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.362 by root, Wed Jul 1 07:58:45 2009 UTC vs.
Revision 1.438 by root, Mon Nov 18 10:27:53 2013 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
12 17
18#define ECB_NO_THREADS 1
19#include "ecb.h"
20
21#include <stddef.h>
13#include <stdio.h> 22#include <stdio.h>
14#include <errno.h> 23#include <errno.h>
15#include <assert.h> 24#include <assert.h>
16 25
17#ifdef WIN32 26#ifndef SVs_PADSTALE
27# define SVs_PADSTALE 0
28#endif
29
30#ifdef PadARRAY
31# define NEWPADAPI 1
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else
34typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST;
37typedef AV PAD;
38# endif
39# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
40# define PadlistMAX(pl) AvFILLp (pl)
41# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY
43# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif
46
47/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
48/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
49#if PERL_VERSION_ATLEAST(5,19,0)
50# define SVt_BIND SVt_IV
51#endif
52
53#if defined(_WIN32)
54# undef HAS_GETTIMEOFDAY
18# undef setjmp 55# undef setjmp
19# undef longjmp 56# undef longjmp
20# undef _exit 57# undef _exit
21# define setjmp _setjmp /* deep magic */ 58# define setjmp _setjmp /* deep magic */
22#else 59#else
23# include <inttypes.h> /* most portable stdint.h */ 60# include <inttypes.h> /* most portable stdint.h */
24#endif 61#endif
25 62
26#ifdef HAVE_MMAP
27# include <unistd.h>
28# include <sys/mman.h>
29# ifndef MAP_ANONYMOUS
30# ifdef MAP_ANON
31# define MAP_ANONYMOUS MAP_ANON
32# else
33# undef HAVE_MMAP
34# endif
35# endif
36# include <limits.h>
37# ifndef PAGESIZE
38# define PAGESIZE pagesize
39# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
40static long pagesize;
41# else
42# define BOOT_PAGESIZE (void)0
43# endif
44#else
45# define PAGESIZE 0
46# define BOOT_PAGESIZE (void)0
47#endif
48
49#if CORO_USE_VALGRIND
50# include <valgrind/valgrind.h>
51#endif
52
53/* the maximum number of idle cctx that will be pooled */ 63/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 64static int cctx_max_idle = 4;
55 65
56#define PERL_VERSION_ATLEAST(a,b,c) \ 66#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57 (PERL_REVISION > (a) \ 67# define HAS_SCOPESTACK_NAME 1
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD
117#endif
118
119#ifndef CORO_STACKGUARD
120# define CORO_STACKGUARD 0
121#endif 68#endif
122 69
123/* prefer perl internal functions over our own? */ 70/* prefer perl internal functions over our own? */
124#ifndef CORO_PREFER_PERL_FUNCTIONS 71#ifndef CORO_PREFER_PERL_FUNCTIONS
125# define CORO_PREFER_PERL_FUNCTIONS 0 72# define CORO_PREFER_PERL_FUNCTIONS 0
… …
135# define STACKLEVEL ((void *)&stacklevel) 82# define STACKLEVEL ((void *)&stacklevel)
136#endif 83#endif
137 84
138#define IN_DESTRUCT PL_dirty 85#define IN_DESTRUCT PL_dirty
139 86
140#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline
144#else
145# define attribute(x)
146# define expect(expr,value) (expr)
147# define INLINE static
148#endif
149
150#define expect_false(expr) expect ((expr) != 0, 0)
151#define expect_true(expr) expect ((expr) != 0, 1)
152
153#define NOINLINE attribute ((noinline))
154
155#include "CoroAPI.h" 87#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */ 88#define GCoroAPI (&coroapi) /* very sneaky */
157 89
158#ifdef USE_ITHREADS 90#ifdef USE_ITHREADS
159# if CORO_PTHREAD 91# if CORO_PTHREAD
… …
175static void (*u2time)(pTHX_ UV ret[2]); 107static void (*u2time)(pTHX_ UV ret[2]);
176 108
177/* we hijack an hopefully unused CV flag for our purposes */ 109/* we hijack an hopefully unused CV flag for our purposes */
178#define CVf_SLF 0x4000 110#define CVf_SLF 0x4000
179static OP *pp_slf (pTHX); 111static OP *pp_slf (pTHX);
112static void slf_destroy (pTHX_ struct coro *coro);
180 113
181static U32 cctx_gen; 114static U32 cctx_gen;
182static size_t cctx_stacksize = CORO_STACKSIZE; 115static size_t cctx_stacksize = CORO_STACKSIZE;
183static struct CoroAPI coroapi; 116static struct CoroAPI coroapi;
184static AV *main_mainstack; /* used to differentiate between $main and others */ 117static AV *main_mainstack; /* used to differentiate between $main and others */
… …
201static SV *sv_pool_size; 134static SV *sv_pool_size;
202static SV *sv_async_pool_idle; /* description string */ 135static SV *sv_async_pool_idle; /* description string */
203static AV *av_async_pool; /* idle pool */ 136static AV *av_async_pool; /* idle pool */
204static SV *sv_Coro; /* class string */ 137static SV *sv_Coro; /* class string */
205static CV *cv_pool_handler; 138static CV *cv_pool_handler;
206static CV *cv_coro_state_new;
207 139
208/* Coro::AnyEvent */ 140/* Coro::AnyEvent */
209static SV *sv_activity; 141static SV *sv_activity;
210 142
211/* enable processtime/realtime profiling */ 143/* enable processtime/realtime profiling */
… …
215static char times_valid; 147static char times_valid;
216 148
217static struct coro_cctx *cctx_first; 149static struct coro_cctx *cctx_first;
218static int cctx_count, cctx_idle; 150static int cctx_count, cctx_idle;
219 151
220enum { 152enum
153{
221 CC_MAPPED = 0x01, 154 CC_MAPPED = 0x01,
222 CC_NOREUSE = 0x02, /* throw this away after tracing */ 155 CC_NOREUSE = 0x02, /* throw this away after tracing */
223 CC_TRACE = 0x04, 156 CC_TRACE = 0x04,
224 CC_TRACE_SUB = 0x08, /* trace sub calls */ 157 CC_TRACE_SUB = 0x08, /* trace sub calls */
225 CC_TRACE_LINE = 0x10, /* trace each statement */ 158 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
230typedef struct coro_cctx 163typedef struct coro_cctx
231{ 164{
232 struct coro_cctx *next; 165 struct coro_cctx *next;
233 166
234 /* the stack */ 167 /* the stack */
235 void *sptr; 168 struct coro_stack stack;
236 size_t ssize;
237 169
238 /* cpu state */ 170 /* cpu state */
239 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 171 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
172#ifndef NDEBUG
240 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 173 JMPENV *idle_te; /* same as idle_sp, but for top_env */
174#endif
241 JMPENV *top_env; 175 JMPENV *top_env;
242 coro_context cctx; 176 coro_context cctx;
243 177
244 U32 gen; 178 U32 gen;
245#if CORO_USE_VALGRIND 179#if CORO_USE_VALGRIND
246 int valgrind_id; 180 int valgrind_id;
247#endif 181#endif
248 unsigned char flags; 182 unsigned char flags;
249} coro_cctx; 183} coro_cctx;
250 184
251coro_cctx *cctx_current; /* the currently running cctx */ 185static coro_cctx *cctx_current; /* the currently running cctx */
252 186
253/*****************************************************************************/ 187/*****************************************************************************/
254 188
189static MGVTBL coro_state_vtbl;
190
255enum { 191enum
192{
256 CF_RUNNING = 0x0001, /* coroutine is running */ 193 CF_RUNNING = 0x0001, /* coroutine is running */
257 CF_READY = 0x0002, /* coroutine is ready */ 194 CF_READY = 0x0002, /* coroutine is ready */
258 CF_NEW = 0x0004, /* has never been switched to */ 195 CF_NEW = 0x0004, /* has never been switched to */
259 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 196 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
260 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 197 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
198 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
261}; 199};
262 200
263/* the structure where most of the perl state is stored, overlaid on the cxstack */ 201/* the structure where most of the perl state is stored, overlaid on the cxstack */
264typedef struct 202typedef struct
265{ 203{
266 SV *defsv;
267 AV *defav;
268 SV *errsv;
269 SV *irsgv;
270 HV *hinthv;
271#define VAR(name,type) type name; 204 #define VARx(name,expr,type) type name;
272# include "state.h" 205 #include "state.h"
273#undef VAR
274} perl_slots; 206} perl_slots;
275 207
208/* how many context stack entries do we need for perl_slots */
276#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 209#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
277 210
278/* this is a structure representing a perl-level coroutine */ 211/* this is a structure representing a perl-level coroutine */
279struct coro { 212struct coro
213{
280 /* the C coroutine allocated to this perl coroutine, if any */ 214 /* the C coroutine allocated to this perl coroutine, if any */
281 coro_cctx *cctx; 215 coro_cctx *cctx;
282 216
283 /* ready queue */ 217 /* ready queue */
284 struct coro *next_ready; 218 struct coro *next_ready;
… …
286 /* state data */ 220 /* state data */
287 struct CoroSLF slf_frame; /* saved slf frame */ 221 struct CoroSLF slf_frame; /* saved slf frame */
288 AV *mainstack; 222 AV *mainstack;
289 perl_slots *slot; /* basically the saved sp */ 223 perl_slots *slot; /* basically the saved sp */
290 224
291 CV *startcv; /* the CV to execute */ 225 CV *startcv; /* the CV to execute */
292 AV *args; /* data associated with this coroutine (initial args) */ 226 AV *args; /* data associated with this coroutine (initial args) */
293 int refcnt; /* coroutines are refcounted, yes */
294 int flags; /* CF_ flags */ 227 int flags; /* CF_ flags */
295 HV *hv; /* the perl hash associated with this coro, if any */ 228 HV *hv; /* the perl hash associated with this coro, if any */
296 void (*on_destroy)(pTHX_ struct coro *coro);
297 229
298 /* statistics */ 230 /* statistics */
299 int usecount; /* number of transfers to this coro */ 231 int usecount; /* number of transfers to this coro */
300 232
301 /* coro process data */ 233 /* coro process data */
302 int prio; 234 int prio;
303 SV *except; /* exception to be thrown */ 235 SV *except; /* exception to be thrown */
304 SV *rouse_cb; 236 SV *rouse_cb; /* last rouse callback */
237 AV *on_destroy; /* callbacks or coros to notify on destroy */
238 AV *status; /* the exit status list */
305 239
306 /* async_pool */ 240 /* async_pool */
307 SV *saved_deffh; 241 SV *saved_deffh;
308 SV *invoke_cb; 242 SV *invoke_cb;
309 AV *invoke_av; 243 AV *invoke_av;
310 244
311 /* on_enter/on_leave */ 245 /* on_enter/on_leave */
312 AV *on_enter; 246 AV *on_enter;
313 AV *on_leave; 247 AV *on_leave;
314 248
249 /* swap_sv */
250 AV *swap_sv;
251
315 /* times */ 252 /* times */
316 coro_ts t_cpu, t_real; 253 coro_ts t_cpu, t_real;
317 254
318 /* linked list */ 255 /* linked list */
319 struct coro *next, *prev; 256 struct coro *next, *prev;
… …
322typedef struct coro *Coro__State; 259typedef struct coro *Coro__State;
323typedef struct coro *Coro__State_or_hashref; 260typedef struct coro *Coro__State_or_hashref;
324 261
325/* the following variables are effectively part of the perl context */ 262/* the following variables are effectively part of the perl context */
326/* and get copied between struct coro and these variables */ 263/* and get copied between struct coro and these variables */
327/* the mainr easonw e don't support windows process emulation */ 264/* the main reason we don't support windows process emulation */
328static struct CoroSLF slf_frame; /* the current slf frame */ 265static struct CoroSLF slf_frame; /* the current slf frame */
329 266
330/** Coro ********************************************************************/ 267/** Coro ********************************************************************/
331 268
332#define CORO_PRIO_MAX 3 269#define CORO_PRIO_MAX 3
… …
338 275
339/* for Coro.pm */ 276/* for Coro.pm */
340static SV *coro_current; 277static SV *coro_current;
341static SV *coro_readyhook; 278static SV *coro_readyhook;
342static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 279static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
343static CV *cv_coro_run, *cv_coro_terminate; 280static CV *cv_coro_run;
344static struct coro *coro_first; 281static struct coro *coro_first;
345#define coro_nready coroapi.nready 282#define coro_nready coroapi.nready
346 283
284/** JIT *********************************************************************/
285
286#if CORO_JIT
287 /* APPLE doesn't have mmap though */
288 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
289 #ifndef CORO_JIT_TYPE
290 #if ECB_AMD64 && CORO_JIT_UNIXY
291 #define CORO_JIT_TYPE "amd64-unix"
292 #elif __i386 && CORO_JIT_UNIXY
293 #define CORO_JIT_TYPE "x86-unix"
294 #endif
295 #endif
296#endif
297
298#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
299 #undef CORO_JIT
300#endif
301
302#if CORO_JIT
303 typedef void (*load_save_perl_slots_type)(perl_slots *);
304 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
305#endif
306
307/** Coro::Select ************************************************************/
308
309static OP *(*coro_old_pp_sselect) (pTHX);
310static SV *coro_select_select;
311
312/* horrible hack, but if it works... */
313static OP *
314coro_pp_sselect (pTHX)
315{
316 dSP;
317 PUSHMARK (SP - 4); /* fake argument list */
318 XPUSHs (coro_select_select);
319 PUTBACK;
320
321 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
322 PL_op->op_flags |= OPf_STACKED;
323 PL_op->op_private = 0;
324 return PL_ppaddr [OP_ENTERSUB](aTHX);
325}
326
327/** time stuff **************************************************************/
328
329#ifdef HAS_GETTIMEOFDAY
330
331ecb_inline void
332coro_u2time (pTHX_ UV ret[2])
333{
334 struct timeval tv;
335 gettimeofday (&tv, 0);
336
337 ret [0] = tv.tv_sec;
338 ret [1] = tv.tv_usec;
339}
340
341ecb_inline double
342coro_nvtime (void)
343{
344 struct timeval tv;
345 gettimeofday (&tv, 0);
346
347 return tv.tv_sec + tv.tv_usec * 1e-6;
348}
349
350ecb_inline void
351time_init (pTHX)
352{
353 nvtime = coro_nvtime;
354 u2time = coro_u2time;
355}
356
357#else
358
359ecb_inline void
360time_init (pTHX)
361{
362 SV **svp;
363
364 require_pv ("Time/HiRes.pm");
365
366 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
367
368 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
369 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
370
371 nvtime = INT2PTR (double (*)(), SvIV (*svp));
372
373 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
374 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
375}
376
377#endif
378
347/** lowlevel stuff **********************************************************/ 379/** lowlevel stuff **********************************************************/
348 380
349static SV * 381static SV * ecb_noinline
350coro_get_sv (pTHX_ const char *name, int create) 382coro_get_sv (pTHX_ const char *name, int create)
351{ 383{
352#if PERL_VERSION_ATLEAST (5,10,0) 384#if PERL_VERSION_ATLEAST (5,10,0)
353 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 385 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
354 get_sv (name, create); 386 get_sv (name, create);
355#endif 387#endif
356 return get_sv (name, create); 388 return get_sv (name, create);
357} 389}
358 390
359static AV * 391static AV * ecb_noinline
360coro_get_av (pTHX_ const char *name, int create) 392coro_get_av (pTHX_ const char *name, int create)
361{ 393{
362#if PERL_VERSION_ATLEAST (5,10,0) 394#if PERL_VERSION_ATLEAST (5,10,0)
363 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 395 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
364 get_av (name, create); 396 get_av (name, create);
365#endif 397#endif
366 return get_av (name, create); 398 return get_av (name, create);
367} 399}
368 400
369static HV * 401static HV * ecb_noinline
370coro_get_hv (pTHX_ const char *name, int create) 402coro_get_hv (pTHX_ const char *name, int create)
371{ 403{
372#if PERL_VERSION_ATLEAST (5,10,0) 404#if PERL_VERSION_ATLEAST (5,10,0)
373 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 405 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
374 get_hv (name, create); 406 get_hv (name, create);
375#endif 407#endif
376 return get_hv (name, create); 408 return get_hv (name, create);
377} 409}
378 410
379/* may croak */ 411ecb_inline void
380INLINE CV *
381coro_sv_2cv (pTHX_ SV *sv)
382{
383 HV *st;
384 GV *gvp;
385 CV *cv = sv_2cv (sv, &st, &gvp, 0);
386
387 if (!cv)
388 croak ("code reference expected");
389
390 return cv;
391}
392
393INLINE void
394coro_times_update () 412coro_times_update (void)
395{ 413{
396#ifdef coro_clock_gettime 414#ifdef coro_clock_gettime
397 struct timespec ts; 415 struct timespec ts;
398 416
399 ts.tv_sec = ts.tv_nsec = 0; 417 ts.tv_sec = ts.tv_nsec = 0;
… …
411 time_real [0] = tv [0]; 429 time_real [0] = tv [0];
412 time_real [1] = tv [1] * 1000; 430 time_real [1] = tv [1] * 1000;
413#endif 431#endif
414} 432}
415 433
416INLINE void 434ecb_inline void
417coro_times_add (struct coro *c) 435coro_times_add (struct coro *c)
418{ 436{
419 c->t_real [1] += time_real [1]; 437 c->t_real [1] += time_real [1];
420 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 438 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
421 c->t_real [0] += time_real [0]; 439 c->t_real [0] += time_real [0];
… …
423 c->t_cpu [1] += time_cpu [1]; 441 c->t_cpu [1] += time_cpu [1];
424 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 442 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
425 c->t_cpu [0] += time_cpu [0]; 443 c->t_cpu [0] += time_cpu [0];
426} 444}
427 445
428INLINE void 446ecb_inline void
429coro_times_sub (struct coro *c) 447coro_times_sub (struct coro *c)
430{ 448{
431 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 449 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
432 c->t_real [1] -= time_real [1]; 450 c->t_real [1] -= time_real [1];
433 c->t_real [0] -= time_real [0]; 451 c->t_real [0] -= time_real [0];
… …
441/* magic glue */ 459/* magic glue */
442 460
443#define CORO_MAGIC_type_cv 26 461#define CORO_MAGIC_type_cv 26
444#define CORO_MAGIC_type_state PERL_MAGIC_ext 462#define CORO_MAGIC_type_state PERL_MAGIC_ext
445 463
446#define CORO_MAGIC_NN(sv, type) \ 464#define CORO_MAGIC_NN(sv, type) \
447 (expect_true (SvMAGIC (sv)->mg_type == type) \ 465 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
448 ? SvMAGIC (sv) \ 466 ? SvMAGIC (sv) \
449 : mg_find (sv, type)) 467 : mg_find (sv, type))
450 468
451#define CORO_MAGIC(sv, type) \ 469#define CORO_MAGIC(sv, type) \
452 (expect_true (SvMAGIC (sv)) \ 470 (ecb_expect_true (SvMAGIC (sv)) \
453 ? CORO_MAGIC_NN (sv, type) \ 471 ? CORO_MAGIC_NN (sv, type) \
454 : 0) 472 : 0)
455 473
456#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 474#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
457#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 475#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
458 476
459INLINE struct coro * 477ecb_inline MAGIC *
478SvSTATEhv_p (pTHX_ SV *coro)
479{
480 MAGIC *mg;
481
482 if (ecb_expect_true (
483 SvTYPE (coro) == SVt_PVHV
484 && (mg = CORO_MAGIC_state (coro))
485 && mg->mg_virtual == &coro_state_vtbl
486 ))
487 return mg;
488
489 return 0;
490}
491
492ecb_inline struct coro *
460SvSTATE_ (pTHX_ SV *coro) 493SvSTATE_ (pTHX_ SV *coro)
461{ 494{
462 HV *stash;
463 MAGIC *mg; 495 MAGIC *mg;
464 496
465 if (SvROK (coro)) 497 if (SvROK (coro))
466 coro = SvRV (coro); 498 coro = SvRV (coro);
467 499
468 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 500 mg = SvSTATEhv_p (aTHX_ coro);
501 if (!mg)
469 croak ("Coro::State object required"); 502 croak ("Coro::State object required");
470 503
471 stash = SvSTASH (coro);
472 if (expect_false (stash != coro_stash && stash != coro_state_stash))
473 {
474 /* very slow, but rare, check */
475 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
476 croak ("Coro::State object required");
477 }
478
479 mg = CORO_MAGIC_state (coro);
480 return (struct coro *)mg->mg_ptr; 504 return (struct coro *)mg->mg_ptr;
481} 505}
482 506
483#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 507#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
484 508
… …
487#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 511#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
488 512
489/*****************************************************************************/ 513/*****************************************************************************/
490/* padlist management and caching */ 514/* padlist management and caching */
491 515
492static AV * 516ecb_inline PADLIST *
493coro_derive_padlist (pTHX_ CV *cv) 517coro_derive_padlist (pTHX_ CV *cv)
494{ 518{
495 AV *padlist = CvPADLIST (cv); 519 PADLIST *padlist = CvPADLIST (cv);
496 AV *newpadlist, *newpad; 520 PADLIST *newpadlist;
521 PAD *newpad;
522 PADOFFSET off = PadlistMAX (padlist) + 1;
497 523
498 newpadlist = newAV (); 524#if NEWPADAPI
525
526 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
527 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
528 while (!PadlistARRAY (padlist)[off - 1])
529 --off;
530
531 Perl_pad_push (aTHX_ padlist, off);
532
533 newpad = PadlistARRAY (padlist)[off];
534 PadlistARRAY (padlist)[off] = 0;
535
536#else
537
538#if PERL_VERSION_ATLEAST (5,10,0)
539 Perl_pad_push (aTHX_ padlist, off);
540#else
541 Perl_pad_push (aTHX_ padlist, off, 1);
542#endif
543
544 newpad = PadlistARRAY (padlist)[off];
545 PadlistMAX (padlist) = off - 1;
546
547#endif
548
549 newPADLIST (newpadlist);
550#if !PERL_VERSION_ATLEAST(5,15,3)
551 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
499 AvREAL_off (newpadlist); 552 AvREAL_off (newpadlist);
500#if PERL_VERSION_ATLEAST (5,10,0)
501 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
502#else
503 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
504#endif 553#endif
505 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
506 --AvFILLp (padlist);
507 554
508 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 555 /* Already extended to 2 elements by newPADLIST. */
509 av_store (newpadlist, 1, (SV *)newpad); 556 PadlistMAX (newpadlist) = 1;
557 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
558 PadlistARRAY (newpadlist)[1] = newpad;
510 559
511 return newpadlist; 560 return newpadlist;
512} 561}
513 562
514static void 563ecb_inline void
515free_padlist (pTHX_ AV *padlist) 564free_padlist (pTHX_ PADLIST *padlist)
516{ 565{
517 /* may be during global destruction */ 566 /* may be during global destruction */
518 if (!IN_DESTRUCT) 567 if (!IN_DESTRUCT)
519 { 568 {
520 I32 i = AvFILLp (padlist); 569 I32 i = PadlistMAX (padlist);
521 570
522 while (i > 0) /* special-case index 0 */ 571 while (i > 0) /* special-case index 0 */
523 { 572 {
524 /* we try to be extra-careful here */ 573 /* we try to be extra-careful here */
525 AV *av = (AV *)AvARRAY (padlist)[i--]; 574 PAD *pad = PadlistARRAY (padlist)[i--];
526 I32 j = AvFILLp (av);
527 575
576 if (pad)
577 {
578 I32 j = PadMAX (pad);
579
528 while (j >= 0) 580 while (j >= 0)
529 SvREFCNT_dec (AvARRAY (av)[j--]); 581 SvREFCNT_dec (PadARRAY (pad)[j--]);
530 582
531 AvFILLp (av) = -1; 583 PadMAX (pad) = -1;
532 SvREFCNT_dec (av); 584 SvREFCNT_dec (pad);
585 }
533 } 586 }
534 587
535 SvREFCNT_dec (AvARRAY (padlist)[0]); 588 SvREFCNT_dec (PadlistNAMES (padlist));
536 589
590#if NEWPADAPI
591 Safefree (PadlistARRAY (padlist));
592 Safefree (padlist);
593#else
537 AvFILLp (padlist) = -1; 594 AvFILLp (padlist) = -1;
595 AvREAL_off (padlist);
538 SvREFCNT_dec ((SV*)padlist); 596 SvREFCNT_dec ((SV*)padlist);
597#endif
539 } 598 }
540} 599}
541 600
542static int 601static int
543coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 602coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
544{ 603{
545 AV *padlist; 604 PADLIST *padlist;
546 AV *av = (AV *)mg->mg_obj; 605 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
606 size_t len = *(size_t *)mg->mg_ptr;
547 607
548 /* perl manages to free our internal AV and _then_ call us */ 608 /* perl manages to free our internal AV and _then_ call us */
549 if (IN_DESTRUCT) 609 if (IN_DESTRUCT)
550 return 0; 610 return 0;
551 611
552 /* casting is fun. */ 612 while (len--)
553 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
554 free_padlist (aTHX_ padlist); 613 free_padlist (aTHX_ padlists[len]);
555
556 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
557 614
558 return 0; 615 return 0;
559} 616}
560 617
561static MGVTBL coro_cv_vtbl = { 618static MGVTBL coro_cv_vtbl = {
562 0, 0, 0, 0, 619 0, 0, 0, 0,
563 coro_cv_free 620 coro_cv_free
564}; 621};
565 622
566/* the next two functions merely cache the padlists */ 623/* the next two functions merely cache the padlists */
567static void 624ecb_inline void
568get_padlist (pTHX_ CV *cv) 625get_padlist (pTHX_ CV *cv)
569{ 626{
570 MAGIC *mg = CORO_MAGIC_cv (cv); 627 MAGIC *mg = CORO_MAGIC_cv (cv);
571 AV *av; 628 size_t *lenp;
572 629
573 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 630 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
574 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 631 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
575 else 632 else
576 { 633 {
577#if CORO_PREFER_PERL_FUNCTIONS 634#if CORO_PREFER_PERL_FUNCTIONS
578 /* this is probably cleaner? but also slower! */ 635 /* this is probably cleaner? but also slower! */
579 /* in practise, it seems to be less stable */ 636 /* in practise, it seems to be less stable */
… …
585 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 642 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
586#endif 643#endif
587 } 644 }
588} 645}
589 646
590static void 647ecb_inline void
591put_padlist (pTHX_ CV *cv) 648put_padlist (pTHX_ CV *cv)
592{ 649{
593 MAGIC *mg = CORO_MAGIC_cv (cv); 650 MAGIC *mg = CORO_MAGIC_cv (cv);
594 AV *av;
595 651
596 if (expect_false (!mg)) 652 if (ecb_expect_false (!mg))
653 {
597 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 654 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
655 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
656 mg->mg_len = 1; /* so mg_free frees mg_ptr */
657 }
658 else
659 Renew (mg->mg_ptr,
660 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
661 char);
598 662
599 av = (AV *)mg->mg_obj; 663 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
600
601 if (expect_false (AvFILLp (av) >= AvMAX (av)))
602 av_extend (av, AvFILLp (av) + 1);
603
604 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
605} 664}
606 665
607/** load & save, init *******************************************************/ 666/** load & save, init *******************************************************/
667
668ecb_inline void
669swap_sv (SV *a, SV *b)
670{
671 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
672 SV tmp;
673
674 /* swap sv_any */
675 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
676
677 /* swap sv_flags */
678 SvFLAGS (&tmp) = SvFLAGS (a);
679 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
680 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
681
682#if PERL_VERSION_ATLEAST (5,10,0)
683 /* perl 5.10 and later complicates this _quite_ a bit, but it also
684 * is much faster, so no quarrels here. alternatively, we could
685 * sv_upgrade to avoid this.
686 */
687 {
688 /* swap sv_u */
689 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
690
691 /* if SvANY points to the head, we need to adjust the pointers,
692 * as the pointer for a still points to b, and maybe vice versa.
693 */
694 #define svany_in_head(type) \
695 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
696
697 if (svany_in_head (SvTYPE (a)))
698 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
699
700 if (svany_in_head (SvTYPE (b)))
701 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
702 }
703#endif
704}
705
706/* swap sv heads, at least logically */
707static void
708swap_svs (pTHX_ Coro__State c)
709{
710 int i;
711
712 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
713 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
714}
715
716#define SWAP_SVS(coro) \
717 if (ecb_expect_false ((coro)->swap_sv)) \
718 swap_svs (aTHX_ (coro))
608 719
609static void 720static void
610on_enterleave_call (pTHX_ SV *cb); 721on_enterleave_call (pTHX_ SV *cb);
611 722
612static void 723static void
… …
615 perl_slots *slot = c->slot; 726 perl_slots *slot = c->slot;
616 c->slot = 0; 727 c->slot = 0;
617 728
618 PL_mainstack = c->mainstack; 729 PL_mainstack = c->mainstack;
619 730
620 GvSV (PL_defgv) = slot->defsv; 731#if CORO_JIT
621 GvAV (PL_defgv) = slot->defav; 732 load_perl_slots (slot);
622 GvSV (PL_errgv) = slot->errsv; 733#else
623 GvSV (irsgv) = slot->irsgv;
624 GvHV (PL_hintgv) = slot->hinthv;
625
626 #define VAR(name,type) PL_ ## name = slot->name; 734 #define VARx(name,expr,type) expr = slot->name;
627 # include "state.h" 735 #include "state.h"
628 #undef VAR 736#endif
629 737
630 { 738 {
631 dSP; 739 dSP;
632 740
633 CV *cv; 741 CV *cv;
634 742
635 /* now do the ugly restore mess */ 743 /* now do the ugly restore mess */
636 while (expect_true (cv = (CV *)POPs)) 744 while (ecb_expect_true (cv = (CV *)POPs))
637 { 745 {
638 put_padlist (aTHX_ cv); /* mark this padlist as available */ 746 put_padlist (aTHX_ cv); /* mark this padlist as available */
639 CvDEPTH (cv) = PTR2IV (POPs); 747 CvDEPTH (cv) = PTR2IV (POPs);
640 CvPADLIST (cv) = (AV *)POPs; 748 CvPADLIST (cv) = (PADLIST *)POPs;
641 } 749 }
642 750
643 PUTBACK; 751 PUTBACK;
644 } 752 }
645 753
646 slf_frame = c->slf_frame; 754 slf_frame = c->slf_frame;
647 CORO_THROW = c->except; 755 CORO_THROW = c->except;
648 756
649 if (expect_false (enable_times)) 757 if (ecb_expect_false (enable_times))
650 { 758 {
651 if (expect_false (!times_valid)) 759 if (ecb_expect_false (!times_valid))
652 coro_times_update (); 760 coro_times_update ();
653 761
654 coro_times_sub (c); 762 coro_times_sub (c);
655 } 763 }
656 764
657 if (expect_false (c->on_enter)) 765 if (ecb_expect_false (c->on_enter))
658 { 766 {
659 int i; 767 int i;
660 768
661 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 769 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
662 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 770 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
663 } 771 }
772
773 SWAP_SVS (c);
664} 774}
665 775
666static void 776static void
667save_perl (pTHX_ Coro__State c) 777save_perl (pTHX_ Coro__State c)
668{ 778{
779 SWAP_SVS (c);
780
669 if (expect_false (c->on_leave)) 781 if (ecb_expect_false (c->on_leave))
670 { 782 {
671 int i; 783 int i;
672 784
673 for (i = AvFILLp (c->on_leave); i >= 0; --i) 785 for (i = AvFILLp (c->on_leave); i >= 0; --i)
674 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 786 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
675 } 787 }
676 788
677 times_valid = 0; 789 times_valid = 0;
678 790
679 if (expect_false (enable_times)) 791 if (ecb_expect_false (enable_times))
680 { 792 {
681 coro_times_update (); times_valid = 1; 793 coro_times_update (); times_valid = 1;
682 coro_times_add (c); 794 coro_times_add (c);
683 } 795 }
684 796
… …
698 810
699 XPUSHs (Nullsv); 811 XPUSHs (Nullsv);
700 /* this loop was inspired by pp_caller */ 812 /* this loop was inspired by pp_caller */
701 for (;;) 813 for (;;)
702 { 814 {
703 while (expect_true (cxix >= 0)) 815 while (ecb_expect_true (cxix >= 0))
704 { 816 {
705 PERL_CONTEXT *cx = &ccstk[cxix--]; 817 PERL_CONTEXT *cx = &ccstk[cxix--];
706 818
707 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 819 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
708 { 820 {
709 CV *cv = cx->blk_sub.cv; 821 CV *cv = cx->blk_sub.cv;
710 822
711 if (expect_true (CvDEPTH (cv))) 823 if (ecb_expect_true (CvDEPTH (cv)))
712 { 824 {
713 EXTEND (SP, 3); 825 EXTEND (SP, 3);
714 PUSHs ((SV *)CvPADLIST (cv)); 826 PUSHs ((SV *)CvPADLIST (cv));
715 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 827 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
716 PUSHs ((SV *)cv); 828 PUSHs ((SV *)cv);
… …
719 get_padlist (aTHX_ cv); 831 get_padlist (aTHX_ cv);
720 } 832 }
721 } 833 }
722 } 834 }
723 835
724 if (expect_true (top_si->si_type == PERLSI_MAIN)) 836 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
725 break; 837 break;
726 838
727 top_si = top_si->si_prev; 839 top_si = top_si->si_prev;
728 ccstk = top_si->si_cxstack; 840 ccstk = top_si->si_cxstack;
729 cxix = top_si->si_cxix; 841 cxix = top_si->si_cxix;
… …
731 843
732 PUTBACK; 844 PUTBACK;
733 } 845 }
734 846
735 /* allocate some space on the context stack for our purposes */ 847 /* allocate some space on the context stack for our purposes */
736 /* we manually unroll here, as usually 2 slots is enough */ 848 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
737 if (SLOT_COUNT >= 1) CXINC;
738 if (SLOT_COUNT >= 2) CXINC;
739 if (SLOT_COUNT >= 3) CXINC;
740 { 849 {
741 unsigned int i; 850 unsigned int i;
851
742 for (i = 3; i < SLOT_COUNT; ++i) 852 for (i = 0; i < SLOT_COUNT; ++i)
743 CXINC; 853 CXINC;
744 } 854
745 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 855 cxstack_ix -= SLOT_COUNT; /* undo allocation */
856 }
746 857
747 c->mainstack = PL_mainstack; 858 c->mainstack = PL_mainstack;
748 859
749 { 860 {
750 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 861 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
751 862
752 slot->defav = GvAV (PL_defgv); 863#if CORO_JIT
753 slot->defsv = DEFSV; 864 save_perl_slots (slot);
754 slot->errsv = ERRSV; 865#else
755 slot->irsgv = GvSV (irsgv);
756 slot->hinthv = GvHV (PL_hintgv);
757
758 #define VAR(name,type) slot->name = PL_ ## name; 866 #define VARx(name,expr,type) slot->name = expr;
759 # include "state.h" 867 #include "state.h"
760 #undef VAR 868#endif
761 } 869 }
762} 870}
763 871
764/* 872/*
765 * allocate various perl stacks. This is almost an exact copy 873 * allocate various perl stacks. This is almost an exact copy
… …
771# define coro_init_stacks(thx) init_stacks () 879# define coro_init_stacks(thx) init_stacks ()
772#else 880#else
773static void 881static void
774coro_init_stacks (pTHX) 882coro_init_stacks (pTHX)
775{ 883{
776 PL_curstackinfo = new_stackinfo(32, 8); 884 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
777 PL_curstackinfo->si_type = PERLSI_MAIN; 885 PL_curstackinfo->si_type = PERLSI_MAIN;
778 PL_curstack = PL_curstackinfo->si_stack; 886 PL_curstack = PL_curstackinfo->si_stack;
779 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 887 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
780 888
781 PL_stack_base = AvARRAY(PL_curstack); 889 PL_stack_base = AvARRAY(PL_curstack);
… …
796#endif 904#endif
797 905
798 New(54,PL_scopestack,8,I32); 906 New(54,PL_scopestack,8,I32);
799 PL_scopestack_ix = 0; 907 PL_scopestack_ix = 0;
800 PL_scopestack_max = 8; 908 PL_scopestack_max = 8;
909#if HAS_SCOPESTACK_NAME
910 New(54,PL_scopestack_name,8,const char*);
911#endif
801 912
802 New(54,PL_savestack,24,ANY); 913 New(54,PL_savestack,24,ANY);
803 PL_savestack_ix = 0; 914 PL_savestack_ix = 0;
804 PL_savestack_max = 24; 915 PL_savestack_max = 24;
805 916
… …
833 } 944 }
834 945
835 Safefree (PL_tmps_stack); 946 Safefree (PL_tmps_stack);
836 Safefree (PL_markstack); 947 Safefree (PL_markstack);
837 Safefree (PL_scopestack); 948 Safefree (PL_scopestack);
949#if HAS_SCOPESTACK_NAME
950 Safefree (PL_scopestack_name);
951#endif
838 Safefree (PL_savestack); 952 Safefree (PL_savestack);
839#if !PERL_VERSION_ATLEAST (5,10,0) 953#if !PERL_VERSION_ATLEAST (5,10,0)
840 Safefree (PL_retstack); 954 Safefree (PL_retstack);
841#endif 955#endif
842} 956}
… …
888#endif 1002#endif
889 1003
890/* 1004/*
891 * This overrides the default magic get method of %SIG elements. 1005 * This overrides the default magic get method of %SIG elements.
892 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1006 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
893 * and instead of trying to save and restore the hash elements, we just provide 1007 * and instead of trying to save and restore the hash elements (extremely slow),
894 * readback here. 1008 * we just provide our own readback here.
895 */ 1009 */
896static int 1010static int ecb_cold
897coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1011coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
898{ 1012{
899 const char *s = MgPV_nolen_const (mg); 1013 const char *s = MgPV_nolen_const (mg);
900 1014
901 if (*s == '_') 1015 if (*s == '_')
902 { 1016 {
903 SV **svp = 0; 1017 SV **svp = 0;
904 1018
905 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1019 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
906 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1020 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
907 1021
908 if (svp) 1022 if (svp)
909 { 1023 {
910 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1024 SV *ssv;
1025
1026 if (!*svp)
1027 ssv = &PL_sv_undef;
1028 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1029 ssv = sv_2mortal (newRV_inc (*svp));
1030 else
1031 ssv = *svp;
1032
1033 sv_setsv (sv, ssv);
911 return 0; 1034 return 0;
912 } 1035 }
913 } 1036 }
914 1037
915 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1038 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
916} 1039}
917 1040
918static int 1041static int ecb_cold
919coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1042coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
920{ 1043{
921 const char *s = MgPV_nolen_const (mg); 1044 const char *s = MgPV_nolen_const (mg);
922 1045
923 if (*s == '_') 1046 if (*s == '_')
… …
937 } 1060 }
938 1061
939 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1062 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
940} 1063}
941 1064
942static int 1065static int ecb_cold
943coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1066coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
944{ 1067{
945 const char *s = MgPV_nolen_const (mg); 1068 const char *s = MgPV_nolen_const (mg);
946 1069
947 if (*s == '_') 1070 if (*s == '_')
… …
980slf_check_repeat (pTHX_ struct CoroSLF *frame) 1103slf_check_repeat (pTHX_ struct CoroSLF *frame)
981{ 1104{
982 return 1; 1105 return 1;
983} 1106}
984 1107
985static UNOP coro_setup_op; 1108static UNOP init_perl_op;
986 1109
987static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1110ecb_noinline static void /* noinline to keep it out of the transfer fast path */
988coro_setup (pTHX_ struct coro *coro) 1111init_perl (pTHX_ struct coro *coro)
989{ 1112{
990 /* 1113 /*
991 * emulate part of the perl startup here. 1114 * emulate part of the perl startup here.
992 */ 1115 */
993 coro_init_stacks (aTHX); 1116 coro_init_stacks (aTHX);
… …
1000 PL_comppad_name_fill = 0; 1123 PL_comppad_name_fill = 0;
1001 PL_comppad_name_floor = 0; 1124 PL_comppad_name_floor = 0;
1002 PL_curpm = 0; 1125 PL_curpm = 0;
1003 PL_curpad = 0; 1126 PL_curpad = 0;
1004 PL_localizing = 0; 1127 PL_localizing = 0;
1005 PL_dirty = 0;
1006 PL_restartop = 0; 1128 PL_restartop = 0;
1007#if PERL_VERSION_ATLEAST (5,10,0) 1129#if PERL_VERSION_ATLEAST (5,10,0)
1008 PL_parser = 0; 1130 PL_parser = 0;
1009#endif 1131#endif
1010 PL_hints = 0; 1132 PL_hints = 0;
1011 1133
1012 /* recreate the die/warn hooks */ 1134 /* recreate the die/warn hooks */
1013 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1135 PL_diehook = SvREFCNT_inc (rv_diehook);
1014 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1136 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1015 1137
1016 GvSV (PL_defgv) = newSV (0); 1138 GvSV (PL_defgv) = newSV (0);
1017 GvAV (PL_defgv) = coro->args; coro->args = 0; 1139 GvAV (PL_defgv) = coro->args; coro->args = 0;
1018 GvSV (PL_errgv) = newSV (0); 1140 GvSV (PL_errgv) = newSV (0);
1019 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1141 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1020 GvHV (PL_hintgv) = 0; 1142 GvHV (PL_hintgv) = 0;
… …
1040 /* this newly created coroutine might be run on an existing cctx which most 1162 /* this newly created coroutine might be run on an existing cctx which most
1041 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1163 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1042 */ 1164 */
1043 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1165 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1044 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1166 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1167 slf_frame.destroy = 0;
1045 1168
1046 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1169 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1047 coro_setup_op.op_next = PL_op; 1170 init_perl_op.op_next = PL_op;
1048 coro_setup_op.op_type = OP_ENTERSUB; 1171 init_perl_op.op_type = OP_ENTERSUB;
1049 coro_setup_op.op_ppaddr = pp_slf; 1172 init_perl_op.op_ppaddr = pp_slf;
1050 /* no flags etc. required, as an init function won't be called */ 1173 /* no flags etc. required, as an init function won't be called */
1051 1174
1052 PL_op = (OP *)&coro_setup_op; 1175 PL_op = (OP *)&init_perl_op;
1053 1176
1054 /* copy throw, in case it was set before coro_setup */ 1177 /* copy throw, in case it was set before init_perl */
1055 CORO_THROW = coro->except; 1178 CORO_THROW = coro->except;
1056 1179
1180 SWAP_SVS (coro);
1181
1057 if (expect_false (enable_times)) 1182 if (ecb_expect_false (enable_times))
1058 { 1183 {
1059 coro_times_update (); 1184 coro_times_update ();
1060 coro_times_sub (coro); 1185 coro_times_sub (coro);
1061 } 1186 }
1062} 1187}
… …
1081 dounwind (-1); 1206 dounwind (-1);
1082 } 1207 }
1083} 1208}
1084 1209
1085static void 1210static void
1086coro_destruct_perl (pTHX_ struct coro *coro) 1211destroy_perl (pTHX_ struct coro *coro)
1087{ 1212{
1088 SV *svf [9]; 1213 SV *svf [9];
1089 1214
1090 { 1215 {
1216 SV *old_current = SvRV (coro_current);
1091 struct coro *current = SvSTATE_current; 1217 struct coro *current = SvSTATE (old_current);
1092 1218
1093 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1219 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1094 1220
1095 save_perl (aTHX_ current); 1221 save_perl (aTHX_ current);
1222
1223 /* this will cause transfer_check to croak on block*/
1224 SvRV_set (coro_current, (SV *)coro->hv);
1225
1096 load_perl (aTHX_ coro); 1226 load_perl (aTHX_ coro);
1097 1227
1098 coro_unwind_stacks (aTHX); 1228 coro_unwind_stacks (aTHX);
1229
1230 /* restore swapped sv's */
1231 SWAP_SVS (coro);
1232
1099 coro_destruct_stacks (aTHX); 1233 coro_destruct_stacks (aTHX);
1100 1234
1101 // now save some sv's to be free'd later 1235 /* now save some sv's to be free'd later */
1102 svf [0] = GvSV (PL_defgv); 1236 svf [0] = GvSV (PL_defgv);
1103 svf [1] = (SV *)GvAV (PL_defgv); 1237 svf [1] = (SV *)GvAV (PL_defgv);
1104 svf [2] = GvSV (PL_errgv); 1238 svf [2] = GvSV (PL_errgv);
1105 svf [3] = (SV *)PL_defoutgv; 1239 svf [3] = (SV *)PL_defoutgv;
1106 svf [4] = PL_rs; 1240 svf [4] = PL_rs;
… …
1108 svf [6] = (SV *)GvHV (PL_hintgv); 1242 svf [6] = (SV *)GvHV (PL_hintgv);
1109 svf [7] = PL_diehook; 1243 svf [7] = PL_diehook;
1110 svf [8] = PL_warnhook; 1244 svf [8] = PL_warnhook;
1111 assert (9 == sizeof (svf) / sizeof (*svf)); 1245 assert (9 == sizeof (svf) / sizeof (*svf));
1112 1246
1247 SvRV_set (coro_current, old_current);
1248
1113 load_perl (aTHX_ current); 1249 load_perl (aTHX_ current);
1114 } 1250 }
1115 1251
1116 { 1252 {
1117 unsigned int i; 1253 unsigned int i;
… …
1124 SvREFCNT_dec (coro->invoke_cb); 1260 SvREFCNT_dec (coro->invoke_cb);
1125 SvREFCNT_dec (coro->invoke_av); 1261 SvREFCNT_dec (coro->invoke_av);
1126 } 1262 }
1127} 1263}
1128 1264
1129INLINE void 1265ecb_inline void
1130free_coro_mortal (pTHX) 1266free_coro_mortal (pTHX)
1131{ 1267{
1132 if (expect_true (coro_mortal)) 1268 if (ecb_expect_true (coro_mortal))
1133 { 1269 {
1134 SvREFCNT_dec (coro_mortal); 1270 SvREFCNT_dec ((SV *)coro_mortal);
1135 coro_mortal = 0; 1271 coro_mortal = 0;
1136 } 1272 }
1137} 1273}
1138 1274
1139static int 1275static int
… …
1272 1408
1273 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1409 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1274} 1410}
1275 1411
1276/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1412/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1277static void NOINLINE 1413static void ecb_noinline
1278cctx_prepare (pTHX) 1414cctx_prepare (pTHX)
1279{ 1415{
1280 PL_top_env = &PL_start_env; 1416 PL_top_env = &PL_start_env;
1281 1417
1282 if (cctx_current->flags & CC_TRACE) 1418 if (cctx_current->flags & CC_TRACE)
… …
1293 slf_frame.prepare = slf_prepare_set_stacklevel; 1429 slf_frame.prepare = slf_prepare_set_stacklevel;
1294 slf_frame.check = slf_check_set_stacklevel; 1430 slf_frame.check = slf_check_set_stacklevel;
1295} 1431}
1296 1432
1297/* the tail of transfer: execute stuff we can only do after a transfer */ 1433/* the tail of transfer: execute stuff we can only do after a transfer */
1298INLINE void 1434ecb_inline void
1299transfer_tail (pTHX) 1435transfer_tail (pTHX)
1300{ 1436{
1301 free_coro_mortal (aTHX); 1437 free_coro_mortal (aTHX);
1438}
1439
1440/* try to exit the same way perl's main function would do */
1441/* we do not bother resetting the environment or other things *7
1442/* that are not, uhm, essential */
1443/* this obviously also doesn't work when perl is embedded */
1444static void ecb_noinline ecb_cold
1445perlish_exit (pTHX)
1446{
1447 int exitstatus = perl_destruct (PL_curinterp);
1448 perl_free (PL_curinterp);
1449 exit (exitstatus);
1302} 1450}
1303 1451
1304/* 1452/*
1305 * this is a _very_ stripped down perl interpreter ;) 1453 * this is a _very_ stripped down perl interpreter ;)
1306 */ 1454 */
… …
1328 /* somebody or something will hit me for both perl_run and PL_restartop */ 1476 /* somebody or something will hit me for both perl_run and PL_restartop */
1329 PL_restartop = PL_op; 1477 PL_restartop = PL_op;
1330 perl_run (PL_curinterp); 1478 perl_run (PL_curinterp);
1331 /* 1479 /*
1332 * Unfortunately, there is no way to get at the return values of the 1480 * Unfortunately, there is no way to get at the return values of the
1333 * coro body here, as perl_run destroys these 1481 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1482 * runtime errors here, as this is just a random interpreter, not a thread.
1334 */ 1483 */
1335 1484
1336 /* 1485 /*
1337 * If perl-run returns we assume exit() was being called or the coro 1486 * If perl-run returns we assume exit() was being called or the coro
1338 * fell off the end, which seems to be the only valid (non-bug) 1487 * fell off the end, which seems to be the only valid (non-bug)
1339 * reason for perl_run to return. We try to exit by jumping to the 1488 * reason for perl_run to return. We try to mimic whatever perl is normally
1340 * bootstrap-time "top" top_env, as we cannot restore the "main" 1489 * doing in that case. YMMV.
1341 * coroutine as Coro has no such concept.
1342 * This actually isn't valid with the pthread backend, but OSes requiring
1343 * that backend are too broken to do it in a standards-compliant way.
1344 */ 1490 */
1345 PL_top_env = main_top_env; 1491 perlish_exit (aTHX);
1346 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1347 } 1492 }
1348} 1493}
1349 1494
1350static coro_cctx * 1495static coro_cctx *
1351cctx_new () 1496cctx_new (void)
1352{ 1497{
1353 coro_cctx *cctx; 1498 coro_cctx *cctx;
1354 1499
1355 ++cctx_count; 1500 ++cctx_count;
1356 New (0, cctx, 1, coro_cctx); 1501 New (0, cctx, 1, coro_cctx);
… …
1362 return cctx; 1507 return cctx;
1363} 1508}
1364 1509
1365/* create a new cctx only suitable as source */ 1510/* create a new cctx only suitable as source */
1366static coro_cctx * 1511static coro_cctx *
1367cctx_new_empty () 1512cctx_new_empty (void)
1368{ 1513{
1369 coro_cctx *cctx = cctx_new (); 1514 coro_cctx *cctx = cctx_new ();
1370 1515
1371 cctx->sptr = 0; 1516 cctx->stack.sptr = 0;
1372 coro_create (&cctx->cctx, 0, 0, 0, 0); 1517 coro_create (&cctx->cctx, 0, 0, 0, 0);
1373 1518
1374 return cctx; 1519 return cctx;
1375} 1520}
1376 1521
1377/* create a new cctx suitable as destination/running a perl interpreter */ 1522/* create a new cctx suitable as destination/running a perl interpreter */
1378static coro_cctx * 1523static coro_cctx *
1379cctx_new_run () 1524cctx_new_run (void)
1380{ 1525{
1381 coro_cctx *cctx = cctx_new (); 1526 coro_cctx *cctx = cctx_new ();
1382 void *stack_start;
1383 size_t stack_size;
1384 1527
1385#if HAVE_MMAP 1528 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1386 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1387 /* mmap supposedly does allocate-on-write for us */
1388 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1389
1390 if (cctx->sptr != (void *)-1)
1391 {
1392 #if CORO_STACKGUARD
1393 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1394 #endif
1395 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1396 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1397 cctx->flags |= CC_MAPPED;
1398 } 1529 {
1399 else
1400#endif
1401 {
1402 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1403 New (0, cctx->sptr, cctx_stacksize, long);
1404
1405 if (!cctx->sptr)
1406 {
1407 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1530 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1408 _exit (EXIT_FAILURE); 1531 _exit (EXIT_FAILURE);
1409 }
1410
1411 stack_start = cctx->sptr;
1412 stack_size = cctx->ssize;
1413 } 1532 }
1414 1533
1415 #if CORO_USE_VALGRIND
1416 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1417 #endif
1418
1419 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1534 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1420 1535
1421 return cctx; 1536 return cctx;
1422} 1537}
1423 1538
1424static void 1539static void
1425cctx_destroy (coro_cctx *cctx) 1540cctx_destroy (coro_cctx *cctx)
1426{ 1541{
1427 if (!cctx) 1542 if (!cctx)
1428 return; 1543 return;
1429 1544
1430 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1545 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1431 1546
1432 --cctx_count; 1547 --cctx_count;
1433 coro_destroy (&cctx->cctx); 1548 coro_destroy (&cctx->cctx);
1434 1549
1435 /* coro_transfer creates new, empty cctx's */ 1550 coro_stack_free (&cctx->stack);
1436 if (cctx->sptr)
1437 {
1438 #if CORO_USE_VALGRIND
1439 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1440 #endif
1441
1442#if HAVE_MMAP
1443 if (cctx->flags & CC_MAPPED)
1444 munmap (cctx->sptr, cctx->ssize);
1445 else
1446#endif
1447 Safefree (cctx->sptr);
1448 }
1449 1551
1450 Safefree (cctx); 1552 Safefree (cctx);
1451} 1553}
1452 1554
1453/* wether this cctx should be destructed */ 1555/* wether this cctx should be destructed */
1454#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1556#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1455 1557
1456static coro_cctx * 1558static coro_cctx *
1457cctx_get (pTHX) 1559cctx_get (pTHX)
1458{ 1560{
1459 while (expect_true (cctx_first)) 1561 while (ecb_expect_true (cctx_first))
1460 { 1562 {
1461 coro_cctx *cctx = cctx_first; 1563 coro_cctx *cctx = cctx_first;
1462 cctx_first = cctx->next; 1564 cctx_first = cctx->next;
1463 --cctx_idle; 1565 --cctx_idle;
1464 1566
1465 if (expect_true (!CCTX_EXPIRED (cctx))) 1567 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1466 return cctx; 1568 return cctx;
1467 1569
1468 cctx_destroy (cctx); 1570 cctx_destroy (cctx);
1469 } 1571 }
1470 1572
… …
1472} 1574}
1473 1575
1474static void 1576static void
1475cctx_put (coro_cctx *cctx) 1577cctx_put (coro_cctx *cctx)
1476{ 1578{
1477 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1579 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1478 1580
1479 /* free another cctx if overlimit */ 1581 /* free another cctx if overlimit */
1480 if (expect_false (cctx_idle >= cctx_max_idle)) 1582 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1481 { 1583 {
1482 coro_cctx *first = cctx_first; 1584 coro_cctx *first = cctx_first;
1483 cctx_first = first->next; 1585 cctx_first = first->next;
1484 --cctx_idle; 1586 --cctx_idle;
1485 1587
… …
1496static void 1598static void
1497transfer_check (pTHX_ struct coro *prev, struct coro *next) 1599transfer_check (pTHX_ struct coro *prev, struct coro *next)
1498{ 1600{
1499 /* TODO: throwing up here is considered harmful */ 1601 /* TODO: throwing up here is considered harmful */
1500 1602
1501 if (expect_true (prev != next)) 1603 if (ecb_expect_true (prev != next))
1502 { 1604 {
1503 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1605 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1504 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1606 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1505 1607
1506 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1608 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1507 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1609 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1508 1610
1509#if !PERL_VERSION_ATLEAST (5,10,0) 1611#if !PERL_VERSION_ATLEAST (5,10,0)
1510 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1612 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1511 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1613 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1512#endif 1614#endif
1513 } 1615 }
1514} 1616}
1515 1617
1516/* always use the TRANSFER macro */ 1618/* always use the TRANSFER macro */
1517static void NOINLINE /* noinline so we have a fixed stackframe */ 1619static void ecb_noinline /* noinline so we have a fixed stackframe */
1518transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1620transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1519{ 1621{
1520 dSTACKLEVEL; 1622 dSTACKLEVEL;
1521 1623
1522 /* sometimes transfer is only called to set idle_sp */ 1624 /* sometimes transfer is only called to set idle_sp */
1523 if (expect_false (!prev)) 1625 if (ecb_expect_false (!prev))
1524 { 1626 {
1525 cctx_current->idle_sp = STACKLEVEL; 1627 cctx_current->idle_sp = STACKLEVEL;
1526 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1628 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1527 } 1629 }
1528 else if (expect_true (prev != next)) 1630 else if (ecb_expect_true (prev != next))
1529 { 1631 {
1530 coro_cctx *cctx_prev; 1632 coro_cctx *cctx_prev;
1531 1633
1532 if (expect_false (prev->flags & CF_NEW)) 1634 if (ecb_expect_false (prev->flags & CF_NEW))
1533 { 1635 {
1534 /* create a new empty/source context */ 1636 /* create a new empty/source context */
1535 prev->flags &= ~CF_NEW; 1637 prev->flags &= ~CF_NEW;
1536 prev->flags |= CF_RUNNING; 1638 prev->flags |= CF_RUNNING;
1537 } 1639 }
… …
1540 next->flags |= CF_RUNNING; 1642 next->flags |= CF_RUNNING;
1541 1643
1542 /* first get rid of the old state */ 1644 /* first get rid of the old state */
1543 save_perl (aTHX_ prev); 1645 save_perl (aTHX_ prev);
1544 1646
1545 if (expect_false (next->flags & CF_NEW)) 1647 if (ecb_expect_false (next->flags & CF_NEW))
1546 { 1648 {
1547 /* need to start coroutine */ 1649 /* need to start coroutine */
1548 next->flags &= ~CF_NEW; 1650 next->flags &= ~CF_NEW;
1549 /* setup coroutine call */ 1651 /* setup coroutine call */
1550 coro_setup (aTHX_ next); 1652 init_perl (aTHX_ next);
1551 } 1653 }
1552 else 1654 else
1553 load_perl (aTHX_ next); 1655 load_perl (aTHX_ next);
1554 1656
1555 /* possibly untie and reuse the cctx */ 1657 /* possibly untie and reuse the cctx */
1556 if (expect_true ( 1658 if (ecb_expect_true (
1557 cctx_current->idle_sp == STACKLEVEL 1659 cctx_current->idle_sp == STACKLEVEL
1558 && !(cctx_current->flags & CC_TRACE) 1660 && !(cctx_current->flags & CC_TRACE)
1559 && !force_cctx 1661 && !force_cctx
1560 )) 1662 ))
1561 { 1663 {
1562 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1664 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1563 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1665 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1564 1666
1565 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1667 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1566 /* without this the next cctx_get might destroy the running cctx while still in use */ 1668 /* without this the next cctx_get might destroy the running cctx while still in use */
1567 if (expect_false (CCTX_EXPIRED (cctx_current))) 1669 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1568 if (expect_true (!next->cctx)) 1670 if (ecb_expect_true (!next->cctx))
1569 next->cctx = cctx_get (aTHX); 1671 next->cctx = cctx_get (aTHX);
1570 1672
1571 cctx_put (cctx_current); 1673 cctx_put (cctx_current);
1572 } 1674 }
1573 else 1675 else
1574 prev->cctx = cctx_current; 1676 prev->cctx = cctx_current;
1575 1677
1576 ++next->usecount; 1678 ++next->usecount;
1577 1679
1578 cctx_prev = cctx_current; 1680 cctx_prev = cctx_current;
1579 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1681 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1580 1682
1581 next->cctx = 0; 1683 next->cctx = 0;
1582 1684
1583 if (expect_false (cctx_prev != cctx_current)) 1685 if (ecb_expect_false (cctx_prev != cctx_current))
1584 { 1686 {
1585 cctx_prev->top_env = PL_top_env; 1687 cctx_prev->top_env = PL_top_env;
1586 PL_top_env = cctx_current->top_env; 1688 PL_top_env = cctx_current->top_env;
1587 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1689 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1588 } 1690 }
… …
1594#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1696#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1595#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1697#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1596 1698
1597/** high level stuff ********************************************************/ 1699/** high level stuff ********************************************************/
1598 1700
1701/* this function is actually Coro, not Coro::State, but we call it from here */
1702/* because it is convenient - but it hasn't been declared yet for that reason */
1599static int 1703static void
1704coro_call_on_destroy (pTHX_ struct coro *coro);
1705
1706static void
1600coro_state_destroy (pTHX_ struct coro *coro) 1707coro_state_destroy (pTHX_ struct coro *coro)
1601{ 1708{
1602 if (coro->flags & CF_DESTROYED) 1709 if (coro->flags & CF_ZOMBIE)
1603 return 0; 1710 return;
1604 1711
1605 if (coro->on_destroy && !PL_dirty)
1606 coro->on_destroy (aTHX_ coro); 1712 slf_destroy (aTHX_ coro);
1607 1713
1608 coro->flags |= CF_DESTROYED; 1714 coro->flags |= CF_ZOMBIE;
1609 1715
1610 if (coro->flags & CF_READY) 1716 if (coro->flags & CF_READY)
1611 { 1717 {
1612 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1718 /* reduce nready, as destroying a ready coro effectively unreadies it */
1613 /* alternative: look through all ready queues and remove the coro */ 1719 /* alternative: look through all ready queues and remove the coro */
1614 --coro_nready; 1720 --coro_nready;
1615 } 1721 }
1616 else 1722 else
1617 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1723 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1724
1725 if (coro->next) coro->next->prev = coro->prev;
1726 if (coro->prev) coro->prev->next = coro->next;
1727 if (coro == coro_first) coro_first = coro->next;
1618 1728
1619 if (coro->mainstack 1729 if (coro->mainstack
1620 && coro->mainstack != main_mainstack 1730 && coro->mainstack != main_mainstack
1621 && coro->slot 1731 && coro->slot
1622 && !PL_dirty) 1732 && !PL_dirty)
1623 coro_destruct_perl (aTHX_ coro); 1733 destroy_perl (aTHX_ coro);
1624 1734
1625 cctx_destroy (coro->cctx); 1735 cctx_destroy (coro->cctx);
1626 SvREFCNT_dec (coro->startcv); 1736 SvREFCNT_dec (coro->startcv);
1627 SvREFCNT_dec (coro->args); 1737 SvREFCNT_dec (coro->args);
1738 SvREFCNT_dec (coro->swap_sv);
1628 SvREFCNT_dec (CORO_THROW); 1739 SvREFCNT_dec (CORO_THROW);
1629 1740
1630 if (coro->next) coro->next->prev = coro->prev; 1741 coro_call_on_destroy (aTHX_ coro);
1631 if (coro->prev) coro->prev->next = coro->next;
1632 if (coro == coro_first) coro_first = coro->next;
1633 1742
1634 return 1; 1743 /* more destruction mayhem in coro_state_free */
1635} 1744}
1636 1745
1637static int 1746static int
1638coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1747coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1639{ 1748{
1640 struct coro *coro = (struct coro *)mg->mg_ptr; 1749 struct coro *coro = (struct coro *)mg->mg_ptr;
1641 mg->mg_ptr = 0; 1750 mg->mg_ptr = 0;
1642 1751
1643 coro->hv = 0;
1644
1645 if (--coro->refcnt < 0)
1646 {
1647 coro_state_destroy (aTHX_ coro); 1752 coro_state_destroy (aTHX_ coro);
1753 SvREFCNT_dec (coro->on_destroy);
1754 SvREFCNT_dec (coro->status);
1755
1648 Safefree (coro); 1756 Safefree (coro);
1649 }
1650 1757
1651 return 0; 1758 return 0;
1652} 1759}
1653 1760
1654static int 1761static int ecb_cold
1655coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1762coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1656{ 1763{
1657 struct coro *coro = (struct coro *)mg->mg_ptr; 1764 /* called when perl clones the current process the slow way (windows process emulation) */
1658 1765 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1659 ++coro->refcnt; 1766 mg->mg_ptr = 0;
1767 mg->mg_virtual = 0;
1660 1768
1661 return 0; 1769 return 0;
1662} 1770}
1663 1771
1664static MGVTBL coro_state_vtbl = { 1772static MGVTBL coro_state_vtbl = {
… …
1687 1795
1688 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1796 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1689 TRANSFER (ta, 1); 1797 TRANSFER (ta, 1);
1690} 1798}
1691 1799
1692/*****************************************************************************/
1693/* gensub: simple closure generation utility */
1694
1695#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1696
1697/* create a closure from XS, returns a code reference */
1698/* the arg can be accessed via GENSUB_ARG from the callback */
1699/* the callback must use dXSARGS/XSRETURN */
1700static SV *
1701gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1702{
1703 CV *cv = (CV *)newSV (0);
1704
1705 sv_upgrade ((SV *)cv, SVt_PVCV);
1706
1707 CvANON_on (cv);
1708 CvISXSUB_on (cv);
1709 CvXSUB (cv) = xsub;
1710 GENSUB_ARG = arg;
1711
1712 return newRV_noinc ((SV *)cv);
1713}
1714
1715/** Coro ********************************************************************/ 1800/** Coro ********************************************************************/
1716 1801
1717INLINE void 1802ecb_inline void
1718coro_enq (pTHX_ struct coro *coro) 1803coro_enq (pTHX_ struct coro *coro)
1719{ 1804{
1720 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1805 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1721 1806
1722 SvREFCNT_inc_NN (coro->hv); 1807 SvREFCNT_inc_NN (coro->hv);
… …
1724 coro->next_ready = 0; 1809 coro->next_ready = 0;
1725 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1810 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1726 ready [1] = coro; 1811 ready [1] = coro;
1727} 1812}
1728 1813
1729INLINE struct coro * 1814ecb_inline struct coro *
1730coro_deq (pTHX) 1815coro_deq (pTHX)
1731{ 1816{
1732 int prio; 1817 int prio;
1733 1818
1734 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1819 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1744 } 1829 }
1745 1830
1746 return 0; 1831 return 0;
1747} 1832}
1748 1833
1834static void
1835invoke_sv_ready_hook_helper (void)
1836{
1837 dTHX;
1838 dSP;
1839
1840 ENTER;
1841 SAVETMPS;
1842
1843 PUSHMARK (SP);
1844 PUTBACK;
1845 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1846
1847 FREETMPS;
1848 LEAVE;
1849}
1850
1749static int 1851static int
1750api_ready (pTHX_ SV *coro_sv) 1852api_ready (pTHX_ SV *coro_sv)
1751{ 1853{
1752 struct coro *coro;
1753 SV *sv_hook;
1754 void (*xs_hook)(void);
1755
1756 coro = SvSTATE (coro_sv); 1854 struct coro *coro = SvSTATE (coro_sv);
1757 1855
1758 if (coro->flags & CF_READY) 1856 if (coro->flags & CF_READY)
1759 return 0; 1857 return 0;
1760 1858
1761 coro->flags |= CF_READY; 1859 coro->flags |= CF_READY;
1762 1860
1763 sv_hook = coro_nready ? 0 : coro_readyhook;
1764 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1765
1766 coro_enq (aTHX_ coro); 1861 coro_enq (aTHX_ coro);
1767 ++coro_nready;
1768 1862
1769 if (sv_hook) 1863 if (!coro_nready++)
1770 { 1864 if (coroapi.readyhook)
1771 dSP; 1865 coroapi.readyhook ();
1772
1773 ENTER;
1774 SAVETMPS;
1775
1776 PUSHMARK (SP);
1777 PUTBACK;
1778 call_sv (sv_hook, G_VOID | G_DISCARD);
1779
1780 FREETMPS;
1781 LEAVE;
1782 }
1783
1784 if (xs_hook)
1785 xs_hook ();
1786 1866
1787 return 1; 1867 return 1;
1788} 1868}
1789 1869
1790static int 1870static int
… …
1792{ 1872{
1793 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1873 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1794} 1874}
1795 1875
1796/* expects to own a reference to next->hv */ 1876/* expects to own a reference to next->hv */
1797INLINE void 1877ecb_inline void
1798prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1878prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1799{ 1879{
1800 SV *prev_sv = SvRV (coro_current); 1880 SV *prev_sv = SvRV (coro_current);
1801 1881
1802 ta->prev = SvSTATE_hv (prev_sv); 1882 ta->prev = SvSTATE_hv (prev_sv);
… …
1815{ 1895{
1816 for (;;) 1896 for (;;)
1817 { 1897 {
1818 struct coro *next = coro_deq (aTHX); 1898 struct coro *next = coro_deq (aTHX);
1819 1899
1820 if (expect_true (next)) 1900 if (ecb_expect_true (next))
1821 { 1901 {
1822 /* cannot transfer to destroyed coros, skip and look for next */ 1902 /* cannot transfer to destroyed coros, skip and look for next */
1823 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1903 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1824 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1904 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1825 else 1905 else
1826 { 1906 {
1827 next->flags &= ~CF_READY; 1907 next->flags &= ~CF_READY;
1828 --coro_nready; 1908 --coro_nready;
… …
1835 { 1915 {
1836 /* nothing to schedule: call the idle handler */ 1916 /* nothing to schedule: call the idle handler */
1837 if (SvROK (sv_idle) 1917 if (SvROK (sv_idle)
1838 && SvOBJECT (SvRV (sv_idle))) 1918 && SvOBJECT (SvRV (sv_idle)))
1839 { 1919 {
1920 if (SvRV (sv_idle) == SvRV (coro_current))
1921 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1922
1840 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1923 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1841 api_ready (aTHX_ SvRV (sv_idle)); 1924 api_ready (aTHX_ SvRV (sv_idle));
1842 --coro_nready; 1925 --coro_nready;
1843 } 1926 }
1844 else 1927 else
1845 { 1928 {
1929 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1846 dSP; 1930 dSP;
1847 1931
1848 ENTER; 1932 ENTER;
1849 SAVETMPS; 1933 SAVETMPS;
1850 1934
… …
1857 } 1941 }
1858 } 1942 }
1859 } 1943 }
1860} 1944}
1861 1945
1862INLINE void 1946ecb_inline void
1863prepare_cede (pTHX_ struct coro_transfer_args *ta) 1947prepare_cede (pTHX_ struct coro_transfer_args *ta)
1864{ 1948{
1865 api_ready (aTHX_ coro_current); 1949 api_ready (aTHX_ coro_current);
1866 prepare_schedule (aTHX_ ta); 1950 prepare_schedule (aTHX_ ta);
1867} 1951}
1868 1952
1869INLINE void 1953ecb_inline void
1870prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1954prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1871{ 1955{
1872 SV *prev = SvRV (coro_current); 1956 SV *prev = SvRV (coro_current);
1873 1957
1874 if (coro_nready) 1958 if (coro_nready)
… …
1904{ 1988{
1905 struct coro_transfer_args ta; 1989 struct coro_transfer_args ta;
1906 1990
1907 prepare_cede (aTHX_ &ta); 1991 prepare_cede (aTHX_ &ta);
1908 1992
1909 if (expect_true (ta.prev != ta.next)) 1993 if (ecb_expect_true (ta.prev != ta.next))
1910 { 1994 {
1911 TRANSFER (ta, 1); 1995 TRANSFER (ta, 1);
1912 return 1; 1996 return 1;
1913 } 1997 }
1914 else 1998 else
… …
1957 coro->slot->runops = RUNOPS_DEFAULT; 2041 coro->slot->runops = RUNOPS_DEFAULT;
1958 } 2042 }
1959} 2043}
1960 2044
1961static void 2045static void
2046coro_push_av (pTHX_ AV *av, I32 gimme_v)
2047{
2048 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2049 {
2050 dSP;
2051
2052 if (gimme_v == G_SCALAR)
2053 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2054 else
2055 {
2056 int i;
2057 EXTEND (SP, AvFILLp (av) + 1);
2058
2059 for (i = 0; i <= AvFILLp (av); ++i)
2060 PUSHs (AvARRAY (av)[i]);
2061 }
2062
2063 PUTBACK;
2064 }
2065}
2066
2067static void
2068coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2069{
2070 if (!coro->on_destroy)
2071 coro->on_destroy = newAV ();
2072
2073 av_push (coro->on_destroy, cb);
2074}
2075
2076static void
2077slf_destroy_join (pTHX_ struct CoroSLF *frame)
2078{
2079 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2080}
2081
2082static int
2083slf_check_join (pTHX_ struct CoroSLF *frame)
2084{
2085 struct coro *coro = (struct coro *)frame->data;
2086
2087 if (!coro->status)
2088 return 1;
2089
2090 frame->destroy = 0;
2091
2092 coro_push_av (aTHX_ coro->status, GIMME_V);
2093
2094 SvREFCNT_dec ((SV *)coro->hv);
2095
2096 return 0;
2097}
2098
2099static void
2100slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2101{
2102 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2103
2104 if (items > 1)
2105 croak ("join called with too many arguments");
2106
2107 if (coro->status)
2108 frame->prepare = prepare_nop;
2109 else
2110 {
2111 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2112 frame->prepare = prepare_schedule;
2113 }
2114
2115 frame->check = slf_check_join;
2116 frame->destroy = slf_destroy_join;
2117 frame->data = (void *)coro;
2118 SvREFCNT_inc (coro->hv);
2119}
2120
2121static void
1962coro_call_on_destroy (pTHX_ struct coro *coro) 2122coro_call_on_destroy (pTHX_ struct coro *coro)
1963{ 2123{
1964 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2124 AV *od = coro->on_destroy;
1965 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1966 2125
1967 if (on_destroyp) 2126 if (!od)
1968 { 2127 return;
1969 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1970 2128
2129 coro->on_destroy = 0;
2130 sv_2mortal ((SV *)od);
2131
1971 while (AvFILLp (on_destroy) >= 0) 2132 while (AvFILLp (od) >= 0)
2133 {
2134 SV *cb = sv_2mortal (av_pop (od));
2135
2136 /* coro hv's (and only hv's at the moment) are supported as well */
2137 if (SvSTATEhv_p (aTHX_ cb))
2138 api_ready (aTHX_ cb);
2139 else
1972 { 2140 {
1973 dSP; /* don't disturb outer sp */ 2141 dSP; /* don't disturb outer sp */
1974 SV *cb = av_pop (on_destroy);
1975
1976 PUSHMARK (SP); 2142 PUSHMARK (SP);
1977 2143
1978 if (statusp) 2144 if (coro->status)
1979 { 2145 {
1980 int i; 2146 PUTBACK;
1981 AV *status = (AV *)SvRV (*statusp); 2147 coro_push_av (aTHX_ coro->status, G_ARRAY);
1982 EXTEND (SP, AvFILLp (status) + 1); 2148 SPAGAIN;
1983
1984 for (i = 0; i <= AvFILLp (status); ++i)
1985 PUSHs (AvARRAY (status)[i]);
1986 } 2149 }
1987 2150
1988 PUTBACK; 2151 PUTBACK;
1989 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2152 call_sv (cb, G_VOID | G_DISCARD);
1990 } 2153 }
1991 } 2154 }
1992} 2155}
1993 2156
1994static void 2157static void
1995slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2158coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1996{ 2159{
2160 AV *av;
2161
2162 if (coro->status)
2163 {
2164 av = coro->status;
2165 av_clear (av);
2166 }
2167 else
2168 av = coro->status = newAV ();
2169
2170 /* items are actually not so common, so optimise for this case */
2171 if (items)
2172 {
1997 int i; 2173 int i;
1998 HV *hv = (HV *)SvRV (coro_current);
1999 AV *av = newAV ();
2000 2174
2001 av_extend (av, items - 1); 2175 av_extend (av, items - 1);
2176
2002 for (i = 0; i < items; ++i) 2177 for (i = 0; i < items; ++i)
2003 av_push (av, SvREFCNT_inc_NN (arg [i])); 2178 av_push (av, SvREFCNT_inc_NN (arg [i]));
2179 }
2180}
2004 2181
2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2182static void
2006 2183slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2184{
2007 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2185 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2008 api_ready (aTHX_ sv_manager); 2186 api_ready (aTHX_ sv_manager);
2009 2187
2010 frame->prepare = prepare_schedule; 2188 frame->prepare = prepare_schedule;
2011 frame->check = slf_check_repeat; 2189 frame->check = slf_check_repeat;
2012 2190
2013 /* as a minor optimisation, we could unwind all stacks here */ 2191 /* as a minor optimisation, we could unwind all stacks here */
2014 /* but that puts extra pressure on pp_slf, and is not worth much */ 2192 /* but that puts extra pressure on pp_slf, and is not worth much */
2015 /*coro_unwind_stacks (aTHX);*/ 2193 /*coro_unwind_stacks (aTHX);*/
2194}
2195
2196static void
2197slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2198{
2199 HV *coro_hv = (HV *)SvRV (coro_current);
2200
2201 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2202 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2203}
2204
2205static void
2206slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2207{
2208 HV *coro_hv;
2209 struct coro *coro;
2210
2211 if (items <= 0)
2212 croak ("Coro::cancel called without coro object,");
2213
2214 coro = SvSTATE (arg [0]);
2215 coro_hv = coro->hv;
2216
2217 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2218
2219 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2220 {
2221 /* coro currently busy cancelling something, so just notify it */
2222 coro->slf_frame.data = (void *)coro;
2223
2224 frame->prepare = prepare_nop;
2225 frame->check = slf_check_nop;
2226 }
2227 else if (coro_hv == (HV *)SvRV (coro_current))
2228 {
2229 /* cancelling the current coro is allowed, and equals terminate */
2230 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2231 }
2232 else
2233 {
2234 struct coro *self = SvSTATE_current;
2235
2236 /* otherwise we cancel directly, purely for speed reasons
2237 * unfortunately, this requires some magic trickery, as
2238 * somebody else could cancel us, so we have to fight the cancellation.
2239 * this is ugly, and hopefully fully worth the extra speed.
2240 * besides, I can't get the slow-but-safe version working...
2241 */
2242 slf_frame.data = 0;
2243 self->flags |= CF_NOCANCEL;
2244 coro_state_destroy (aTHX_ coro);
2245 self->flags &= ~CF_NOCANCEL;
2246
2247 if (slf_frame.data)
2248 {
2249 /* while we were busy we have been cancelled, so terminate */
2250 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2251 }
2252 else
2253 {
2254 frame->prepare = prepare_nop;
2255 frame->check = slf_check_nop;
2256 }
2257 }
2258}
2259
2260static int
2261slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2262{
2263 frame->prepare = 0;
2264 coro_unwind_stacks (aTHX);
2265
2266 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2267
2268 return 1;
2269}
2270
2271static int
2272safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2273{
2274 if (coro->cctx)
2275 croak ("coro inside C callback, unable to cancel at this time, caught");
2276
2277 if (coro->flags & CF_NEW)
2278 {
2279 coro_set_status (aTHX_ coro, arg, items);
2280 coro_state_destroy (aTHX_ coro);
2281 }
2282 else
2283 {
2284 if (!coro->slf_frame.prepare)
2285 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2286
2287 slf_destroy (aTHX_ coro);
2288
2289 coro_set_status (aTHX_ coro, arg, items);
2290 coro->slf_frame.prepare = prepare_nop;
2291 coro->slf_frame.check = slf_check_safe_cancel;
2292
2293 api_ready (aTHX_ (SV *)coro->hv);
2294 }
2295
2296 return 1;
2016} 2297}
2017 2298
2018/*****************************************************************************/ 2299/*****************************************************************************/
2019/* async pool handler */ 2300/* async pool handler */
2020 2301
… …
2051slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2332slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2052{ 2333{
2053 HV *hv = (HV *)SvRV (coro_current); 2334 HV *hv = (HV *)SvRV (coro_current);
2054 struct coro *coro = SvSTATE_hv ((SV *)hv); 2335 struct coro *coro = SvSTATE_hv ((SV *)hv);
2055 2336
2056 if (expect_true (coro->saved_deffh)) 2337 if (ecb_expect_true (coro->saved_deffh))
2057 { 2338 {
2058 /* subsequent iteration */ 2339 /* subsequent iteration */
2059 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2340 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2060 coro->saved_deffh = 0; 2341 coro->saved_deffh = 0;
2061 2342
2062 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2343 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2063 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2344 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2064 { 2345 {
2065 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2346 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2066 coro->invoke_av = newAV (); 2347 return;
2067
2068 frame->prepare = prepare_nop;
2069 } 2348 }
2070 else 2349 else
2071 { 2350 {
2072 av_clear (GvAV (PL_defgv)); 2351 av_clear (GvAV (PL_defgv));
2073 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2352 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2098 2377
2099static void 2378static void
2100coro_rouse_callback (pTHX_ CV *cv) 2379coro_rouse_callback (pTHX_ CV *cv)
2101{ 2380{
2102 dXSARGS; 2381 dXSARGS;
2103 SV *data = (SV *)GENSUB_ARG; 2382 SV *data = (SV *)S_GENSUB_ARG;
2104 2383
2105 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2384 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2106 { 2385 {
2107 /* first call, set args */ 2386 /* first call, set args */
2108 SV *coro = SvRV (data); 2387 SV *coro = SvRV (data);
… …
2123 2402
2124static int 2403static int
2125slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2404slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2126{ 2405{
2127 SV *data = (SV *)frame->data; 2406 SV *data = (SV *)frame->data;
2128 2407
2129 if (CORO_THROW) 2408 if (CORO_THROW)
2130 return 0; 2409 return 0;
2131 2410
2132 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2411 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2133 return 1; 2412 return 1;
… …
2169 cb = sv_2mortal (coro->rouse_cb); 2448 cb = sv_2mortal (coro->rouse_cb);
2170 coro->rouse_cb = 0; 2449 coro->rouse_cb = 0;
2171 } 2450 }
2172 2451
2173 if (!SvROK (cb) 2452 if (!SvROK (cb)
2174 || SvTYPE (SvRV (cb)) != SVt_PVCV 2453 || SvTYPE (SvRV (cb)) != SVt_PVCV
2175 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2454 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2176 croak ("Coro::rouse_wait called with illegal callback argument,"); 2455 croak ("Coro::rouse_wait called with illegal callback argument,");
2177 2456
2178 { 2457 {
2179 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2458 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2180 SV *data = (SV *)GENSUB_ARG; 2459 SV *data = (SV *)S_GENSUB_ARG;
2181 2460
2182 frame->data = (void *)data; 2461 frame->data = (void *)data;
2183 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2462 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2184 frame->check = slf_check_rouse_wait; 2463 frame->check = slf_check_rouse_wait;
2185 } 2464 }
… …
2189coro_new_rouse_cb (pTHX) 2468coro_new_rouse_cb (pTHX)
2190{ 2469{
2191 HV *hv = (HV *)SvRV (coro_current); 2470 HV *hv = (HV *)SvRV (coro_current);
2192 struct coro *coro = SvSTATE_hv (hv); 2471 struct coro *coro = SvSTATE_hv (hv);
2193 SV *data = newRV_inc ((SV *)hv); 2472 SV *data = newRV_inc ((SV *)hv);
2194 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2473 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2195 2474
2196 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2475 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2197 SvREFCNT_dec (data); /* magicext increases the refcount */ 2476 SvREFCNT_dec (data); /* magicext increases the refcount */
2198 2477
2199 SvREFCNT_dec (coro->rouse_cb); 2478 SvREFCNT_dec (coro->rouse_cb);
… …
2296static void 2575static void
2297slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2576slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2298{ 2577{
2299 frame->prepare = prepare_cede_notself; 2578 frame->prepare = prepare_cede_notself;
2300 frame->check = slf_check_nop; 2579 frame->check = slf_check_nop;
2580}
2581
2582/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2583static void
2584slf_destroy (pTHX_ struct coro *coro)
2585{
2586 /* this callback is reserved for slf functions needing to do cleanup */
2587 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2588 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2589
2590 /*
2591 * The on_destroy above most likely is from an SLF call.
2592 * Since by definition the SLF call will not finish when we destroy
2593 * the coro, we will have to force-finish it here, otherwise
2594 * cleanup functions cannot call SLF functions.
2595 */
2596 coro->slf_frame.prepare = 0;
2301} 2597}
2302 2598
2303/* 2599/*
2304 * these not obviously related functions are all rolled into one 2600 * these not obviously related functions are all rolled into one
2305 * function to increase chances that they all will call transfer with the same 2601 * function to increase chances that they all will call transfer with the same
… …
2312 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2608 I32 checkmark; /* mark SP to see how many elements check has pushed */
2313 2609
2314 /* set up the slf frame, unless it has already been set-up */ 2610 /* set up the slf frame, unless it has already been set-up */
2315 /* the latter happens when a new coro has been started */ 2611 /* the latter happens when a new coro has been started */
2316 /* or when a new cctx was attached to an existing coroutine */ 2612 /* or when a new cctx was attached to an existing coroutine */
2317 if (expect_true (!slf_frame.prepare)) 2613 if (ecb_expect_true (!slf_frame.prepare))
2318 { 2614 {
2319 /* first iteration */ 2615 /* first iteration */
2320 dSP; 2616 dSP;
2321 SV **arg = PL_stack_base + TOPMARK + 1; 2617 SV **arg = PL_stack_base + TOPMARK + 1;
2322 int items = SP - arg; /* args without function object */ 2618 int items = SP - arg; /* args without function object */
… …
2363 while (slf_frame.check (aTHX_ &slf_frame)); 2659 while (slf_frame.check (aTHX_ &slf_frame));
2364 2660
2365 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2661 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2366 2662
2367 /* exception handling */ 2663 /* exception handling */
2368 if (expect_false (CORO_THROW)) 2664 if (ecb_expect_false (CORO_THROW))
2369 { 2665 {
2370 SV *exception = sv_2mortal (CORO_THROW); 2666 SV *exception = sv_2mortal (CORO_THROW);
2371 2667
2372 CORO_THROW = 0; 2668 CORO_THROW = 0;
2373 sv_setsv (ERRSV, exception); 2669 sv_setsv (ERRSV, exception);
2374 croak (0); 2670 croak (0);
2375 } 2671 }
2376 2672
2377 /* return value handling - mostly like entersub */ 2673 /* return value handling - mostly like entersub */
2378 /* make sure we put something on the stack in scalar context */ 2674 /* make sure we put something on the stack in scalar context */
2379 if (GIMME_V == G_SCALAR) 2675 if (GIMME_V == G_SCALAR
2676 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2380 { 2677 {
2381 dSP; 2678 dSP;
2382 SV **bot = PL_stack_base + checkmark; 2679 SV **bot = PL_stack_base + checkmark;
2383 2680
2384 if (sp == bot) /* too few, push undef */ 2681 if (sp == bot) /* too few, push undef */
2385 bot [1] = &PL_sv_undef; 2682 bot [1] = &PL_sv_undef;
2386 else if (sp != bot + 1) /* too many, take last one */ 2683 else /* too many, take last one */
2387 bot [1] = *sp; 2684 bot [1] = *sp;
2388 2685
2389 SP = bot + 1; 2686 SP = bot + 1;
2390 2687
2391 PUTBACK; 2688 PUTBACK;
… …
2424 if (PL_op->op_flags & OPf_STACKED) 2721 if (PL_op->op_flags & OPf_STACKED)
2425 { 2722 {
2426 if (items > slf_arga) 2723 if (items > slf_arga)
2427 { 2724 {
2428 slf_arga = items; 2725 slf_arga = items;
2429 free (slf_argv); 2726 Safefree (slf_argv);
2430 slf_argv = malloc (slf_arga * sizeof (SV *)); 2727 New (0, slf_argv, slf_arga, SV *);
2431 } 2728 }
2432 2729
2433 slf_argc = items; 2730 slf_argc = items;
2434 2731
2435 for (i = 0; i < items; ++i) 2732 for (i = 0; i < items; ++i)
… …
2498{ 2795{
2499 PerlIOBuf base; 2796 PerlIOBuf base;
2500 NV next, every; 2797 NV next, every;
2501} PerlIOCede; 2798} PerlIOCede;
2502 2799
2503static IV 2800static IV ecb_cold
2504PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2801PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2505{ 2802{
2506 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2803 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2507 2804
2508 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2805 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2509 self->next = nvtime () + self->every; 2806 self->next = nvtime () + self->every;
2510 2807
2511 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2808 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2512} 2809}
2513 2810
2514static SV * 2811static SV * ecb_cold
2515PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2812PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2516{ 2813{
2517 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2814 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2518 2815
2519 return newSVnv (self->every); 2816 return newSVnv (self->every);
… …
2631 SvREFCNT_dec (cb); 2928 SvREFCNT_dec (cb);
2632 } 2929 }
2633} 2930}
2634 2931
2635static void 2932static void
2636coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2933coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2637{ 2934{
2638 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2935 /* call $sem->adjust (0) to possibly wake up some other waiters */
2639 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2936 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2640} 2937}
2641 2938
2642static int 2939static int
2643slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2940slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2644{ 2941{
2645 AV *av = (AV *)frame->data; 2942 AV *av = (AV *)frame->data;
2646 SV *count_sv = AvARRAY (av)[0]; 2943 SV *count_sv = AvARRAY (av)[0];
2944 SV *coro_hv = SvRV (coro_current);
2647 2945
2648 /* if we are about to throw, don't actually acquire the lock, just throw */ 2946 /* if we are about to throw, don't actually acquire the lock, just throw */
2649 if (CORO_THROW) 2947 if (CORO_THROW)
2650 return 0; 2948 return 0;
2651 else if (SvIVX (count_sv) > 0) 2949 else if (SvIVX (count_sv) > 0)
2652 { 2950 {
2653 SvSTATE_current->on_destroy = 0; 2951 frame->destroy = 0;
2654 2952
2655 if (acquire) 2953 if (acquire)
2656 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2954 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2657 else 2955 else
2658 coro_semaphore_adjust (aTHX_ av, 0); 2956 coro_semaphore_adjust (aTHX_ av, 0);
… …
2663 { 2961 {
2664 int i; 2962 int i;
2665 /* if we were woken up but can't down, we look through the whole */ 2963 /* if we were woken up but can't down, we look through the whole */
2666 /* waiters list and only add us if we aren't in there already */ 2964 /* waiters list and only add us if we aren't in there already */
2667 /* this avoids some degenerate memory usage cases */ 2965 /* this avoids some degenerate memory usage cases */
2668 2966 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2669 for (i = 1; i <= AvFILLp (av); ++i)
2670 if (AvARRAY (av)[i] == SvRV (coro_current)) 2967 if (AvARRAY (av)[i] == coro_hv)
2671 return 1; 2968 return 1;
2672 2969
2673 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2970 av_push (av, SvREFCNT_inc (coro_hv));
2674 return 1; 2971 return 1;
2675 } 2972 }
2676} 2973}
2677 2974
2678static int 2975static int
… …
2701 { 2998 {
2702 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2999 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2703 3000
2704 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3001 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2705 frame->prepare = prepare_schedule; 3002 frame->prepare = prepare_schedule;
2706
2707 /* to avoid race conditions when a woken-up coro gets terminated */ 3003 /* to avoid race conditions when a woken-up coro gets terminated */
2708 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3004 /* we arrange for a temporary on_destroy that calls adjust (0) */
2709 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3005 frame->destroy = coro_semaphore_destroy;
2710 } 3006 }
2711} 3007}
2712 3008
2713static void 3009static void
2714slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3010slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2722{ 3018{
2723 if (items >= 2) 3019 if (items >= 2)
2724 { 3020 {
2725 /* callback form */ 3021 /* callback form */
2726 AV *av = (AV *)SvRV (arg [0]); 3022 AV *av = (AV *)SvRV (arg [0]);
2727 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3023 SV *cb_cv = s_get_cv_croak (arg [1]);
2728 3024
2729 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3025 av_push (av, SvREFCNT_inc_NN (cb_cv));
2730 3026
2731 if (SvIVX (AvARRAY (av)[0]) > 0) 3027 if (SvIVX (AvARRAY (av)[0]) > 0)
2732 coro_semaphore_adjust (aTHX_ av, 0); 3028 coro_semaphore_adjust (aTHX_ av, 0);
… …
2792{ 3088{
2793 AV *av = (AV *)SvRV (arg [0]); 3089 AV *av = (AV *)SvRV (arg [0]);
2794 3090
2795 if (items >= 2) 3091 if (items >= 2)
2796 { 3092 {
2797 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3093 SV *cb_cv = s_get_cv_croak (arg [1]);
2798 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3094 av_push (av, SvREFCNT_inc_NN (cb_cv));
2799 3095
2800 if (SvIVX (AvARRAY (av)[0])) 3096 if (SvIVX (AvARRAY (av)[0]))
2801 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3097 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2802 3098
2803 frame->prepare = prepare_nop; 3099 frame->prepare = prepare_nop;
2804 frame->check = slf_check_nop; 3100 frame->check = slf_check_nop;
2805 } 3101 }
2806 else if (SvIVX (AvARRAY (av)[0])) 3102 else if (SvIVX (AvARRAY (av)[0]))
… …
2837 3133
2838static void 3134static void
2839coro_aio_callback (pTHX_ CV *cv) 3135coro_aio_callback (pTHX_ CV *cv)
2840{ 3136{
2841 dXSARGS; 3137 dXSARGS;
2842 AV *state = (AV *)GENSUB_ARG; 3138 AV *state = (AV *)S_GENSUB_ARG;
2843 SV *coro = av_pop (state); 3139 SV *coro = av_pop (state);
2844 SV *data_sv = newSV (sizeof (struct io_state)); 3140 SV *data_sv = newSV (sizeof (struct io_state));
2845 3141
2846 av_extend (state, items - 1); 3142 av_extend (state, items - 1);
2847 3143
… …
2883 /* it quickly returns */ 3179 /* it quickly returns */
2884 if (CORO_THROW) 3180 if (CORO_THROW)
2885 return 0; 3181 return 0;
2886 3182
2887 /* one element that is an RV? repeat! */ 3183 /* one element that is an RV? repeat! */
2888 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3184 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2889 return 1; 3185 return 1;
2890 3186
2891 /* restore status */ 3187 /* restore status */
2892 { 3188 {
2893 SV *data_sv = av_pop (state); 3189 SV *data_sv = av_pop (state);
… …
2932 dSP; 3228 dSP;
2933 3229
2934 static SV *prio_cv; 3230 static SV *prio_cv;
2935 static SV *prio_sv; 3231 static SV *prio_sv;
2936 3232
2937 if (expect_false (!prio_cv)) 3233 if (ecb_expect_false (!prio_cv))
2938 { 3234 {
2939 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3235 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2940 prio_sv = newSViv (0); 3236 prio_sv = newSViv (0);
2941 } 3237 }
2942 3238
… …
2961 3257
2962 for (i = 0; i < items; ++i) 3258 for (i = 0; i < items; ++i)
2963 PUSHs (arg [i]); 3259 PUSHs (arg [i]);
2964 3260
2965 /* now push the callback closure */ 3261 /* now push the callback closure */
2966 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3262 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2967 3263
2968 /* now call the AIO function - we assume our request is uncancelable */ 3264 /* now call the AIO function - we assume our request is uncancelable */
2969 PUTBACK; 3265 PUTBACK;
2970 call_sv ((SV *)req, G_VOID | G_DISCARD); 3266 call_sv ((SV *)req, G_VOID | G_DISCARD);
2971 } 3267 }
2972 3268
2973 /* now that the requets is going, we loop toll we have a result */ 3269 /* now that the request is going, we loop till we have a result */
2974 frame->data = (void *)state; 3270 frame->data = (void *)state;
2975 frame->prepare = prepare_schedule; 3271 frame->prepare = prepare_schedule;
2976 frame->check = slf_check_aio_req; 3272 frame->check = slf_check_aio_req;
2977} 3273}
2978 3274
… …
2988 3284
2989/*****************************************************************************/ 3285/*****************************************************************************/
2990 3286
2991#if CORO_CLONE 3287#if CORO_CLONE
2992# include "clone.c" 3288# include "clone.c"
3289#endif
3290
3291/*****************************************************************************/
3292
3293static SV *
3294coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3295{
3296 SV *coro_sv;
3297 struct coro *coro;
3298 MAGIC *mg;
3299 HV *hv;
3300 SV *cb;
3301 int i;
3302
3303 if (argc > 0)
3304 {
3305 cb = s_get_cv_croak (argv [0]);
3306
3307 if (!is_coro)
3308 {
3309 if (CvISXSUB (cb))
3310 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3311
3312 if (!CvROOT (cb))
3313 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3314 }
3315 }
3316
3317 Newz (0, coro, 1, struct coro);
3318 coro->args = newAV ();
3319 coro->flags = CF_NEW;
3320
3321 if (coro_first) coro_first->prev = coro;
3322 coro->next = coro_first;
3323 coro_first = coro;
3324
3325 coro->hv = hv = newHV ();
3326 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3327 mg->mg_flags |= MGf_DUP;
3328 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3329
3330 if (argc > 0)
3331 {
3332 av_extend (coro->args, argc + is_coro - 1);
3333
3334 if (is_coro)
3335 {
3336 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3337 cb = (SV *)cv_coro_run;
3338 }
3339
3340 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3341
3342 for (i = 1; i < argc; i++)
3343 av_push (coro->args, newSVsv (argv [i]));
3344 }
3345
3346 return coro_sv;
3347}
3348
3349#ifndef __cplusplus
3350ecb_cold XS(boot_Coro__State);
3351#endif
3352
3353#if CORO_JIT
3354
3355static void ecb_noinline ecb_cold
3356pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3357{
3358 dSP;
3359 AV *av = newAV ();
3360
3361 av_store (av, 3, newSVuv (d));
3362 av_store (av, 2, newSVuv (c));
3363 av_store (av, 1, newSVuv (b));
3364 av_store (av, 0, newSVuv (a));
3365
3366 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3367
3368 PUTBACK;
3369}
3370
3371static void ecb_noinline ecb_cold
3372jit_init (pTHX)
3373{
3374 dSP;
3375 SV *load, *save;
3376 char *map_base;
3377 char *load_ptr, *save_ptr;
3378 STRLEN load_len, save_len, map_len;
3379 int count;
3380
3381 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3382
3383 PUSHMARK (SP);
3384 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3385 #include "state.h"
3386 count = call_pv ("Coro::State::_jit", G_ARRAY);
3387 SPAGAIN;
3388
3389 save = POPs; save_ptr = SvPVbyte (save, save_len);
3390 load = POPs; load_ptr = SvPVbyte (load, load_len);
3391
3392 map_len = load_len + save_len + 16;
3393
3394 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3395
3396 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3397
3398 load_perl_slots = (load_save_perl_slots_type)map_base;
3399 memcpy (map_base, load_ptr, load_len);
3400
3401 map_base += (load_len + 15) & ~15;
3402
3403 save_perl_slots = (load_save_perl_slots_type)map_base;
3404 memcpy (map_base, save_ptr, save_len);
3405
3406 /* we are good citizens and try to make the page read-only, so the evil evil */
3407 /* hackers might have it a bit more difficult */
3408 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3409
3410 PUTBACK;
3411 eval_pv ("undef &Coro::State::_jit", 1);
3412}
3413
2993#endif 3414#endif
2994 3415
2995MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3416MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2996 3417
2997PROTOTYPES: DISABLE 3418PROTOTYPES: DISABLE
… …
3001#ifdef USE_ITHREADS 3422#ifdef USE_ITHREADS
3002# if CORO_PTHREAD 3423# if CORO_PTHREAD
3003 coro_thx = PERL_GET_CONTEXT; 3424 coro_thx = PERL_GET_CONTEXT;
3004# endif 3425# endif
3005#endif 3426#endif
3006 BOOT_PAGESIZE; 3427 /* perl defines these to check for existance first, but why it doesn't */
3428 /* just create them one at init time is not clear to me, except for */
3429 /* programs trying to delete them, but... */
3430 /* anyway, we declare this as invalid and make sure they are initialised here */
3431 DEFSV;
3432 ERRSV;
3007 3433
3008 cctx_current = cctx_new_empty (); 3434 cctx_current = cctx_new_empty ();
3009 3435
3010 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3436 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3011 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3437 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3051 coroapi.prepare_nop = prepare_nop; 3477 coroapi.prepare_nop = prepare_nop;
3052 coroapi.prepare_schedule = prepare_schedule; 3478 coroapi.prepare_schedule = prepare_schedule;
3053 coroapi.prepare_cede = prepare_cede; 3479 coroapi.prepare_cede = prepare_cede;
3054 coroapi.prepare_cede_notself = prepare_cede_notself; 3480 coroapi.prepare_cede_notself = prepare_cede_notself;
3055 3481
3056 { 3482 time_init (aTHX);
3057 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3058
3059 if (!svp) croak ("Time::HiRes is required");
3060 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3061
3062 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3063
3064 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3065 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3066 }
3067 3483
3068 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3484 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3485#if CORO_JIT
3486 PUTBACK;
3487 jit_init (aTHX);
3488 SPAGAIN;
3489#endif
3069} 3490}
3070 3491
3071SV * 3492SV *
3072new (char *klass, ...) 3493new (SV *klass, ...)
3073 ALIAS: 3494 ALIAS:
3074 Coro::new = 1 3495 Coro::new = 1
3075 CODE: 3496 CODE:
3076{ 3497 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
3077 struct coro *coro; 3498 OUTPUT:
3078 MAGIC *mg;
3079 HV *hv;
3080 CV *cb;
3081 int i;
3082
3083 if (items > 1)
3084 {
3085 cb = coro_sv_2cv (aTHX_ ST (1));
3086
3087 if (!ix)
3088 {
3089 if (CvISXSUB (cb))
3090 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3091
3092 if (!CvROOT (cb))
3093 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3094 }
3095 }
3096
3097 Newz (0, coro, 1, struct coro);
3098 coro->args = newAV ();
3099 coro->flags = CF_NEW;
3100
3101 if (coro_first) coro_first->prev = coro;
3102 coro->next = coro_first;
3103 coro_first = coro;
3104
3105 coro->hv = hv = newHV ();
3106 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3107 mg->mg_flags |= MGf_DUP;
3108 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3109
3110 if (items > 1)
3111 {
3112 av_extend (coro->args, items - 1 + ix - 1);
3113
3114 if (ix)
3115 {
3116 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3117 cb = cv_coro_run;
3118 }
3119
3120 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3121
3122 for (i = 2; i < items; i++)
3123 av_push (coro->args, newSVsv (ST (i)));
3124 }
3125}
3126 OUTPUT:
3127 RETVAL 3499 RETVAL
3128 3500
3129void 3501void
3130transfer (...) 3502transfer (...)
3131 PROTOTYPE: $$ 3503 PROTOTYPE: $$
3132 CODE: 3504 CODE:
3133 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3505 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3134
3135bool
3136_destroy (SV *coro_sv)
3137 CODE:
3138 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3139 OUTPUT:
3140 RETVAL
3141
3142void
3143_exit (int code)
3144 PROTOTYPE: $
3145 CODE:
3146 _exit (code);
3147 3506
3148SV * 3507SV *
3149clone (Coro::State coro) 3508clone (Coro::State coro)
3150 CODE: 3509 CODE:
3151{ 3510{
… …
3206void 3565void
3207list () 3566list ()
3208 PROTOTYPE: 3567 PROTOTYPE:
3209 PPCODE: 3568 PPCODE:
3210{ 3569{
3211 struct coro *coro; 3570 struct coro *coro;
3212 for (coro = coro_first; coro; coro = coro->next) 3571 for (coro = coro_first; coro; coro = coro->next)
3213 if (coro->hv) 3572 if (coro->hv)
3214 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3573 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3215} 3574}
3216 3575
… …
3221 CODE: 3580 CODE:
3222{ 3581{
3223 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3582 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3224 { 3583 {
3225 struct coro *current = SvSTATE_current; 3584 struct coro *current = SvSTATE_current;
3585 struct CoroSLF slf_save;
3226 3586
3227 if (current != coro) 3587 if (current != coro)
3228 { 3588 {
3229 PUTBACK; 3589 PUTBACK;
3230 save_perl (aTHX_ current); 3590 save_perl (aTHX_ current);
3231 load_perl (aTHX_ coro); 3591 load_perl (aTHX_ coro);
3592 /* the coro is most likely in an active SLF call.
3593 * while not strictly required (the code we execute is
3594 * not allowed to call any SLF functions), it's cleaner
3595 * to reinitialise the slf_frame and restore it later.
3596 * This might one day allow us to actually do SLF calls
3597 * from code executed here.
3598 */
3599 slf_save = slf_frame;
3600 slf_frame.prepare = 0;
3232 SPAGAIN; 3601 SPAGAIN;
3233 } 3602 }
3234 3603
3235 PUSHSTACK; 3604 PUSHSTACK;
3236 3605
… …
3246 SPAGAIN; 3615 SPAGAIN;
3247 3616
3248 if (current != coro) 3617 if (current != coro)
3249 { 3618 {
3250 PUTBACK; 3619 PUTBACK;
3620 slf_frame = slf_save;
3251 save_perl (aTHX_ coro); 3621 save_perl (aTHX_ coro);
3252 load_perl (aTHX_ current); 3622 load_perl (aTHX_ current);
3253 SPAGAIN; 3623 SPAGAIN;
3254 } 3624 }
3255 } 3625 }
… …
3260 PROTOTYPE: $ 3630 PROTOTYPE: $
3261 ALIAS: 3631 ALIAS:
3262 is_ready = CF_READY 3632 is_ready = CF_READY
3263 is_running = CF_RUNNING 3633 is_running = CF_RUNNING
3264 is_new = CF_NEW 3634 is_new = CF_NEW
3265 is_destroyed = CF_DESTROYED 3635 is_destroyed = CF_ZOMBIE
3636 is_zombie = CF_ZOMBIE
3266 is_suspended = CF_SUSPENDED 3637 is_suspended = CF_SUSPENDED
3267 CODE: 3638 CODE:
3268 RETVAL = boolSV (coro->flags & ix); 3639 RETVAL = boolSV (coro->flags & ix);
3269 OUTPUT: 3640 OUTPUT:
3270 RETVAL 3641 RETVAL
3271 3642
3272void 3643void
3273throw (Coro::State self, SV *throw = &PL_sv_undef) 3644throw (SV *self, SV *exception = &PL_sv_undef)
3274 PROTOTYPE: $;$ 3645 PROTOTYPE: $;$
3275 CODE: 3646 CODE:
3276{ 3647{
3648 struct coro *coro = SvSTATE (self);
3277 struct coro *current = SvSTATE_current; 3649 struct coro *current = SvSTATE_current;
3278 SV **throwp = self == current ? &CORO_THROW : &self->except; 3650 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3279 SvREFCNT_dec (*throwp); 3651 SvREFCNT_dec (*exceptionp);
3280 SvGETMAGIC (throw); 3652 SvGETMAGIC (exception);
3281 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3653 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3654
3655 api_ready (aTHX_ self);
3282} 3656}
3283 3657
3284void 3658void
3285api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3659api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3286 PROTOTYPE: $;$ 3660 PROTOTYPE: $;$
… …
3341 3715
3342void 3716void
3343cancel (Coro::State self) 3717cancel (Coro::State self)
3344 CODE: 3718 CODE:
3345 coro_state_destroy (aTHX_ self); 3719 coro_state_destroy (aTHX_ self);
3346 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3347
3348 3720
3349SV * 3721SV *
3350enable_times (int enabled = enable_times) 3722enable_times (int enabled = enable_times)
3351 CODE: 3723 CODE:
3352{ 3724{
… …
3365 3737
3366void 3738void
3367times (Coro::State self) 3739times (Coro::State self)
3368 PPCODE: 3740 PPCODE:
3369{ 3741{
3370 struct coro *current = SvSTATE (coro_current); 3742 struct coro *current = SvSTATE (coro_current);
3371 3743
3372 if (expect_false (current == self)) 3744 if (ecb_expect_false (current == self))
3373 { 3745 {
3374 coro_times_update (); 3746 coro_times_update ();
3375 coro_times_add (SvSTATE (coro_current)); 3747 coro_times_add (SvSTATE (coro_current));
3376 } 3748 }
3377 3749
3378 EXTEND (SP, 2); 3750 EXTEND (SP, 2);
3379 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3751 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3380 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3752 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3381 3753
3382 if (expect_false (current == self)) 3754 if (ecb_expect_false (current == self))
3383 coro_times_sub (SvSTATE (coro_current)); 3755 coro_times_sub (SvSTATE (coro_current));
3384} 3756}
3757
3758void
3759swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3760 CODE:
3761{
3762 struct coro *current = SvSTATE_current;
3763
3764 if (current == coro)
3765 SWAP_SVS (current);
3766
3767 if (!coro->swap_sv)
3768 coro->swap_sv = newAV ();
3769
3770 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3771 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3772
3773 if (current == coro)
3774 SWAP_SVS (current);
3775}
3776
3385 3777
3386MODULE = Coro::State PACKAGE = Coro 3778MODULE = Coro::State PACKAGE = Coro
3387 3779
3388BOOT: 3780BOOT:
3389{ 3781{
3390 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3782 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3391 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3783 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3392 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3784 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3393 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3394 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3785 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3395 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3786 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3396 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3787 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3397 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3788 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3398 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3789 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3399 3790
3400 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3791 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3401 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3792 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3402 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3793 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3403 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3794 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3404 3795
3405 coro_stash = gv_stashpv ("Coro", TRUE); 3796 coro_stash = gv_stashpv ("Coro", TRUE);
3406 3797
3407 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3798 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3408 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3799 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
… …
3427 sv_setiv (sv, (IV)&coroapi); 3818 sv_setiv (sv, (IV)&coroapi);
3428 SvREADONLY_on (sv); 3819 SvREADONLY_on (sv);
3429 } 3820 }
3430} 3821}
3431 3822
3823SV *
3824async (...)
3825 PROTOTYPE: &@
3826 CODE:
3827 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3828 api_ready (aTHX_ RETVAL);
3829 OUTPUT:
3830 RETVAL
3831
3832void
3833_destroy (Coro::State coro)
3834 CODE:
3835 /* used by the manager thread */
3836 coro_state_destroy (aTHX_ coro);
3837
3838void
3839on_destroy (Coro::State coro, SV *cb)
3840 CODE:
3841 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3842
3843void
3844join (...)
3845 CODE:
3846 CORO_EXECUTE_SLF_XS (slf_init_join);
3847
3432void 3848void
3433terminate (...) 3849terminate (...)
3434 CODE: 3850 CODE:
3435 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3851 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3852
3853void
3854cancel (...)
3855 CODE:
3856 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3857
3858int
3859safe_cancel (Coro::State self, ...)
3860 C_ARGS: aTHX_ self, &ST (1), items - 1
3436 3861
3437void 3862void
3438schedule (...) 3863schedule (...)
3439 CODE: 3864 CODE:
3440 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3865 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3470_set_readyhook (SV *hook) 3895_set_readyhook (SV *hook)
3471 PROTOTYPE: $ 3896 PROTOTYPE: $
3472 CODE: 3897 CODE:
3473 SvREFCNT_dec (coro_readyhook); 3898 SvREFCNT_dec (coro_readyhook);
3474 SvGETMAGIC (hook); 3899 SvGETMAGIC (hook);
3900 if (SvOK (hook))
3901 {
3475 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3902 coro_readyhook = newSVsv (hook);
3903 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3904 }
3905 else
3906 {
3907 coro_readyhook = 0;
3908 CORO_READYHOOK = 0;
3909 }
3476 3910
3477int 3911int
3478prio (Coro::State coro, int newprio = 0) 3912prio (Coro::State coro, int newprio = 0)
3479 PROTOTYPE: $;$ 3913 PROTOTYPE: $;$
3480 ALIAS: 3914 ALIAS:
… …
3544 for (i = 1; i < items; ++i) 3978 for (i = 1; i < items; ++i)
3545 av_push (av, SvREFCNT_inc_NN (ST (i))); 3979 av_push (av, SvREFCNT_inc_NN (ST (i)));
3546 3980
3547 if ((SV *)hv == &PL_sv_undef) 3981 if ((SV *)hv == &PL_sv_undef)
3548 { 3982 {
3549 PUSHMARK (SP); 3983 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3550 EXTEND (SP, 2);
3551 PUSHs (sv_Coro);
3552 PUSHs ((SV *)cv_pool_handler);
3553 PUTBACK;
3554 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3555 SPAGAIN;
3556
3557 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3984 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3985 SvREFCNT_dec (sv);
3558 } 3986 }
3559 3987
3560 { 3988 {
3561 struct coro *coro = SvSTATE_hv (hv); 3989 struct coro *coro = SvSTATE_hv (hv);
3562 3990
… …
3594 on_leave = 1 4022 on_leave = 1
3595 PROTOTYPE: & 4023 PROTOTYPE: &
3596 CODE: 4024 CODE:
3597{ 4025{
3598 struct coro *coro = SvSTATE_current; 4026 struct coro *coro = SvSTATE_current;
3599 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4027 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3600 4028
3601 block = (SV *)coro_sv_2cv (aTHX_ block); 4029 block = s_get_cv_croak (block);
3602 4030
3603 if (!*avp) 4031 if (!*avp)
3604 *avp = newAV (); 4032 *avp = newAV ();
3605 4033
3606 av_push (*avp, SvREFCNT_inc (block)); 4034 av_push (*avp, SvREFCNT_inc (block));
… …
3624 4052
3625SV * 4053SV *
3626new (SV *klass, SV *count = 0) 4054new (SV *klass, SV *count = 0)
3627 CODE: 4055 CODE:
3628{ 4056{
3629 int semcnt = 1; 4057 int semcnt = 1;
3630 4058
3631 if (count) 4059 if (count)
3632 { 4060 {
3633 SvGETMAGIC (count); 4061 SvGETMAGIC (count);
3634 4062
… …
3694 XSRETURN_NO; 4122 XSRETURN_NO;
3695} 4123}
3696 4124
3697void 4125void
3698waiters (SV *self) 4126waiters (SV *self)
3699 PPCODE: 4127 PPCODE:
3700{ 4128{
3701 AV *av = (AV *)SvRV (self); 4129 AV *av = (AV *)SvRV (self);
3702 int wcount = AvFILLp (av) + 1 - 1; 4130 int wcount = AvFILLp (av) + 1 - 1;
3703 4131
3704 if (GIMME_V == G_SCALAR) 4132 if (GIMME_V == G_SCALAR)
… …
3713} 4141}
3714 4142
3715MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4143MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3716 4144
3717void 4145void
3718_may_delete (SV *sem, int count, int extra_refs) 4146_may_delete (SV *sem, int count, unsigned int extra_refs)
3719 PPCODE: 4147 PPCODE:
3720{ 4148{
3721 AV *av = (AV *)SvRV (sem); 4149 AV *av = (AV *)SvRV (sem);
3722 4150
3723 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4151 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3724 && AvFILLp (av) == 0 /* no waiters, just count */ 4152 && AvFILLp (av) == 0 /* no waiters, just count */
3725 && SvIV (AvARRAY (av)[0]) == count) 4153 && SvIV (AvARRAY (av)[0]) == count)
3726 XSRETURN_YES; 4154 XSRETURN_YES;
… …
3747 4175
3748void 4176void
3749broadcast (SV *self) 4177broadcast (SV *self)
3750 CODE: 4178 CODE:
3751{ 4179{
3752 AV *av = (AV *)SvRV (self); 4180 AV *av = (AV *)SvRV (self);
3753 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4181 coro_signal_wake (aTHX_ av, AvFILLp (av));
3754} 4182}
3755 4183
3756void 4184void
3757send (SV *self) 4185send (SV *self)
… …
3765 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4193 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3766} 4194}
3767 4195
3768IV 4196IV
3769awaited (SV *self) 4197awaited (SV *self)
3770 CODE: 4198 CODE:
3771 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4199 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3772 OUTPUT: 4200 OUTPUT:
3773 RETVAL 4201 RETVAL
3774 4202
3775 4203
… …
3780 4208
3781void 4209void
3782_schedule (...) 4210_schedule (...)
3783 CODE: 4211 CODE:
3784{ 4212{
3785 static int incede; 4213 static int incede;
3786 4214
3787 api_cede_notself (aTHX); 4215 api_cede_notself (aTHX);
3788 4216
3789 ++incede; 4217 ++incede;
3790 while (coro_nready >= incede && api_cede (aTHX)) 4218 while (coro_nready >= incede && api_cede (aTHX))
… …
3806 4234
3807void 4235void
3808_register (char *target, char *proto, SV *req) 4236_register (char *target, char *proto, SV *req)
3809 CODE: 4237 CODE:
3810{ 4238{
3811 CV *req_cv = coro_sv_2cv (aTHX_ req); 4239 SV *req_cv = s_get_cv_croak (req);
3812 /* newXSproto doesn't return the CV on 5.8 */ 4240 /* newXSproto doesn't return the CV on 5.8 */
3813 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4241 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3814 sv_setpv ((SV *)slf_cv, proto); 4242 sv_setpv ((SV *)slf_cv, proto);
3815 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4243 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3816} 4244}
3817 4245
4246MODULE = Coro::State PACKAGE = Coro::Select
4247
4248void
4249patch_pp_sselect ()
4250 CODE:
4251 if (!coro_old_pp_sselect)
4252 {
4253 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4254 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4255 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4256 }
4257
4258void
4259unpatch_pp_sselect ()
4260 CODE:
4261 if (coro_old_pp_sselect)
4262 {
4263 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4264 coro_old_pp_sselect = 0;
4265 }
4266
4267MODULE = Coro::State PACKAGE = Coro::Util
4268
4269void
4270_exit (int code)
4271 CODE:
4272 _exit (code);
4273
4274NV
4275time ()
4276 CODE:
4277 RETVAL = nvtime (aTHX);
4278 OUTPUT:
4279 RETVAL
4280
4281NV
4282gettimeofday ()
4283 PPCODE:
4284{
4285 UV tv [2];
4286 u2time (aTHX_ tv);
4287 EXTEND (SP, 2);
4288 PUSHs (sv_2mortal (newSVuv (tv [0])));
4289 PUSHs (sv_2mortal (newSVuv (tv [1])));
4290}
4291

Diff Legend

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