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.279 by root, Sun Nov 16 08:59:16 2008 UTC vs.
Revision 1.407 by root, Sat Jun 11 15:30:21 2011 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
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
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
17#include "ecb.h"
12 18
19#include <stddef.h>
13#include <stdio.h> 20#include <stdio.h>
14#include <errno.h> 21#include <errno.h>
15#include <assert.h> 22#include <assert.h>
16 23
17#ifdef WIN32 24#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0
26#endif
27
28#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY
18# undef setjmp 30# undef setjmp
19# undef longjmp 31# undef longjmp
20# undef _exit 32# undef _exit
21# define setjmp _setjmp // deep magic, don't ask 33# define setjmp _setjmp /* deep magic */
22#else 34#else
23# include <inttypes.h> /* most portable stdint.h */ 35# include <inttypes.h> /* most portable stdint.h */
24#endif 36#endif
25 37
26#ifdef HAVE_MMAP 38#ifdef HAVE_MMAP
… …
51#endif 63#endif
52 64
53/* the maximum number of idle cctx that will be pooled */ 65/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 66static int cctx_max_idle = 4;
55 67
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100
101/* 5.8.7 */
102#ifndef SvRV_set
103# define SvRV_set(s,v) SvRV(s) = (v)
104#endif
105
106#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 68#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
107# undef CORO_STACKGUARD 69# undef CORO_STACKGUARD
108#endif 70#endif
109 71
110#ifndef CORO_STACKGUARD 72#ifndef CORO_STACKGUARD
… …
117#endif 79#endif
118 80
119/* The next macros try to return the current stack pointer, in an as 81/* The next macros try to return the current stack pointer, in an as
120 * portable way as possible. */ 82 * portable way as possible. */
121#if __GNUC__ >= 4 83#if __GNUC__ >= 4
84# define dSTACKLEVEL int stacklevel_dummy
122# define dSTACKLEVEL void *stacklevel = __builtin_frame_address (0) 85# define STACKLEVEL __builtin_frame_address (0)
123#else 86#else
124# define dSTACKLEVEL volatile void *stacklevel = (volatile void *)&stacklevel 87# define dSTACKLEVEL volatile void *stacklevel
88# define STACKLEVEL ((void *)&stacklevel)
125#endif 89#endif
126 90
127#define IN_DESTRUCT (PL_main_cv == Nullcv) 91#define IN_DESTRUCT PL_dirty
128
129#if __GNUC__ >= 3
130# define attribute(x) __attribute__(x)
131# define expect(expr,value) __builtin_expect ((expr),(value))
132# define INLINE static inline
133#else
134# define attribute(x)
135# define expect(expr,value) (expr)
136# define INLINE static
137#endif
138
139#define expect_false(expr) expect ((expr) != 0, 0)
140#define expect_true(expr) expect ((expr) != 0, 1)
141
142#define NOINLINE attribute ((noinline))
143 92
144#include "CoroAPI.h" 93#include "CoroAPI.h"
94#define GCoroAPI (&coroapi) /* very sneaky */
145 95
146#ifdef USE_ITHREADS 96#ifdef USE_ITHREADS
147
148static perl_mutex coro_lock;
149# define LOCK do { MUTEX_LOCK (&coro_lock); } while (0)
150# define UNLOCK do { MUTEX_UNLOCK (&coro_lock); } while (0)
151# if CORO_PTHREAD 97# if CORO_PTHREAD
152static void *coro_thx; 98static void *coro_thx;
153# endif 99# endif
154
155#else
156
157# define LOCK (void)0
158# define UNLOCK (void)0
159
160#endif 100#endif
161 101
162# undef LOCK 102/* used in state.h */
163# define LOCK (void)0 103#define VAR(name,type) VARx(name, PL_ ## name, type)
164# undef UNLOCK
165# define UNLOCK (void)0
166 104
167/* helper storage struct for Coro::AIO */ 105#ifdef __linux
168struct io_state 106# include <time.h> /* for timespec */
169{ 107# include <syscall.h> /* for SYS_* */
170 AV *res; 108# ifdef SYS_clock_gettime
171 int errorno; 109# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
172 I32 laststype; /* U16 in 5.10.0 */ 110# define CORO_CLOCK_MONOTONIC 1
173 int laststatval; 111# define CORO_CLOCK_THREAD_CPUTIME_ID 3
174 Stat_t statcache; 112# endif
175}; 113#endif
176 114
177static double (*nvtime)(); /* so why doesn't it take void? */ 115static double (*nvtime)(); /* so why doesn't it take void? */
116static void (*u2time)(pTHX_ UV ret[2]);
117
118/* we hijack an hopefully unused CV flag for our purposes */
119#define CVf_SLF 0x4000
120static OP *pp_slf (pTHX);
121static void slf_destroy (pTHX_ struct coro *coro);
178 122
179static U32 cctx_gen; 123static U32 cctx_gen;
180static size_t cctx_stacksize = CORO_STACKSIZE; 124static size_t cctx_stacksize = CORO_STACKSIZE;
181static struct CoroAPI coroapi; 125static struct CoroAPI coroapi;
182static AV *main_mainstack; /* used to differentiate between $main and others */ 126static AV *main_mainstack; /* used to differentiate between $main and others */
183static JMPENV *main_top_env; 127static JMPENV *main_top_env;
184static HV *coro_state_stash, *coro_stash; 128static HV *coro_state_stash, *coro_stash;
185static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 129static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
186static volatile struct coro *transfer_next; 130
131static AV *av_destroy; /* destruction queue */
132static SV *sv_manager; /* the manager coro */
133static SV *sv_idle; /* $Coro::idle */
187 134
188static GV *irsgv; /* $/ */ 135static GV *irsgv; /* $/ */
189static GV *stdoutgv; /* *STDOUT */ 136static GV *stdoutgv; /* *STDOUT */
190static SV *rv_diehook; 137static SV *rv_diehook;
191static SV *rv_warnhook; 138static SV *rv_warnhook;
192static HV *hv_sig; /* %SIG */ 139static HV *hv_sig; /* %SIG */
193 140
194/* async_pool helper stuff */ 141/* async_pool helper stuff */
195static SV *sv_pool_rss; 142static SV *sv_pool_rss;
196static SV *sv_pool_size; 143static SV *sv_pool_size;
144static SV *sv_async_pool_idle; /* description string */
197static AV *av_async_pool; 145static AV *av_async_pool; /* idle pool */
146static SV *sv_Coro; /* class string */
147static CV *cv_pool_handler;
198 148
199/* Coro::AnyEvent */ 149/* Coro::AnyEvent */
200static SV *sv_activity; 150static SV *sv_activity;
201 151
152/* enable processtime/realtime profiling */
153static char enable_times;
154typedef U32 coro_ts[2];
155static coro_ts time_real, time_cpu;
156static char times_valid;
157
202static struct coro_cctx *cctx_first; 158static struct coro_cctx *cctx_first;
203static int cctx_count, cctx_idle; 159static int cctx_count, cctx_idle;
204 160
205enum { 161enum
162{
206 CC_MAPPED = 0x01, 163 CC_MAPPED = 0x01,
207 CC_NOREUSE = 0x02, /* throw this away after tracing */ 164 CC_NOREUSE = 0x02, /* throw this away after tracing */
208 CC_TRACE = 0x04, 165 CC_TRACE = 0x04,
209 CC_TRACE_SUB = 0x08, /* trace sub calls */ 166 CC_TRACE_SUB = 0x08, /* trace sub calls */
210 CC_TRACE_LINE = 0x10, /* trace each statement */ 167 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
231 int valgrind_id; 188 int valgrind_id;
232#endif 189#endif
233 unsigned char flags; 190 unsigned char flags;
234} coro_cctx; 191} coro_cctx;
235 192
193static coro_cctx *cctx_current; /* the currently running cctx */
194
195/*****************************************************************************/
196
197static MGVTBL coro_state_vtbl;
198
236enum { 199enum
200{
237 CF_RUNNING = 0x0001, /* coroutine is running */ 201 CF_RUNNING = 0x0001, /* coroutine is running */
238 CF_READY = 0x0002, /* coroutine is ready */ 202 CF_READY = 0x0002, /* coroutine is ready */
239 CF_NEW = 0x0004, /* has never been switched to */ 203 CF_NEW = 0x0004, /* has never been switched to */
240 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 204 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
205 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
206 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
241}; 207};
242 208
243/* the structure where most of the perl state is stored, overlaid on the cxstack */ 209/* the structure where most of the perl state is stored, overlaid on the cxstack */
244typedef struct 210typedef struct
245{ 211{
246 SV *defsv;
247 AV *defav;
248 SV *errsv;
249 SV *irsgv;
250#define VAR(name,type) type name; 212#define VARx(name,expr,type) type name;
251# include "state.h" 213# include "state.h"
252#undef VAR 214#undef VARx
253} perl_slots; 215} perl_slots;
254 216
217// how many context stack entries do we need for perl_slots
255#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 218#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
256 219
257/* this is a structure representing a perl-level coroutine */ 220/* this is a structure representing a perl-level coroutine */
258struct coro { 221struct coro
222{
259 /* the C coroutine allocated to this perl coroutine, if any */ 223 /* the C coroutine allocated to this perl coroutine, if any */
260 coro_cctx *cctx; 224 coro_cctx *cctx;
261 225
262 /* process data */ 226 /* ready queue */
227 struct coro *next_ready;
228
229 /* state data */
263 struct CoroSLF slf_frame; /* saved slf frame */ 230 struct CoroSLF slf_frame; /* saved slf frame */
264 AV *mainstack; 231 AV *mainstack;
265 perl_slots *slot; /* basically the saved sp */ 232 perl_slots *slot; /* basically the saved sp */
266 233
234 CV *startcv; /* the CV to execute */
267 AV *args; /* data associated with this coroutine (initial args) */ 235 AV *args; /* data associated with this coroutine (initial args) */
268 int refcnt; /* coroutines are refcounted, yes */
269 int flags; /* CF_ flags */ 236 int flags; /* CF_ flags */
270 HV *hv; /* the perl hash associated with this coro, if any */ 237 HV *hv; /* the perl hash associated with this coro, if any */
271 238
272 /* statistics */ 239 /* statistics */
273 int usecount; /* number of transfers to this coro */ 240 int usecount; /* number of transfers to this coro */
274 241
275 /* coro process data */ 242 /* coro process data */
276 int prio; 243 int prio;
277 SV *throw; /* exception to be thrown */ 244 SV *except; /* exception to be thrown */
245 SV *rouse_cb; /* last rouse callback */
246 AV *on_destroy; /* callbacks or coros to notify on destroy */
247 AV *status; /* the exit status list */
278 248
279 /* async_pool */ 249 /* async_pool */
280 SV *saved_deffh; 250 SV *saved_deffh;
251 SV *invoke_cb;
252 AV *invoke_av;
253
254 /* on_enter/on_leave */
255 AV *on_enter;
256 AV *on_leave;
257
258 /* swap_sv */
259 AV *swap_sv;
260
261 /* times */
262 coro_ts t_cpu, t_real;
281 263
282 /* linked list */ 264 /* linked list */
283 struct coro *next, *prev; 265 struct coro *next, *prev;
284}; 266};
285 267
286typedef struct coro *Coro__State; 268typedef struct coro *Coro__State;
287typedef struct coro *Coro__State_or_hashref; 269typedef struct coro *Coro__State_or_hashref;
288 270
271/* the following variables are effectively part of the perl context */
272/* and get copied between struct coro and these variables */
273/* the main reason we don't support windows process emulation */
289static struct CoroSLF slf_frame; /* the current slf frame */ 274static struct CoroSLF slf_frame; /* the current slf frame */
290 275
291/** Coro ********************************************************************/ 276/** Coro ********************************************************************/
292 277
293#define PRIO_MAX 3 278#define CORO_PRIO_MAX 3
294#define PRIO_HIGH 1 279#define CORO_PRIO_HIGH 1
295#define PRIO_NORMAL 0 280#define CORO_PRIO_NORMAL 0
296#define PRIO_LOW -1 281#define CORO_PRIO_LOW -1
297#define PRIO_IDLE -3 282#define CORO_PRIO_IDLE -3
298#define PRIO_MIN -4 283#define CORO_PRIO_MIN -4
299 284
300/* for Coro.pm */ 285/* for Coro.pm */
301static SV *coro_current; 286static SV *coro_current;
302static SV *coro_readyhook; 287static SV *coro_readyhook;
303static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 288static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
289static CV *cv_coro_run;
304static struct coro *coro_first; 290static struct coro *coro_first;
305#define coro_nready coroapi.nready 291#define coro_nready coroapi.nready
306 292
293/** JIT *********************************************************************/
294
295#if CORO_JIT
296 #ifndef CORO_JIT_TYPE
297 #if __x86_64 && (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris)
298 #define CORO_JIT_TYPE "amd64-unix"
299 typedef void (*load_save_perl_slots_type)(perl_slots *);
300 #elif __i386 && (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris)
301 #define CORO_JIT_TYPE "x86-unix"
302 typedef void (*load_save_perl_slots_type)(perl_slots *);
303 #else
304 #undef CORO_JIT
305 #endif
306 #endif
307#endif
308
309#if CORO_JIT
310static load_save_perl_slots_type load_perl_slots, save_perl_slots;
311#endif
312
313/** Coro::Select ************************************************************/
314
315static OP *(*coro_old_pp_sselect) (pTHX);
316static SV *coro_select_select;
317
318/* horrible hack, but if it works... */
319static OP *
320coro_pp_sselect (pTHX)
321{
322 dSP;
323 PUSHMARK (SP - 4); /* fake argument list */
324 XPUSHs (coro_select_select);
325 PUTBACK;
326
327 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
328 PL_op->op_flags |= OPf_STACKED;
329 PL_op->op_private = 0;
330 return PL_ppaddr [OP_ENTERSUB](aTHX);
331}
332
333/** time stuff **************************************************************/
334
335#ifdef HAS_GETTIMEOFDAY
336
337ECB_INLINE void
338coro_u2time (pTHX_ UV ret[2])
339{
340 struct timeval tv;
341 gettimeofday (&tv, 0);
342
343 ret [0] = tv.tv_sec;
344 ret [1] = tv.tv_usec;
345}
346
347ECB_INLINE double
348coro_nvtime ()
349{
350 struct timeval tv;
351 gettimeofday (&tv, 0);
352
353 return tv.tv_sec + tv.tv_usec * 1e-6;
354}
355
356ECB_INLINE void
357time_init (pTHX)
358{
359 nvtime = coro_nvtime;
360 u2time = coro_u2time;
361}
362
363#else
364
365ECB_INLINE void
366time_init (pTHX)
367{
368 SV **svp;
369
370 require_pv ("Time/HiRes.pm");
371
372 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
373
374 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
375 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
376
377 nvtime = INT2PTR (double (*)(), SvIV (*svp));
378
379 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
380 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
381}
382
383#endif
384
307/** lowlevel stuff **********************************************************/ 385/** lowlevel stuff **********************************************************/
308 386
309static SV * 387static SV * ecb_noinline
310coro_get_sv (pTHX_ const char *name, int create) 388coro_get_sv (pTHX_ const char *name, int create)
311{ 389{
312#if PERL_VERSION_ATLEAST (5,10,0) 390#if PERL_VERSION_ATLEAST (5,10,0)
313 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 391 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
314 get_sv (name, create); 392 get_sv (name, create);
315#endif 393#endif
316 return get_sv (name, create); 394 return get_sv (name, create);
317} 395}
318 396
319static AV * 397static AV * ecb_noinline
320coro_get_av (pTHX_ const char *name, int create) 398coro_get_av (pTHX_ const char *name, int create)
321{ 399{
322#if PERL_VERSION_ATLEAST (5,10,0) 400#if PERL_VERSION_ATLEAST (5,10,0)
323 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 401 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
324 get_av (name, create); 402 get_av (name, create);
325#endif 403#endif
326 return get_av (name, create); 404 return get_av (name, create);
327} 405}
328 406
329static HV * 407static HV * ecb_noinline
330coro_get_hv (pTHX_ const char *name, int create) 408coro_get_hv (pTHX_ const char *name, int create)
331{ 409{
332#if PERL_VERSION_ATLEAST (5,10,0) 410#if PERL_VERSION_ATLEAST (5,10,0)
333 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 411 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
334 get_hv (name, create); 412 get_hv (name, create);
335#endif 413#endif
336 return get_hv (name, create); 414 return get_hv (name, create);
337} 415}
338 416
339static AV * 417ECB_INLINE void
418coro_times_update ()
419{
420#ifdef coro_clock_gettime
421 struct timespec ts;
422
423 ts.tv_sec = ts.tv_nsec = 0;
424 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
425 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
426
427 ts.tv_sec = ts.tv_nsec = 0;
428 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
429 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
430#else
431 dTHX;
432 UV tv[2];
433
434 u2time (aTHX_ tv);
435 time_real [0] = tv [0];
436 time_real [1] = tv [1] * 1000;
437#endif
438}
439
440ECB_INLINE void
441coro_times_add (struct coro *c)
442{
443 c->t_real [1] += time_real [1];
444 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
445 c->t_real [0] += time_real [0];
446
447 c->t_cpu [1] += time_cpu [1];
448 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
449 c->t_cpu [0] += time_cpu [0];
450}
451
452ECB_INLINE void
453coro_times_sub (struct coro *c)
454{
455 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
456 c->t_real [1] -= time_real [1];
457 c->t_real [0] -= time_real [0];
458
459 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
460 c->t_cpu [1] -= time_cpu [1];
461 c->t_cpu [0] -= time_cpu [0];
462}
463
464/*****************************************************************************/
465/* magic glue */
466
467#define CORO_MAGIC_type_cv 26
468#define CORO_MAGIC_type_state PERL_MAGIC_ext
469
470#define CORO_MAGIC_NN(sv, type) \
471 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
472 ? SvMAGIC (sv) \
473 : mg_find (sv, type))
474
475#define CORO_MAGIC(sv, type) \
476 (ecb_expect_true (SvMAGIC (sv)) \
477 ? CORO_MAGIC_NN (sv, type) \
478 : 0)
479
480#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
481#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
482
483ECB_INLINE MAGIC *
484SvSTATEhv_p (pTHX_ SV *coro)
485{
486 MAGIC *mg;
487
488 if (ecb_expect_true (
489 SvTYPE (coro) == SVt_PVHV
490 && (mg = CORO_MAGIC_state (coro))
491 && mg->mg_virtual == &coro_state_vtbl
492 ))
493 return mg;
494
495 return 0;
496}
497
498ECB_INLINE struct coro *
499SvSTATE_ (pTHX_ SV *coro)
500{
501 MAGIC *mg;
502
503 if (SvROK (coro))
504 coro = SvRV (coro);
505
506 mg = SvSTATEhv_p (aTHX_ coro);
507 if (!mg)
508 croak ("Coro::State object required");
509
510 return (struct coro *)mg->mg_ptr;
511}
512
513#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
514
515/* faster than SvSTATE, but expects a coroutine hv */
516#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
517#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
518
519/*****************************************************************************/
520/* padlist management and caching */
521
522ECB_INLINE AV *
340coro_clone_padlist (pTHX_ CV *cv) 523coro_derive_padlist (pTHX_ CV *cv)
341{ 524{
342 AV *padlist = CvPADLIST (cv); 525 AV *padlist = CvPADLIST (cv);
343 AV *newpadlist, *newpad; 526 AV *newpadlist, *newpad;
344 527
345 newpadlist = newAV (); 528 newpadlist = newAV ();
… …
350 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 533 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
351#endif 534#endif
352 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 535 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
353 --AvFILLp (padlist); 536 --AvFILLp (padlist);
354 537
355 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 538 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
356 av_store (newpadlist, 1, (SV *)newpad); 539 av_store (newpadlist, 1, (SV *)newpad);
357 540
358 return newpadlist; 541 return newpadlist;
359} 542}
360 543
361static void 544ECB_INLINE void
362free_padlist (pTHX_ AV *padlist) 545free_padlist (pTHX_ AV *padlist)
363{ 546{
364 /* may be during global destruction */ 547 /* may be during global destruction */
365 if (SvREFCNT (padlist)) 548 if (!IN_DESTRUCT)
366 { 549 {
367 I32 i = AvFILLp (padlist); 550 I32 i = AvFILLp (padlist);
368 while (i >= 0) 551
552 while (i > 0) /* special-case index 0 */
369 { 553 {
370 SV **svp = av_fetch (padlist, i--, FALSE); 554 /* we try to be extra-careful here */
371 if (svp) 555 AV *av = (AV *)AvARRAY (padlist)[i--];
372 { 556 I32 j = AvFILLp (av);
373 SV *sv; 557
374 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 558 while (j >= 0)
559 SvREFCNT_dec (AvARRAY (av)[j--]);
560
561 AvFILLp (av) = -1;
375 SvREFCNT_dec (sv); 562 SvREFCNT_dec (av);
376
377 SvREFCNT_dec (*svp);
378 }
379 } 563 }
380 564
565 SvREFCNT_dec (AvARRAY (padlist)[0]);
566
567 AvFILLp (padlist) = -1;
381 SvREFCNT_dec ((SV*)padlist); 568 SvREFCNT_dec ((SV*)padlist);
382 } 569 }
383} 570}
384 571
385static int 572static int
386coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 573coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
387{ 574{
388 AV *padlist; 575 AV *padlist;
389 AV *av = (AV *)mg->mg_obj; 576 AV *av = (AV *)mg->mg_obj;
577
578 /* perl manages to free our internal AV and _then_ call us */
579 if (IN_DESTRUCT)
580 return 0;
390 581
391 /* casting is fun. */ 582 /* casting is fun. */
392 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 583 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
393 free_padlist (aTHX_ padlist); 584 free_padlist (aTHX_ padlist);
394 585
395 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 586 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
396 587
397 return 0; 588 return 0;
398} 589}
399
400#define CORO_MAGIC_type_cv PERL_MAGIC_ext
401#define CORO_MAGIC_type_state PERL_MAGIC_ext
402 590
403static MGVTBL coro_cv_vtbl = { 591static MGVTBL coro_cv_vtbl = {
404 0, 0, 0, 0, 592 0, 0, 0, 0,
405 coro_cv_free 593 coro_cv_free
406}; 594};
407 595
408#define CORO_MAGIC(sv, type) \
409 SvMAGIC (sv) \
410 ? SvMAGIC (sv)->mg_type == type \
411 ? SvMAGIC (sv) \
412 : mg_find (sv, type) \
413 : 0
414
415#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
416#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
417
418INLINE struct coro *
419SvSTATE_ (pTHX_ SV *coro)
420{
421 HV *stash;
422 MAGIC *mg;
423
424 if (SvROK (coro))
425 coro = SvRV (coro);
426
427 if (expect_false (SvTYPE (coro) != SVt_PVHV))
428 croak ("Coro::State object required");
429
430 stash = SvSTASH (coro);
431 if (expect_false (stash != coro_stash && stash != coro_state_stash))
432 {
433 /* very slow, but rare, check */
434 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
435 croak ("Coro::State object required");
436 }
437
438 mg = CORO_MAGIC_state (coro);
439 return (struct coro *)mg->mg_ptr;
440}
441
442#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
443
444/* the next two functions merely cache the padlists */ 596/* the next two functions merely cache the padlists */
445static void 597ECB_INLINE void
446get_padlist (pTHX_ CV *cv) 598get_padlist (pTHX_ CV *cv)
447{ 599{
448 MAGIC *mg = CORO_MAGIC_cv (cv); 600 MAGIC *mg = CORO_MAGIC_cv (cv);
449 AV *av; 601 AV *av;
450 602
451 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 603 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
452 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 604 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
453 else 605 else
454 { 606 {
455#if CORO_PREFER_PERL_FUNCTIONS 607#if CORO_PREFER_PERL_FUNCTIONS
456 /* this is probably cleaner? but also slower! */ 608 /* this is probably cleaner? but also slower! */
457 /* in practise, it seems to be less stable */ 609 /* in practise, it seems to be less stable */
458 CV *cp = Perl_cv_clone (cv); 610 CV *cp = Perl_cv_clone (aTHX_ cv);
459 CvPADLIST (cv) = CvPADLIST (cp); 611 CvPADLIST (cv) = CvPADLIST (cp);
460 CvPADLIST (cp) = 0; 612 CvPADLIST (cp) = 0;
461 SvREFCNT_dec (cp); 613 SvREFCNT_dec (cp);
462#else 614#else
463 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 615 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
464#endif 616#endif
465 } 617 }
466} 618}
467 619
468static void 620ECB_INLINE void
469put_padlist (pTHX_ CV *cv) 621put_padlist (pTHX_ CV *cv)
470{ 622{
471 MAGIC *mg = CORO_MAGIC_cv (cv); 623 MAGIC *mg = CORO_MAGIC_cv (cv);
472 AV *av; 624 AV *av;
473 625
474 if (expect_false (!mg)) 626 if (ecb_expect_false (!mg))
475 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 627 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
476 628
477 av = (AV *)mg->mg_obj; 629 av = (AV *)mg->mg_obj;
478 630
479 if (expect_false (AvFILLp (av) >= AvMAX (av))) 631 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
480 av_extend (av, AvMAX (av) + 1); 632 av_extend (av, AvFILLp (av) + 1);
481 633
482 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 634 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
483} 635}
484 636
485/** load & save, init *******************************************************/ 637/** load & save, init *******************************************************/
638
639/* swap sv heads, at least logically */
640static void
641swap_svs (pTHX_ Coro__State c)
642{
643 int i;
644
645 for (i = 0; i <= AvFILLp (c->swap_sv); )
646 {
647 SV *a = AvARRAY (c->swap_sv)[i++];
648 SV *b = AvARRAY (c->swap_sv)[i++];
649
650 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
651 SV tmp;
652
653 /* swap sv_any */
654 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
655
656 /* swap sv_flags */
657 SvFLAGS (&tmp) = SvFLAGS (a);
658 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
659 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
660
661#if PERL_VERSION_ATLEAST (5,10,0)
662 /* perl 5.10 complicates this _quite_ a bit, but it also is
663 * much faster, so no quarrels here. alternatively, we could
664 * sv_upgrade to avoid this.
665 */
666 {
667 /* swap sv_u */
668 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
669
670 /* if SvANY points to the head, we need to adjust the pointers,
671 * as the pointer for a still points to b, and maybe vice versa.
672 */
673 #define svany_in_head(type) \
674 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
675
676 if (svany_in_head (SvTYPE (a)))
677 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
678
679 if (svany_in_head (SvTYPE (b)))
680 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
681 }
682#endif
683 }
684}
685
686#define SWAP_SVS(coro) \
687 if (ecb_expect_false ((coro)->swap_sv)) \
688 swap_svs (aTHX_ (coro))
689
690static void
691on_enterleave_call (pTHX_ SV *cb);
486 692
487static void 693static void
488load_perl (pTHX_ Coro__State c) 694load_perl (pTHX_ Coro__State c)
489{ 695{
490 perl_slots *slot = c->slot; 696 perl_slots *slot = c->slot;
491 c->slot = 0; 697 c->slot = 0;
492 698
493 PL_mainstack = c->mainstack; 699 PL_mainstack = c->mainstack;
494 700
495 GvSV (PL_defgv) = slot->defsv; 701#if CORO_JIT
496 GvAV (PL_defgv) = slot->defav; 702 load_perl_slots (slot);
497 GvSV (PL_errgv) = slot->errsv; 703#else
498 GvSV (irsgv) = slot->irsgv;
499
500 #define VAR(name,type) PL_ ## name = slot->name; 704 #define VARx(name,expr,type) expr = slot->name;
501 # include "state.h" 705 # include "state.h"
502 #undef VAR 706 #undef VARx
707#endif
503 708
504 { 709 {
505 dSP; 710 dSP;
506 711
507 CV *cv; 712 CV *cv;
508 713
509 /* now do the ugly restore mess */ 714 /* now do the ugly restore mess */
510 while (expect_true (cv = (CV *)POPs)) 715 while (ecb_expect_true (cv = (CV *)POPs))
511 { 716 {
512 put_padlist (aTHX_ cv); /* mark this padlist as available */ 717 put_padlist (aTHX_ cv); /* mark this padlist as available */
513 CvDEPTH (cv) = PTR2IV (POPs); 718 CvDEPTH (cv) = PTR2IV (POPs);
514 CvPADLIST (cv) = (AV *)POPs; 719 CvPADLIST (cv) = (AV *)POPs;
515 } 720 }
516 721
517 PUTBACK; 722 PUTBACK;
518 } 723 }
519 724
520 slf_frame = c->slf_frame; 725 slf_frame = c->slf_frame;
726 CORO_THROW = c->except;
727
728 if (ecb_expect_false (enable_times))
729 {
730 if (ecb_expect_false (!times_valid))
731 coro_times_update ();
732
733 coro_times_sub (c);
734 }
735
736 if (ecb_expect_false (c->on_enter))
737 {
738 int i;
739
740 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
742 }
743
744 SWAP_SVS (c);
521} 745}
522 746
523static void 747static void
524save_perl (pTHX_ Coro__State c) 748save_perl (pTHX_ Coro__State c)
525{ 749{
750 SWAP_SVS (c);
751
752 if (ecb_expect_false (c->on_leave))
753 {
754 int i;
755
756 for (i = AvFILLp (c->on_leave); i >= 0; --i)
757 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
758 }
759
760 times_valid = 0;
761
762 if (ecb_expect_false (enable_times))
763 {
764 coro_times_update (); times_valid = 1;
765 coro_times_add (c);
766 }
767
768 c->except = CORO_THROW;
526 c->slf_frame = slf_frame; 769 c->slf_frame = slf_frame;
527 770
528 { 771 {
529 dSP; 772 dSP;
530 I32 cxix = cxstack_ix; 773 I32 cxix = cxstack_ix;
… …
538 781
539 XPUSHs (Nullsv); 782 XPUSHs (Nullsv);
540 /* this loop was inspired by pp_caller */ 783 /* this loop was inspired by pp_caller */
541 for (;;) 784 for (;;)
542 { 785 {
543 while (expect_true (cxix >= 0)) 786 while (ecb_expect_true (cxix >= 0))
544 { 787 {
545 PERL_CONTEXT *cx = &ccstk[cxix--]; 788 PERL_CONTEXT *cx = &ccstk[cxix--];
546 789
547 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 790 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
548 { 791 {
549 CV *cv = cx->blk_sub.cv; 792 CV *cv = cx->blk_sub.cv;
550 793
551 if (expect_true (CvDEPTH (cv))) 794 if (ecb_expect_true (CvDEPTH (cv)))
552 { 795 {
553 EXTEND (SP, 3); 796 EXTEND (SP, 3);
554 PUSHs ((SV *)CvPADLIST (cv)); 797 PUSHs ((SV *)CvPADLIST (cv));
555 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 798 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
556 PUSHs ((SV *)cv); 799 PUSHs ((SV *)cv);
… …
559 get_padlist (aTHX_ cv); 802 get_padlist (aTHX_ cv);
560 } 803 }
561 } 804 }
562 } 805 }
563 806
564 if (expect_true (top_si->si_type == PERLSI_MAIN)) 807 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
565 break; 808 break;
566 809
567 top_si = top_si->si_prev; 810 top_si = top_si->si_prev;
568 ccstk = top_si->si_cxstack; 811 ccstk = top_si->si_cxstack;
569 cxix = top_si->si_cxix; 812 cxix = top_si->si_cxix;
… …
571 814
572 PUTBACK; 815 PUTBACK;
573 } 816 }
574 817
575 /* allocate some space on the context stack for our purposes */ 818 /* allocate some space on the context stack for our purposes */
576 /* we manually unroll here, as usually 2 slots is enough */ 819 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
577 if (SLOT_COUNT >= 1) CXINC;
578 if (SLOT_COUNT >= 2) CXINC;
579 if (SLOT_COUNT >= 3) CXINC;
580 { 820 {
581 int i; 821 unsigned int i;
822
582 for (i = 3; i < SLOT_COUNT; ++i) 823 for (i = 0; i < SLOT_COUNT; ++i)
583 CXINC; 824 CXINC;
584 } 825
585 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 826 cxstack_ix -= SLOT_COUNT; /* undo allocation */
827 }
586 828
587 c->mainstack = PL_mainstack; 829 c->mainstack = PL_mainstack;
588 830
589 { 831 {
590 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 832 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
591 833
592 slot->defav = GvAV (PL_defgv); 834#if CORO_JIT
593 slot->defsv = DEFSV; 835 save_perl_slots (slot);
594 slot->errsv = ERRSV; 836#else
595 slot->irsgv = GvSV (irsgv);
596
597 #define VAR(name,type) slot->name = PL_ ## name; 837 #define VARx(name,expr,type) slot->name = expr;
598 # include "state.h" 838 # include "state.h"
599 #undef VAR 839 #undef VARx
840#endif
600 } 841 }
601} 842}
602 843
603/* 844/*
604 * allocate various perl stacks. This is almost an exact copy 845 * allocate various perl stacks. This is almost an exact copy
605 * of perl.c:init_stacks, except that it uses less memory 846 * of perl.c:init_stacks, except that it uses less memory
606 * on the (sometimes correct) assumption that coroutines do 847 * on the (sometimes correct) assumption that coroutines do
607 * not usually need a lot of stackspace. 848 * not usually need a lot of stackspace.
608 */ 849 */
609#if CORO_PREFER_PERL_FUNCTIONS 850#if CORO_PREFER_PERL_FUNCTIONS
610# define coro_init_stacks init_stacks 851# define coro_init_stacks(thx) init_stacks ()
611#else 852#else
612static void 853static void
613coro_init_stacks (pTHX) 854coro_init_stacks (pTHX)
614{ 855{
615 PL_curstackinfo = new_stackinfo(32, 8); 856 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
616 PL_curstackinfo->si_type = PERLSI_MAIN; 857 PL_curstackinfo->si_type = PERLSI_MAIN;
617 PL_curstack = PL_curstackinfo->si_stack; 858 PL_curstack = PL_curstackinfo->si_stack;
618 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 859 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
619 860
620 PL_stack_base = AvARRAY(PL_curstack); 861 PL_stack_base = AvARRAY(PL_curstack);
… …
678#if !PERL_VERSION_ATLEAST (5,10,0) 919#if !PERL_VERSION_ATLEAST (5,10,0)
679 Safefree (PL_retstack); 920 Safefree (PL_retstack);
680#endif 921#endif
681} 922}
682 923
924#define CORO_RSS \
925 rss += sizeof (SYM (curstackinfo)); \
926 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
927 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
928 rss += SYM (tmps_max) * sizeof (SV *); \
929 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
930 rss += SYM (scopestack_max) * sizeof (I32); \
931 rss += SYM (savestack_max) * sizeof (ANY);
932
683static size_t 933static size_t
684coro_rss (pTHX_ struct coro *coro) 934coro_rss (pTHX_ struct coro *coro)
685{ 935{
686 size_t rss = sizeof (*coro); 936 size_t rss = sizeof (*coro);
687 937
688 if (coro->mainstack) 938 if (coro->mainstack)
689 { 939 {
690 perl_slots tmp_slot;
691 perl_slots *slot;
692
693 if (coro->flags & CF_RUNNING) 940 if (coro->flags & CF_RUNNING)
694 { 941 {
695 slot = &tmp_slot; 942 #define SYM(sym) PL_ ## sym
696 943 CORO_RSS;
697 #define VAR(name,type) slot->name = PL_ ## name;
698 # include "state.h"
699 #undef VAR 944 #undef SYM
700 } 945 }
701 else 946 else
702 slot = coro->slot;
703
704 if (slot)
705 { 947 {
706 rss += sizeof (slot->curstackinfo); 948 #define SYM(sym) coro->slot->sym
707 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 949 CORO_RSS;
708 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 950 #undef SYM
709 rss += slot->tmps_max * sizeof (SV *);
710 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
711 rss += slot->scopestack_max * sizeof (I32);
712 rss += slot->savestack_max * sizeof (ANY);
713
714#if !PERL_VERSION_ATLEAST (5,10,0)
715 rss += slot->retstack_max * sizeof (OP *);
716#endif
717 } 951 }
718 } 952 }
719 953
720 return rss; 954 return rss;
721} 955}
… …
734#endif 968#endif
735 969
736/* 970/*
737 * This overrides the default magic get method of %SIG elements. 971 * This overrides the default magic get method of %SIG elements.
738 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 972 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
739 * and instead of tryign to save and restore the hash elements, we just provide 973 * and instead of trying to save and restore the hash elements (extremely slow),
740 * readback here. 974 * we just provide our own readback here.
741 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
742 * not expecting this to actually change the hook. This is a potential problem
743 * when a schedule happens then, but we ignore this.
744 */ 975 */
745static int 976static int ecb_cold
746coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 977coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
747{ 978{
748 const char *s = MgPV_nolen_const (mg); 979 const char *s = MgPV_nolen_const (mg);
749 980
750 if (*s == '_') 981 if (*s == '_')
… …
762 } 993 }
763 994
764 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 995 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
765} 996}
766 997
767static int 998static int ecb_cold
768coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 999coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
769{ 1000{
770 const char *s = MgPV_nolen_const (mg); 1001 const char *s = MgPV_nolen_const (mg);
771 1002
772 if (*s == '_') 1003 if (*s == '_')
… …
786 } 1017 }
787 1018
788 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1019 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
789} 1020}
790 1021
791static int 1022static int ecb_cold
792coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1023coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
793{ 1024{
794 const char *s = MgPV_nolen_const (mg); 1025 const char *s = MgPV_nolen_const (mg);
795 1026
796 if (*s == '_') 1027 if (*s == '_')
… …
801 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1032 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
802 1033
803 if (svp) 1034 if (svp)
804 { 1035 {
805 SV *old = *svp; 1036 SV *old = *svp;
806 *svp = newSVsv (sv); 1037 *svp = SvOK (sv) ? newSVsv (sv) : 0;
807 SvREFCNT_dec (old); 1038 SvREFCNT_dec (old);
808 return 0; 1039 return 0;
809 } 1040 }
810 } 1041 }
811 1042
… …
823slf_check_nop (pTHX_ struct CoroSLF *frame) 1054slf_check_nop (pTHX_ struct CoroSLF *frame)
824{ 1055{
825 return 0; 1056 return 0;
826} 1057}
827 1058
828static void 1059static int
1060slf_check_repeat (pTHX_ struct CoroSLF *frame)
1061{
1062 return 1;
1063}
1064
1065static UNOP init_perl_op;
1066
1067ecb_noinline static void /* noinline to keep it out of the transfer fast path */
829coro_setup (pTHX_ struct coro *coro) 1068init_perl (pTHX_ struct coro *coro)
830{ 1069{
831 /* 1070 /*
832 * emulate part of the perl startup here. 1071 * emulate part of the perl startup here.
833 */ 1072 */
834 coro_init_stacks (aTHX); 1073 coro_init_stacks (aTHX);
835 1074
836 PL_runops = RUNOPS_DEFAULT; 1075 PL_runops = RUNOPS_DEFAULT;
837 PL_curcop = &PL_compiling; 1076 PL_curcop = &PL_compiling;
838 PL_in_eval = EVAL_NULL; 1077 PL_in_eval = EVAL_NULL;
839 PL_comppad = 0; 1078 PL_comppad = 0;
1079 PL_comppad_name = 0;
1080 PL_comppad_name_fill = 0;
1081 PL_comppad_name_floor = 0;
840 PL_curpm = 0; 1082 PL_curpm = 0;
841 PL_curpad = 0; 1083 PL_curpad = 0;
842 PL_localizing = 0; 1084 PL_localizing = 0;
843 PL_dirty = 0;
844 PL_restartop = 0; 1085 PL_restartop = 0;
845#if PERL_VERSION_ATLEAST (5,10,0) 1086#if PERL_VERSION_ATLEAST (5,10,0)
846 PL_parser = 0; 1087 PL_parser = 0;
847#endif 1088#endif
1089 PL_hints = 0;
848 1090
849 /* recreate the die/warn hooks */ 1091 /* recreate the die/warn hooks */
850 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1092 PL_diehook = SvREFCNT_inc (rv_diehook);
851 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1093 PL_warnhook = SvREFCNT_inc (rv_warnhook);
852 1094
853 GvSV (PL_defgv) = newSV (0); 1095 GvSV (PL_defgv) = newSV (0);
854 GvAV (PL_defgv) = coro->args; coro->args = 0; 1096 GvAV (PL_defgv) = coro->args; coro->args = 0;
855 GvSV (PL_errgv) = newSV (0); 1097 GvSV (PL_errgv) = newSV (0);
856 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1098 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1099 GvHV (PL_hintgv) = 0;
857 PL_rs = newSVsv (GvSV (irsgv)); 1100 PL_rs = newSVsv (GvSV (irsgv));
858 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1101 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
859 1102
860 { 1103 {
861 dSP; 1104 dSP;
862 UNOP myop; 1105 UNOP myop;
863 1106
864 Zero (&myop, 1, UNOP); 1107 Zero (&myop, 1, UNOP);
865 myop.op_next = Nullop; 1108 myop.op_next = Nullop;
1109 myop.op_type = OP_ENTERSUB;
866 myop.op_flags = OPf_WANT_VOID; 1110 myop.op_flags = OPf_WANT_VOID;
867 1111
868 PUSHMARK (SP); 1112 PUSHMARK (SP);
869 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 1113 PUSHs ((SV *)coro->startcv);
870 PUTBACK; 1114 PUTBACK;
871 PL_op = (OP *)&myop; 1115 PL_op = (OP *)&myop;
872 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1116 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
873 SPAGAIN;
874 } 1117 }
875 1118
876 /* this newly created coroutine might be run on an existing cctx which most 1119 /* this newly created coroutine might be run on an existing cctx which most
877 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1120 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
878 */ 1121 */
879 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1122 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
880 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1123 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
881} 1124 slf_frame.destroy = 0;
882 1125
1126 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1127 init_perl_op.op_next = PL_op;
1128 init_perl_op.op_type = OP_ENTERSUB;
1129 init_perl_op.op_ppaddr = pp_slf;
1130 /* no flags etc. required, as an init function won't be called */
1131
1132 PL_op = (OP *)&init_perl_op;
1133
1134 /* copy throw, in case it was set before init_perl */
1135 CORO_THROW = coro->except;
1136
1137 SWAP_SVS (coro);
1138
1139 if (ecb_expect_false (enable_times))
1140 {
1141 coro_times_update ();
1142 coro_times_sub (coro);
1143 }
1144}
1145
883static void 1146static void
884coro_destruct (pTHX_ struct coro *coro) 1147coro_unwind_stacks (pTHX)
885{ 1148{
886 if (!IN_DESTRUCT) 1149 if (!IN_DESTRUCT)
887 { 1150 {
888 /* restore all saved variables and stuff */ 1151 /* restore all saved variables and stuff */
889 LEAVE_SCOPE (0); 1152 LEAVE_SCOPE (0);
… …
897 POPSTACK_TO (PL_mainstack); 1160 POPSTACK_TO (PL_mainstack);
898 1161
899 /* unwind main stack */ 1162 /* unwind main stack */
900 dounwind (-1); 1163 dounwind (-1);
901 } 1164 }
1165}
902 1166
903 SvREFCNT_dec (GvSV (PL_defgv)); 1167static void
904 SvREFCNT_dec (GvAV (PL_defgv)); 1168destroy_perl (pTHX_ struct coro *coro)
905 SvREFCNT_dec (GvSV (PL_errgv)); 1169{
906 SvREFCNT_dec (PL_defoutgv); 1170 SV *svf [9];
907 SvREFCNT_dec (PL_rs);
908 SvREFCNT_dec (GvSV (irsgv));
909 1171
910 SvREFCNT_dec (PL_diehook);
911 SvREFCNT_dec (PL_warnhook);
912 1172 {
1173 SV *old_current = SvRV (coro_current);
1174 struct coro *current = SvSTATE (old_current);
1175
1176 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1177
1178 save_perl (aTHX_ current);
1179
1180 /* this will cause transfer_check to croak on block*/
1181 SvRV_set (coro_current, (SV *)coro->hv);
1182
1183 load_perl (aTHX_ coro);
1184
1185 coro_unwind_stacks (aTHX);
1186
1187 /* restore swapped sv's */
1188 SWAP_SVS (coro);
1189
1190 coro_destruct_stacks (aTHX);
1191
1192 // now save some sv's to be free'd later
1193 svf [0] = GvSV (PL_defgv);
1194 svf [1] = (SV *)GvAV (PL_defgv);
1195 svf [2] = GvSV (PL_errgv);
1196 svf [3] = (SV *)PL_defoutgv;
1197 svf [4] = PL_rs;
1198 svf [5] = GvSV (irsgv);
1199 svf [6] = (SV *)GvHV (PL_hintgv);
1200 svf [7] = PL_diehook;
1201 svf [8] = PL_warnhook;
1202 assert (9 == sizeof (svf) / sizeof (*svf));
1203
1204 SvRV_set (coro_current, old_current);
1205
1206 load_perl (aTHX_ current);
1207 }
1208
1209 {
1210 unsigned int i;
1211
1212 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1213 SvREFCNT_dec (svf [i]);
1214
913 SvREFCNT_dec (coro->saved_deffh); 1215 SvREFCNT_dec (coro->saved_deffh);
914 SvREFCNT_dec (coro->throw); 1216 SvREFCNT_dec (coro->rouse_cb);
915 1217 SvREFCNT_dec (coro->invoke_cb);
916 coro_destruct_stacks (aTHX); 1218 SvREFCNT_dec (coro->invoke_av);
1219 }
917} 1220}
918 1221
919INLINE void 1222ECB_INLINE void
920free_coro_mortal (pTHX) 1223free_coro_mortal (pTHX)
921{ 1224{
922 if (expect_true (coro_mortal)) 1225 if (ecb_expect_true (coro_mortal))
923 { 1226 {
924 SvREFCNT_dec (coro_mortal); 1227 SvREFCNT_dec ((SV *)coro_mortal);
925 coro_mortal = 0; 1228 coro_mortal = 0;
926 } 1229 }
927} 1230}
928 1231
929static int 1232static int
930runops_trace (pTHX) 1233runops_trace (pTHX)
931{ 1234{
932 COP *oldcop = 0; 1235 COP *oldcop = 0;
933 int oldcxix = -2; 1236 int oldcxix = -2;
934 struct coro *coro = SvSTATE (coro_current); /* trace cctx is tied to specific coro */
935 coro_cctx *cctx = coro->cctx;
936 1237
937 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1238 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
938 { 1239 {
939 PERL_ASYNC_CHECK (); 1240 PERL_ASYNC_CHECK ();
940 1241
941 if (cctx->flags & CC_TRACE_ALL) 1242 if (cctx_current->flags & CC_TRACE_ALL)
942 { 1243 {
943 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1244 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
944 { 1245 {
945 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1246 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
946 SV **bot, **top; 1247 SV **bot, **top;
947 AV *av = newAV (); /* return values */ 1248 AV *av = newAV (); /* return values */
948 SV **cb; 1249 SV **cb;
… …
985 1286
986 if (PL_curcop != &PL_compiling) 1287 if (PL_curcop != &PL_compiling)
987 { 1288 {
988 SV **cb; 1289 SV **cb;
989 1290
990 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1291 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
991 { 1292 {
992 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1293 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
993 1294
994 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1295 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
995 { 1296 {
996 runops_proc_t old_runops = PL_runops;
997 dSP; 1297 dSP;
998 GV *gv = CvGV (cx->blk_sub.cv); 1298 GV *gv = CvGV (cx->blk_sub.cv);
999 SV *fullname = sv_2mortal (newSV (0)); 1299 SV *fullname = sv_2mortal (newSV (0));
1000 1300
1001 if (isGV (gv)) 1301 if (isGV (gv))
… …
1006 SAVETMPS; 1306 SAVETMPS;
1007 EXTEND (SP, 3); 1307 EXTEND (SP, 3);
1008 PUSHMARK (SP); 1308 PUSHMARK (SP);
1009 PUSHs (&PL_sv_yes); 1309 PUSHs (&PL_sv_yes);
1010 PUSHs (fullname); 1310 PUSHs (fullname);
1011 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1311 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1012 PUTBACK; 1312 PUTBACK;
1013 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1313 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1014 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1314 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1015 SPAGAIN; 1315 SPAGAIN;
1016 FREETMPS; 1316 FREETMPS;
… …
1019 } 1319 }
1020 1320
1021 oldcxix = cxstack_ix; 1321 oldcxix = cxstack_ix;
1022 } 1322 }
1023 1323
1024 if (cctx->flags & CC_TRACE_LINE) 1324 if (cctx_current->flags & CC_TRACE_LINE)
1025 { 1325 {
1026 dSP; 1326 dSP;
1027 1327
1028 PL_runops = RUNOPS_DEFAULT; 1328 PL_runops = RUNOPS_DEFAULT;
1029 ENTER; 1329 ENTER;
… …
1048 1348
1049 TAINT_NOT; 1349 TAINT_NOT;
1050 return 0; 1350 return 0;
1051} 1351}
1052 1352
1353static struct CoroSLF cctx_ssl_frame;
1354
1053static void 1355static void
1054prepare_set_stacklevel (struct coro_transfer_args *ta, struct coro_cctx *cctx) 1356slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1055{ 1357{
1056 ta->prev = (struct coro *)cctx;
1057 ta->next = 0; 1358 ta->prev = 0;
1058} 1359}
1059 1360
1060/* inject a fake call to Coro::State::_cctx_init into the execution */ 1361static int
1061/* _cctx_init should be careful, as it could be called at almost any time */ 1362slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1062/* during execution of a perl program */
1063/* also initialises PL_top_env */
1064static void NOINLINE
1065cctx_prepare (pTHX_ coro_cctx *cctx)
1066{ 1363{
1067 dSP; 1364 *frame = cctx_ssl_frame;
1068 UNOP myop;
1069 1365
1366 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1367}
1368
1369/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1370static void ecb_noinline
1371cctx_prepare (pTHX)
1372{
1070 PL_top_env = &PL_start_env; 1373 PL_top_env = &PL_start_env;
1071 1374
1072 if (cctx->flags & CC_TRACE) 1375 if (cctx_current->flags & CC_TRACE)
1073 PL_runops = runops_trace; 1376 PL_runops = runops_trace;
1074 1377
1075 Zero (&myop, 1, UNOP); 1378 /* we already must be executing an SLF op, there is no other valid way
1076 myop.op_next = PL_op; 1379 * that can lead to creation of a new cctx */
1077 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1380 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1381 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1078 1382
1079 PUSHMARK (SP); 1383 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1080 EXTEND (SP, 2); 1384 cctx_ssl_frame = slf_frame;
1081 PUSHs (sv_2mortal (newSViv ((IV)cctx))); 1385
1082 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1386 slf_frame.prepare = slf_prepare_set_stacklevel;
1083 PUTBACK; 1387 slf_frame.check = slf_check_set_stacklevel;
1084 PL_op = (OP *)&myop;
1085 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1086 SPAGAIN;
1087} 1388}
1088 1389
1089/* the tail of transfer: execute stuff we can only do after a transfer */ 1390/* the tail of transfer: execute stuff we can only do after a transfer */
1090INLINE void 1391ECB_INLINE void
1091transfer_tail (pTHX) 1392transfer_tail (pTHX)
1092{ 1393{
1093 struct coro *next = (struct coro *)transfer_next;
1094 assert (!(transfer_next = 0)); /* just used for the side effect when asserts are enabled */
1095 assert (("FATAL: next coroutine was zero in transfer_tail (please report)", next));
1096
1097 free_coro_mortal (aTHX); 1394 free_coro_mortal (aTHX);
1098 UNLOCK;
1099
1100 if (expect_false (next->throw))
1101 {
1102 SV *exception = sv_2mortal (next->throw);
1103
1104 next->throw = 0;
1105 sv_setsv (ERRSV, exception);
1106 croak (0);
1107 }
1108} 1395}
1109 1396
1110/* 1397/*
1111 * this is a _very_ stripped down perl interpreter ;) 1398 * this is a _very_ stripped down perl interpreter ;)
1112 */ 1399 */
… …
1124 /* normally we would need to skip the entersub here */ 1411 /* normally we would need to skip the entersub here */
1125 /* not doing so will re-execute it, which is exactly what we want */ 1412 /* not doing so will re-execute it, which is exactly what we want */
1126 /* PL_nop = PL_nop->op_next */ 1413 /* PL_nop = PL_nop->op_next */
1127 1414
1128 /* inject a fake subroutine call to cctx_init */ 1415 /* inject a fake subroutine call to cctx_init */
1129 cctx_prepare (aTHX_ (coro_cctx *)arg); 1416 cctx_prepare (aTHX);
1130 1417
1131 /* cctx_run is the alternative tail of transfer() */ 1418 /* cctx_run is the alternative tail of transfer() */
1132 /* TODO: throwing an exception here might be deadly, VERIFY */
1133 transfer_tail (aTHX); 1419 transfer_tail (aTHX);
1134 1420
1135 /* somebody or something will hit me for both perl_run and PL_restartop */ 1421 /* somebody or something will hit me for both perl_run and PL_restartop */
1136 PL_restartop = PL_op; 1422 PL_restartop = PL_op;
1137 perl_run (PL_curinterp); 1423 perl_run (PL_curinterp);
1424 /*
1425 * Unfortunately, there is no way to get at the return values of the
1426 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1427 * runtime errors here, as this is just a random interpreter, not a thread.
1428 */
1138 1429
1139 /* 1430 /*
1140 * If perl-run returns we assume exit() was being called or the coro 1431 * If perl-run returns we assume exit() was being called or the coro
1141 * fell off the end, which seems to be the only valid (non-bug) 1432 * fell off the end, which seems to be the only valid (non-bug)
1142 * reason for perl_run to return. We try to exit by jumping to the 1433 * reason for perl_run to return. We try to exit by jumping to the
1143 * bootstrap-time "top" top_env, as we cannot restore the "main" 1434 * bootstrap-time "top" top_env, as we cannot restore the "main"
1144 * coroutine as Coro has no such concept 1435 * coroutine as Coro has no such concept.
1436 * This actually isn't valid with the pthread backend, but OSes requiring
1437 * that backend are too broken to do it in a standards-compliant way.
1145 */ 1438 */
1146 PL_top_env = main_top_env; 1439 PL_top_env = main_top_env;
1147 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1440 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1148 } 1441 }
1149} 1442}
… …
1226cctx_destroy (coro_cctx *cctx) 1519cctx_destroy (coro_cctx *cctx)
1227{ 1520{
1228 if (!cctx) 1521 if (!cctx)
1229 return; 1522 return;
1230 1523
1524 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1525
1231 --cctx_count; 1526 --cctx_count;
1232 coro_destroy (&cctx->cctx); 1527 coro_destroy (&cctx->cctx);
1233 1528
1234 /* coro_transfer creates new, empty cctx's */ 1529 /* coro_transfer creates new, empty cctx's */
1235 if (cctx->sptr) 1530 if (cctx->sptr)
… …
1253#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1548#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1254 1549
1255static coro_cctx * 1550static coro_cctx *
1256cctx_get (pTHX) 1551cctx_get (pTHX)
1257{ 1552{
1258 while (expect_true (cctx_first)) 1553 while (ecb_expect_true (cctx_first))
1259 { 1554 {
1260 coro_cctx *cctx = cctx_first; 1555 coro_cctx *cctx = cctx_first;
1261 cctx_first = cctx->next; 1556 cctx_first = cctx->next;
1262 --cctx_idle; 1557 --cctx_idle;
1263 1558
1264 if (expect_true (!CCTX_EXPIRED (cctx))) 1559 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1265 return cctx; 1560 return cctx;
1266 1561
1267 cctx_destroy (cctx); 1562 cctx_destroy (cctx);
1268 } 1563 }
1269 1564
… …
1274cctx_put (coro_cctx *cctx) 1569cctx_put (coro_cctx *cctx)
1275{ 1570{
1276 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1571 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1277 1572
1278 /* free another cctx if overlimit */ 1573 /* free another cctx if overlimit */
1279 if (expect_false (cctx_idle >= cctx_max_idle)) 1574 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1280 { 1575 {
1281 coro_cctx *first = cctx_first; 1576 coro_cctx *first = cctx_first;
1282 cctx_first = first->next; 1577 cctx_first = first->next;
1283 --cctx_idle; 1578 --cctx_idle;
1284 1579
… …
1293/** coroutine switching *****************************************************/ 1588/** coroutine switching *****************************************************/
1294 1589
1295static void 1590static void
1296transfer_check (pTHX_ struct coro *prev, struct coro *next) 1591transfer_check (pTHX_ struct coro *prev, struct coro *next)
1297{ 1592{
1593 /* TODO: throwing up here is considered harmful */
1594
1298 if (expect_true (prev != next)) 1595 if (ecb_expect_true (prev != next))
1299 { 1596 {
1300 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1597 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1301 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1598 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1302 1599
1303 if (expect_false (next->flags & CF_RUNNING)) 1600 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1304 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1305
1306 if (expect_false (next->flags & CF_DESTROYED))
1307 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1601 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1308 1602
1309#if !PERL_VERSION_ATLEAST (5,10,0) 1603#if !PERL_VERSION_ATLEAST (5,10,0)
1310 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1604 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1311 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1605 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1312#endif 1606#endif
1313 } 1607 }
1314} 1608}
1315 1609
1316/* always use the TRANSFER macro */ 1610/* always use the TRANSFER macro */
1317static void NOINLINE 1611static void ecb_noinline /* noinline so we have a fixed stackframe */
1318transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1612transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1319{ 1613{
1320 dSTACKLEVEL; 1614 dSTACKLEVEL;
1321 1615
1322 /* sometimes transfer is only called to set idle_sp */ 1616 /* sometimes transfer is only called to set idle_sp */
1323 if (expect_false (!next)) 1617 if (ecb_expect_false (!prev))
1324 { 1618 {
1325 ((coro_cctx *)prev)->idle_sp = (void *)stacklevel; 1619 cctx_current->idle_sp = STACKLEVEL;
1326 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1620 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1327 } 1621 }
1328 else if (expect_true (prev != next)) 1622 else if (ecb_expect_true (prev != next))
1329 { 1623 {
1330 coro_cctx *prev__cctx; 1624 coro_cctx *cctx_prev;
1331 1625
1332 if (expect_false (prev->flags & CF_NEW)) 1626 if (ecb_expect_false (prev->flags & CF_NEW))
1333 { 1627 {
1334 /* create a new empty/source context */ 1628 /* create a new empty/source context */
1335 prev->cctx = cctx_new_empty ();
1336 prev->flags &= ~CF_NEW; 1629 prev->flags &= ~CF_NEW;
1337 prev->flags |= CF_RUNNING; 1630 prev->flags |= CF_RUNNING;
1338 } 1631 }
1339 1632
1340 prev->flags &= ~CF_RUNNING; 1633 prev->flags &= ~CF_RUNNING;
1341 next->flags |= CF_RUNNING; 1634 next->flags |= CF_RUNNING;
1342 1635
1343 LOCK;
1344
1345 /* first get rid of the old state */ 1636 /* first get rid of the old state */
1346 save_perl (aTHX_ prev); 1637 save_perl (aTHX_ prev);
1347 1638
1348 if (expect_false (next->flags & CF_NEW)) 1639 if (ecb_expect_false (next->flags & CF_NEW))
1349 { 1640 {
1350 /* need to start coroutine */ 1641 /* need to start coroutine */
1351 next->flags &= ~CF_NEW; 1642 next->flags &= ~CF_NEW;
1352 /* setup coroutine call */ 1643 /* setup coroutine call */
1353 coro_setup (aTHX_ next); 1644 init_perl (aTHX_ next);
1354 } 1645 }
1355 else 1646 else
1356 load_perl (aTHX_ next); 1647 load_perl (aTHX_ next);
1357 1648
1358 prev__cctx = prev->cctx;
1359
1360 /* possibly untie and reuse the cctx */ 1649 /* possibly untie and reuse the cctx */
1361 if (expect_true ( 1650 if (ecb_expect_true (
1362 prev__cctx->idle_sp == (void *)stacklevel 1651 cctx_current->idle_sp == STACKLEVEL
1363 && !(prev__cctx->flags & CC_TRACE) 1652 && !(cctx_current->flags & CC_TRACE)
1364 && !force_cctx 1653 && !force_cctx
1365 )) 1654 ))
1366 { 1655 {
1367 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1656 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1368 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1657 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1369 1658
1370 prev->cctx = 0;
1371
1372 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1659 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1373 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1660 /* without this the next cctx_get might destroy the running cctx while still in use */
1374 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1661 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1375 if (!next->cctx) 1662 if (ecb_expect_true (!next->cctx))
1376 next->cctx = cctx_get (aTHX); 1663 next->cctx = cctx_get (aTHX);
1377 1664
1378 cctx_put (prev__cctx); 1665 cctx_put (cctx_current);
1379 } 1666 }
1667 else
1668 prev->cctx = cctx_current;
1380 1669
1381 ++next->usecount; 1670 ++next->usecount;
1382 1671
1383 if (expect_true (!next->cctx)) 1672 cctx_prev = cctx_current;
1384 next->cctx = cctx_get (aTHX); 1673 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1385 1674
1386 assert (("FATAL: transfer_next already nonzero in Coro (please report)", !transfer_next)); 1675 next->cctx = 0;
1387 transfer_next = next;
1388 1676
1389 if (expect_false (prev__cctx != next->cctx)) 1677 if (ecb_expect_false (cctx_prev != cctx_current))
1390 { 1678 {
1391 prev__cctx->top_env = PL_top_env; 1679 cctx_prev->top_env = PL_top_env;
1392 PL_top_env = next->cctx->top_env; 1680 PL_top_env = cctx_current->top_env;
1393 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1681 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1394 } 1682 }
1395 1683
1396 transfer_tail (aTHX); 1684 transfer_tail (aTHX);
1397 } 1685 }
1398} 1686}
… …
1400#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1688#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1401#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1689#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1402 1690
1403/** high level stuff ********************************************************/ 1691/** high level stuff ********************************************************/
1404 1692
1693/* this function is actually Coro, not Coro::State, but we call it from here */
1694/* because it is convenient - but it hasn't been declared yet for that reason */
1405static int 1695static void
1696coro_call_on_destroy (pTHX_ struct coro *coro);
1697
1698static void
1406coro_state_destroy (pTHX_ struct coro *coro) 1699coro_state_destroy (pTHX_ struct coro *coro)
1407{ 1700{
1408 if (coro->flags & CF_DESTROYED) 1701 if (coro->flags & CF_ZOMBIE)
1409 return 0; 1702 return;
1410 1703
1704 slf_destroy (aTHX_ coro);
1705
1411 coro->flags |= CF_DESTROYED; 1706 coro->flags |= CF_ZOMBIE;
1412 1707
1413 if (coro->flags & CF_READY) 1708 if (coro->flags & CF_READY)
1414 { 1709 {
1415 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1710 /* reduce nready, as destroying a ready coro effectively unreadies it */
1416 /* alternative: look through all ready queues and remove the coro */ 1711 /* alternative: look through all ready queues and remove the coro */
1417 LOCK;
1418 --coro_nready; 1712 --coro_nready;
1419 UNLOCK;
1420 } 1713 }
1421 else 1714 else
1422 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1715 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1423
1424 if (coro->mainstack && coro->mainstack != main_mainstack)
1425 {
1426 struct coro temp;
1427
1428 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1429
1430 save_perl (aTHX_ &temp);
1431 load_perl (aTHX_ coro);
1432
1433 coro_destruct (aTHX_ coro);
1434
1435 load_perl (aTHX_ &temp);
1436
1437 coro->slot = 0;
1438 }
1439
1440 cctx_destroy (coro->cctx);
1441 SvREFCNT_dec (coro->args);
1442 1716
1443 if (coro->next) coro->next->prev = coro->prev; 1717 if (coro->next) coro->next->prev = coro->prev;
1444 if (coro->prev) coro->prev->next = coro->next; 1718 if (coro->prev) coro->prev->next = coro->next;
1445 if (coro == coro_first) coro_first = coro->next; 1719 if (coro == coro_first) coro_first = coro->next;
1446 1720
1447 return 1; 1721 if (coro->mainstack
1722 && coro->mainstack != main_mainstack
1723 && coro->slot
1724 && !PL_dirty)
1725 destroy_perl (aTHX_ coro);
1726
1727 cctx_destroy (coro->cctx);
1728 SvREFCNT_dec (coro->startcv);
1729 SvREFCNT_dec (coro->args);
1730 SvREFCNT_dec (coro->swap_sv);
1731 SvREFCNT_dec (CORO_THROW);
1732
1733 coro_call_on_destroy (aTHX_ coro);
1734
1735 /* more destruction mayhem in coro_state_free */
1448} 1736}
1449 1737
1450static int 1738static int
1451coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1739coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1452{ 1740{
1453 struct coro *coro = (struct coro *)mg->mg_ptr; 1741 struct coro *coro = (struct coro *)mg->mg_ptr;
1454 mg->mg_ptr = 0; 1742 mg->mg_ptr = 0;
1455 1743
1456 coro->hv = 0;
1457
1458 if (--coro->refcnt < 0)
1459 {
1460 coro_state_destroy (aTHX_ coro); 1744 coro_state_destroy (aTHX_ coro);
1745 SvREFCNT_dec (coro->on_destroy);
1746 SvREFCNT_dec (coro->status);
1747
1461 Safefree (coro); 1748 Safefree (coro);
1462 }
1463 1749
1464 return 0; 1750 return 0;
1465} 1751}
1466 1752
1467static int 1753static int ecb_cold
1468coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1754coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1469{ 1755{
1470 struct coro *coro = (struct coro *)mg->mg_ptr; 1756 /* called when perl clones the current process the slow way (windows process emulation) */
1471 1757 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1472 ++coro->refcnt; 1758 mg->mg_ptr = 0;
1759 mg->mg_virtual = 0;
1473 1760
1474 return 0; 1761 return 0;
1475} 1762}
1476 1763
1477static MGVTBL coro_state_vtbl = { 1764static MGVTBL coro_state_vtbl = {
… …
1502 TRANSFER (ta, 1); 1789 TRANSFER (ta, 1);
1503} 1790}
1504 1791
1505/** Coro ********************************************************************/ 1792/** Coro ********************************************************************/
1506 1793
1507static void 1794ECB_INLINE void
1508coro_enq (pTHX_ SV *coro_sv) 1795coro_enq (pTHX_ struct coro *coro)
1509{ 1796{
1510 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1797 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1511}
1512 1798
1513static SV * 1799 SvREFCNT_inc_NN (coro->hv);
1800
1801 coro->next_ready = 0;
1802 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1803 ready [1] = coro;
1804}
1805
1806ECB_INLINE struct coro *
1514coro_deq (pTHX) 1807coro_deq (pTHX)
1515{ 1808{
1516 int prio; 1809 int prio;
1517 1810
1518 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1811 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1519 if (AvFILLp (coro_ready [prio]) >= 0) 1812 {
1520 return av_shift (coro_ready [prio]); 1813 struct coro **ready = coro_ready [prio];
1814
1815 if (ready [0])
1816 {
1817 struct coro *coro = ready [0];
1818 ready [0] = coro->next_ready;
1819 return coro;
1820 }
1821 }
1521 1822
1522 return 0; 1823 return 0;
1824}
1825
1826static void
1827invoke_sv_ready_hook_helper (void)
1828{
1829 dTHX;
1830 dSP;
1831
1832 ENTER;
1833 SAVETMPS;
1834
1835 PUSHMARK (SP);
1836 PUTBACK;
1837 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1838
1839 FREETMPS;
1840 LEAVE;
1523} 1841}
1524 1842
1525static int 1843static int
1526api_ready (pTHX_ SV *coro_sv) 1844api_ready (pTHX_ SV *coro_sv)
1527{ 1845{
1528 struct coro *coro;
1529 SV *sv_hook;
1530 void (*xs_hook)(void);
1531
1532 if (SvROK (coro_sv))
1533 coro_sv = SvRV (coro_sv);
1534
1535 coro = SvSTATE (coro_sv); 1846 struct coro *coro = SvSTATE (coro_sv);
1536 1847
1537 if (coro->flags & CF_READY) 1848 if (coro->flags & CF_READY)
1538 return 0; 1849 return 0;
1539 1850
1540 coro->flags |= CF_READY; 1851 coro->flags |= CF_READY;
1541 1852
1542 LOCK; 1853 coro_enq (aTHX_ coro);
1543 1854
1544 sv_hook = coro_nready ? 0 : coro_readyhook; 1855 if (!coro_nready++)
1545 xs_hook = coro_nready ? 0 : coroapi.readyhook; 1856 if (coroapi.readyhook)
1546 1857 coroapi.readyhook ();
1547 coro_enq (aTHX_ SvREFCNT_inc_NN (coro_sv));
1548 ++coro_nready;
1549
1550 UNLOCK;
1551
1552 if (sv_hook)
1553 {
1554 dSP;
1555
1556 ENTER;
1557 SAVETMPS;
1558
1559 PUSHMARK (SP);
1560 PUTBACK;
1561 call_sv (sv_hook, G_DISCARD);
1562 SPAGAIN;
1563
1564 FREETMPS;
1565 LEAVE;
1566 }
1567
1568 if (xs_hook)
1569 xs_hook ();
1570 1858
1571 return 1; 1859 return 1;
1572} 1860}
1573 1861
1574static int 1862static int
1575api_is_ready (pTHX_ SV *coro_sv) 1863api_is_ready (pTHX_ SV *coro_sv)
1576{ 1864{
1577 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1865 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1578} 1866}
1579 1867
1868/* expects to own a reference to next->hv */
1580INLINE void 1869ECB_INLINE void
1581prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1870prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1582{ 1871{
1583 SV *prev_sv, *next_sv;
1584
1585 for (;;)
1586 {
1587 LOCK;
1588 next_sv = coro_deq (aTHX);
1589
1590 /* nothing to schedule: call the idle handler */
1591 if (expect_false (!next_sv))
1592 {
1593 dSP;
1594 UNLOCK;
1595
1596 ENTER;
1597 SAVETMPS;
1598
1599 PUSHMARK (SP);
1600 PUTBACK;
1601 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1602 SPAGAIN;
1603
1604 FREETMPS;
1605 LEAVE;
1606 continue;
1607 }
1608
1609 ta->next = SvSTATE (next_sv);
1610
1611 /* cannot transfer to destroyed coros, skip and look for next */
1612 if (expect_false (ta->next->flags & CF_DESTROYED))
1613 {
1614 UNLOCK;
1615 SvREFCNT_dec (next_sv);
1616 /* coro_nready has already been taken care of by destroy */
1617 continue;
1618 }
1619
1620 --coro_nready;
1621 UNLOCK;
1622 break;
1623 }
1624
1625 /* free this only after the transfer */
1626 prev_sv = SvRV (coro_current); 1872 SV *prev_sv = SvRV (coro_current);
1873
1627 ta->prev = SvSTATE (prev_sv); 1874 ta->prev = SvSTATE_hv (prev_sv);
1875 ta->next = next;
1876
1628 TRANSFER_CHECK (*ta); 1877 TRANSFER_CHECK (*ta);
1629 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1878
1630 ta->next->flags &= ~CF_READY;
1631 SvRV_set (coro_current, next_sv); 1879 SvRV_set (coro_current, (SV *)next->hv);
1632 1880
1633 LOCK;
1634 free_coro_mortal (aTHX); 1881 free_coro_mortal (aTHX);
1635 coro_mortal = prev_sv; 1882 coro_mortal = prev_sv;
1636 UNLOCK;
1637} 1883}
1638 1884
1885static void
1886prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1887{
1888 for (;;)
1889 {
1890 struct coro *next = coro_deq (aTHX);
1891
1892 if (ecb_expect_true (next))
1893 {
1894 /* cannot transfer to destroyed coros, skip and look for next */
1895 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1896 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1897 else
1898 {
1899 next->flags &= ~CF_READY;
1900 --coro_nready;
1901
1902 prepare_schedule_to (aTHX_ ta, next);
1903 break;
1904 }
1905 }
1906 else
1907 {
1908 /* nothing to schedule: call the idle handler */
1909 if (SvROK (sv_idle)
1910 && SvOBJECT (SvRV (sv_idle)))
1911 {
1912 if (SvRV (sv_idle) == SvRV (coro_current))
1913 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1914
1915 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1916 api_ready (aTHX_ SvRV (sv_idle));
1917 --coro_nready;
1918 }
1919 else
1920 {
1921 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1922 dSP;
1923
1924 ENTER;
1925 SAVETMPS;
1926
1927 PUSHMARK (SP);
1928 PUTBACK;
1929 call_sv (sv_idle, G_VOID | G_DISCARD);
1930
1931 FREETMPS;
1932 LEAVE;
1933 }
1934 }
1935 }
1936}
1937
1639INLINE void 1938ECB_INLINE void
1640prepare_cede (pTHX_ struct coro_transfer_args *ta) 1939prepare_cede (pTHX_ struct coro_transfer_args *ta)
1641{ 1940{
1642 api_ready (aTHX_ coro_current); 1941 api_ready (aTHX_ coro_current);
1643 prepare_schedule (aTHX_ ta); 1942 prepare_schedule (aTHX_ ta);
1644} 1943}
1645 1944
1646INLINE void 1945ECB_INLINE void
1647prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1946prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1648{ 1947{
1649 SV *prev = SvRV (coro_current); 1948 SV *prev = SvRV (coro_current);
1650 1949
1651 if (coro_nready) 1950 if (coro_nready)
… …
1664 1963
1665 prepare_schedule (aTHX_ &ta); 1964 prepare_schedule (aTHX_ &ta);
1666 TRANSFER (ta, 1); 1965 TRANSFER (ta, 1);
1667} 1966}
1668 1967
1968static void
1969api_schedule_to (pTHX_ SV *coro_sv)
1970{
1971 struct coro_transfer_args ta;
1972 struct coro *next = SvSTATE (coro_sv);
1973
1974 SvREFCNT_inc_NN (coro_sv);
1975 prepare_schedule_to (aTHX_ &ta, next);
1976}
1977
1669static int 1978static int
1670api_cede (pTHX) 1979api_cede (pTHX)
1671{ 1980{
1672 struct coro_transfer_args ta; 1981 struct coro_transfer_args ta;
1673 1982
1674 prepare_cede (aTHX_ &ta); 1983 prepare_cede (aTHX_ &ta);
1675 1984
1676 if (expect_true (ta.prev != ta.next)) 1985 if (ecb_expect_true (ta.prev != ta.next))
1677 { 1986 {
1678 TRANSFER (ta, 1); 1987 TRANSFER (ta, 1);
1679 return 1; 1988 return 1;
1680 } 1989 }
1681 else 1990 else
… …
1700static void 2009static void
1701api_trace (pTHX_ SV *coro_sv, int flags) 2010api_trace (pTHX_ SV *coro_sv, int flags)
1702{ 2011{
1703 struct coro *coro = SvSTATE (coro_sv); 2012 struct coro *coro = SvSTATE (coro_sv);
1704 2013
2014 if (coro->flags & CF_RUNNING)
2015 croak ("cannot enable tracing on a running coroutine, caught");
2016
1705 if (flags & CC_TRACE) 2017 if (flags & CC_TRACE)
1706 { 2018 {
1707 if (!coro->cctx) 2019 if (!coro->cctx)
1708 coro->cctx = cctx_new_run (); 2020 coro->cctx = cctx_new_run ();
1709 else if (!(coro->cctx->flags & CC_TRACE)) 2021 else if (!(coro->cctx->flags & CC_TRACE))
1710 croak ("cannot enable tracing on coroutine with custom stack,"); 2022 croak ("cannot enable tracing on coroutine with custom stack, caught");
1711 2023
1712 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 2024 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1713 } 2025 }
1714 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 2026 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1715 { 2027 {
… …
1720 else 2032 else
1721 coro->slot->runops = RUNOPS_DEFAULT; 2033 coro->slot->runops = RUNOPS_DEFAULT;
1722 } 2034 }
1723} 2035}
1724 2036
2037static void
2038coro_push_av (pTHX_ AV *av, I32 gimme_v)
2039{
2040 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2041 {
2042 dSP;
2043
2044 if (gimme_v == G_SCALAR)
2045 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2046 else
2047 {
2048 int i;
2049 EXTEND (SP, AvFILLp (av) + 1);
2050
2051 for (i = 0; i <= AvFILLp (av); ++i)
2052 PUSHs (AvARRAY (av)[i]);
2053 }
2054
2055 PUTBACK;
2056 }
2057}
2058
2059static void
2060coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2061{
2062 if (!coro->on_destroy)
2063 coro->on_destroy = newAV ();
2064
2065 av_push (coro->on_destroy, cb);
2066}
2067
2068static void
2069slf_destroy_join (pTHX_ struct CoroSLF *frame)
2070{
2071 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2072}
2073
2074static int
2075slf_check_join (pTHX_ struct CoroSLF *frame)
2076{
2077 struct coro *coro = (struct coro *)frame->data;
2078
2079 if (!coro->status)
2080 return 1;
2081
2082 frame->destroy = 0;
2083
2084 coro_push_av (aTHX_ coro->status, GIMME_V);
2085
2086 SvREFCNT_dec ((SV *)coro->hv);
2087
2088 return 0;
2089}
2090
2091static void
2092slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2093{
2094 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2095
2096 if (items > 1)
2097 croak ("join called with too many arguments");
2098
2099 if (coro->status)
2100 frame->prepare = prepare_nop;
2101 else
2102 {
2103 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2104 frame->prepare = prepare_schedule;
2105 }
2106
2107 frame->check = slf_check_join;
2108 frame->destroy = slf_destroy_join;
2109 frame->data = (void *)coro;
2110 SvREFCNT_inc (coro->hv);
2111}
2112
2113static void
2114coro_call_on_destroy (pTHX_ struct coro *coro)
2115{
2116 AV *od = coro->on_destroy;
2117
2118 if (!od)
2119 return;
2120
2121 while (AvFILLp (od) >= 0)
2122 {
2123 SV *cb = sv_2mortal (av_pop (od));
2124
2125 /* coro hv's (and only hv's at the moment) are supported as well */
2126 if (SvSTATEhv_p (aTHX_ cb))
2127 api_ready (aTHX_ cb);
2128 else
2129 {
2130 dSP; /* don't disturb outer sp */
2131 PUSHMARK (SP);
2132
2133 if (coro->status)
2134 {
2135 PUTBACK;
2136 coro_push_av (aTHX_ coro->status, G_ARRAY);
2137 SPAGAIN;
2138 }
2139
2140 PUTBACK;
2141 call_sv (cb, G_VOID | G_DISCARD);
2142 }
2143 }
2144}
2145
2146static void
2147coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2148{
2149 AV *av;
2150
2151 if (coro->status)
2152 {
2153 av = coro->status;
2154 av_clear (av);
2155 }
2156 else
2157 av = coro->status = newAV ();
2158
2159 /* items are actually not so common, so optimise for this case */
2160 if (items)
2161 {
2162 int i;
2163
2164 av_extend (av, items - 1);
2165
2166 for (i = 0; i < items; ++i)
2167 av_push (av, SvREFCNT_inc_NN (arg [i]));
2168 }
2169}
2170
2171static void
2172slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2173{
2174 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2175 api_ready (aTHX_ sv_manager);
2176
2177 frame->prepare = prepare_schedule;
2178 frame->check = slf_check_repeat;
2179
2180 /* as a minor optimisation, we could unwind all stacks here */
2181 /* but that puts extra pressure on pp_slf, and is not worth much */
2182 /*coro_unwind_stacks (aTHX);*/
2183}
2184
2185static void
2186slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2187{
2188 HV *coro_hv = (HV *)SvRV (coro_current);
2189
2190 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2191 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2192}
2193
2194static void
2195slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2196{
2197 HV *coro_hv;
2198 struct coro *coro;
2199
2200 if (items <= 0)
2201 croak ("Coro::cancel called without coro object,");
2202
2203 coro = SvSTATE (arg [0]);
2204 coro_hv = coro->hv;
2205
2206 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2207
2208 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2209 {
2210 /* coro currently busy cancelling something, so just notify it */
2211 coro->slf_frame.data = (void *)coro;
2212
2213 frame->prepare = prepare_nop;
2214 frame->check = slf_check_nop;
2215 }
2216 else if (coro_hv == (HV *)SvRV (coro_current))
2217 {
2218 /* cancelling the current coro is allowed, and equals terminate */
2219 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2220 }
2221 else
2222 {
2223 struct coro *self = SvSTATE_current;
2224
2225 /* otherwise we cancel directly, purely for speed reasons
2226 * unfortunately, this requires some magic trickery, as
2227 * somebody else could cancel us, so we have to fight the cancellation.
2228 * this is ugly, and hopefully fully worth the extra speed.
2229 * besides, I can't get the slow-but-safe version working...
2230 */
2231 slf_frame.data = 0;
2232 self->flags |= CF_NOCANCEL;
2233 coro_state_destroy (aTHX_ coro);
2234 self->flags &= ~CF_NOCANCEL;
2235
2236 if (slf_frame.data)
2237 {
2238 /* while we were busy we have been cancelled, so terminate */
2239 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2240 }
2241 else
2242 {
2243 frame->prepare = prepare_nop;
2244 frame->check = slf_check_nop;
2245 }
2246 }
2247}
2248
2249static int
2250slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2251{
2252 frame->prepare = 0;
2253 coro_unwind_stacks (aTHX);
2254
2255 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2256
2257 return 1;
2258}
2259
2260static int
2261safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2262{
2263 if (coro->cctx)
2264 croak ("coro inside C callback, unable to cancel at this time, caught");
2265
2266 if (coro->flags & CF_NEW)
2267 {
2268 coro_set_status (aTHX_ coro, arg, items);
2269 coro_state_destroy (aTHX_ coro);
2270 }
2271 else
2272 {
2273 if (!coro->slf_frame.prepare)
2274 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2275
2276 slf_destroy (aTHX_ coro);
2277
2278 coro_set_status (aTHX_ coro, arg, items);
2279 coro->slf_frame.prepare = prepare_nop;
2280 coro->slf_frame.check = slf_check_safe_cancel;
2281
2282 api_ready (aTHX_ (SV *)coro->hv);
2283 }
2284
2285 return 1;
2286}
2287
2288/*****************************************************************************/
2289/* async pool handler */
2290
2291static int
2292slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
2293{
2294 HV *hv = (HV *)SvRV (coro_current);
2295 struct coro *coro = (struct coro *)frame->data;
2296
2297 if (!coro->invoke_cb)
2298 return 1; /* loop till we have invoke */
2299 else
2300 {
2301 hv_store (hv, "desc", sizeof ("desc") - 1,
2302 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2303
2304 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2305
2306 {
2307 dSP;
2308 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
2309 PUTBACK;
2310 }
2311
2312 SvREFCNT_dec (GvAV (PL_defgv));
2313 GvAV (PL_defgv) = coro->invoke_av;
2314 coro->invoke_av = 0;
2315
2316 return 0;
2317 }
2318}
2319
2320static void
2321slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2322{
2323 HV *hv = (HV *)SvRV (coro_current);
2324 struct coro *coro = SvSTATE_hv ((SV *)hv);
2325
2326 if (ecb_expect_true (coro->saved_deffh))
2327 {
2328 /* subsequent iteration */
2329 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2330 coro->saved_deffh = 0;
2331
2332 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2333 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2334 {
2335 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2336 return;
2337 }
2338 else
2339 {
2340 av_clear (GvAV (PL_defgv));
2341 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2342
2343 coro->prio = 0;
2344
2345 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2346 api_trace (aTHX_ coro_current, 0);
2347
2348 frame->prepare = prepare_schedule;
2349 av_push (av_async_pool, SvREFCNT_inc (hv));
2350 }
2351 }
2352 else
2353 {
2354 /* first iteration, simply fall through */
2355 frame->prepare = prepare_nop;
2356 }
2357
2358 frame->check = slf_check_pool_handler;
2359 frame->data = (void *)coro;
2360}
2361
2362/*****************************************************************************/
2363/* rouse callback */
2364
2365#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
2366
2367static void
2368coro_rouse_callback (pTHX_ CV *cv)
2369{
2370 dXSARGS;
2371 SV *data = (SV *)S_GENSUB_ARG;
2372
2373 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2374 {
2375 /* first call, set args */
2376 SV *coro = SvRV (data);
2377 AV *av = newAV ();
2378
2379 SvRV_set (data, (SV *)av);
2380
2381 /* better take a full copy of the arguments */
2382 while (items--)
2383 av_store (av, items, newSVsv (ST (items)));
2384
2385 api_ready (aTHX_ coro);
2386 SvREFCNT_dec (coro);
2387 }
2388
2389 XSRETURN_EMPTY;
2390}
2391
2392static int
2393slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2394{
2395 SV *data = (SV *)frame->data;
2396
2397 if (CORO_THROW)
2398 return 0;
2399
2400 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2401 return 1;
2402
2403 /* now push all results on the stack */
2404 {
2405 dSP;
2406 AV *av = (AV *)SvRV (data);
2407 int i;
2408
2409 EXTEND (SP, AvFILLp (av) + 1);
2410 for (i = 0; i <= AvFILLp (av); ++i)
2411 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2412
2413 /* we have stolen the elements, so set length to zero and free */
2414 AvFILLp (av) = -1;
2415 av_undef (av);
2416
2417 PUTBACK;
2418 }
2419
2420 return 0;
2421}
2422
2423static void
2424slf_init_rouse_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2425{
2426 SV *cb;
2427
2428 if (items)
2429 cb = arg [0];
2430 else
2431 {
2432 struct coro *coro = SvSTATE_current;
2433
2434 if (!coro->rouse_cb)
2435 croak ("Coro::rouse_wait called without rouse callback, and no default rouse callback found either,");
2436
2437 cb = sv_2mortal (coro->rouse_cb);
2438 coro->rouse_cb = 0;
2439 }
2440
2441 if (!SvROK (cb)
2442 || SvTYPE (SvRV (cb)) != SVt_PVCV
2443 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2444 croak ("Coro::rouse_wait called with illegal callback argument,");
2445
2446 {
2447 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2448 SV *data = (SV *)S_GENSUB_ARG;
2449
2450 frame->data = (void *)data;
2451 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2452 frame->check = slf_check_rouse_wait;
2453 }
2454}
2455
2456static SV *
2457coro_new_rouse_cb (pTHX)
2458{
2459 HV *hv = (HV *)SvRV (coro_current);
2460 struct coro *coro = SvSTATE_hv (hv);
2461 SV *data = newRV_inc ((SV *)hv);
2462 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2463
2464 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2465 SvREFCNT_dec (data); /* magicext increases the refcount */
2466
2467 SvREFCNT_dec (coro->rouse_cb);
2468 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2469
2470 return cb;
2471}
2472
2473/*****************************************************************************/
2474/* schedule-like-function opcode (SLF) */
2475
2476static UNOP slf_restore; /* restore stack as entersub did, for first-re-run */
2477static const CV *slf_cv;
2478static SV **slf_argv;
2479static int slf_argc, slf_arga; /* count, allocated */
2480static I32 slf_ax; /* top of stack, for restore */
2481
2482/* this restores the stack in the case we patched the entersub, to */
2483/* recreate the stack frame as perl will on following calls */
2484/* since entersub cleared the stack */
2485static OP *
2486pp_restore (pTHX)
2487{
2488 int i;
2489 SV **SP = PL_stack_base + slf_ax;
2490
2491 PUSHMARK (SP);
2492
2493 EXTEND (SP, slf_argc + 1);
2494
2495 for (i = 0; i < slf_argc; ++i)
2496 PUSHs (sv_2mortal (slf_argv [i]));
2497
2498 PUSHs ((SV *)CvGV (slf_cv));
2499
2500 RETURNOP (slf_restore.op_first);
2501}
2502
2503static void
2504slf_prepare_transfer (pTHX_ struct coro_transfer_args *ta)
2505{
2506 SV **arg = (SV **)slf_frame.data;
2507
2508 prepare_transfer (aTHX_ ta, arg [0], arg [1]);
2509}
2510
2511static void
2512slf_init_transfer (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2513{
2514 if (items != 2)
2515 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d,", items);
2516
2517 frame->prepare = slf_prepare_transfer;
2518 frame->check = slf_check_nop;
2519 frame->data = (void *)arg; /* let's hope it will stay valid */
2520}
2521
2522static void
2523slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2524{
2525 frame->prepare = prepare_schedule;
2526 frame->check = slf_check_nop;
2527}
2528
2529static void
2530slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2531{
2532 struct coro *next = (struct coro *)slf_frame.data;
2533
2534 SvREFCNT_inc_NN (next->hv);
2535 prepare_schedule_to (aTHX_ ta, next);
2536}
2537
2538static void
2539slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2540{
2541 if (!items)
2542 croak ("Coro::schedule_to expects a coroutine argument, caught");
2543
2544 frame->data = (void *)SvSTATE (arg [0]);
2545 frame->prepare = slf_prepare_schedule_to;
2546 frame->check = slf_check_nop;
2547}
2548
2549static void
2550slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2551{
2552 api_ready (aTHX_ SvRV (coro_current));
2553
2554 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
2555}
2556
2557static void
2558slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2559{
2560 frame->prepare = prepare_cede;
2561 frame->check = slf_check_nop;
2562}
2563
2564static void
2565slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2566{
2567 frame->prepare = prepare_cede_notself;
2568 frame->check = slf_check_nop;
2569}
2570
2571/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2572static void
2573slf_destroy (pTHX_ struct coro *coro)
2574{
2575 /* this callback is reserved for slf functions needing to do cleanup */
2576 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2577 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2578
2579 /*
2580 * The on_destroy above most likely is from an SLF call.
2581 * Since by definition the SLF call will not finish when we destroy
2582 * the coro, we will have to force-finish it here, otherwise
2583 * cleanup functions cannot call SLF functions.
2584 */
2585 coro->slf_frame.prepare = 0;
2586}
2587
2588/*
2589 * these not obviously related functions are all rolled into one
2590 * function to increase chances that they all will call transfer with the same
2591 * stack offset
2592 * SLF stands for "schedule-like-function".
2593 */
2594static OP *
2595pp_slf (pTHX)
2596{
2597 I32 checkmark; /* mark SP to see how many elements check has pushed */
2598
2599 /* set up the slf frame, unless it has already been set-up */
2600 /* the latter happens when a new coro has been started */
2601 /* or when a new cctx was attached to an existing coroutine */
2602 if (ecb_expect_true (!slf_frame.prepare))
2603 {
2604 /* first iteration */
2605 dSP;
2606 SV **arg = PL_stack_base + TOPMARK + 1;
2607 int items = SP - arg; /* args without function object */
2608 SV *gv = *sp;
2609
2610 /* do a quick consistency check on the "function" object, and if it isn't */
2611 /* for us, divert to the real entersub */
2612 if (SvTYPE (gv) != SVt_PVGV
2613 || !GvCV (gv)
2614 || !(CvFLAGS (GvCV (gv)) & CVf_SLF))
2615 return PL_ppaddr[OP_ENTERSUB](aTHX);
2616
2617 if (!(PL_op->op_flags & OPf_STACKED))
2618 {
2619 /* ampersand-form of call, use @_ instead of stack */
2620 AV *av = GvAV (PL_defgv);
2621 arg = AvARRAY (av);
2622 items = AvFILLp (av) + 1;
2623 }
2624
2625 /* now call the init function, which needs to set up slf_frame */
2626 ((coro_slf_cb)CvXSUBANY (GvCV (gv)).any_ptr)
2627 (aTHX_ &slf_frame, GvCV (gv), arg, items);
2628
2629 /* pop args */
2630 SP = PL_stack_base + POPMARK;
2631
2632 PUTBACK;
2633 }
2634
2635 /* now that we have a slf_frame, interpret it! */
2636 /* we use a callback system not to make the code needlessly */
2637 /* complicated, but so we can run multiple perl coros from one cctx */
2638
2639 do
2640 {
2641 struct coro_transfer_args ta;
2642
2643 slf_frame.prepare (aTHX_ &ta);
2644 TRANSFER (ta, 0);
2645
2646 checkmark = PL_stack_sp - PL_stack_base;
2647 }
2648 while (slf_frame.check (aTHX_ &slf_frame));
2649
2650 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2651
2652 /* exception handling */
2653 if (ecb_expect_false (CORO_THROW))
2654 {
2655 SV *exception = sv_2mortal (CORO_THROW);
2656
2657 CORO_THROW = 0;
2658 sv_setsv (ERRSV, exception);
2659 croak (0);
2660 }
2661
2662 /* return value handling - mostly like entersub */
2663 /* make sure we put something on the stack in scalar context */
2664 if (GIMME_V == G_SCALAR
2665 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2666 {
2667 dSP;
2668 SV **bot = PL_stack_base + checkmark;
2669
2670 if (sp == bot) /* too few, push undef */
2671 bot [1] = &PL_sv_undef;
2672 else /* too many, take last one */
2673 bot [1] = *sp;
2674
2675 SP = bot + 1;
2676
2677 PUTBACK;
2678 }
2679
2680 return NORMAL;
2681}
2682
2683static void
2684api_execute_slf (pTHX_ CV *cv, coro_slf_cb init_cb, I32 ax)
2685{
2686 int i;
2687 SV **arg = PL_stack_base + ax;
2688 int items = PL_stack_sp - arg + 1;
2689
2690 assert (("FATAL: SLF call with illegal CV value", !CvANON (cv)));
2691
2692 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB]
2693 && PL_op->op_ppaddr != pp_slf)
2694 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or any other means, caught");
2695
2696 CvFLAGS (cv) |= CVf_SLF;
2697 CvXSUBANY (cv).any_ptr = (void *)init_cb;
2698 slf_cv = cv;
2699
2700 /* we patch the op, and then re-run the whole call */
2701 /* we have to put the same argument on the stack for this to work */
2702 /* and this will be done by pp_restore */
2703 slf_restore.op_next = (OP *)&slf_restore;
2704 slf_restore.op_type = OP_CUSTOM;
2705 slf_restore.op_ppaddr = pp_restore;
2706 slf_restore.op_first = PL_op;
2707
2708 slf_ax = ax - 1; /* undo the ax++ inside dAXMARK */
2709
2710 if (PL_op->op_flags & OPf_STACKED)
2711 {
2712 if (items > slf_arga)
2713 {
2714 slf_arga = items;
2715 Safefree (slf_argv);
2716 New (0, slf_argv, slf_arga, SV *);
2717 }
2718
2719 slf_argc = items;
2720
2721 for (i = 0; i < items; ++i)
2722 slf_argv [i] = SvREFCNT_inc (arg [i]);
2723 }
2724 else
2725 slf_argc = 0;
2726
2727 PL_op->op_ppaddr = pp_slf;
2728 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2729
2730 PL_op = (OP *)&slf_restore;
2731}
2732
2733/*****************************************************************************/
2734/* dynamic wind */
2735
2736static void
2737on_enterleave_call (pTHX_ SV *cb)
2738{
2739 dSP;
2740
2741 PUSHSTACK;
2742
2743 PUSHMARK (SP);
2744 PUTBACK;
2745 call_sv (cb, G_VOID | G_DISCARD);
2746 SPAGAIN;
2747
2748 POPSTACK;
2749}
2750
2751static SV *
2752coro_avp_pop_and_free (pTHX_ AV **avp)
2753{
2754 AV *av = *avp;
2755 SV *res = av_pop (av);
2756
2757 if (AvFILLp (av) < 0)
2758 {
2759 *avp = 0;
2760 SvREFCNT_dec (av);
2761 }
2762
2763 return res;
2764}
2765
2766static void
2767coro_pop_on_enter (pTHX_ void *coro)
2768{
2769 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2770 SvREFCNT_dec (cb);
2771}
2772
2773static void
2774coro_pop_on_leave (pTHX_ void *coro)
2775{
2776 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2777 on_enterleave_call (aTHX_ sv_2mortal (cb));
2778}
2779
1725/*****************************************************************************/ 2780/*****************************************************************************/
1726/* PerlIO::cede */ 2781/* PerlIO::cede */
1727 2782
1728typedef struct 2783typedef struct
1729{ 2784{
1730 PerlIOBuf base; 2785 PerlIOBuf base;
1731 NV next, every; 2786 NV next, every;
1732} PerlIOCede; 2787} PerlIOCede;
1733 2788
1734static IV 2789static IV ecb_cold
1735PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2790PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
1736{ 2791{
1737 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2792 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1738 2793
1739 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2794 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
1740 self->next = nvtime () + self->every; 2795 self->next = nvtime () + self->every;
1741 2796
1742 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2797 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
1743} 2798}
1744 2799
1745static SV * 2800static SV * ecb_cold
1746PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2801PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
1747{ 2802{
1748 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2803 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1749 2804
1750 return newSVnv (self->every); 2805 return newSVnv (self->every);
… …
1796 PerlIOBuf_get_cnt, 2851 PerlIOBuf_get_cnt,
1797 PerlIOBuf_set_ptrcnt, 2852 PerlIOBuf_set_ptrcnt,
1798}; 2853};
1799 2854
1800/*****************************************************************************/ 2855/*****************************************************************************/
2856/* Coro::Semaphore & Coro::Signal */
1801 2857
1802static const CV *slf_cv; /* for quick consistency check */
1803
1804static UNOP slf_restore; /* restore stack as entersub did, for first-re-run */
1805static SV *slf_arg0;
1806static SV *slf_arg1;
1807static SV *slf_arg2;
1808
1809/* this restores the stack in the case we patched the entersub, to */
1810/* recreate the stack frame as perl will on following calls */
1811/* since entersub cleared the stack */
1812static OP * 2858static SV *
1813pp_restore (pTHX) 2859coro_waitarray_new (pTHX_ int count)
1814{ 2860{
1815 dSP; 2861 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2862 AV *av = newAV ();
2863 SV **ary;
1816 2864
1817 PUSHMARK (SP); 2865 /* unfortunately, building manually saves memory */
2866 Newx (ary, 2, SV *);
2867 AvALLOC (av) = ary;
2868#if PERL_VERSION_ATLEAST (5,10,0)
2869 AvARRAY (av) = ary;
2870#else
2871 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2872 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2873 SvPVX ((SV *)av) = (char *)ary;
2874#endif
2875 AvMAX (av) = 1;
2876 AvFILLp (av) = 0;
2877 ary [0] = newSViv (count);
1818 2878
1819 EXTEND (SP, 3); 2879 return newRV_noinc ((SV *)av);
1820 if (slf_arg0) PUSHs (sv_2mortal (slf_arg0));
1821 if (slf_arg1) PUSHs (sv_2mortal (slf_arg1));
1822 if (slf_arg2) PUSHs (sv_2mortal (slf_arg2));
1823 PUSHs ((SV *)CvGV (slf_cv));
1824
1825 RETURNOP (slf_restore.op_first);
1826} 2880}
1827 2881
1828static void 2882/* semaphore */
1829slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1830{
1831 prepare_set_stacklevel (ta, (struct coro_cctx *)slf_frame.data);
1832}
1833 2883
1834static void 2884static void
1835slf_init_set_stacklevel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2885coro_semaphore_adjust (pTHX_ AV *av, IV adjust)
1836{ 2886{
1837 assert (("FATAL: set_stacklevel needs the coro cctx as sole argument", items == 1)); 2887 SV *count_sv = AvARRAY (av)[0];
2888 IV count = SvIVX (count_sv);
1838 2889
1839 frame->prepare = slf_prepare_set_stacklevel; 2890 count += adjust;
1840 frame->check = slf_check_nop; 2891 SvIVX (count_sv) = count;
1841 frame->data = (void *)SvIV (arg [0]);
1842}
1843 2892
1844static void 2893 /* now wake up as many waiters as are expected to lock */
1845slf_prepare_transfer (pTHX_ struct coro_transfer_args *ta) 2894 while (count > 0 && AvFILLp (av) > 0)
1846{
1847 SV **arg = (SV **)slf_frame.data;
1848
1849 prepare_transfer (aTHX_ ta, arg [0], arg [1]);
1850}
1851
1852static void
1853slf_init_transfer (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1854{
1855 if (items != 2)
1856 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d,", items);
1857
1858 frame->prepare = slf_prepare_transfer;
1859 frame->check = slf_check_nop;
1860 frame->data = (void *)arg; /* let's hope it will stay valid */
1861}
1862
1863static void
1864slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1865{
1866 frame->prepare = prepare_schedule;
1867 frame->check = slf_check_nop;
1868}
1869
1870static void
1871slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1872{
1873 frame->prepare = prepare_cede;
1874 frame->check = slf_check_nop;
1875}
1876
1877static void
1878slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1879{
1880 frame->prepare = prepare_cede_notself;
1881 frame->check = slf_check_nop;
1882}
1883
1884/* we hijack an hopefully unused CV flag for our purposes */
1885#define CVf_SLF 0x4000
1886
1887/*
1888 * these not obviously related functions are all rolled into one
1889 * function to increase chances that they all will call transfer with the same
1890 * stack offset
1891 * SLF stands for "schedule-like-function".
1892 */
1893static OP *
1894pp_slf (pTHX)
1895{
1896 I32 checkmark; /* mark SP to see how many elements check has pushed */
1897
1898 /* set up the slf frame, unless it has already been set-up */
1899 /* the latter happens when a new coro has been started */
1900 /* or when a new cctx was attached to an existing coroutine */
1901 if (expect_true (!slf_frame.prepare))
1902 { 2895 {
1903 /* first iteration */ 2896 SV *cb;
1904 dSP;
1905 SV **arg = PL_stack_base + TOPMARK + 1;
1906 int items = SP - arg; /* args without function object */
1907 SV *gv = *sp;
1908 2897
1909 /* do a quick consistency check on the "function" object, and if it isn't */ 2898 /* swap first two elements so we can shift a waiter */
1910 /* for us, divert to the real entersub */ 2899 AvARRAY (av)[0] = AvARRAY (av)[1];
1911 if (SvTYPE (gv) != SVt_PVGV || !(CvFLAGS (GvCV (gv)) & CVf_SLF)) 2900 AvARRAY (av)[1] = count_sv;
1912 return PL_ppaddr[OP_ENTERSUB](aTHX); 2901 cb = av_shift (av);
1913 2902
1914 /* pop args */ 2903 if (SvOBJECT (cb))
1915 SP = PL_stack_base + POPMARK;
1916
1917 if (!(PL_op->op_flags & OPf_STACKED))
1918 { 2904 {
1919 /* ampersand-form of call, use @_ instead of stack */ 2905 api_ready (aTHX_ cb);
1920 AV *av = GvAV (PL_defgv); 2906 --count;
1921 arg = AvARRAY (av);
1922 items = AvFILLp (av) + 1;
1923 } 2907 }
1924 2908 else if (SvTYPE (cb) == SVt_PVCV)
1925 PUTBACK;
1926
1927 ((coro_slf_cb)CvXSUBANY (GvCV (gv)).any_ptr) (aTHX_ &slf_frame, GvCV (gv), arg, items);
1928 }
1929
1930 /* now interpret the slf_frame */
1931 /* we use a callback system not to make the code needlessly */
1932 /* complicated, but so we can run multiple perl coros from one cctx */
1933
1934 do
1935 {
1936 struct coro_transfer_args ta;
1937
1938 slf_frame.prepare (aTHX_ &ta);
1939 TRANSFER (ta, 0);
1940
1941 checkmark = PL_stack_sp - PL_stack_base;
1942 }
1943 while (slf_frame.check (aTHX_ &slf_frame));
1944
1945 {
1946 dSP;
1947 SV **bot = PL_stack_base + checkmark;
1948 int gimme = GIMME_V;
1949
1950 slf_frame.prepare = 0; /* signal pp_slf that we need a new frame */
1951
1952 /* make sure we put something on the stack in scalar context */
1953 if (gimme == G_SCALAR)
1954 { 2909 {
1955 if (sp == bot) 2910 dSP;
1956 XPUSHs (&PL_sv_undef); 2911 PUSHMARK (SP);
1957 2912 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
1958 SP = bot + 1; 2913 PUTBACK;
2914 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
1959 } 2915 }
1960 2916
1961 PUTBACK; 2917 SvREFCNT_dec (cb);
1962 } 2918 }
1963
1964 return NORMAL;
1965} 2919}
1966 2920
1967static void 2921static void
1968api_execute_slf (pTHX_ CV *cv, coro_slf_cb init_cb, SV **arg, int items) 2922coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
1969{ 2923{
1970 assert (("FATAL: SLF call with illegal CV value", !CvANON (cv))); 2924 /* call $sem->adjust (0) to possibly wake up some other waiters */
1971 2925 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
1972 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB]
1973 && PL_op->op_ppaddr != pp_slf)
1974 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or any other means, caught");
1975
1976 if (items > 3)
1977 croak ("Coro only supports up to three arguments to SLF functions currently (not %d), caught", items);
1978
1979 CvFLAGS (cv) |= CVf_SLF;
1980 CvXSUBANY (cv).any_ptr = (void *)init_cb;
1981 slf_cv = cv;
1982
1983 /* we patch the op, and then re-run the whole call */
1984 /* we have to put the same argument on the stack for this to work */
1985 /* and this will be done by pp_restore */
1986 slf_restore.op_next = (OP *)&slf_restore;
1987 slf_restore.op_type = OP_NULL;
1988 slf_restore.op_ppaddr = pp_restore;
1989 slf_restore.op_first = PL_op;
1990
1991 slf_arg0 = items > 0 ? SvREFCNT_inc (arg [0]) : 0;
1992 slf_arg1 = items > 1 ? SvREFCNT_inc (arg [1]) : 0;
1993 slf_arg2 = items > 2 ? SvREFCNT_inc (arg [2]) : 0;
1994
1995 PL_op->op_ppaddr = pp_slf;
1996
1997 PL_op = (OP *)&slf_restore;
1998} 2926}
1999
2000/*****************************************************************************/
2001 2927
2002static int 2928static int
2003slf_check_semaphore_down (pTHX_ struct CoroSLF *frame) 2929slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2004{ 2930{
2005 AV *av = (AV *)frame->data; 2931 AV *av = (AV *)frame->data;
2006 SV *count_sv = AvARRAY (av)[0]; 2932 SV *count_sv = AvARRAY (av)[0];
2933 SV *coro_hv = SvRV (coro_current);
2007 2934
2935 /* if we are about to throw, don't actually acquire the lock, just throw */
2936 if (CORO_THROW)
2937 return 0;
2008 if (SvIVX (count_sv) > 0) 2938 else if (SvIVX (count_sv) > 0)
2009 { 2939 {
2940 frame->destroy = 0;
2941
2942 if (acquire)
2010 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2943 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2944 else
2945 coro_semaphore_adjust (aTHX_ av, 0);
2946
2011 return 0; 2947 return 0;
2012 } 2948 }
2013 else 2949 else
2014 { 2950 {
2015 int i; 2951 int i;
2016 /* if we were woken up but can't down, we look through the whole */ 2952 /* if we were woken up but can't down, we look through the whole */
2017 /* waiters list and only add us if we aren't in there already */ 2953 /* waiters list and only add us if we aren't in there already */
2018 /* this avoids some degenerate memory usage cases */ 2954 /* this avoids some degenerate memory usage cases */
2019 2955 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug
2020 for (i = 1; i <= AvFILLp (av); ++i)
2021 if (AvARRAY (av)[i] == SvRV (coro_current)) 2956 if (AvARRAY (av)[i] == coro_hv)
2022 return 1; 2957 return 1;
2023 2958
2024 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2959 av_push (av, SvREFCNT_inc (coro_hv));
2025 return 1; 2960 return 1;
2026 } 2961 }
2027} 2962}
2028 2963
2029static void 2964static int
2965slf_check_semaphore_down (pTHX_ struct CoroSLF *frame)
2966{
2967 return slf_check_semaphore_down_or_wait (aTHX_ frame, 1);
2968}
2969
2970static int
2971slf_check_semaphore_wait (pTHX_ struct CoroSLF *frame)
2972{
2973 return slf_check_semaphore_down_or_wait (aTHX_ frame, 0);
2974}
2975
2976static void
2030slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2977slf_init_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2031{ 2978{
2032 AV *av = (AV *)SvRV (arg [0]); 2979 AV *av = (AV *)SvRV (arg [0]);
2033 2980
2034 if (SvIVX (AvARRAY (av)[0]) > 0) 2981 if (SvIVX (AvARRAY (av)[0]) > 0)
2035 { 2982 {
… …
2040 { 2987 {
2041 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2988 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2042 2989
2043 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2990 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2044 frame->prepare = prepare_schedule; 2991 frame->prepare = prepare_schedule;
2992 /* to avoid race conditions when a woken-up coro gets terminated */
2993 /* we arrange for a temporary on_destroy that calls adjust (0) */
2994 frame->destroy = coro_semaphore_destroy;
2045 } 2995 }
2996}
2046 2997
2998static void
2999slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
3000{
3001 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2047 frame->check = slf_check_semaphore_down; 3002 frame->check = slf_check_semaphore_down;
3003}
2048 3004
3005static void
3006slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
3007{
3008 if (items >= 2)
3009 {
3010 /* callback form */
3011 AV *av = (AV *)SvRV (arg [0]);
3012 SV *cb_cv = s_get_cv_croak (arg [1]);
3013
3014 av_push (av, SvREFCNT_inc_NN (cb_cv));
3015
3016 if (SvIVX (AvARRAY (av)[0]) > 0)
3017 coro_semaphore_adjust (aTHX_ av, 0);
3018
3019 frame->prepare = prepare_nop;
3020 frame->check = slf_check_nop;
3021 }
3022 else
3023 {
3024 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
3025 frame->check = slf_check_semaphore_wait;
3026 }
3027}
3028
3029/* signal */
3030
3031static void
3032coro_signal_wake (pTHX_ AV *av, int count)
3033{
3034 SvIVX (AvARRAY (av)[0]) = 0;
3035
3036 /* now signal count waiters */
3037 while (count > 0 && AvFILLp (av) > 0)
3038 {
3039 SV *cb;
3040
3041 /* swap first two elements so we can shift a waiter */
3042 cb = AvARRAY (av)[0];
3043 AvARRAY (av)[0] = AvARRAY (av)[1];
3044 AvARRAY (av)[1] = cb;
3045
3046 cb = av_shift (av);
3047
3048 if (SvTYPE (cb) == SVt_PVCV)
3049 {
3050 dSP;
3051 PUSHMARK (SP);
3052 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3053 PUTBACK;
3054 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3055 }
3056 else
3057 {
3058 api_ready (aTHX_ cb);
3059 sv_setiv (cb, 0); /* signal waiter */
3060 }
3061
3062 SvREFCNT_dec (cb);
3063
3064 --count;
3065 }
3066}
3067
3068static int
3069slf_check_signal_wait (pTHX_ struct CoroSLF *frame)
3070{
3071 /* if we are about to throw, also stop waiting */
3072 return SvROK ((SV *)frame->data) && !CORO_THROW;
3073}
3074
3075static void
3076slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
3077{
3078 AV *av = (AV *)SvRV (arg [0]);
3079
3080 if (items >= 2)
3081 {
3082 SV *cb_cv = s_get_cv_croak (arg [1]);
3083 av_push (av, SvREFCNT_inc_NN (cb_cv));
3084
3085 if (SvIVX (AvARRAY (av)[0]))
3086 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3087
3088 frame->prepare = prepare_nop;
3089 frame->check = slf_check_nop;
3090 }
3091 else if (SvIVX (AvARRAY (av)[0]))
3092 {
3093 SvIVX (AvARRAY (av)[0]) = 0;
3094 frame->prepare = prepare_nop;
3095 frame->check = slf_check_nop;
3096 }
3097 else
3098 {
3099 SV *waiter = newSVsv (coro_current); /* owned by signal av */
3100
3101 av_push (av, waiter);
3102
3103 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
3104 frame->prepare = prepare_schedule;
3105 frame->check = slf_check_signal_wait;
3106 }
2049} 3107}
2050 3108
2051/*****************************************************************************/ 3109/*****************************************************************************/
3110/* Coro::AIO */
2052 3111
2053#define GENSUB_ARG CvXSUBANY (cv).any_ptr 3112#define CORO_MAGIC_type_aio PERL_MAGIC_ext
2054 3113
2055/* create a closure from XS, returns a code reference */ 3114/* helper storage struct */
2056/* the arg can be accessed via GENSUB_ARG from the callback */ 3115struct io_state
2057/* the callback must use dXSARGS/XSRETURN */ 3116{
3117 int errorno;
3118 I32 laststype; /* U16 in 5.10.0 */
3119 int laststatval;
3120 Stat_t statcache;
3121};
3122
3123static void
3124coro_aio_callback (pTHX_ CV *cv)
3125{
3126 dXSARGS;
3127 AV *state = (AV *)S_GENSUB_ARG;
3128 SV *coro = av_pop (state);
3129 SV *data_sv = newSV (sizeof (struct io_state));
3130
3131 av_extend (state, items - 1);
3132
3133 sv_upgrade (data_sv, SVt_PV);
3134 SvCUR_set (data_sv, sizeof (struct io_state));
3135 SvPOK_only (data_sv);
3136
3137 {
3138 struct io_state *data = (struct io_state *)SvPVX (data_sv);
3139
3140 data->errorno = errno;
3141 data->laststype = PL_laststype;
3142 data->laststatval = PL_laststatval;
3143 data->statcache = PL_statcache;
3144 }
3145
3146 /* now build the result vector out of all the parameters and the data_sv */
3147 {
3148 int i;
3149
3150 for (i = 0; i < items; ++i)
3151 av_push (state, SvREFCNT_inc_NN (ST (i)));
3152 }
3153
3154 av_push (state, data_sv);
3155
3156 api_ready (aTHX_ coro);
3157 SvREFCNT_dec (coro);
3158 SvREFCNT_dec ((AV *)state);
3159}
3160
3161static int
3162slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3163{
3164 AV *state = (AV *)frame->data;
3165
3166 /* if we are about to throw, return early */
3167 /* this does not cancel the aio request, but at least */
3168 /* it quickly returns */
3169 if (CORO_THROW)
3170 return 0;
3171
3172 /* one element that is an RV? repeat! */
3173 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0]))
3174 return 1;
3175
3176 /* restore status */
3177 {
3178 SV *data_sv = av_pop (state);
3179 struct io_state *data = (struct io_state *)SvPVX (data_sv);
3180
3181 errno = data->errorno;
3182 PL_laststype = data->laststype;
3183 PL_laststatval = data->laststatval;
3184 PL_statcache = data->statcache;
3185
3186 SvREFCNT_dec (data_sv);
3187 }
3188
3189 /* push result values */
3190 {
3191 dSP;
3192 int i;
3193
3194 EXTEND (SP, AvFILLp (state) + 1);
3195 for (i = 0; i <= AvFILLp (state); ++i)
3196 PUSHs (sv_2mortal (SvREFCNT_inc_NN (AvARRAY (state)[i])));
3197
3198 PUTBACK;
3199 }
3200
3201 return 0;
3202}
3203
3204static void
3205slf_init_aio_req (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
3206{
3207 AV *state = (AV *)sv_2mortal ((SV *)newAV ());
3208 SV *coro_hv = SvRV (coro_current);
3209 struct coro *coro = SvSTATE_hv (coro_hv);
3210
3211 /* put our coroutine id on the state arg */
3212 av_push (state, SvREFCNT_inc_NN (coro_hv));
3213
3214 /* first see whether we have a non-zero priority and set it as AIO prio */
3215 if (coro->prio)
3216 {
3217 dSP;
3218
3219 static SV *prio_cv;
3220 static SV *prio_sv;
3221
3222 if (ecb_expect_false (!prio_cv))
3223 {
3224 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3225 prio_sv = newSViv (0);
3226 }
3227
3228 PUSHMARK (SP);
3229 sv_setiv (prio_sv, coro->prio);
3230 XPUSHs (prio_sv);
3231
3232 PUTBACK;
3233 call_sv (prio_cv, G_VOID | G_DISCARD);
3234 }
3235
3236 /* now call the original request */
3237 {
3238 dSP;
3239 CV *req = (CV *)CORO_MAGIC_NN ((SV *)cv, CORO_MAGIC_type_aio)->mg_obj;
3240 int i;
3241
3242 PUSHMARK (SP);
3243
3244 /* first push all args to the stack */
3245 EXTEND (SP, items + 1);
3246
3247 for (i = 0; i < items; ++i)
3248 PUSHs (arg [i]);
3249
3250 /* now push the callback closure */
3251 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
3252
3253 /* now call the AIO function - we assume our request is uncancelable */
3254 PUTBACK;
3255 call_sv ((SV *)req, G_VOID | G_DISCARD);
3256 }
3257
3258 /* now that the request is going, we loop till we have a result */
3259 frame->data = (void *)state;
3260 frame->prepare = prepare_schedule;
3261 frame->check = slf_check_aio_req;
3262}
3263
3264static void
3265coro_aio_req_xs (pTHX_ CV *cv)
3266{
3267 dXSARGS;
3268
3269 CORO_EXECUTE_SLF_XS (slf_init_aio_req);
3270
3271 XSRETURN_EMPTY;
3272}
3273
3274/*****************************************************************************/
3275
3276#if CORO_CLONE
3277# include "clone.c"
3278#endif
3279
3280/*****************************************************************************/
3281
2058static SV * 3282static SV *
2059gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg) 3283coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2060{ 3284{
2061 CV *cv = (CV *)NEWSV (0, 0); 3285 SV *coro_sv;
3286 struct coro *coro;
3287 MAGIC *mg;
3288 HV *hv;
3289 SV *cb;
3290 int i;
2062 3291
2063 sv_upgrade ((SV *)cv, SVt_PVCV); 3292 if (argc > 0)
3293 {
3294 cb = s_get_cv_croak (argv [0]);
2064 3295
2065 CvANON_on (cv); 3296 if (!is_coro)
2066 CvISXSUB_on (cv); 3297 {
2067 CvXSUB (cv) = xsub; 3298 if (CvISXSUB (cb))
2068 GENSUB_ARG = arg; 3299 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2069 3300
2070 return newRV_noinc ((SV *)cv); 3301 if (!CvROOT (cb))
2071} 3302 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3303 }
3304 }
2072 3305
2073/*****************************************************************************/ 3306 Newz (0, coro, 1, struct coro);
3307 coro->args = newAV ();
3308 coro->flags = CF_NEW;
3309
3310 if (coro_first) coro_first->prev = coro;
3311 coro->next = coro_first;
3312 coro_first = coro;
3313
3314 coro->hv = hv = newHV ();
3315 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3316 mg->mg_flags |= MGf_DUP;
3317 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3318
3319 if (argc > 0)
3320 {
3321 av_extend (coro->args, argc + is_coro - 1);
3322
3323 if (is_coro)
3324 {
3325 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3326 cb = (SV *)cv_coro_run;
3327 }
3328
3329 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3330
3331 for (i = 1; i < argc; i++)
3332 av_push (coro->args, newSVsv (argv [i]));
3333 }
3334
3335 return coro_sv;
3336}
3337
3338#ifndef __cplusplus
3339ecb_cold XS(boot_Coro__State);
3340#endif
3341
3342#if CORO_JIT
3343
3344static void ecb_noinline ecb_cold
3345pushav_3uv (pTHX_ UV a, UV b, UV c)
3346{
3347 dSP;
3348 AV *av = newAV ();
3349
3350 av_store (av, 2, newSVuv (c));
3351 av_store (av, 1, newSVuv (b));
3352 av_store (av, 0, newSVuv (a));
3353
3354 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3355
3356 PUTBACK;
3357}
3358
3359static void ecb_noinline ecb_cold
3360jit_init (pTHX)
3361{
3362 dSP;
3363 SV *load, *save;
3364 char *map_base;
3365 char *load_ptr, *save_ptr;
3366 STRLEN load_len, save_len;
3367 int count;
3368
3369 PUSHMARK (SP);
3370 PUTBACK;
3371#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type));
3372# include "state.h"
3373#undef VARx
3374 count = call_pv ("Coro::State::_jit", G_ARRAY);
3375 SPAGAIN;
3376
3377 save = POPs; save_ptr = SvPVbyte (save, save_len);
3378 load = POPs; load_ptr = SvPVbyte (load, load_len);
3379
3380 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3381
3382 assert (("Coro: unable mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3383
3384 load_perl_slots = (load_save_perl_slots_type)map_base;
3385 memcpy (map_base, load_ptr, load_len);
3386
3387 map_base += (load_len + 15) & ~15;
3388
3389 save_perl_slots = (load_save_perl_slots_type)map_base;
3390 memcpy (map_base, save_ptr, save_len);
3391}
3392
3393#endif
2074 3394
2075MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3395MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2076 3396
2077PROTOTYPES: DISABLE 3397PROTOTYPES: DISABLE
2078 3398
2079BOOT: 3399BOOT:
2080{ 3400{
2081#ifdef USE_ITHREADS 3401#ifdef USE_ITHREADS
2082 MUTEX_INIT (&coro_lock);
2083# if CORO_PTHREAD 3402# if CORO_PTHREAD
2084 coro_thx = PERL_GET_CONTEXT; 3403 coro_thx = PERL_GET_CONTEXT;
2085# endif 3404# endif
2086#endif 3405#endif
2087 BOOT_PAGESIZE; 3406 BOOT_PAGESIZE;
2088 3407
3408 /* perl defines these to check for existance first, but why it doesn't */
3409 /* just create them one at init time is not clear to me, except for */
3410 /* programs trying to delete them, but... */
3411 /* anyway, we declare this as invalid and make sure they are initialised here */
3412 DEFSV;
3413 ERRSV;
3414
3415 cctx_current = cctx_new_empty ();
3416
2089 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3417 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2090 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3418 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2091 3419
2092 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3420 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2093 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3421 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2107 main_mainstack = PL_mainstack; 3435 main_mainstack = PL_mainstack;
2108 main_top_env = PL_top_env; 3436 main_top_env = PL_top_env;
2109 3437
2110 while (main_top_env->je_prev) 3438 while (main_top_env->je_prev)
2111 main_top_env = main_top_env->je_prev; 3439 main_top_env = main_top_env->je_prev;
3440
3441 {
3442 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
3443
3444 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
3445 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
3446
3447 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
3448 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
3449 }
2112 3450
2113 coroapi.ver = CORO_API_VERSION; 3451 coroapi.ver = CORO_API_VERSION;
2114 coroapi.rev = CORO_API_REVISION; 3452 coroapi.rev = CORO_API_REVISION;
2115 3453
2116 coroapi.transfer = api_transfer; 3454 coroapi.transfer = api_transfer;
… …
2120 coroapi.prepare_nop = prepare_nop; 3458 coroapi.prepare_nop = prepare_nop;
2121 coroapi.prepare_schedule = prepare_schedule; 3459 coroapi.prepare_schedule = prepare_schedule;
2122 coroapi.prepare_cede = prepare_cede; 3460 coroapi.prepare_cede = prepare_cede;
2123 coroapi.prepare_cede_notself = prepare_cede_notself; 3461 coroapi.prepare_cede_notself = prepare_cede_notself;
2124 3462
2125 { 3463 time_init (aTHX);
2126 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2127 3464
2128 if (!svp) croak ("Time::HiRes is required");
2129 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2130
2131 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2132 }
2133
2134 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3465 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3466#if CORO_JIT
3467 PUTBACK;
3468 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3469 jit_init (aTHX);
3470 perl_eval_pv ("undef &Coro::State::_jit", 1);
3471 SPAGAIN;
3472#endif
2135} 3473}
2136 3474
2137SV * 3475SV *
2138new (char *klass, ...) 3476new (SV *klass, ...)
3477 ALIAS:
3478 Coro::new = 1
2139 CODE: 3479 CODE:
2140{ 3480 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2141 struct coro *coro; 3481 OUTPUT:
2142 MAGIC *mg;
2143 HV *hv;
2144 int i;
2145
2146 Newz (0, coro, 1, struct coro);
2147 coro->args = newAV ();
2148 coro->flags = CF_NEW;
2149
2150 if (coro_first) coro_first->prev = coro;
2151 coro->next = coro_first;
2152 coro_first = coro;
2153
2154 coro->hv = hv = newHV ();
2155 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2156 mg->mg_flags |= MGf_DUP;
2157 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2158
2159 av_extend (coro->args, items - 1);
2160 for (i = 1; i < items; i++)
2161 av_push (coro->args, newSVsv (ST (i)));
2162}
2163 OUTPUT:
2164 RETVAL 3482 RETVAL
2165
2166void
2167_set_stacklevel (...)
2168 CODE:
2169 api_execute_slf (aTHX_ cv, slf_init_set_stacklevel, &ST (0), items);
2170 3483
2171void 3484void
2172transfer (...) 3485transfer (...)
2173 PROTOTYPE: $$ 3486 PROTOTYPE: $$
2174 CODE: 3487 CODE:
2175 api_execute_slf (aTHX_ cv, slf_init_transfer, &ST (0), items); 3488 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2176
2177bool
2178_destroy (SV *coro_sv)
2179 CODE:
2180 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2181 OUTPUT:
2182 RETVAL
2183 3489
2184void 3490void
2185_exit (int code) 3491_exit (int code)
2186 PROTOTYPE: $ 3492 PROTOTYPE: $
2187 CODE: 3493 CODE:
2188 _exit (code); 3494 _exit (code);
3495
3496SV *
3497clone (Coro::State coro)
3498 CODE:
3499{
3500#if CORO_CLONE
3501 struct coro *ncoro = coro_clone (aTHX_ coro);
3502 MAGIC *mg;
3503 /* TODO: too much duplication */
3504 ncoro->hv = newHV ();
3505 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3506 mg->mg_flags |= MGf_DUP;
3507 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3508#else
3509 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3510#endif
3511}
3512 OUTPUT:
3513 RETVAL
2189 3514
2190int 3515int
2191cctx_stacksize (int new_stacksize = 0) 3516cctx_stacksize (int new_stacksize = 0)
2192 PROTOTYPE: ;$ 3517 PROTOTYPE: ;$
2193 CODE: 3518 CODE:
… …
2243 eval = 1 3568 eval = 1
2244 CODE: 3569 CODE:
2245{ 3570{
2246 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3571 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2247 { 3572 {
2248 struct coro temp; 3573 struct coro *current = SvSTATE_current;
3574 struct CoroSLF slf_save;
2249 3575
2250 if (!(coro->flags & CF_RUNNING)) 3576 if (current != coro)
2251 { 3577 {
2252 PUTBACK; 3578 PUTBACK;
2253 save_perl (aTHX_ &temp); 3579 save_perl (aTHX_ current);
2254 load_perl (aTHX_ coro); 3580 load_perl (aTHX_ coro);
3581 /* the coro is most likely in an active SLF call.
3582 * while not strictly required (the code we execute is
3583 * not allowed to call any SLF functions), it's cleaner
3584 * to reinitialise the slf_frame and restore it later.
3585 * This might one day allow us to actually do SLF calls
3586 * from code executed here.
3587 */
3588 slf_save = slf_frame;
3589 slf_frame.prepare = 0;
3590 SPAGAIN;
2255 } 3591 }
2256 3592
2257 {
2258 dSP;
2259 ENTER;
2260 SAVETMPS;
2261 PUTBACK;
2262 PUSHSTACK; 3593 PUSHSTACK;
3594
2263 PUSHMARK (SP); 3595 PUSHMARK (SP);
3596 PUTBACK;
2264 3597
2265 if (ix) 3598 if (ix)
2266 eval_sv (coderef, 0); 3599 eval_sv (coderef, 0);
2267 else 3600 else
2268 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3601 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2269 3602
2270 POPSTACK; 3603 POPSTACK;
2271 SPAGAIN; 3604 SPAGAIN;
2272 FREETMPS;
2273 LEAVE;
2274 PUTBACK;
2275 }
2276 3605
2277 if (!(coro->flags & CF_RUNNING)) 3606 if (current != coro)
2278 { 3607 {
3608 PUTBACK;
3609 slf_frame = slf_save;
2279 save_perl (aTHX_ coro); 3610 save_perl (aTHX_ coro);
2280 load_perl (aTHX_ &temp); 3611 load_perl (aTHX_ current);
2281 SPAGAIN; 3612 SPAGAIN;
2282 } 3613 }
2283 } 3614 }
2284} 3615}
2285 3616
… …
2288 PROTOTYPE: $ 3619 PROTOTYPE: $
2289 ALIAS: 3620 ALIAS:
2290 is_ready = CF_READY 3621 is_ready = CF_READY
2291 is_running = CF_RUNNING 3622 is_running = CF_RUNNING
2292 is_new = CF_NEW 3623 is_new = CF_NEW
2293 is_destroyed = CF_DESTROYED 3624 is_destroyed = CF_ZOMBIE
3625 is_zombie = CF_ZOMBIE
3626 is_suspended = CF_SUSPENDED
2294 CODE: 3627 CODE:
2295 RETVAL = boolSV (coro->flags & ix); 3628 RETVAL = boolSV (coro->flags & ix);
2296 OUTPUT: 3629 OUTPUT:
2297 RETVAL 3630 RETVAL
2298 3631
2299void 3632void
2300throw (Coro::State self, SV *throw = &PL_sv_undef) 3633throw (Coro::State self, SV *exception = &PL_sv_undef)
2301 PROTOTYPE: $;$ 3634 PROTOTYPE: $;$
2302 CODE: 3635 CODE:
3636{
3637 struct coro *current = SvSTATE_current;
3638 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
2303 SvREFCNT_dec (self->throw); 3639 SvREFCNT_dec (*exceptionp);
2304 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 3640 SvGETMAGIC (exception);
3641 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3642}
2305 3643
2306void 3644void
2307api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3645api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2308 PROTOTYPE: $;$ 3646 PROTOTYPE: $;$
2309 C_ARGS: aTHX_ coro, flags 3647 C_ARGS: aTHX_ coro, flags
2310 3648
2311SV * 3649SV *
2312has_cctx (Coro::State coro) 3650has_cctx (Coro::State coro)
2313 PROTOTYPE: $ 3651 PROTOTYPE: $
2314 CODE: 3652 CODE:
2315 RETVAL = boolSV (!!coro->cctx); 3653 /* maybe manage the running flag differently */
3654 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2316 OUTPUT: 3655 OUTPUT:
2317 RETVAL 3656 RETVAL
2318 3657
2319int 3658int
2320is_traced (Coro::State coro) 3659is_traced (Coro::State coro)
… …
2340 3679
2341void 3680void
2342force_cctx () 3681force_cctx ()
2343 PROTOTYPE: 3682 PROTOTYPE:
2344 CODE: 3683 CODE:
2345 struct coro *coro = SvSTATE (coro_current);
2346 coro->cctx->idle_sp = 0; 3684 cctx_current->idle_sp = 0;
2347 3685
2348void 3686void
2349swap_defsv (Coro::State self) 3687swap_defsv (Coro::State self)
2350 PROTOTYPE: $ 3688 PROTOTYPE: $
2351 ALIAS: 3689 ALIAS:
… …
2359 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3697 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2360 3698
2361 SV *tmp = *src; *src = *dst; *dst = tmp; 3699 SV *tmp = *src; *src = *dst; *dst = tmp;
2362 } 3700 }
2363 3701
3702void
3703cancel (Coro::State self)
3704 CODE:
3705 coro_state_destroy (aTHX_ self);
3706
3707SV *
3708enable_times (int enabled = enable_times)
3709 CODE:
3710{
3711 RETVAL = boolSV (enable_times);
3712
3713 if (enabled != enable_times)
3714 {
3715 enable_times = enabled;
3716
3717 coro_times_update ();
3718 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3719 }
3720}
3721 OUTPUT:
3722 RETVAL
3723
3724void
3725times (Coro::State self)
3726 PPCODE:
3727{
3728 struct coro *current = SvSTATE (coro_current);
3729
3730 if (ecb_expect_false (current == self))
3731 {
3732 coro_times_update ();
3733 coro_times_add (SvSTATE (coro_current));
3734 }
3735
3736 EXTEND (SP, 2);
3737 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3738 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3739
3740 if (ecb_expect_false (current == self))
3741 coro_times_sub (SvSTATE (coro_current));
3742}
3743
3744void
3745swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3746 CODE:
3747{
3748 struct coro *current = SvSTATE_current;
3749
3750 if (current == coro)
3751 SWAP_SVS (current);
3752
3753 if (!coro->swap_sv)
3754 coro->swap_sv = newAV ();
3755
3756 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3757 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3758
3759 if (current == coro)
3760 SWAP_SVS (current);
3761}
3762
3763
2364MODULE = Coro::State PACKAGE = Coro 3764MODULE = Coro::State PACKAGE = Coro
2365 3765
2366BOOT: 3766BOOT:
2367{ 3767{
2368 int i;
2369
2370 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2371 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3768 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2372 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3769 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2373 3770 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
2374 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3771 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2375 SvREADONLY_on (coro_current); 3772 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3773 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3774 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3775 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
2376 3776
3777 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3778 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3779 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3780 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3781
2377 coro_stash = gv_stashpv ("Coro", TRUE); 3782 coro_stash = gv_stashpv ("Coro", TRUE);
2378 3783
2379 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3784 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2380 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3785 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2381 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3786 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2382 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3787 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2383 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3788 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2384 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3789 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2385
2386 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2387 coro_ready[i] = newAV ();
2388 3790
2389 { 3791 {
2390 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3792 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2391 3793
2392 coroapi.schedule = api_schedule; 3794 coroapi.schedule = api_schedule;
3795 coroapi.schedule_to = api_schedule_to;
2393 coroapi.cede = api_cede; 3796 coroapi.cede = api_cede;
2394 coroapi.cede_notself = api_cede_notself; 3797 coroapi.cede_notself = api_cede_notself;
2395 coroapi.ready = api_ready; 3798 coroapi.ready = api_ready;
2396 coroapi.is_ready = api_is_ready; 3799 coroapi.is_ready = api_is_ready;
2397 coroapi.nready = coro_nready; 3800 coroapi.nready = coro_nready;
2398 coroapi.current = coro_current; 3801 coroapi.current = coro_current;
2399 3802
2400 GCoroAPI = &coroapi; 3803 /*GCoroAPI = &coroapi;*/
2401 sv_setiv (sv, (IV)&coroapi); 3804 sv_setiv (sv, (IV)&coroapi);
2402 SvREADONLY_on (sv); 3805 SvREADONLY_on (sv);
2403 } 3806 }
2404} 3807}
2405 3808
3809SV *
3810async (...)
3811 PROTOTYPE: &@
3812 CODE:
3813 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3814 api_ready (aTHX_ RETVAL);
3815 OUTPUT:
3816 RETVAL
3817
3818void
3819_destroy (Coro::State coro)
3820 CODE:
3821 /* used by the manager thread */
3822 coro_state_destroy (aTHX_ coro);
3823
3824void
3825on_destroy (Coro::State coro, SV *cb)
3826 CODE:
3827 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3828
3829void
3830join (...)
3831 CODE:
3832 CORO_EXECUTE_SLF_XS (slf_init_join);
3833
3834void
3835terminate (...)
3836 CODE:
3837 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3838
3839void
3840cancel (...)
3841 CODE:
3842 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3843
3844int
3845safe_cancel (Coro::State self, ...)
3846 C_ARGS: aTHX_ self, &ST (1), items - 1
3847
2406void 3848void
2407schedule (...) 3849schedule (...)
2408 CODE: 3850 CODE:
2409 api_execute_slf (aTHX_ cv, slf_init_schedule, &ST (0), 0); 3851 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3852
3853void
3854schedule_to (...)
3855 CODE:
3856 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3857
3858void
3859cede_to (...)
3860 CODE:
3861 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2410 3862
2411void 3863void
2412cede (...) 3864cede (...)
2413 CODE: 3865 CODE:
2414 api_execute_slf (aTHX_ cv, slf_init_cede, &ST (0), 0); 3866 CORO_EXECUTE_SLF_XS (slf_init_cede);
2415 3867
2416void 3868void
2417cede_notself (...) 3869cede_notself (...)
2418 CODE: 3870 CODE:
2419 api_execute_slf (aTHX_ cv, slf_init_cede_notself, &ST (0), 0); 3871 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
2420 3872
2421void 3873void
2422_set_current (SV *current) 3874_set_current (SV *current)
2423 PROTOTYPE: $ 3875 PROTOTYPE: $
2424 CODE: 3876 CODE:
… …
2427 3879
2428void 3880void
2429_set_readyhook (SV *hook) 3881_set_readyhook (SV *hook)
2430 PROTOTYPE: $ 3882 PROTOTYPE: $
2431 CODE: 3883 CODE:
2432 LOCK;
2433 SvREFCNT_dec (coro_readyhook); 3884 SvREFCNT_dec (coro_readyhook);
3885 SvGETMAGIC (hook);
3886 if (SvOK (hook))
3887 {
2434 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3888 coro_readyhook = newSVsv (hook);
2435 UNLOCK; 3889 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3890 }
3891 else
3892 {
3893 coro_readyhook = 0;
3894 CORO_READYHOOK = 0;
3895 }
2436 3896
2437int 3897int
2438prio (Coro::State coro, int newprio = 0) 3898prio (Coro::State coro, int newprio = 0)
2439 PROTOTYPE: $;$ 3899 PROTOTYPE: $;$
2440 ALIAS: 3900 ALIAS:
… …
2446 if (items > 1) 3906 if (items > 1)
2447 { 3907 {
2448 if (ix) 3908 if (ix)
2449 newprio = coro->prio - newprio; 3909 newprio = coro->prio - newprio;
2450 3910
2451 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3911 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
2452 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3912 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
2453 3913
2454 coro->prio = newprio; 3914 coro->prio = newprio;
2455 } 3915 }
2456} 3916}
2457 OUTPUT: 3917 OUTPUT:
… …
2471 CODE: 3931 CODE:
2472 RETVAL = coro_nready; 3932 RETVAL = coro_nready;
2473 OUTPUT: 3933 OUTPUT:
2474 RETVAL 3934 RETVAL
2475 3935
2476# for async_pool speedup
2477void 3936void
2478_pool_1 (SV *cb) 3937suspend (Coro::State self)
3938 PROTOTYPE: $
2479 CODE: 3939 CODE:
2480{ 3940 self->flags |= CF_SUSPENDED;
2481 struct coro *coro = SvSTATE (coro_current);
2482 HV *hv = (HV *)SvRV (coro_current);
2483 AV *defav = GvAV (PL_defgv);
2484 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2485 AV *invoke_av;
2486 int i, len;
2487 3941
2488 if (!invoke) 3942void
3943resume (Coro::State self)
3944 PROTOTYPE: $
3945 CODE:
3946 self->flags &= ~CF_SUSPENDED;
3947
3948void
3949_pool_handler (...)
3950 CODE:
3951 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3952
3953void
3954async_pool (SV *cv, ...)
3955 PROTOTYPE: &@
3956 PPCODE:
3957{
3958 HV *hv = (HV *)av_pop (av_async_pool);
3959 AV *av = newAV ();
3960 SV *cb = ST (0);
3961 int i;
3962
3963 av_extend (av, items - 2);
3964 for (i = 1; i < items; ++i)
3965 av_push (av, SvREFCNT_inc_NN (ST (i)));
3966
3967 if ((SV *)hv == &PL_sv_undef)
2489 { 3968 {
2490 SV *old = PL_diehook; 3969 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
2491 PL_diehook = 0; 3970 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
2492 SvREFCNT_dec (old); 3971 SvREFCNT_dec (sv);
2493 croak ("\3async_pool terminate\2\n");
2494 } 3972 }
2495 3973
2496 SvREFCNT_dec (coro->saved_deffh);
2497 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2498
2499 hv_store (hv, "desc", sizeof ("desc") - 1,
2500 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2501
2502 invoke_av = (AV *)SvRV (invoke);
2503 len = av_len (invoke_av);
2504
2505 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2506
2507 if (len > 0)
2508 { 3974 {
2509 av_fill (defav, len - 1); 3975 struct coro *coro = SvSTATE_hv (hv);
2510 for (i = 0; i < len; ++i) 3976
2511 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3977 assert (!coro->invoke_cb);
3978 assert (!coro->invoke_av);
3979 coro->invoke_cb = SvREFCNT_inc (cb);
3980 coro->invoke_av = av;
2512 } 3981 }
3982
3983 api_ready (aTHX_ (SV *)hv);
3984
3985 if (GIMME_V != G_VOID)
3986 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3987 else
3988 SvREFCNT_dec (hv);
2513} 3989}
3990
3991SV *
3992rouse_cb ()
3993 PROTOTYPE:
3994 CODE:
3995 RETVAL = coro_new_rouse_cb (aTHX);
3996 OUTPUT:
3997 RETVAL
2514 3998
2515void 3999void
2516_pool_2 (SV *cb) 4000rouse_wait (...)
4001 PROTOTYPE: ;$
4002 PPCODE:
4003 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
4004
4005void
4006on_enter (SV *block)
4007 ALIAS:
4008 on_leave = 1
4009 PROTOTYPE: &
2517 CODE: 4010 CODE:
2518{ 4011{
2519 struct coro *coro = SvSTATE (coro_current); 4012 struct coro *coro = SvSTATE_current;
4013 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
2520 4014
2521 sv_setsv (cb, &PL_sv_undef); 4015 block = s_get_cv_croak (block);
2522 4016
2523 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 4017 if (!*avp)
2524 coro->saved_deffh = 0;
2525
2526 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2527 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2528 {
2529 SV *old = PL_diehook;
2530 PL_diehook = 0;
2531 SvREFCNT_dec (old);
2532 croak ("\3async_pool terminate\2\n");
2533 }
2534
2535 av_clear (GvAV (PL_defgv));
2536 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
2537 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2538
2539 coro->prio = 0;
2540
2541 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2542 api_trace (aTHX_ coro_current, 0);
2543
2544 av_push (av_async_pool, newSVsv (coro_current));
2545}
2546
2547
2548MODULE = Coro::State PACKAGE = Coro::AIO
2549
2550void
2551_get_state (SV *self)
2552 PROTOTYPE: $
2553 PPCODE:
2554{
2555 AV *defav = GvAV (PL_defgv);
2556 AV *av = newAV (); 4018 *avp = newAV ();
2557 int i;
2558 SV *data_sv = newSV (sizeof (struct io_state));
2559 struct io_state *data = (struct io_state *)SvPVX (data_sv);
2560 SvCUR_set (data_sv, sizeof (struct io_state));
2561 SvPOK_only (data_sv);
2562 4019
2563 data->errorno = errno; 4020 av_push (*avp, SvREFCNT_inc (block));
2564 data->laststype = PL_laststype;
2565 data->laststatval = PL_laststatval;
2566 data->statcache = PL_statcache;
2567 4021
2568 av_extend (av, AvFILLp (defav) + 1 + 1); 4022 if (!ix)
4023 on_enterleave_call (aTHX_ block);
2569 4024
2570 for (i = 0; i <= AvFILLp (defav); ++i) 4025 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
2571 av_push (av, SvREFCNT_inc_NN (AvARRAY (defav)[i])); 4026 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
2572 4027 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
2573 av_push (av, data_sv);
2574
2575 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2576
2577 api_ready (aTHX_ self);
2578}
2579
2580void
2581_set_state (SV *state)
2582 PROTOTYPE: $
2583 PPCODE:
2584{
2585 AV *av = (AV *)SvRV (state);
2586 struct io_state *data = (struct io_state *)SvPVX (AvARRAY (av)[AvFILLp (av)]);
2587 int i;
2588
2589 errno = data->errorno;
2590 PL_laststype = data->laststype;
2591 PL_laststatval = data->laststatval;
2592 PL_statcache = data->statcache;
2593
2594 EXTEND (SP, AvFILLp (av));
2595 for (i = 0; i < AvFILLp (av); ++i)
2596 PUSHs (sv_2mortal (SvREFCNT_inc_NN (AvARRAY (av)[i])));
2597}
2598
2599
2600MODULE = Coro::State PACKAGE = Coro::AnyEvent
2601
2602BOOT:
2603 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2604
2605void
2606_schedule (...)
2607 CODE:
2608{
2609 static int incede;
2610
2611 api_cede_notself (aTHX);
2612
2613 ++incede;
2614 while (coro_nready >= incede && api_cede (aTHX))
2615 ;
2616
2617 sv_setsv (sv_activity, &PL_sv_undef);
2618 if (coro_nready >= incede)
2619 {
2620 PUSHMARK (SP);
2621 PUTBACK;
2622 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2623 SPAGAIN;
2624 }
2625
2626 --incede;
2627} 4028}
2628 4029
2629 4030
2630MODULE = Coro::State PACKAGE = PerlIO::cede 4031MODULE = Coro::State PACKAGE = PerlIO::cede
2631 4032
2632BOOT: 4033BOOT:
2633 PerlIO_define_layer (aTHX_ &PerlIO_cede); 4034 PerlIO_define_layer (aTHX_ &PerlIO_cede);
2634 4035
4036
2635MODULE = Coro::State PACKAGE = Coro::Semaphore 4037MODULE = Coro::State PACKAGE = Coro::Semaphore
2636 4038
2637SV * 4039SV *
2638new (SV *klass, SV *count_ = 0) 4040new (SV *klass, SV *count = 0)
2639 CODE: 4041 CODE:
2640{ 4042{
2641 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 4043 int semcnt = 1;
2642 AV *av = newAV (); 4044
2643 av_push (av, newSViv (count_ && SvOK (count_) ? SvIV (count_) : 1)); 4045 if (count)
2644 RETVAL = sv_bless (newRV_noinc ((SV *)av), GvSTASH (CvGV (cv))); 4046 {
4047 SvGETMAGIC (count);
4048
4049 if (SvOK (count))
4050 semcnt = SvIV (count);
4051 }
4052
4053 RETVAL = sv_bless (
4054 coro_waitarray_new (aTHX_ semcnt),
4055 GvSTASH (CvGV (cv))
4056 );
2645} 4057}
4058 OUTPUT:
4059 RETVAL
4060
4061# helper for Coro::Channel and others
4062SV *
4063_alloc (int count)
4064 CODE:
4065 RETVAL = coro_waitarray_new (aTHX_ count);
2646 OUTPUT: 4066 OUTPUT:
2647 RETVAL 4067 RETVAL
2648 4068
2649SV * 4069SV *
2650count (SV *self) 4070count (SV *self)
… …
2656void 4076void
2657up (SV *self, int adjust = 1) 4077up (SV *self, int adjust = 1)
2658 ALIAS: 4078 ALIAS:
2659 adjust = 1 4079 adjust = 1
2660 CODE: 4080 CODE:
2661{ 4081 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
2662 AV *av = (AV *)SvRV (self);
2663 SV *count_sv = AvARRAY (av)[0];
2664 IV count = SvIVX (count_sv);
2665
2666 count += ix ? adjust : 1;
2667 SvIVX (count_sv) = count;
2668
2669 /* now wake up as many waiters as possible */
2670 while (count > 0 && AvFILLp (av) >= count)
2671 {
2672 SV *cb;
2673
2674 /* swap first two elements so we can shift a waiter */
2675 AvARRAY (av)[0] = AvARRAY (av)[1];
2676 AvARRAY (av)[1] = count_sv;
2677 cb = av_shift (av);
2678
2679 if (SvOBJECT (cb))
2680 api_ready (aTHX_ cb);
2681 else
2682 croak ("callbacks not yet supported");
2683
2684 SvREFCNT_dec (cb);
2685 }
2686}
2687 4082
2688void 4083void
2689down (SV *self) 4084down (...)
2690 CODE: 4085 CODE:
2691 api_execute_slf (aTHX_ cv, slf_init_semaphore_down, &ST (0), 1); 4086 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
4087
4088void
4089wait (...)
4090 CODE:
4091 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
2692 4092
2693void 4093void
2694try (SV *self) 4094try (SV *self)
2695 PPCODE: 4095 PPCODE:
2696{ 4096{
… …
2708 XSRETURN_NO; 4108 XSRETURN_NO;
2709} 4109}
2710 4110
2711void 4111void
2712waiters (SV *self) 4112waiters (SV *self)
2713 CODE: 4113 PPCODE:
2714{ 4114{
2715 AV *av = (AV *)SvRV (self); 4115 AV *av = (AV *)SvRV (self);
4116 int wcount = AvFILLp (av) + 1 - 1;
2716 4117
2717 if (GIMME_V == G_SCALAR) 4118 if (GIMME_V == G_SCALAR)
2718 XPUSHs (sv_2mortal (newSVsv (AvARRAY (av)[0]))); 4119 XPUSHs (sv_2mortal (newSViv (wcount)));
2719 else 4120 else
2720 { 4121 {
2721 int i; 4122 int i;
2722 EXTEND (SP, AvFILLp (av) + 1 - 1); 4123 EXTEND (SP, wcount);
2723 for (i = 1; i <= AvFILLp (av); ++i) 4124 for (i = 1; i <= wcount; ++i)
2724 PUSHs (newSVsv (AvARRAY (av)[i])); 4125 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
2725 } 4126 }
2726} 4127}
2727 4128
4129MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4130
4131void
4132_may_delete (SV *sem, int count, int extra_refs)
4133 PPCODE:
4134{
4135 AV *av = (AV *)SvRV (sem);
4136
4137 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4138 && AvFILLp (av) == 0 /* no waiters, just count */
4139 && SvIV (AvARRAY (av)[0]) == count)
4140 XSRETURN_YES;
4141
4142 XSRETURN_NO;
4143}
4144
4145MODULE = Coro::State PACKAGE = Coro::Signal
4146
4147SV *
4148new (SV *klass)
4149 CODE:
4150 RETVAL = sv_bless (
4151 coro_waitarray_new (aTHX_ 0),
4152 GvSTASH (CvGV (cv))
4153 );
4154 OUTPUT:
4155 RETVAL
4156
4157void
4158wait (...)
4159 CODE:
4160 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
4161
4162void
4163broadcast (SV *self)
4164 CODE:
4165{
4166 AV *av = (AV *)SvRV (self);
4167 coro_signal_wake (aTHX_ av, AvFILLp (av));
4168}
4169
4170void
4171send (SV *self)
4172 CODE:
4173{
4174 AV *av = (AV *)SvRV (self);
4175
4176 if (AvFILLp (av))
4177 coro_signal_wake (aTHX_ av, 1);
4178 else
4179 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4180}
4181
4182IV
4183awaited (SV *self)
4184 CODE:
4185 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4186 OUTPUT:
4187 RETVAL
4188
4189
4190MODULE = Coro::State PACKAGE = Coro::AnyEvent
4191
4192BOOT:
4193 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
4194
4195void
4196_schedule (...)
4197 CODE:
4198{
4199 static int incede;
4200
4201 api_cede_notself (aTHX);
4202
4203 ++incede;
4204 while (coro_nready >= incede && api_cede (aTHX))
4205 ;
4206
4207 sv_setsv (sv_activity, &PL_sv_undef);
4208 if (coro_nready >= incede)
4209 {
4210 PUSHMARK (SP);
4211 PUTBACK;
4212 call_pv ("Coro::AnyEvent::_activity", G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
4213 }
4214
4215 --incede;
4216}
4217
4218
4219MODULE = Coro::State PACKAGE = Coro::AIO
4220
4221void
4222_register (char *target, char *proto, SV *req)
4223 CODE:
4224{
4225 SV *req_cv = s_get_cv_croak (req);
4226 /* newXSproto doesn't return the CV on 5.8 */
4227 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
4228 sv_setpv ((SV *)slf_cv, proto);
4229 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
4230}
4231
4232MODULE = Coro::State PACKAGE = Coro::Select
4233
4234void
4235patch_pp_sselect ()
4236 CODE:
4237 if (!coro_old_pp_sselect)
4238 {
4239 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4240 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4241 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4242 }
4243
4244void
4245unpatch_pp_sselect ()
4246 CODE:
4247 if (coro_old_pp_sselect)
4248 {
4249 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4250 coro_old_pp_sselect = 0;
4251 }
4252

Diff Legend

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