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.358 by root, Mon Jun 29 04:30:25 2009 UTC vs.
Revision 1.437 by root, Tue Nov 5 15:13:42 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
143/* enable processtime/realtime profiling */
144static char enable_times;
145typedef U32 coro_ts[2];
146static coro_ts time_real, time_cpu;
147static char times_valid;
148
210static struct coro_cctx *cctx_first; 149static struct coro_cctx *cctx_first;
211static int cctx_count, cctx_idle; 150static int cctx_count, cctx_idle;
212 151
213enum { 152enum
153{
214 CC_MAPPED = 0x01, 154 CC_MAPPED = 0x01,
215 CC_NOREUSE = 0x02, /* throw this away after tracing */ 155 CC_NOREUSE = 0x02, /* throw this away after tracing */
216 CC_TRACE = 0x04, 156 CC_TRACE = 0x04,
217 CC_TRACE_SUB = 0x08, /* trace sub calls */ 157 CC_TRACE_SUB = 0x08, /* trace sub calls */
218 CC_TRACE_LINE = 0x10, /* trace each statement */ 158 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
223typedef struct coro_cctx 163typedef struct coro_cctx
224{ 164{
225 struct coro_cctx *next; 165 struct coro_cctx *next;
226 166
227 /* the stack */ 167 /* the stack */
228 void *sptr; 168 struct coro_stack stack;
229 size_t ssize;
230 169
231 /* cpu state */ 170 /* cpu state */
232 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
233 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
234 JMPENV *top_env; 175 JMPENV *top_env;
235 coro_context cctx; 176 coro_context cctx;
236 177
237 U32 gen; 178 U32 gen;
238#if CORO_USE_VALGRIND 179#if CORO_USE_VALGRIND
239 int valgrind_id; 180 int valgrind_id;
240#endif 181#endif
241 unsigned char flags; 182 unsigned char flags;
242} coro_cctx; 183} coro_cctx;
243 184
244coro_cctx *cctx_current; /* the currently running cctx */ 185static coro_cctx *cctx_current; /* the currently running cctx */
245 186
246/*****************************************************************************/ 187/*****************************************************************************/
247 188
189static MGVTBL coro_state_vtbl;
190
248enum { 191enum
192{
249 CF_RUNNING = 0x0001, /* coroutine is running */ 193 CF_RUNNING = 0x0001, /* coroutine is running */
250 CF_READY = 0x0002, /* coroutine is ready */ 194 CF_READY = 0x0002, /* coroutine is ready */
251 CF_NEW = 0x0004, /* has never been switched to */ 195 CF_NEW = 0x0004, /* has never been switched to */
252 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 196 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
253 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) */
254}; 199};
255 200
256/* 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 */
257typedef struct 202typedef struct
258{ 203{
259 SV *defsv;
260 AV *defav;
261 SV *errsv;
262 SV *irsgv;
263 HV *hinthv;
264#define VAR(name,type) type name; 204 #define VARx(name,expr,type) type name;
265# include "state.h" 205 #include "state.h"
266#undef VAR
267} perl_slots; 206} perl_slots;
268 207
208/* how many context stack entries do we need for perl_slots */
269#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))
270 210
271/* this is a structure representing a perl-level coroutine */ 211/* this is a structure representing a perl-level coroutine */
272struct coro { 212struct coro
213{
273 /* the C coroutine allocated to this perl coroutine, if any */ 214 /* the C coroutine allocated to this perl coroutine, if any */
274 coro_cctx *cctx; 215 coro_cctx *cctx;
275 216
276 /* ready queue */ 217 /* ready queue */
277 struct coro *next_ready; 218 struct coro *next_ready;
… …
279 /* state data */ 220 /* state data */
280 struct CoroSLF slf_frame; /* saved slf frame */ 221 struct CoroSLF slf_frame; /* saved slf frame */
281 AV *mainstack; 222 AV *mainstack;
282 perl_slots *slot; /* basically the saved sp */ 223 perl_slots *slot; /* basically the saved sp */
283 224
284 CV *startcv; /* the CV to execute */ 225 CV *startcv; /* the CV to execute */
285 AV *args; /* data associated with this coroutine (initial args) */ 226 AV *args; /* data associated with this coroutine (initial args) */
286 int refcnt; /* coroutines are refcounted, yes */
287 int flags; /* CF_ flags */ 227 int flags; /* CF_ flags */
288 HV *hv; /* the perl hash associated with this coro, if any */ 228 HV *hv; /* the perl hash associated with this coro, if any */
289 void (*on_destroy)(pTHX_ struct coro *coro);
290 229
291 /* statistics */ 230 /* statistics */
292 int usecount; /* number of transfers to this coro */ 231 int usecount; /* number of transfers to this coro */
293 232
294 /* coro process data */ 233 /* coro process data */
295 int prio; 234 int prio;
296 SV *except; /* exception to be thrown */ 235 SV *except; /* exception to be thrown */
297 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 */
298 239
299 /* async_pool */ 240 /* async_pool */
300 SV *saved_deffh; 241 SV *saved_deffh;
301 SV *invoke_cb; 242 SV *invoke_cb;
302 AV *invoke_av; 243 AV *invoke_av;
303 244
304 /* on_enter/on_leave */ 245 /* on_enter/on_leave */
305 AV *on_enter; 246 AV *on_enter;
306 AV *on_leave; 247 AV *on_leave;
307 248
249 /* swap_sv */
250 AV *swap_sv;
251
252 /* times */
253 coro_ts t_cpu, t_real;
254
308 /* linked list */ 255 /* linked list */
309 struct coro *next, *prev; 256 struct coro *next, *prev;
310}; 257};
311 258
312typedef struct coro *Coro__State; 259typedef struct coro *Coro__State;
313typedef struct coro *Coro__State_or_hashref; 260typedef struct coro *Coro__State_or_hashref;
314 261
315/* the following variables are effectively part of the perl context */ 262/* the following variables are effectively part of the perl context */
316/* and get copied between struct coro and these variables */ 263/* and get copied between struct coro and these variables */
317/* the mainr easonw e don't support windows process emulation */ 264/* the main reason we don't support windows process emulation */
318static struct CoroSLF slf_frame; /* the current slf frame */ 265static struct CoroSLF slf_frame; /* the current slf frame */
319 266
320/** Coro ********************************************************************/ 267/** Coro ********************************************************************/
321 268
322#define CORO_PRIO_MAX 3 269#define CORO_PRIO_MAX 3
… …
328 275
329/* for Coro.pm */ 276/* for Coro.pm */
330static SV *coro_current; 277static SV *coro_current;
331static SV *coro_readyhook; 278static SV *coro_readyhook;
332static 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 */
333static CV *cv_coro_run, *cv_coro_terminate; 280static CV *cv_coro_run;
334static struct coro *coro_first; 281static struct coro *coro_first;
335#define coro_nready coroapi.nready 282#define coro_nready coroapi.nready
336 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
337/** lowlevel stuff **********************************************************/ 379/** lowlevel stuff **********************************************************/
338 380
339static SV * 381static SV * ecb_noinline
340coro_get_sv (pTHX_ const char *name, int create) 382coro_get_sv (pTHX_ const char *name, int create)
341{ 383{
342#if PERL_VERSION_ATLEAST (5,10,0) 384#if PERL_VERSION_ATLEAST (5,10,0)
343 /* 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 */
344 get_sv (name, create); 386 get_sv (name, create);
345#endif 387#endif
346 return get_sv (name, create); 388 return get_sv (name, create);
347} 389}
348 390
349static AV * 391static AV * ecb_noinline
350coro_get_av (pTHX_ const char *name, int create) 392coro_get_av (pTHX_ const char *name, int create)
351{ 393{
352#if PERL_VERSION_ATLEAST (5,10,0) 394#if PERL_VERSION_ATLEAST (5,10,0)
353 /* 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 */
354 get_av (name, create); 396 get_av (name, create);
355#endif 397#endif
356 return get_av (name, create); 398 return get_av (name, create);
357} 399}
358 400
359static HV * 401static HV * ecb_noinline
360coro_get_hv (pTHX_ const char *name, int create) 402coro_get_hv (pTHX_ const char *name, int create)
361{ 403{
362#if PERL_VERSION_ATLEAST (5,10,0) 404#if PERL_VERSION_ATLEAST (5,10,0)
363 /* 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 */
364 get_hv (name, create); 406 get_hv (name, create);
365#endif 407#endif
366 return get_hv (name, create); 408 return get_hv (name, create);
367} 409}
368 410
369/* may croak */ 411ecb_inline void
370INLINE CV * 412coro_times_update (void)
371coro_sv_2cv (pTHX_ SV *sv)
372{ 413{
373 HV *st; 414#ifdef coro_clock_gettime
374 GV *gvp; 415 struct timespec ts;
375 CV *cv = sv_2cv (sv, &st, &gvp, 0);
376 416
377 if (!cv) 417 ts.tv_sec = ts.tv_nsec = 0;
378 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;
379 420
380 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];
381} 456}
382 457
383/*****************************************************************************/ 458/*****************************************************************************/
384/* magic glue */ 459/* magic glue */
385 460
386#define CORO_MAGIC_type_cv 26 461#define CORO_MAGIC_type_cv 26
387#define CORO_MAGIC_type_state PERL_MAGIC_ext 462#define CORO_MAGIC_type_state PERL_MAGIC_ext
388 463
389#define CORO_MAGIC_NN(sv, type) \ 464#define CORO_MAGIC_NN(sv, type) \
390 (expect_true (SvMAGIC (sv)->mg_type == type) \ 465 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
391 ? SvMAGIC (sv) \ 466 ? SvMAGIC (sv) \
392 : mg_find (sv, type)) 467 : mg_find (sv, type))
393 468
394#define CORO_MAGIC(sv, type) \ 469#define CORO_MAGIC(sv, type) \
395 (expect_true (SvMAGIC (sv)) \ 470 (ecb_expect_true (SvMAGIC (sv)) \
396 ? CORO_MAGIC_NN (sv, type) \ 471 ? CORO_MAGIC_NN (sv, type) \
397 : 0) 472 : 0)
398 473
399#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)
400#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)
401 476
402INLINE 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 *
403SvSTATE_ (pTHX_ SV *coro) 493SvSTATE_ (pTHX_ SV *coro)
404{ 494{
405 HV *stash;
406 MAGIC *mg; 495 MAGIC *mg;
407 496
408 if (SvROK (coro)) 497 if (SvROK (coro))
409 coro = SvRV (coro); 498 coro = SvRV (coro);
410 499
411 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 500 mg = SvSTATEhv_p (aTHX_ coro);
501 if (!mg)
412 croak ("Coro::State object required"); 502 croak ("Coro::State object required");
413 503
414 stash = SvSTASH (coro);
415 if (expect_false (stash != coro_stash && stash != coro_state_stash))
416 {
417 /* very slow, but rare, check */
418 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
419 croak ("Coro::State object required");
420 }
421
422 mg = CORO_MAGIC_state (coro);
423 return (struct coro *)mg->mg_ptr; 504 return (struct coro *)mg->mg_ptr;
424} 505}
425 506
426#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 507#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
427 508
… …
430#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 511#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
431 512
432/*****************************************************************************/ 513/*****************************************************************************/
433/* padlist management and caching */ 514/* padlist management and caching */
434 515
435static AV * 516ecb_inline PADLIST *
436coro_derive_padlist (pTHX_ CV *cv) 517coro_derive_padlist (pTHX_ CV *cv)
437{ 518{
438 AV *padlist = CvPADLIST (cv); 519 PADLIST *padlist = CvPADLIST (cv);
439 AV *newpadlist, *newpad; 520 PADLIST *newpadlist;
521 PAD *newpad;
522 PADOFFSET off = PadlistMAX (padlist) + 1;
440 523
441 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. */
442 AvREAL_off (newpadlist); 552 AvREAL_off (newpadlist);
443#if PERL_VERSION_ATLEAST (5,10,0)
444 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
445#else
446 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
447#endif 553#endif
448 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
449 --AvFILLp (padlist);
450 554
451 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 555 /* Already extended to 2 elements by newPADLIST. */
452 av_store (newpadlist, 1, (SV *)newpad); 556 PadlistMAX (newpadlist) = 1;
557 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
558 PadlistARRAY (newpadlist)[1] = newpad;
453 559
454 return newpadlist; 560 return newpadlist;
455} 561}
456 562
457static void 563ecb_inline void
458free_padlist (pTHX_ AV *padlist) 564free_padlist (pTHX_ PADLIST *padlist)
459{ 565{
460 /* may be during global destruction */ 566 /* may be during global destruction */
461 if (!IN_DESTRUCT) 567 if (!IN_DESTRUCT)
462 { 568 {
463 I32 i = AvFILLp (padlist); 569 I32 i = PadlistMAX (padlist);
464 570
465 while (i > 0) /* special-case index 0 */ 571 while (i > 0) /* special-case index 0 */
466 { 572 {
467 /* we try to be extra-careful here */ 573 /* we try to be extra-careful here */
468 AV *av = (AV *)AvARRAY (padlist)[i--]; 574 PAD *pad = PadlistARRAY (padlist)[i--];
469 I32 j = AvFILLp (av); 575 I32 j = PadMAX (pad);
470 576
471 while (j >= 0) 577 while (j >= 0)
472 SvREFCNT_dec (AvARRAY (av)[j--]); 578 SvREFCNT_dec (PadARRAY (pad)[j--]);
473 579
474 AvFILLp (av) = -1; 580 PadMAX (pad) = -1;
475 SvREFCNT_dec (av); 581 SvREFCNT_dec (pad);
476 } 582 }
477 583
478 SvREFCNT_dec (AvARRAY (padlist)[0]); 584 SvREFCNT_dec (PadlistNAMES (padlist));
479 585
586#if NEWPADAPI
587 Safefree (PadlistARRAY (padlist));
588 Safefree (padlist);
589#else
480 AvFILLp (padlist) = -1; 590 AvFILLp (padlist) = -1;
591 AvREAL_off (padlist);
481 SvREFCNT_dec ((SV*)padlist); 592 SvREFCNT_dec ((SV*)padlist);
593#endif
482 } 594 }
483} 595}
484 596
485static int 597static int
486coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 598coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
487{ 599{
488 AV *padlist; 600 PADLIST *padlist;
489 AV *av = (AV *)mg->mg_obj; 601 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
602 size_t len = *(size_t *)mg->mg_ptr;
490 603
491 /* perl manages to free our internal AV and _then_ call us */ 604 /* perl manages to free our internal AV and _then_ call us */
492 if (IN_DESTRUCT) 605 if (IN_DESTRUCT)
493 return; 606 return 0;
494 607
495 /* casting is fun. */ 608 while (len--)
496 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
497 free_padlist (aTHX_ padlist); 609 free_padlist (aTHX_ padlists[len]);
498
499 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
500 610
501 return 0; 611 return 0;
502} 612}
503 613
504static MGVTBL coro_cv_vtbl = { 614static MGVTBL coro_cv_vtbl = {
505 0, 0, 0, 0, 615 0, 0, 0, 0,
506 coro_cv_free 616 coro_cv_free
507}; 617};
508 618
509/* the next two functions merely cache the padlists */ 619/* the next two functions merely cache the padlists */
510static void 620ecb_inline void
511get_padlist (pTHX_ CV *cv) 621get_padlist (pTHX_ CV *cv)
512{ 622{
513 MAGIC *mg = CORO_MAGIC_cv (cv); 623 MAGIC *mg = CORO_MAGIC_cv (cv);
514 AV *av; 624 size_t *lenp;
515 625
516 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 626 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
517 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 627 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
518 else 628 else
519 { 629 {
520#if CORO_PREFER_PERL_FUNCTIONS 630#if CORO_PREFER_PERL_FUNCTIONS
521 /* this is probably cleaner? but also slower! */ 631 /* this is probably cleaner? but also slower! */
522 /* in practise, it seems to be less stable */ 632 /* in practise, it seems to be less stable */
… …
528 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 638 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
529#endif 639#endif
530 } 640 }
531} 641}
532 642
533static void 643ecb_inline void
534put_padlist (pTHX_ CV *cv) 644put_padlist (pTHX_ CV *cv)
535{ 645{
536 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
537 AV *av;
538 647
539 if (expect_false (!mg)) 648 if (ecb_expect_false (!mg))
649 {
540 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 650 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
651 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
652 mg->mg_len = 1; /* so mg_free frees mg_ptr */
653 }
654 else
655 Renew (mg->mg_ptr,
656 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
657 char);
541 658
542 av = (AV *)mg->mg_obj; 659 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
543
544 if (expect_false (AvFILLp (av) >= AvMAX (av)))
545 av_extend (av, AvFILLp (av) + 1);
546
547 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
548} 660}
549 661
550/** load & save, init *******************************************************/ 662/** load & save, init *******************************************************/
663
664ecb_inline void
665swap_sv (SV *a, SV *b)
666{
667 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
668 SV tmp;
669
670 /* swap sv_any */
671 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
672
673 /* swap sv_flags */
674 SvFLAGS (&tmp) = SvFLAGS (a);
675 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
676 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
677
678#if PERL_VERSION_ATLEAST (5,10,0)
679 /* perl 5.10 and later complicates this _quite_ a bit, but it also
680 * is much faster, so no quarrels here. alternatively, we could
681 * sv_upgrade to avoid this.
682 */
683 {
684 /* swap sv_u */
685 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
686
687 /* if SvANY points to the head, we need to adjust the pointers,
688 * as the pointer for a still points to b, and maybe vice versa.
689 */
690 #define svany_in_head(type) \
691 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
692
693 if (svany_in_head (SvTYPE (a)))
694 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
695
696 if (svany_in_head (SvTYPE (b)))
697 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
698 }
699#endif
700}
701
702/* swap sv heads, at least logically */
703static void
704swap_svs (pTHX_ Coro__State c)
705{
706 int i;
707
708 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
709 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
710}
711
712#define SWAP_SVS(coro) \
713 if (ecb_expect_false ((coro)->swap_sv)) \
714 swap_svs (aTHX_ (coro))
551 715
552static void 716static void
553on_enterleave_call (pTHX_ SV *cb); 717on_enterleave_call (pTHX_ SV *cb);
554 718
555static void 719static void
… …
558 perl_slots *slot = c->slot; 722 perl_slots *slot = c->slot;
559 c->slot = 0; 723 c->slot = 0;
560 724
561 PL_mainstack = c->mainstack; 725 PL_mainstack = c->mainstack;
562 726
563 GvSV (PL_defgv) = slot->defsv; 727#if CORO_JIT
564 GvAV (PL_defgv) = slot->defav; 728 load_perl_slots (slot);
565 GvSV (PL_errgv) = slot->errsv; 729#else
566 GvSV (irsgv) = slot->irsgv;
567 GvHV (PL_hintgv) = slot->hinthv;
568
569 #define VAR(name,type) PL_ ## name = slot->name; 730 #define VARx(name,expr,type) expr = slot->name;
570 # include "state.h" 731 #include "state.h"
571 #undef VAR 732#endif
572 733
573 { 734 {
574 dSP; 735 dSP;
575 736
576 CV *cv; 737 CV *cv;
577 738
578 /* now do the ugly restore mess */ 739 /* now do the ugly restore mess */
579 while (expect_true (cv = (CV *)POPs)) 740 while (ecb_expect_true (cv = (CV *)POPs))
580 { 741 {
581 put_padlist (aTHX_ cv); /* mark this padlist as available */ 742 put_padlist (aTHX_ cv); /* mark this padlist as available */
582 CvDEPTH (cv) = PTR2IV (POPs); 743 CvDEPTH (cv) = PTR2IV (POPs);
583 CvPADLIST (cv) = (AV *)POPs; 744 CvPADLIST (cv) = (PADLIST *)POPs;
584 } 745 }
585 746
586 PUTBACK; 747 PUTBACK;
587 } 748 }
588 749
589 slf_frame = c->slf_frame; 750 slf_frame = c->slf_frame;
590 CORO_THROW = c->except; 751 CORO_THROW = c->except;
591 752
753 if (ecb_expect_false (enable_times))
754 {
755 if (ecb_expect_false (!times_valid))
756 coro_times_update ();
757
758 coro_times_sub (c);
759 }
760
592 if (expect_false (c->on_enter)) 761 if (ecb_expect_false (c->on_enter))
593 { 762 {
594 int i; 763 int i;
595 764
596 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 765 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
597 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 766 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
598 } 767 }
768
769 SWAP_SVS (c);
599} 770}
600 771
601static void 772static void
602save_perl (pTHX_ Coro__State c) 773save_perl (pTHX_ Coro__State c)
603{ 774{
775 SWAP_SVS (c);
776
604 if (expect_false (c->on_leave)) 777 if (ecb_expect_false (c->on_leave))
605 { 778 {
606 int i; 779 int i;
607 780
608 for (i = AvFILLp (c->on_leave); i >= 0; --i) 781 for (i = AvFILLp (c->on_leave); i >= 0; --i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 782 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
783 }
784
785 times_valid = 0;
786
787 if (ecb_expect_false (enable_times))
788 {
789 coro_times_update (); times_valid = 1;
790 coro_times_add (c);
610 } 791 }
611 792
612 c->except = CORO_THROW; 793 c->except = CORO_THROW;
613 c->slf_frame = slf_frame; 794 c->slf_frame = slf_frame;
614 795
… …
625 806
626 XPUSHs (Nullsv); 807 XPUSHs (Nullsv);
627 /* this loop was inspired by pp_caller */ 808 /* this loop was inspired by pp_caller */
628 for (;;) 809 for (;;)
629 { 810 {
630 while (expect_true (cxix >= 0)) 811 while (ecb_expect_true (cxix >= 0))
631 { 812 {
632 PERL_CONTEXT *cx = &ccstk[cxix--]; 813 PERL_CONTEXT *cx = &ccstk[cxix--];
633 814
634 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 815 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
635 { 816 {
636 CV *cv = cx->blk_sub.cv; 817 CV *cv = cx->blk_sub.cv;
637 818
638 if (expect_true (CvDEPTH (cv))) 819 if (ecb_expect_true (CvDEPTH (cv)))
639 { 820 {
640 EXTEND (SP, 3); 821 EXTEND (SP, 3);
641 PUSHs ((SV *)CvPADLIST (cv)); 822 PUSHs ((SV *)CvPADLIST (cv));
642 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 823 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
643 PUSHs ((SV *)cv); 824 PUSHs ((SV *)cv);
… …
646 get_padlist (aTHX_ cv); 827 get_padlist (aTHX_ cv);
647 } 828 }
648 } 829 }
649 } 830 }
650 831
651 if (expect_true (top_si->si_type == PERLSI_MAIN)) 832 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
652 break; 833 break;
653 834
654 top_si = top_si->si_prev; 835 top_si = top_si->si_prev;
655 ccstk = top_si->si_cxstack; 836 ccstk = top_si->si_cxstack;
656 cxix = top_si->si_cxix; 837 cxix = top_si->si_cxix;
… …
658 839
659 PUTBACK; 840 PUTBACK;
660 } 841 }
661 842
662 /* allocate some space on the context stack for our purposes */ 843 /* allocate some space on the context stack for our purposes */
663 /* we manually unroll here, as usually 2 slots is enough */ 844 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
664 if (SLOT_COUNT >= 1) CXINC;
665 if (SLOT_COUNT >= 2) CXINC;
666 if (SLOT_COUNT >= 3) CXINC;
667 { 845 {
668 int i; 846 unsigned int i;
847
669 for (i = 3; i < SLOT_COUNT; ++i) 848 for (i = 0; i < SLOT_COUNT; ++i)
670 CXINC; 849 CXINC;
671 } 850
672 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 851 cxstack_ix -= SLOT_COUNT; /* undo allocation */
852 }
673 853
674 c->mainstack = PL_mainstack; 854 c->mainstack = PL_mainstack;
675 855
676 { 856 {
677 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 857 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
678 858
679 slot->defav = GvAV (PL_defgv); 859#if CORO_JIT
680 slot->defsv = DEFSV; 860 save_perl_slots (slot);
681 slot->errsv = ERRSV; 861#else
682 slot->irsgv = GvSV (irsgv);
683 slot->hinthv = GvHV (PL_hintgv);
684
685 #define VAR(name,type) slot->name = PL_ ## name; 862 #define VARx(name,expr,type) slot->name = expr;
686 # include "state.h" 863 #include "state.h"
687 #undef VAR 864#endif
688 } 865 }
689} 866}
690 867
691/* 868/*
692 * allocate various perl stacks. This is almost an exact copy 869 * allocate various perl stacks. This is almost an exact copy
… …
698# define coro_init_stacks(thx) init_stacks () 875# define coro_init_stacks(thx) init_stacks ()
699#else 876#else
700static void 877static void
701coro_init_stacks (pTHX) 878coro_init_stacks (pTHX)
702{ 879{
703 PL_curstackinfo = new_stackinfo(32, 8); 880 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
704 PL_curstackinfo->si_type = PERLSI_MAIN; 881 PL_curstackinfo->si_type = PERLSI_MAIN;
705 PL_curstack = PL_curstackinfo->si_stack; 882 PL_curstack = PL_curstackinfo->si_stack;
706 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 883 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
707 884
708 PL_stack_base = AvARRAY(PL_curstack); 885 PL_stack_base = AvARRAY(PL_curstack);
… …
723#endif 900#endif
724 901
725 New(54,PL_scopestack,8,I32); 902 New(54,PL_scopestack,8,I32);
726 PL_scopestack_ix = 0; 903 PL_scopestack_ix = 0;
727 PL_scopestack_max = 8; 904 PL_scopestack_max = 8;
905#if HAS_SCOPESTACK_NAME
906 New(54,PL_scopestack_name,8,const char*);
907#endif
728 908
729 New(54,PL_savestack,24,ANY); 909 New(54,PL_savestack,24,ANY);
730 PL_savestack_ix = 0; 910 PL_savestack_ix = 0;
731 PL_savestack_max = 24; 911 PL_savestack_max = 24;
732 912
… …
760 } 940 }
761 941
762 Safefree (PL_tmps_stack); 942 Safefree (PL_tmps_stack);
763 Safefree (PL_markstack); 943 Safefree (PL_markstack);
764 Safefree (PL_scopestack); 944 Safefree (PL_scopestack);
945#if HAS_SCOPESTACK_NAME
946 Safefree (PL_scopestack_name);
947#endif
765 Safefree (PL_savestack); 948 Safefree (PL_savestack);
766#if !PERL_VERSION_ATLEAST (5,10,0) 949#if !PERL_VERSION_ATLEAST (5,10,0)
767 Safefree (PL_retstack); 950 Safefree (PL_retstack);
768#endif 951#endif
769} 952}
… …
815#endif 998#endif
816 999
817/* 1000/*
818 * This overrides the default magic get method of %SIG elements. 1001 * This overrides the default magic get method of %SIG elements.
819 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1002 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
820 * and instead of trying to save and restore the hash elements, we just provide 1003 * and instead of trying to save and restore the hash elements (extremely slow),
821 * readback here. 1004 * we just provide our own readback here.
822 */ 1005 */
823static int 1006static int ecb_cold
824coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1007coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
825{ 1008{
826 const char *s = MgPV_nolen_const (mg); 1009 const char *s = MgPV_nolen_const (mg);
827 1010
828 if (*s == '_') 1011 if (*s == '_')
829 { 1012 {
830 SV **svp = 0; 1013 SV **svp = 0;
831 1014
832 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1015 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
833 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1016 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
834 1017
835 if (svp) 1018 if (svp)
836 { 1019 {
837 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1020 SV *ssv;
1021
1022 if (!*svp)
1023 ssv = &PL_sv_undef;
1024 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1025 ssv = sv_2mortal (newRV_inc (*svp));
1026 else
1027 ssv = *svp;
1028
1029 sv_setsv (sv, ssv);
838 return 0; 1030 return 0;
839 } 1031 }
840 } 1032 }
841 1033
842 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1034 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
843} 1035}
844 1036
845static int 1037static int ecb_cold
846coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1038coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
847{ 1039{
848 const char *s = MgPV_nolen_const (mg); 1040 const char *s = MgPV_nolen_const (mg);
849 1041
850 if (*s == '_') 1042 if (*s == '_')
… …
864 } 1056 }
865 1057
866 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1058 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
867} 1059}
868 1060
869static int 1061static int ecb_cold
870coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1062coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
871{ 1063{
872 const char *s = MgPV_nolen_const (mg); 1064 const char *s = MgPV_nolen_const (mg);
873 1065
874 if (*s == '_') 1066 if (*s == '_')
… …
907slf_check_repeat (pTHX_ struct CoroSLF *frame) 1099slf_check_repeat (pTHX_ struct CoroSLF *frame)
908{ 1100{
909 return 1; 1101 return 1;
910} 1102}
911 1103
912static UNOP coro_setup_op; 1104static UNOP init_perl_op;
913 1105
914static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1106ecb_noinline static void /* noinline to keep it out of the transfer fast path */
915coro_setup (pTHX_ struct coro *coro) 1107init_perl (pTHX_ struct coro *coro)
916{ 1108{
917 /* 1109 /*
918 * emulate part of the perl startup here. 1110 * emulate part of the perl startup here.
919 */ 1111 */
920 coro_init_stacks (aTHX); 1112 coro_init_stacks (aTHX);
… …
927 PL_comppad_name_fill = 0; 1119 PL_comppad_name_fill = 0;
928 PL_comppad_name_floor = 0; 1120 PL_comppad_name_floor = 0;
929 PL_curpm = 0; 1121 PL_curpm = 0;
930 PL_curpad = 0; 1122 PL_curpad = 0;
931 PL_localizing = 0; 1123 PL_localizing = 0;
932 PL_dirty = 0;
933 PL_restartop = 0; 1124 PL_restartop = 0;
934#if PERL_VERSION_ATLEAST (5,10,0) 1125#if PERL_VERSION_ATLEAST (5,10,0)
935 PL_parser = 0; 1126 PL_parser = 0;
936#endif 1127#endif
937 PL_hints = 0; 1128 PL_hints = 0;
938 1129
939 /* recreate the die/warn hooks */ 1130 /* recreate the die/warn hooks */
940 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1131 PL_diehook = SvREFCNT_inc (rv_diehook);
941 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1132 PL_warnhook = SvREFCNT_inc (rv_warnhook);
942 1133
943 GvSV (PL_defgv) = newSV (0); 1134 GvSV (PL_defgv) = newSV (0);
944 GvAV (PL_defgv) = coro->args; coro->args = 0; 1135 GvAV (PL_defgv) = coro->args; coro->args = 0;
945 GvSV (PL_errgv) = newSV (0); 1136 GvSV (PL_errgv) = newSV (0);
946 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1137 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
947 GvHV (PL_hintgv) = 0; 1138 GvHV (PL_hintgv) = 0;
… …
967 /* this newly created coroutine might be run on an existing cctx which most 1158 /* this newly created coroutine might be run on an existing cctx which most
968 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1159 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
969 */ 1160 */
970 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1161 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
971 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1162 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1163 slf_frame.destroy = 0;
972 1164
973 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1165 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
974 coro_setup_op.op_next = PL_op; 1166 init_perl_op.op_next = PL_op;
975 coro_setup_op.op_type = OP_ENTERSUB; 1167 init_perl_op.op_type = OP_ENTERSUB;
976 coro_setup_op.op_ppaddr = pp_slf; 1168 init_perl_op.op_ppaddr = pp_slf;
977 /* no flags etc. required, as an init function won't be called */ 1169 /* no flags etc. required, as an init function won't be called */
978 1170
979 PL_op = (OP *)&coro_setup_op; 1171 PL_op = (OP *)&init_perl_op;
980 1172
981 /* copy throw, in case it was set before coro_setup */ 1173 /* copy throw, in case it was set before init_perl */
982 CORO_THROW = coro->except; 1174 CORO_THROW = coro->except;
1175
1176 SWAP_SVS (coro);
1177
1178 if (ecb_expect_false (enable_times))
1179 {
1180 coro_times_update ();
1181 coro_times_sub (coro);
1182 }
983} 1183}
984 1184
985static void 1185static void
986coro_unwind_stacks (pTHX) 1186coro_unwind_stacks (pTHX)
987{ 1187{
… …
1002 dounwind (-1); 1202 dounwind (-1);
1003 } 1203 }
1004} 1204}
1005 1205
1006static void 1206static void
1007coro_destruct_perl (pTHX_ struct coro *coro) 1207destroy_perl (pTHX_ struct coro *coro)
1008{ 1208{
1009 SV *svf [9]; 1209 SV *svf [9];
1010 1210
1011 { 1211 {
1212 SV *old_current = SvRV (coro_current);
1012 struct coro *current = SvSTATE_current; 1213 struct coro *current = SvSTATE (old_current);
1013 1214
1014 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1215 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1015 1216
1016 save_perl (aTHX_ current); 1217 save_perl (aTHX_ current);
1218
1219 /* this will cause transfer_check to croak on block*/
1220 SvRV_set (coro_current, (SV *)coro->hv);
1221
1017 load_perl (aTHX_ coro); 1222 load_perl (aTHX_ coro);
1018 1223
1019 coro_unwind_stacks (aTHX); 1224 coro_unwind_stacks (aTHX);
1225
1226 /* restore swapped sv's */
1227 SWAP_SVS (coro);
1228
1020 coro_destruct_stacks (aTHX); 1229 coro_destruct_stacks (aTHX);
1021 1230
1022 // now save some sv's to be free'd later 1231 /* now save some sv's to be free'd later */
1023 svf [0] = GvSV (PL_defgv); 1232 svf [0] = GvSV (PL_defgv);
1024 svf [1] = (SV *)GvAV (PL_defgv); 1233 svf [1] = (SV *)GvAV (PL_defgv);
1025 svf [2] = GvSV (PL_errgv); 1234 svf [2] = GvSV (PL_errgv);
1026 svf [3] = (SV *)PL_defoutgv; 1235 svf [3] = (SV *)PL_defoutgv;
1027 svf [4] = PL_rs; 1236 svf [4] = PL_rs;
… …
1029 svf [6] = (SV *)GvHV (PL_hintgv); 1238 svf [6] = (SV *)GvHV (PL_hintgv);
1030 svf [7] = PL_diehook; 1239 svf [7] = PL_diehook;
1031 svf [8] = PL_warnhook; 1240 svf [8] = PL_warnhook;
1032 assert (9 == sizeof (svf) / sizeof (*svf)); 1241 assert (9 == sizeof (svf) / sizeof (*svf));
1033 1242
1243 SvRV_set (coro_current, old_current);
1244
1034 load_perl (aTHX_ current); 1245 load_perl (aTHX_ current);
1035 } 1246 }
1036 1247
1037 { 1248 {
1038 int i; 1249 unsigned int i;
1039 1250
1040 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1251 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1041 SvREFCNT_dec (svf [i]); 1252 SvREFCNT_dec (svf [i]);
1042 1253
1043 SvREFCNT_dec (coro->saved_deffh); 1254 SvREFCNT_dec (coro->saved_deffh);
… …
1045 SvREFCNT_dec (coro->invoke_cb); 1256 SvREFCNT_dec (coro->invoke_cb);
1046 SvREFCNT_dec (coro->invoke_av); 1257 SvREFCNT_dec (coro->invoke_av);
1047 } 1258 }
1048} 1259}
1049 1260
1050INLINE void 1261ecb_inline void
1051free_coro_mortal (pTHX) 1262free_coro_mortal (pTHX)
1052{ 1263{
1053 if (expect_true (coro_mortal)) 1264 if (ecb_expect_true (coro_mortal))
1054 { 1265 {
1055 SvREFCNT_dec (coro_mortal); 1266 SvREFCNT_dec ((SV *)coro_mortal);
1056 coro_mortal = 0; 1267 coro_mortal = 0;
1057 } 1268 }
1058} 1269}
1059 1270
1060static int 1271static int
… …
1193 1404
1194 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1405 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1195} 1406}
1196 1407
1197/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1408/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1198static void NOINLINE 1409static void ecb_noinline
1199cctx_prepare (pTHX) 1410cctx_prepare (pTHX)
1200{ 1411{
1201 PL_top_env = &PL_start_env; 1412 PL_top_env = &PL_start_env;
1202 1413
1203 if (cctx_current->flags & CC_TRACE) 1414 if (cctx_current->flags & CC_TRACE)
… …
1214 slf_frame.prepare = slf_prepare_set_stacklevel; 1425 slf_frame.prepare = slf_prepare_set_stacklevel;
1215 slf_frame.check = slf_check_set_stacklevel; 1426 slf_frame.check = slf_check_set_stacklevel;
1216} 1427}
1217 1428
1218/* the tail of transfer: execute stuff we can only do after a transfer */ 1429/* the tail of transfer: execute stuff we can only do after a transfer */
1219INLINE void 1430ecb_inline void
1220transfer_tail (pTHX) 1431transfer_tail (pTHX)
1221{ 1432{
1222 free_coro_mortal (aTHX); 1433 free_coro_mortal (aTHX);
1434}
1435
1436/* try to exit the same way perl's main function would do */
1437/* we do not bother resetting the environment or other things *7
1438/* that are not, uhm, essential */
1439/* this obviously also doesn't work when perl is embedded */
1440static void ecb_noinline ecb_cold
1441perlish_exit (pTHX)
1442{
1443 int exitstatus = perl_destruct (PL_curinterp);
1444 perl_free (PL_curinterp);
1445 exit (exitstatus);
1223} 1446}
1224 1447
1225/* 1448/*
1226 * this is a _very_ stripped down perl interpreter ;) 1449 * this is a _very_ stripped down perl interpreter ;)
1227 */ 1450 */
… …
1249 /* somebody or something will hit me for both perl_run and PL_restartop */ 1472 /* somebody or something will hit me for both perl_run and PL_restartop */
1250 PL_restartop = PL_op; 1473 PL_restartop = PL_op;
1251 perl_run (PL_curinterp); 1474 perl_run (PL_curinterp);
1252 /* 1475 /*
1253 * Unfortunately, there is no way to get at the return values of the 1476 * Unfortunately, there is no way to get at the return values of the
1254 * coro body here, as perl_run destroys these 1477 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1478 * runtime errors here, as this is just a random interpreter, not a thread.
1255 */ 1479 */
1256 1480
1257 /* 1481 /*
1258 * If perl-run returns we assume exit() was being called or the coro 1482 * If perl-run returns we assume exit() was being called or the coro
1259 * fell off the end, which seems to be the only valid (non-bug) 1483 * fell off the end, which seems to be the only valid (non-bug)
1260 * reason for perl_run to return. We try to exit by jumping to the 1484 * reason for perl_run to return. We try to mimic whatever perl is normally
1261 * bootstrap-time "top" top_env, as we cannot restore the "main" 1485 * doing in that case. YMMV.
1262 * coroutine as Coro has no such concept.
1263 * This actually isn't valid with the pthread backend, but OSes requiring
1264 * that backend are too broken to do it in a standards-compliant way.
1265 */ 1486 */
1266 PL_top_env = main_top_env; 1487 perlish_exit (aTHX);
1267 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1268 } 1488 }
1269} 1489}
1270 1490
1271static coro_cctx * 1491static coro_cctx *
1272cctx_new () 1492cctx_new (void)
1273{ 1493{
1274 coro_cctx *cctx; 1494 coro_cctx *cctx;
1275 1495
1276 ++cctx_count; 1496 ++cctx_count;
1277 New (0, cctx, 1, coro_cctx); 1497 New (0, cctx, 1, coro_cctx);
… …
1283 return cctx; 1503 return cctx;
1284} 1504}
1285 1505
1286/* create a new cctx only suitable as source */ 1506/* create a new cctx only suitable as source */
1287static coro_cctx * 1507static coro_cctx *
1288cctx_new_empty () 1508cctx_new_empty (void)
1289{ 1509{
1290 coro_cctx *cctx = cctx_new (); 1510 coro_cctx *cctx = cctx_new ();
1291 1511
1292 cctx->sptr = 0; 1512 cctx->stack.sptr = 0;
1293 coro_create (&cctx->cctx, 0, 0, 0, 0); 1513 coro_create (&cctx->cctx, 0, 0, 0, 0);
1294 1514
1295 return cctx; 1515 return cctx;
1296} 1516}
1297 1517
1298/* create a new cctx suitable as destination/running a perl interpreter */ 1518/* create a new cctx suitable as destination/running a perl interpreter */
1299static coro_cctx * 1519static coro_cctx *
1300cctx_new_run () 1520cctx_new_run (void)
1301{ 1521{
1302 coro_cctx *cctx = cctx_new (); 1522 coro_cctx *cctx = cctx_new ();
1303 void *stack_start;
1304 size_t stack_size;
1305 1523
1306#if HAVE_MMAP 1524 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1307 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1308 /* mmap supposedly does allocate-on-write for us */
1309 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1310
1311 if (cctx->sptr != (void *)-1)
1312 {
1313 #if CORO_STACKGUARD
1314 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1315 #endif
1316 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1317 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1318 cctx->flags |= CC_MAPPED;
1319 } 1525 {
1320 else
1321#endif
1322 {
1323 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1324 New (0, cctx->sptr, cctx_stacksize, long);
1325
1326 if (!cctx->sptr)
1327 {
1328 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1526 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1329 _exit (EXIT_FAILURE); 1527 _exit (EXIT_FAILURE);
1330 }
1331
1332 stack_start = cctx->sptr;
1333 stack_size = cctx->ssize;
1334 } 1528 }
1335 1529
1336 #if CORO_USE_VALGRIND
1337 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1338 #endif
1339
1340 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1530 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1341 1531
1342 return cctx; 1532 return cctx;
1343} 1533}
1344 1534
1345static void 1535static void
1346cctx_destroy (coro_cctx *cctx) 1536cctx_destroy (coro_cctx *cctx)
1347{ 1537{
1348 if (!cctx) 1538 if (!cctx)
1349 return; 1539 return;
1350 1540
1351 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1541 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1352 1542
1353 --cctx_count; 1543 --cctx_count;
1354 coro_destroy (&cctx->cctx); 1544 coro_destroy (&cctx->cctx);
1355 1545
1356 /* coro_transfer creates new, empty cctx's */ 1546 coro_stack_free (&cctx->stack);
1357 if (cctx->sptr)
1358 {
1359 #if CORO_USE_VALGRIND
1360 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1361 #endif
1362
1363#if HAVE_MMAP
1364 if (cctx->flags & CC_MAPPED)
1365 munmap (cctx->sptr, cctx->ssize);
1366 else
1367#endif
1368 Safefree (cctx->sptr);
1369 }
1370 1547
1371 Safefree (cctx); 1548 Safefree (cctx);
1372} 1549}
1373 1550
1374/* wether this cctx should be destructed */ 1551/* wether this cctx should be destructed */
1375#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1552#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1376 1553
1377static coro_cctx * 1554static coro_cctx *
1378cctx_get (pTHX) 1555cctx_get (pTHX)
1379{ 1556{
1380 while (expect_true (cctx_first)) 1557 while (ecb_expect_true (cctx_first))
1381 { 1558 {
1382 coro_cctx *cctx = cctx_first; 1559 coro_cctx *cctx = cctx_first;
1383 cctx_first = cctx->next; 1560 cctx_first = cctx->next;
1384 --cctx_idle; 1561 --cctx_idle;
1385 1562
1386 if (expect_true (!CCTX_EXPIRED (cctx))) 1563 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1387 return cctx; 1564 return cctx;
1388 1565
1389 cctx_destroy (cctx); 1566 cctx_destroy (cctx);
1390 } 1567 }
1391 1568
… …
1393} 1570}
1394 1571
1395static void 1572static void
1396cctx_put (coro_cctx *cctx) 1573cctx_put (coro_cctx *cctx)
1397{ 1574{
1398 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1575 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1399 1576
1400 /* free another cctx if overlimit */ 1577 /* free another cctx if overlimit */
1401 if (expect_false (cctx_idle >= cctx_max_idle)) 1578 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1402 { 1579 {
1403 coro_cctx *first = cctx_first; 1580 coro_cctx *first = cctx_first;
1404 cctx_first = first->next; 1581 cctx_first = first->next;
1405 --cctx_idle; 1582 --cctx_idle;
1406 1583
… …
1417static void 1594static void
1418transfer_check (pTHX_ struct coro *prev, struct coro *next) 1595transfer_check (pTHX_ struct coro *prev, struct coro *next)
1419{ 1596{
1420 /* TODO: throwing up here is considered harmful */ 1597 /* TODO: throwing up here is considered harmful */
1421 1598
1422 if (expect_true (prev != next)) 1599 if (ecb_expect_true (prev != next))
1423 { 1600 {
1424 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1601 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1425 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1602 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1426 1603
1427 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1604 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1428 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1605 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1429 1606
1430#if !PERL_VERSION_ATLEAST (5,10,0) 1607#if !PERL_VERSION_ATLEAST (5,10,0)
1431 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1608 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1432 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1609 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1433#endif 1610#endif
1434 } 1611 }
1435} 1612}
1436 1613
1437/* always use the TRANSFER macro */ 1614/* always use the TRANSFER macro */
1438static void NOINLINE /* noinline so we have a fixed stackframe */ 1615static void ecb_noinline /* noinline so we have a fixed stackframe */
1439transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1616transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1440{ 1617{
1441 dSTACKLEVEL; 1618 dSTACKLEVEL;
1442 1619
1443 /* sometimes transfer is only called to set idle_sp */ 1620 /* sometimes transfer is only called to set idle_sp */
1444 if (expect_false (!prev)) 1621 if (ecb_expect_false (!prev))
1445 { 1622 {
1446 cctx_current->idle_sp = STACKLEVEL; 1623 cctx_current->idle_sp = STACKLEVEL;
1447 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1624 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1448 } 1625 }
1449 else if (expect_true (prev != next)) 1626 else if (ecb_expect_true (prev != next))
1450 { 1627 {
1451 coro_cctx *cctx_prev; 1628 coro_cctx *cctx_prev;
1452 1629
1453 if (expect_false (prev->flags & CF_NEW)) 1630 if (ecb_expect_false (prev->flags & CF_NEW))
1454 { 1631 {
1455 /* create a new empty/source context */ 1632 /* create a new empty/source context */
1456 prev->flags &= ~CF_NEW; 1633 prev->flags &= ~CF_NEW;
1457 prev->flags |= CF_RUNNING; 1634 prev->flags |= CF_RUNNING;
1458 } 1635 }
… …
1461 next->flags |= CF_RUNNING; 1638 next->flags |= CF_RUNNING;
1462 1639
1463 /* first get rid of the old state */ 1640 /* first get rid of the old state */
1464 save_perl (aTHX_ prev); 1641 save_perl (aTHX_ prev);
1465 1642
1466 if (expect_false (next->flags & CF_NEW)) 1643 if (ecb_expect_false (next->flags & CF_NEW))
1467 { 1644 {
1468 /* need to start coroutine */ 1645 /* need to start coroutine */
1469 next->flags &= ~CF_NEW; 1646 next->flags &= ~CF_NEW;
1470 /* setup coroutine call */ 1647 /* setup coroutine call */
1471 coro_setup (aTHX_ next); 1648 init_perl (aTHX_ next);
1472 } 1649 }
1473 else 1650 else
1474 load_perl (aTHX_ next); 1651 load_perl (aTHX_ next);
1475 1652
1476 /* possibly untie and reuse the cctx */ 1653 /* possibly untie and reuse the cctx */
1477 if (expect_true ( 1654 if (ecb_expect_true (
1478 cctx_current->idle_sp == STACKLEVEL 1655 cctx_current->idle_sp == STACKLEVEL
1479 && !(cctx_current->flags & CC_TRACE) 1656 && !(cctx_current->flags & CC_TRACE)
1480 && !force_cctx 1657 && !force_cctx
1481 )) 1658 ))
1482 { 1659 {
1483 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1660 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1484 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1661 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1485 1662
1486 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1663 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1487 /* without this the next cctx_get might destroy the running cctx while still in use */ 1664 /* without this the next cctx_get might destroy the running cctx while still in use */
1488 if (expect_false (CCTX_EXPIRED (cctx_current))) 1665 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1489 if (expect_true (!next->cctx)) 1666 if (ecb_expect_true (!next->cctx))
1490 next->cctx = cctx_get (aTHX); 1667 next->cctx = cctx_get (aTHX);
1491 1668
1492 cctx_put (cctx_current); 1669 cctx_put (cctx_current);
1493 } 1670 }
1494 else 1671 else
1495 prev->cctx = cctx_current; 1672 prev->cctx = cctx_current;
1496 1673
1497 ++next->usecount; 1674 ++next->usecount;
1498 1675
1499 cctx_prev = cctx_current; 1676 cctx_prev = cctx_current;
1500 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1677 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1501 1678
1502 next->cctx = 0; 1679 next->cctx = 0;
1503 1680
1504 if (expect_false (cctx_prev != cctx_current)) 1681 if (ecb_expect_false (cctx_prev != cctx_current))
1505 { 1682 {
1506 cctx_prev->top_env = PL_top_env; 1683 cctx_prev->top_env = PL_top_env;
1507 PL_top_env = cctx_current->top_env; 1684 PL_top_env = cctx_current->top_env;
1508 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1685 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1509 } 1686 }
… …
1515#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1692#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1516#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1693#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1517 1694
1518/** high level stuff ********************************************************/ 1695/** high level stuff ********************************************************/
1519 1696
1697/* this function is actually Coro, not Coro::State, but we call it from here */
1698/* because it is convenient - but it hasn't been declared yet for that reason */
1520static int 1699static void
1700coro_call_on_destroy (pTHX_ struct coro *coro);
1701
1702static void
1521coro_state_destroy (pTHX_ struct coro *coro) 1703coro_state_destroy (pTHX_ struct coro *coro)
1522{ 1704{
1523 if (coro->flags & CF_DESTROYED) 1705 if (coro->flags & CF_ZOMBIE)
1524 return 0; 1706 return;
1525 1707
1526 if (coro->on_destroy && !PL_dirty)
1527 coro->on_destroy (aTHX_ coro); 1708 slf_destroy (aTHX_ coro);
1528 1709
1529 coro->flags |= CF_DESTROYED; 1710 coro->flags |= CF_ZOMBIE;
1530 1711
1531 if (coro->flags & CF_READY) 1712 if (coro->flags & CF_READY)
1532 { 1713 {
1533 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1714 /* reduce nready, as destroying a ready coro effectively unreadies it */
1534 /* alternative: look through all ready queues and remove the coro */ 1715 /* alternative: look through all ready queues and remove the coro */
1535 --coro_nready; 1716 --coro_nready;
1536 } 1717 }
1537 else 1718 else
1538 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1719 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1720
1721 if (coro->next) coro->next->prev = coro->prev;
1722 if (coro->prev) coro->prev->next = coro->next;
1723 if (coro == coro_first) coro_first = coro->next;
1539 1724
1540 if (coro->mainstack 1725 if (coro->mainstack
1541 && coro->mainstack != main_mainstack 1726 && coro->mainstack != main_mainstack
1542 && coro->slot 1727 && coro->slot
1543 && !PL_dirty) 1728 && !PL_dirty)
1544 coro_destruct_perl (aTHX_ coro); 1729 destroy_perl (aTHX_ coro);
1545 1730
1546 cctx_destroy (coro->cctx); 1731 cctx_destroy (coro->cctx);
1547 SvREFCNT_dec (coro->startcv); 1732 SvREFCNT_dec (coro->startcv);
1548 SvREFCNT_dec (coro->args); 1733 SvREFCNT_dec (coro->args);
1734 SvREFCNT_dec (coro->swap_sv);
1549 SvREFCNT_dec (CORO_THROW); 1735 SvREFCNT_dec (CORO_THROW);
1550 1736
1551 if (coro->next) coro->next->prev = coro->prev; 1737 coro_call_on_destroy (aTHX_ coro);
1552 if (coro->prev) coro->prev->next = coro->next;
1553 if (coro == coro_first) coro_first = coro->next;
1554 1738
1555 return 1; 1739 /* more destruction mayhem in coro_state_free */
1556} 1740}
1557 1741
1558static int 1742static int
1559coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1743coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1560{ 1744{
1561 struct coro *coro = (struct coro *)mg->mg_ptr; 1745 struct coro *coro = (struct coro *)mg->mg_ptr;
1562 mg->mg_ptr = 0; 1746 mg->mg_ptr = 0;
1563 1747
1564 coro->hv = 0;
1565
1566 if (--coro->refcnt < 0)
1567 {
1568 coro_state_destroy (aTHX_ coro); 1748 coro_state_destroy (aTHX_ coro);
1749 SvREFCNT_dec (coro->on_destroy);
1750 SvREFCNT_dec (coro->status);
1751
1569 Safefree (coro); 1752 Safefree (coro);
1570 }
1571 1753
1572 return 0; 1754 return 0;
1573} 1755}
1574 1756
1575static int 1757static int ecb_cold
1576coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1758coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1577{ 1759{
1578 struct coro *coro = (struct coro *)mg->mg_ptr; 1760 /* called when perl clones the current process the slow way (windows process emulation) */
1579 1761 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1580 ++coro->refcnt; 1762 mg->mg_ptr = 0;
1763 mg->mg_virtual = 0;
1581 1764
1582 return 0; 1765 return 0;
1583} 1766}
1584 1767
1585static MGVTBL coro_state_vtbl = { 1768static MGVTBL coro_state_vtbl = {
… …
1608 1791
1609 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1792 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1610 TRANSFER (ta, 1); 1793 TRANSFER (ta, 1);
1611} 1794}
1612 1795
1613/*****************************************************************************/
1614/* gensub: simple closure generation utility */
1615
1616#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1617
1618/* create a closure from XS, returns a code reference */
1619/* the arg can be accessed via GENSUB_ARG from the callback */
1620/* the callback must use dXSARGS/XSRETURN */
1621static SV *
1622gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1623{
1624 CV *cv = (CV *)newSV (0);
1625
1626 sv_upgrade ((SV *)cv, SVt_PVCV);
1627
1628 CvANON_on (cv);
1629 CvISXSUB_on (cv);
1630 CvXSUB (cv) = xsub;
1631 GENSUB_ARG = arg;
1632
1633 return newRV_noinc ((SV *)cv);
1634}
1635
1636/** Coro ********************************************************************/ 1796/** Coro ********************************************************************/
1637 1797
1638INLINE void 1798ecb_inline void
1639coro_enq (pTHX_ struct coro *coro) 1799coro_enq (pTHX_ struct coro *coro)
1640{ 1800{
1641 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1801 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1642 1802
1643 SvREFCNT_inc_NN (coro->hv); 1803 SvREFCNT_inc_NN (coro->hv);
… …
1645 coro->next_ready = 0; 1805 coro->next_ready = 0;
1646 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1806 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1647 ready [1] = coro; 1807 ready [1] = coro;
1648} 1808}
1649 1809
1650INLINE struct coro * 1810ecb_inline struct coro *
1651coro_deq (pTHX) 1811coro_deq (pTHX)
1652{ 1812{
1653 int prio; 1813 int prio;
1654 1814
1655 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1815 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1665 } 1825 }
1666 1826
1667 return 0; 1827 return 0;
1668} 1828}
1669 1829
1830static void
1831invoke_sv_ready_hook_helper (void)
1832{
1833 dTHX;
1834 dSP;
1835
1836 ENTER;
1837 SAVETMPS;
1838
1839 PUSHMARK (SP);
1840 PUTBACK;
1841 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1842
1843 FREETMPS;
1844 LEAVE;
1845}
1846
1670static int 1847static int
1671api_ready (pTHX_ SV *coro_sv) 1848api_ready (pTHX_ SV *coro_sv)
1672{ 1849{
1673 struct coro *coro;
1674 SV *sv_hook;
1675 void (*xs_hook)(void);
1676
1677 coro = SvSTATE (coro_sv); 1850 struct coro *coro = SvSTATE (coro_sv);
1678 1851
1679 if (coro->flags & CF_READY) 1852 if (coro->flags & CF_READY)
1680 return 0; 1853 return 0;
1681 1854
1682 coro->flags |= CF_READY; 1855 coro->flags |= CF_READY;
1683 1856
1684 sv_hook = coro_nready ? 0 : coro_readyhook;
1685 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1686
1687 coro_enq (aTHX_ coro); 1857 coro_enq (aTHX_ coro);
1688 ++coro_nready;
1689 1858
1690 if (sv_hook) 1859 if (!coro_nready++)
1691 { 1860 if (coroapi.readyhook)
1692 dSP; 1861 coroapi.readyhook ();
1693
1694 ENTER;
1695 SAVETMPS;
1696
1697 PUSHMARK (SP);
1698 PUTBACK;
1699 call_sv (sv_hook, G_VOID | G_DISCARD);
1700
1701 FREETMPS;
1702 LEAVE;
1703 }
1704
1705 if (xs_hook)
1706 xs_hook ();
1707 1862
1708 return 1; 1863 return 1;
1709} 1864}
1710 1865
1711static int 1866static int
… …
1713{ 1868{
1714 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1869 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1715} 1870}
1716 1871
1717/* expects to own a reference to next->hv */ 1872/* expects to own a reference to next->hv */
1718INLINE void 1873ecb_inline void
1719prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1874prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1720{ 1875{
1721 SV *prev_sv = SvRV (coro_current); 1876 SV *prev_sv = SvRV (coro_current);
1722 1877
1723 ta->prev = SvSTATE_hv (prev_sv); 1878 ta->prev = SvSTATE_hv (prev_sv);
… …
1736{ 1891{
1737 for (;;) 1892 for (;;)
1738 { 1893 {
1739 struct coro *next = coro_deq (aTHX); 1894 struct coro *next = coro_deq (aTHX);
1740 1895
1741 if (expect_true (next)) 1896 if (ecb_expect_true (next))
1742 { 1897 {
1743 /* cannot transfer to destroyed coros, skip and look for next */ 1898 /* cannot transfer to destroyed coros, skip and look for next */
1744 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1899 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1745 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1900 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1746 else 1901 else
1747 { 1902 {
1748 next->flags &= ~CF_READY; 1903 next->flags &= ~CF_READY;
1749 --coro_nready; 1904 --coro_nready;
… …
1756 { 1911 {
1757 /* nothing to schedule: call the idle handler */ 1912 /* nothing to schedule: call the idle handler */
1758 if (SvROK (sv_idle) 1913 if (SvROK (sv_idle)
1759 && SvOBJECT (SvRV (sv_idle))) 1914 && SvOBJECT (SvRV (sv_idle)))
1760 { 1915 {
1916 if (SvRV (sv_idle) == SvRV (coro_current))
1917 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1918
1761 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1919 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1762 api_ready (aTHX_ SvRV (sv_idle)); 1920 api_ready (aTHX_ SvRV (sv_idle));
1763 --coro_nready; 1921 --coro_nready;
1764 } 1922 }
1765 else 1923 else
1766 { 1924 {
1925 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1767 dSP; 1926 dSP;
1768 1927
1769 ENTER; 1928 ENTER;
1770 SAVETMPS; 1929 SAVETMPS;
1771 1930
… …
1778 } 1937 }
1779 } 1938 }
1780 } 1939 }
1781} 1940}
1782 1941
1783INLINE void 1942ecb_inline void
1784prepare_cede (pTHX_ struct coro_transfer_args *ta) 1943prepare_cede (pTHX_ struct coro_transfer_args *ta)
1785{ 1944{
1786 api_ready (aTHX_ coro_current); 1945 api_ready (aTHX_ coro_current);
1787 prepare_schedule (aTHX_ ta); 1946 prepare_schedule (aTHX_ ta);
1788} 1947}
1789 1948
1790INLINE void 1949ecb_inline void
1791prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1950prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1792{ 1951{
1793 SV *prev = SvRV (coro_current); 1952 SV *prev = SvRV (coro_current);
1794 1953
1795 if (coro_nready) 1954 if (coro_nready)
… …
1825{ 1984{
1826 struct coro_transfer_args ta; 1985 struct coro_transfer_args ta;
1827 1986
1828 prepare_cede (aTHX_ &ta); 1987 prepare_cede (aTHX_ &ta);
1829 1988
1830 if (expect_true (ta.prev != ta.next)) 1989 if (ecb_expect_true (ta.prev != ta.next))
1831 { 1990 {
1832 TRANSFER (ta, 1); 1991 TRANSFER (ta, 1);
1833 return 1; 1992 return 1;
1834 } 1993 }
1835 else 1994 else
… …
1878 coro->slot->runops = RUNOPS_DEFAULT; 2037 coro->slot->runops = RUNOPS_DEFAULT;
1879 } 2038 }
1880} 2039}
1881 2040
1882static void 2041static void
2042coro_push_av (pTHX_ AV *av, I32 gimme_v)
2043{
2044 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2045 {
2046 dSP;
2047
2048 if (gimme_v == G_SCALAR)
2049 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2050 else
2051 {
2052 int i;
2053 EXTEND (SP, AvFILLp (av) + 1);
2054
2055 for (i = 0; i <= AvFILLp (av); ++i)
2056 PUSHs (AvARRAY (av)[i]);
2057 }
2058
2059 PUTBACK;
2060 }
2061}
2062
2063static void
2064coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2065{
2066 if (!coro->on_destroy)
2067 coro->on_destroy = newAV ();
2068
2069 av_push (coro->on_destroy, cb);
2070}
2071
2072static void
2073slf_destroy_join (pTHX_ struct CoroSLF *frame)
2074{
2075 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2076}
2077
2078static int
2079slf_check_join (pTHX_ struct CoroSLF *frame)
2080{
2081 struct coro *coro = (struct coro *)frame->data;
2082
2083 if (!coro->status)
2084 return 1;
2085
2086 frame->destroy = 0;
2087
2088 coro_push_av (aTHX_ coro->status, GIMME_V);
2089
2090 SvREFCNT_dec ((SV *)coro->hv);
2091
2092 return 0;
2093}
2094
2095static void
2096slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2097{
2098 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2099
2100 if (items > 1)
2101 croak ("join called with too many arguments");
2102
2103 if (coro->status)
2104 frame->prepare = prepare_nop;
2105 else
2106 {
2107 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2108 frame->prepare = prepare_schedule;
2109 }
2110
2111 frame->check = slf_check_join;
2112 frame->destroy = slf_destroy_join;
2113 frame->data = (void *)coro;
2114 SvREFCNT_inc (coro->hv);
2115}
2116
2117static void
1883coro_call_on_destroy (pTHX_ struct coro *coro) 2118coro_call_on_destroy (pTHX_ struct coro *coro)
1884{ 2119{
1885 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2120 AV *od = coro->on_destroy;
1886 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1887 2121
1888 if (on_destroyp) 2122 if (!od)
1889 { 2123 return;
1890 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1891 2124
2125 coro->on_destroy = 0;
2126 sv_2mortal ((SV *)od);
2127
1892 while (AvFILLp (on_destroy) >= 0) 2128 while (AvFILLp (od) >= 0)
2129 {
2130 SV *cb = sv_2mortal (av_pop (od));
2131
2132 /* coro hv's (and only hv's at the moment) are supported as well */
2133 if (SvSTATEhv_p (aTHX_ cb))
2134 api_ready (aTHX_ cb);
2135 else
1893 { 2136 {
1894 dSP; /* don't disturb outer sp */ 2137 dSP; /* don't disturb outer sp */
1895 SV *cb = av_pop (on_destroy);
1896
1897 PUSHMARK (SP); 2138 PUSHMARK (SP);
1898 2139
1899 if (statusp) 2140 if (coro->status)
1900 { 2141 {
1901 int i; 2142 PUTBACK;
1902 AV *status = (AV *)SvRV (*statusp); 2143 coro_push_av (aTHX_ coro->status, G_ARRAY);
1903 EXTEND (SP, AvFILLp (status) + 1); 2144 SPAGAIN;
1904
1905 for (i = 0; i <= AvFILLp (status); ++i)
1906 PUSHs (AvARRAY (status)[i]);
1907 } 2145 }
1908 2146
1909 PUTBACK; 2147 PUTBACK;
1910 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2148 call_sv (cb, G_VOID | G_DISCARD);
1911 } 2149 }
1912 } 2150 }
1913} 2151}
1914 2152
1915static void 2153static void
1916slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2154coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1917{ 2155{
2156 AV *av;
2157
2158 if (coro->status)
2159 {
2160 av = coro->status;
2161 av_clear (av);
2162 }
2163 else
2164 av = coro->status = newAV ();
2165
2166 /* items are actually not so common, so optimise for this case */
2167 if (items)
2168 {
1918 int i; 2169 int i;
1919 HV *hv = (HV *)SvRV (coro_current);
1920 AV *av = newAV ();
1921 2170
1922 av_extend (av, items - 1); 2171 av_extend (av, items - 1);
2172
1923 for (i = 0; i < items; ++i) 2173 for (i = 0; i < items; ++i)
1924 av_push (av, SvREFCNT_inc_NN (arg [i])); 2174 av_push (av, SvREFCNT_inc_NN (arg [i]));
2175 }
2176}
1925 2177
1926 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2178static void
1927 2179slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2180{
1928 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2181 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1929 api_ready (aTHX_ sv_manager); 2182 api_ready (aTHX_ sv_manager);
1930 2183
1931 frame->prepare = prepare_schedule; 2184 frame->prepare = prepare_schedule;
1932 frame->check = slf_check_repeat; 2185 frame->check = slf_check_repeat;
1933 2186
1934 /* as a minor optimisation, we could unwind all stacks here */ 2187 /* as a minor optimisation, we could unwind all stacks here */
1935 /* but that puts extra pressure on pp_slf, and is not worth much */ 2188 /* but that puts extra pressure on pp_slf, and is not worth much */
1936 /*coro_unwind_stacks (aTHX);*/ 2189 /*coro_unwind_stacks (aTHX);*/
2190}
2191
2192static void
2193slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2194{
2195 HV *coro_hv = (HV *)SvRV (coro_current);
2196
2197 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2198 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2199}
2200
2201static void
2202slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2203{
2204 HV *coro_hv;
2205 struct coro *coro;
2206
2207 if (items <= 0)
2208 croak ("Coro::cancel called without coro object,");
2209
2210 coro = SvSTATE (arg [0]);
2211 coro_hv = coro->hv;
2212
2213 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2214
2215 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2216 {
2217 /* coro currently busy cancelling something, so just notify it */
2218 coro->slf_frame.data = (void *)coro;
2219
2220 frame->prepare = prepare_nop;
2221 frame->check = slf_check_nop;
2222 }
2223 else if (coro_hv == (HV *)SvRV (coro_current))
2224 {
2225 /* cancelling the current coro is allowed, and equals terminate */
2226 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2227 }
2228 else
2229 {
2230 struct coro *self = SvSTATE_current;
2231
2232 /* otherwise we cancel directly, purely for speed reasons
2233 * unfortunately, this requires some magic trickery, as
2234 * somebody else could cancel us, so we have to fight the cancellation.
2235 * this is ugly, and hopefully fully worth the extra speed.
2236 * besides, I can't get the slow-but-safe version working...
2237 */
2238 slf_frame.data = 0;
2239 self->flags |= CF_NOCANCEL;
2240 coro_state_destroy (aTHX_ coro);
2241 self->flags &= ~CF_NOCANCEL;
2242
2243 if (slf_frame.data)
2244 {
2245 /* while we were busy we have been cancelled, so terminate */
2246 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2247 }
2248 else
2249 {
2250 frame->prepare = prepare_nop;
2251 frame->check = slf_check_nop;
2252 }
2253 }
2254}
2255
2256static int
2257slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2258{
2259 frame->prepare = 0;
2260 coro_unwind_stacks (aTHX);
2261
2262 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2263
2264 return 1;
2265}
2266
2267static int
2268safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2269{
2270 if (coro->cctx)
2271 croak ("coro inside C callback, unable to cancel at this time, caught");
2272
2273 if (coro->flags & CF_NEW)
2274 {
2275 coro_set_status (aTHX_ coro, arg, items);
2276 coro_state_destroy (aTHX_ coro);
2277 }
2278 else
2279 {
2280 if (!coro->slf_frame.prepare)
2281 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2282
2283 slf_destroy (aTHX_ coro);
2284
2285 coro_set_status (aTHX_ coro, arg, items);
2286 coro->slf_frame.prepare = prepare_nop;
2287 coro->slf_frame.check = slf_check_safe_cancel;
2288
2289 api_ready (aTHX_ (SV *)coro->hv);
2290 }
2291
2292 return 1;
1937} 2293}
1938 2294
1939/*****************************************************************************/ 2295/*****************************************************************************/
1940/* async pool handler */ 2296/* async pool handler */
1941 2297
… …
1972slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2328slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1973{ 2329{
1974 HV *hv = (HV *)SvRV (coro_current); 2330 HV *hv = (HV *)SvRV (coro_current);
1975 struct coro *coro = SvSTATE_hv ((SV *)hv); 2331 struct coro *coro = SvSTATE_hv ((SV *)hv);
1976 2332
1977 if (expect_true (coro->saved_deffh)) 2333 if (ecb_expect_true (coro->saved_deffh))
1978 { 2334 {
1979 /* subsequent iteration */ 2335 /* subsequent iteration */
1980 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2336 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1981 coro->saved_deffh = 0; 2337 coro->saved_deffh = 0;
1982 2338
1983 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2339 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1984 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2340 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1985 { 2341 {
1986 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2342 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1987 coro->invoke_av = newAV (); 2343 return;
1988
1989 frame->prepare = prepare_nop;
1990 } 2344 }
1991 else 2345 else
1992 { 2346 {
1993 av_clear (GvAV (PL_defgv)); 2347 av_clear (GvAV (PL_defgv));
1994 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2348 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2019 2373
2020static void 2374static void
2021coro_rouse_callback (pTHX_ CV *cv) 2375coro_rouse_callback (pTHX_ CV *cv)
2022{ 2376{
2023 dXSARGS; 2377 dXSARGS;
2024 SV *data = (SV *)GENSUB_ARG; 2378 SV *data = (SV *)S_GENSUB_ARG;
2025 2379
2026 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2380 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2027 { 2381 {
2028 /* first call, set args */ 2382 /* first call, set args */
2029 SV *coro = SvRV (data); 2383 SV *coro = SvRV (data);
… …
2044 2398
2045static int 2399static int
2046slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2400slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2047{ 2401{
2048 SV *data = (SV *)frame->data; 2402 SV *data = (SV *)frame->data;
2049 2403
2050 if (CORO_THROW) 2404 if (CORO_THROW)
2051 return 0; 2405 return 0;
2052 2406
2053 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2407 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2054 return 1; 2408 return 1;
… …
2090 cb = sv_2mortal (coro->rouse_cb); 2444 cb = sv_2mortal (coro->rouse_cb);
2091 coro->rouse_cb = 0; 2445 coro->rouse_cb = 0;
2092 } 2446 }
2093 2447
2094 if (!SvROK (cb) 2448 if (!SvROK (cb)
2095 || SvTYPE (SvRV (cb)) != SVt_PVCV 2449 || SvTYPE (SvRV (cb)) != SVt_PVCV
2096 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2450 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2097 croak ("Coro::rouse_wait called with illegal callback argument,"); 2451 croak ("Coro::rouse_wait called with illegal callback argument,");
2098 2452
2099 { 2453 {
2100 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2454 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2101 SV *data = (SV *)GENSUB_ARG; 2455 SV *data = (SV *)S_GENSUB_ARG;
2102 2456
2103 frame->data = (void *)data; 2457 frame->data = (void *)data;
2104 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2458 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2105 frame->check = slf_check_rouse_wait; 2459 frame->check = slf_check_rouse_wait;
2106 } 2460 }
… …
2110coro_new_rouse_cb (pTHX) 2464coro_new_rouse_cb (pTHX)
2111{ 2465{
2112 HV *hv = (HV *)SvRV (coro_current); 2466 HV *hv = (HV *)SvRV (coro_current);
2113 struct coro *coro = SvSTATE_hv (hv); 2467 struct coro *coro = SvSTATE_hv (hv);
2114 SV *data = newRV_inc ((SV *)hv); 2468 SV *data = newRV_inc ((SV *)hv);
2115 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2469 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2116 2470
2117 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2471 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2118 SvREFCNT_dec (data); /* magicext increases the refcount */ 2472 SvREFCNT_dec (data); /* magicext increases the refcount */
2119 2473
2120 SvREFCNT_dec (coro->rouse_cb); 2474 SvREFCNT_dec (coro->rouse_cb);
… …
2217static void 2571static void
2218slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2572slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2219{ 2573{
2220 frame->prepare = prepare_cede_notself; 2574 frame->prepare = prepare_cede_notself;
2221 frame->check = slf_check_nop; 2575 frame->check = slf_check_nop;
2576}
2577
2578/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2579static void
2580slf_destroy (pTHX_ struct coro *coro)
2581{
2582 /* this callback is reserved for slf functions needing to do cleanup */
2583 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2584 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2585
2586 /*
2587 * The on_destroy above most likely is from an SLF call.
2588 * Since by definition the SLF call will not finish when we destroy
2589 * the coro, we will have to force-finish it here, otherwise
2590 * cleanup functions cannot call SLF functions.
2591 */
2592 coro->slf_frame.prepare = 0;
2222} 2593}
2223 2594
2224/* 2595/*
2225 * these not obviously related functions are all rolled into one 2596 * these not obviously related functions are all rolled into one
2226 * function to increase chances that they all will call transfer with the same 2597 * function to increase chances that they all will call transfer with the same
… …
2233 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2604 I32 checkmark; /* mark SP to see how many elements check has pushed */
2234 2605
2235 /* set up the slf frame, unless it has already been set-up */ 2606 /* set up the slf frame, unless it has already been set-up */
2236 /* the latter happens when a new coro has been started */ 2607 /* the latter happens when a new coro has been started */
2237 /* or when a new cctx was attached to an existing coroutine */ 2608 /* or when a new cctx was attached to an existing coroutine */
2238 if (expect_true (!slf_frame.prepare)) 2609 if (ecb_expect_true (!slf_frame.prepare))
2239 { 2610 {
2240 /* first iteration */ 2611 /* first iteration */
2241 dSP; 2612 dSP;
2242 SV **arg = PL_stack_base + TOPMARK + 1; 2613 SV **arg = PL_stack_base + TOPMARK + 1;
2243 int items = SP - arg; /* args without function object */ 2614 int items = SP - arg; /* args without function object */
… …
2284 while (slf_frame.check (aTHX_ &slf_frame)); 2655 while (slf_frame.check (aTHX_ &slf_frame));
2285 2656
2286 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2657 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2287 2658
2288 /* exception handling */ 2659 /* exception handling */
2289 if (expect_false (CORO_THROW)) 2660 if (ecb_expect_false (CORO_THROW))
2290 { 2661 {
2291 SV *exception = sv_2mortal (CORO_THROW); 2662 SV *exception = sv_2mortal (CORO_THROW);
2292 2663
2293 CORO_THROW = 0; 2664 CORO_THROW = 0;
2294 sv_setsv (ERRSV, exception); 2665 sv_setsv (ERRSV, exception);
2295 croak (0); 2666 croak (0);
2296 } 2667 }
2297 2668
2298 /* return value handling - mostly like entersub */ 2669 /* return value handling - mostly like entersub */
2299 /* make sure we put something on the stack in scalar context */ 2670 /* make sure we put something on the stack in scalar context */
2300 if (GIMME_V == G_SCALAR) 2671 if (GIMME_V == G_SCALAR
2672 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2301 { 2673 {
2302 dSP; 2674 dSP;
2303 SV **bot = PL_stack_base + checkmark; 2675 SV **bot = PL_stack_base + checkmark;
2304 2676
2305 if (sp == bot) /* too few, push undef */ 2677 if (sp == bot) /* too few, push undef */
2306 bot [1] = &PL_sv_undef; 2678 bot [1] = &PL_sv_undef;
2307 else if (sp != bot + 1) /* too many, take last one */ 2679 else /* too many, take last one */
2308 bot [1] = *sp; 2680 bot [1] = *sp;
2309 2681
2310 SP = bot + 1; 2682 SP = bot + 1;
2311 2683
2312 PUTBACK; 2684 PUTBACK;
… …
2345 if (PL_op->op_flags & OPf_STACKED) 2717 if (PL_op->op_flags & OPf_STACKED)
2346 { 2718 {
2347 if (items > slf_arga) 2719 if (items > slf_arga)
2348 { 2720 {
2349 slf_arga = items; 2721 slf_arga = items;
2350 free (slf_argv); 2722 Safefree (slf_argv);
2351 slf_argv = malloc (slf_arga * sizeof (SV *)); 2723 New (0, slf_argv, slf_arga, SV *);
2352 } 2724 }
2353 2725
2354 slf_argc = items; 2726 slf_argc = items;
2355 2727
2356 for (i = 0; i < items; ++i) 2728 for (i = 0; i < items; ++i)
… …
2419{ 2791{
2420 PerlIOBuf base; 2792 PerlIOBuf base;
2421 NV next, every; 2793 NV next, every;
2422} PerlIOCede; 2794} PerlIOCede;
2423 2795
2424static IV 2796static IV ecb_cold
2425PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2797PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2426{ 2798{
2427 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2799 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2428 2800
2429 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2801 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2430 self->next = nvtime () + self->every; 2802 self->next = nvtime () + self->every;
2431 2803
2432 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2804 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2433} 2805}
2434 2806
2435static SV * 2807static SV * ecb_cold
2436PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2808PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2437{ 2809{
2438 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2810 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2439 2811
2440 return newSVnv (self->every); 2812 return newSVnv (self->every);
… …
2552 SvREFCNT_dec (cb); 2924 SvREFCNT_dec (cb);
2553 } 2925 }
2554} 2926}
2555 2927
2556static void 2928static void
2557coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2929coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2558{ 2930{
2559 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2931 /* call $sem->adjust (0) to possibly wake up some other waiters */
2560 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2932 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2561} 2933}
2562 2934
2563static int 2935static int
2564slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2936slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2565{ 2937{
2566 AV *av = (AV *)frame->data; 2938 AV *av = (AV *)frame->data;
2567 SV *count_sv = AvARRAY (av)[0]; 2939 SV *count_sv = AvARRAY (av)[0];
2940 SV *coro_hv = SvRV (coro_current);
2568 2941
2569 /* if we are about to throw, don't actually acquire the lock, just throw */ 2942 /* if we are about to throw, don't actually acquire the lock, just throw */
2570 if (CORO_THROW) 2943 if (CORO_THROW)
2571 return 0; 2944 return 0;
2572 else if (SvIVX (count_sv) > 0) 2945 else if (SvIVX (count_sv) > 0)
2573 { 2946 {
2574 SvSTATE_current->on_destroy = 0; 2947 frame->destroy = 0;
2575 2948
2576 if (acquire) 2949 if (acquire)
2577 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2950 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2578 else 2951 else
2579 coro_semaphore_adjust (aTHX_ av, 0); 2952 coro_semaphore_adjust (aTHX_ av, 0);
… …
2584 { 2957 {
2585 int i; 2958 int i;
2586 /* if we were woken up but can't down, we look through the whole */ 2959 /* if we were woken up but can't down, we look through the whole */
2587 /* waiters list and only add us if we aren't in there already */ 2960 /* waiters list and only add us if we aren't in there already */
2588 /* this avoids some degenerate memory usage cases */ 2961 /* this avoids some degenerate memory usage cases */
2589 2962 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2590 for (i = 1; i <= AvFILLp (av); ++i)
2591 if (AvARRAY (av)[i] == SvRV (coro_current)) 2963 if (AvARRAY (av)[i] == coro_hv)
2592 return 1; 2964 return 1;
2593 2965
2594 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2966 av_push (av, SvREFCNT_inc (coro_hv));
2595 return 1; 2967 return 1;
2596 } 2968 }
2597} 2969}
2598 2970
2599static int 2971static int
… …
2622 { 2994 {
2623 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2995 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2624 2996
2625 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2997 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2626 frame->prepare = prepare_schedule; 2998 frame->prepare = prepare_schedule;
2627
2628 /* to avoid race conditions when a woken-up coro gets terminated */ 2999 /* to avoid race conditions when a woken-up coro gets terminated */
2629 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3000 /* we arrange for a temporary on_destroy that calls adjust (0) */
2630 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3001 frame->destroy = coro_semaphore_destroy;
2631 } 3002 }
2632} 3003}
2633 3004
2634static void 3005static void
2635slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3006slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2643{ 3014{
2644 if (items >= 2) 3015 if (items >= 2)
2645 { 3016 {
2646 /* callback form */ 3017 /* callback form */
2647 AV *av = (AV *)SvRV (arg [0]); 3018 AV *av = (AV *)SvRV (arg [0]);
2648 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3019 SV *cb_cv = s_get_cv_croak (arg [1]);
2649 3020
2650 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3021 av_push (av, SvREFCNT_inc_NN (cb_cv));
2651 3022
2652 if (SvIVX (AvARRAY (av)[0]) > 0) 3023 if (SvIVX (AvARRAY (av)[0]) > 0)
2653 coro_semaphore_adjust (aTHX_ av, 0); 3024 coro_semaphore_adjust (aTHX_ av, 0);
… …
2713{ 3084{
2714 AV *av = (AV *)SvRV (arg [0]); 3085 AV *av = (AV *)SvRV (arg [0]);
2715 3086
2716 if (items >= 2) 3087 if (items >= 2)
2717 { 3088 {
2718 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3089 SV *cb_cv = s_get_cv_croak (arg [1]);
2719 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3090 av_push (av, SvREFCNT_inc_NN (cb_cv));
2720 3091
2721 if (SvIVX (AvARRAY (av)[0])) 3092 if (SvIVX (AvARRAY (av)[0]))
2722 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3093 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2723 3094
2724 frame->prepare = prepare_nop; 3095 frame->prepare = prepare_nop;
2725 frame->check = slf_check_nop; 3096 frame->check = slf_check_nop;
2726 } 3097 }
2727 else if (SvIVX (AvARRAY (av)[0])) 3098 else if (SvIVX (AvARRAY (av)[0]))
… …
2758 3129
2759static void 3130static void
2760coro_aio_callback (pTHX_ CV *cv) 3131coro_aio_callback (pTHX_ CV *cv)
2761{ 3132{
2762 dXSARGS; 3133 dXSARGS;
2763 AV *state = (AV *)GENSUB_ARG; 3134 AV *state = (AV *)S_GENSUB_ARG;
2764 SV *coro = av_pop (state); 3135 SV *coro = av_pop (state);
2765 SV *data_sv = newSV (sizeof (struct io_state)); 3136 SV *data_sv = newSV (sizeof (struct io_state));
2766 3137
2767 av_extend (state, items - 1); 3138 av_extend (state, items - 1);
2768 3139
… …
2804 /* it quickly returns */ 3175 /* it quickly returns */
2805 if (CORO_THROW) 3176 if (CORO_THROW)
2806 return 0; 3177 return 0;
2807 3178
2808 /* one element that is an RV? repeat! */ 3179 /* one element that is an RV? repeat! */
2809 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3180 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2810 return 1; 3181 return 1;
2811 3182
2812 /* restore status */ 3183 /* restore status */
2813 { 3184 {
2814 SV *data_sv = av_pop (state); 3185 SV *data_sv = av_pop (state);
… …
2853 dSP; 3224 dSP;
2854 3225
2855 static SV *prio_cv; 3226 static SV *prio_cv;
2856 static SV *prio_sv; 3227 static SV *prio_sv;
2857 3228
2858 if (expect_false (!prio_cv)) 3229 if (ecb_expect_false (!prio_cv))
2859 { 3230 {
2860 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3231 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2861 prio_sv = newSViv (0); 3232 prio_sv = newSViv (0);
2862 } 3233 }
2863 3234
… …
2882 3253
2883 for (i = 0; i < items; ++i) 3254 for (i = 0; i < items; ++i)
2884 PUSHs (arg [i]); 3255 PUSHs (arg [i]);
2885 3256
2886 /* now push the callback closure */ 3257 /* now push the callback closure */
2887 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3258 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2888 3259
2889 /* now call the AIO function - we assume our request is uncancelable */ 3260 /* now call the AIO function - we assume our request is uncancelable */
2890 PUTBACK; 3261 PUTBACK;
2891 call_sv ((SV *)req, G_VOID | G_DISCARD); 3262 call_sv ((SV *)req, G_VOID | G_DISCARD);
2892 } 3263 }
2893 3264
2894 /* now that the requets is going, we loop toll we have a result */ 3265 /* now that the request is going, we loop till we have a result */
2895 frame->data = (void *)state; 3266 frame->data = (void *)state;
2896 frame->prepare = prepare_schedule; 3267 frame->prepare = prepare_schedule;
2897 frame->check = slf_check_aio_req; 3268 frame->check = slf_check_aio_req;
2898} 3269}
2899 3270
… …
2909 3280
2910/*****************************************************************************/ 3281/*****************************************************************************/
2911 3282
2912#if CORO_CLONE 3283#if CORO_CLONE
2913# include "clone.c" 3284# include "clone.c"
3285#endif
3286
3287/*****************************************************************************/
3288
3289static SV *
3290coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3291{
3292 SV *coro_sv;
3293 struct coro *coro;
3294 MAGIC *mg;
3295 HV *hv;
3296 SV *cb;
3297 int i;
3298
3299 if (argc > 0)
3300 {
3301 cb = s_get_cv_croak (argv [0]);
3302
3303 if (!is_coro)
3304 {
3305 if (CvISXSUB (cb))
3306 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3307
3308 if (!CvROOT (cb))
3309 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3310 }
3311 }
3312
3313 Newz (0, coro, 1, struct coro);
3314 coro->args = newAV ();
3315 coro->flags = CF_NEW;
3316
3317 if (coro_first) coro_first->prev = coro;
3318 coro->next = coro_first;
3319 coro_first = coro;
3320
3321 coro->hv = hv = newHV ();
3322 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3323 mg->mg_flags |= MGf_DUP;
3324 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3325
3326 if (argc > 0)
3327 {
3328 av_extend (coro->args, argc + is_coro - 1);
3329
3330 if (is_coro)
3331 {
3332 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3333 cb = (SV *)cv_coro_run;
3334 }
3335
3336 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3337
3338 for (i = 1; i < argc; i++)
3339 av_push (coro->args, newSVsv (argv [i]));
3340 }
3341
3342 return coro_sv;
3343}
3344
3345#ifndef __cplusplus
3346ecb_cold XS(boot_Coro__State);
3347#endif
3348
3349#if CORO_JIT
3350
3351static void ecb_noinline ecb_cold
3352pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3353{
3354 dSP;
3355 AV *av = newAV ();
3356
3357 av_store (av, 3, newSVuv (d));
3358 av_store (av, 2, newSVuv (c));
3359 av_store (av, 1, newSVuv (b));
3360 av_store (av, 0, newSVuv (a));
3361
3362 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3363
3364 PUTBACK;
3365}
3366
3367static void ecb_noinline ecb_cold
3368jit_init (pTHX)
3369{
3370 dSP;
3371 SV *load, *save;
3372 char *map_base;
3373 char *load_ptr, *save_ptr;
3374 STRLEN load_len, save_len, map_len;
3375 int count;
3376
3377 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3378
3379 PUSHMARK (SP);
3380 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3381 #include "state.h"
3382 count = call_pv ("Coro::State::_jit", G_ARRAY);
3383 SPAGAIN;
3384
3385 save = POPs; save_ptr = SvPVbyte (save, save_len);
3386 load = POPs; load_ptr = SvPVbyte (load, load_len);
3387
3388 map_len = load_len + save_len + 16;
3389
3390 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3391
3392 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3393
3394 load_perl_slots = (load_save_perl_slots_type)map_base;
3395 memcpy (map_base, load_ptr, load_len);
3396
3397 map_base += (load_len + 15) & ~15;
3398
3399 save_perl_slots = (load_save_perl_slots_type)map_base;
3400 memcpy (map_base, save_ptr, save_len);
3401
3402 /* we are good citizens and try to make the page read-only, so the evil evil */
3403 /* hackers might have it a bit more difficult */
3404 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3405
3406 PUTBACK;
3407 eval_pv ("undef &Coro::State::_jit", 1);
3408}
3409
2914#endif 3410#endif
2915 3411
2916MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3412MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2917 3413
2918PROTOTYPES: DISABLE 3414PROTOTYPES: DISABLE
… …
2922#ifdef USE_ITHREADS 3418#ifdef USE_ITHREADS
2923# if CORO_PTHREAD 3419# if CORO_PTHREAD
2924 coro_thx = PERL_GET_CONTEXT; 3420 coro_thx = PERL_GET_CONTEXT;
2925# endif 3421# endif
2926#endif 3422#endif
2927 BOOT_PAGESIZE; 3423 /* perl defines these to check for existance first, but why it doesn't */
3424 /* just create them one at init time is not clear to me, except for */
3425 /* programs trying to delete them, but... */
3426 /* anyway, we declare this as invalid and make sure they are initialised here */
3427 DEFSV;
3428 ERRSV;
2928 3429
2929 cctx_current = cctx_new_empty (); 3430 cctx_current = cctx_new_empty ();
2930 3431
2931 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3432 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2932 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3433 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2972 coroapi.prepare_nop = prepare_nop; 3473 coroapi.prepare_nop = prepare_nop;
2973 coroapi.prepare_schedule = prepare_schedule; 3474 coroapi.prepare_schedule = prepare_schedule;
2974 coroapi.prepare_cede = prepare_cede; 3475 coroapi.prepare_cede = prepare_cede;
2975 coroapi.prepare_cede_notself = prepare_cede_notself; 3476 coroapi.prepare_cede_notself = prepare_cede_notself;
2976 3477
2977 { 3478 time_init (aTHX);
2978 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2979
2980 if (!svp) croak ("Time::HiRes is required");
2981 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2982
2983 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2984 }
2985 3479
2986 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3480 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3481#if CORO_JIT
3482 PUTBACK;
3483 jit_init (aTHX);
3484 SPAGAIN;
3485#endif
2987} 3486}
2988 3487
2989SV * 3488SV *
2990new (char *klass, ...) 3489new (SV *klass, ...)
2991 ALIAS: 3490 ALIAS:
2992 Coro::new = 1 3491 Coro::new = 1
2993 CODE: 3492 CODE:
2994{ 3493 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2995 struct coro *coro; 3494 OUTPUT:
2996 MAGIC *mg;
2997 HV *hv;
2998 CV *cb;
2999 int i;
3000
3001 if (items > 1)
3002 {
3003 cb = coro_sv_2cv (aTHX_ ST (1));
3004
3005 if (!ix)
3006 {
3007 if (CvISXSUB (cb))
3008 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3009
3010 if (!CvROOT (cb))
3011 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3012 }
3013 }
3014
3015 Newz (0, coro, 1, struct coro);
3016 coro->args = newAV ();
3017 coro->flags = CF_NEW;
3018
3019 if (coro_first) coro_first->prev = coro;
3020 coro->next = coro_first;
3021 coro_first = coro;
3022
3023 coro->hv = hv = newHV ();
3024 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3025 mg->mg_flags |= MGf_DUP;
3026 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3027
3028 if (items > 1)
3029 {
3030 av_extend (coro->args, items - 1 + ix - 1);
3031
3032 if (ix)
3033 {
3034 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3035 cb = cv_coro_run;
3036 }
3037
3038 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3039
3040 for (i = 2; i < items; i++)
3041 av_push (coro->args, newSVsv (ST (i)));
3042 }
3043}
3044 OUTPUT:
3045 RETVAL 3495 RETVAL
3046 3496
3047void 3497void
3048transfer (...) 3498transfer (...)
3049 PROTOTYPE: $$ 3499 PROTOTYPE: $$
3050 CODE: 3500 CODE:
3051 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3501 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3052
3053bool
3054_destroy (SV *coro_sv)
3055 CODE:
3056 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3057 OUTPUT:
3058 RETVAL
3059
3060void
3061_exit (int code)
3062 PROTOTYPE: $
3063 CODE:
3064 _exit (code);
3065 3502
3066SV * 3503SV *
3067clone (Coro::State coro) 3504clone (Coro::State coro)
3068 CODE: 3505 CODE:
3069{ 3506{
… …
3124void 3561void
3125list () 3562list ()
3126 PROTOTYPE: 3563 PROTOTYPE:
3127 PPCODE: 3564 PPCODE:
3128{ 3565{
3129 struct coro *coro; 3566 struct coro *coro;
3130 for (coro = coro_first; coro; coro = coro->next) 3567 for (coro = coro_first; coro; coro = coro->next)
3131 if (coro->hv) 3568 if (coro->hv)
3132 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3569 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3133} 3570}
3134 3571
… …
3139 CODE: 3576 CODE:
3140{ 3577{
3141 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3578 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3142 { 3579 {
3143 struct coro *current = SvSTATE_current; 3580 struct coro *current = SvSTATE_current;
3581 struct CoroSLF slf_save;
3144 3582
3145 if (current != coro) 3583 if (current != coro)
3146 { 3584 {
3147 PUTBACK; 3585 PUTBACK;
3148 save_perl (aTHX_ current); 3586 save_perl (aTHX_ current);
3149 load_perl (aTHX_ coro); 3587 load_perl (aTHX_ coro);
3588 /* the coro is most likely in an active SLF call.
3589 * while not strictly required (the code we execute is
3590 * not allowed to call any SLF functions), it's cleaner
3591 * to reinitialise the slf_frame and restore it later.
3592 * This might one day allow us to actually do SLF calls
3593 * from code executed here.
3594 */
3595 slf_save = slf_frame;
3596 slf_frame.prepare = 0;
3150 SPAGAIN; 3597 SPAGAIN;
3151 } 3598 }
3152 3599
3153 PUSHSTACK; 3600 PUSHSTACK;
3154 3601
… …
3164 SPAGAIN; 3611 SPAGAIN;
3165 3612
3166 if (current != coro) 3613 if (current != coro)
3167 { 3614 {
3168 PUTBACK; 3615 PUTBACK;
3616 slf_frame = slf_save;
3169 save_perl (aTHX_ coro); 3617 save_perl (aTHX_ coro);
3170 load_perl (aTHX_ current); 3618 load_perl (aTHX_ current);
3171 SPAGAIN; 3619 SPAGAIN;
3172 } 3620 }
3173 } 3621 }
… …
3178 PROTOTYPE: $ 3626 PROTOTYPE: $
3179 ALIAS: 3627 ALIAS:
3180 is_ready = CF_READY 3628 is_ready = CF_READY
3181 is_running = CF_RUNNING 3629 is_running = CF_RUNNING
3182 is_new = CF_NEW 3630 is_new = CF_NEW
3183 is_destroyed = CF_DESTROYED 3631 is_destroyed = CF_ZOMBIE
3632 is_zombie = CF_ZOMBIE
3184 is_suspended = CF_SUSPENDED 3633 is_suspended = CF_SUSPENDED
3185 CODE: 3634 CODE:
3186 RETVAL = boolSV (coro->flags & ix); 3635 RETVAL = boolSV (coro->flags & ix);
3187 OUTPUT: 3636 OUTPUT:
3188 RETVAL 3637 RETVAL
3189 3638
3190void 3639void
3191throw (Coro::State self, SV *throw = &PL_sv_undef) 3640throw (SV *self, SV *exception = &PL_sv_undef)
3192 PROTOTYPE: $;$ 3641 PROTOTYPE: $;$
3193 CODE: 3642 CODE:
3194{ 3643{
3644 struct coro *coro = SvSTATE (self);
3195 struct coro *current = SvSTATE_current; 3645 struct coro *current = SvSTATE_current;
3196 SV **throwp = self == current ? &CORO_THROW : &self->except; 3646 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3197 SvREFCNT_dec (*throwp); 3647 SvREFCNT_dec (*exceptionp);
3198 SvGETMAGIC (throw); 3648 SvGETMAGIC (exception);
3199 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3649 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3650
3651 api_ready (aTHX_ self);
3200} 3652}
3201 3653
3202void 3654void
3203api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3655api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3204 PROTOTYPE: $;$ 3656 PROTOTYPE: $;$
… …
3259 3711
3260void 3712void
3261cancel (Coro::State self) 3713cancel (Coro::State self)
3262 CODE: 3714 CODE:
3263 coro_state_destroy (aTHX_ self); 3715 coro_state_destroy (aTHX_ self);
3264 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3716
3717SV *
3718enable_times (int enabled = enable_times)
3719 CODE:
3720{
3721 RETVAL = boolSV (enable_times);
3722
3723 if (enabled != enable_times)
3724 {
3725 enable_times = enabled;
3726
3727 coro_times_update ();
3728 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3729 }
3730}
3731 OUTPUT:
3732 RETVAL
3733
3734void
3735times (Coro::State self)
3736 PPCODE:
3737{
3738 struct coro *current = SvSTATE (coro_current);
3739
3740 if (ecb_expect_false (current == self))
3741 {
3742 coro_times_update ();
3743 coro_times_add (SvSTATE (coro_current));
3744 }
3745
3746 EXTEND (SP, 2);
3747 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3748 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3749
3750 if (ecb_expect_false (current == self))
3751 coro_times_sub (SvSTATE (coro_current));
3752}
3753
3754void
3755swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3756 CODE:
3757{
3758 struct coro *current = SvSTATE_current;
3759
3760 if (current == coro)
3761 SWAP_SVS (current);
3762
3763 if (!coro->swap_sv)
3764 coro->swap_sv = newAV ();
3765
3766 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3767 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3768
3769 if (current == coro)
3770 SWAP_SVS (current);
3771}
3265 3772
3266 3773
3267MODULE = Coro::State PACKAGE = Coro 3774MODULE = Coro::State PACKAGE = Coro
3268 3775
3269BOOT: 3776BOOT:
3270{ 3777{
3271 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3778 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3272 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3779 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3273 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3780 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3274 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3275 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3781 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3276 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3782 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3277 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3783 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3278 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3784 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3279 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3785 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3280 3786
3281 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3787 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3282 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3788 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3283 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3789 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3284 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3790 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3285 3791
3286 coro_stash = gv_stashpv ("Coro", TRUE); 3792 coro_stash = gv_stashpv ("Coro", TRUE);
3287 3793
3288 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3794 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3289 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3795 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
… …
3308 sv_setiv (sv, (IV)&coroapi); 3814 sv_setiv (sv, (IV)&coroapi);
3309 SvREADONLY_on (sv); 3815 SvREADONLY_on (sv);
3310 } 3816 }
3311} 3817}
3312 3818
3819SV *
3820async (...)
3821 PROTOTYPE: &@
3822 CODE:
3823 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3824 api_ready (aTHX_ RETVAL);
3825 OUTPUT:
3826 RETVAL
3827
3828void
3829_destroy (Coro::State coro)
3830 CODE:
3831 /* used by the manager thread */
3832 coro_state_destroy (aTHX_ coro);
3833
3834void
3835on_destroy (Coro::State coro, SV *cb)
3836 CODE:
3837 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3838
3839void
3840join (...)
3841 CODE:
3842 CORO_EXECUTE_SLF_XS (slf_init_join);
3843
3313void 3844void
3314terminate (...) 3845terminate (...)
3315 CODE: 3846 CODE:
3316 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3847 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3848
3849void
3850cancel (...)
3851 CODE:
3852 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3853
3854int
3855safe_cancel (Coro::State self, ...)
3856 C_ARGS: aTHX_ self, &ST (1), items - 1
3317 3857
3318void 3858void
3319schedule (...) 3859schedule (...)
3320 CODE: 3860 CODE:
3321 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3861 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3351_set_readyhook (SV *hook) 3891_set_readyhook (SV *hook)
3352 PROTOTYPE: $ 3892 PROTOTYPE: $
3353 CODE: 3893 CODE:
3354 SvREFCNT_dec (coro_readyhook); 3894 SvREFCNT_dec (coro_readyhook);
3355 SvGETMAGIC (hook); 3895 SvGETMAGIC (hook);
3896 if (SvOK (hook))
3897 {
3356 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3898 coro_readyhook = newSVsv (hook);
3899 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3900 }
3901 else
3902 {
3903 coro_readyhook = 0;
3904 CORO_READYHOOK = 0;
3905 }
3357 3906
3358int 3907int
3359prio (Coro::State coro, int newprio = 0) 3908prio (Coro::State coro, int newprio = 0)
3360 PROTOTYPE: $;$ 3909 PROTOTYPE: $;$
3361 ALIAS: 3910 ALIAS:
… …
3367 if (items > 1) 3916 if (items > 1)
3368 { 3917 {
3369 if (ix) 3918 if (ix)
3370 newprio = coro->prio - newprio; 3919 newprio = coro->prio - newprio;
3371 3920
3372 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3921 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3373 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3922 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3374 3923
3375 coro->prio = newprio; 3924 coro->prio = newprio;
3376 } 3925 }
3377} 3926}
3378 OUTPUT: 3927 OUTPUT:
… …
3425 for (i = 1; i < items; ++i) 3974 for (i = 1; i < items; ++i)
3426 av_push (av, SvREFCNT_inc_NN (ST (i))); 3975 av_push (av, SvREFCNT_inc_NN (ST (i)));
3427 3976
3428 if ((SV *)hv == &PL_sv_undef) 3977 if ((SV *)hv == &PL_sv_undef)
3429 { 3978 {
3430 PUSHMARK (SP); 3979 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3431 EXTEND (SP, 2);
3432 PUSHs (sv_Coro);
3433 PUSHs ((SV *)cv_pool_handler);
3434 PUTBACK;
3435 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3436 SPAGAIN;
3437
3438 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3980 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3981 SvREFCNT_dec (sv);
3439 } 3982 }
3440 3983
3441 { 3984 {
3442 struct coro *coro = SvSTATE_hv (hv); 3985 struct coro *coro = SvSTATE_hv (hv);
3443 3986
… …
3475 on_leave = 1 4018 on_leave = 1
3476 PROTOTYPE: & 4019 PROTOTYPE: &
3477 CODE: 4020 CODE:
3478{ 4021{
3479 struct coro *coro = SvSTATE_current; 4022 struct coro *coro = SvSTATE_current;
3480 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4023 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3481 4024
3482 block = (SV *)coro_sv_2cv (aTHX_ block); 4025 block = s_get_cv_croak (block);
3483 4026
3484 if (!*avp) 4027 if (!*avp)
3485 *avp = newAV (); 4028 *avp = newAV ();
3486 4029
3487 av_push (*avp, SvREFCNT_inc (block)); 4030 av_push (*avp, SvREFCNT_inc (block));
… …
3505 4048
3506SV * 4049SV *
3507new (SV *klass, SV *count = 0) 4050new (SV *klass, SV *count = 0)
3508 CODE: 4051 CODE:
3509{ 4052{
3510 int semcnt = 1; 4053 int semcnt = 1;
3511 4054
3512 if (count) 4055 if (count)
3513 { 4056 {
3514 SvGETMAGIC (count); 4057 SvGETMAGIC (count);
3515 4058
… …
3575 XSRETURN_NO; 4118 XSRETURN_NO;
3576} 4119}
3577 4120
3578void 4121void
3579waiters (SV *self) 4122waiters (SV *self)
3580 PPCODE: 4123 PPCODE:
3581{ 4124{
3582 AV *av = (AV *)SvRV (self); 4125 AV *av = (AV *)SvRV (self);
3583 int wcount = AvFILLp (av) + 1 - 1; 4126 int wcount = AvFILLp (av) + 1 - 1;
3584 4127
3585 if (GIMME_V == G_SCALAR) 4128 if (GIMME_V == G_SCALAR)
… …
3594} 4137}
3595 4138
3596MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4139MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3597 4140
3598void 4141void
3599_may_delete (SV *sem, int count, int extra_refs) 4142_may_delete (SV *sem, int count, unsigned int extra_refs)
3600 PPCODE: 4143 PPCODE:
3601{ 4144{
3602 AV *av = (AV *)SvRV (sem); 4145 AV *av = (AV *)SvRV (sem);
3603 4146
3604 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4147 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3605 && AvFILLp (av) == 0 /* no waiters, just count */ 4148 && AvFILLp (av) == 0 /* no waiters, just count */
3606 && SvIV (AvARRAY (av)[0]) == count) 4149 && SvIV (AvARRAY (av)[0]) == count)
3607 XSRETURN_YES; 4150 XSRETURN_YES;
… …
3628 4171
3629void 4172void
3630broadcast (SV *self) 4173broadcast (SV *self)
3631 CODE: 4174 CODE:
3632{ 4175{
3633 AV *av = (AV *)SvRV (self); 4176 AV *av = (AV *)SvRV (self);
3634 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4177 coro_signal_wake (aTHX_ av, AvFILLp (av));
3635} 4178}
3636 4179
3637void 4180void
3638send (SV *self) 4181send (SV *self)
… …
3646 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4189 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3647} 4190}
3648 4191
3649IV 4192IV
3650awaited (SV *self) 4193awaited (SV *self)
3651 CODE: 4194 CODE:
3652 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4195 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3653 OUTPUT: 4196 OUTPUT:
3654 RETVAL 4197 RETVAL
3655 4198
3656 4199
… …
3661 4204
3662void 4205void
3663_schedule (...) 4206_schedule (...)
3664 CODE: 4207 CODE:
3665{ 4208{
3666 static int incede; 4209 static int incede;
3667 4210
3668 api_cede_notself (aTHX); 4211 api_cede_notself (aTHX);
3669 4212
3670 ++incede; 4213 ++incede;
3671 while (coro_nready >= incede && api_cede (aTHX)) 4214 while (coro_nready >= incede && api_cede (aTHX))
… …
3687 4230
3688void 4231void
3689_register (char *target, char *proto, SV *req) 4232_register (char *target, char *proto, SV *req)
3690 CODE: 4233 CODE:
3691{ 4234{
3692 CV *req_cv = coro_sv_2cv (aTHX_ req); 4235 SV *req_cv = s_get_cv_croak (req);
3693 /* newXSproto doesn't return the CV on 5.8 */ 4236 /* newXSproto doesn't return the CV on 5.8 */
3694 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4237 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3695 sv_setpv ((SV *)slf_cv, proto); 4238 sv_setpv ((SV *)slf_cv, proto);
3696 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4239 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3697} 4240}
3698 4241
4242MODULE = Coro::State PACKAGE = Coro::Select
4243
4244void
4245patch_pp_sselect ()
4246 CODE:
4247 if (!coro_old_pp_sselect)
4248 {
4249 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4250 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4251 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4252 }
4253
4254void
4255unpatch_pp_sselect ()
4256 CODE:
4257 if (coro_old_pp_sselect)
4258 {
4259 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4260 coro_old_pp_sselect = 0;
4261 }
4262
4263MODULE = Coro::State PACKAGE = Coro::Util
4264
4265void
4266_exit (int code)
4267 CODE:
4268 _exit (code);
4269
4270NV
4271time ()
4272 CODE:
4273 RETVAL = nvtime (aTHX);
4274 OUTPUT:
4275 RETVAL
4276
4277NV
4278gettimeofday ()
4279 PPCODE:
4280{
4281 UV tv [2];
4282 u2time (aTHX_ tv);
4283 EXTEND (SP, 2);
4284 PUSHs (sv_2mortal (newSVuv (tv [0])));
4285 PUSHs (sv_2mortal (newSVuv (tv [1])));
4286}
4287

Diff Legend

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