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.321 by root, Sat Nov 22 02:09:54 2008 UTC vs.
Revision 1.446 by root, Wed Sep 3 14:26:34 2014 UTC

1#define CORO_CLONE 1 //D 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1 /* perl usually disables NDEBUG later */
2 5
3#include "libcoro/coro.c" 6#include "libcoro/coro.c"
4 7
5#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
6#define PERL_EXT 9#define PERL_EXT
… …
8#include "EXTERN.h" 11#include "EXTERN.h"
9#include "perl.h" 12#include "perl.h"
10#include "XSUB.h" 13#include "XSUB.h"
11#include "perliol.h" 14#include "perliol.h"
12 15
13#include "patchlevel.h" 16#include "schmorp.h"
14 17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
15#include <stdio.h> 23#include <stdio.h>
16#include <errno.h> 24#include <errno.h>
17#include <assert.h> 25#include <assert.h>
18 26
19#ifdef WIN32 27#ifndef SVs_PADSTALE
28# define SVs_PADSTALE 0
29#endif
30
31#ifdef PadARRAY
32# define NEWPADAPI 1
33# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
34#else
35typedef AV PADNAMELIST;
36# if !PERL_VERSION_ATLEAST(5,8,0)
37typedef AV PADLIST;
38typedef AV PAD;
39# endif
40# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
41# define PadlistMAX(pl) AvFILLp (pl)
42# define PadlistNAMES(pl) (*PadlistARRAY (pl))
43# define PadARRAY AvARRAY
44# define PadMAX AvFILLp
45# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
46#endif
47
48/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
49/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
50#if PERL_VERSION_ATLEAST(5,19,0)
51# define SVt_BIND SVt_IV
52#endif
53
54#if defined(_WIN32)
55# undef HAS_GETTIMEOFDAY
20# undef setjmp 56# undef setjmp
21# undef longjmp 57# undef longjmp
22# undef _exit 58# undef _exit
23# define setjmp _setjmp /* deep magic */ 59# define setjmp _setjmp /* deep magic */
24#else 60#else
25# include <inttypes.h> /* most portable stdint.h */ 61# include <inttypes.h> /* most portable stdint.h */
26#endif 62#endif
27 63
28#ifdef HAVE_MMAP
29# include <unistd.h>
30# include <sys/mman.h>
31# ifndef MAP_ANONYMOUS
32# ifdef MAP_ANON
33# define MAP_ANONYMOUS MAP_ANON
34# else
35# undef HAVE_MMAP
36# endif
37# endif
38# include <limits.h>
39# ifndef PAGESIZE
40# define PAGESIZE pagesize
41# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
42static long pagesize;
43# else
44# define BOOT_PAGESIZE (void)0
45# endif
46#else
47# define PAGESIZE 0
48# define BOOT_PAGESIZE (void)0
49#endif
50
51#if CORO_USE_VALGRIND
52# include <valgrind/valgrind.h>
53#endif
54
55/* the maximum number of idle cctx that will be pooled */ 64/* the maximum number of idle cctx that will be pooled */
56static int cctx_max_idle = 4; 65static int cctx_max_idle = 4;
57 66
58#define PERL_VERSION_ATLEAST(a,b,c) \ 67#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
59 (PERL_REVISION > (a) \ 68# define HAS_SCOPESTACK_NAME 1
60 || (PERL_REVISION == (a) \
61 && (PERL_VERSION > (b) \
62 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
63
64#if !PERL_VERSION_ATLEAST (5,6,0)
65# ifndef PL_ppaddr
66# define PL_ppaddr ppaddr
67# endif
68# ifndef call_sv
69# define call_sv perl_call_sv
70# endif
71# ifndef get_sv
72# define get_sv perl_get_sv
73# endif
74# ifndef get_cv
75# define get_cv perl_get_cv
76# endif
77# ifndef IS_PADGV
78# define IS_PADGV(v) 0
79# endif
80# ifndef IS_PADCONST
81# define IS_PADCONST(v) 0
82# endif
83#endif
84
85/* 5.11 */
86#ifndef CxHASARGS
87# define CxHASARGS(cx) (cx)->blk_sub.hasargs
88#endif
89
90/* 5.10.0 */
91#ifndef SvREFCNT_inc_NN
92# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
93#endif
94
95/* 5.8.8 */
96#ifndef GV_NOTQUAL
97# define GV_NOTQUAL 0
98#endif
99#ifndef newSV
100# define newSV(l) NEWSV(0,l)
101#endif
102#ifndef CvISXSUB_on
103# define CvISXSUB_on(cv) (void)cv
104#endif
105#ifndef CvISXSUB
106# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
107#endif
108#ifndef Newx
109# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
110#endif
111
112/* 5.8.7 */
113#ifndef SvRV_set
114# define SvRV_set(s,v) SvRV(s) = (v)
115#endif
116
117#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
118# undef CORO_STACKGUARD
119#endif
120
121#ifndef CORO_STACKGUARD
122# define CORO_STACKGUARD 0
123#endif 69#endif
124 70
125/* prefer perl internal functions over our own? */ 71/* prefer perl internal functions over our own? */
126#ifndef CORO_PREFER_PERL_FUNCTIONS 72#ifndef CORO_PREFER_PERL_FUNCTIONS
127# define CORO_PREFER_PERL_FUNCTIONS 0 73# define CORO_PREFER_PERL_FUNCTIONS 0
… …
135#else 81#else
136# define dSTACKLEVEL volatile void *stacklevel 82# define dSTACKLEVEL volatile void *stacklevel
137# define STACKLEVEL ((void *)&stacklevel) 83# define STACKLEVEL ((void *)&stacklevel)
138#endif 84#endif
139 85
140#define IN_DESTRUCT (PL_main_cv == Nullcv) 86#define IN_DESTRUCT PL_dirty
141
142#if __GNUC__ >= 3
143# define attribute(x) __attribute__(x)
144# define expect(expr,value) __builtin_expect ((expr),(value))
145# define INLINE static inline
146#else
147# define attribute(x)
148# define expect(expr,value) (expr)
149# define INLINE static
150#endif
151
152#define expect_false(expr) expect ((expr) != 0, 0)
153#define expect_true(expr) expect ((expr) != 0, 1)
154
155#define NOINLINE attribute ((noinline))
156 87
157#include "CoroAPI.h" 88#include "CoroAPI.h"
158#define GCoroAPI (&coroapi) /* very sneaky */ 89#define GCoroAPI (&coroapi) /* very sneaky */
159 90
160#ifdef USE_ITHREADS 91#ifdef USE_ITHREADS
161# if CORO_PTHREAD 92# if CORO_PTHREAD
162static void *coro_thx; 93static void *coro_thx;
163# endif 94# endif
164#endif 95#endif
165 96
97#ifdef __linux
98# include <time.h> /* for timespec */
99# include <syscall.h> /* for SYS_* */
100# ifdef SYS_clock_gettime
101# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
102# define CORO_CLOCK_MONOTONIC 1
103# define CORO_CLOCK_THREAD_CPUTIME_ID 3
104# endif
105#endif
106
166static double (*nvtime)(); /* so why doesn't it take void? */ 107static double (*nvtime)(); /* so why doesn't it take void? */
108static void (*u2time)(pTHX_ UV ret[2]);
167 109
168/* we hijack an hopefully unused CV flag for our purposes */ 110/* we hijack an hopefully unused CV flag for our purposes */
169#define CVf_SLF 0x4000 111#define CVf_SLF 0x4000
170static OP *pp_slf (pTHX); 112static OP *pp_slf (pTHX);
113static void slf_destroy (pTHX_ struct coro *coro);
171 114
172static U32 cctx_gen; 115static U32 cctx_gen;
173static size_t cctx_stacksize = CORO_STACKSIZE; 116static size_t cctx_stacksize = CORO_STACKSIZE;
174static struct CoroAPI coroapi; 117static struct CoroAPI coroapi;
175static AV *main_mainstack; /* used to differentiate between $main and others */ 118static AV *main_mainstack; /* used to differentiate between $main and others */
… …
177static HV *coro_state_stash, *coro_stash; 120static HV *coro_state_stash, *coro_stash;
178static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 121static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
179 122
180static AV *av_destroy; /* destruction queue */ 123static AV *av_destroy; /* destruction queue */
181static SV *sv_manager; /* the manager coro */ 124static SV *sv_manager; /* the manager coro */
125static SV *sv_idle; /* $Coro::idle */
182 126
183static GV *irsgv; /* $/ */ 127static GV *irsgv; /* $/ */
184static GV *stdoutgv; /* *STDOUT */ 128static GV *stdoutgv; /* *STDOUT */
185static SV *rv_diehook; 129static SV *rv_diehook;
186static SV *rv_warnhook; 130static SV *rv_warnhook;
… …
191static SV *sv_pool_size; 135static SV *sv_pool_size;
192static SV *sv_async_pool_idle; /* description string */ 136static SV *sv_async_pool_idle; /* description string */
193static AV *av_async_pool; /* idle pool */ 137static AV *av_async_pool; /* idle pool */
194static SV *sv_Coro; /* class string */ 138static SV *sv_Coro; /* class string */
195static CV *cv_pool_handler; 139static CV *cv_pool_handler;
196static CV *cv_coro_state_new;
197 140
198/* Coro::AnyEvent */ 141/* Coro::AnyEvent */
199static SV *sv_activity; 142static SV *sv_activity;
200 143
144/* enable processtime/realtime profiling */
145static char enable_times;
146typedef U32 coro_ts[2];
147static coro_ts time_real, time_cpu;
148static char times_valid;
149
201static struct coro_cctx *cctx_first; 150static struct coro_cctx *cctx_first;
202static int cctx_count, cctx_idle; 151static int cctx_count, cctx_idle;
203 152
204enum { 153enum
154{
205 CC_MAPPED = 0x01, 155 CC_MAPPED = 0x01,
206 CC_NOREUSE = 0x02, /* throw this away after tracing */ 156 CC_NOREUSE = 0x02, /* throw this away after tracing */
207 CC_TRACE = 0x04, 157 CC_TRACE = 0x04,
208 CC_TRACE_SUB = 0x08, /* trace sub calls */ 158 CC_TRACE_SUB = 0x08, /* trace sub calls */
209 CC_TRACE_LINE = 0x10, /* trace each statement */ 159 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
214typedef struct coro_cctx 164typedef struct coro_cctx
215{ 165{
216 struct coro_cctx *next; 166 struct coro_cctx *next;
217 167
218 /* the stack */ 168 /* the stack */
219 void *sptr; 169 struct coro_stack stack;
220 size_t ssize;
221 170
222 /* cpu state */ 171 /* cpu state */
223 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 172 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
173#ifndef NDEBUG
224 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 174 JMPENV *idle_te; /* same as idle_sp, but for top_env */
175#endif
225 JMPENV *top_env; 176 JMPENV *top_env;
226 coro_context cctx; 177 coro_context cctx;
227 178
228 U32 gen; 179 U32 gen;
229#if CORO_USE_VALGRIND 180#if CORO_USE_VALGRIND
230 int valgrind_id; 181 int valgrind_id;
231#endif 182#endif
232 unsigned char flags; 183 unsigned char flags;
233} coro_cctx; 184} coro_cctx;
234 185
186static coro_cctx *cctx_current; /* the currently running cctx */
187
188/*****************************************************************************/
189
190static MGVTBL coro_state_vtbl;
191
235enum { 192enum
193{
236 CF_RUNNING = 0x0001, /* coroutine is running */ 194 CF_RUNNING = 0x0001, /* coroutine is running */
237 CF_READY = 0x0002, /* coroutine is ready */ 195 CF_READY = 0x0002, /* coroutine is ready */
238 CF_NEW = 0x0004, /* has never been switched to */ 196 CF_NEW = 0x0004, /* has never been switched to */
239 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 197 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
198 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
199 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
240}; 200};
241 201
242/* the structure where most of the perl state is stored, overlaid on the cxstack */ 202/* the structure where most of the perl state is stored, overlaid on the cxstack */
243typedef struct 203typedef struct
244{ 204{
245 SV *defsv;
246 AV *defav;
247 SV *errsv;
248 SV *irsgv;
249#define VAR(name,type) type name; 205 #define VARx(name,expr,type) type name;
250# include "state.h" 206 #include "state.h"
251#undef VAR
252} perl_slots; 207} perl_slots;
253 208
209/* how many context stack entries do we need for perl_slots */
254#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 210#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
255 211
256/* this is a structure representing a perl-level coroutine */ 212/* this is a structure representing a perl-level coroutine */
257struct coro { 213struct coro
214{
258 /* the C coroutine allocated to this perl coroutine, if any */ 215 /* the C coroutine allocated to this perl coroutine, if any */
259 coro_cctx *cctx; 216 coro_cctx *cctx;
217
218 /* ready queue */
219 struct coro *next_ready;
260 220
261 /* state data */ 221 /* state data */
262 struct CoroSLF slf_frame; /* saved slf frame */ 222 struct CoroSLF slf_frame; /* saved slf frame */
263 AV *mainstack; 223 AV *mainstack;
264 perl_slots *slot; /* basically the saved sp */ 224 perl_slots *slot; /* basically the saved sp */
265 225
266 CV *startcv; /* the CV to execute */ 226 CV *startcv; /* the CV to execute */
267 AV *args; /* data associated with this coroutine (initial args) */ 227 AV *args; /* data associated with this coroutine (initial args) */
268 int refcnt; /* coroutines are refcounted, yes */
269 int flags; /* CF_ flags */ 228 int flags; /* CF_ flags */
270 HV *hv; /* the perl hash associated with this coro, if any */ 229 HV *hv; /* the perl hash associated with this coro, if any */
271 void (*on_destroy)(pTHX_ struct coro *coro);
272 230
273 /* statistics */ 231 /* statistics */
274 int usecount; /* number of transfers to this coro */ 232 int usecount; /* number of transfers to this coro */
275 233
276 /* coro process data */ 234 /* coro process data */
277 int prio; 235 int prio;
278 SV *except; /* exception to be thrown */ 236 SV *except; /* exception to be thrown */
279 SV *rouse_cb; 237 SV *rouse_cb; /* last rouse callback */
238 AV *on_destroy; /* callbacks or coros to notify on destroy */
239 AV *status; /* the exit status list */
280 240
281 /* async_pool */ 241 /* async_pool */
282 SV *saved_deffh; 242 SV *saved_deffh;
283 SV *invoke_cb; 243 SV *invoke_cb;
284 AV *invoke_av; 244 AV *invoke_av;
285 245
246 /* on_enter/on_leave */
247 AV *on_enter;
248 AV *on_leave;
249
250 /* swap_sv */
251 AV *swap_sv;
252
253 /* times */
254 coro_ts t_cpu, t_real;
255
286 /* linked list */ 256 /* linked list */
287 struct coro *next, *prev; 257 struct coro *next, *prev;
288}; 258};
289 259
290typedef struct coro *Coro__State; 260typedef struct coro *Coro__State;
291typedef struct coro *Coro__State_or_hashref; 261typedef struct coro *Coro__State_or_hashref;
292 262
293/* the following variables are effectively part of the perl context */ 263/* the following variables are effectively part of the perl context */
294/* and get copied between struct coro and these variables */ 264/* and get copied between struct coro and these variables */
295/* the mainr easonw e don't support windows process emulation */ 265/* the main reason we don't support windows process emulation */
296static struct CoroSLF slf_frame; /* the current slf frame */ 266static struct CoroSLF slf_frame; /* the current slf frame */
297 267
298/** Coro ********************************************************************/ 268/** Coro ********************************************************************/
299 269
300#define PRIO_MAX 3 270#define CORO_PRIO_MAX 3
301#define PRIO_HIGH 1 271#define CORO_PRIO_HIGH 1
302#define PRIO_NORMAL 0 272#define CORO_PRIO_NORMAL 0
303#define PRIO_LOW -1 273#define CORO_PRIO_LOW -1
304#define PRIO_IDLE -3 274#define CORO_PRIO_IDLE -3
305#define PRIO_MIN -4 275#define CORO_PRIO_MIN -4
306 276
307/* for Coro.pm */ 277/* for Coro.pm */
308static SV *coro_current; 278static SV *coro_current;
309static SV *coro_readyhook; 279static SV *coro_readyhook;
310static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 280static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
311static CV *cv_coro_run, *cv_coro_terminate; 281static CV *cv_coro_run;
312static struct coro *coro_first; 282static struct coro *coro_first;
313#define coro_nready coroapi.nready 283#define coro_nready coroapi.nready
314 284
285/** JIT *********************************************************************/
286
287#if CORO_JIT
288 /* APPLE doesn't have mmap though */
289 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
290 #ifndef CORO_JIT_TYPE
291 #if ECB_AMD64 && CORO_JIT_UNIXY
292 #define CORO_JIT_TYPE "amd64-unix"
293 #elif __i386 && CORO_JIT_UNIXY
294 #define CORO_JIT_TYPE "x86-unix"
295 #endif
296 #endif
297#endif
298
299#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
300 #undef CORO_JIT
301#endif
302
303#if CORO_JIT
304 typedef void (*load_save_perl_slots_type)(perl_slots *);
305 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
306#endif
307
308/** Coro::Select ************************************************************/
309
310static OP *(*coro_old_pp_sselect) (pTHX);
311static SV *coro_select_select;
312
313/* horrible hack, but if it works... */
314static OP *
315coro_pp_sselect (pTHX)
316{
317 dSP;
318 PUSHMARK (SP - 4); /* fake argument list */
319 XPUSHs (coro_select_select);
320 PUTBACK;
321
322 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
323 PL_op->op_flags |= OPf_STACKED;
324 PL_op->op_private = 0;
325 return PL_ppaddr [OP_ENTERSUB](aTHX);
326}
327
328/** time stuff **************************************************************/
329
330#ifdef HAS_GETTIMEOFDAY
331
332ecb_inline void
333coro_u2time (pTHX_ UV ret[2])
334{
335 struct timeval tv;
336 gettimeofday (&tv, 0);
337
338 ret [0] = tv.tv_sec;
339 ret [1] = tv.tv_usec;
340}
341
342ecb_inline double
343coro_nvtime (void)
344{
345 struct timeval tv;
346 gettimeofday (&tv, 0);
347
348 return tv.tv_sec + tv.tv_usec * 1e-6;
349}
350
351ecb_inline void
352time_init (pTHX)
353{
354 nvtime = coro_nvtime;
355 u2time = coro_u2time;
356}
357
358#else
359
360ecb_inline void
361time_init (pTHX)
362{
363 SV **svp;
364
365 require_pv ("Time/HiRes.pm");
366
367 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
368
369 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
370 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
371
372 nvtime = INT2PTR (double (*)(), SvIV (*svp));
373
374 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
375 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
376}
377
378#endif
379
315/** lowlevel stuff **********************************************************/ 380/** lowlevel stuff **********************************************************/
316 381
317static SV * 382static SV * ecb_noinline
318coro_get_sv (pTHX_ const char *name, int create) 383coro_get_sv (pTHX_ const char *name, int create)
319{ 384{
320#if PERL_VERSION_ATLEAST (5,10,0) 385#if PERL_VERSION_ATLEAST (5,10,0)
321 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 386 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
322 get_sv (name, create); 387 get_sv (name, create);
323#endif 388#endif
324 return get_sv (name, create); 389 return get_sv (name, create);
325} 390}
326 391
327static AV * 392static AV * ecb_noinline
328coro_get_av (pTHX_ const char *name, int create) 393coro_get_av (pTHX_ const char *name, int create)
329{ 394{
330#if PERL_VERSION_ATLEAST (5,10,0) 395#if PERL_VERSION_ATLEAST (5,10,0)
331 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 396 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
332 get_av (name, create); 397 get_av (name, create);
333#endif 398#endif
334 return get_av (name, create); 399 return get_av (name, create);
335} 400}
336 401
337static HV * 402static HV * ecb_noinline
338coro_get_hv (pTHX_ const char *name, int create) 403coro_get_hv (pTHX_ const char *name, int create)
339{ 404{
340#if PERL_VERSION_ATLEAST (5,10,0) 405#if PERL_VERSION_ATLEAST (5,10,0)
341 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 406 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
342 get_hv (name, create); 407 get_hv (name, create);
343#endif 408#endif
344 return get_hv (name, create); 409 return get_hv (name, create);
345} 410}
346 411
347/* may croak */ 412ecb_inline void
348INLINE CV * 413coro_times_update (void)
349coro_sv_2cv (pTHX_ SV *sv)
350{ 414{
351 HV *st; 415#ifdef coro_clock_gettime
352 GV *gvp; 416 struct timespec ts;
353 return sv_2cv (sv, &st, &gvp, 0);
354}
355 417
356static AV * 418 ts.tv_sec = ts.tv_nsec = 0;
419 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
420 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
421
422 ts.tv_sec = ts.tv_nsec = 0;
423 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
424 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
425#else
426 dTHX;
427 UV tv[2];
428
429 u2time (aTHX_ tv);
430 time_real [0] = tv [0];
431 time_real [1] = tv [1] * 1000;
432#endif
433}
434
435ecb_inline void
436coro_times_add (struct coro *c)
437{
438 c->t_real [1] += time_real [1];
439 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
440 c->t_real [0] += time_real [0];
441
442 c->t_cpu [1] += time_cpu [1];
443 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
444 c->t_cpu [0] += time_cpu [0];
445}
446
447ecb_inline void
448coro_times_sub (struct coro *c)
449{
450 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
451 c->t_real [1] -= time_real [1];
452 c->t_real [0] -= time_real [0];
453
454 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
455 c->t_cpu [1] -= time_cpu [1];
456 c->t_cpu [0] -= time_cpu [0];
457}
458
459/*****************************************************************************/
460/* magic glue */
461
462#define CORO_MAGIC_type_cv 26
463#define CORO_MAGIC_type_state PERL_MAGIC_ext
464
465#define CORO_MAGIC_NN(sv, type) \
466 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
467 ? SvMAGIC (sv) \
468 : mg_find (sv, type))
469
470#define CORO_MAGIC(sv, type) \
471 (ecb_expect_true (SvMAGIC (sv)) \
472 ? CORO_MAGIC_NN (sv, type) \
473 : 0)
474
475#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
476#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
477
478ecb_inline MAGIC *
479SvSTATEhv_p (pTHX_ SV *coro)
480{
481 MAGIC *mg;
482
483 if (ecb_expect_true (
484 SvTYPE (coro) == SVt_PVHV
485 && (mg = CORO_MAGIC_state (coro))
486 && mg->mg_virtual == &coro_state_vtbl
487 ))
488 return mg;
489
490 return 0;
491}
492
493ecb_inline struct coro *
494SvSTATE_ (pTHX_ SV *coro)
495{
496 MAGIC *mg;
497
498 if (SvROK (coro))
499 coro = SvRV (coro);
500
501 mg = SvSTATEhv_p (aTHX_ coro);
502 if (!mg)
503 croak ("Coro::State object required");
504
505 return (struct coro *)mg->mg_ptr;
506}
507
508#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
509
510/* faster than SvSTATE, but expects a coroutine hv */
511#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
512#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
513
514/*****************************************************************************/
515/* padlist management and caching */
516
517ecb_inline PADLIST *
357coro_derive_padlist (pTHX_ CV *cv) 518coro_derive_padlist (pTHX_ CV *cv)
358{ 519{
359 AV *padlist = CvPADLIST (cv); 520 PADLIST *padlist = CvPADLIST (cv);
360 AV *newpadlist, *newpad; 521 PADLIST *newpadlist;
522 PAD *newpad;
523 PADOFFSET off = PadlistMAX (padlist) + 1;
361 524
362 newpadlist = newAV (); 525#if NEWPADAPI
526
527 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
528 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
529 while (!PadlistARRAY (padlist)[off - 1])
530 --off;
531
532 Perl_pad_push (aTHX_ padlist, off);
533
534 newpad = PadlistARRAY (padlist)[off];
535 PadlistARRAY (padlist)[off] = 0;
536
537#else
538
539#if PERL_VERSION_ATLEAST (5,10,0)
540 Perl_pad_push (aTHX_ padlist, off);
541#else
542 Perl_pad_push (aTHX_ padlist, off, 1);
543#endif
544
545 newpad = PadlistARRAY (padlist)[off];
546 PadlistMAX (padlist) = off - 1;
547
548#endif
549
550 newPADLIST (newpadlist);
551#if !PERL_VERSION_ATLEAST(5,15,3)
552 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
363 AvREAL_off (newpadlist); 553 AvREAL_off (newpadlist);
364#if PERL_VERSION_ATLEAST (5,10,0)
365 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
366#else
367 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
368#endif 554#endif
369 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
370 --AvFILLp (padlist);
371 555
372 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 556 /* Already extended to 2 elements by newPADLIST. */
373 av_store (newpadlist, 1, (SV *)newpad); 557 PadlistMAX (newpadlist) = 1;
558 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
559 PadlistARRAY (newpadlist)[1] = newpad;
374 560
375 return newpadlist; 561 return newpadlist;
376} 562}
377 563
378static void 564ecb_inline void
379free_padlist (pTHX_ AV *padlist) 565free_padlist (pTHX_ PADLIST *padlist)
380{ 566{
381 /* may be during global destruction */ 567 /* may be during global destruction */
382 if (SvREFCNT (padlist)) 568 if (!IN_DESTRUCT)
383 { 569 {
384 I32 i = AvFILLp (padlist); 570 I32 i = PadlistMAX (padlist);
385 while (i >= 0) 571
572 while (i > 0) /* special-case index 0 */
386 { 573 {
387 SV **svp = av_fetch (padlist, i--, FALSE); 574 /* we try to be extra-careful here */
575 PAD *pad = PadlistARRAY (padlist)[i--];
576
388 if (svp) 577 if (pad)
389 { 578 {
390 SV *sv; 579 I32 j = PadMAX (pad);
391 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 580
581 while (j >= 0)
392 SvREFCNT_dec (sv); 582 SvREFCNT_dec (PadARRAY (pad)[j--]);
393 583
584 PadMAX (pad) = -1;
394 SvREFCNT_dec (*svp); 585 SvREFCNT_dec (pad);
395 } 586 }
396 } 587 }
397 588
589 SvREFCNT_dec (PadlistNAMES (padlist));
590
591#if NEWPADAPI
592 Safefree (PadlistARRAY (padlist));
593 Safefree (padlist);
594#else
595 AvFILLp (padlist) = -1;
596 AvREAL_off (padlist);
398 SvREFCNT_dec ((SV*)padlist); 597 SvREFCNT_dec ((SV*)padlist);
598#endif
399 } 599 }
400} 600}
401 601
402static int 602static int
403coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 603coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
404{ 604{
405 AV *padlist; 605 PADLIST *padlist;
406 AV *av = (AV *)mg->mg_obj; 606 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
607 size_t len = *(size_t *)mg->mg_ptr;
407 608
408 /* casting is fun. */ 609 /* perl manages to free our internal AV and _then_ call us */
409 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 610 if (IN_DESTRUCT)
611 return 0;
612
613 while (len--)
410 free_padlist (aTHX_ padlist); 614 free_padlist (aTHX_ padlists[len]);
411
412 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
413 615
414 return 0; 616 return 0;
415} 617}
416
417#define CORO_MAGIC_type_cv 26
418#define CORO_MAGIC_type_state PERL_MAGIC_ext
419 618
420static MGVTBL coro_cv_vtbl = { 619static MGVTBL coro_cv_vtbl = {
421 0, 0, 0, 0, 620 0, 0, 0, 0,
422 coro_cv_free 621 coro_cv_free
423}; 622};
424 623
425#define CORO_MAGIC_NN(sv, type) \
426 (expect_true (SvMAGIC (sv)->mg_type == type) \
427 ? SvMAGIC (sv) \
428 : mg_find (sv, type))
429
430#define CORO_MAGIC(sv, type) \
431 (expect_true (SvMAGIC (sv)) \
432 ? CORO_MAGIC_NN (sv, type) \
433 : 0)
434
435#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
436#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
437
438INLINE struct coro *
439SvSTATE_ (pTHX_ SV *coro)
440{
441 HV *stash;
442 MAGIC *mg;
443
444 if (SvROK (coro))
445 coro = SvRV (coro);
446
447 if (expect_false (SvTYPE (coro) != SVt_PVHV))
448 croak ("Coro::State object required");
449
450 stash = SvSTASH (coro);
451 if (expect_false (stash != coro_stash && stash != coro_state_stash))
452 {
453 /* very slow, but rare, check */
454 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
455 croak ("Coro::State object required");
456 }
457
458 mg = CORO_MAGIC_state (coro);
459 return (struct coro *)mg->mg_ptr;
460}
461
462#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
463
464/* faster than SvSTATE, but expects a coroutine hv */
465#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
466#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
467
468/* the next two functions merely cache the padlists */ 624/* the next two functions merely cache the padlists */
469static void 625ecb_inline void
470get_padlist (pTHX_ CV *cv) 626get_padlist (pTHX_ CV *cv)
471{ 627{
472 MAGIC *mg = CORO_MAGIC_cv (cv); 628 MAGIC *mg = CORO_MAGIC_cv (cv);
473 AV *av; 629 size_t *lenp;
474 630
475 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 631 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
476 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 632 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
477 else 633 else
478 { 634 {
479#if CORO_PREFER_PERL_FUNCTIONS 635#if CORO_PREFER_PERL_FUNCTIONS
480 /* this is probably cleaner? but also slower! */ 636 /* this is probably cleaner? but also slower! */
481 /* in practise, it seems to be less stable */ 637 /* in practise, it seems to be less stable */
… …
487 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 643 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
488#endif 644#endif
489 } 645 }
490} 646}
491 647
492static void 648ecb_inline void
493put_padlist (pTHX_ CV *cv) 649put_padlist (pTHX_ CV *cv)
494{ 650{
495 MAGIC *mg = CORO_MAGIC_cv (cv); 651 MAGIC *mg = CORO_MAGIC_cv (cv);
496 AV *av;
497 652
498 if (expect_false (!mg)) 653 if (ecb_expect_false (!mg))
654 {
499 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 655 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
656 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
657 mg->mg_len = 1; /* so mg_free frees mg_ptr */
658 }
659 else
660 Renew (mg->mg_ptr,
661 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
662 char);
500 663
501 av = (AV *)mg->mg_obj; 664 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
502
503 if (expect_false (AvFILLp (av) >= AvMAX (av)))
504 av_extend (av, AvMAX (av) + 1);
505
506 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
507} 665}
508 666
509/** load & save, init *******************************************************/ 667/** load & save, init *******************************************************/
668
669ecb_inline void
670swap_sv (SV *a, SV *b)
671{
672 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
673 SV tmp;
674
675 /* swap sv_any */
676 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
677
678 /* swap sv_flags */
679 SvFLAGS (&tmp) = SvFLAGS (a);
680 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
681 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
682
683#if PERL_VERSION_ATLEAST (5,10,0)
684 /* perl 5.10 and later complicates this _quite_ a bit, but it also
685 * is much faster, so no quarrels here. alternatively, we could
686 * sv_upgrade to avoid this.
687 */
688 {
689 /* swap sv_u */
690 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
691
692 /* if SvANY points to the head, we need to adjust the pointers,
693 * as the pointer for a still points to b, and maybe vice versa.
694 */
695 #define svany_in_head(type) \
696 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
697
698 if (svany_in_head (SvTYPE (a)))
699 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
700
701 if (svany_in_head (SvTYPE (b)))
702 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
703 }
704#endif
705}
706
707/* swap sv heads, at least logically */
708static void
709swap_svs (pTHX_ Coro__State c)
710{
711 int i;
712
713 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
714 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
715}
716
717#define SWAP_SVS(coro) \
718 if (ecb_expect_false ((coro)->swap_sv)) \
719 swap_svs (aTHX_ (coro))
720
721static void
722on_enterleave_call (pTHX_ SV *cb);
510 723
511static void 724static void
512load_perl (pTHX_ Coro__State c) 725load_perl (pTHX_ Coro__State c)
513{ 726{
514 perl_slots *slot = c->slot; 727 perl_slots *slot = c->slot;
515 c->slot = 0; 728 c->slot = 0;
516 729
517 PL_mainstack = c->mainstack; 730 PL_mainstack = c->mainstack;
518 731
519 GvSV (PL_defgv) = slot->defsv; 732#if CORO_JIT
520 GvAV (PL_defgv) = slot->defav; 733 load_perl_slots (slot);
521 GvSV (PL_errgv) = slot->errsv; 734#else
522 GvSV (irsgv) = slot->irsgv;
523
524 #define VAR(name,type) PL_ ## name = slot->name; 735 #define VARx(name,expr,type) expr = slot->name;
525 # include "state.h" 736 #include "state.h"
526 #undef VAR 737#endif
527 738
528 { 739 {
529 dSP; 740 dSP;
530 741
531 CV *cv; 742 CV *cv;
532 743
533 /* now do the ugly restore mess */ 744 /* now do the ugly restore mess */
534 while (expect_true (cv = (CV *)POPs)) 745 while (ecb_expect_true (cv = (CV *)POPs))
535 { 746 {
536 put_padlist (aTHX_ cv); /* mark this padlist as available */ 747 put_padlist (aTHX_ cv); /* mark this padlist as available */
537 CvDEPTH (cv) = PTR2IV (POPs); 748 CvDEPTH (cv) = PTR2IV (POPs);
538 CvPADLIST (cv) = (AV *)POPs; 749 CvPADLIST (cv) = (PADLIST *)POPs;
539 } 750 }
540 751
541 PUTBACK; 752 PUTBACK;
542 } 753 }
543 754
544 slf_frame = c->slf_frame; 755 slf_frame = c->slf_frame;
545 CORO_THROW = c->except; 756 CORO_THROW = c->except;
757
758 if (ecb_expect_false (enable_times))
759 {
760 if (ecb_expect_false (!times_valid))
761 coro_times_update ();
762
763 coro_times_sub (c);
764 }
765
766 if (ecb_expect_false (c->on_enter))
767 {
768 int i;
769
770 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
771 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
772 }
773
774 SWAP_SVS (c);
546} 775}
547 776
548static void 777static void
549save_perl (pTHX_ Coro__State c) 778save_perl (pTHX_ Coro__State c)
550{ 779{
780 SWAP_SVS (c);
781
782 if (ecb_expect_false (c->on_leave))
783 {
784 int i;
785
786 for (i = AvFILLp (c->on_leave); i >= 0; --i)
787 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
788 }
789
790 times_valid = 0;
791
792 if (ecb_expect_false (enable_times))
793 {
794 coro_times_update (); times_valid = 1;
795 coro_times_add (c);
796 }
797
551 c->except = CORO_THROW; 798 c->except = CORO_THROW;
552 c->slf_frame = slf_frame; 799 c->slf_frame = slf_frame;
553 800
554 { 801 {
555 dSP; 802 dSP;
… …
564 811
565 XPUSHs (Nullsv); 812 XPUSHs (Nullsv);
566 /* this loop was inspired by pp_caller */ 813 /* this loop was inspired by pp_caller */
567 for (;;) 814 for (;;)
568 { 815 {
569 while (expect_true (cxix >= 0)) 816 while (ecb_expect_true (cxix >= 0))
570 { 817 {
571 PERL_CONTEXT *cx = &ccstk[cxix--]; 818 PERL_CONTEXT *cx = &ccstk[cxix--];
572 819
573 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 820 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
574 { 821 {
575 CV *cv = cx->blk_sub.cv; 822 CV *cv = cx->blk_sub.cv;
576 823
577 if (expect_true (CvDEPTH (cv))) 824 if (ecb_expect_true (CvDEPTH (cv)))
578 { 825 {
579 EXTEND (SP, 3); 826 EXTEND (SP, 3);
580 PUSHs ((SV *)CvPADLIST (cv)); 827 PUSHs ((SV *)CvPADLIST (cv));
581 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 828 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
582 PUSHs ((SV *)cv); 829 PUSHs ((SV *)cv);
… …
585 get_padlist (aTHX_ cv); 832 get_padlist (aTHX_ cv);
586 } 833 }
587 } 834 }
588 } 835 }
589 836
590 if (expect_true (top_si->si_type == PERLSI_MAIN)) 837 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
591 break; 838 break;
592 839
593 top_si = top_si->si_prev; 840 top_si = top_si->si_prev;
594 ccstk = top_si->si_cxstack; 841 ccstk = top_si->si_cxstack;
595 cxix = top_si->si_cxix; 842 cxix = top_si->si_cxix;
… …
597 844
598 PUTBACK; 845 PUTBACK;
599 } 846 }
600 847
601 /* allocate some space on the context stack for our purposes */ 848 /* allocate some space on the context stack for our purposes */
602 /* we manually unroll here, as usually 2 slots is enough */ 849 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
603 if (SLOT_COUNT >= 1) CXINC;
604 if (SLOT_COUNT >= 2) CXINC;
605 if (SLOT_COUNT >= 3) CXINC;
606 { 850 {
607 int i; 851 unsigned int i;
852
608 for (i = 3; i < SLOT_COUNT; ++i) 853 for (i = 0; i < SLOT_COUNT; ++i)
609 CXINC; 854 CXINC;
610 } 855
611 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 856 cxstack_ix -= SLOT_COUNT; /* undo allocation */
857 }
612 858
613 c->mainstack = PL_mainstack; 859 c->mainstack = PL_mainstack;
614 860
615 { 861 {
616 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 862 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
617 863
618 slot->defav = GvAV (PL_defgv); 864#if CORO_JIT
619 slot->defsv = DEFSV; 865 save_perl_slots (slot);
620 slot->errsv = ERRSV; 866#else
621 slot->irsgv = GvSV (irsgv);
622
623 #define VAR(name,type) slot->name = PL_ ## name; 867 #define VARx(name,expr,type) slot->name = expr;
624 # include "state.h" 868 #include "state.h"
625 #undef VAR 869#endif
626 } 870 }
627} 871}
628 872
629/* 873/*
630 * allocate various perl stacks. This is almost an exact copy 874 * allocate various perl stacks. This is almost an exact copy
… …
636# define coro_init_stacks(thx) init_stacks () 880# define coro_init_stacks(thx) init_stacks ()
637#else 881#else
638static void 882static void
639coro_init_stacks (pTHX) 883coro_init_stacks (pTHX)
640{ 884{
641 PL_curstackinfo = new_stackinfo(32, 8); 885 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
642 PL_curstackinfo->si_type = PERLSI_MAIN; 886 PL_curstackinfo->si_type = PERLSI_MAIN;
643 PL_curstack = PL_curstackinfo->si_stack; 887 PL_curstack = PL_curstackinfo->si_stack;
644 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 888 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
645 889
646 PL_stack_base = AvARRAY(PL_curstack); 890 PL_stack_base = AvARRAY(PL_curstack);
… …
661#endif 905#endif
662 906
663 New(54,PL_scopestack,8,I32); 907 New(54,PL_scopestack,8,I32);
664 PL_scopestack_ix = 0; 908 PL_scopestack_ix = 0;
665 PL_scopestack_max = 8; 909 PL_scopestack_max = 8;
910#if HAS_SCOPESTACK_NAME
911 New(54,PL_scopestack_name,8,const char*);
912#endif
666 913
667 New(54,PL_savestack,24,ANY); 914 New(54,PL_savestack,24,ANY);
668 PL_savestack_ix = 0; 915 PL_savestack_ix = 0;
669 PL_savestack_max = 24; 916 PL_savestack_max = 24;
670 917
… …
698 } 945 }
699 946
700 Safefree (PL_tmps_stack); 947 Safefree (PL_tmps_stack);
701 Safefree (PL_markstack); 948 Safefree (PL_markstack);
702 Safefree (PL_scopestack); 949 Safefree (PL_scopestack);
950#if HAS_SCOPESTACK_NAME
951 Safefree (PL_scopestack_name);
952#endif
703 Safefree (PL_savestack); 953 Safefree (PL_savestack);
704#if !PERL_VERSION_ATLEAST (5,10,0) 954#if !PERL_VERSION_ATLEAST (5,10,0)
705 Safefree (PL_retstack); 955 Safefree (PL_retstack);
706#endif 956#endif
707} 957}
… …
753#endif 1003#endif
754 1004
755/* 1005/*
756 * This overrides the default magic get method of %SIG elements. 1006 * This overrides the default magic get method of %SIG elements.
757 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1007 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
758 * and instead of tryign to save and restore the hash elements, we just provide 1008 * and instead of trying to save and restore the hash elements (extremely slow),
759 * readback here. 1009 * we just provide our own readback here.
760 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
761 * not expecting this to actually change the hook. This is a potential problem
762 * when a schedule happens then, but we ignore this.
763 */ 1010 */
764static int 1011static int ecb_cold
765coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1012coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
766{ 1013{
767 const char *s = MgPV_nolen_const (mg); 1014 const char *s = MgPV_nolen_const (mg);
768 1015
769 if (*s == '_') 1016 if (*s == '_')
770 { 1017 {
771 SV **svp = 0; 1018 SV **svp = 0;
772 1019
773 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1020 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
774 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1021 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
775 1022
776 if (svp) 1023 if (svp)
777 { 1024 {
778 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1025 SV *ssv;
1026
1027 if (!*svp)
1028 ssv = &PL_sv_undef;
1029 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1030 ssv = sv_2mortal (newRV_inc (*svp));
1031 else
1032 ssv = *svp;
1033
1034 sv_setsv (sv, ssv);
779 return 0; 1035 return 0;
780 } 1036 }
781 } 1037 }
782 1038
783 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1039 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
784} 1040}
785 1041
786static int 1042static int ecb_cold
787coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1043coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
788{ 1044{
789 const char *s = MgPV_nolen_const (mg); 1045 const char *s = MgPV_nolen_const (mg);
790 1046
791 if (*s == '_') 1047 if (*s == '_')
… …
805 } 1061 }
806 1062
807 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1063 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
808} 1064}
809 1065
810static int 1066static int ecb_cold
811coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1067coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
812{ 1068{
813 const char *s = MgPV_nolen_const (mg); 1069 const char *s = MgPV_nolen_const (mg);
814 1070
815 if (*s == '_') 1071 if (*s == '_')
… …
820 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1076 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
821 1077
822 if (svp) 1078 if (svp)
823 { 1079 {
824 SV *old = *svp; 1080 SV *old = *svp;
825 *svp = newSVsv (sv); 1081 *svp = SvOK (sv) ? newSVsv (sv) : 0;
826 SvREFCNT_dec (old); 1082 SvREFCNT_dec (old);
827 return 0; 1083 return 0;
828 } 1084 }
829 } 1085 }
830 1086
… …
848slf_check_repeat (pTHX_ struct CoroSLF *frame) 1104slf_check_repeat (pTHX_ struct CoroSLF *frame)
849{ 1105{
850 return 1; 1106 return 1;
851} 1107}
852 1108
853static UNOP coro_setup_op; 1109static UNOP init_perl_op;
854 1110
855static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1111ecb_noinline static void /* noinline to keep it out of the transfer fast path */
856coro_setup (pTHX_ struct coro *coro) 1112init_perl (pTHX_ struct coro *coro)
857{ 1113{
858 /* 1114 /*
859 * emulate part of the perl startup here. 1115 * emulate part of the perl startup here.
860 */ 1116 */
861 coro_init_stacks (aTHX); 1117 coro_init_stacks (aTHX);
862 1118
863 PL_runops = RUNOPS_DEFAULT; 1119 PL_runops = RUNOPS_DEFAULT;
864 PL_curcop = &PL_compiling; 1120 PL_curcop = &PL_compiling;
865 PL_in_eval = EVAL_NULL; 1121 PL_in_eval = EVAL_NULL;
866 PL_comppad = 0; 1122 PL_comppad = 0;
1123 PL_comppad_name = 0;
1124 PL_comppad_name_fill = 0;
1125 PL_comppad_name_floor = 0;
867 PL_curpm = 0; 1126 PL_curpm = 0;
868 PL_curpad = 0; 1127 PL_curpad = 0;
869 PL_localizing = 0; 1128 PL_localizing = 0;
870 PL_dirty = 0;
871 PL_restartop = 0; 1129 PL_restartop = 0;
872#if PERL_VERSION_ATLEAST (5,10,0) 1130#if PERL_VERSION_ATLEAST (5,10,0)
873 PL_parser = 0; 1131 PL_parser = 0;
874#endif 1132#endif
1133 PL_hints = 0;
875 1134
876 /* recreate the die/warn hooks */ 1135 /* recreate the die/warn hooks */
877 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1136 PL_diehook = SvREFCNT_inc (rv_diehook);
878 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1137 PL_warnhook = SvREFCNT_inc (rv_warnhook);
879 1138
880 GvSV (PL_defgv) = newSV (0); 1139 GvSV (PL_defgv) = newSV (0);
881 GvAV (PL_defgv) = coro->args; coro->args = 0; 1140 GvAV (PL_defgv) = coro->args; coro->args = 0;
882 GvSV (PL_errgv) = newSV (0); 1141 GvSV (PL_errgv) = newSV (0);
883 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1142 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1143 GvHV (PL_hintgv) = newHV ();
1144#if PERL_VERSION_ATLEAST (5,10,0)
1145 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1146#endif
884 PL_rs = newSVsv (GvSV (irsgv)); 1147 PL_rs = newSVsv (GvSV (irsgv));
885 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1148 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
886 1149
887 { 1150 {
888 dSP; 1151 dSP;
… …
903 /* this newly created coroutine might be run on an existing cctx which most 1166 /* this newly created coroutine might be run on an existing cctx which most
904 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1167 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
905 */ 1168 */
906 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1169 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
907 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1170 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1171 slf_frame.destroy = 0;
908 1172
909 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1173 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
910 coro_setup_op.op_next = PL_op; 1174 init_perl_op.op_next = PL_op;
911 coro_setup_op.op_type = OP_ENTERSUB; 1175 init_perl_op.op_type = OP_ENTERSUB;
912 coro_setup_op.op_ppaddr = pp_slf; 1176 init_perl_op.op_ppaddr = pp_slf;
913 /* no flags etc. required, as an init function won't be called */ 1177 /* no flags etc. required, as an init function won't be called */
914 1178
915 PL_op = (OP *)&coro_setup_op; 1179 PL_op = (OP *)&init_perl_op;
916 1180
917 /* copy throw, in case it was set before coro_setup */ 1181 /* copy throw, in case it was set before init_perl */
918 CORO_THROW = coro->except; 1182 CORO_THROW = coro->except;
919}
920 1183
1184 SWAP_SVS (coro);
1185
1186 if (ecb_expect_false (enable_times))
1187 {
1188 coro_times_update ();
1189 coro_times_sub (coro);
1190 }
1191}
1192
921static void 1193static void
922coro_destruct (pTHX_ struct coro *coro) 1194coro_unwind_stacks (pTHX)
923{ 1195{
924 if (!IN_DESTRUCT) 1196 if (!IN_DESTRUCT)
925 { 1197 {
926 /* restore all saved variables and stuff */ 1198 /* restore all saved variables and stuff */
927 LEAVE_SCOPE (0); 1199 LEAVE_SCOPE (0);
… …
935 POPSTACK_TO (PL_mainstack); 1207 POPSTACK_TO (PL_mainstack);
936 1208
937 /* unwind main stack */ 1209 /* unwind main stack */
938 dounwind (-1); 1210 dounwind (-1);
939 } 1211 }
1212}
940 1213
941 SvREFCNT_dec (GvSV (PL_defgv)); 1214static void
942 SvREFCNT_dec (GvAV (PL_defgv)); 1215destroy_perl (pTHX_ struct coro *coro)
943 SvREFCNT_dec (GvSV (PL_errgv)); 1216{
944 SvREFCNT_dec (PL_defoutgv); 1217 SV *svf [9];
945 SvREFCNT_dec (PL_rs);
946 SvREFCNT_dec (GvSV (irsgv));
947 1218
948 SvREFCNT_dec (PL_diehook);
949 SvREFCNT_dec (PL_warnhook);
950 1219 {
1220 SV *old_current = SvRV (coro_current);
1221 struct coro *current = SvSTATE (old_current);
1222
1223 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1224
1225 save_perl (aTHX_ current);
1226
1227 /* this will cause transfer_check to croak on block*/
1228 SvRV_set (coro_current, (SV *)coro->hv);
1229
1230 load_perl (aTHX_ coro);
1231
1232 coro_unwind_stacks (aTHX);
1233
1234 /* restore swapped sv's */
1235 SWAP_SVS (coro);
1236
1237 coro_destruct_stacks (aTHX);
1238
1239 /* now save some sv's to be free'd later */
1240 svf [0] = GvSV (PL_defgv);
1241 svf [1] = (SV *)GvAV (PL_defgv);
1242 svf [2] = GvSV (PL_errgv);
1243 svf [3] = (SV *)PL_defoutgv;
1244 svf [4] = PL_rs;
1245 svf [5] = GvSV (irsgv);
1246 svf [6] = (SV *)GvHV (PL_hintgv);
1247 svf [7] = PL_diehook;
1248 svf [8] = PL_warnhook;
1249 assert (9 == sizeof (svf) / sizeof (*svf));
1250
1251 SvRV_set (coro_current, old_current);
1252
1253 load_perl (aTHX_ current);
1254 }
1255
1256 {
1257 unsigned int i;
1258
1259 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1260 SvREFCNT_dec (svf [i]);
1261
951 SvREFCNT_dec (coro->saved_deffh); 1262 SvREFCNT_dec (coro->saved_deffh);
952 SvREFCNT_dec (coro->rouse_cb); 1263 SvREFCNT_dec (coro->rouse_cb);
953 SvREFCNT_dec (coro->invoke_cb); 1264 SvREFCNT_dec (coro->invoke_cb);
954 SvREFCNT_dec (coro->invoke_av); 1265 SvREFCNT_dec (coro->invoke_av);
955 1266 }
956 coro_destruct_stacks (aTHX);
957} 1267}
958 1268
959INLINE void 1269ecb_inline void
960free_coro_mortal (pTHX) 1270free_coro_mortal (pTHX)
961{ 1271{
962 if (expect_true (coro_mortal)) 1272 if (ecb_expect_true (coro_mortal))
963 { 1273 {
964 SvREFCNT_dec (coro_mortal); 1274 SvREFCNT_dec ((SV *)coro_mortal);
965 coro_mortal = 0; 1275 coro_mortal = 0;
966 } 1276 }
967} 1277}
968 1278
969static int 1279static int
970runops_trace (pTHX) 1280runops_trace (pTHX)
971{ 1281{
972 COP *oldcop = 0; 1282 COP *oldcop = 0;
973 int oldcxix = -2; 1283 int oldcxix = -2;
974 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
975 coro_cctx *cctx = coro->cctx;
976 1284
977 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1285 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
978 { 1286 {
979 PERL_ASYNC_CHECK (); 1287 PERL_ASYNC_CHECK ();
980 1288
981 if (cctx->flags & CC_TRACE_ALL) 1289 if (cctx_current->flags & CC_TRACE_ALL)
982 { 1290 {
983 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1291 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
984 { 1292 {
985 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1293 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
986 SV **bot, **top; 1294 SV **bot, **top;
987 AV *av = newAV (); /* return values */ 1295 AV *av = newAV (); /* return values */
988 SV **cb; 1296 SV **cb;
… …
1025 1333
1026 if (PL_curcop != &PL_compiling) 1334 if (PL_curcop != &PL_compiling)
1027 { 1335 {
1028 SV **cb; 1336 SV **cb;
1029 1337
1030 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1338 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1031 { 1339 {
1032 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1340 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1033 1341
1034 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1342 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1035 { 1343 {
… …
1058 } 1366 }
1059 1367
1060 oldcxix = cxstack_ix; 1368 oldcxix = cxstack_ix;
1061 } 1369 }
1062 1370
1063 if (cctx->flags & CC_TRACE_LINE) 1371 if (cctx_current->flags & CC_TRACE_LINE)
1064 { 1372 {
1065 dSP; 1373 dSP;
1066 1374
1067 PL_runops = RUNOPS_DEFAULT; 1375 PL_runops = RUNOPS_DEFAULT;
1068 ENTER; 1376 ENTER;
… …
1087 1395
1088 TAINT_NOT; 1396 TAINT_NOT;
1089 return 0; 1397 return 0;
1090} 1398}
1091 1399
1092static struct coro_cctx *cctx_ssl_cctx;
1093static struct CoroSLF cctx_ssl_frame; 1400static struct CoroSLF cctx_ssl_frame;
1094 1401
1095static void 1402static void
1096slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1403slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1097{ 1404{
1098 ta->prev = (struct coro *)cctx_ssl_cctx;
1099 ta->next = 0; 1405 ta->prev = 0;
1100} 1406}
1101 1407
1102static int 1408static int
1103slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1409slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1104{ 1410{
… …
1106 1412
1107 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1413 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1108} 1414}
1109 1415
1110/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1416/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1111static void NOINLINE 1417static void ecb_noinline
1112cctx_prepare (pTHX_ coro_cctx *cctx) 1418cctx_prepare (pTHX)
1113{ 1419{
1114 PL_top_env = &PL_start_env; 1420 PL_top_env = &PL_start_env;
1115 1421
1116 if (cctx->flags & CC_TRACE) 1422 if (cctx_current->flags & CC_TRACE)
1117 PL_runops = runops_trace; 1423 PL_runops = runops_trace;
1118 1424
1119 /* we already must be executing an SLF op, there is no other valid way 1425 /* we already must be executing an SLF op, there is no other valid way
1120 * that can lead to creation of a new cctx */ 1426 * that can lead to creation of a new cctx */
1121 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1427 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1122 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1428 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1123 1429
1124 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1430 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1125 cctx_ssl_cctx = cctx;
1126 cctx_ssl_frame = slf_frame; 1431 cctx_ssl_frame = slf_frame;
1127 1432
1128 slf_frame.prepare = slf_prepare_set_stacklevel; 1433 slf_frame.prepare = slf_prepare_set_stacklevel;
1129 slf_frame.check = slf_check_set_stacklevel; 1434 slf_frame.check = slf_check_set_stacklevel;
1130} 1435}
1131 1436
1132/* the tail of transfer: execute stuff we can only do after a transfer */ 1437/* the tail of transfer: execute stuff we can only do after a transfer */
1133INLINE void 1438ecb_inline void
1134transfer_tail (pTHX) 1439transfer_tail (pTHX)
1135{ 1440{
1136 free_coro_mortal (aTHX); 1441 free_coro_mortal (aTHX);
1442}
1443
1444/* try to exit the same way perl's main function would do */
1445/* we do not bother resetting the environment or other things *7
1446/* that are not, uhm, essential */
1447/* this obviously also doesn't work when perl is embedded */
1448static void ecb_noinline ecb_cold
1449perlish_exit (pTHX)
1450{
1451 int exitstatus = perl_destruct (PL_curinterp);
1452 perl_free (PL_curinterp);
1453 exit (exitstatus);
1137} 1454}
1138 1455
1139/* 1456/*
1140 * this is a _very_ stripped down perl interpreter ;) 1457 * this is a _very_ stripped down perl interpreter ;)
1141 */ 1458 */
… …
1153 /* normally we would need to skip the entersub here */ 1470 /* normally we would need to skip the entersub here */
1154 /* not doing so will re-execute it, which is exactly what we want */ 1471 /* not doing so will re-execute it, which is exactly what we want */
1155 /* PL_nop = PL_nop->op_next */ 1472 /* PL_nop = PL_nop->op_next */
1156 1473
1157 /* inject a fake subroutine call to cctx_init */ 1474 /* inject a fake subroutine call to cctx_init */
1158 cctx_prepare (aTHX_ (coro_cctx *)arg); 1475 cctx_prepare (aTHX);
1159 1476
1160 /* cctx_run is the alternative tail of transfer() */ 1477 /* cctx_run is the alternative tail of transfer() */
1161 transfer_tail (aTHX); 1478 transfer_tail (aTHX);
1162 1479
1163 /* somebody or something will hit me for both perl_run and PL_restartop */ 1480 /* somebody or something will hit me for both perl_run and PL_restartop */
1164 PL_restartop = PL_op; 1481 PL_restartop = PL_op;
1165 perl_run (PL_curinterp); 1482 perl_run (PL_curinterp);
1166 /* 1483 /*
1167 * Unfortunately, there is no way to get at the return values of the 1484 * Unfortunately, there is no way to get at the return values of the
1168 * coro body here, as perl_run destroys these 1485 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1486 * runtime errors here, as this is just a random interpreter, not a thread.
1169 */ 1487 */
1170 1488
1171 /* 1489 /*
1172 * If perl-run returns we assume exit() was being called or the coro 1490 * If perl-run returns we assume exit() was being called or the coro
1173 * fell off the end, which seems to be the only valid (non-bug) 1491 * fell off the end, which seems to be the only valid (non-bug)
1174 * reason for perl_run to return. We try to exit by jumping to the 1492 * reason for perl_run to return. We try to mimic whatever perl is normally
1175 * bootstrap-time "top" top_env, as we cannot restore the "main" 1493 * doing in that case. YMMV.
1176 * coroutine as Coro has no such concept
1177 */ 1494 */
1178 PL_top_env = main_top_env; 1495 perlish_exit (aTHX);
1179 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1180 } 1496 }
1181} 1497}
1182 1498
1183static coro_cctx * 1499static coro_cctx *
1184cctx_new () 1500cctx_new (void)
1185{ 1501{
1186 coro_cctx *cctx; 1502 coro_cctx *cctx;
1187 1503
1188 ++cctx_count; 1504 ++cctx_count;
1189 New (0, cctx, 1, coro_cctx); 1505 New (0, cctx, 1, coro_cctx);
… …
1195 return cctx; 1511 return cctx;
1196} 1512}
1197 1513
1198/* create a new cctx only suitable as source */ 1514/* create a new cctx only suitable as source */
1199static coro_cctx * 1515static coro_cctx *
1200cctx_new_empty () 1516cctx_new_empty (void)
1201{ 1517{
1202 coro_cctx *cctx = cctx_new (); 1518 coro_cctx *cctx = cctx_new ();
1203 1519
1204 cctx->sptr = 0; 1520 cctx->stack.sptr = 0;
1205 coro_create (&cctx->cctx, 0, 0, 0, 0); 1521 coro_create (&cctx->cctx, 0, 0, 0, 0);
1206 1522
1207 return cctx; 1523 return cctx;
1208} 1524}
1209 1525
1210/* create a new cctx suitable as destination/running a perl interpreter */ 1526/* create a new cctx suitable as destination/running a perl interpreter */
1211static coro_cctx * 1527static coro_cctx *
1212cctx_new_run () 1528cctx_new_run (void)
1213{ 1529{
1214 coro_cctx *cctx = cctx_new (); 1530 coro_cctx *cctx = cctx_new ();
1215 void *stack_start;
1216 size_t stack_size;
1217 1531
1218#if HAVE_MMAP 1532 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1219 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1220 /* mmap supposedly does allocate-on-write for us */
1221 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1222
1223 if (cctx->sptr != (void *)-1)
1224 {
1225 #if CORO_STACKGUARD
1226 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1227 #endif
1228 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1229 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1230 cctx->flags |= CC_MAPPED;
1231 } 1533 {
1232 else
1233#endif
1234 {
1235 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1236 New (0, cctx->sptr, cctx_stacksize, long);
1237
1238 if (!cctx->sptr)
1239 {
1240 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1534 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1241 _exit (EXIT_FAILURE); 1535 _exit (EXIT_FAILURE);
1242 }
1243
1244 stack_start = cctx->sptr;
1245 stack_size = cctx->ssize;
1246 } 1536 }
1247 1537
1248 #if CORO_USE_VALGRIND
1249 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1250 #endif
1251
1252 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1538 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1253 1539
1254 return cctx; 1540 return cctx;
1255} 1541}
1256 1542
1257static void 1543static void
1258cctx_destroy (coro_cctx *cctx) 1544cctx_destroy (coro_cctx *cctx)
1259{ 1545{
1260 if (!cctx) 1546 if (!cctx)
1261 return; 1547 return;
1262 1548
1549 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1550
1263 --cctx_count; 1551 --cctx_count;
1264 coro_destroy (&cctx->cctx); 1552 coro_destroy (&cctx->cctx);
1265 1553
1266 /* coro_transfer creates new, empty cctx's */ 1554 coro_stack_free (&cctx->stack);
1267 if (cctx->sptr)
1268 {
1269 #if CORO_USE_VALGRIND
1270 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1271 #endif
1272
1273#if HAVE_MMAP
1274 if (cctx->flags & CC_MAPPED)
1275 munmap (cctx->sptr, cctx->ssize);
1276 else
1277#endif
1278 Safefree (cctx->sptr);
1279 }
1280 1555
1281 Safefree (cctx); 1556 Safefree (cctx);
1282} 1557}
1283 1558
1284/* wether this cctx should be destructed */ 1559/* wether this cctx should be destructed */
1285#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1560#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1286 1561
1287static coro_cctx * 1562static coro_cctx *
1288cctx_get (pTHX) 1563cctx_get (pTHX)
1289{ 1564{
1290 while (expect_true (cctx_first)) 1565 while (ecb_expect_true (cctx_first))
1291 { 1566 {
1292 coro_cctx *cctx = cctx_first; 1567 coro_cctx *cctx = cctx_first;
1293 cctx_first = cctx->next; 1568 cctx_first = cctx->next;
1294 --cctx_idle; 1569 --cctx_idle;
1295 1570
1296 if (expect_true (!CCTX_EXPIRED (cctx))) 1571 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1297 return cctx; 1572 return cctx;
1298 1573
1299 cctx_destroy (cctx); 1574 cctx_destroy (cctx);
1300 } 1575 }
1301 1576
… …
1303} 1578}
1304 1579
1305static void 1580static void
1306cctx_put (coro_cctx *cctx) 1581cctx_put (coro_cctx *cctx)
1307{ 1582{
1308 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1583 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1309 1584
1310 /* free another cctx if overlimit */ 1585 /* free another cctx if overlimit */
1311 if (expect_false (cctx_idle >= cctx_max_idle)) 1586 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1312 { 1587 {
1313 coro_cctx *first = cctx_first; 1588 coro_cctx *first = cctx_first;
1314 cctx_first = first->next; 1589 cctx_first = first->next;
1315 --cctx_idle; 1590 --cctx_idle;
1316 1591
… …
1327static void 1602static void
1328transfer_check (pTHX_ struct coro *prev, struct coro *next) 1603transfer_check (pTHX_ struct coro *prev, struct coro *next)
1329{ 1604{
1330 /* TODO: throwing up here is considered harmful */ 1605 /* TODO: throwing up here is considered harmful */
1331 1606
1332 if (expect_true (prev != next)) 1607 if (ecb_expect_true (prev != next))
1333 { 1608 {
1334 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1609 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1335 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1610 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1336 1611
1337 if (expect_false (next->flags & CF_RUNNING)) 1612 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1338 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1339
1340 if (expect_false (next->flags & CF_DESTROYED))
1341 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1613 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1342 1614
1343#if !PERL_VERSION_ATLEAST (5,10,0) 1615#if !PERL_VERSION_ATLEAST (5,10,0)
1344 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1616 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1345 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1617 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1346#endif 1618#endif
1347 } 1619 }
1348} 1620}
1349 1621
1350/* always use the TRANSFER macro */ 1622/* always use the TRANSFER macro */
1351static void NOINLINE /* noinline so we have a fixed stackframe */ 1623static void ecb_noinline /* noinline so we have a fixed stackframe */
1352transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1624transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1353{ 1625{
1354 dSTACKLEVEL; 1626 dSTACKLEVEL;
1355 1627
1356 /* sometimes transfer is only called to set idle_sp */ 1628 /* sometimes transfer is only called to set idle_sp */
1357 if (expect_false (!next)) 1629 if (ecb_expect_false (!prev))
1358 { 1630 {
1359 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1631 cctx_current->idle_sp = STACKLEVEL;
1360 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1632 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1361 } 1633 }
1362 else if (expect_true (prev != next)) 1634 else if (ecb_expect_true (prev != next))
1363 { 1635 {
1364 coro_cctx *prev__cctx; 1636 coro_cctx *cctx_prev;
1365 1637
1366 if (expect_false (prev->flags & CF_NEW)) 1638 if (ecb_expect_false (prev->flags & CF_NEW))
1367 { 1639 {
1368 /* create a new empty/source context */ 1640 /* create a new empty/source context */
1369 prev->cctx = cctx_new_empty ();
1370 prev->flags &= ~CF_NEW; 1641 prev->flags &= ~CF_NEW;
1371 prev->flags |= CF_RUNNING; 1642 prev->flags |= CF_RUNNING;
1372 } 1643 }
1373 1644
1374 prev->flags &= ~CF_RUNNING; 1645 prev->flags &= ~CF_RUNNING;
1375 next->flags |= CF_RUNNING; 1646 next->flags |= CF_RUNNING;
1376 1647
1377 /* first get rid of the old state */ 1648 /* first get rid of the old state */
1378 save_perl (aTHX_ prev); 1649 save_perl (aTHX_ prev);
1379 1650
1380 if (expect_false (next->flags & CF_NEW)) 1651 if (ecb_expect_false (next->flags & CF_NEW))
1381 { 1652 {
1382 /* need to start coroutine */ 1653 /* need to start coroutine */
1383 next->flags &= ~CF_NEW; 1654 next->flags &= ~CF_NEW;
1384 /* setup coroutine call */ 1655 /* setup coroutine call */
1385 coro_setup (aTHX_ next); 1656 init_perl (aTHX_ next);
1386 } 1657 }
1387 else 1658 else
1388 load_perl (aTHX_ next); 1659 load_perl (aTHX_ next);
1389 1660
1390 prev__cctx = prev->cctx;
1391
1392 /* possibly untie and reuse the cctx */ 1661 /* possibly untie and reuse the cctx */
1393 if (expect_true ( 1662 if (ecb_expect_true (
1394 prev__cctx->idle_sp == STACKLEVEL 1663 cctx_current->idle_sp == STACKLEVEL
1395 && !(prev__cctx->flags & CC_TRACE) 1664 && !(cctx_current->flags & CC_TRACE)
1396 && !force_cctx 1665 && !force_cctx
1397 )) 1666 ))
1398 { 1667 {
1399 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1668 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1400 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1669 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1401 1670
1402 prev->cctx = 0;
1403
1404 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1671 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1405 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1672 /* without this the next cctx_get might destroy the running cctx while still in use */
1406 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1673 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1407 if (!next->cctx) 1674 if (ecb_expect_true (!next->cctx))
1408 next->cctx = cctx_get (aTHX); 1675 next->cctx = cctx_get (aTHX);
1409 1676
1410 cctx_put (prev__cctx); 1677 cctx_put (cctx_current);
1411 } 1678 }
1679 else
1680 prev->cctx = cctx_current;
1412 1681
1413 ++next->usecount; 1682 ++next->usecount;
1414 1683
1415 if (expect_true (!next->cctx)) 1684 cctx_prev = cctx_current;
1416 next->cctx = cctx_get (aTHX); 1685 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1417 1686
1418 if (expect_false (prev__cctx != next->cctx)) 1687 next->cctx = 0;
1688
1689 if (ecb_expect_false (cctx_prev != cctx_current))
1419 { 1690 {
1420 prev__cctx->top_env = PL_top_env; 1691 cctx_prev->top_env = PL_top_env;
1421 PL_top_env = next->cctx->top_env; 1692 PL_top_env = cctx_current->top_env;
1422 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1693 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1423 } 1694 }
1424 1695
1425 transfer_tail (aTHX); 1696 transfer_tail (aTHX);
1426 } 1697 }
1427} 1698}
… …
1429#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1700#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1430#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1701#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1431 1702
1432/** high level stuff ********************************************************/ 1703/** high level stuff ********************************************************/
1433 1704
1705/* this function is actually Coro, not Coro::State, but we call it from here */
1706/* because it is convenient - but it hasn't been declared yet for that reason */
1434static int 1707static void
1708coro_call_on_destroy (pTHX_ struct coro *coro);
1709
1710static void
1435coro_state_destroy (pTHX_ struct coro *coro) 1711coro_state_destroy (pTHX_ struct coro *coro)
1436{ 1712{
1437 if (coro->flags & CF_DESTROYED) 1713 if (coro->flags & CF_ZOMBIE)
1438 return 0; 1714 return;
1439 1715
1440 if (coro->on_destroy)
1441 coro->on_destroy (aTHX_ coro); 1716 slf_destroy (aTHX_ coro);
1442 1717
1443 coro->flags |= CF_DESTROYED; 1718 coro->flags |= CF_ZOMBIE;
1444 1719
1445 if (coro->flags & CF_READY) 1720 if (coro->flags & CF_READY)
1446 { 1721 {
1447 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1722 /* reduce nready, as destroying a ready coro effectively unreadies it */
1448 /* alternative: look through all ready queues and remove the coro */ 1723 /* alternative: look through all ready queues and remove the coro */
1449 --coro_nready; 1724 --coro_nready;
1450 } 1725 }
1451 else 1726 else
1452 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1727 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1453 1728
1454 if (coro->mainstack && coro->mainstack != main_mainstack) 1729 if (coro->next) coro->next->prev = coro->prev;
1455 { 1730 if (coro->prev) coro->prev->next = coro->next;
1456 struct coro temp; 1731 if (coro == coro_first) coro_first = coro->next;
1457 1732
1458 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1733 if (coro->mainstack
1459 1734 && coro->mainstack != main_mainstack
1460 save_perl (aTHX_ &temp); 1735 && coro->slot
1736 && !PL_dirty)
1461 load_perl (aTHX_ coro); 1737 destroy_perl (aTHX_ coro);
1462
1463 coro_destruct (aTHX_ coro);
1464
1465 load_perl (aTHX_ &temp);
1466
1467 coro->slot = 0;
1468 }
1469 1738
1470 cctx_destroy (coro->cctx); 1739 cctx_destroy (coro->cctx);
1471 SvREFCNT_dec (coro->startcv); 1740 SvREFCNT_dec (coro->startcv);
1472 SvREFCNT_dec (coro->args); 1741 SvREFCNT_dec (coro->args);
1742 SvREFCNT_dec (coro->swap_sv);
1473 SvREFCNT_dec (CORO_THROW); 1743 SvREFCNT_dec (CORO_THROW);
1474 1744
1475 if (coro->next) coro->next->prev = coro->prev; 1745 coro_call_on_destroy (aTHX_ coro);
1476 if (coro->prev) coro->prev->next = coro->next;
1477 if (coro == coro_first) coro_first = coro->next;
1478 1746
1479 return 1; 1747 /* more destruction mayhem in coro_state_free */
1480} 1748}
1481 1749
1482static int 1750static int
1483coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1751coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1484{ 1752{
1485 struct coro *coro = (struct coro *)mg->mg_ptr; 1753 struct coro *coro = (struct coro *)mg->mg_ptr;
1486 mg->mg_ptr = 0; 1754 mg->mg_ptr = 0;
1487 1755
1488 coro->hv = 0;
1489
1490 if (--coro->refcnt < 0)
1491 {
1492 coro_state_destroy (aTHX_ coro); 1756 coro_state_destroy (aTHX_ coro);
1757 SvREFCNT_dec (coro->on_destroy);
1758 SvREFCNT_dec (coro->status);
1759
1493 Safefree (coro); 1760 Safefree (coro);
1494 }
1495 1761
1496 return 0; 1762 return 0;
1497} 1763}
1498 1764
1499static int 1765static int ecb_cold
1500coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1766coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1501{ 1767{
1502 struct coro *coro = (struct coro *)mg->mg_ptr; 1768 /* called when perl clones the current process the slow way (windows process emulation) */
1503 1769 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1504 ++coro->refcnt; 1770 mg->mg_ptr = 0;
1771 mg->mg_virtual = 0;
1505 1772
1506 return 0; 1773 return 0;
1507} 1774}
1508 1775
1509static MGVTBL coro_state_vtbl = { 1776static MGVTBL coro_state_vtbl = {
… …
1532 1799
1533 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1800 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1534 TRANSFER (ta, 1); 1801 TRANSFER (ta, 1);
1535} 1802}
1536 1803
1537/*****************************************************************************/
1538/* gensub: simple closure generation utility */
1539
1540#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1541
1542/* create a closure from XS, returns a code reference */
1543/* the arg can be accessed via GENSUB_ARG from the callback */
1544/* the callback must use dXSARGS/XSRETURN */
1545static SV *
1546gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1547{
1548 CV *cv = (CV *)newSV (0);
1549
1550 sv_upgrade ((SV *)cv, SVt_PVCV);
1551
1552 CvANON_on (cv);
1553 CvISXSUB_on (cv);
1554 CvXSUB (cv) = xsub;
1555 GENSUB_ARG = arg;
1556
1557 return newRV_noinc ((SV *)cv);
1558}
1559
1560/** Coro ********************************************************************/ 1804/** Coro ********************************************************************/
1561 1805
1562INLINE void 1806ecb_inline void
1563coro_enq (pTHX_ struct coro *coro) 1807coro_enq (pTHX_ struct coro *coro)
1564{ 1808{
1565 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1809 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1566}
1567 1810
1568INLINE SV * 1811 SvREFCNT_inc_NN (coro->hv);
1812
1813 coro->next_ready = 0;
1814 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1815 ready [1] = coro;
1816}
1817
1818ecb_inline struct coro *
1569coro_deq (pTHX) 1819coro_deq (pTHX)
1570{ 1820{
1571 int prio; 1821 int prio;
1572 1822
1573 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1823 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1574 if (AvFILLp (coro_ready [prio]) >= 0) 1824 {
1575 return av_shift (coro_ready [prio]); 1825 struct coro **ready = coro_ready [prio];
1826
1827 if (ready [0])
1828 {
1829 struct coro *coro = ready [0];
1830 ready [0] = coro->next_ready;
1831 return coro;
1832 }
1833 }
1576 1834
1577 return 0; 1835 return 0;
1836}
1837
1838static void
1839invoke_sv_ready_hook_helper (void)
1840{
1841 dTHX;
1842 dSP;
1843
1844 ENTER;
1845 SAVETMPS;
1846
1847 PUSHMARK (SP);
1848 PUTBACK;
1849 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1850
1851 FREETMPS;
1852 LEAVE;
1578} 1853}
1579 1854
1580static int 1855static int
1581api_ready (pTHX_ SV *coro_sv) 1856api_ready (pTHX_ SV *coro_sv)
1582{ 1857{
1583 struct coro *coro;
1584 SV *sv_hook;
1585 void (*xs_hook)(void);
1586
1587 if (SvROK (coro_sv))
1588 coro_sv = SvRV (coro_sv);
1589
1590 coro = SvSTATE (coro_sv); 1858 struct coro *coro = SvSTATE (coro_sv);
1591 1859
1592 if (coro->flags & CF_READY) 1860 if (coro->flags & CF_READY)
1593 return 0; 1861 return 0;
1594 1862
1595 coro->flags |= CF_READY; 1863 coro->flags |= CF_READY;
1596 1864
1597 sv_hook = coro_nready ? 0 : coro_readyhook;
1598 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1599
1600 coro_enq (aTHX_ coro); 1865 coro_enq (aTHX_ coro);
1601 ++coro_nready;
1602 1866
1603 if (sv_hook) 1867 if (!coro_nready++)
1604 { 1868 if (coroapi.readyhook)
1605 dSP; 1869 coroapi.readyhook ();
1606
1607 ENTER;
1608 SAVETMPS;
1609
1610 PUSHMARK (SP);
1611 PUTBACK;
1612 call_sv (sv_hook, G_VOID | G_DISCARD);
1613
1614 FREETMPS;
1615 LEAVE;
1616 }
1617
1618 if (xs_hook)
1619 xs_hook ();
1620 1870
1621 return 1; 1871 return 1;
1622} 1872}
1623 1873
1624static int 1874static int
… …
1626{ 1876{
1627 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1877 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1628} 1878}
1629 1879
1630/* expects to own a reference to next->hv */ 1880/* expects to own a reference to next->hv */
1631INLINE void 1881ecb_inline void
1632prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1882prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1633{ 1883{
1634 SV *prev_sv = SvRV (coro_current); 1884 SV *prev_sv = SvRV (coro_current);
1635 1885
1636 ta->prev = SvSTATE_hv (prev_sv); 1886 ta->prev = SvSTATE_hv (prev_sv);
… …
1647static void 1897static void
1648prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1898prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1649{ 1899{
1650 for (;;) 1900 for (;;)
1651 { 1901 {
1652 SV *next_sv = coro_deq (aTHX); 1902 struct coro *next = coro_deq (aTHX);
1653 1903
1654 if (expect_true (next_sv)) 1904 if (ecb_expect_true (next))
1655 { 1905 {
1656 struct coro *next = SvSTATE_hv (next_sv);
1657
1658 /* cannot transfer to destroyed coros, skip and look for next */ 1906 /* cannot transfer to destroyed coros, skip and look for next */
1659 if (expect_false (next->flags & CF_DESTROYED)) 1907 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1660 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1908 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1661 else 1909 else
1662 { 1910 {
1663 next->flags &= ~CF_READY; 1911 next->flags &= ~CF_READY;
1664 --coro_nready; 1912 --coro_nready;
1665 1913
… …
1668 } 1916 }
1669 } 1917 }
1670 else 1918 else
1671 { 1919 {
1672 /* nothing to schedule: call the idle handler */ 1920 /* nothing to schedule: call the idle handler */
1921 if (SvROK (sv_idle)
1922 && SvOBJECT (SvRV (sv_idle)))
1923 {
1924 if (SvRV (sv_idle) == SvRV (coro_current))
1925 {
1926 require_pv ("Carp");
1927
1928 {
1929 dSP;
1930
1931 ENTER;
1932 SAVETMPS;
1933
1934 PUSHMARK (SP);
1935 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1936 PUTBACK;
1937 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1938
1939 FREETMPS;
1940 LEAVE;
1941 }
1942 }
1943
1944 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1945 api_ready (aTHX_ SvRV (sv_idle));
1946 --coro_nready;
1947 }
1948 else
1949 {
1950 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1673 dSP; 1951 dSP;
1674 1952
1675 ENTER; 1953 ENTER;
1676 SAVETMPS; 1954 SAVETMPS;
1677 1955
1678 PUSHMARK (SP); 1956 PUSHMARK (SP);
1679 PUTBACK; 1957 PUTBACK;
1680 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1958 call_sv (sv_idle, G_VOID | G_DISCARD);
1681 1959
1682 FREETMPS; 1960 FREETMPS;
1683 LEAVE; 1961 LEAVE;
1962 }
1684 } 1963 }
1685 } 1964 }
1686} 1965}
1687 1966
1688INLINE void 1967ecb_inline void
1689prepare_cede (pTHX_ struct coro_transfer_args *ta) 1968prepare_cede (pTHX_ struct coro_transfer_args *ta)
1690{ 1969{
1691 api_ready (aTHX_ coro_current); 1970 api_ready (aTHX_ coro_current);
1692 prepare_schedule (aTHX_ ta); 1971 prepare_schedule (aTHX_ ta);
1693} 1972}
1694 1973
1695INLINE void 1974ecb_inline void
1696prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1975prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1697{ 1976{
1698 SV *prev = SvRV (coro_current); 1977 SV *prev = SvRV (coro_current);
1699 1978
1700 if (coro_nready) 1979 if (coro_nready)
… …
1730{ 2009{
1731 struct coro_transfer_args ta; 2010 struct coro_transfer_args ta;
1732 2011
1733 prepare_cede (aTHX_ &ta); 2012 prepare_cede (aTHX_ &ta);
1734 2013
1735 if (expect_true (ta.prev != ta.next)) 2014 if (ecb_expect_true (ta.prev != ta.next))
1736 { 2015 {
1737 TRANSFER (ta, 1); 2016 TRANSFER (ta, 1);
1738 return 1; 2017 return 1;
1739 } 2018 }
1740 else 2019 else
… …
1759static void 2038static void
1760api_trace (pTHX_ SV *coro_sv, int flags) 2039api_trace (pTHX_ SV *coro_sv, int flags)
1761{ 2040{
1762 struct coro *coro = SvSTATE (coro_sv); 2041 struct coro *coro = SvSTATE (coro_sv);
1763 2042
2043 if (coro->flags & CF_RUNNING)
2044 croak ("cannot enable tracing on a running coroutine, caught");
2045
1764 if (flags & CC_TRACE) 2046 if (flags & CC_TRACE)
1765 { 2047 {
1766 if (!coro->cctx) 2048 if (!coro->cctx)
1767 coro->cctx = cctx_new_run (); 2049 coro->cctx = cctx_new_run ();
1768 else if (!(coro->cctx->flags & CC_TRACE)) 2050 else if (!(coro->cctx->flags & CC_TRACE))
1769 croak ("cannot enable tracing on coroutine with custom stack,"); 2051 croak ("cannot enable tracing on coroutine with custom stack, caught");
1770 2052
1771 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 2053 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1772 } 2054 }
1773 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 2055 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1774 { 2056 {
… …
1780 coro->slot->runops = RUNOPS_DEFAULT; 2062 coro->slot->runops = RUNOPS_DEFAULT;
1781 } 2063 }
1782} 2064}
1783 2065
1784static void 2066static void
2067coro_push_av (pTHX_ AV *av, I32 gimme_v)
2068{
2069 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2070 {
2071 dSP;
2072
2073 if (gimme_v == G_SCALAR)
2074 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2075 else
2076 {
2077 int i;
2078 EXTEND (SP, AvFILLp (av) + 1);
2079
2080 for (i = 0; i <= AvFILLp (av); ++i)
2081 PUSHs (AvARRAY (av)[i]);
2082 }
2083
2084 PUTBACK;
2085 }
2086}
2087
2088static void
2089coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2090{
2091 if (!coro->on_destroy)
2092 coro->on_destroy = newAV ();
2093
2094 av_push (coro->on_destroy, cb);
2095}
2096
2097static void
2098slf_destroy_join (pTHX_ struct CoroSLF *frame)
2099{
2100 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2101}
2102
2103static int
2104slf_check_join (pTHX_ struct CoroSLF *frame)
2105{
2106 struct coro *coro = (struct coro *)frame->data;
2107
2108 if (!coro->status)
2109 return 1;
2110
2111 frame->destroy = 0;
2112
2113 coro_push_av (aTHX_ coro->status, GIMME_V);
2114
2115 SvREFCNT_dec ((SV *)coro->hv);
2116
2117 return 0;
2118}
2119
2120static void
2121slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2122{
2123 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2124
2125 if (items > 1)
2126 croak ("join called with too many arguments");
2127
2128 if (coro->status)
2129 frame->prepare = prepare_nop;
2130 else
2131 {
2132 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2133 frame->prepare = prepare_schedule;
2134 }
2135
2136 frame->check = slf_check_join;
2137 frame->destroy = slf_destroy_join;
2138 frame->data = (void *)coro;
2139 SvREFCNT_inc (coro->hv);
2140}
2141
2142static void
1785coro_call_on_destroy (pTHX_ struct coro *coro) 2143coro_call_on_destroy (pTHX_ struct coro *coro)
1786{ 2144{
1787 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2145 AV *od = coro->on_destroy;
1788 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1789 2146
1790 if (on_destroyp) 2147 if (!od)
1791 { 2148 return;
1792 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1793 2149
2150 coro->on_destroy = 0;
2151 sv_2mortal ((SV *)od);
2152
1794 while (AvFILLp (on_destroy) >= 0) 2153 while (AvFILLp (od) >= 0)
2154 {
2155 SV *cb = sv_2mortal (av_pop (od));
2156
2157 /* coro hv's (and only hv's at the moment) are supported as well */
2158 if (SvSTATEhv_p (aTHX_ cb))
2159 api_ready (aTHX_ cb);
2160 else
1795 { 2161 {
1796 dSP; /* don't disturb outer sp */ 2162 dSP; /* don't disturb outer sp */
1797 SV *cb = av_pop (on_destroy);
1798
1799 PUSHMARK (SP); 2163 PUSHMARK (SP);
1800 2164
1801 if (statusp) 2165 if (coro->status)
1802 { 2166 {
1803 int i; 2167 PUTBACK;
1804 AV *status = (AV *)SvRV (*statusp); 2168 coro_push_av (aTHX_ coro->status, G_ARRAY);
1805 EXTEND (SP, AvFILLp (status) + 1); 2169 SPAGAIN;
1806
1807 for (i = 0; i <= AvFILLp (status); ++i)
1808 PUSHs (AvARRAY (status)[i]);
1809 } 2170 }
1810 2171
1811 PUTBACK; 2172 PUTBACK;
1812 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2173 call_sv (cb, G_VOID | G_DISCARD);
1813 } 2174 }
1814 } 2175 }
1815} 2176}
1816 2177
1817static void 2178static void
1818slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2179coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1819{ 2180{
2181 AV *av;
2182
2183 if (coro->status)
2184 {
2185 av = coro->status;
2186 av_clear (av);
2187 }
2188 else
2189 av = coro->status = newAV ();
2190
2191 /* items are actually not so common, so optimise for this case */
2192 if (items)
2193 {
1820 int i; 2194 int i;
1821 HV *hv = (HV *)SvRV (coro_current);
1822 AV *av = newAV ();
1823 2195
1824 av_extend (av, items - 1); 2196 av_extend (av, items - 1);
2197
1825 for (i = 0; i < items; ++i) 2198 for (i = 0; i < items; ++i)
1826 av_push (av, SvREFCNT_inc_NN (arg [i])); 2199 av_push (av, SvREFCNT_inc_NN (arg [i]));
2200 }
2201}
1827 2202
1828 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2203static void
1829 2204slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2205{
1830 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2206 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1831 api_ready (aTHX_ sv_manager); 2207 api_ready (aTHX_ sv_manager);
1832 2208
1833 frame->prepare = prepare_schedule; 2209 frame->prepare = prepare_schedule;
1834 frame->check = slf_check_repeat; 2210 frame->check = slf_check_repeat;
2211
2212 /* as a minor optimisation, we could unwind all stacks here */
2213 /* but that puts extra pressure on pp_slf, and is not worth much */
2214 /*coro_unwind_stacks (aTHX);*/
2215}
2216
2217static void
2218slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2219{
2220 HV *coro_hv = (HV *)SvRV (coro_current);
2221
2222 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2223 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2224}
2225
2226static void
2227slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2228{
2229 HV *coro_hv;
2230 struct coro *coro;
2231
2232 if (items <= 0)
2233 croak ("Coro::cancel called without coro object,");
2234
2235 coro = SvSTATE (arg [0]);
2236 coro_hv = coro->hv;
2237
2238 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2239
2240 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2241 {
2242 /* coro currently busy cancelling something, so just notify it */
2243 coro->slf_frame.data = (void *)coro;
2244
2245 frame->prepare = prepare_nop;
2246 frame->check = slf_check_nop;
2247 }
2248 else if (coro_hv == (HV *)SvRV (coro_current))
2249 {
2250 /* cancelling the current coro is allowed, and equals terminate */
2251 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2252 }
2253 else
2254 {
2255 struct coro *self = SvSTATE_current;
2256
2257 if (!self)
2258 croak ("Coro::cancel called outside of thread content,");
2259
2260 /* otherwise we cancel directly, purely for speed reasons
2261 * unfortunately, this requires some magic trickery, as
2262 * somebody else could cancel us, so we have to fight the cancellation.
2263 * this is ugly, and hopefully fully worth the extra speed.
2264 * besides, I can't get the slow-but-safe version working...
2265 */
2266 slf_frame.data = 0;
2267 self->flags |= CF_NOCANCEL;
2268 coro_state_destroy (aTHX_ coro);
2269 self->flags &= ~CF_NOCANCEL;
2270
2271 if (slf_frame.data)
2272 {
2273 /* while we were busy we have been cancelled, so terminate */
2274 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2275 }
2276 else
2277 {
2278 frame->prepare = prepare_nop;
2279 frame->check = slf_check_nop;
2280 }
2281 }
2282}
2283
2284static int
2285slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2286{
2287 frame->prepare = 0;
2288 coro_unwind_stacks (aTHX);
2289
2290 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2291
2292 return 1;
2293}
2294
2295static int
2296safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2297{
2298 if (coro->cctx)
2299 croak ("coro inside C callback, unable to cancel at this time, caught");
2300
2301 if (coro->flags & CF_NEW)
2302 {
2303 coro_set_status (aTHX_ coro, arg, items);
2304 coro_state_destroy (aTHX_ coro);
2305 }
2306 else
2307 {
2308 if (!coro->slf_frame.prepare)
2309 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2310
2311 slf_destroy (aTHX_ coro);
2312
2313 coro_set_status (aTHX_ coro, arg, items);
2314 coro->slf_frame.prepare = prepare_nop;
2315 coro->slf_frame.check = slf_check_safe_cancel;
2316
2317 api_ready (aTHX_ (SV *)coro->hv);
2318 }
2319
2320 return 1;
1835} 2321}
1836 2322
1837/*****************************************************************************/ 2323/*****************************************************************************/
1838/* async pool handler */ 2324/* async pool handler */
1839 2325
… …
1870slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2356slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1871{ 2357{
1872 HV *hv = (HV *)SvRV (coro_current); 2358 HV *hv = (HV *)SvRV (coro_current);
1873 struct coro *coro = SvSTATE_hv ((SV *)hv); 2359 struct coro *coro = SvSTATE_hv ((SV *)hv);
1874 2360
1875 if (expect_true (coro->saved_deffh)) 2361 if (ecb_expect_true (coro->saved_deffh))
1876 { 2362 {
1877 /* subsequent iteration */ 2363 /* subsequent iteration */
1878 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2364 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1879 coro->saved_deffh = 0; 2365 coro->saved_deffh = 0;
1880 2366
1881 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2367 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1882 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2368 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1883 { 2369 {
1884 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2370 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1885 coro->invoke_av = newAV (); 2371 return;
1886
1887 frame->prepare = prepare_nop;
1888 } 2372 }
1889 else 2373 else
1890 { 2374 {
1891 av_clear (GvAV (PL_defgv)); 2375 av_clear (GvAV (PL_defgv));
1892 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2376 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
1917 2401
1918static void 2402static void
1919coro_rouse_callback (pTHX_ CV *cv) 2403coro_rouse_callback (pTHX_ CV *cv)
1920{ 2404{
1921 dXSARGS; 2405 dXSARGS;
1922 SV *data = (SV *)GENSUB_ARG; 2406 SV *data = (SV *)S_GENSUB_ARG;
1923 2407
1924 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2408 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1925 { 2409 {
1926 /* first call, set args */ 2410 /* first call, set args */
2411 SV *coro = SvRV (data);
1927 AV *av = newAV (); 2412 AV *av = newAV ();
1928 SV *coro = SvRV (data);
1929 2413
1930 SvRV_set (data, (SV *)av); 2414 SvRV_set (data, (SV *)av);
1931 api_ready (aTHX_ coro);
1932 SvREFCNT_dec (coro);
1933 2415
1934 /* better take a full copy of the arguments */ 2416 /* better take a full copy of the arguments */
1935 while (items--) 2417 while (items--)
1936 av_store (av, items, newSVsv (ST (items))); 2418 av_store (av, items, newSVsv (ST (items)));
2419
2420 api_ready (aTHX_ coro);
2421 SvREFCNT_dec (coro);
1937 } 2422 }
1938 2423
1939 XSRETURN_EMPTY; 2424 XSRETURN_EMPTY;
1940} 2425}
1941 2426
1942static int 2427static int
1943slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2428slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
1944{ 2429{
1945 SV *data = (SV *)frame->data; 2430 SV *data = (SV *)frame->data;
1946 2431
1947 if (CORO_THROW) 2432 if (CORO_THROW)
1948 return 0; 2433 return 0;
1949 2434
1950 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2435 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1951 return 1; 2436 return 1;
… …
1958 2443
1959 EXTEND (SP, AvFILLp (av) + 1); 2444 EXTEND (SP, AvFILLp (av) + 1);
1960 for (i = 0; i <= AvFILLp (av); ++i) 2445 for (i = 0; i <= AvFILLp (av); ++i)
1961 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2446 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1962 2447
1963 /* we have stolen the elements, so ste length to zero and free */ 2448 /* we have stolen the elements, so set length to zero and free */
1964 AvFILLp (av) = -1; 2449 AvFILLp (av) = -1;
1965 av_undef (av); 2450 av_undef (av);
1966 2451
1967 PUTBACK; 2452 PUTBACK;
1968 } 2453 }
… …
1987 cb = sv_2mortal (coro->rouse_cb); 2472 cb = sv_2mortal (coro->rouse_cb);
1988 coro->rouse_cb = 0; 2473 coro->rouse_cb = 0;
1989 } 2474 }
1990 2475
1991 if (!SvROK (cb) 2476 if (!SvROK (cb)
1992 || SvTYPE (SvRV (cb)) != SVt_PVCV 2477 || SvTYPE (SvRV (cb)) != SVt_PVCV
1993 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2478 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1994 croak ("Coro::rouse_wait called with illegal callback argument,"); 2479 croak ("Coro::rouse_wait called with illegal callback argument,");
1995 2480
1996 { 2481 {
1997 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2482 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1998 SV *data = (SV *)GENSUB_ARG; 2483 SV *data = (SV *)S_GENSUB_ARG;
1999 2484
2000 frame->data = (void *)data; 2485 frame->data = (void *)data;
2001 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2486 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2002 frame->check = slf_check_rouse_wait; 2487 frame->check = slf_check_rouse_wait;
2003 } 2488 }
… …
2007coro_new_rouse_cb (pTHX) 2492coro_new_rouse_cb (pTHX)
2008{ 2493{
2009 HV *hv = (HV *)SvRV (coro_current); 2494 HV *hv = (HV *)SvRV (coro_current);
2010 struct coro *coro = SvSTATE_hv (hv); 2495 struct coro *coro = SvSTATE_hv (hv);
2011 SV *data = newRV_inc ((SV *)hv); 2496 SV *data = newRV_inc ((SV *)hv);
2012 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2497 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2013 2498
2014 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2499 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2015 SvREFCNT_dec (data); /* magicext increases the refcount */ 2500 SvREFCNT_dec (data); /* magicext increases the refcount */
2016 2501
2017 SvREFCNT_dec (coro->rouse_cb); 2502 SvREFCNT_dec (coro->rouse_cb);
… …
2114static void 2599static void
2115slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2600slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2116{ 2601{
2117 frame->prepare = prepare_cede_notself; 2602 frame->prepare = prepare_cede_notself;
2118 frame->check = slf_check_nop; 2603 frame->check = slf_check_nop;
2604}
2605
2606/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2607static void
2608slf_destroy (pTHX_ struct coro *coro)
2609{
2610 struct CoroSLF frame = coro->slf_frame;
2611
2612 /*
2613 * The on_destroy below most likely is from an SLF call.
2614 * Since by definition the SLF call will not finish when we destroy
2615 * the coro, we will have to force-finish it here, otherwise
2616 * cleanup functions cannot call SLF functions.
2617 */
2618 coro->slf_frame.prepare = 0;
2619
2620 /* this callback is reserved for slf functions needing to do cleanup */
2621 if (frame.destroy && frame.prepare && !PL_dirty)
2622 frame.destroy (aTHX_ &frame);
2119} 2623}
2120 2624
2121/* 2625/*
2122 * these not obviously related functions are all rolled into one 2626 * these not obviously related functions are all rolled into one
2123 * function to increase chances that they all will call transfer with the same 2627 * function to increase chances that they all will call transfer with the same
… …
2130 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2634 I32 checkmark; /* mark SP to see how many elements check has pushed */
2131 2635
2132 /* set up the slf frame, unless it has already been set-up */ 2636 /* set up the slf frame, unless it has already been set-up */
2133 /* the latter happens when a new coro has been started */ 2637 /* the latter happens when a new coro has been started */
2134 /* or when a new cctx was attached to an existing coroutine */ 2638 /* or when a new cctx was attached to an existing coroutine */
2135 if (expect_true (!slf_frame.prepare)) 2639 if (ecb_expect_true (!slf_frame.prepare))
2136 { 2640 {
2137 /* first iteration */ 2641 /* first iteration */
2138 dSP; 2642 dSP;
2139 SV **arg = PL_stack_base + TOPMARK + 1; 2643 SV **arg = PL_stack_base + TOPMARK + 1;
2140 int items = SP - arg; /* args without function object */ 2644 int items = SP - arg; /* args without function object */
… …
2181 while (slf_frame.check (aTHX_ &slf_frame)); 2685 while (slf_frame.check (aTHX_ &slf_frame));
2182 2686
2183 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2687 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2184 2688
2185 /* exception handling */ 2689 /* exception handling */
2186 if (expect_false (CORO_THROW)) 2690 if (ecb_expect_false (CORO_THROW))
2187 { 2691 {
2188 SV *exception = sv_2mortal (CORO_THROW); 2692 SV *exception = sv_2mortal (CORO_THROW);
2189 2693
2190 CORO_THROW = 0; 2694 CORO_THROW = 0;
2191 sv_setsv (ERRSV, exception); 2695 sv_setsv (ERRSV, exception);
2192 croak (0); 2696 croak (0);
2193 } 2697 }
2194 2698
2195 /* return value handling - mostly like entersub */ 2699 /* return value handling - mostly like entersub */
2196 /* make sure we put something on the stack in scalar context */ 2700 /* make sure we put something on the stack in scalar context */
2197 if (GIMME_V == G_SCALAR) 2701 if (GIMME_V == G_SCALAR
2702 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2198 { 2703 {
2199 dSP; 2704 dSP;
2200 SV **bot = PL_stack_base + checkmark; 2705 SV **bot = PL_stack_base + checkmark;
2201 2706
2202 if (sp == bot) /* too few, push undef */ 2707 if (sp == bot) /* too few, push undef */
2203 bot [1] = &PL_sv_undef; 2708 bot [1] = &PL_sv_undef;
2204 else if (sp != bot + 1) /* too many, take last one */ 2709 else /* too many, take last one */
2205 bot [1] = *sp; 2710 bot [1] = *sp;
2206 2711
2207 SP = bot + 1; 2712 SP = bot + 1;
2208 2713
2209 PUTBACK; 2714 PUTBACK;
… …
2242 if (PL_op->op_flags & OPf_STACKED) 2747 if (PL_op->op_flags & OPf_STACKED)
2243 { 2748 {
2244 if (items > slf_arga) 2749 if (items > slf_arga)
2245 { 2750 {
2246 slf_arga = items; 2751 slf_arga = items;
2247 free (slf_argv); 2752 Safefree (slf_argv);
2248 slf_argv = malloc (slf_arga * sizeof (SV *)); 2753 New (0, slf_argv, slf_arga, SV *);
2249 } 2754 }
2250 2755
2251 slf_argc = items; 2756 slf_argc = items;
2252 2757
2253 for (i = 0; i < items; ++i) 2758 for (i = 0; i < items; ++i)
… …
2258 2763
2259 PL_op->op_ppaddr = pp_slf; 2764 PL_op->op_ppaddr = pp_slf;
2260 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2765 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2261 2766
2262 PL_op = (OP *)&slf_restore; 2767 PL_op = (OP *)&slf_restore;
2768}
2769
2770/*****************************************************************************/
2771/* dynamic wind */
2772
2773static void
2774on_enterleave_call (pTHX_ SV *cb)
2775{
2776 dSP;
2777
2778 PUSHSTACK;
2779
2780 PUSHMARK (SP);
2781 PUTBACK;
2782 call_sv (cb, G_VOID | G_DISCARD);
2783 SPAGAIN;
2784
2785 POPSTACK;
2786}
2787
2788static SV *
2789coro_avp_pop_and_free (pTHX_ AV **avp)
2790{
2791 AV *av = *avp;
2792 SV *res = av_pop (av);
2793
2794 if (AvFILLp (av) < 0)
2795 {
2796 *avp = 0;
2797 SvREFCNT_dec (av);
2798 }
2799
2800 return res;
2801}
2802
2803static void
2804coro_pop_on_enter (pTHX_ void *coro)
2805{
2806 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2807 SvREFCNT_dec (cb);
2808}
2809
2810static void
2811coro_pop_on_leave (pTHX_ void *coro)
2812{
2813 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2814 on_enterleave_call (aTHX_ sv_2mortal (cb));
2263} 2815}
2264 2816
2265/*****************************************************************************/ 2817/*****************************************************************************/
2266/* PerlIO::cede */ 2818/* PerlIO::cede */
2267 2819
… …
2269{ 2821{
2270 PerlIOBuf base; 2822 PerlIOBuf base;
2271 NV next, every; 2823 NV next, every;
2272} PerlIOCede; 2824} PerlIOCede;
2273 2825
2274static IV 2826static IV ecb_cold
2275PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2827PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2276{ 2828{
2277 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2829 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2278 2830
2279 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2831 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2280 self->next = nvtime () + self->every; 2832 self->next = nvtime () + self->every;
2281 2833
2282 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2834 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2283} 2835}
2284 2836
2285static SV * 2837static SV * ecb_cold
2286PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2838PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2287{ 2839{
2288 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2840 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2289 2841
2290 return newSVnv (self->every); 2842 return newSVnv (self->every);
… …
2341/* Coro::Semaphore & Coro::Signal */ 2893/* Coro::Semaphore & Coro::Signal */
2342 2894
2343static SV * 2895static SV *
2344coro_waitarray_new (pTHX_ int count) 2896coro_waitarray_new (pTHX_ int count)
2345{ 2897{
2346 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2898 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2347 AV *av = newAV (); 2899 AV *av = newAV ();
2348 SV **ary; 2900 SV **ary;
2349 2901
2350 /* unfortunately, building manually saves memory */ 2902 /* unfortunately, building manually saves memory */
2351 Newx (ary, 2, SV *); 2903 Newx (ary, 2, SV *);
2352 AvALLOC (av) = ary; 2904 AvALLOC (av) = ary;
2905#if PERL_VERSION_ATLEAST (5,10,0)
2353 /*AvARRAY (av) = ary;*/ 2906 AvARRAY (av) = ary;
2907#else
2354 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2908 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2909 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2910 SvPVX ((SV *)av) = (char *)ary;
2911#endif
2355 AvMAX (av) = 1; 2912 AvMAX (av) = 1;
2356 AvFILLp (av) = 0; 2913 AvFILLp (av) = 0;
2357 ary [0] = newSViv (count); 2914 ary [0] = newSViv (count);
2358 2915
2359 return newRV_noinc ((SV *)av); 2916 return newRV_noinc ((SV *)av);
… …
2397 SvREFCNT_dec (cb); 2954 SvREFCNT_dec (cb);
2398 } 2955 }
2399} 2956}
2400 2957
2401static void 2958static void
2402coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2959coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2403{ 2960{
2404 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2961 /* call $sem->adjust (0) to possibly wake up some other waiters */
2405 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2962 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2406} 2963}
2407 2964
2408static int 2965static int
2409slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2966slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2410{ 2967{
2411 AV *av = (AV *)frame->data; 2968 AV *av = (AV *)frame->data;
2412 SV *count_sv = AvARRAY (av)[0]; 2969 SV *count_sv = AvARRAY (av)[0];
2970 SV *coro_hv = SvRV (coro_current);
2971
2972 frame->destroy = 0;
2413 2973
2414 /* if we are about to throw, don't actually acquire the lock, just throw */ 2974 /* if we are about to throw, don't actually acquire the lock, just throw */
2415 if (CORO_THROW) 2975 if (ecb_expect_false (CORO_THROW))
2976 {
2977 /* we still might be responsible for the semaphore, so wake up others */
2978 coro_semaphore_adjust (aTHX_ av, 0);
2979
2416 return 0; 2980 return 0;
2981 }
2417 else if (SvIVX (count_sv) > 0) 2982 else if (SvIVX (count_sv) > 0)
2418 { 2983 {
2419 SvSTATE_current->on_destroy = 0;
2420
2421 if (acquire) 2984 if (acquire)
2422 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2985 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2423 else 2986 else
2424 coro_semaphore_adjust (aTHX_ av, 0); 2987 coro_semaphore_adjust (aTHX_ av, 0);
2425 2988
… …
2429 { 2992 {
2430 int i; 2993 int i;
2431 /* if we were woken up but can't down, we look through the whole */ 2994 /* if we were woken up but can't down, we look through the whole */
2432 /* waiters list and only add us if we aren't in there already */ 2995 /* waiters list and only add us if we aren't in there already */
2433 /* this avoids some degenerate memory usage cases */ 2996 /* this avoids some degenerate memory usage cases */
2434 2997 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2435 for (i = 1; i <= AvFILLp (av); ++i)
2436 if (AvARRAY (av)[i] == SvRV (coro_current)) 2998 if (AvARRAY (av)[i] == coro_hv)
2437 return 1; 2999 return 1;
2438 3000
2439 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3001 av_push (av, SvREFCNT_inc (coro_hv));
2440 return 1; 3002 return 1;
2441 } 3003 }
2442} 3004}
2443 3005
2444static int 3006static int
… …
2467 { 3029 {
2468 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3030 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2469 3031
2470 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3032 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2471 frame->prepare = prepare_schedule; 3033 frame->prepare = prepare_schedule;
2472
2473 /* to avoid race conditions when a woken-up coro gets terminated */ 3034 /* to avoid race conditions when a woken-up coro gets terminated */
2474 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3035 /* we arrange for a temporary on_destroy that calls adjust (0) */
2475 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3036 frame->destroy = coro_semaphore_destroy;
2476 } 3037 }
2477} 3038}
2478 3039
2479static void 3040static void
2480slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3041slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2488{ 3049{
2489 if (items >= 2) 3050 if (items >= 2)
2490 { 3051 {
2491 /* callback form */ 3052 /* callback form */
2492 AV *av = (AV *)SvRV (arg [0]); 3053 AV *av = (AV *)SvRV (arg [0]);
2493 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3054 SV *cb_cv = s_get_cv_croak (arg [1]);
2494 3055
2495 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3056 av_push (av, SvREFCNT_inc_NN (cb_cv));
2496 3057
2497 if (SvIVX (AvARRAY (av)[0]) > 0) 3058 if (SvIVX (AvARRAY (av)[0]) > 0)
2498 coro_semaphore_adjust (aTHX_ av, 0); 3059 coro_semaphore_adjust (aTHX_ av, 0);
2499 3060
2500 frame->prepare = prepare_nop; 3061 frame->prepare = prepare_nop;
… …
2524 AvARRAY (av)[0] = AvARRAY (av)[1]; 3085 AvARRAY (av)[0] = AvARRAY (av)[1];
2525 AvARRAY (av)[1] = cb; 3086 AvARRAY (av)[1] = cb;
2526 3087
2527 cb = av_shift (av); 3088 cb = av_shift (av);
2528 3089
3090 if (SvTYPE (cb) == SVt_PVCV)
3091 {
3092 dSP;
3093 PUSHMARK (SP);
3094 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3095 PUTBACK;
3096 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3097 }
3098 else
3099 {
2529 api_ready (aTHX_ cb); 3100 api_ready (aTHX_ cb);
2530 sv_setiv (cb, 0); /* signal waiter */ 3101 sv_setiv (cb, 0); /* signal waiter */
3102 }
3103
2531 SvREFCNT_dec (cb); 3104 SvREFCNT_dec (cb);
2532 3105
2533 --count; 3106 --count;
2534 } 3107 }
2535} 3108}
… …
2544static void 3117static void
2545slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3118slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2546{ 3119{
2547 AV *av = (AV *)SvRV (arg [0]); 3120 AV *av = (AV *)SvRV (arg [0]);
2548 3121
3122 if (items >= 2)
3123 {
3124 SV *cb_cv = s_get_cv_croak (arg [1]);
3125 av_push (av, SvREFCNT_inc_NN (cb_cv));
3126
2549 if (SvIVX (AvARRAY (av)[0])) 3127 if (SvIVX (AvARRAY (av)[0]))
3128 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3129
3130 frame->prepare = prepare_nop;
3131 frame->check = slf_check_nop;
3132 }
3133 else if (SvIVX (AvARRAY (av)[0]))
2550 { 3134 {
2551 SvIVX (AvARRAY (av)[0]) = 0; 3135 SvIVX (AvARRAY (av)[0]) = 0;
2552 frame->prepare = prepare_nop; 3136 frame->prepare = prepare_nop;
2553 frame->check = slf_check_nop; 3137 frame->check = slf_check_nop;
2554 } 3138 }
2555 else 3139 else
2556 { 3140 {
2557 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3141 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2558 3142
2559 av_push (av, waiter); 3143 av_push (av, waiter);
2560 3144
2561 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3145 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2562 frame->prepare = prepare_schedule; 3146 frame->prepare = prepare_schedule;
… …
2580 3164
2581static void 3165static void
2582coro_aio_callback (pTHX_ CV *cv) 3166coro_aio_callback (pTHX_ CV *cv)
2583{ 3167{
2584 dXSARGS; 3168 dXSARGS;
2585 AV *state = (AV *)GENSUB_ARG; 3169 AV *state = (AV *)S_GENSUB_ARG;
2586 SV *coro = av_pop (state); 3170 SV *coro = av_pop (state);
2587 SV *data_sv = newSV (sizeof (struct io_state)); 3171 SV *data_sv = newSV (sizeof (struct io_state));
2588 3172
2589 av_extend (state, items - 1); 3173 av_extend (state, items - 1);
2590 3174
… …
2626 /* it quickly returns */ 3210 /* it quickly returns */
2627 if (CORO_THROW) 3211 if (CORO_THROW)
2628 return 0; 3212 return 0;
2629 3213
2630 /* one element that is an RV? repeat! */ 3214 /* one element that is an RV? repeat! */
2631 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3215 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2632 return 1; 3216 return 1;
2633 3217
2634 /* restore status */ 3218 /* restore status */
2635 { 3219 {
2636 SV *data_sv = av_pop (state); 3220 SV *data_sv = av_pop (state);
… …
2675 dSP; 3259 dSP;
2676 3260
2677 static SV *prio_cv; 3261 static SV *prio_cv;
2678 static SV *prio_sv; 3262 static SV *prio_sv;
2679 3263
2680 if (expect_false (!prio_cv)) 3264 if (ecb_expect_false (!prio_cv))
2681 { 3265 {
2682 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3266 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2683 prio_sv = newSViv (0); 3267 prio_sv = newSViv (0);
2684 } 3268 }
2685 3269
… …
2704 3288
2705 for (i = 0; i < items; ++i) 3289 for (i = 0; i < items; ++i)
2706 PUSHs (arg [i]); 3290 PUSHs (arg [i]);
2707 3291
2708 /* now push the callback closure */ 3292 /* now push the callback closure */
2709 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3293 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2710 3294
2711 /* now call the AIO function - we assume our request is uncancelable */ 3295 /* now call the AIO function - we assume our request is uncancelable */
2712 PUTBACK; 3296 PUTBACK;
2713 call_sv ((SV *)req, G_VOID | G_DISCARD); 3297 call_sv ((SV *)req, G_VOID | G_DISCARD);
2714 } 3298 }
2715 3299
2716 /* now that the requets is going, we loop toll we have a result */ 3300 /* now that the request is going, we loop till we have a result */
2717 frame->data = (void *)state; 3301 frame->data = (void *)state;
2718 frame->prepare = prepare_schedule; 3302 frame->prepare = prepare_schedule;
2719 frame->check = slf_check_aio_req; 3303 frame->check = slf_check_aio_req;
2720} 3304}
2721 3305
… …
2733 3317
2734#if CORO_CLONE 3318#if CORO_CLONE
2735# include "clone.c" 3319# include "clone.c"
2736#endif 3320#endif
2737 3321
3322/*****************************************************************************/
3323
3324static SV *
3325coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3326{
3327 SV *coro_sv;
3328 struct coro *coro;
3329 MAGIC *mg;
3330 HV *hv;
3331 SV *cb;
3332 int i;
3333
3334 if (argc > 0)
3335 {
3336 cb = s_get_cv_croak (argv [0]);
3337
3338 if (!is_coro)
3339 {
3340 if (CvISXSUB (cb))
3341 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3342
3343 if (!CvROOT (cb))
3344 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3345 }
3346 }
3347
3348 Newz (0, coro, 1, struct coro);
3349 coro->args = newAV ();
3350 coro->flags = CF_NEW;
3351
3352 if (coro_first) coro_first->prev = coro;
3353 coro->next = coro_first;
3354 coro_first = coro;
3355
3356 coro->hv = hv = newHV ();
3357 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3358 mg->mg_flags |= MGf_DUP;
3359 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3360
3361 if (argc > 0)
3362 {
3363 av_extend (coro->args, argc + is_coro - 1);
3364
3365 if (is_coro)
3366 {
3367 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3368 cb = (SV *)cv_coro_run;
3369 }
3370
3371 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3372
3373 for (i = 1; i < argc; i++)
3374 av_push (coro->args, newSVsv (argv [i]));
3375 }
3376
3377 return coro_sv;
3378}
3379
3380#ifndef __cplusplus
3381ecb_cold XS(boot_Coro__State);
3382#endif
3383
3384#if CORO_JIT
3385
3386static void ecb_noinline ecb_cold
3387pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3388{
3389 dSP;
3390 AV *av = newAV ();
3391
3392 av_store (av, 3, newSVuv (d));
3393 av_store (av, 2, newSVuv (c));
3394 av_store (av, 1, newSVuv (b));
3395 av_store (av, 0, newSVuv (a));
3396
3397 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3398
3399 PUTBACK;
3400}
3401
3402static void ecb_noinline ecb_cold
3403jit_init (pTHX)
3404{
3405 dSP;
3406 SV *load, *save;
3407 char *map_base;
3408 char *load_ptr, *save_ptr;
3409 STRLEN load_len, save_len, map_len;
3410 int count;
3411
3412 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3413
3414 PUSHMARK (SP);
3415 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3416 #include "state.h"
3417 count = call_pv ("Coro::State::_jit", G_ARRAY);
3418 SPAGAIN;
3419
3420 save = POPs; save_ptr = SvPVbyte (save, save_len);
3421 load = POPs; load_ptr = SvPVbyte (load, load_len);
3422
3423 map_len = load_len + save_len + 16;
3424
3425 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3426
3427 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3428
3429 load_perl_slots = (load_save_perl_slots_type)map_base;
3430 memcpy (map_base, load_ptr, load_len);
3431
3432 map_base += (load_len + 15) & ~15;
3433
3434 save_perl_slots = (load_save_perl_slots_type)map_base;
3435 memcpy (map_base, save_ptr, save_len);
3436
3437 /* we are good citizens and try to make the page read-only, so the evil evil */
3438 /* hackers might have it a bit more difficult */
3439 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3440
3441 PUTBACK;
3442 eval_pv ("undef &Coro::State::_jit", 1);
3443}
3444
3445#endif
3446
2738MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3447MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2739 3448
2740PROTOTYPES: DISABLE 3449PROTOTYPES: DISABLE
2741 3450
2742BOOT: 3451BOOT:
2743{ 3452{
3453#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3454#include "state.h"
2744#ifdef USE_ITHREADS 3455#ifdef USE_ITHREADS
2745# if CORO_PTHREAD 3456# if CORO_PTHREAD
2746 coro_thx = PERL_GET_CONTEXT; 3457 coro_thx = PERL_GET_CONTEXT;
2747# endif 3458# endif
2748#endif 3459#endif
2749 BOOT_PAGESIZE; 3460 /* perl defines these to check for existance first, but why it doesn't */
3461 /* just create them one at init time is not clear to me, except for */
3462 /* programs trying to delete them, but... */
3463 /* anyway, we declare this as invalid and make sure they are initialised here */
3464 DEFSV;
3465 ERRSV;
3466
3467 cctx_current = cctx_new_empty ();
2750 3468
2751 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3469 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2752 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3470 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2753 3471
2754 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3472 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
… …
2792 coroapi.prepare_nop = prepare_nop; 3510 coroapi.prepare_nop = prepare_nop;
2793 coroapi.prepare_schedule = prepare_schedule; 3511 coroapi.prepare_schedule = prepare_schedule;
2794 coroapi.prepare_cede = prepare_cede; 3512 coroapi.prepare_cede = prepare_cede;
2795 coroapi.prepare_cede_notself = prepare_cede_notself; 3513 coroapi.prepare_cede_notself = prepare_cede_notself;
2796 3514
2797 { 3515 time_init (aTHX);
2798 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2799 3516
2800 if (!svp) croak ("Time::HiRes is required");
2801 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2802
2803 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2804 }
2805
2806 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3517 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3518#if CORO_JIT
3519 PUTBACK;
3520 jit_init (aTHX);
3521 SPAGAIN;
3522#endif
2807} 3523}
2808 3524
2809SV * 3525SV *
2810new (char *klass, ...) 3526new (SV *klass, ...)
2811 ALIAS: 3527 ALIAS:
2812 Coro::new = 1 3528 Coro::new = 1
2813 CODE: 3529 CODE:
2814{ 3530 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2815 struct coro *coro; 3531 OUTPUT:
2816 MAGIC *mg;
2817 HV *hv;
2818 CV *cb;
2819 int i;
2820
2821 if (items > 1)
2822 {
2823 cb = coro_sv_2cv (aTHX_ ST (1));
2824
2825 if (!ix)
2826 {
2827 if (CvISXSUB (cb))
2828 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2829
2830 if (!CvROOT (cb))
2831 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2832 }
2833 }
2834
2835 Newz (0, coro, 1, struct coro);
2836 coro->args = newAV ();
2837 coro->flags = CF_NEW;
2838
2839 if (coro_first) coro_first->prev = coro;
2840 coro->next = coro_first;
2841 coro_first = coro;
2842
2843 coro->hv = hv = newHV ();
2844 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2845 mg->mg_flags |= MGf_DUP;
2846 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2847
2848 if (items > 1)
2849 {
2850 av_extend (coro->args, items - 1 + ix - 1);
2851
2852 if (ix)
2853 {
2854 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2855 cb = cv_coro_run;
2856 }
2857
2858 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2859
2860 for (i = 2; i < items; i++)
2861 av_push (coro->args, newSVsv (ST (i)));
2862 }
2863}
2864 OUTPUT:
2865 RETVAL 3532 RETVAL
2866 3533
2867void 3534void
2868transfer (...) 3535transfer (...)
2869 PROTOTYPE: $$ 3536 PROTOTYPE: $$
2870 CODE: 3537 CODE:
2871 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3538 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2872 3539
2873bool
2874_destroy (SV *coro_sv)
2875 CODE:
2876 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2877 OUTPUT:
2878 RETVAL
2879
2880void
2881_exit (int code)
2882 PROTOTYPE: $
2883 CODE:
2884 _exit (code);
2885
2886#if CORO_CLONE
2887
2888SV * 3540SV *
2889clone (Coro::State coro) 3541clone (Coro::State coro)
2890 CODE: 3542 CODE:
2891{ 3543{
3544#if CORO_CLONE
2892 struct coro *ncoro = coro_clone (coro); 3545 struct coro *ncoro = coro_clone (aTHX_ coro);
2893 MAGIC *mg; 3546 MAGIC *mg;
2894 /* TODO: too much duplication */ 3547 /* TODO: too much duplication */
2895 ncoro->hv = newHV (); 3548 ncoro->hv = newHV ();
2896 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3549 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2897 mg->mg_flags |= MGf_DUP; 3550 mg->mg_flags |= MGf_DUP;
2898 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv)); 3551 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3552#else
3553 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3554#endif
2899} 3555}
2900 OUTPUT: 3556 OUTPUT:
2901 RETVAL 3557 RETVAL
2902
2903#endif
2904 3558
2905int 3559int
2906cctx_stacksize (int new_stacksize = 0) 3560cctx_stacksize (int new_stacksize = 0)
2907 PROTOTYPE: ;$ 3561 PROTOTYPE: ;$
2908 CODE: 3562 CODE:
… …
2944void 3598void
2945list () 3599list ()
2946 PROTOTYPE: 3600 PROTOTYPE:
2947 PPCODE: 3601 PPCODE:
2948{ 3602{
2949 struct coro *coro; 3603 struct coro *coro;
2950 for (coro = coro_first; coro; coro = coro->next) 3604 for (coro = coro_first; coro; coro = coro->next)
2951 if (coro->hv) 3605 if (coro->hv)
2952 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3606 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
2953} 3607}
2954 3608
… …
2958 eval = 1 3612 eval = 1
2959 CODE: 3613 CODE:
2960{ 3614{
2961 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3615 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2962 { 3616 {
2963 struct coro temp; 3617 struct coro *current = SvSTATE_current;
3618 struct CoroSLF slf_save;
2964 3619
2965 if (!(coro->flags & CF_RUNNING)) 3620 if (current != coro)
2966 { 3621 {
2967 PUTBACK; 3622 PUTBACK;
2968 save_perl (aTHX_ &temp); 3623 save_perl (aTHX_ current);
2969 load_perl (aTHX_ coro); 3624 load_perl (aTHX_ coro);
3625 /* the coro is most likely in an active SLF call.
3626 * while not strictly required (the code we execute is
3627 * not allowed to call any SLF functions), it's cleaner
3628 * to reinitialise the slf_frame and restore it later.
3629 * This might one day allow us to actually do SLF calls
3630 * from code executed here.
3631 */
3632 slf_save = slf_frame;
3633 slf_frame.prepare = 0;
3634 SPAGAIN;
2970 } 3635 }
2971 3636
2972 {
2973 dSP;
2974 ENTER;
2975 SAVETMPS;
2976 PUTBACK;
2977 PUSHSTACK; 3637 PUSHSTACK;
3638
2978 PUSHMARK (SP); 3639 PUSHMARK (SP);
3640 PUTBACK;
2979 3641
2980 if (ix) 3642 if (ix)
2981 eval_sv (coderef, 0); 3643 eval_sv (coderef, 0);
2982 else 3644 else
2983 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3645 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2984 3646
2985 POPSTACK; 3647 POPSTACK;
2986 SPAGAIN; 3648 SPAGAIN;
2987 FREETMPS;
2988 LEAVE;
2989 PUTBACK;
2990 }
2991 3649
2992 if (!(coro->flags & CF_RUNNING)) 3650 if (current != coro)
2993 { 3651 {
3652 PUTBACK;
3653 slf_frame = slf_save;
2994 save_perl (aTHX_ coro); 3654 save_perl (aTHX_ coro);
2995 load_perl (aTHX_ &temp); 3655 load_perl (aTHX_ current);
2996 SPAGAIN; 3656 SPAGAIN;
2997 } 3657 }
2998 } 3658 }
2999} 3659}
3000 3660
… …
3003 PROTOTYPE: $ 3663 PROTOTYPE: $
3004 ALIAS: 3664 ALIAS:
3005 is_ready = CF_READY 3665 is_ready = CF_READY
3006 is_running = CF_RUNNING 3666 is_running = CF_RUNNING
3007 is_new = CF_NEW 3667 is_new = CF_NEW
3008 is_destroyed = CF_DESTROYED 3668 is_destroyed = CF_ZOMBIE
3669 is_zombie = CF_ZOMBIE
3670 is_suspended = CF_SUSPENDED
3009 CODE: 3671 CODE:
3010 RETVAL = boolSV (coro->flags & ix); 3672 RETVAL = boolSV (coro->flags & ix);
3011 OUTPUT: 3673 OUTPUT:
3012 RETVAL 3674 RETVAL
3013 3675
3014void 3676void
3015throw (Coro::State self, SV *throw = &PL_sv_undef) 3677throw (SV *self, SV *exception = &PL_sv_undef)
3016 PROTOTYPE: $;$ 3678 PROTOTYPE: $;$
3017 CODE: 3679 CODE:
3018{ 3680{
3681 struct coro *coro = SvSTATE (self);
3019 struct coro *current = SvSTATE_current; 3682 struct coro *current = SvSTATE_current;
3020 SV **throwp = self == current ? &CORO_THROW : &self->except; 3683 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3021 SvREFCNT_dec (*throwp); 3684 SvREFCNT_dec (*exceptionp);
3022 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3685 SvGETMAGIC (exception);
3686 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3687
3688 api_ready (aTHX_ self);
3023} 3689}
3024 3690
3025void 3691void
3026api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3692api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3027 PROTOTYPE: $;$ 3693 PROTOTYPE: $;$
… …
3029 3695
3030SV * 3696SV *
3031has_cctx (Coro::State coro) 3697has_cctx (Coro::State coro)
3032 PROTOTYPE: $ 3698 PROTOTYPE: $
3033 CODE: 3699 CODE:
3034 RETVAL = boolSV (!!coro->cctx); 3700 /* maybe manage the running flag differently */
3701 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
3035 OUTPUT: 3702 OUTPUT:
3036 RETVAL 3703 RETVAL
3037 3704
3038int 3705int
3039is_traced (Coro::State coro) 3706is_traced (Coro::State coro)
… …
3059 3726
3060void 3727void
3061force_cctx () 3728force_cctx ()
3062 PROTOTYPE: 3729 PROTOTYPE:
3063 CODE: 3730 CODE:
3064 SvSTATE_current->cctx->idle_sp = 0; 3731 cctx_current->idle_sp = 0;
3065 3732
3066void 3733void
3067swap_defsv (Coro::State self) 3734swap_defsv (Coro::State self)
3068 PROTOTYPE: $ 3735 PROTOTYPE: $
3069 ALIAS: 3736 ALIAS:
… …
3077 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3744 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3078 3745
3079 SV *tmp = *src; *src = *dst; *dst = tmp; 3746 SV *tmp = *src; *src = *dst; *dst = tmp;
3080 } 3747 }
3081 3748
3749void
3750cancel (Coro::State self)
3751 CODE:
3752 coro_state_destroy (aTHX_ self);
3753
3754SV *
3755enable_times (int enabled = enable_times)
3756 CODE:
3757{
3758 RETVAL = boolSV (enable_times);
3759
3760 if (enabled != enable_times)
3761 {
3762 enable_times = enabled;
3763
3764 coro_times_update ();
3765 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3766 }
3767}
3768 OUTPUT:
3769 RETVAL
3770
3771void
3772times (Coro::State self)
3773 PPCODE:
3774{
3775 struct coro *current = SvSTATE (coro_current);
3776
3777 if (ecb_expect_false (current == self))
3778 {
3779 coro_times_update ();
3780 coro_times_add (SvSTATE (coro_current));
3781 }
3782
3783 EXTEND (SP, 2);
3784 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3785 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3786
3787 if (ecb_expect_false (current == self))
3788 coro_times_sub (SvSTATE (coro_current));
3789}
3790
3791void
3792swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3793 CODE:
3794{
3795 struct coro *current = SvSTATE_current;
3796
3797 if (current == coro)
3798 SWAP_SVS (current);
3799
3800 if (!coro->swap_sv)
3801 coro->swap_sv = newAV ();
3802
3803 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3804 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3805
3806 if (current == coro)
3807 SWAP_SVS (current);
3808}
3809
3082 3810
3083MODULE = Coro::State PACKAGE = Coro 3811MODULE = Coro::State PACKAGE = Coro
3084 3812
3085BOOT: 3813BOOT:
3086{ 3814{
3087 int i;
3088
3089 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3815 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3090 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3816 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3091 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3817 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3092 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3093 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3818 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3094 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3819 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3095 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3820 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3096 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3821 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3822 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3097 3823
3098 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3824 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3099 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3825 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3100 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3826 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3101 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3827 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3102 3828
3103 coro_stash = gv_stashpv ("Coro", TRUE); 3829 coro_stash = gv_stashpv ("Coro", TRUE);
3104 3830
3105 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3831 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3106 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3832 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3107 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3833 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3108 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3834 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3109 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3835 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3110 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3836 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3111
3112 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3113 coro_ready[i] = newAV ();
3114 3837
3115 { 3838 {
3116 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3839 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3117 3840
3118 coroapi.schedule = api_schedule; 3841 coroapi.schedule = api_schedule;
… …
3128 sv_setiv (sv, (IV)&coroapi); 3851 sv_setiv (sv, (IV)&coroapi);
3129 SvREADONLY_on (sv); 3852 SvREADONLY_on (sv);
3130 } 3853 }
3131} 3854}
3132 3855
3856SV *
3857async (...)
3858 PROTOTYPE: &@
3859 CODE:
3860 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3861 api_ready (aTHX_ RETVAL);
3862 OUTPUT:
3863 RETVAL
3864
3865void
3866_destroy (Coro::State coro)
3867 CODE:
3868 /* used by the manager thread */
3869 coro_state_destroy (aTHX_ coro);
3870
3871void
3872on_destroy (Coro::State coro, SV *cb)
3873 CODE:
3874 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3875
3876void
3877join (...)
3878 CODE:
3879 CORO_EXECUTE_SLF_XS (slf_init_join);
3880
3133void 3881void
3134terminate (...) 3882terminate (...)
3135 CODE: 3883 CODE:
3136 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3884 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3137 3885
3138void 3886void
3887cancel (...)
3888 CODE:
3889 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3890
3891int
3892safe_cancel (Coro::State self, ...)
3893 C_ARGS: aTHX_ self, &ST (1), items - 1
3894
3895void
3139schedule (...) 3896schedule (...)
3140 CODE: 3897 CODE:
3141 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3898 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3142 3899
3143void 3900void
… …
3157 3914
3158void 3915void
3159cede_notself (...) 3916cede_notself (...)
3160 CODE: 3917 CODE:
3161 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3918 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3162
3163void
3164_cancel (Coro::State self)
3165 CODE:
3166 coro_state_destroy (aTHX_ self);
3167 coro_call_on_destroy (aTHX_ self);
3168 3919
3169void 3920void
3170_set_current (SV *current) 3921_set_current (SV *current)
3171 PROTOTYPE: $ 3922 PROTOTYPE: $
3172 CODE: 3923 CODE:
… …
3176void 3927void
3177_set_readyhook (SV *hook) 3928_set_readyhook (SV *hook)
3178 PROTOTYPE: $ 3929 PROTOTYPE: $
3179 CODE: 3930 CODE:
3180 SvREFCNT_dec (coro_readyhook); 3931 SvREFCNT_dec (coro_readyhook);
3932 SvGETMAGIC (hook);
3933 if (SvOK (hook))
3934 {
3181 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3935 coro_readyhook = newSVsv (hook);
3936 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3937 }
3938 else
3939 {
3940 coro_readyhook = 0;
3941 CORO_READYHOOK = 0;
3942 }
3182 3943
3183int 3944int
3184prio (Coro::State coro, int newprio = 0) 3945prio (Coro::State coro, int newprio = 0)
3185 PROTOTYPE: $;$ 3946 PROTOTYPE: $;$
3186 ALIAS: 3947 ALIAS:
… …
3192 if (items > 1) 3953 if (items > 1)
3193 { 3954 {
3194 if (ix) 3955 if (ix)
3195 newprio = coro->prio - newprio; 3956 newprio = coro->prio - newprio;
3196 3957
3197 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3958 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3198 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3959 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3199 3960
3200 coro->prio = newprio; 3961 coro->prio = newprio;
3201 } 3962 }
3202} 3963}
3203 OUTPUT: 3964 OUTPUT:
… …
3218 RETVAL = coro_nready; 3979 RETVAL = coro_nready;
3219 OUTPUT: 3980 OUTPUT:
3220 RETVAL 3981 RETVAL
3221 3982
3222void 3983void
3984suspend (Coro::State self)
3985 PROTOTYPE: $
3986 CODE:
3987 self->flags |= CF_SUSPENDED;
3988
3989void
3990resume (Coro::State self)
3991 PROTOTYPE: $
3992 CODE:
3993 self->flags &= ~CF_SUSPENDED;
3994
3995void
3223_pool_handler (...) 3996_pool_handler (...)
3224 CODE: 3997 CODE:
3225 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3998 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3226 3999
3227void 4000void
… …
3238 for (i = 1; i < items; ++i) 4011 for (i = 1; i < items; ++i)
3239 av_push (av, SvREFCNT_inc_NN (ST (i))); 4012 av_push (av, SvREFCNT_inc_NN (ST (i)));
3240 4013
3241 if ((SV *)hv == &PL_sv_undef) 4014 if ((SV *)hv == &PL_sv_undef)
3242 { 4015 {
3243 PUSHMARK (SP); 4016 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3244 EXTEND (SP, 2);
3245 PUSHs (sv_Coro);
3246 PUSHs ((SV *)cv_pool_handler);
3247 PUTBACK;
3248 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3249 SPAGAIN;
3250
3251 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4017 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4018 SvREFCNT_dec (sv);
3252 } 4019 }
3253 4020
3254 { 4021 {
3255 struct coro *coro = SvSTATE_hv (hv); 4022 struct coro *coro = SvSTATE_hv (hv);
3256 4023
… …
3280rouse_wait (...) 4047rouse_wait (...)
3281 PROTOTYPE: ;$ 4048 PROTOTYPE: ;$
3282 PPCODE: 4049 PPCODE:
3283 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 4050 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3284 4051
4052void
4053on_enter (SV *block)
4054 ALIAS:
4055 on_leave = 1
4056 PROTOTYPE: &
4057 CODE:
4058{
4059 struct coro *coro = SvSTATE_current;
4060 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4061
4062 block = s_get_cv_croak (block);
4063
4064 if (!*avp)
4065 *avp = newAV ();
4066
4067 av_push (*avp, SvREFCNT_inc (block));
4068
4069 if (!ix)
4070 on_enterleave_call (aTHX_ block);
4071
4072 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4073 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
4074 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4075}
4076
3285 4077
3286MODULE = Coro::State PACKAGE = PerlIO::cede 4078MODULE = Coro::State PACKAGE = PerlIO::cede
3287 4079
3288BOOT: 4080BOOT:
3289 PerlIO_define_layer (aTHX_ &PerlIO_cede); 4081 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3292MODULE = Coro::State PACKAGE = Coro::Semaphore 4084MODULE = Coro::State PACKAGE = Coro::Semaphore
3293 4085
3294SV * 4086SV *
3295new (SV *klass, SV *count = 0) 4087new (SV *klass, SV *count = 0)
3296 CODE: 4088 CODE:
4089{
4090 int semcnt = 1;
4091
4092 if (count)
4093 {
4094 SvGETMAGIC (count);
4095
4096 if (SvOK (count))
4097 semcnt = SvIV (count);
4098 }
4099
3297 RETVAL = sv_bless ( 4100 RETVAL = sv_bless (
3298 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4101 coro_waitarray_new (aTHX_ semcnt),
3299 GvSTASH (CvGV (cv)) 4102 GvSTASH (CvGV (cv))
3300 ); 4103 );
4104}
3301 OUTPUT: 4105 OUTPUT:
3302 RETVAL 4106 RETVAL
3303 4107
3304# helper for Coro::Channel 4108# helper for Coro::Channel and others
3305SV * 4109SV *
3306_alloc (int count) 4110_alloc (int count)
3307 CODE: 4111 CODE:
3308 RETVAL = coro_waitarray_new (aTHX_ count); 4112 RETVAL = coro_waitarray_new (aTHX_ count);
3309 OUTPUT: 4113 OUTPUT:
… …
3351 XSRETURN_NO; 4155 XSRETURN_NO;
3352} 4156}
3353 4157
3354void 4158void
3355waiters (SV *self) 4159waiters (SV *self)
3356 PPCODE: 4160 PPCODE:
3357{ 4161{
3358 AV *av = (AV *)SvRV (self); 4162 AV *av = (AV *)SvRV (self);
3359 int wcount = AvFILLp (av) + 1 - 1; 4163 int wcount = AvFILLp (av) + 1 - 1;
3360 4164
3361 if (GIMME_V == G_SCALAR) 4165 if (GIMME_V == G_SCALAR)
… …
3367 for (i = 1; i <= wcount; ++i) 4171 for (i = 1; i <= wcount; ++i)
3368 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4172 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3369 } 4173 }
3370} 4174}
3371 4175
4176MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4177
4178void
4179_may_delete (SV *sem, int count, unsigned int extra_refs)
4180 PPCODE:
4181{
4182 AV *av = (AV *)SvRV (sem);
4183
4184 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4185 && AvFILLp (av) == 0 /* no waiters, just count */
4186 && SvIV (AvARRAY (av)[0]) == count)
4187 XSRETURN_YES;
4188
4189 XSRETURN_NO;
4190}
4191
3372MODULE = Coro::State PACKAGE = Coro::Signal 4192MODULE = Coro::State PACKAGE = Coro::Signal
3373 4193
3374SV * 4194SV *
3375new (SV *klass) 4195new (SV *klass)
3376 CODE: 4196 CODE:
… …
3388 4208
3389void 4209void
3390broadcast (SV *self) 4210broadcast (SV *self)
3391 CODE: 4211 CODE:
3392{ 4212{
3393 AV *av = (AV *)SvRV (self); 4213 AV *av = (AV *)SvRV (self);
3394 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4214 coro_signal_wake (aTHX_ av, AvFILLp (av));
3395} 4215}
3396 4216
3397void 4217void
3398send (SV *self) 4218send (SV *self)
… …
3406 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4226 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3407} 4227}
3408 4228
3409IV 4229IV
3410awaited (SV *self) 4230awaited (SV *self)
3411 CODE: 4231 CODE:
3412 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4232 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3413 OUTPUT: 4233 OUTPUT:
3414 RETVAL 4234 RETVAL
3415 4235
3416 4236
… …
3421 4241
3422void 4242void
3423_schedule (...) 4243_schedule (...)
3424 CODE: 4244 CODE:
3425{ 4245{
3426 static int incede; 4246 static int incede;
3427 4247
3428 api_cede_notself (aTHX); 4248 api_cede_notself (aTHX);
3429 4249
3430 ++incede; 4250 ++incede;
3431 while (coro_nready >= incede && api_cede (aTHX)) 4251 while (coro_nready >= incede && api_cede (aTHX))
… …
3447 4267
3448void 4268void
3449_register (char *target, char *proto, SV *req) 4269_register (char *target, char *proto, SV *req)
3450 CODE: 4270 CODE:
3451{ 4271{
3452 CV *req_cv = coro_sv_2cv (aTHX_ req); 4272 SV *req_cv = s_get_cv_croak (req);
3453 /* newXSproto doesn't return the CV on 5.8 */ 4273 /* newXSproto doesn't return the CV on 5.8 */
3454 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4274 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3455 sv_setpv ((SV *)slf_cv, proto); 4275 sv_setpv ((SV *)slf_cv, proto);
3456 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4276 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3457} 4277}
3458 4278
4279MODULE = Coro::State PACKAGE = Coro::Select
4280
4281void
4282patch_pp_sselect ()
4283 CODE:
4284 if (!coro_old_pp_sselect)
4285 {
4286 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4287 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4288 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4289 }
4290
4291void
4292unpatch_pp_sselect ()
4293 CODE:
4294 if (coro_old_pp_sselect)
4295 {
4296 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4297 coro_old_pp_sselect = 0;
4298 }
4299
4300MODULE = Coro::State PACKAGE = Coro::Util
4301
4302void
4303_exit (int code)
4304 CODE:
4305 _exit (code);
4306
4307NV
4308time ()
4309 CODE:
4310 RETVAL = nvtime (aTHX);
4311 OUTPUT:
4312 RETVAL
4313
4314NV
4315gettimeofday ()
4316 PPCODE:
4317{
4318 UV tv [2];
4319 u2time (aTHX_ tv);
4320 EXTEND (SP, 2);
4321 PUSHs (sv_2mortal (newSVuv (tv [0])));
4322 PUSHs (sv_2mortal (newSVuv (tv [1])));
4323}
4324

Diff Legend

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