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.359 by root, Mon Jun 29 05:07:19 2009 UTC vs.
Revision 1.439 by root, Tue Nov 19 05:16:01 2013 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
12 17
18#define ECB_NO_THREADS 1
19#include "ecb.h"
20
21#include <stddef.h>
13#include <stdio.h> 22#include <stdio.h>
14#include <errno.h> 23#include <errno.h>
15#include <assert.h> 24#include <assert.h>
16 25
17#ifdef WIN32 26#ifndef SVs_PADSTALE
27# define SVs_PADSTALE 0
28#endif
29
30#ifdef PadARRAY
31# define NEWPADAPI 1
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else
34typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST;
37typedef AV PAD;
38# endif
39# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
40# define PadlistMAX(pl) AvFILLp (pl)
41# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY
43# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif
46
47/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
48/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
49#if PERL_VERSION_ATLEAST(5,19,0)
50# define SVt_BIND SVt_IV
51#endif
52
53#if defined(_WIN32)
54# undef HAS_GETTIMEOFDAY
18# undef setjmp 55# undef setjmp
19# undef longjmp 56# undef longjmp
20# undef _exit 57# undef _exit
21# define setjmp _setjmp /* deep magic */ 58# define setjmp _setjmp /* deep magic */
22#else 59#else
23# include <inttypes.h> /* most portable stdint.h */ 60# include <inttypes.h> /* most portable stdint.h */
24#endif 61#endif
25 62
26#ifdef HAVE_MMAP
27# include <unistd.h>
28# include <sys/mman.h>
29# ifndef MAP_ANONYMOUS
30# ifdef MAP_ANON
31# define MAP_ANONYMOUS MAP_ANON
32# else
33# undef HAVE_MMAP
34# endif
35# endif
36# include <limits.h>
37# ifndef PAGESIZE
38# define PAGESIZE pagesize
39# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
40static long pagesize;
41# else
42# define BOOT_PAGESIZE (void)0
43# endif
44#else
45# define PAGESIZE 0
46# define BOOT_PAGESIZE (void)0
47#endif
48
49#if CORO_USE_VALGRIND
50# include <valgrind/valgrind.h>
51#endif
52
53/* the maximum number of idle cctx that will be pooled */ 63/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 64static int cctx_max_idle = 4;
55 65
56#define PERL_VERSION_ATLEAST(a,b,c) \ 66#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57 (PERL_REVISION > (a) \ 67# define HAS_SCOPESTACK_NAME 1
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD
117#endif
118
119#ifndef CORO_STACKGUARD
120# define CORO_STACKGUARD 0
121#endif 68#endif
122 69
123/* prefer perl internal functions over our own? */ 70/* prefer perl internal functions over our own? */
124#ifndef CORO_PREFER_PERL_FUNCTIONS 71#ifndef CORO_PREFER_PERL_FUNCTIONS
125# define CORO_PREFER_PERL_FUNCTIONS 0 72# define CORO_PREFER_PERL_FUNCTIONS 0
… …
135# define STACKLEVEL ((void *)&stacklevel) 82# define STACKLEVEL ((void *)&stacklevel)
136#endif 83#endif
137 84
138#define IN_DESTRUCT PL_dirty 85#define IN_DESTRUCT PL_dirty
139 86
140#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline
144#else
145# define attribute(x)
146# define expect(expr,value) (expr)
147# define INLINE static
148#endif
149
150#define expect_false(expr) expect ((expr) != 0, 0)
151#define expect_true(expr) expect ((expr) != 0, 1)
152
153#define NOINLINE attribute ((noinline))
154
155#include "CoroAPI.h" 87#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */ 88#define GCoroAPI (&coroapi) /* very sneaky */
157 89
158#ifdef USE_ITHREADS 90#ifdef USE_ITHREADS
159# if CORO_PTHREAD 91# if CORO_PTHREAD
… …
170# define CORO_CLOCK_THREAD_CPUTIME_ID 3 102# define CORO_CLOCK_THREAD_CPUTIME_ID 3
171# endif 103# endif
172#endif 104#endif
173 105
174static double (*nvtime)(); /* so why doesn't it take void? */ 106static double (*nvtime)(); /* so why doesn't it take void? */
107static void (*u2time)(pTHX_ UV ret[2]);
175 108
176/* we hijack an hopefully unused CV flag for our purposes */ 109/* we hijack an hopefully unused CV flag for our purposes */
177#define CVf_SLF 0x4000 110#define CVf_SLF 0x4000
178static OP *pp_slf (pTHX); 111static OP *pp_slf (pTHX);
112static void slf_destroy (pTHX_ struct coro *coro);
179 113
180static U32 cctx_gen; 114static U32 cctx_gen;
181static size_t cctx_stacksize = CORO_STACKSIZE; 115static size_t cctx_stacksize = CORO_STACKSIZE;
182static struct CoroAPI coroapi; 116static struct CoroAPI coroapi;
183static AV *main_mainstack; /* used to differentiate between $main and others */ 117static AV *main_mainstack; /* used to differentiate between $main and others */
… …
200static SV *sv_pool_size; 134static SV *sv_pool_size;
201static SV *sv_async_pool_idle; /* description string */ 135static SV *sv_async_pool_idle; /* description string */
202static AV *av_async_pool; /* idle pool */ 136static AV *av_async_pool; /* idle pool */
203static SV *sv_Coro; /* class string */ 137static SV *sv_Coro; /* class string */
204static CV *cv_pool_handler; 138static CV *cv_pool_handler;
205static CV *cv_coro_state_new;
206 139
207/* Coro::AnyEvent */ 140/* Coro::AnyEvent */
208static SV *sv_activity; 141static SV *sv_activity;
209 142
210/* enable processtime/realtime profiling */ 143/* enable processtime/realtime profiling */
211static char profile_times; 144static char enable_times;
212typedef U32 coro_ts[2]; 145typedef U32 coro_ts[2];
146static coro_ts time_real, time_cpu;
147static char times_valid;
213 148
214static struct coro_cctx *cctx_first; 149static struct coro_cctx *cctx_first;
215static int cctx_count, cctx_idle; 150static int cctx_count, cctx_idle;
216 151
217enum { 152enum
153{
218 CC_MAPPED = 0x01, 154 CC_MAPPED = 0x01,
219 CC_NOREUSE = 0x02, /* throw this away after tracing */ 155 CC_NOREUSE = 0x02, /* throw this away after tracing */
220 CC_TRACE = 0x04, 156 CC_TRACE = 0x04,
221 CC_TRACE_SUB = 0x08, /* trace sub calls */ 157 CC_TRACE_SUB = 0x08, /* trace sub calls */
222 CC_TRACE_LINE = 0x10, /* trace each statement */ 158 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
227typedef struct coro_cctx 163typedef struct coro_cctx
228{ 164{
229 struct coro_cctx *next; 165 struct coro_cctx *next;
230 166
231 /* the stack */ 167 /* the stack */
232 void *sptr; 168 struct coro_stack stack;
233 size_t ssize;
234 169
235 /* cpu state */ 170 /* cpu state */
236 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 171 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
172#ifndef NDEBUG
237 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 173 JMPENV *idle_te; /* same as idle_sp, but for top_env */
174#endif
238 JMPENV *top_env; 175 JMPENV *top_env;
239 coro_context cctx; 176 coro_context cctx;
240 177
241 U32 gen; 178 U32 gen;
242#if CORO_USE_VALGRIND 179#if CORO_USE_VALGRIND
243 int valgrind_id; 180 int valgrind_id;
244#endif 181#endif
245 unsigned char flags; 182 unsigned char flags;
246} coro_cctx; 183} coro_cctx;
247 184
248coro_cctx *cctx_current; /* the currently running cctx */ 185static coro_cctx *cctx_current; /* the currently running cctx */
249 186
250/*****************************************************************************/ 187/*****************************************************************************/
251 188
189static MGVTBL coro_state_vtbl;
190
252enum { 191enum
192{
253 CF_RUNNING = 0x0001, /* coroutine is running */ 193 CF_RUNNING = 0x0001, /* coroutine is running */
254 CF_READY = 0x0002, /* coroutine is ready */ 194 CF_READY = 0x0002, /* coroutine is ready */
255 CF_NEW = 0x0004, /* has never been switched to */ 195 CF_NEW = 0x0004, /* has never been switched to */
256 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 196 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
257 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 197 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
198 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
258}; 199};
259 200
260/* the structure where most of the perl state is stored, overlaid on the cxstack */ 201/* the structure where most of the perl state is stored, overlaid on the cxstack */
261typedef struct 202typedef struct
262{ 203{
263 SV *defsv;
264 AV *defav;
265 SV *errsv;
266 SV *irsgv;
267 HV *hinthv;
268#define VAR(name,type) type name; 204 #define VARx(name,expr,type) type name;
269# include "state.h" 205 #include "state.h"
270#undef VAR
271} perl_slots; 206} perl_slots;
272 207
208/* how many context stack entries do we need for perl_slots */
273#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 209#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
274 210
275/* this is a structure representing a perl-level coroutine */ 211/* this is a structure representing a perl-level coroutine */
276struct coro { 212struct coro
213{
277 /* the C coroutine allocated to this perl coroutine, if any */ 214 /* the C coroutine allocated to this perl coroutine, if any */
278 coro_cctx *cctx; 215 coro_cctx *cctx;
279 216
280 /* ready queue */ 217 /* ready queue */
281 struct coro *next_ready; 218 struct coro *next_ready;
… …
283 /* state data */ 220 /* state data */
284 struct CoroSLF slf_frame; /* saved slf frame */ 221 struct CoroSLF slf_frame; /* saved slf frame */
285 AV *mainstack; 222 AV *mainstack;
286 perl_slots *slot; /* basically the saved sp */ 223 perl_slots *slot; /* basically the saved sp */
287 224
288 CV *startcv; /* the CV to execute */ 225 CV *startcv; /* the CV to execute */
289 AV *args; /* data associated with this coroutine (initial args) */ 226 AV *args; /* data associated with this coroutine (initial args) */
290 int refcnt; /* coroutines are refcounted, yes */
291 int flags; /* CF_ flags */ 227 int flags; /* CF_ flags */
292 HV *hv; /* the perl hash associated with this coro, if any */ 228 HV *hv; /* the perl hash associated with this coro, if any */
293 void (*on_destroy)(pTHX_ struct coro *coro);
294 229
295 /* statistics */ 230 /* statistics */
296 int usecount; /* number of transfers to this coro */ 231 int usecount; /* number of transfers to this coro */
297 232
298 /* coro process data */ 233 /* coro process data */
299 int prio; 234 int prio;
300 SV *except; /* exception to be thrown */ 235 SV *except; /* exception to be thrown */
301 SV *rouse_cb; 236 SV *rouse_cb; /* last rouse callback */
237 AV *on_destroy; /* callbacks or coros to notify on destroy */
238 AV *status; /* the exit status list */
302 239
303 /* async_pool */ 240 /* async_pool */
304 SV *saved_deffh; 241 SV *saved_deffh;
305 SV *invoke_cb; 242 SV *invoke_cb;
306 AV *invoke_av; 243 AV *invoke_av;
307 244
308 /* on_enter/on_leave */ 245 /* on_enter/on_leave */
309 AV *on_enter; 246 AV *on_enter;
310 AV *on_leave; 247 AV *on_leave;
311 248
249 /* swap_sv */
250 AV *swap_sv;
251
252 /* times */
253 coro_ts t_cpu, t_real;
254
312 /* linked list */ 255 /* linked list */
313 struct coro *next, *prev; 256 struct coro *next, *prev;
314}; 257};
315 258
316typedef struct coro *Coro__State; 259typedef struct coro *Coro__State;
317typedef struct coro *Coro__State_or_hashref; 260typedef struct coro *Coro__State_or_hashref;
318 261
319/* the following variables are effectively part of the perl context */ 262/* the following variables are effectively part of the perl context */
320/* and get copied between struct coro and these variables */ 263/* and get copied between struct coro and these variables */
321/* the mainr easonw e don't support windows process emulation */ 264/* the main reason we don't support windows process emulation */
322static struct CoroSLF slf_frame; /* the current slf frame */ 265static struct CoroSLF slf_frame; /* the current slf frame */
323 266
324/** Coro ********************************************************************/ 267/** Coro ********************************************************************/
325 268
326#define CORO_PRIO_MAX 3 269#define CORO_PRIO_MAX 3
… …
332 275
333/* for Coro.pm */ 276/* for Coro.pm */
334static SV *coro_current; 277static SV *coro_current;
335static SV *coro_readyhook; 278static SV *coro_readyhook;
336static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 279static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
337static CV *cv_coro_run, *cv_coro_terminate; 280static CV *cv_coro_run;
338static struct coro *coro_first; 281static struct coro *coro_first;
339#define coro_nready coroapi.nready 282#define coro_nready coroapi.nready
340 283
284/** JIT *********************************************************************/
285
286#if CORO_JIT
287 /* APPLE doesn't have mmap though */
288 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
289 #ifndef CORO_JIT_TYPE
290 #if ECB_AMD64 && CORO_JIT_UNIXY
291 #define CORO_JIT_TYPE "amd64-unix"
292 #elif __i386 && CORO_JIT_UNIXY
293 #define CORO_JIT_TYPE "x86-unix"
294 #endif
295 #endif
296#endif
297
298#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
299 #undef CORO_JIT
300#endif
301
302#if CORO_JIT
303 typedef void (*load_save_perl_slots_type)(perl_slots *);
304 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
305#endif
306
307/** Coro::Select ************************************************************/
308
309static OP *(*coro_old_pp_sselect) (pTHX);
310static SV *coro_select_select;
311
312/* horrible hack, but if it works... */
313static OP *
314coro_pp_sselect (pTHX)
315{
316 dSP;
317 PUSHMARK (SP - 4); /* fake argument list */
318 XPUSHs (coro_select_select);
319 PUTBACK;
320
321 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
322 PL_op->op_flags |= OPf_STACKED;
323 PL_op->op_private = 0;
324 return PL_ppaddr [OP_ENTERSUB](aTHX);
325}
326
327/** time stuff **************************************************************/
328
329#ifdef HAS_GETTIMEOFDAY
330
331ecb_inline void
332coro_u2time (pTHX_ UV ret[2])
333{
334 struct timeval tv;
335 gettimeofday (&tv, 0);
336
337 ret [0] = tv.tv_sec;
338 ret [1] = tv.tv_usec;
339}
340
341ecb_inline double
342coro_nvtime (void)
343{
344 struct timeval tv;
345 gettimeofday (&tv, 0);
346
347 return tv.tv_sec + tv.tv_usec * 1e-6;
348}
349
350ecb_inline void
351time_init (pTHX)
352{
353 nvtime = coro_nvtime;
354 u2time = coro_u2time;
355}
356
357#else
358
359ecb_inline void
360time_init (pTHX)
361{
362 SV **svp;
363
364 require_pv ("Time/HiRes.pm");
365
366 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
367
368 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
369 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
370
371 nvtime = INT2PTR (double (*)(), SvIV (*svp));
372
373 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
374 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
375}
376
377#endif
378
341/** lowlevel stuff **********************************************************/ 379/** lowlevel stuff **********************************************************/
342 380
343static SV * 381static SV * ecb_noinline
344coro_get_sv (pTHX_ const char *name, int create) 382coro_get_sv (pTHX_ const char *name, int create)
345{ 383{
346#if PERL_VERSION_ATLEAST (5,10,0) 384#if PERL_VERSION_ATLEAST (5,10,0)
347 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 385 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
348 get_sv (name, create); 386 get_sv (name, create);
349#endif 387#endif
350 return get_sv (name, create); 388 return get_sv (name, create);
351} 389}
352 390
353static AV * 391static AV * ecb_noinline
354coro_get_av (pTHX_ const char *name, int create) 392coro_get_av (pTHX_ const char *name, int create)
355{ 393{
356#if PERL_VERSION_ATLEAST (5,10,0) 394#if PERL_VERSION_ATLEAST (5,10,0)
357 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 395 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
358 get_av (name, create); 396 get_av (name, create);
359#endif 397#endif
360 return get_av (name, create); 398 return get_av (name, create);
361} 399}
362 400
363static HV * 401static HV * ecb_noinline
364coro_get_hv (pTHX_ const char *name, int create) 402coro_get_hv (pTHX_ const char *name, int create)
365{ 403{
366#if PERL_VERSION_ATLEAST (5,10,0) 404#if PERL_VERSION_ATLEAST (5,10,0)
367 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 405 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
368 get_hv (name, create); 406 get_hv (name, create);
369#endif 407#endif
370 return get_hv (name, create); 408 return get_hv (name, create);
371} 409}
372 410
373/* may croak */ 411ecb_inline void
374INLINE CV * 412coro_times_update (void)
375coro_sv_2cv (pTHX_ SV *sv)
376{ 413{
377 HV *st; 414#ifdef coro_clock_gettime
378 GV *gvp; 415 struct timespec ts;
379 CV *cv = sv_2cv (sv, &st, &gvp, 0);
380 416
381 if (!cv) 417 ts.tv_sec = ts.tv_nsec = 0;
382 croak ("code reference expected"); 418 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
419 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
383 420
384 return cv; 421 ts.tv_sec = ts.tv_nsec = 0;
422 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
423 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
424#else
425 dTHX;
426 UV tv[2];
427
428 u2time (aTHX_ tv);
429 time_real [0] = tv [0];
430 time_real [1] = tv [1] * 1000;
431#endif
432}
433
434ecb_inline void
435coro_times_add (struct coro *c)
436{
437 c->t_real [1] += time_real [1];
438 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
439 c->t_real [0] += time_real [0];
440
441 c->t_cpu [1] += time_cpu [1];
442 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
443 c->t_cpu [0] += time_cpu [0];
444}
445
446ecb_inline void
447coro_times_sub (struct coro *c)
448{
449 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
450 c->t_real [1] -= time_real [1];
451 c->t_real [0] -= time_real [0];
452
453 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
454 c->t_cpu [1] -= time_cpu [1];
455 c->t_cpu [0] -= time_cpu [0];
385} 456}
386 457
387/*****************************************************************************/ 458/*****************************************************************************/
388/* magic glue */ 459/* magic glue */
389 460
390#define CORO_MAGIC_type_cv 26 461#define CORO_MAGIC_type_cv 26
391#define CORO_MAGIC_type_state PERL_MAGIC_ext 462#define CORO_MAGIC_type_state PERL_MAGIC_ext
392 463
393#define CORO_MAGIC_NN(sv, type) \ 464#define CORO_MAGIC_NN(sv, type) \
394 (expect_true (SvMAGIC (sv)->mg_type == type) \ 465 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
395 ? SvMAGIC (sv) \ 466 ? SvMAGIC (sv) \
396 : mg_find (sv, type)) 467 : mg_find (sv, type))
397 468
398#define CORO_MAGIC(sv, type) \ 469#define CORO_MAGIC(sv, type) \
399 (expect_true (SvMAGIC (sv)) \ 470 (ecb_expect_true (SvMAGIC (sv)) \
400 ? CORO_MAGIC_NN (sv, type) \ 471 ? CORO_MAGIC_NN (sv, type) \
401 : 0) 472 : 0)
402 473
403#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 474#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
404#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 475#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
405 476
406INLINE struct coro * 477ecb_inline MAGIC *
478SvSTATEhv_p (pTHX_ SV *coro)
479{
480 MAGIC *mg;
481
482 if (ecb_expect_true (
483 SvTYPE (coro) == SVt_PVHV
484 && (mg = CORO_MAGIC_state (coro))
485 && mg->mg_virtual == &coro_state_vtbl
486 ))
487 return mg;
488
489 return 0;
490}
491
492ecb_inline struct coro *
407SvSTATE_ (pTHX_ SV *coro) 493SvSTATE_ (pTHX_ SV *coro)
408{ 494{
409 HV *stash;
410 MAGIC *mg; 495 MAGIC *mg;
411 496
412 if (SvROK (coro)) 497 if (SvROK (coro))
413 coro = SvRV (coro); 498 coro = SvRV (coro);
414 499
415 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 500 mg = SvSTATEhv_p (aTHX_ coro);
501 if (!mg)
416 croak ("Coro::State object required"); 502 croak ("Coro::State object required");
417 503
418 stash = SvSTASH (coro);
419 if (expect_false (stash != coro_stash && stash != coro_state_stash))
420 {
421 /* very slow, but rare, check */
422 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
423 croak ("Coro::State object required");
424 }
425
426 mg = CORO_MAGIC_state (coro);
427 return (struct coro *)mg->mg_ptr; 504 return (struct coro *)mg->mg_ptr;
428} 505}
429 506
430#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 507#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
431 508
… …
434#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 511#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
435 512
436/*****************************************************************************/ 513/*****************************************************************************/
437/* padlist management and caching */ 514/* padlist management and caching */
438 515
439static AV * 516ecb_inline PADLIST *
440coro_derive_padlist (pTHX_ CV *cv) 517coro_derive_padlist (pTHX_ CV *cv)
441{ 518{
442 AV *padlist = CvPADLIST (cv); 519 PADLIST *padlist = CvPADLIST (cv);
443 AV *newpadlist, *newpad; 520 PADLIST *newpadlist;
521 PAD *newpad;
522 PADOFFSET off = PadlistMAX (padlist) + 1;
444 523
445 newpadlist = newAV (); 524#if NEWPADAPI
525
526 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
527 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
528 while (!PadlistARRAY (padlist)[off - 1])
529 --off;
530
531 Perl_pad_push (aTHX_ padlist, off);
532
533 newpad = PadlistARRAY (padlist)[off];
534 PadlistARRAY (padlist)[off] = 0;
535
536#else
537
538#if PERL_VERSION_ATLEAST (5,10,0)
539 Perl_pad_push (aTHX_ padlist, off);
540#else
541 Perl_pad_push (aTHX_ padlist, off, 1);
542#endif
543
544 newpad = PadlistARRAY (padlist)[off];
545 PadlistMAX (padlist) = off - 1;
546
547#endif
548
549 newPADLIST (newpadlist);
550#if !PERL_VERSION_ATLEAST(5,15,3)
551 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
446 AvREAL_off (newpadlist); 552 AvREAL_off (newpadlist);
447#if PERL_VERSION_ATLEAST (5,10,0)
448 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
449#else
450 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
451#endif 553#endif
452 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
453 --AvFILLp (padlist);
454 554
455 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 555 /* Already extended to 2 elements by newPADLIST. */
456 av_store (newpadlist, 1, (SV *)newpad); 556 PadlistMAX (newpadlist) = 1;
557 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
558 PadlistARRAY (newpadlist)[1] = newpad;
457 559
458 return newpadlist; 560 return newpadlist;
459} 561}
460 562
461static void 563ecb_inline void
462free_padlist (pTHX_ AV *padlist) 564free_padlist (pTHX_ PADLIST *padlist)
463{ 565{
464 /* may be during global destruction */ 566 /* may be during global destruction */
465 if (!IN_DESTRUCT) 567 if (!IN_DESTRUCT)
466 { 568 {
467 I32 i = AvFILLp (padlist); 569 I32 i = PadlistMAX (padlist);
468 570
469 while (i > 0) /* special-case index 0 */ 571 while (i > 0) /* special-case index 0 */
470 { 572 {
471 /* we try to be extra-careful here */ 573 /* we try to be extra-careful here */
472 AV *av = (AV *)AvARRAY (padlist)[i--]; 574 PAD *pad = PadlistARRAY (padlist)[i--];
473 I32 j = AvFILLp (av);
474 575
576 if (pad)
577 {
578 I32 j = PadMAX (pad);
579
475 while (j >= 0) 580 while (j >= 0)
476 SvREFCNT_dec (AvARRAY (av)[j--]); 581 SvREFCNT_dec (PadARRAY (pad)[j--]);
477 582
478 AvFILLp (av) = -1; 583 PadMAX (pad) = -1;
479 SvREFCNT_dec (av); 584 SvREFCNT_dec (pad);
585 }
480 } 586 }
481 587
482 SvREFCNT_dec (AvARRAY (padlist)[0]); 588 SvREFCNT_dec (PadlistNAMES (padlist));
483 589
590#if NEWPADAPI
591 Safefree (PadlistARRAY (padlist));
592 Safefree (padlist);
593#else
484 AvFILLp (padlist) = -1; 594 AvFILLp (padlist) = -1;
595 AvREAL_off (padlist);
485 SvREFCNT_dec ((SV*)padlist); 596 SvREFCNT_dec ((SV*)padlist);
597#endif
486 } 598 }
487} 599}
488 600
489static int 601static int
490coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 602coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
491{ 603{
492 AV *padlist; 604 PADLIST *padlist;
493 AV *av = (AV *)mg->mg_obj; 605 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
606 size_t len = *(size_t *)mg->mg_ptr;
494 607
495 /* perl manages to free our internal AV and _then_ call us */ 608 /* perl manages to free our internal AV and _then_ call us */
496 if (IN_DESTRUCT) 609 if (IN_DESTRUCT)
497 return; 610 return 0;
498 611
499 /* casting is fun. */ 612 while (len--)
500 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
501 free_padlist (aTHX_ padlist); 613 free_padlist (aTHX_ padlists[len]);
502
503 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
504 614
505 return 0; 615 return 0;
506} 616}
507 617
508static MGVTBL coro_cv_vtbl = { 618static MGVTBL coro_cv_vtbl = {
509 0, 0, 0, 0, 619 0, 0, 0, 0,
510 coro_cv_free 620 coro_cv_free
511}; 621};
512 622
513/* the next two functions merely cache the padlists */ 623/* the next two functions merely cache the padlists */
514static void 624ecb_inline void
515get_padlist (pTHX_ CV *cv) 625get_padlist (pTHX_ CV *cv)
516{ 626{
517 MAGIC *mg = CORO_MAGIC_cv (cv); 627 MAGIC *mg = CORO_MAGIC_cv (cv);
518 AV *av; 628 size_t *lenp;
519 629
520 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 630 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
521 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 631 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
522 else 632 else
523 { 633 {
524#if CORO_PREFER_PERL_FUNCTIONS 634#if CORO_PREFER_PERL_FUNCTIONS
525 /* this is probably cleaner? but also slower! */ 635 /* this is probably cleaner? but also slower! */
526 /* in practise, it seems to be less stable */ 636 /* in practise, it seems to be less stable */
… …
532 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 642 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
533#endif 643#endif
534 } 644 }
535} 645}
536 646
537static void 647ecb_inline void
538put_padlist (pTHX_ CV *cv) 648put_padlist (pTHX_ CV *cv)
539{ 649{
540 MAGIC *mg = CORO_MAGIC_cv (cv); 650 MAGIC *mg = CORO_MAGIC_cv (cv);
541 AV *av;
542 651
543 if (expect_false (!mg)) 652 if (ecb_expect_false (!mg))
653 {
544 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 654 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
655 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
656 mg->mg_len = 1; /* so mg_free frees mg_ptr */
657 }
658 else
659 Renew (mg->mg_ptr,
660 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
661 char);
545 662
546 av = (AV *)mg->mg_obj; 663 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
547
548 if (expect_false (AvFILLp (av) >= AvMAX (av)))
549 av_extend (av, AvFILLp (av) + 1);
550
551 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
552} 664}
553 665
554/** load & save, init *******************************************************/ 666/** load & save, init *******************************************************/
667
668ecb_inline void
669swap_sv (SV *a, SV *b)
670{
671 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
672 SV tmp;
673
674 /* swap sv_any */
675 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
676
677 /* swap sv_flags */
678 SvFLAGS (&tmp) = SvFLAGS (a);
679 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
680 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
681
682#if PERL_VERSION_ATLEAST (5,10,0)
683 /* perl 5.10 and later complicates this _quite_ a bit, but it also
684 * is much faster, so no quarrels here. alternatively, we could
685 * sv_upgrade to avoid this.
686 */
687 {
688 /* swap sv_u */
689 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
690
691 /* if SvANY points to the head, we need to adjust the pointers,
692 * as the pointer for a still points to b, and maybe vice versa.
693 */
694 #define svany_in_head(type) \
695 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
696
697 if (svany_in_head (SvTYPE (a)))
698 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
699
700 if (svany_in_head (SvTYPE (b)))
701 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
702 }
703#endif
704}
705
706/* swap sv heads, at least logically */
707static void
708swap_svs (pTHX_ Coro__State c)
709{
710 int i;
711
712 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
713 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
714}
715
716#define SWAP_SVS(coro) \
717 if (ecb_expect_false ((coro)->swap_sv)) \
718 swap_svs (aTHX_ (coro))
555 719
556static void 720static void
557on_enterleave_call (pTHX_ SV *cb); 721on_enterleave_call (pTHX_ SV *cb);
558 722
559static void 723static void
… …
562 perl_slots *slot = c->slot; 726 perl_slots *slot = c->slot;
563 c->slot = 0; 727 c->slot = 0;
564 728
565 PL_mainstack = c->mainstack; 729 PL_mainstack = c->mainstack;
566 730
567 GvSV (PL_defgv) = slot->defsv; 731#if CORO_JIT
568 GvAV (PL_defgv) = slot->defav; 732 load_perl_slots (slot);
569 GvSV (PL_errgv) = slot->errsv; 733#else
570 GvSV (irsgv) = slot->irsgv;
571 GvHV (PL_hintgv) = slot->hinthv;
572
573 #define VAR(name,type) PL_ ## name = slot->name; 734 #define VARx(name,expr,type) expr = slot->name;
574 # include "state.h" 735 #include "state.h"
575 #undef VAR 736#endif
576 737
577 { 738 {
578 dSP; 739 dSP;
579 740
580 CV *cv; 741 CV *cv;
581 742
582 /* now do the ugly restore mess */ 743 /* now do the ugly restore mess */
583 while (expect_true (cv = (CV *)POPs)) 744 while (ecb_expect_true (cv = (CV *)POPs))
584 { 745 {
585 put_padlist (aTHX_ cv); /* mark this padlist as available */ 746 put_padlist (aTHX_ cv); /* mark this padlist as available */
586 CvDEPTH (cv) = PTR2IV (POPs); 747 CvDEPTH (cv) = PTR2IV (POPs);
587 CvPADLIST (cv) = (AV *)POPs; 748 CvPADLIST (cv) = (PADLIST *)POPs;
588 } 749 }
589 750
590 PUTBACK; 751 PUTBACK;
591 } 752 }
592 753
593 slf_frame = c->slf_frame; 754 slf_frame = c->slf_frame;
594 CORO_THROW = c->except; 755 CORO_THROW = c->except;
595 756
757 if (ecb_expect_false (enable_times))
758 {
759 if (ecb_expect_false (!times_valid))
760 coro_times_update ();
761
762 coro_times_sub (c);
763 }
764
596 if (expect_false (c->on_enter)) 765 if (ecb_expect_false (c->on_enter))
597 { 766 {
598 int i; 767 int i;
599 768
600 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 769 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
601 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 770 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
602 } 771 }
772
773 SWAP_SVS (c);
603} 774}
604 775
605static void 776static void
606save_perl (pTHX_ Coro__State c) 777save_perl (pTHX_ Coro__State c)
607{ 778{
779 SWAP_SVS (c);
780
608 if (expect_false (c->on_leave)) 781 if (ecb_expect_false (c->on_leave))
609 { 782 {
610 int i; 783 int i;
611 784
612 for (i = AvFILLp (c->on_leave); i >= 0; --i) 785 for (i = AvFILLp (c->on_leave); i >= 0; --i)
613 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 786 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
787 }
788
789 times_valid = 0;
790
791 if (ecb_expect_false (enable_times))
792 {
793 coro_times_update (); times_valid = 1;
794 coro_times_add (c);
614 } 795 }
615 796
616 c->except = CORO_THROW; 797 c->except = CORO_THROW;
617 c->slf_frame = slf_frame; 798 c->slf_frame = slf_frame;
618 799
… …
629 810
630 XPUSHs (Nullsv); 811 XPUSHs (Nullsv);
631 /* this loop was inspired by pp_caller */ 812 /* this loop was inspired by pp_caller */
632 for (;;) 813 for (;;)
633 { 814 {
634 while (expect_true (cxix >= 0)) 815 while (ecb_expect_true (cxix >= 0))
635 { 816 {
636 PERL_CONTEXT *cx = &ccstk[cxix--]; 817 PERL_CONTEXT *cx = &ccstk[cxix--];
637 818
638 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 819 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
639 { 820 {
640 CV *cv = cx->blk_sub.cv; 821 CV *cv = cx->blk_sub.cv;
641 822
642 if (expect_true (CvDEPTH (cv))) 823 if (ecb_expect_true (CvDEPTH (cv)))
643 { 824 {
644 EXTEND (SP, 3); 825 EXTEND (SP, 3);
645 PUSHs ((SV *)CvPADLIST (cv)); 826 PUSHs ((SV *)CvPADLIST (cv));
646 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 827 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
647 PUSHs ((SV *)cv); 828 PUSHs ((SV *)cv);
… …
650 get_padlist (aTHX_ cv); 831 get_padlist (aTHX_ cv);
651 } 832 }
652 } 833 }
653 } 834 }
654 835
655 if (expect_true (top_si->si_type == PERLSI_MAIN)) 836 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
656 break; 837 break;
657 838
658 top_si = top_si->si_prev; 839 top_si = top_si->si_prev;
659 ccstk = top_si->si_cxstack; 840 ccstk = top_si->si_cxstack;
660 cxix = top_si->si_cxix; 841 cxix = top_si->si_cxix;
… …
662 843
663 PUTBACK; 844 PUTBACK;
664 } 845 }
665 846
666 /* allocate some space on the context stack for our purposes */ 847 /* allocate some space on the context stack for our purposes */
667 /* we manually unroll here, as usually 2 slots is enough */ 848 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
668 if (SLOT_COUNT >= 1) CXINC;
669 if (SLOT_COUNT >= 2) CXINC;
670 if (SLOT_COUNT >= 3) CXINC;
671 { 849 {
672 int i; 850 unsigned int i;
851
673 for (i = 3; i < SLOT_COUNT; ++i) 852 for (i = 0; i < SLOT_COUNT; ++i)
674 CXINC; 853 CXINC;
675 } 854
676 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 855 cxstack_ix -= SLOT_COUNT; /* undo allocation */
856 }
677 857
678 c->mainstack = PL_mainstack; 858 c->mainstack = PL_mainstack;
679 859
680 { 860 {
681 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 861 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
682 862
683 slot->defav = GvAV (PL_defgv); 863#if CORO_JIT
684 slot->defsv = DEFSV; 864 save_perl_slots (slot);
685 slot->errsv = ERRSV; 865#else
686 slot->irsgv = GvSV (irsgv);
687 slot->hinthv = GvHV (PL_hintgv);
688
689 #define VAR(name,type) slot->name = PL_ ## name; 866 #define VARx(name,expr,type) slot->name = expr;
690 # include "state.h" 867 #include "state.h"
691 #undef VAR 868#endif
692 } 869 }
693} 870}
694 871
695/* 872/*
696 * allocate various perl stacks. This is almost an exact copy 873 * allocate various perl stacks. This is almost an exact copy
… …
702# define coro_init_stacks(thx) init_stacks () 879# define coro_init_stacks(thx) init_stacks ()
703#else 880#else
704static void 881static void
705coro_init_stacks (pTHX) 882coro_init_stacks (pTHX)
706{ 883{
707 PL_curstackinfo = new_stackinfo(32, 8); 884 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
708 PL_curstackinfo->si_type = PERLSI_MAIN; 885 PL_curstackinfo->si_type = PERLSI_MAIN;
709 PL_curstack = PL_curstackinfo->si_stack; 886 PL_curstack = PL_curstackinfo->si_stack;
710 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 887 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
711 888
712 PL_stack_base = AvARRAY(PL_curstack); 889 PL_stack_base = AvARRAY(PL_curstack);
… …
727#endif 904#endif
728 905
729 New(54,PL_scopestack,8,I32); 906 New(54,PL_scopestack,8,I32);
730 PL_scopestack_ix = 0; 907 PL_scopestack_ix = 0;
731 PL_scopestack_max = 8; 908 PL_scopestack_max = 8;
909#if HAS_SCOPESTACK_NAME
910 New(54,PL_scopestack_name,8,const char*);
911#endif
732 912
733 New(54,PL_savestack,24,ANY); 913 New(54,PL_savestack,24,ANY);
734 PL_savestack_ix = 0; 914 PL_savestack_ix = 0;
735 PL_savestack_max = 24; 915 PL_savestack_max = 24;
736 916
… …
764 } 944 }
765 945
766 Safefree (PL_tmps_stack); 946 Safefree (PL_tmps_stack);
767 Safefree (PL_markstack); 947 Safefree (PL_markstack);
768 Safefree (PL_scopestack); 948 Safefree (PL_scopestack);
949#if HAS_SCOPESTACK_NAME
950 Safefree (PL_scopestack_name);
951#endif
769 Safefree (PL_savestack); 952 Safefree (PL_savestack);
770#if !PERL_VERSION_ATLEAST (5,10,0) 953#if !PERL_VERSION_ATLEAST (5,10,0)
771 Safefree (PL_retstack); 954 Safefree (PL_retstack);
772#endif 955#endif
773} 956}
… …
819#endif 1002#endif
820 1003
821/* 1004/*
822 * This overrides the default magic get method of %SIG elements. 1005 * This overrides the default magic get method of %SIG elements.
823 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1006 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
824 * and instead of trying to save and restore the hash elements, we just provide 1007 * and instead of trying to save and restore the hash elements (extremely slow),
825 * readback here. 1008 * we just provide our own readback here.
826 */ 1009 */
827static int 1010static int ecb_cold
828coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1011coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
829{ 1012{
830 const char *s = MgPV_nolen_const (mg); 1013 const char *s = MgPV_nolen_const (mg);
831 1014
832 if (*s == '_') 1015 if (*s == '_')
833 { 1016 {
834 SV **svp = 0; 1017 SV **svp = 0;
835 1018
836 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1019 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
837 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1020 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
838 1021
839 if (svp) 1022 if (svp)
840 { 1023 {
841 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1024 SV *ssv;
1025
1026 if (!*svp)
1027 ssv = &PL_sv_undef;
1028 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1029 ssv = sv_2mortal (newRV_inc (*svp));
1030 else
1031 ssv = *svp;
1032
1033 sv_setsv (sv, ssv);
842 return 0; 1034 return 0;
843 } 1035 }
844 } 1036 }
845 1037
846 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1038 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
847} 1039}
848 1040
849static int 1041static int ecb_cold
850coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1042coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
851{ 1043{
852 const char *s = MgPV_nolen_const (mg); 1044 const char *s = MgPV_nolen_const (mg);
853 1045
854 if (*s == '_') 1046 if (*s == '_')
… …
868 } 1060 }
869 1061
870 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1062 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
871} 1063}
872 1064
873static int 1065static int ecb_cold
874coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1066coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
875{ 1067{
876 const char *s = MgPV_nolen_const (mg); 1068 const char *s = MgPV_nolen_const (mg);
877 1069
878 if (*s == '_') 1070 if (*s == '_')
… …
911slf_check_repeat (pTHX_ struct CoroSLF *frame) 1103slf_check_repeat (pTHX_ struct CoroSLF *frame)
912{ 1104{
913 return 1; 1105 return 1;
914} 1106}
915 1107
916static UNOP coro_setup_op; 1108static UNOP init_perl_op;
917 1109
918static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1110ecb_noinline static void /* noinline to keep it out of the transfer fast path */
919coro_setup (pTHX_ struct coro *coro) 1111init_perl (pTHX_ struct coro *coro)
920{ 1112{
921 /* 1113 /*
922 * emulate part of the perl startup here. 1114 * emulate part of the perl startup here.
923 */ 1115 */
924 coro_init_stacks (aTHX); 1116 coro_init_stacks (aTHX);
… …
931 PL_comppad_name_fill = 0; 1123 PL_comppad_name_fill = 0;
932 PL_comppad_name_floor = 0; 1124 PL_comppad_name_floor = 0;
933 PL_curpm = 0; 1125 PL_curpm = 0;
934 PL_curpad = 0; 1126 PL_curpad = 0;
935 PL_localizing = 0; 1127 PL_localizing = 0;
936 PL_dirty = 0;
937 PL_restartop = 0; 1128 PL_restartop = 0;
938#if PERL_VERSION_ATLEAST (5,10,0) 1129#if PERL_VERSION_ATLEAST (5,10,0)
939 PL_parser = 0; 1130 PL_parser = 0;
940#endif 1131#endif
941 PL_hints = 0; 1132 PL_hints = 0;
942 1133
943 /* recreate the die/warn hooks */ 1134 /* recreate the die/warn hooks */
944 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1135 PL_diehook = SvREFCNT_inc (rv_diehook);
945 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1136 PL_warnhook = SvREFCNT_inc (rv_warnhook);
946 1137
947 GvSV (PL_defgv) = newSV (0); 1138 GvSV (PL_defgv) = newSV (0);
948 GvAV (PL_defgv) = coro->args; coro->args = 0; 1139 GvAV (PL_defgv) = coro->args; coro->args = 0;
949 GvSV (PL_errgv) = newSV (0); 1140 GvSV (PL_errgv) = newSV (0);
950 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1141 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
951 GvHV (PL_hintgv) = 0; 1142 GvHV (PL_hintgv) = 0;
… …
971 /* this newly created coroutine might be run on an existing cctx which most 1162 /* this newly created coroutine might be run on an existing cctx which most
972 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1163 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
973 */ 1164 */
974 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1165 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
975 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1166 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1167 slf_frame.destroy = 0;
976 1168
977 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1169 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
978 coro_setup_op.op_next = PL_op; 1170 init_perl_op.op_next = PL_op;
979 coro_setup_op.op_type = OP_ENTERSUB; 1171 init_perl_op.op_type = OP_ENTERSUB;
980 coro_setup_op.op_ppaddr = pp_slf; 1172 init_perl_op.op_ppaddr = pp_slf;
981 /* no flags etc. required, as an init function won't be called */ 1173 /* no flags etc. required, as an init function won't be called */
982 1174
983 PL_op = (OP *)&coro_setup_op; 1175 PL_op = (OP *)&init_perl_op;
984 1176
985 /* copy throw, in case it was set before coro_setup */ 1177 /* copy throw, in case it was set before init_perl */
986 CORO_THROW = coro->except; 1178 CORO_THROW = coro->except;
1179
1180 SWAP_SVS (coro);
1181
1182 if (ecb_expect_false (enable_times))
1183 {
1184 coro_times_update ();
1185 coro_times_sub (coro);
1186 }
987} 1187}
988 1188
989static void 1189static void
990coro_unwind_stacks (pTHX) 1190coro_unwind_stacks (pTHX)
991{ 1191{
… …
1006 dounwind (-1); 1206 dounwind (-1);
1007 } 1207 }
1008} 1208}
1009 1209
1010static void 1210static void
1011coro_destruct_perl (pTHX_ struct coro *coro) 1211destroy_perl (pTHX_ struct coro *coro)
1012{ 1212{
1013 SV *svf [9]; 1213 SV *svf [9];
1014 1214
1015 { 1215 {
1216 SV *old_current = SvRV (coro_current);
1016 struct coro *current = SvSTATE_current; 1217 struct coro *current = SvSTATE (old_current);
1017 1218
1018 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1219 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1019 1220
1020 save_perl (aTHX_ current); 1221 save_perl (aTHX_ current);
1222
1223 /* this will cause transfer_check to croak on block*/
1224 SvRV_set (coro_current, (SV *)coro->hv);
1225
1021 load_perl (aTHX_ coro); 1226 load_perl (aTHX_ coro);
1022 1227
1023 coro_unwind_stacks (aTHX); 1228 coro_unwind_stacks (aTHX);
1229
1230 /* restore swapped sv's */
1231 SWAP_SVS (coro);
1232
1024 coro_destruct_stacks (aTHX); 1233 coro_destruct_stacks (aTHX);
1025 1234
1026 // now save some sv's to be free'd later 1235 /* now save some sv's to be free'd later */
1027 svf [0] = GvSV (PL_defgv); 1236 svf [0] = GvSV (PL_defgv);
1028 svf [1] = (SV *)GvAV (PL_defgv); 1237 svf [1] = (SV *)GvAV (PL_defgv);
1029 svf [2] = GvSV (PL_errgv); 1238 svf [2] = GvSV (PL_errgv);
1030 svf [3] = (SV *)PL_defoutgv; 1239 svf [3] = (SV *)PL_defoutgv;
1031 svf [4] = PL_rs; 1240 svf [4] = PL_rs;
… …
1033 svf [6] = (SV *)GvHV (PL_hintgv); 1242 svf [6] = (SV *)GvHV (PL_hintgv);
1034 svf [7] = PL_diehook; 1243 svf [7] = PL_diehook;
1035 svf [8] = PL_warnhook; 1244 svf [8] = PL_warnhook;
1036 assert (9 == sizeof (svf) / sizeof (*svf)); 1245 assert (9 == sizeof (svf) / sizeof (*svf));
1037 1246
1247 SvRV_set (coro_current, old_current);
1248
1038 load_perl (aTHX_ current); 1249 load_perl (aTHX_ current);
1039 } 1250 }
1040 1251
1041 { 1252 {
1042 int i; 1253 unsigned int i;
1043 1254
1044 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1255 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1045 SvREFCNT_dec (svf [i]); 1256 SvREFCNT_dec (svf [i]);
1046 1257
1047 SvREFCNT_dec (coro->saved_deffh); 1258 SvREFCNT_dec (coro->saved_deffh);
… …
1049 SvREFCNT_dec (coro->invoke_cb); 1260 SvREFCNT_dec (coro->invoke_cb);
1050 SvREFCNT_dec (coro->invoke_av); 1261 SvREFCNT_dec (coro->invoke_av);
1051 } 1262 }
1052} 1263}
1053 1264
1054INLINE void 1265ecb_inline void
1055free_coro_mortal (pTHX) 1266free_coro_mortal (pTHX)
1056{ 1267{
1057 if (expect_true (coro_mortal)) 1268 if (ecb_expect_true (coro_mortal))
1058 { 1269 {
1059 SvREFCNT_dec (coro_mortal); 1270 SvREFCNT_dec ((SV *)coro_mortal);
1060 coro_mortal = 0; 1271 coro_mortal = 0;
1061 } 1272 }
1062} 1273}
1063 1274
1064static int 1275static int
… …
1197 1408
1198 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1409 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1199} 1410}
1200 1411
1201/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1412/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1202static void NOINLINE 1413static void ecb_noinline
1203cctx_prepare (pTHX) 1414cctx_prepare (pTHX)
1204{ 1415{
1205 PL_top_env = &PL_start_env; 1416 PL_top_env = &PL_start_env;
1206 1417
1207 if (cctx_current->flags & CC_TRACE) 1418 if (cctx_current->flags & CC_TRACE)
… …
1218 slf_frame.prepare = slf_prepare_set_stacklevel; 1429 slf_frame.prepare = slf_prepare_set_stacklevel;
1219 slf_frame.check = slf_check_set_stacklevel; 1430 slf_frame.check = slf_check_set_stacklevel;
1220} 1431}
1221 1432
1222/* the tail of transfer: execute stuff we can only do after a transfer */ 1433/* the tail of transfer: execute stuff we can only do after a transfer */
1223INLINE void 1434ecb_inline void
1224transfer_tail (pTHX) 1435transfer_tail (pTHX)
1225{ 1436{
1226 free_coro_mortal (aTHX); 1437 free_coro_mortal (aTHX);
1438}
1439
1440/* try to exit the same way perl's main function would do */
1441/* we do not bother resetting the environment or other things *7
1442/* that are not, uhm, essential */
1443/* this obviously also doesn't work when perl is embedded */
1444static void ecb_noinline ecb_cold
1445perlish_exit (pTHX)
1446{
1447 int exitstatus = perl_destruct (PL_curinterp);
1448 perl_free (PL_curinterp);
1449 exit (exitstatus);
1227} 1450}
1228 1451
1229/* 1452/*
1230 * this is a _very_ stripped down perl interpreter ;) 1453 * this is a _very_ stripped down perl interpreter ;)
1231 */ 1454 */
… …
1253 /* somebody or something will hit me for both perl_run and PL_restartop */ 1476 /* somebody or something will hit me for both perl_run and PL_restartop */
1254 PL_restartop = PL_op; 1477 PL_restartop = PL_op;
1255 perl_run (PL_curinterp); 1478 perl_run (PL_curinterp);
1256 /* 1479 /*
1257 * Unfortunately, there is no way to get at the return values of the 1480 * Unfortunately, there is no way to get at the return values of the
1258 * coro body here, as perl_run destroys these 1481 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1482 * runtime errors here, as this is just a random interpreter, not a thread.
1259 */ 1483 */
1260 1484
1261 /* 1485 /*
1262 * If perl-run returns we assume exit() was being called or the coro 1486 * If perl-run returns we assume exit() was being called or the coro
1263 * fell off the end, which seems to be the only valid (non-bug) 1487 * fell off the end, which seems to be the only valid (non-bug)
1264 * reason for perl_run to return. We try to exit by jumping to the 1488 * reason for perl_run to return. We try to mimic whatever perl is normally
1265 * bootstrap-time "top" top_env, as we cannot restore the "main" 1489 * doing in that case. YMMV.
1266 * coroutine as Coro has no such concept.
1267 * This actually isn't valid with the pthread backend, but OSes requiring
1268 * that backend are too broken to do it in a standards-compliant way.
1269 */ 1490 */
1270 PL_top_env = main_top_env; 1491 perlish_exit (aTHX);
1271 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1272 } 1492 }
1273} 1493}
1274 1494
1275static coro_cctx * 1495static coro_cctx *
1276cctx_new () 1496cctx_new (void)
1277{ 1497{
1278 coro_cctx *cctx; 1498 coro_cctx *cctx;
1279 1499
1280 ++cctx_count; 1500 ++cctx_count;
1281 New (0, cctx, 1, coro_cctx); 1501 New (0, cctx, 1, coro_cctx);
… …
1287 return cctx; 1507 return cctx;
1288} 1508}
1289 1509
1290/* create a new cctx only suitable as source */ 1510/* create a new cctx only suitable as source */
1291static coro_cctx * 1511static coro_cctx *
1292cctx_new_empty () 1512cctx_new_empty (void)
1293{ 1513{
1294 coro_cctx *cctx = cctx_new (); 1514 coro_cctx *cctx = cctx_new ();
1295 1515
1296 cctx->sptr = 0; 1516 cctx->stack.sptr = 0;
1297 coro_create (&cctx->cctx, 0, 0, 0, 0); 1517 coro_create (&cctx->cctx, 0, 0, 0, 0);
1298 1518
1299 return cctx; 1519 return cctx;
1300} 1520}
1301 1521
1302/* create a new cctx suitable as destination/running a perl interpreter */ 1522/* create a new cctx suitable as destination/running a perl interpreter */
1303static coro_cctx * 1523static coro_cctx *
1304cctx_new_run () 1524cctx_new_run (void)
1305{ 1525{
1306 coro_cctx *cctx = cctx_new (); 1526 coro_cctx *cctx = cctx_new ();
1307 void *stack_start;
1308 size_t stack_size;
1309 1527
1310#if HAVE_MMAP 1528 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1311 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1312 /* mmap supposedly does allocate-on-write for us */
1313 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1314
1315 if (cctx->sptr != (void *)-1)
1316 {
1317 #if CORO_STACKGUARD
1318 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1319 #endif
1320 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1321 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1322 cctx->flags |= CC_MAPPED;
1323 } 1529 {
1324 else
1325#endif
1326 {
1327 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1328 New (0, cctx->sptr, cctx_stacksize, long);
1329
1330 if (!cctx->sptr)
1331 {
1332 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1530 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1333 _exit (EXIT_FAILURE); 1531 _exit (EXIT_FAILURE);
1334 }
1335
1336 stack_start = cctx->sptr;
1337 stack_size = cctx->ssize;
1338 } 1532 }
1339 1533
1340 #if CORO_USE_VALGRIND
1341 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1342 #endif
1343
1344 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1534 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1345 1535
1346 return cctx; 1536 return cctx;
1347} 1537}
1348 1538
1349static void 1539static void
1350cctx_destroy (coro_cctx *cctx) 1540cctx_destroy (coro_cctx *cctx)
1351{ 1541{
1352 if (!cctx) 1542 if (!cctx)
1353 return; 1543 return;
1354 1544
1355 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1545 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1356 1546
1357 --cctx_count; 1547 --cctx_count;
1358 coro_destroy (&cctx->cctx); 1548 coro_destroy (&cctx->cctx);
1359 1549
1360 /* coro_transfer creates new, empty cctx's */ 1550 coro_stack_free (&cctx->stack);
1361 if (cctx->sptr)
1362 {
1363 #if CORO_USE_VALGRIND
1364 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1365 #endif
1366
1367#if HAVE_MMAP
1368 if (cctx->flags & CC_MAPPED)
1369 munmap (cctx->sptr, cctx->ssize);
1370 else
1371#endif
1372 Safefree (cctx->sptr);
1373 }
1374 1551
1375 Safefree (cctx); 1552 Safefree (cctx);
1376} 1553}
1377 1554
1378/* wether this cctx should be destructed */ 1555/* wether this cctx should be destructed */
1379#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1556#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1380 1557
1381static coro_cctx * 1558static coro_cctx *
1382cctx_get (pTHX) 1559cctx_get (pTHX)
1383{ 1560{
1384 while (expect_true (cctx_first)) 1561 while (ecb_expect_true (cctx_first))
1385 { 1562 {
1386 coro_cctx *cctx = cctx_first; 1563 coro_cctx *cctx = cctx_first;
1387 cctx_first = cctx->next; 1564 cctx_first = cctx->next;
1388 --cctx_idle; 1565 --cctx_idle;
1389 1566
1390 if (expect_true (!CCTX_EXPIRED (cctx))) 1567 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1391 return cctx; 1568 return cctx;
1392 1569
1393 cctx_destroy (cctx); 1570 cctx_destroy (cctx);
1394 } 1571 }
1395 1572
… …
1397} 1574}
1398 1575
1399static void 1576static void
1400cctx_put (coro_cctx *cctx) 1577cctx_put (coro_cctx *cctx)
1401{ 1578{
1402 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1579 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1403 1580
1404 /* free another cctx if overlimit */ 1581 /* free another cctx if overlimit */
1405 if (expect_false (cctx_idle >= cctx_max_idle)) 1582 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1406 { 1583 {
1407 coro_cctx *first = cctx_first; 1584 coro_cctx *first = cctx_first;
1408 cctx_first = first->next; 1585 cctx_first = first->next;
1409 --cctx_idle; 1586 --cctx_idle;
1410 1587
… …
1421static void 1598static void
1422transfer_check (pTHX_ struct coro *prev, struct coro *next) 1599transfer_check (pTHX_ struct coro *prev, struct coro *next)
1423{ 1600{
1424 /* TODO: throwing up here is considered harmful */ 1601 /* TODO: throwing up here is considered harmful */
1425 1602
1426 if (expect_true (prev != next)) 1603 if (ecb_expect_true (prev != next))
1427 { 1604 {
1428 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1605 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1429 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1606 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1430 1607
1431 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1608 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1432 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1609 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1433 1610
1434#if !PERL_VERSION_ATLEAST (5,10,0) 1611#if !PERL_VERSION_ATLEAST (5,10,0)
1435 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1612 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1436 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1613 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1437#endif 1614#endif
1438 } 1615 }
1439} 1616}
1440 1617
1441/* always use the TRANSFER macro */ 1618/* always use the TRANSFER macro */
1442static void NOINLINE /* noinline so we have a fixed stackframe */ 1619static void ecb_noinline /* noinline so we have a fixed stackframe */
1443transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1620transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1444{ 1621{
1445 dSTACKLEVEL; 1622 dSTACKLEVEL;
1446 1623
1447 /* sometimes transfer is only called to set idle_sp */ 1624 /* sometimes transfer is only called to set idle_sp */
1448 if (expect_false (!prev)) 1625 if (ecb_expect_false (!prev))
1449 { 1626 {
1450 cctx_current->idle_sp = STACKLEVEL; 1627 cctx_current->idle_sp = STACKLEVEL;
1451 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1628 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1452 } 1629 }
1453 else if (expect_true (prev != next)) 1630 else if (ecb_expect_true (prev != next))
1454 { 1631 {
1455 coro_cctx *cctx_prev; 1632 coro_cctx *cctx_prev;
1456 1633
1457 if (expect_false (prev->flags & CF_NEW)) 1634 if (ecb_expect_false (prev->flags & CF_NEW))
1458 { 1635 {
1459 /* create a new empty/source context */ 1636 /* create a new empty/source context */
1460 prev->flags &= ~CF_NEW; 1637 prev->flags &= ~CF_NEW;
1461 prev->flags |= CF_RUNNING; 1638 prev->flags |= CF_RUNNING;
1462 } 1639 }
… …
1465 next->flags |= CF_RUNNING; 1642 next->flags |= CF_RUNNING;
1466 1643
1467 /* first get rid of the old state */ 1644 /* first get rid of the old state */
1468 save_perl (aTHX_ prev); 1645 save_perl (aTHX_ prev);
1469 1646
1470 if (expect_false (next->flags & CF_NEW)) 1647 if (ecb_expect_false (next->flags & CF_NEW))
1471 { 1648 {
1472 /* need to start coroutine */ 1649 /* need to start coroutine */
1473 next->flags &= ~CF_NEW; 1650 next->flags &= ~CF_NEW;
1474 /* setup coroutine call */ 1651 /* setup coroutine call */
1475 coro_setup (aTHX_ next); 1652 init_perl (aTHX_ next);
1476 } 1653 }
1477 else 1654 else
1478 load_perl (aTHX_ next); 1655 load_perl (aTHX_ next);
1479 1656
1480 /* possibly untie and reuse the cctx */ 1657 /* possibly untie and reuse the cctx */
1481 if (expect_true ( 1658 if (ecb_expect_true (
1482 cctx_current->idle_sp == STACKLEVEL 1659 cctx_current->idle_sp == STACKLEVEL
1483 && !(cctx_current->flags & CC_TRACE) 1660 && !(cctx_current->flags & CC_TRACE)
1484 && !force_cctx 1661 && !force_cctx
1485 )) 1662 ))
1486 { 1663 {
1487 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1664 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1488 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1665 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1489 1666
1490 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1667 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1491 /* without this the next cctx_get might destroy the running cctx while still in use */ 1668 /* without this the next cctx_get might destroy the running cctx while still in use */
1492 if (expect_false (CCTX_EXPIRED (cctx_current))) 1669 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1493 if (expect_true (!next->cctx)) 1670 if (ecb_expect_true (!next->cctx))
1494 next->cctx = cctx_get (aTHX); 1671 next->cctx = cctx_get (aTHX);
1495 1672
1496 cctx_put (cctx_current); 1673 cctx_put (cctx_current);
1497 } 1674 }
1498 else 1675 else
1499 prev->cctx = cctx_current; 1676 prev->cctx = cctx_current;
1500 1677
1501 ++next->usecount; 1678 ++next->usecount;
1502 1679
1503 cctx_prev = cctx_current; 1680 cctx_prev = cctx_current;
1504 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1681 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1505 1682
1506 next->cctx = 0; 1683 next->cctx = 0;
1507 1684
1508 if (expect_false (cctx_prev != cctx_current)) 1685 if (ecb_expect_false (cctx_prev != cctx_current))
1509 { 1686 {
1510 cctx_prev->top_env = PL_top_env; 1687 cctx_prev->top_env = PL_top_env;
1511 PL_top_env = cctx_current->top_env; 1688 PL_top_env = cctx_current->top_env;
1512 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1689 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1513 } 1690 }
… …
1519#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1696#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1520#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1697#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1521 1698
1522/** high level stuff ********************************************************/ 1699/** high level stuff ********************************************************/
1523 1700
1701/* this function is actually Coro, not Coro::State, but we call it from here */
1702/* because it is convenient - but it hasn't been declared yet for that reason */
1524static int 1703static void
1704coro_call_on_destroy (pTHX_ struct coro *coro);
1705
1706static void
1525coro_state_destroy (pTHX_ struct coro *coro) 1707coro_state_destroy (pTHX_ struct coro *coro)
1526{ 1708{
1527 if (coro->flags & CF_DESTROYED) 1709 if (coro->flags & CF_ZOMBIE)
1528 return 0; 1710 return;
1529 1711
1530 if (coro->on_destroy && !PL_dirty)
1531 coro->on_destroy (aTHX_ coro); 1712 slf_destroy (aTHX_ coro);
1532 1713
1533 coro->flags |= CF_DESTROYED; 1714 coro->flags |= CF_ZOMBIE;
1534 1715
1535 if (coro->flags & CF_READY) 1716 if (coro->flags & CF_READY)
1536 { 1717 {
1537 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1718 /* reduce nready, as destroying a ready coro effectively unreadies it */
1538 /* alternative: look through all ready queues and remove the coro */ 1719 /* alternative: look through all ready queues and remove the coro */
1539 --coro_nready; 1720 --coro_nready;
1540 } 1721 }
1541 else 1722 else
1542 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1723 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1724
1725 if (coro->next) coro->next->prev = coro->prev;
1726 if (coro->prev) coro->prev->next = coro->next;
1727 if (coro == coro_first) coro_first = coro->next;
1543 1728
1544 if (coro->mainstack 1729 if (coro->mainstack
1545 && coro->mainstack != main_mainstack 1730 && coro->mainstack != main_mainstack
1546 && coro->slot 1731 && coro->slot
1547 && !PL_dirty) 1732 && !PL_dirty)
1548 coro_destruct_perl (aTHX_ coro); 1733 destroy_perl (aTHX_ coro);
1549 1734
1550 cctx_destroy (coro->cctx); 1735 cctx_destroy (coro->cctx);
1551 SvREFCNT_dec (coro->startcv); 1736 SvREFCNT_dec (coro->startcv);
1552 SvREFCNT_dec (coro->args); 1737 SvREFCNT_dec (coro->args);
1738 SvREFCNT_dec (coro->swap_sv);
1553 SvREFCNT_dec (CORO_THROW); 1739 SvREFCNT_dec (CORO_THROW);
1554 1740
1555 if (coro->next) coro->next->prev = coro->prev; 1741 coro_call_on_destroy (aTHX_ coro);
1556 if (coro->prev) coro->prev->next = coro->next;
1557 if (coro == coro_first) coro_first = coro->next;
1558 1742
1559 return 1; 1743 /* more destruction mayhem in coro_state_free */
1560} 1744}
1561 1745
1562static int 1746static int
1563coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1747coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1564{ 1748{
1565 struct coro *coro = (struct coro *)mg->mg_ptr; 1749 struct coro *coro = (struct coro *)mg->mg_ptr;
1566 mg->mg_ptr = 0; 1750 mg->mg_ptr = 0;
1567 1751
1568 coro->hv = 0;
1569
1570 if (--coro->refcnt < 0)
1571 {
1572 coro_state_destroy (aTHX_ coro); 1752 coro_state_destroy (aTHX_ coro);
1753 SvREFCNT_dec (coro->on_destroy);
1754 SvREFCNT_dec (coro->status);
1755
1573 Safefree (coro); 1756 Safefree (coro);
1574 }
1575 1757
1576 return 0; 1758 return 0;
1577} 1759}
1578 1760
1579static int 1761static int ecb_cold
1580coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1762coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1581{ 1763{
1582 struct coro *coro = (struct coro *)mg->mg_ptr; 1764 /* called when perl clones the current process the slow way (windows process emulation) */
1583 1765 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1584 ++coro->refcnt; 1766 mg->mg_ptr = 0;
1767 mg->mg_virtual = 0;
1585 1768
1586 return 0; 1769 return 0;
1587} 1770}
1588 1771
1589static MGVTBL coro_state_vtbl = { 1772static MGVTBL coro_state_vtbl = {
… …
1612 1795
1613 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1796 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1614 TRANSFER (ta, 1); 1797 TRANSFER (ta, 1);
1615} 1798}
1616 1799
1617/*****************************************************************************/
1618/* gensub: simple closure generation utility */
1619
1620#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1621
1622/* create a closure from XS, returns a code reference */
1623/* the arg can be accessed via GENSUB_ARG from the callback */
1624/* the callback must use dXSARGS/XSRETURN */
1625static SV *
1626gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1627{
1628 CV *cv = (CV *)newSV (0);
1629
1630 sv_upgrade ((SV *)cv, SVt_PVCV);
1631
1632 CvANON_on (cv);
1633 CvISXSUB_on (cv);
1634 CvXSUB (cv) = xsub;
1635 GENSUB_ARG = arg;
1636
1637 return newRV_noinc ((SV *)cv);
1638}
1639
1640/** Coro ********************************************************************/ 1800/** Coro ********************************************************************/
1641 1801
1642INLINE void 1802ecb_inline void
1643coro_enq (pTHX_ struct coro *coro) 1803coro_enq (pTHX_ struct coro *coro)
1644{ 1804{
1645 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1805 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1646 1806
1647 SvREFCNT_inc_NN (coro->hv); 1807 SvREFCNT_inc_NN (coro->hv);
… …
1649 coro->next_ready = 0; 1809 coro->next_ready = 0;
1650 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1810 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1651 ready [1] = coro; 1811 ready [1] = coro;
1652} 1812}
1653 1813
1654INLINE struct coro * 1814ecb_inline struct coro *
1655coro_deq (pTHX) 1815coro_deq (pTHX)
1656{ 1816{
1657 int prio; 1817 int prio;
1658 1818
1659 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1819 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1669 } 1829 }
1670 1830
1671 return 0; 1831 return 0;
1672} 1832}
1673 1833
1834static void
1835invoke_sv_ready_hook_helper (void)
1836{
1837 dTHX;
1838 dSP;
1839
1840 ENTER;
1841 SAVETMPS;
1842
1843 PUSHMARK (SP);
1844 PUTBACK;
1845 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1846
1847 FREETMPS;
1848 LEAVE;
1849}
1850
1674static int 1851static int
1675api_ready (pTHX_ SV *coro_sv) 1852api_ready (pTHX_ SV *coro_sv)
1676{ 1853{
1677 struct coro *coro;
1678 SV *sv_hook;
1679 void (*xs_hook)(void);
1680
1681 coro = SvSTATE (coro_sv); 1854 struct coro *coro = SvSTATE (coro_sv);
1682 1855
1683 if (coro->flags & CF_READY) 1856 if (coro->flags & CF_READY)
1684 return 0; 1857 return 0;
1685 1858
1686 coro->flags |= CF_READY; 1859 coro->flags |= CF_READY;
1687 1860
1688 sv_hook = coro_nready ? 0 : coro_readyhook;
1689 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1690
1691 coro_enq (aTHX_ coro); 1861 coro_enq (aTHX_ coro);
1692 ++coro_nready;
1693 1862
1694 if (sv_hook) 1863 if (!coro_nready++)
1695 { 1864 if (coroapi.readyhook)
1696 dSP; 1865 coroapi.readyhook ();
1697
1698 ENTER;
1699 SAVETMPS;
1700
1701 PUSHMARK (SP);
1702 PUTBACK;
1703 call_sv (sv_hook, G_VOID | G_DISCARD);
1704
1705 FREETMPS;
1706 LEAVE;
1707 }
1708
1709 if (xs_hook)
1710 xs_hook ();
1711 1866
1712 return 1; 1867 return 1;
1713} 1868}
1714 1869
1715static int 1870static int
… …
1717{ 1872{
1718 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1873 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1719} 1874}
1720 1875
1721/* expects to own a reference to next->hv */ 1876/* expects to own a reference to next->hv */
1722INLINE void 1877ecb_inline void
1723prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1878prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1724{ 1879{
1725 SV *prev_sv = SvRV (coro_current); 1880 SV *prev_sv = SvRV (coro_current);
1726 1881
1727 ta->prev = SvSTATE_hv (prev_sv); 1882 ta->prev = SvSTATE_hv (prev_sv);
… …
1740{ 1895{
1741 for (;;) 1896 for (;;)
1742 { 1897 {
1743 struct coro *next = coro_deq (aTHX); 1898 struct coro *next = coro_deq (aTHX);
1744 1899
1745 if (expect_true (next)) 1900 if (ecb_expect_true (next))
1746 { 1901 {
1747 /* cannot transfer to destroyed coros, skip and look for next */ 1902 /* cannot transfer to destroyed coros, skip and look for next */
1748 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1903 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1749 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1904 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1750 else 1905 else
1751 { 1906 {
1752 next->flags &= ~CF_READY; 1907 next->flags &= ~CF_READY;
1753 --coro_nready; 1908 --coro_nready;
… …
1760 { 1915 {
1761 /* nothing to schedule: call the idle handler */ 1916 /* nothing to schedule: call the idle handler */
1762 if (SvROK (sv_idle) 1917 if (SvROK (sv_idle)
1763 && SvOBJECT (SvRV (sv_idle))) 1918 && SvOBJECT (SvRV (sv_idle)))
1764 { 1919 {
1920 if (SvRV (sv_idle) == SvRV (coro_current))
1921 {
1922 require_pv ("Carp");
1923
1924 {
1925 dSP;
1926
1927 ENTER;
1928 SAVETMPS;
1929
1930 PUSHMARK (SP);
1931 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1932 PUTBACK;
1933 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1934
1935 FREETMPS;
1936 LEAVE;
1937 }
1938 }
1939
1765 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1940 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1766 api_ready (aTHX_ SvRV (sv_idle)); 1941 api_ready (aTHX_ SvRV (sv_idle));
1767 --coro_nready; 1942 --coro_nready;
1768 } 1943 }
1769 else 1944 else
1770 { 1945 {
1946 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1771 dSP; 1947 dSP;
1772 1948
1773 ENTER; 1949 ENTER;
1774 SAVETMPS; 1950 SAVETMPS;
1775 1951
… …
1782 } 1958 }
1783 } 1959 }
1784 } 1960 }
1785} 1961}
1786 1962
1787INLINE void 1963ecb_inline void
1788prepare_cede (pTHX_ struct coro_transfer_args *ta) 1964prepare_cede (pTHX_ struct coro_transfer_args *ta)
1789{ 1965{
1790 api_ready (aTHX_ coro_current); 1966 api_ready (aTHX_ coro_current);
1791 prepare_schedule (aTHX_ ta); 1967 prepare_schedule (aTHX_ ta);
1792} 1968}
1793 1969
1794INLINE void 1970ecb_inline void
1795prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1971prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1796{ 1972{
1797 SV *prev = SvRV (coro_current); 1973 SV *prev = SvRV (coro_current);
1798 1974
1799 if (coro_nready) 1975 if (coro_nready)
… …
1829{ 2005{
1830 struct coro_transfer_args ta; 2006 struct coro_transfer_args ta;
1831 2007
1832 prepare_cede (aTHX_ &ta); 2008 prepare_cede (aTHX_ &ta);
1833 2009
1834 if (expect_true (ta.prev != ta.next)) 2010 if (ecb_expect_true (ta.prev != ta.next))
1835 { 2011 {
1836 TRANSFER (ta, 1); 2012 TRANSFER (ta, 1);
1837 return 1; 2013 return 1;
1838 } 2014 }
1839 else 2015 else
… …
1882 coro->slot->runops = RUNOPS_DEFAULT; 2058 coro->slot->runops = RUNOPS_DEFAULT;
1883 } 2059 }
1884} 2060}
1885 2061
1886static void 2062static void
2063coro_push_av (pTHX_ AV *av, I32 gimme_v)
2064{
2065 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2066 {
2067 dSP;
2068
2069 if (gimme_v == G_SCALAR)
2070 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2071 else
2072 {
2073 int i;
2074 EXTEND (SP, AvFILLp (av) + 1);
2075
2076 for (i = 0; i <= AvFILLp (av); ++i)
2077 PUSHs (AvARRAY (av)[i]);
2078 }
2079
2080 PUTBACK;
2081 }
2082}
2083
2084static void
2085coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2086{
2087 if (!coro->on_destroy)
2088 coro->on_destroy = newAV ();
2089
2090 av_push (coro->on_destroy, cb);
2091}
2092
2093static void
2094slf_destroy_join (pTHX_ struct CoroSLF *frame)
2095{
2096 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2097}
2098
2099static int
2100slf_check_join (pTHX_ struct CoroSLF *frame)
2101{
2102 struct coro *coro = (struct coro *)frame->data;
2103
2104 if (!coro->status)
2105 return 1;
2106
2107 frame->destroy = 0;
2108
2109 coro_push_av (aTHX_ coro->status, GIMME_V);
2110
2111 SvREFCNT_dec ((SV *)coro->hv);
2112
2113 return 0;
2114}
2115
2116static void
2117slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2118{
2119 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2120
2121 if (items > 1)
2122 croak ("join called with too many arguments");
2123
2124 if (coro->status)
2125 frame->prepare = prepare_nop;
2126 else
2127 {
2128 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2129 frame->prepare = prepare_schedule;
2130 }
2131
2132 frame->check = slf_check_join;
2133 frame->destroy = slf_destroy_join;
2134 frame->data = (void *)coro;
2135 SvREFCNT_inc (coro->hv);
2136}
2137
2138static void
1887coro_call_on_destroy (pTHX_ struct coro *coro) 2139coro_call_on_destroy (pTHX_ struct coro *coro)
1888{ 2140{
1889 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2141 AV *od = coro->on_destroy;
1890 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1891 2142
1892 if (on_destroyp) 2143 if (!od)
1893 { 2144 return;
1894 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1895 2145
2146 coro->on_destroy = 0;
2147 sv_2mortal ((SV *)od);
2148
1896 while (AvFILLp (on_destroy) >= 0) 2149 while (AvFILLp (od) >= 0)
2150 {
2151 SV *cb = sv_2mortal (av_pop (od));
2152
2153 /* coro hv's (and only hv's at the moment) are supported as well */
2154 if (SvSTATEhv_p (aTHX_ cb))
2155 api_ready (aTHX_ cb);
2156 else
1897 { 2157 {
1898 dSP; /* don't disturb outer sp */ 2158 dSP; /* don't disturb outer sp */
1899 SV *cb = av_pop (on_destroy);
1900
1901 PUSHMARK (SP); 2159 PUSHMARK (SP);
1902 2160
1903 if (statusp) 2161 if (coro->status)
1904 { 2162 {
1905 int i; 2163 PUTBACK;
1906 AV *status = (AV *)SvRV (*statusp); 2164 coro_push_av (aTHX_ coro->status, G_ARRAY);
1907 EXTEND (SP, AvFILLp (status) + 1); 2165 SPAGAIN;
1908
1909 for (i = 0; i <= AvFILLp (status); ++i)
1910 PUSHs (AvARRAY (status)[i]);
1911 } 2166 }
1912 2167
1913 PUTBACK; 2168 PUTBACK;
1914 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2169 call_sv (cb, G_VOID | G_DISCARD);
1915 } 2170 }
1916 } 2171 }
1917} 2172}
1918 2173
1919static void 2174static void
1920slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2175coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1921{ 2176{
2177 AV *av;
2178
2179 if (coro->status)
2180 {
2181 av = coro->status;
2182 av_clear (av);
2183 }
2184 else
2185 av = coro->status = newAV ();
2186
2187 /* items are actually not so common, so optimise for this case */
2188 if (items)
2189 {
1922 int i; 2190 int i;
1923 HV *hv = (HV *)SvRV (coro_current);
1924 AV *av = newAV ();
1925 2191
1926 av_extend (av, items - 1); 2192 av_extend (av, items - 1);
2193
1927 for (i = 0; i < items; ++i) 2194 for (i = 0; i < items; ++i)
1928 av_push (av, SvREFCNT_inc_NN (arg [i])); 2195 av_push (av, SvREFCNT_inc_NN (arg [i]));
2196 }
2197}
1929 2198
1930 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2199static void
1931 2200slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2201{
1932 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2202 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1933 api_ready (aTHX_ sv_manager); 2203 api_ready (aTHX_ sv_manager);
1934 2204
1935 frame->prepare = prepare_schedule; 2205 frame->prepare = prepare_schedule;
1936 frame->check = slf_check_repeat; 2206 frame->check = slf_check_repeat;
1937 2207
1938 /* as a minor optimisation, we could unwind all stacks here */ 2208 /* as a minor optimisation, we could unwind all stacks here */
1939 /* but that puts extra pressure on pp_slf, and is not worth much */ 2209 /* but that puts extra pressure on pp_slf, and is not worth much */
1940 /*coro_unwind_stacks (aTHX);*/ 2210 /*coro_unwind_stacks (aTHX);*/
2211}
2212
2213static void
2214slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2215{
2216 HV *coro_hv = (HV *)SvRV (coro_current);
2217
2218 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2219 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2220}
2221
2222static void
2223slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2224{
2225 HV *coro_hv;
2226 struct coro *coro;
2227
2228 if (items <= 0)
2229 croak ("Coro::cancel called without coro object,");
2230
2231 coro = SvSTATE (arg [0]);
2232 coro_hv = coro->hv;
2233
2234 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2235
2236 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2237 {
2238 /* coro currently busy cancelling something, so just notify it */
2239 coro->slf_frame.data = (void *)coro;
2240
2241 frame->prepare = prepare_nop;
2242 frame->check = slf_check_nop;
2243 }
2244 else if (coro_hv == (HV *)SvRV (coro_current))
2245 {
2246 /* cancelling the current coro is allowed, and equals terminate */
2247 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2248 }
2249 else
2250 {
2251 struct coro *self = SvSTATE_current;
2252
2253 /* otherwise we cancel directly, purely for speed reasons
2254 * unfortunately, this requires some magic trickery, as
2255 * somebody else could cancel us, so we have to fight the cancellation.
2256 * this is ugly, and hopefully fully worth the extra speed.
2257 * besides, I can't get the slow-but-safe version working...
2258 */
2259 slf_frame.data = 0;
2260 self->flags |= CF_NOCANCEL;
2261 coro_state_destroy (aTHX_ coro);
2262 self->flags &= ~CF_NOCANCEL;
2263
2264 if (slf_frame.data)
2265 {
2266 /* while we were busy we have been cancelled, so terminate */
2267 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2268 }
2269 else
2270 {
2271 frame->prepare = prepare_nop;
2272 frame->check = slf_check_nop;
2273 }
2274 }
2275}
2276
2277static int
2278slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2279{
2280 frame->prepare = 0;
2281 coro_unwind_stacks (aTHX);
2282
2283 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2284
2285 return 1;
2286}
2287
2288static int
2289safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2290{
2291 if (coro->cctx)
2292 croak ("coro inside C callback, unable to cancel at this time, caught");
2293
2294 if (coro->flags & CF_NEW)
2295 {
2296 coro_set_status (aTHX_ coro, arg, items);
2297 coro_state_destroy (aTHX_ coro);
2298 }
2299 else
2300 {
2301 if (!coro->slf_frame.prepare)
2302 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2303
2304 slf_destroy (aTHX_ coro);
2305
2306 coro_set_status (aTHX_ coro, arg, items);
2307 coro->slf_frame.prepare = prepare_nop;
2308 coro->slf_frame.check = slf_check_safe_cancel;
2309
2310 api_ready (aTHX_ (SV *)coro->hv);
2311 }
2312
2313 return 1;
1941} 2314}
1942 2315
1943/*****************************************************************************/ 2316/*****************************************************************************/
1944/* async pool handler */ 2317/* async pool handler */
1945 2318
… …
1976slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2349slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1977{ 2350{
1978 HV *hv = (HV *)SvRV (coro_current); 2351 HV *hv = (HV *)SvRV (coro_current);
1979 struct coro *coro = SvSTATE_hv ((SV *)hv); 2352 struct coro *coro = SvSTATE_hv ((SV *)hv);
1980 2353
1981 if (expect_true (coro->saved_deffh)) 2354 if (ecb_expect_true (coro->saved_deffh))
1982 { 2355 {
1983 /* subsequent iteration */ 2356 /* subsequent iteration */
1984 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2357 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1985 coro->saved_deffh = 0; 2358 coro->saved_deffh = 0;
1986 2359
1987 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2360 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1988 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2361 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1989 { 2362 {
1990 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2363 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1991 coro->invoke_av = newAV (); 2364 return;
1992
1993 frame->prepare = prepare_nop;
1994 } 2365 }
1995 else 2366 else
1996 { 2367 {
1997 av_clear (GvAV (PL_defgv)); 2368 av_clear (GvAV (PL_defgv));
1998 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2369 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2023 2394
2024static void 2395static void
2025coro_rouse_callback (pTHX_ CV *cv) 2396coro_rouse_callback (pTHX_ CV *cv)
2026{ 2397{
2027 dXSARGS; 2398 dXSARGS;
2028 SV *data = (SV *)GENSUB_ARG; 2399 SV *data = (SV *)S_GENSUB_ARG;
2029 2400
2030 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2401 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2031 { 2402 {
2032 /* first call, set args */ 2403 /* first call, set args */
2033 SV *coro = SvRV (data); 2404 SV *coro = SvRV (data);
… …
2048 2419
2049static int 2420static int
2050slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2421slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2051{ 2422{
2052 SV *data = (SV *)frame->data; 2423 SV *data = (SV *)frame->data;
2053 2424
2054 if (CORO_THROW) 2425 if (CORO_THROW)
2055 return 0; 2426 return 0;
2056 2427
2057 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2428 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2058 return 1; 2429 return 1;
… …
2094 cb = sv_2mortal (coro->rouse_cb); 2465 cb = sv_2mortal (coro->rouse_cb);
2095 coro->rouse_cb = 0; 2466 coro->rouse_cb = 0;
2096 } 2467 }
2097 2468
2098 if (!SvROK (cb) 2469 if (!SvROK (cb)
2099 || SvTYPE (SvRV (cb)) != SVt_PVCV 2470 || SvTYPE (SvRV (cb)) != SVt_PVCV
2100 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2471 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2101 croak ("Coro::rouse_wait called with illegal callback argument,"); 2472 croak ("Coro::rouse_wait called with illegal callback argument,");
2102 2473
2103 { 2474 {
2104 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2475 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2105 SV *data = (SV *)GENSUB_ARG; 2476 SV *data = (SV *)S_GENSUB_ARG;
2106 2477
2107 frame->data = (void *)data; 2478 frame->data = (void *)data;
2108 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2479 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2109 frame->check = slf_check_rouse_wait; 2480 frame->check = slf_check_rouse_wait;
2110 } 2481 }
… …
2114coro_new_rouse_cb (pTHX) 2485coro_new_rouse_cb (pTHX)
2115{ 2486{
2116 HV *hv = (HV *)SvRV (coro_current); 2487 HV *hv = (HV *)SvRV (coro_current);
2117 struct coro *coro = SvSTATE_hv (hv); 2488 struct coro *coro = SvSTATE_hv (hv);
2118 SV *data = newRV_inc ((SV *)hv); 2489 SV *data = newRV_inc ((SV *)hv);
2119 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2490 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2120 2491
2121 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2492 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2122 SvREFCNT_dec (data); /* magicext increases the refcount */ 2493 SvREFCNT_dec (data); /* magicext increases the refcount */
2123 2494
2124 SvREFCNT_dec (coro->rouse_cb); 2495 SvREFCNT_dec (coro->rouse_cb);
… …
2221static void 2592static void
2222slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2593slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2223{ 2594{
2224 frame->prepare = prepare_cede_notself; 2595 frame->prepare = prepare_cede_notself;
2225 frame->check = slf_check_nop; 2596 frame->check = slf_check_nop;
2597}
2598
2599/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2600static void
2601slf_destroy (pTHX_ struct coro *coro)
2602{
2603 /* this callback is reserved for slf functions needing to do cleanup */
2604 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2605 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2606
2607 /*
2608 * The on_destroy above most likely is from an SLF call.
2609 * Since by definition the SLF call will not finish when we destroy
2610 * the coro, we will have to force-finish it here, otherwise
2611 * cleanup functions cannot call SLF functions.
2612 */
2613 coro->slf_frame.prepare = 0;
2226} 2614}
2227 2615
2228/* 2616/*
2229 * these not obviously related functions are all rolled into one 2617 * these not obviously related functions are all rolled into one
2230 * function to increase chances that they all will call transfer with the same 2618 * function to increase chances that they all will call transfer with the same
… …
2237 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2625 I32 checkmark; /* mark SP to see how many elements check has pushed */
2238 2626
2239 /* set up the slf frame, unless it has already been set-up */ 2627 /* set up the slf frame, unless it has already been set-up */
2240 /* the latter happens when a new coro has been started */ 2628 /* the latter happens when a new coro has been started */
2241 /* or when a new cctx was attached to an existing coroutine */ 2629 /* or when a new cctx was attached to an existing coroutine */
2242 if (expect_true (!slf_frame.prepare)) 2630 if (ecb_expect_true (!slf_frame.prepare))
2243 { 2631 {
2244 /* first iteration */ 2632 /* first iteration */
2245 dSP; 2633 dSP;
2246 SV **arg = PL_stack_base + TOPMARK + 1; 2634 SV **arg = PL_stack_base + TOPMARK + 1;
2247 int items = SP - arg; /* args without function object */ 2635 int items = SP - arg; /* args without function object */
… …
2288 while (slf_frame.check (aTHX_ &slf_frame)); 2676 while (slf_frame.check (aTHX_ &slf_frame));
2289 2677
2290 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2678 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2291 2679
2292 /* exception handling */ 2680 /* exception handling */
2293 if (expect_false (CORO_THROW)) 2681 if (ecb_expect_false (CORO_THROW))
2294 { 2682 {
2295 SV *exception = sv_2mortal (CORO_THROW); 2683 SV *exception = sv_2mortal (CORO_THROW);
2296 2684
2297 CORO_THROW = 0; 2685 CORO_THROW = 0;
2298 sv_setsv (ERRSV, exception); 2686 sv_setsv (ERRSV, exception);
2299 croak (0); 2687 croak (0);
2300 } 2688 }
2301 2689
2302 /* return value handling - mostly like entersub */ 2690 /* return value handling - mostly like entersub */
2303 /* make sure we put something on the stack in scalar context */ 2691 /* make sure we put something on the stack in scalar context */
2304 if (GIMME_V == G_SCALAR) 2692 if (GIMME_V == G_SCALAR
2693 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2305 { 2694 {
2306 dSP; 2695 dSP;
2307 SV **bot = PL_stack_base + checkmark; 2696 SV **bot = PL_stack_base + checkmark;
2308 2697
2309 if (sp == bot) /* too few, push undef */ 2698 if (sp == bot) /* too few, push undef */
2310 bot [1] = &PL_sv_undef; 2699 bot [1] = &PL_sv_undef;
2311 else if (sp != bot + 1) /* too many, take last one */ 2700 else /* too many, take last one */
2312 bot [1] = *sp; 2701 bot [1] = *sp;
2313 2702
2314 SP = bot + 1; 2703 SP = bot + 1;
2315 2704
2316 PUTBACK; 2705 PUTBACK;
… …
2349 if (PL_op->op_flags & OPf_STACKED) 2738 if (PL_op->op_flags & OPf_STACKED)
2350 { 2739 {
2351 if (items > slf_arga) 2740 if (items > slf_arga)
2352 { 2741 {
2353 slf_arga = items; 2742 slf_arga = items;
2354 free (slf_argv); 2743 Safefree (slf_argv);
2355 slf_argv = malloc (slf_arga * sizeof (SV *)); 2744 New (0, slf_argv, slf_arga, SV *);
2356 } 2745 }
2357 2746
2358 slf_argc = items; 2747 slf_argc = items;
2359 2748
2360 for (i = 0; i < items; ++i) 2749 for (i = 0; i < items; ++i)
… …
2423{ 2812{
2424 PerlIOBuf base; 2813 PerlIOBuf base;
2425 NV next, every; 2814 NV next, every;
2426} PerlIOCede; 2815} PerlIOCede;
2427 2816
2428static IV 2817static IV ecb_cold
2429PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2818PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2430{ 2819{
2431 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2820 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2432 2821
2433 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2822 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2434 self->next = nvtime () + self->every; 2823 self->next = nvtime () + self->every;
2435 2824
2436 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2825 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2437} 2826}
2438 2827
2439static SV * 2828static SV * ecb_cold
2440PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2829PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2441{ 2830{
2442 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2831 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2443 2832
2444 return newSVnv (self->every); 2833 return newSVnv (self->every);
… …
2556 SvREFCNT_dec (cb); 2945 SvREFCNT_dec (cb);
2557 } 2946 }
2558} 2947}
2559 2948
2560static void 2949static void
2561coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2950coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2562{ 2951{
2563 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2952 /* call $sem->adjust (0) to possibly wake up some other waiters */
2564 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2953 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2565} 2954}
2566 2955
2567static int 2956static int
2568slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2957slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2569{ 2958{
2570 AV *av = (AV *)frame->data; 2959 AV *av = (AV *)frame->data;
2571 SV *count_sv = AvARRAY (av)[0]; 2960 SV *count_sv = AvARRAY (av)[0];
2961 SV *coro_hv = SvRV (coro_current);
2572 2962
2573 /* if we are about to throw, don't actually acquire the lock, just throw */ 2963 /* if we are about to throw, don't actually acquire the lock, just throw */
2574 if (CORO_THROW) 2964 if (CORO_THROW)
2575 return 0; 2965 return 0;
2576 else if (SvIVX (count_sv) > 0) 2966 else if (SvIVX (count_sv) > 0)
2577 { 2967 {
2578 SvSTATE_current->on_destroy = 0; 2968 frame->destroy = 0;
2579 2969
2580 if (acquire) 2970 if (acquire)
2581 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2971 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2582 else 2972 else
2583 coro_semaphore_adjust (aTHX_ av, 0); 2973 coro_semaphore_adjust (aTHX_ av, 0);
… …
2588 { 2978 {
2589 int i; 2979 int i;
2590 /* if we were woken up but can't down, we look through the whole */ 2980 /* if we were woken up but can't down, we look through the whole */
2591 /* waiters list and only add us if we aren't in there already */ 2981 /* waiters list and only add us if we aren't in there already */
2592 /* this avoids some degenerate memory usage cases */ 2982 /* this avoids some degenerate memory usage cases */
2593 2983 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2594 for (i = 1; i <= AvFILLp (av); ++i)
2595 if (AvARRAY (av)[i] == SvRV (coro_current)) 2984 if (AvARRAY (av)[i] == coro_hv)
2596 return 1; 2985 return 1;
2597 2986
2598 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2987 av_push (av, SvREFCNT_inc (coro_hv));
2599 return 1; 2988 return 1;
2600 } 2989 }
2601} 2990}
2602 2991
2603static int 2992static int
… …
2626 { 3015 {
2627 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3016 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2628 3017
2629 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3018 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2630 frame->prepare = prepare_schedule; 3019 frame->prepare = prepare_schedule;
2631
2632 /* to avoid race conditions when a woken-up coro gets terminated */ 3020 /* to avoid race conditions when a woken-up coro gets terminated */
2633 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3021 /* we arrange for a temporary on_destroy that calls adjust (0) */
2634 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3022 frame->destroy = coro_semaphore_destroy;
2635 } 3023 }
2636} 3024}
2637 3025
2638static void 3026static void
2639slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3027slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2647{ 3035{
2648 if (items >= 2) 3036 if (items >= 2)
2649 { 3037 {
2650 /* callback form */ 3038 /* callback form */
2651 AV *av = (AV *)SvRV (arg [0]); 3039 AV *av = (AV *)SvRV (arg [0]);
2652 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3040 SV *cb_cv = s_get_cv_croak (arg [1]);
2653 3041
2654 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3042 av_push (av, SvREFCNT_inc_NN (cb_cv));
2655 3043
2656 if (SvIVX (AvARRAY (av)[0]) > 0) 3044 if (SvIVX (AvARRAY (av)[0]) > 0)
2657 coro_semaphore_adjust (aTHX_ av, 0); 3045 coro_semaphore_adjust (aTHX_ av, 0);
… …
2717{ 3105{
2718 AV *av = (AV *)SvRV (arg [0]); 3106 AV *av = (AV *)SvRV (arg [0]);
2719 3107
2720 if (items >= 2) 3108 if (items >= 2)
2721 { 3109 {
2722 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3110 SV *cb_cv = s_get_cv_croak (arg [1]);
2723 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3111 av_push (av, SvREFCNT_inc_NN (cb_cv));
2724 3112
2725 if (SvIVX (AvARRAY (av)[0])) 3113 if (SvIVX (AvARRAY (av)[0]))
2726 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3114 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2727 3115
2728 frame->prepare = prepare_nop; 3116 frame->prepare = prepare_nop;
2729 frame->check = slf_check_nop; 3117 frame->check = slf_check_nop;
2730 } 3118 }
2731 else if (SvIVX (AvARRAY (av)[0])) 3119 else if (SvIVX (AvARRAY (av)[0]))
… …
2762 3150
2763static void 3151static void
2764coro_aio_callback (pTHX_ CV *cv) 3152coro_aio_callback (pTHX_ CV *cv)
2765{ 3153{
2766 dXSARGS; 3154 dXSARGS;
2767 AV *state = (AV *)GENSUB_ARG; 3155 AV *state = (AV *)S_GENSUB_ARG;
2768 SV *coro = av_pop (state); 3156 SV *coro = av_pop (state);
2769 SV *data_sv = newSV (sizeof (struct io_state)); 3157 SV *data_sv = newSV (sizeof (struct io_state));
2770 3158
2771 av_extend (state, items - 1); 3159 av_extend (state, items - 1);
2772 3160
… …
2808 /* it quickly returns */ 3196 /* it quickly returns */
2809 if (CORO_THROW) 3197 if (CORO_THROW)
2810 return 0; 3198 return 0;
2811 3199
2812 /* one element that is an RV? repeat! */ 3200 /* one element that is an RV? repeat! */
2813 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3201 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2814 return 1; 3202 return 1;
2815 3203
2816 /* restore status */ 3204 /* restore status */
2817 { 3205 {
2818 SV *data_sv = av_pop (state); 3206 SV *data_sv = av_pop (state);
… …
2857 dSP; 3245 dSP;
2858 3246
2859 static SV *prio_cv; 3247 static SV *prio_cv;
2860 static SV *prio_sv; 3248 static SV *prio_sv;
2861 3249
2862 if (expect_false (!prio_cv)) 3250 if (ecb_expect_false (!prio_cv))
2863 { 3251 {
2864 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3252 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2865 prio_sv = newSViv (0); 3253 prio_sv = newSViv (0);
2866 } 3254 }
2867 3255
… …
2886 3274
2887 for (i = 0; i < items; ++i) 3275 for (i = 0; i < items; ++i)
2888 PUSHs (arg [i]); 3276 PUSHs (arg [i]);
2889 3277
2890 /* now push the callback closure */ 3278 /* now push the callback closure */
2891 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3279 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2892 3280
2893 /* now call the AIO function - we assume our request is uncancelable */ 3281 /* now call the AIO function - we assume our request is uncancelable */
2894 PUTBACK; 3282 PUTBACK;
2895 call_sv ((SV *)req, G_VOID | G_DISCARD); 3283 call_sv ((SV *)req, G_VOID | G_DISCARD);
2896 } 3284 }
2897 3285
2898 /* now that the requets is going, we loop toll we have a result */ 3286 /* now that the request is going, we loop till we have a result */
2899 frame->data = (void *)state; 3287 frame->data = (void *)state;
2900 frame->prepare = prepare_schedule; 3288 frame->prepare = prepare_schedule;
2901 frame->check = slf_check_aio_req; 3289 frame->check = slf_check_aio_req;
2902} 3290}
2903 3291
… …
2913 3301
2914/*****************************************************************************/ 3302/*****************************************************************************/
2915 3303
2916#if CORO_CLONE 3304#if CORO_CLONE
2917# include "clone.c" 3305# include "clone.c"
3306#endif
3307
3308/*****************************************************************************/
3309
3310static SV *
3311coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3312{
3313 SV *coro_sv;
3314 struct coro *coro;
3315 MAGIC *mg;
3316 HV *hv;
3317 SV *cb;
3318 int i;
3319
3320 if (argc > 0)
3321 {
3322 cb = s_get_cv_croak (argv [0]);
3323
3324 if (!is_coro)
3325 {
3326 if (CvISXSUB (cb))
3327 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3328
3329 if (!CvROOT (cb))
3330 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3331 }
3332 }
3333
3334 Newz (0, coro, 1, struct coro);
3335 coro->args = newAV ();
3336 coro->flags = CF_NEW;
3337
3338 if (coro_first) coro_first->prev = coro;
3339 coro->next = coro_first;
3340 coro_first = coro;
3341
3342 coro->hv = hv = newHV ();
3343 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3344 mg->mg_flags |= MGf_DUP;
3345 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3346
3347 if (argc > 0)
3348 {
3349 av_extend (coro->args, argc + is_coro - 1);
3350
3351 if (is_coro)
3352 {
3353 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3354 cb = (SV *)cv_coro_run;
3355 }
3356
3357 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3358
3359 for (i = 1; i < argc; i++)
3360 av_push (coro->args, newSVsv (argv [i]));
3361 }
3362
3363 return coro_sv;
3364}
3365
3366#ifndef __cplusplus
3367ecb_cold XS(boot_Coro__State);
3368#endif
3369
3370#if CORO_JIT
3371
3372static void ecb_noinline ecb_cold
3373pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3374{
3375 dSP;
3376 AV *av = newAV ();
3377
3378 av_store (av, 3, newSVuv (d));
3379 av_store (av, 2, newSVuv (c));
3380 av_store (av, 1, newSVuv (b));
3381 av_store (av, 0, newSVuv (a));
3382
3383 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3384
3385 PUTBACK;
3386}
3387
3388static void ecb_noinline ecb_cold
3389jit_init (pTHX)
3390{
3391 dSP;
3392 SV *load, *save;
3393 char *map_base;
3394 char *load_ptr, *save_ptr;
3395 STRLEN load_len, save_len, map_len;
3396 int count;
3397
3398 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3399
3400 PUSHMARK (SP);
3401 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3402 #include "state.h"
3403 count = call_pv ("Coro::State::_jit", G_ARRAY);
3404 SPAGAIN;
3405
3406 save = POPs; save_ptr = SvPVbyte (save, save_len);
3407 load = POPs; load_ptr = SvPVbyte (load, load_len);
3408
3409 map_len = load_len + save_len + 16;
3410
3411 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3412
3413 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3414
3415 load_perl_slots = (load_save_perl_slots_type)map_base;
3416 memcpy (map_base, load_ptr, load_len);
3417
3418 map_base += (load_len + 15) & ~15;
3419
3420 save_perl_slots = (load_save_perl_slots_type)map_base;
3421 memcpy (map_base, save_ptr, save_len);
3422
3423 /* we are good citizens and try to make the page read-only, so the evil evil */
3424 /* hackers might have it a bit more difficult */
3425 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3426
3427 PUTBACK;
3428 eval_pv ("undef &Coro::State::_jit", 1);
3429}
3430
2918#endif 3431#endif
2919 3432
2920MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3433MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2921 3434
2922PROTOTYPES: DISABLE 3435PROTOTYPES: DISABLE
… …
2926#ifdef USE_ITHREADS 3439#ifdef USE_ITHREADS
2927# if CORO_PTHREAD 3440# if CORO_PTHREAD
2928 coro_thx = PERL_GET_CONTEXT; 3441 coro_thx = PERL_GET_CONTEXT;
2929# endif 3442# endif
2930#endif 3443#endif
2931 BOOT_PAGESIZE; 3444 /* perl defines these to check for existance first, but why it doesn't */
3445 /* just create them one at init time is not clear to me, except for */
3446 /* programs trying to delete them, but... */
3447 /* anyway, we declare this as invalid and make sure they are initialised here */
3448 DEFSV;
3449 ERRSV;
2932 3450
2933 cctx_current = cctx_new_empty (); 3451 cctx_current = cctx_new_empty ();
2934 3452
2935 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3453 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2936 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3454 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2976 coroapi.prepare_nop = prepare_nop; 3494 coroapi.prepare_nop = prepare_nop;
2977 coroapi.prepare_schedule = prepare_schedule; 3495 coroapi.prepare_schedule = prepare_schedule;
2978 coroapi.prepare_cede = prepare_cede; 3496 coroapi.prepare_cede = prepare_cede;
2979 coroapi.prepare_cede_notself = prepare_cede_notself; 3497 coroapi.prepare_cede_notself = prepare_cede_notself;
2980 3498
2981 { 3499 time_init (aTHX);
2982 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2983
2984 if (!svp) croak ("Time::HiRes is required");
2985 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2986
2987 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2988 }
2989 3500
2990 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3501 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3502#if CORO_JIT
3503 PUTBACK;
3504 jit_init (aTHX);
3505 SPAGAIN;
3506#endif
2991} 3507}
2992 3508
2993SV * 3509SV *
2994new (char *klass, ...) 3510new (SV *klass, ...)
2995 ALIAS: 3511 ALIAS:
2996 Coro::new = 1 3512 Coro::new = 1
2997 CODE: 3513 CODE:
2998{ 3514 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2999 struct coro *coro; 3515 OUTPUT:
3000 MAGIC *mg;
3001 HV *hv;
3002 CV *cb;
3003 int i;
3004
3005 if (items > 1)
3006 {
3007 cb = coro_sv_2cv (aTHX_ ST (1));
3008
3009 if (!ix)
3010 {
3011 if (CvISXSUB (cb))
3012 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3013
3014 if (!CvROOT (cb))
3015 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3016 }
3017 }
3018
3019 Newz (0, coro, 1, struct coro);
3020 coro->args = newAV ();
3021 coro->flags = CF_NEW;
3022
3023 if (coro_first) coro_first->prev = coro;
3024 coro->next = coro_first;
3025 coro_first = coro;
3026
3027 coro->hv = hv = newHV ();
3028 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3029 mg->mg_flags |= MGf_DUP;
3030 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3031
3032 if (items > 1)
3033 {
3034 av_extend (coro->args, items - 1 + ix - 1);
3035
3036 if (ix)
3037 {
3038 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3039 cb = cv_coro_run;
3040 }
3041
3042 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3043
3044 for (i = 2; i < items; i++)
3045 av_push (coro->args, newSVsv (ST (i)));
3046 }
3047}
3048 OUTPUT:
3049 RETVAL 3516 RETVAL
3050 3517
3051void 3518void
3052transfer (...) 3519transfer (...)
3053 PROTOTYPE: $$ 3520 PROTOTYPE: $$
3054 CODE: 3521 CODE:
3055 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3522 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3056
3057bool
3058_destroy (SV *coro_sv)
3059 CODE:
3060 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3061 OUTPUT:
3062 RETVAL
3063
3064void
3065_exit (int code)
3066 PROTOTYPE: $
3067 CODE:
3068 _exit (code);
3069 3523
3070SV * 3524SV *
3071clone (Coro::State coro) 3525clone (Coro::State coro)
3072 CODE: 3526 CODE:
3073{ 3527{
… …
3128void 3582void
3129list () 3583list ()
3130 PROTOTYPE: 3584 PROTOTYPE:
3131 PPCODE: 3585 PPCODE:
3132{ 3586{
3133 struct coro *coro; 3587 struct coro *coro;
3134 for (coro = coro_first; coro; coro = coro->next) 3588 for (coro = coro_first; coro; coro = coro->next)
3135 if (coro->hv) 3589 if (coro->hv)
3136 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3590 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3137} 3591}
3138 3592
… …
3143 CODE: 3597 CODE:
3144{ 3598{
3145 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3599 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3146 { 3600 {
3147 struct coro *current = SvSTATE_current; 3601 struct coro *current = SvSTATE_current;
3602 struct CoroSLF slf_save;
3148 3603
3149 if (current != coro) 3604 if (current != coro)
3150 { 3605 {
3151 PUTBACK; 3606 PUTBACK;
3152 save_perl (aTHX_ current); 3607 save_perl (aTHX_ current);
3153 load_perl (aTHX_ coro); 3608 load_perl (aTHX_ coro);
3609 /* the coro is most likely in an active SLF call.
3610 * while not strictly required (the code we execute is
3611 * not allowed to call any SLF functions), it's cleaner
3612 * to reinitialise the slf_frame and restore it later.
3613 * This might one day allow us to actually do SLF calls
3614 * from code executed here.
3615 */
3616 slf_save = slf_frame;
3617 slf_frame.prepare = 0;
3154 SPAGAIN; 3618 SPAGAIN;
3155 } 3619 }
3156 3620
3157 PUSHSTACK; 3621 PUSHSTACK;
3158 3622
… …
3168 SPAGAIN; 3632 SPAGAIN;
3169 3633
3170 if (current != coro) 3634 if (current != coro)
3171 { 3635 {
3172 PUTBACK; 3636 PUTBACK;
3637 slf_frame = slf_save;
3173 save_perl (aTHX_ coro); 3638 save_perl (aTHX_ coro);
3174 load_perl (aTHX_ current); 3639 load_perl (aTHX_ current);
3175 SPAGAIN; 3640 SPAGAIN;
3176 } 3641 }
3177 } 3642 }
… …
3182 PROTOTYPE: $ 3647 PROTOTYPE: $
3183 ALIAS: 3648 ALIAS:
3184 is_ready = CF_READY 3649 is_ready = CF_READY
3185 is_running = CF_RUNNING 3650 is_running = CF_RUNNING
3186 is_new = CF_NEW 3651 is_new = CF_NEW
3187 is_destroyed = CF_DESTROYED 3652 is_destroyed = CF_ZOMBIE
3653 is_zombie = CF_ZOMBIE
3188 is_suspended = CF_SUSPENDED 3654 is_suspended = CF_SUSPENDED
3189 CODE: 3655 CODE:
3190 RETVAL = boolSV (coro->flags & ix); 3656 RETVAL = boolSV (coro->flags & ix);
3191 OUTPUT: 3657 OUTPUT:
3192 RETVAL 3658 RETVAL
3193 3659
3194void 3660void
3195throw (Coro::State self, SV *throw = &PL_sv_undef) 3661throw (SV *self, SV *exception = &PL_sv_undef)
3196 PROTOTYPE: $;$ 3662 PROTOTYPE: $;$
3197 CODE: 3663 CODE:
3198{ 3664{
3665 struct coro *coro = SvSTATE (self);
3199 struct coro *current = SvSTATE_current; 3666 struct coro *current = SvSTATE_current;
3200 SV **throwp = self == current ? &CORO_THROW : &self->except; 3667 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3201 SvREFCNT_dec (*throwp); 3668 SvREFCNT_dec (*exceptionp);
3202 SvGETMAGIC (throw); 3669 SvGETMAGIC (exception);
3203 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3670 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3671
3672 api_ready (aTHX_ self);
3204} 3673}
3205 3674
3206void 3675void
3207api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3676api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3208 PROTOTYPE: $;$ 3677 PROTOTYPE: $;$
… …
3263 3732
3264void 3733void
3265cancel (Coro::State self) 3734cancel (Coro::State self)
3266 CODE: 3735 CODE:
3267 coro_state_destroy (aTHX_ self); 3736 coro_state_destroy (aTHX_ self);
3268 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3737
3738SV *
3739enable_times (int enabled = enable_times)
3740 CODE:
3741{
3742 RETVAL = boolSV (enable_times);
3743
3744 if (enabled != enable_times)
3745 {
3746 enable_times = enabled;
3747
3748 coro_times_update ();
3749 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3750 }
3751}
3752 OUTPUT:
3753 RETVAL
3754
3755void
3756times (Coro::State self)
3757 PPCODE:
3758{
3759 struct coro *current = SvSTATE (coro_current);
3760
3761 if (ecb_expect_false (current == self))
3762 {
3763 coro_times_update ();
3764 coro_times_add (SvSTATE (coro_current));
3765 }
3766
3767 EXTEND (SP, 2);
3768 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3769 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3770
3771 if (ecb_expect_false (current == self))
3772 coro_times_sub (SvSTATE (coro_current));
3773}
3774
3775void
3776swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3777 CODE:
3778{
3779 struct coro *current = SvSTATE_current;
3780
3781 if (current == coro)
3782 SWAP_SVS (current);
3783
3784 if (!coro->swap_sv)
3785 coro->swap_sv = newAV ();
3786
3787 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3788 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3789
3790 if (current == coro)
3791 SWAP_SVS (current);
3792}
3269 3793
3270 3794
3271MODULE = Coro::State PACKAGE = Coro 3795MODULE = Coro::State PACKAGE = Coro
3272 3796
3273BOOT: 3797BOOT:
3274{ 3798{
3275 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3799 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3276 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3800 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3277 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3801 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3278 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3279 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3802 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3280 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3803 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3281 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3804 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3282 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3805 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3283 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3806 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3284 3807
3285 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3808 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3286 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3809 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3287 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3810 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3288 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3811 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3289 3812
3290 coro_stash = gv_stashpv ("Coro", TRUE); 3813 coro_stash = gv_stashpv ("Coro", TRUE);
3291 3814
3292 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3815 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3293 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3816 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
… …
3312 sv_setiv (sv, (IV)&coroapi); 3835 sv_setiv (sv, (IV)&coroapi);
3313 SvREADONLY_on (sv); 3836 SvREADONLY_on (sv);
3314 } 3837 }
3315} 3838}
3316 3839
3840SV *
3841async (...)
3842 PROTOTYPE: &@
3843 CODE:
3844 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3845 api_ready (aTHX_ RETVAL);
3846 OUTPUT:
3847 RETVAL
3848
3849void
3850_destroy (Coro::State coro)
3851 CODE:
3852 /* used by the manager thread */
3853 coro_state_destroy (aTHX_ coro);
3854
3855void
3856on_destroy (Coro::State coro, SV *cb)
3857 CODE:
3858 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3859
3860void
3861join (...)
3862 CODE:
3863 CORO_EXECUTE_SLF_XS (slf_init_join);
3864
3317void 3865void
3318terminate (...) 3866terminate (...)
3319 CODE: 3867 CODE:
3320 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3868 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3869
3870void
3871cancel (...)
3872 CODE:
3873 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3874
3875int
3876safe_cancel (Coro::State self, ...)
3877 C_ARGS: aTHX_ self, &ST (1), items - 1
3321 3878
3322void 3879void
3323schedule (...) 3880schedule (...)
3324 CODE: 3881 CODE:
3325 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3882 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3355_set_readyhook (SV *hook) 3912_set_readyhook (SV *hook)
3356 PROTOTYPE: $ 3913 PROTOTYPE: $
3357 CODE: 3914 CODE:
3358 SvREFCNT_dec (coro_readyhook); 3915 SvREFCNT_dec (coro_readyhook);
3359 SvGETMAGIC (hook); 3916 SvGETMAGIC (hook);
3917 if (SvOK (hook))
3918 {
3360 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3919 coro_readyhook = newSVsv (hook);
3920 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3921 }
3922 else
3923 {
3924 coro_readyhook = 0;
3925 CORO_READYHOOK = 0;
3926 }
3361 3927
3362int 3928int
3363prio (Coro::State coro, int newprio = 0) 3929prio (Coro::State coro, int newprio = 0)
3364 PROTOTYPE: $;$ 3930 PROTOTYPE: $;$
3365 ALIAS: 3931 ALIAS:
… …
3429 for (i = 1; i < items; ++i) 3995 for (i = 1; i < items; ++i)
3430 av_push (av, SvREFCNT_inc_NN (ST (i))); 3996 av_push (av, SvREFCNT_inc_NN (ST (i)));
3431 3997
3432 if ((SV *)hv == &PL_sv_undef) 3998 if ((SV *)hv == &PL_sv_undef)
3433 { 3999 {
3434 PUSHMARK (SP); 4000 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3435 EXTEND (SP, 2);
3436 PUSHs (sv_Coro);
3437 PUSHs ((SV *)cv_pool_handler);
3438 PUTBACK;
3439 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3440 SPAGAIN;
3441
3442 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4001 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4002 SvREFCNT_dec (sv);
3443 } 4003 }
3444 4004
3445 { 4005 {
3446 struct coro *coro = SvSTATE_hv (hv); 4006 struct coro *coro = SvSTATE_hv (hv);
3447 4007
… …
3479 on_leave = 1 4039 on_leave = 1
3480 PROTOTYPE: & 4040 PROTOTYPE: &
3481 CODE: 4041 CODE:
3482{ 4042{
3483 struct coro *coro = SvSTATE_current; 4043 struct coro *coro = SvSTATE_current;
3484 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4044 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3485 4045
3486 block = (SV *)coro_sv_2cv (aTHX_ block); 4046 block = s_get_cv_croak (block);
3487 4047
3488 if (!*avp) 4048 if (!*avp)
3489 *avp = newAV (); 4049 *avp = newAV ();
3490 4050
3491 av_push (*avp, SvREFCNT_inc (block)); 4051 av_push (*avp, SvREFCNT_inc (block));
… …
3509 4069
3510SV * 4070SV *
3511new (SV *klass, SV *count = 0) 4071new (SV *klass, SV *count = 0)
3512 CODE: 4072 CODE:
3513{ 4073{
3514 int semcnt = 1; 4074 int semcnt = 1;
3515 4075
3516 if (count) 4076 if (count)
3517 { 4077 {
3518 SvGETMAGIC (count); 4078 SvGETMAGIC (count);
3519 4079
… …
3579 XSRETURN_NO; 4139 XSRETURN_NO;
3580} 4140}
3581 4141
3582void 4142void
3583waiters (SV *self) 4143waiters (SV *self)
3584 PPCODE: 4144 PPCODE:
3585{ 4145{
3586 AV *av = (AV *)SvRV (self); 4146 AV *av = (AV *)SvRV (self);
3587 int wcount = AvFILLp (av) + 1 - 1; 4147 int wcount = AvFILLp (av) + 1 - 1;
3588 4148
3589 if (GIMME_V == G_SCALAR) 4149 if (GIMME_V == G_SCALAR)
… …
3598} 4158}
3599 4159
3600MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4160MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3601 4161
3602void 4162void
3603_may_delete (SV *sem, int count, int extra_refs) 4163_may_delete (SV *sem, int count, unsigned int extra_refs)
3604 PPCODE: 4164 PPCODE:
3605{ 4165{
3606 AV *av = (AV *)SvRV (sem); 4166 AV *av = (AV *)SvRV (sem);
3607 4167
3608 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4168 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3609 && AvFILLp (av) == 0 /* no waiters, just count */ 4169 && AvFILLp (av) == 0 /* no waiters, just count */
3610 && SvIV (AvARRAY (av)[0]) == count) 4170 && SvIV (AvARRAY (av)[0]) == count)
3611 XSRETURN_YES; 4171 XSRETURN_YES;
… …
3632 4192
3633void 4193void
3634broadcast (SV *self) 4194broadcast (SV *self)
3635 CODE: 4195 CODE:
3636{ 4196{
3637 AV *av = (AV *)SvRV (self); 4197 AV *av = (AV *)SvRV (self);
3638 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4198 coro_signal_wake (aTHX_ av, AvFILLp (av));
3639} 4199}
3640 4200
3641void 4201void
3642send (SV *self) 4202send (SV *self)
… …
3650 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4210 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3651} 4211}
3652 4212
3653IV 4213IV
3654awaited (SV *self) 4214awaited (SV *self)
3655 CODE: 4215 CODE:
3656 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4216 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3657 OUTPUT: 4217 OUTPUT:
3658 RETVAL 4218 RETVAL
3659 4219
3660 4220
… …
3665 4225
3666void 4226void
3667_schedule (...) 4227_schedule (...)
3668 CODE: 4228 CODE:
3669{ 4229{
3670 static int incede; 4230 static int incede;
3671 4231
3672 api_cede_notself (aTHX); 4232 api_cede_notself (aTHX);
3673 4233
3674 ++incede; 4234 ++incede;
3675 while (coro_nready >= incede && api_cede (aTHX)) 4235 while (coro_nready >= incede && api_cede (aTHX))
… …
3691 4251
3692void 4252void
3693_register (char *target, char *proto, SV *req) 4253_register (char *target, char *proto, SV *req)
3694 CODE: 4254 CODE:
3695{ 4255{
3696 CV *req_cv = coro_sv_2cv (aTHX_ req); 4256 SV *req_cv = s_get_cv_croak (req);
3697 /* newXSproto doesn't return the CV on 5.8 */ 4257 /* newXSproto doesn't return the CV on 5.8 */
3698 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4258 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3699 sv_setpv ((SV *)slf_cv, proto); 4259 sv_setpv ((SV *)slf_cv, proto);
3700 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4260 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3701} 4261}
3702 4262
4263MODULE = Coro::State PACKAGE = Coro::Select
4264
4265void
4266patch_pp_sselect ()
4267 CODE:
4268 if (!coro_old_pp_sselect)
4269 {
4270 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4271 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4272 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4273 }
4274
4275void
4276unpatch_pp_sselect ()
4277 CODE:
4278 if (coro_old_pp_sselect)
4279 {
4280 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4281 coro_old_pp_sselect = 0;
4282 }
4283
4284MODULE = Coro::State PACKAGE = Coro::Util
4285
4286void
4287_exit (int code)
4288 CODE:
4289 _exit (code);
4290
4291NV
4292time ()
4293 CODE:
4294 RETVAL = nvtime (aTHX);
4295 OUTPUT:
4296 RETVAL
4297
4298NV
4299gettimeofday ()
4300 PPCODE:
4301{
4302 UV tv [2];
4303 u2time (aTHX_ tv);
4304 EXTEND (SP, 2);
4305 PUSHs (sv_2mortal (newSVuv (tv [0])));
4306 PUSHs (sv_2mortal (newSVuv (tv [1])));
4307}
4308

Diff Legend

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