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.361 by root, Wed Jul 1 07:26:40 2009 UTC vs.
Revision 1.437 by root, Tue Nov 5 15:13:42 2013 UTC

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

Diff Legend

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