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

Diff Legend

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