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

Diff Legend

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