ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.358 by root, Mon Jun 29 04:30:25 2009 UTC vs.
Revision 1.429 by root, Fri Dec 7 14:21:09 2012 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
… …
170# define CORO_CLOCK_THREAD_CPUTIME_ID 3 96# define CORO_CLOCK_THREAD_CPUTIME_ID 3
171# endif 97# endif
172#endif 98#endif
173 99
174static double (*nvtime)(); /* so why doesn't it take void? */ 100static double (*nvtime)(); /* so why doesn't it take void? */
101static void (*u2time)(pTHX_ UV ret[2]);
175 102
176/* we hijack an hopefully unused CV flag for our purposes */ 103/* we hijack an hopefully unused CV flag for our purposes */
177#define CVf_SLF 0x4000 104#define CVf_SLF 0x4000
178static OP *pp_slf (pTHX); 105static OP *pp_slf (pTHX);
106static void slf_destroy (pTHX_ struct coro *coro);
179 107
180static U32 cctx_gen; 108static U32 cctx_gen;
181static size_t cctx_stacksize = CORO_STACKSIZE; 109static size_t cctx_stacksize = CORO_STACKSIZE;
182static struct CoroAPI coroapi; 110static struct CoroAPI coroapi;
183static AV *main_mainstack; /* used to differentiate between $main and others */ 111static AV *main_mainstack; /* used to differentiate between $main and others */
… …
200static SV *sv_pool_size; 128static SV *sv_pool_size;
201static SV *sv_async_pool_idle; /* description string */ 129static SV *sv_async_pool_idle; /* description string */
202static AV *av_async_pool; /* idle pool */ 130static AV *av_async_pool; /* idle pool */
203static SV *sv_Coro; /* class string */ 131static SV *sv_Coro; /* class string */
204static CV *cv_pool_handler; 132static CV *cv_pool_handler;
205static CV *cv_coro_state_new;
206 133
207/* Coro::AnyEvent */ 134/* Coro::AnyEvent */
208static SV *sv_activity; 135static SV *sv_activity;
209 136
137/* enable processtime/realtime profiling */
138static char enable_times;
139typedef U32 coro_ts[2];
140static coro_ts time_real, time_cpu;
141static char times_valid;
142
210static struct coro_cctx *cctx_first; 143static struct coro_cctx *cctx_first;
211static int cctx_count, cctx_idle; 144static int cctx_count, cctx_idle;
212 145
213enum { 146enum
147{
214 CC_MAPPED = 0x01, 148 CC_MAPPED = 0x01,
215 CC_NOREUSE = 0x02, /* throw this away after tracing */ 149 CC_NOREUSE = 0x02, /* throw this away after tracing */
216 CC_TRACE = 0x04, 150 CC_TRACE = 0x04,
217 CC_TRACE_SUB = 0x08, /* trace sub calls */ 151 CC_TRACE_SUB = 0x08, /* trace sub calls */
218 CC_TRACE_LINE = 0x10, /* trace each statement */ 152 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
223typedef struct coro_cctx 157typedef struct coro_cctx
224{ 158{
225 struct coro_cctx *next; 159 struct coro_cctx *next;
226 160
227 /* the stack */ 161 /* the stack */
228 void *sptr; 162 struct coro_stack stack;
229 size_t ssize;
230 163
231 /* cpu state */ 164 /* cpu state */
232 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 165 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
166#ifndef NDEBUG
233 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 167 JMPENV *idle_te; /* same as idle_sp, but for top_env */
168#endif
234 JMPENV *top_env; 169 JMPENV *top_env;
235 coro_context cctx; 170 coro_context cctx;
236 171
237 U32 gen; 172 U32 gen;
238#if CORO_USE_VALGRIND 173#if CORO_USE_VALGRIND
239 int valgrind_id; 174 int valgrind_id;
240#endif 175#endif
241 unsigned char flags; 176 unsigned char flags;
242} coro_cctx; 177} coro_cctx;
243 178
244coro_cctx *cctx_current; /* the currently running cctx */ 179static coro_cctx *cctx_current; /* the currently running cctx */
245 180
246/*****************************************************************************/ 181/*****************************************************************************/
247 182
183static MGVTBL coro_state_vtbl;
184
248enum { 185enum
186{
249 CF_RUNNING = 0x0001, /* coroutine is running */ 187 CF_RUNNING = 0x0001, /* coroutine is running */
250 CF_READY = 0x0002, /* coroutine is ready */ 188 CF_READY = 0x0002, /* coroutine is ready */
251 CF_NEW = 0x0004, /* has never been switched to */ 189 CF_NEW = 0x0004, /* has never been switched to */
252 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 190 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
253 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 191 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
192 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
254}; 193};
255 194
256/* the structure where most of the perl state is stored, overlaid on the cxstack */ 195/* the structure where most of the perl state is stored, overlaid on the cxstack */
257typedef struct 196typedef struct
258{ 197{
259 SV *defsv;
260 AV *defav;
261 SV *errsv;
262 SV *irsgv;
263 HV *hinthv;
264#define VAR(name,type) type name; 198 #define VARx(name,expr,type) type name;
265# include "state.h" 199 #include "state.h"
266#undef VAR
267} perl_slots; 200} perl_slots;
268 201
202/* how many context stack entries do we need for perl_slots */
269#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 203#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
270 204
271/* this is a structure representing a perl-level coroutine */ 205/* this is a structure representing a perl-level coroutine */
272struct coro { 206struct coro
207{
273 /* the C coroutine allocated to this perl coroutine, if any */ 208 /* the C coroutine allocated to this perl coroutine, if any */
274 coro_cctx *cctx; 209 coro_cctx *cctx;
275 210
276 /* ready queue */ 211 /* ready queue */
277 struct coro *next_ready; 212 struct coro *next_ready;
… …
279 /* state data */ 214 /* state data */
280 struct CoroSLF slf_frame; /* saved slf frame */ 215 struct CoroSLF slf_frame; /* saved slf frame */
281 AV *mainstack; 216 AV *mainstack;
282 perl_slots *slot; /* basically the saved sp */ 217 perl_slots *slot; /* basically the saved sp */
283 218
284 CV *startcv; /* the CV to execute */ 219 CV *startcv; /* the CV to execute */
285 AV *args; /* data associated with this coroutine (initial args) */ 220 AV *args; /* data associated with this coroutine (initial args) */
286 int refcnt; /* coroutines are refcounted, yes */
287 int flags; /* CF_ flags */ 221 int flags; /* CF_ flags */
288 HV *hv; /* the perl hash associated with this coro, if any */ 222 HV *hv; /* the perl hash associated with this coro, if any */
289 void (*on_destroy)(pTHX_ struct coro *coro);
290 223
291 /* statistics */ 224 /* statistics */
292 int usecount; /* number of transfers to this coro */ 225 int usecount; /* number of transfers to this coro */
293 226
294 /* coro process data */ 227 /* coro process data */
295 int prio; 228 int prio;
296 SV *except; /* exception to be thrown */ 229 SV *except; /* exception to be thrown */
297 SV *rouse_cb; 230 SV *rouse_cb; /* last rouse callback */
231 AV *on_destroy; /* callbacks or coros to notify on destroy */
232 AV *status; /* the exit status list */
298 233
299 /* async_pool */ 234 /* async_pool */
300 SV *saved_deffh; 235 SV *saved_deffh;
301 SV *invoke_cb; 236 SV *invoke_cb;
302 AV *invoke_av; 237 AV *invoke_av;
303 238
304 /* on_enter/on_leave */ 239 /* on_enter/on_leave */
305 AV *on_enter; 240 AV *on_enter;
306 AV *on_leave; 241 AV *on_leave;
307 242
243 /* swap_sv */
244 AV *swap_sv;
245
246 /* times */
247 coro_ts t_cpu, t_real;
248
308 /* linked list */ 249 /* linked list */
309 struct coro *next, *prev; 250 struct coro *next, *prev;
310}; 251};
311 252
312typedef struct coro *Coro__State; 253typedef struct coro *Coro__State;
313typedef struct coro *Coro__State_or_hashref; 254typedef struct coro *Coro__State_or_hashref;
314 255
315/* the following variables are effectively part of the perl context */ 256/* the following variables are effectively part of the perl context */
316/* and get copied between struct coro and these variables */ 257/* and get copied between struct coro and these variables */
317/* the mainr easonw e don't support windows process emulation */ 258/* the main reason we don't support windows process emulation */
318static struct CoroSLF slf_frame; /* the current slf frame */ 259static struct CoroSLF slf_frame; /* the current slf frame */
319 260
320/** Coro ********************************************************************/ 261/** Coro ********************************************************************/
321 262
322#define CORO_PRIO_MAX 3 263#define CORO_PRIO_MAX 3
… …
328 269
329/* for Coro.pm */ 270/* for Coro.pm */
330static SV *coro_current; 271static SV *coro_current;
331static SV *coro_readyhook; 272static SV *coro_readyhook;
332static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 273static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
333static CV *cv_coro_run, *cv_coro_terminate; 274static CV *cv_coro_run;
334static struct coro *coro_first; 275static struct coro *coro_first;
335#define coro_nready coroapi.nready 276#define coro_nready coroapi.nready
336 277
278/** JIT *********************************************************************/
279
280#if CORO_JIT
281 /* APPLE doesn't have mmap though */
282 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
283 #ifndef CORO_JIT_TYPE
284 #if __x86_64 && CORO_JIT_UNIXY
285 #define CORO_JIT_TYPE "amd64-unix"
286 #elif __i386 && CORO_JIT_UNIXY
287 #define CORO_JIT_TYPE "x86-unix"
288 #endif
289 #endif
290#endif
291
292#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
293 #undef CORO_JIT
294#endif
295
296#if CORO_JIT
297 typedef void (*load_save_perl_slots_type)(perl_slots *);
298 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
299#endif
300
301/** Coro::Select ************************************************************/
302
303static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select;
305
306/* horrible hack, but if it works... */
307static OP *
308coro_pp_sselect (pTHX)
309{
310 dSP;
311 PUSHMARK (SP - 4); /* fake argument list */
312 XPUSHs (coro_select_select);
313 PUTBACK;
314
315 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
316 PL_op->op_flags |= OPf_STACKED;
317 PL_op->op_private = 0;
318 return PL_ppaddr [OP_ENTERSUB](aTHX);
319}
320
321/** time stuff **************************************************************/
322
323#ifdef HAS_GETTIMEOFDAY
324
325ecb_inline void
326coro_u2time (pTHX_ UV ret[2])
327{
328 struct timeval tv;
329 gettimeofday (&tv, 0);
330
331 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec;
333}
334
335ecb_inline double
336coro_nvtime (void)
337{
338 struct timeval tv;
339 gettimeofday (&tv, 0);
340
341 return tv.tv_sec + tv.tv_usec * 1e-6;
342}
343
344ecb_inline void
345time_init (pTHX)
346{
347 nvtime = coro_nvtime;
348 u2time = coro_u2time;
349}
350
351#else
352
353ecb_inline void
354time_init (pTHX)
355{
356 SV **svp;
357
358 require_pv ("Time/HiRes.pm");
359
360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
361
362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
364
365 nvtime = INT2PTR (double (*)(), SvIV (*svp));
366
367 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
368 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
369}
370
371#endif
372
337/** lowlevel stuff **********************************************************/ 373/** lowlevel stuff **********************************************************/
338 374
339static SV * 375static SV * ecb_noinline
340coro_get_sv (pTHX_ const char *name, int create) 376coro_get_sv (pTHX_ const char *name, int create)
341{ 377{
342#if PERL_VERSION_ATLEAST (5,10,0) 378#if PERL_VERSION_ATLEAST (5,10,0)
343 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 379 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
344 get_sv (name, create); 380 get_sv (name, create);
345#endif 381#endif
346 return get_sv (name, create); 382 return get_sv (name, create);
347} 383}
348 384
349static AV * 385static AV * ecb_noinline
350coro_get_av (pTHX_ const char *name, int create) 386coro_get_av (pTHX_ const char *name, int create)
351{ 387{
352#if PERL_VERSION_ATLEAST (5,10,0) 388#if PERL_VERSION_ATLEAST (5,10,0)
353 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 389 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
354 get_av (name, create); 390 get_av (name, create);
355#endif 391#endif
356 return get_av (name, create); 392 return get_av (name, create);
357} 393}
358 394
359static HV * 395static HV * ecb_noinline
360coro_get_hv (pTHX_ const char *name, int create) 396coro_get_hv (pTHX_ const char *name, int create)
361{ 397{
362#if PERL_VERSION_ATLEAST (5,10,0) 398#if PERL_VERSION_ATLEAST (5,10,0)
363 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
364 get_hv (name, create); 400 get_hv (name, create);
365#endif 401#endif
366 return get_hv (name, create); 402 return get_hv (name, create);
367} 403}
368 404
369/* may croak */ 405ecb_inline void
370INLINE CV * 406coro_times_update (void)
371coro_sv_2cv (pTHX_ SV *sv)
372{ 407{
373 HV *st; 408#ifdef coro_clock_gettime
374 GV *gvp; 409 struct timespec ts;
375 CV *cv = sv_2cv (sv, &st, &gvp, 0);
376 410
377 if (!cv) 411 ts.tv_sec = ts.tv_nsec = 0;
378 croak ("code reference expected"); 412 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
413 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
379 414
380 return cv; 415 ts.tv_sec = ts.tv_nsec = 0;
416 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
417 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
418#else
419 dTHX;
420 UV tv[2];
421
422 u2time (aTHX_ tv);
423 time_real [0] = tv [0];
424 time_real [1] = tv [1] * 1000;
425#endif
426}
427
428ecb_inline void
429coro_times_add (struct coro *c)
430{
431 c->t_real [1] += time_real [1];
432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
433 c->t_real [0] += time_real [0];
434
435 c->t_cpu [1] += time_cpu [1];
436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
437 c->t_cpu [0] += time_cpu [0];
438}
439
440ecb_inline void
441coro_times_sub (struct coro *c)
442{
443 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
444 c->t_real [1] -= time_real [1];
445 c->t_real [0] -= time_real [0];
446
447 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
448 c->t_cpu [1] -= time_cpu [1];
449 c->t_cpu [0] -= time_cpu [0];
381} 450}
382 451
383/*****************************************************************************/ 452/*****************************************************************************/
384/* magic glue */ 453/* magic glue */
385 454
386#define CORO_MAGIC_type_cv 26 455#define CORO_MAGIC_type_cv 26
387#define CORO_MAGIC_type_state PERL_MAGIC_ext 456#define CORO_MAGIC_type_state PERL_MAGIC_ext
388 457
389#define CORO_MAGIC_NN(sv, type) \ 458#define CORO_MAGIC_NN(sv, type) \
390 (expect_true (SvMAGIC (sv)->mg_type == type) \ 459 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
391 ? SvMAGIC (sv) \ 460 ? SvMAGIC (sv) \
392 : mg_find (sv, type)) 461 : mg_find (sv, type))
393 462
394#define CORO_MAGIC(sv, type) \ 463#define CORO_MAGIC(sv, type) \
395 (expect_true (SvMAGIC (sv)) \ 464 (ecb_expect_true (SvMAGIC (sv)) \
396 ? CORO_MAGIC_NN (sv, type) \ 465 ? CORO_MAGIC_NN (sv, type) \
397 : 0) 466 : 0)
398 467
399#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 468#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
400#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 469#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
401 470
402INLINE struct coro * 471ecb_inline MAGIC *
472SvSTATEhv_p (pTHX_ SV *coro)
473{
474 MAGIC *mg;
475
476 if (ecb_expect_true (
477 SvTYPE (coro) == SVt_PVHV
478 && (mg = CORO_MAGIC_state (coro))
479 && mg->mg_virtual == &coro_state_vtbl
480 ))
481 return mg;
482
483 return 0;
484}
485
486ecb_inline struct coro *
403SvSTATE_ (pTHX_ SV *coro) 487SvSTATE_ (pTHX_ SV *coro)
404{ 488{
405 HV *stash;
406 MAGIC *mg; 489 MAGIC *mg;
407 490
408 if (SvROK (coro)) 491 if (SvROK (coro))
409 coro = SvRV (coro); 492 coro = SvRV (coro);
410 493
411 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 494 mg = SvSTATEhv_p (aTHX_ coro);
495 if (!mg)
412 croak ("Coro::State object required"); 496 croak ("Coro::State object required");
413 497
414 stash = SvSTASH (coro);
415 if (expect_false (stash != coro_stash && stash != coro_state_stash))
416 {
417 /* very slow, but rare, check */
418 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
419 croak ("Coro::State object required");
420 }
421
422 mg = CORO_MAGIC_state (coro);
423 return (struct coro *)mg->mg_ptr; 498 return (struct coro *)mg->mg_ptr;
424} 499}
425 500
426#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 501#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
427 502
… …
430#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 505#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
431 506
432/*****************************************************************************/ 507/*****************************************************************************/
433/* padlist management and caching */ 508/* padlist management and caching */
434 509
435static AV * 510ecb_inline PADLIST *
436coro_derive_padlist (pTHX_ CV *cv) 511coro_derive_padlist (pTHX_ CV *cv)
437{ 512{
438 AV *padlist = CvPADLIST (cv); 513 PADLIST *padlist = CvPADLIST (cv);
439 AV *newpadlist, *newpad; 514 PADLIST *newpadlist;
515 PAD *newpad;
516 PADOFFSET const off = PadlistMAX (padlist) + 1;
440 517
441 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. */
442 AvREAL_off (newpadlist); 521 AvREAL_off (newpadlist);
522#endif
443#if PERL_VERSION_ATLEAST (5,10,0) 523#if PERL_VERSION_ATLEAST (5,10,0)
444 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 524 Perl_pad_push (aTHX_ padlist, off);
445#else 525#else
446 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 526 Perl_pad_push (aTHX_ padlist, off, 1);
447#endif 527#endif
448 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 528 newpad = PadlistARRAY (padlist)[off];
449 --AvFILLp (padlist); 529 PadlistMAX (padlist) = off - 1;
450 530
451 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 531 /* Already extended to 2 elements by newPADLIST. */
452 av_store (newpadlist, 1, (SV *)newpad); 532 PadlistMAX (newpadlist) = 1;
533 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
534 PadlistARRAY (newpadlist)[1] = newpad;
453 535
454 return newpadlist; 536 return newpadlist;
455} 537}
456 538
457static void 539ecb_inline void
458free_padlist (pTHX_ AV *padlist) 540free_padlist (pTHX_ PADLIST *padlist)
459{ 541{
460 /* may be during global destruction */ 542 /* may be during global destruction */
461 if (!IN_DESTRUCT) 543 if (!IN_DESTRUCT)
462 { 544 {
463 I32 i = AvFILLp (padlist); 545 I32 i = PadlistMAX (padlist);
464 546
465 while (i > 0) /* special-case index 0 */ 547 while (i > 0) /* special-case index 0 */
466 { 548 {
467 /* we try to be extra-careful here */ 549 /* we try to be extra-careful here */
468 AV *av = (AV *)AvARRAY (padlist)[i--]; 550 PAD *pad = PadlistARRAY (padlist)[i--];
469 I32 j = AvFILLp (av); 551 I32 j = PadMAX (pad);
470 552
471 while (j >= 0) 553 while (j >= 0)
472 SvREFCNT_dec (AvARRAY (av)[j--]); 554 SvREFCNT_dec (PadARRAY (pad)[j--]);
473 555
474 AvFILLp (av) = -1; 556 PadMAX (pad) = -1;
475 SvREFCNT_dec (av); 557 SvREFCNT_dec (pad);
476 } 558 }
477 559
478 SvREFCNT_dec (AvARRAY (padlist)[0]); 560 SvREFCNT_dec (PadlistNAMES (padlist));
479 561
562#ifdef NEWPADAPI
563 Safefree (PadlistARRAY (padlist));
564 Safefree (padlist);
565#else
480 AvFILLp (padlist) = -1; 566 AvFILLp (padlist) = -1;
567 AvREAL_off (padlist);
481 SvREFCNT_dec ((SV*)padlist); 568 SvREFCNT_dec ((SV*)padlist);
569#endif
482 } 570 }
483} 571}
484 572
485static int 573static int
486coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 574coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
487{ 575{
488 AV *padlist; 576 PADLIST *padlist;
489 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;
490 579
491 /* perl manages to free our internal AV and _then_ call us */ 580 /* perl manages to free our internal AV and _then_ call us */
492 if (IN_DESTRUCT) 581 if (IN_DESTRUCT)
493 return; 582 return 0;
494 583
495 /* casting is fun. */ 584 while (len--)
496 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
497 free_padlist (aTHX_ padlist); 585 free_padlist (aTHX_ padlists[len]);
498
499 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
500 586
501 return 0; 587 return 0;
502} 588}
503 589
504static MGVTBL coro_cv_vtbl = { 590static MGVTBL coro_cv_vtbl = {
505 0, 0, 0, 0, 591 0, 0, 0, 0,
506 coro_cv_free 592 coro_cv_free
507}; 593};
508 594
509/* the next two functions merely cache the padlists */ 595/* the next two functions merely cache the padlists */
510static void 596ecb_inline void
511get_padlist (pTHX_ CV *cv) 597get_padlist (pTHX_ CV *cv)
512{ 598{
513 MAGIC *mg = CORO_MAGIC_cv (cv); 599 MAGIC *mg = CORO_MAGIC_cv (cv);
514 AV *av; 600 size_t *lenp;
515 601
516 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 602 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
517 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 603 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
518 else 604 else
519 { 605 {
520#if CORO_PREFER_PERL_FUNCTIONS 606#if CORO_PREFER_PERL_FUNCTIONS
521 /* this is probably cleaner? but also slower! */ 607 /* this is probably cleaner? but also slower! */
522 /* in practise, it seems to be less stable */ 608 /* in practise, it seems to be less stable */
… …
528 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 614 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
529#endif 615#endif
530 } 616 }
531} 617}
532 618
533static void 619ecb_inline void
534put_padlist (pTHX_ CV *cv) 620put_padlist (pTHX_ CV *cv)
535{ 621{
536 MAGIC *mg = CORO_MAGIC_cv (cv); 622 MAGIC *mg = CORO_MAGIC_cv (cv);
537 AV *av;
538 623
539 if (expect_false (!mg)) 624 if (ecb_expect_false (!mg))
625 {
540 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);
541 634
542 av = (AV *)mg->mg_obj; 635 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
543
544 if (expect_false (AvFILLp (av) >= AvMAX (av)))
545 av_extend (av, AvFILLp (av) + 1);
546
547 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
548} 636}
549 637
550/** 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))
551 691
552static void 692static void
553on_enterleave_call (pTHX_ SV *cb); 693on_enterleave_call (pTHX_ SV *cb);
554 694
555static void 695static void
… …
558 perl_slots *slot = c->slot; 698 perl_slots *slot = c->slot;
559 c->slot = 0; 699 c->slot = 0;
560 700
561 PL_mainstack = c->mainstack; 701 PL_mainstack = c->mainstack;
562 702
563 GvSV (PL_defgv) = slot->defsv; 703#if CORO_JIT
564 GvAV (PL_defgv) = slot->defav; 704 load_perl_slots (slot);
565 GvSV (PL_errgv) = slot->errsv; 705#else
566 GvSV (irsgv) = slot->irsgv;
567 GvHV (PL_hintgv) = slot->hinthv;
568
569 #define VAR(name,type) PL_ ## name = slot->name; 706 #define VARx(name,expr,type) expr = slot->name;
570 # include "state.h" 707 #include "state.h"
571 #undef VAR 708#endif
572 709
573 { 710 {
574 dSP; 711 dSP;
575 712
576 CV *cv; 713 CV *cv;
577 714
578 /* now do the ugly restore mess */ 715 /* now do the ugly restore mess */
579 while (expect_true (cv = (CV *)POPs)) 716 while (ecb_expect_true (cv = (CV *)POPs))
580 { 717 {
581 put_padlist (aTHX_ cv); /* mark this padlist as available */ 718 put_padlist (aTHX_ cv); /* mark this padlist as available */
582 CvDEPTH (cv) = PTR2IV (POPs); 719 CvDEPTH (cv) = PTR2IV (POPs);
583 CvPADLIST (cv) = (AV *)POPs; 720 CvPADLIST (cv) = (PADLIST *)POPs;
584 } 721 }
585 722
586 PUTBACK; 723 PUTBACK;
587 } 724 }
588 725
589 slf_frame = c->slf_frame; 726 slf_frame = c->slf_frame;
590 CORO_THROW = c->except; 727 CORO_THROW = c->except;
591 728
729 if (ecb_expect_false (enable_times))
730 {
731 if (ecb_expect_false (!times_valid))
732 coro_times_update ();
733
734 coro_times_sub (c);
735 }
736
592 if (expect_false (c->on_enter)) 737 if (ecb_expect_false (c->on_enter))
593 { 738 {
594 int i; 739 int i;
595 740
596 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 741 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
597 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 742 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
598 } 743 }
744
745 SWAP_SVS (c);
599} 746}
600 747
601static void 748static void
602save_perl (pTHX_ Coro__State c) 749save_perl (pTHX_ Coro__State c)
603{ 750{
751 SWAP_SVS (c);
752
604 if (expect_false (c->on_leave)) 753 if (ecb_expect_false (c->on_leave))
605 { 754 {
606 int i; 755 int i;
607 756
608 for (i = AvFILLp (c->on_leave); i >= 0; --i) 757 for (i = AvFILLp (c->on_leave); i >= 0; --i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 758 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
759 }
760
761 times_valid = 0;
762
763 if (ecb_expect_false (enable_times))
764 {
765 coro_times_update (); times_valid = 1;
766 coro_times_add (c);
610 } 767 }
611 768
612 c->except = CORO_THROW; 769 c->except = CORO_THROW;
613 c->slf_frame = slf_frame; 770 c->slf_frame = slf_frame;
614 771
… …
625 782
626 XPUSHs (Nullsv); 783 XPUSHs (Nullsv);
627 /* this loop was inspired by pp_caller */ 784 /* this loop was inspired by pp_caller */
628 for (;;) 785 for (;;)
629 { 786 {
630 while (expect_true (cxix >= 0)) 787 while (ecb_expect_true (cxix >= 0))
631 { 788 {
632 PERL_CONTEXT *cx = &ccstk[cxix--]; 789 PERL_CONTEXT *cx = &ccstk[cxix--];
633 790
634 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))
635 { 792 {
636 CV *cv = cx->blk_sub.cv; 793 CV *cv = cx->blk_sub.cv;
637 794
638 if (expect_true (CvDEPTH (cv))) 795 if (ecb_expect_true (CvDEPTH (cv)))
639 { 796 {
640 EXTEND (SP, 3); 797 EXTEND (SP, 3);
641 PUSHs ((SV *)CvPADLIST (cv)); 798 PUSHs ((SV *)CvPADLIST (cv));
642 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 799 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
643 PUSHs ((SV *)cv); 800 PUSHs ((SV *)cv);
… …
646 get_padlist (aTHX_ cv); 803 get_padlist (aTHX_ cv);
647 } 804 }
648 } 805 }
649 } 806 }
650 807
651 if (expect_true (top_si->si_type == PERLSI_MAIN)) 808 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
652 break; 809 break;
653 810
654 top_si = top_si->si_prev; 811 top_si = top_si->si_prev;
655 ccstk = top_si->si_cxstack; 812 ccstk = top_si->si_cxstack;
656 cxix = top_si->si_cxix; 813 cxix = top_si->si_cxix;
… …
658 815
659 PUTBACK; 816 PUTBACK;
660 } 817 }
661 818
662 /* allocate some space on the context stack for our purposes */ 819 /* allocate some space on the context stack for our purposes */
663 /* we manually unroll here, as usually 2 slots is enough */ 820 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
664 if (SLOT_COUNT >= 1) CXINC;
665 if (SLOT_COUNT >= 2) CXINC;
666 if (SLOT_COUNT >= 3) CXINC;
667 { 821 {
668 int i; 822 unsigned int i;
823
669 for (i = 3; i < SLOT_COUNT; ++i) 824 for (i = 0; i < SLOT_COUNT; ++i)
670 CXINC; 825 CXINC;
671 } 826
672 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 827 cxstack_ix -= SLOT_COUNT; /* undo allocation */
828 }
673 829
674 c->mainstack = PL_mainstack; 830 c->mainstack = PL_mainstack;
675 831
676 { 832 {
677 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 833 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
678 834
679 slot->defav = GvAV (PL_defgv); 835#if CORO_JIT
680 slot->defsv = DEFSV; 836 save_perl_slots (slot);
681 slot->errsv = ERRSV; 837#else
682 slot->irsgv = GvSV (irsgv);
683 slot->hinthv = GvHV (PL_hintgv);
684
685 #define VAR(name,type) slot->name = PL_ ## name; 838 #define VARx(name,expr,type) slot->name = expr;
686 # include "state.h" 839 #include "state.h"
687 #undef VAR 840#endif
688 } 841 }
689} 842}
690 843
691/* 844/*
692 * allocate various perl stacks. This is almost an exact copy 845 * allocate various perl stacks. This is almost an exact copy
… …
698# define coro_init_stacks(thx) init_stacks () 851# define coro_init_stacks(thx) init_stacks ()
699#else 852#else
700static void 853static void
701coro_init_stacks (pTHX) 854coro_init_stacks (pTHX)
702{ 855{
703 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() */
704 PL_curstackinfo->si_type = PERLSI_MAIN; 857 PL_curstackinfo->si_type = PERLSI_MAIN;
705 PL_curstack = PL_curstackinfo->si_stack; 858 PL_curstack = PL_curstackinfo->si_stack;
706 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 859 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
707 860
708 PL_stack_base = AvARRAY(PL_curstack); 861 PL_stack_base = AvARRAY(PL_curstack);
… …
723#endif 876#endif
724 877
725 New(54,PL_scopestack,8,I32); 878 New(54,PL_scopestack,8,I32);
726 PL_scopestack_ix = 0; 879 PL_scopestack_ix = 0;
727 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
728 884
729 New(54,PL_savestack,24,ANY); 885 New(54,PL_savestack,24,ANY);
730 PL_savestack_ix = 0; 886 PL_savestack_ix = 0;
731 PL_savestack_max = 24; 887 PL_savestack_max = 24;
732 888
… …
760 } 916 }
761 917
762 Safefree (PL_tmps_stack); 918 Safefree (PL_tmps_stack);
763 Safefree (PL_markstack); 919 Safefree (PL_markstack);
764 Safefree (PL_scopestack); 920 Safefree (PL_scopestack);
921#if HAS_SCOPESTACK_NAME
922 Safefree (PL_scopestack_name);
923#endif
765 Safefree (PL_savestack); 924 Safefree (PL_savestack);
766#if !PERL_VERSION_ATLEAST (5,10,0) 925#if !PERL_VERSION_ATLEAST (5,10,0)
767 Safefree (PL_retstack); 926 Safefree (PL_retstack);
768#endif 927#endif
769} 928}
… …
815#endif 974#endif
816 975
817/* 976/*
818 * This overrides the default magic get method of %SIG elements. 977 * This overrides the default magic get method of %SIG elements.
819 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 978 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
820 * and instead of trying to save and restore the hash elements, we just provide 979 * and instead of trying to save and restore the hash elements (extremely slow),
821 * readback here. 980 * we just provide our own readback here.
822 */ 981 */
823static int 982static int ecb_cold
824coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 983coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
825{ 984{
826 const char *s = MgPV_nolen_const (mg); 985 const char *s = MgPV_nolen_const (mg);
827 986
828 if (*s == '_') 987 if (*s == '_')
829 { 988 {
830 SV **svp = 0; 989 SV **svp = 0;
831 990
832 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 991 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
833 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 992 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
834 993
835 if (svp) 994 if (svp)
836 { 995 {
837 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);
838 return 0; 1006 return 0;
839 } 1007 }
840 } 1008 }
841 1009
842 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1010 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
843} 1011}
844 1012
845static int 1013static int ecb_cold
846coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1014coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
847{ 1015{
848 const char *s = MgPV_nolen_const (mg); 1016 const char *s = MgPV_nolen_const (mg);
849 1017
850 if (*s == '_') 1018 if (*s == '_')
… …
864 } 1032 }
865 1033
866 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1034 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
867} 1035}
868 1036
869static int 1037static int ecb_cold
870coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1038coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
871{ 1039{
872 const char *s = MgPV_nolen_const (mg); 1040 const char *s = MgPV_nolen_const (mg);
873 1041
874 if (*s == '_') 1042 if (*s == '_')
… …
907slf_check_repeat (pTHX_ struct CoroSLF *frame) 1075slf_check_repeat (pTHX_ struct CoroSLF *frame)
908{ 1076{
909 return 1; 1077 return 1;
910} 1078}
911 1079
912static UNOP coro_setup_op; 1080static UNOP init_perl_op;
913 1081
914static 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 */
915coro_setup (pTHX_ struct coro *coro) 1083init_perl (pTHX_ struct coro *coro)
916{ 1084{
917 /* 1085 /*
918 * emulate part of the perl startup here. 1086 * emulate part of the perl startup here.
919 */ 1087 */
920 coro_init_stacks (aTHX); 1088 coro_init_stacks (aTHX);
… …
927 PL_comppad_name_fill = 0; 1095 PL_comppad_name_fill = 0;
928 PL_comppad_name_floor = 0; 1096 PL_comppad_name_floor = 0;
929 PL_curpm = 0; 1097 PL_curpm = 0;
930 PL_curpad = 0; 1098 PL_curpad = 0;
931 PL_localizing = 0; 1099 PL_localizing = 0;
932 PL_dirty = 0;
933 PL_restartop = 0; 1100 PL_restartop = 0;
934#if PERL_VERSION_ATLEAST (5,10,0) 1101#if PERL_VERSION_ATLEAST (5,10,0)
935 PL_parser = 0; 1102 PL_parser = 0;
936#endif 1103#endif
937 PL_hints = 0; 1104 PL_hints = 0;
938 1105
939 /* recreate the die/warn hooks */ 1106 /* recreate the die/warn hooks */
940 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1107 PL_diehook = SvREFCNT_inc (rv_diehook);
941 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1108 PL_warnhook = SvREFCNT_inc (rv_warnhook);
942 1109
943 GvSV (PL_defgv) = newSV (0); 1110 GvSV (PL_defgv) = newSV (0);
944 GvAV (PL_defgv) = coro->args; coro->args = 0; 1111 GvAV (PL_defgv) = coro->args; coro->args = 0;
945 GvSV (PL_errgv) = newSV (0); 1112 GvSV (PL_errgv) = newSV (0);
946 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);
947 GvHV (PL_hintgv) = 0; 1114 GvHV (PL_hintgv) = 0;
… …
967 /* 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
968 * 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.
969 */ 1136 */
970 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 */
971 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;
972 1140
973 /* 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 */
974 coro_setup_op.op_next = PL_op; 1142 init_perl_op.op_next = PL_op;
975 coro_setup_op.op_type = OP_ENTERSUB; 1143 init_perl_op.op_type = OP_ENTERSUB;
976 coro_setup_op.op_ppaddr = pp_slf; 1144 init_perl_op.op_ppaddr = pp_slf;
977 /* 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 */
978 1146
979 PL_op = (OP *)&coro_setup_op; 1147 PL_op = (OP *)&init_perl_op;
980 1148
981 /* copy throw, in case it was set before coro_setup */ 1149 /* copy throw, in case it was set before init_perl */
982 CORO_THROW = coro->except; 1150 CORO_THROW = coro->except;
1151
1152 SWAP_SVS (coro);
1153
1154 if (ecb_expect_false (enable_times))
1155 {
1156 coro_times_update ();
1157 coro_times_sub (coro);
1158 }
983} 1159}
984 1160
985static void 1161static void
986coro_unwind_stacks (pTHX) 1162coro_unwind_stacks (pTHX)
987{ 1163{
… …
1002 dounwind (-1); 1178 dounwind (-1);
1003 } 1179 }
1004} 1180}
1005 1181
1006static void 1182static void
1007coro_destruct_perl (pTHX_ struct coro *coro) 1183destroy_perl (pTHX_ struct coro *coro)
1008{ 1184{
1009 SV *svf [9]; 1185 SV *svf [9];
1010 1186
1011 { 1187 {
1188 SV *old_current = SvRV (coro_current);
1012 struct coro *current = SvSTATE_current; 1189 struct coro *current = SvSTATE (old_current);
1013 1190
1014 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));
1015 1192
1016 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
1017 load_perl (aTHX_ coro); 1198 load_perl (aTHX_ coro);
1018 1199
1019 coro_unwind_stacks (aTHX); 1200 coro_unwind_stacks (aTHX);
1201
1202 /* restore swapped sv's */
1203 SWAP_SVS (coro);
1204
1020 coro_destruct_stacks (aTHX); 1205 coro_destruct_stacks (aTHX);
1021 1206
1022 // now save some sv's to be free'd later 1207 /* now save some sv's to be free'd later */
1023 svf [0] = GvSV (PL_defgv); 1208 svf [0] = GvSV (PL_defgv);
1024 svf [1] = (SV *)GvAV (PL_defgv); 1209 svf [1] = (SV *)GvAV (PL_defgv);
1025 svf [2] = GvSV (PL_errgv); 1210 svf [2] = GvSV (PL_errgv);
1026 svf [3] = (SV *)PL_defoutgv; 1211 svf [3] = (SV *)PL_defoutgv;
1027 svf [4] = PL_rs; 1212 svf [4] = PL_rs;
… …
1029 svf [6] = (SV *)GvHV (PL_hintgv); 1214 svf [6] = (SV *)GvHV (PL_hintgv);
1030 svf [7] = PL_diehook; 1215 svf [7] = PL_diehook;
1031 svf [8] = PL_warnhook; 1216 svf [8] = PL_warnhook;
1032 assert (9 == sizeof (svf) / sizeof (*svf)); 1217 assert (9 == sizeof (svf) / sizeof (*svf));
1033 1218
1219 SvRV_set (coro_current, old_current);
1220
1034 load_perl (aTHX_ current); 1221 load_perl (aTHX_ current);
1035 } 1222 }
1036 1223
1037 { 1224 {
1038 int i; 1225 unsigned int i;
1039 1226
1040 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1227 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1041 SvREFCNT_dec (svf [i]); 1228 SvREFCNT_dec (svf [i]);
1042 1229
1043 SvREFCNT_dec (coro->saved_deffh); 1230 SvREFCNT_dec (coro->saved_deffh);
… …
1045 SvREFCNT_dec (coro->invoke_cb); 1232 SvREFCNT_dec (coro->invoke_cb);
1046 SvREFCNT_dec (coro->invoke_av); 1233 SvREFCNT_dec (coro->invoke_av);
1047 } 1234 }
1048} 1235}
1049 1236
1050INLINE void 1237ecb_inline void
1051free_coro_mortal (pTHX) 1238free_coro_mortal (pTHX)
1052{ 1239{
1053 if (expect_true (coro_mortal)) 1240 if (ecb_expect_true (coro_mortal))
1054 { 1241 {
1055 SvREFCNT_dec (coro_mortal); 1242 SvREFCNT_dec ((SV *)coro_mortal);
1056 coro_mortal = 0; 1243 coro_mortal = 0;
1057 } 1244 }
1058} 1245}
1059 1246
1060static int 1247static int
… …
1193 1380
1194 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 */
1195} 1382}
1196 1383
1197/* 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 */
1198static void NOINLINE 1385static void ecb_noinline
1199cctx_prepare (pTHX) 1386cctx_prepare (pTHX)
1200{ 1387{
1201 PL_top_env = &PL_start_env; 1388 PL_top_env = &PL_start_env;
1202 1389
1203 if (cctx_current->flags & CC_TRACE) 1390 if (cctx_current->flags & CC_TRACE)
… …
1214 slf_frame.prepare = slf_prepare_set_stacklevel; 1401 slf_frame.prepare = slf_prepare_set_stacklevel;
1215 slf_frame.check = slf_check_set_stacklevel; 1402 slf_frame.check = slf_check_set_stacklevel;
1216} 1403}
1217 1404
1218/* 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 */
1219INLINE void 1406ecb_inline void
1220transfer_tail (pTHX) 1407transfer_tail (pTHX)
1221{ 1408{
1222 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);
1223} 1422}
1224 1423
1225/* 1424/*
1226 * this is a _very_ stripped down perl interpreter ;) 1425 * this is a _very_ stripped down perl interpreter ;)
1227 */ 1426 */
… …
1249 /* 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 */
1250 PL_restartop = PL_op; 1449 PL_restartop = PL_op;
1251 perl_run (PL_curinterp); 1450 perl_run (PL_curinterp);
1252 /* 1451 /*
1253 * 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
1254 * 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.
1255 */ 1455 */
1256 1456
1257 /* 1457 /*
1258 * 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
1259 * 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)
1260 * 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
1261 * bootstrap-time "top" top_env, as we cannot restore the "main" 1461 * doing in that case. YMMV.
1262 * coroutine as Coro has no such concept.
1263 * This actually isn't valid with the pthread backend, but OSes requiring
1264 * that backend are too broken to do it in a standards-compliant way.
1265 */ 1462 */
1266 PL_top_env = main_top_env; 1463 perlish_exit (aTHX);
1267 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1268 } 1464 }
1269} 1465}
1270 1466
1271static coro_cctx * 1467static coro_cctx *
1272cctx_new () 1468cctx_new (void)
1273{ 1469{
1274 coro_cctx *cctx; 1470 coro_cctx *cctx;
1275 1471
1276 ++cctx_count; 1472 ++cctx_count;
1277 New (0, cctx, 1, coro_cctx); 1473 New (0, cctx, 1, coro_cctx);
… …
1283 return cctx; 1479 return cctx;
1284} 1480}
1285 1481
1286/* create a new cctx only suitable as source */ 1482/* create a new cctx only suitable as source */
1287static coro_cctx * 1483static coro_cctx *
1288cctx_new_empty () 1484cctx_new_empty (void)
1289{ 1485{
1290 coro_cctx *cctx = cctx_new (); 1486 coro_cctx *cctx = cctx_new ();
1291 1487
1292 cctx->sptr = 0; 1488 cctx->stack.sptr = 0;
1293 coro_create (&cctx->cctx, 0, 0, 0, 0); 1489 coro_create (&cctx->cctx, 0, 0, 0, 0);
1294 1490
1295 return cctx; 1491 return cctx;
1296} 1492}
1297 1493
1298/* create a new cctx suitable as destination/running a perl interpreter */ 1494/* create a new cctx suitable as destination/running a perl interpreter */
1299static coro_cctx * 1495static coro_cctx *
1300cctx_new_run () 1496cctx_new_run (void)
1301{ 1497{
1302 coro_cctx *cctx = cctx_new (); 1498 coro_cctx *cctx = cctx_new ();
1303 void *stack_start;
1304 size_t stack_size;
1305 1499
1306#if HAVE_MMAP 1500 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1307 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1308 /* mmap supposedly does allocate-on-write for us */
1309 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1310
1311 if (cctx->sptr != (void *)-1)
1312 {
1313 #if CORO_STACKGUARD
1314 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1315 #endif
1316 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1317 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1318 cctx->flags |= CC_MAPPED;
1319 } 1501 {
1320 else
1321#endif
1322 {
1323 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1324 New (0, cctx->sptr, cctx_stacksize, long);
1325
1326 if (!cctx->sptr)
1327 {
1328 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1502 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1329 _exit (EXIT_FAILURE); 1503 _exit (EXIT_FAILURE);
1330 }
1331
1332 stack_start = cctx->sptr;
1333 stack_size = cctx->ssize;
1334 } 1504 }
1335 1505
1336 #if CORO_USE_VALGRIND
1337 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1338 #endif
1339
1340 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1506 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1341 1507
1342 return cctx; 1508 return cctx;
1343} 1509}
1344 1510
1345static void 1511static void
1346cctx_destroy (coro_cctx *cctx) 1512cctx_destroy (coro_cctx *cctx)
1347{ 1513{
1348 if (!cctx) 1514 if (!cctx)
1349 return; 1515 return;
1350 1516
1351 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1517 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1352 1518
1353 --cctx_count; 1519 --cctx_count;
1354 coro_destroy (&cctx->cctx); 1520 coro_destroy (&cctx->cctx);
1355 1521
1356 /* coro_transfer creates new, empty cctx's */ 1522 coro_stack_free (&cctx->stack);
1357 if (cctx->sptr)
1358 {
1359 #if CORO_USE_VALGRIND
1360 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1361 #endif
1362
1363#if HAVE_MMAP
1364 if (cctx->flags & CC_MAPPED)
1365 munmap (cctx->sptr, cctx->ssize);
1366 else
1367#endif
1368 Safefree (cctx->sptr);
1369 }
1370 1523
1371 Safefree (cctx); 1524 Safefree (cctx);
1372} 1525}
1373 1526
1374/* wether this cctx should be destructed */ 1527/* wether this cctx should be destructed */
1375#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))
1376 1529
1377static coro_cctx * 1530static coro_cctx *
1378cctx_get (pTHX) 1531cctx_get (pTHX)
1379{ 1532{
1380 while (expect_true (cctx_first)) 1533 while (ecb_expect_true (cctx_first))
1381 { 1534 {
1382 coro_cctx *cctx = cctx_first; 1535 coro_cctx *cctx = cctx_first;
1383 cctx_first = cctx->next; 1536 cctx_first = cctx->next;
1384 --cctx_idle; 1537 --cctx_idle;
1385 1538
1386 if (expect_true (!CCTX_EXPIRED (cctx))) 1539 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1387 return cctx; 1540 return cctx;
1388 1541
1389 cctx_destroy (cctx); 1542 cctx_destroy (cctx);
1390 } 1543 }
1391 1544
… …
1393} 1546}
1394 1547
1395static void 1548static void
1396cctx_put (coro_cctx *cctx) 1549cctx_put (coro_cctx *cctx)
1397{ 1550{
1398 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));
1399 1552
1400 /* free another cctx if overlimit */ 1553 /* free another cctx if overlimit */
1401 if (expect_false (cctx_idle >= cctx_max_idle)) 1554 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1402 { 1555 {
1403 coro_cctx *first = cctx_first; 1556 coro_cctx *first = cctx_first;
1404 cctx_first = first->next; 1557 cctx_first = first->next;
1405 --cctx_idle; 1558 --cctx_idle;
1406 1559
… …
1417static void 1570static void
1418transfer_check (pTHX_ struct coro *prev, struct coro *next) 1571transfer_check (pTHX_ struct coro *prev, struct coro *next)
1419{ 1572{
1420 /* TODO: throwing up here is considered harmful */ 1573 /* TODO: throwing up here is considered harmful */
1421 1574
1422 if (expect_true (prev != next)) 1575 if (ecb_expect_true (prev != next))
1423 { 1576 {
1424 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1577 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1425 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1578 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1426 1579
1427 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1580 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1428 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1581 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1429 1582
1430#if !PERL_VERSION_ATLEAST (5,10,0) 1583#if !PERL_VERSION_ATLEAST (5,10,0)
1431 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1584 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1432 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1585 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1433#endif 1586#endif
1434 } 1587 }
1435} 1588}
1436 1589
1437/* always use the TRANSFER macro */ 1590/* always use the TRANSFER macro */
1438static void NOINLINE /* noinline so we have a fixed stackframe */ 1591static void ecb_noinline /* noinline so we have a fixed stackframe */
1439transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1592transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1440{ 1593{
1441 dSTACKLEVEL; 1594 dSTACKLEVEL;
1442 1595
1443 /* sometimes transfer is only called to set idle_sp */ 1596 /* sometimes transfer is only called to set idle_sp */
1444 if (expect_false (!prev)) 1597 if (ecb_expect_false (!prev))
1445 { 1598 {
1446 cctx_current->idle_sp = STACKLEVEL; 1599 cctx_current->idle_sp = STACKLEVEL;
1447 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 */
1448 } 1601 }
1449 else if (expect_true (prev != next)) 1602 else if (ecb_expect_true (prev != next))
1450 { 1603 {
1451 coro_cctx *cctx_prev; 1604 coro_cctx *cctx_prev;
1452 1605
1453 if (expect_false (prev->flags & CF_NEW)) 1606 if (ecb_expect_false (prev->flags & CF_NEW))
1454 { 1607 {
1455 /* create a new empty/source context */ 1608 /* create a new empty/source context */
1456 prev->flags &= ~CF_NEW; 1609 prev->flags &= ~CF_NEW;
1457 prev->flags |= CF_RUNNING; 1610 prev->flags |= CF_RUNNING;
1458 } 1611 }
… …
1461 next->flags |= CF_RUNNING; 1614 next->flags |= CF_RUNNING;
1462 1615
1463 /* first get rid of the old state */ 1616 /* first get rid of the old state */
1464 save_perl (aTHX_ prev); 1617 save_perl (aTHX_ prev);
1465 1618
1466 if (expect_false (next->flags & CF_NEW)) 1619 if (ecb_expect_false (next->flags & CF_NEW))
1467 { 1620 {
1468 /* need to start coroutine */ 1621 /* need to start coroutine */
1469 next->flags &= ~CF_NEW; 1622 next->flags &= ~CF_NEW;
1470 /* setup coroutine call */ 1623 /* setup coroutine call */
1471 coro_setup (aTHX_ next); 1624 init_perl (aTHX_ next);
1472 } 1625 }
1473 else 1626 else
1474 load_perl (aTHX_ next); 1627 load_perl (aTHX_ next);
1475 1628
1476 /* possibly untie and reuse the cctx */ 1629 /* possibly untie and reuse the cctx */
1477 if (expect_true ( 1630 if (ecb_expect_true (
1478 cctx_current->idle_sp == STACKLEVEL 1631 cctx_current->idle_sp == STACKLEVEL
1479 && !(cctx_current->flags & CC_TRACE) 1632 && !(cctx_current->flags & CC_TRACE)
1480 && !force_cctx 1633 && !force_cctx
1481 )) 1634 ))
1482 { 1635 {
1483 /* 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 */
1484 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));
1485 1638
1486 /* 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. */
1487 /* 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 */
1488 if (expect_false (CCTX_EXPIRED (cctx_current))) 1641 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1489 if (expect_true (!next->cctx)) 1642 if (ecb_expect_true (!next->cctx))
1490 next->cctx = cctx_get (aTHX); 1643 next->cctx = cctx_get (aTHX);
1491 1644
1492 cctx_put (cctx_current); 1645 cctx_put (cctx_current);
1493 } 1646 }
1494 else 1647 else
1495 prev->cctx = cctx_current; 1648 prev->cctx = cctx_current;
1496 1649
1497 ++next->usecount; 1650 ++next->usecount;
1498 1651
1499 cctx_prev = cctx_current; 1652 cctx_prev = cctx_current;
1500 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1653 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1501 1654
1502 next->cctx = 0; 1655 next->cctx = 0;
1503 1656
1504 if (expect_false (cctx_prev != cctx_current)) 1657 if (ecb_expect_false (cctx_prev != cctx_current))
1505 { 1658 {
1506 cctx_prev->top_env = PL_top_env; 1659 cctx_prev->top_env = PL_top_env;
1507 PL_top_env = cctx_current->top_env; 1660 PL_top_env = cctx_current->top_env;
1508 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1661 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1509 } 1662 }
… …
1515#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))
1516#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1669#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1517 1670
1518/** high level stuff ********************************************************/ 1671/** high level stuff ********************************************************/
1519 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 */
1520static int 1675static void
1676coro_call_on_destroy (pTHX_ struct coro *coro);
1677
1678static void
1521coro_state_destroy (pTHX_ struct coro *coro) 1679coro_state_destroy (pTHX_ struct coro *coro)
1522{ 1680{
1523 if (coro->flags & CF_DESTROYED) 1681 if (coro->flags & CF_ZOMBIE)
1524 return 0; 1682 return;
1525 1683
1526 if (coro->on_destroy && !PL_dirty)
1527 coro->on_destroy (aTHX_ coro); 1684 slf_destroy (aTHX_ coro);
1528 1685
1529 coro->flags |= CF_DESTROYED; 1686 coro->flags |= CF_ZOMBIE;
1530 1687
1531 if (coro->flags & CF_READY) 1688 if (coro->flags & CF_READY)
1532 { 1689 {
1533 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1690 /* reduce nready, as destroying a ready coro effectively unreadies it */
1534 /* alternative: look through all ready queues and remove the coro */ 1691 /* alternative: look through all ready queues and remove the coro */
1535 --coro_nready; 1692 --coro_nready;
1536 } 1693 }
1537 else 1694 else
1538 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;
1539 1700
1540 if (coro->mainstack 1701 if (coro->mainstack
1541 && coro->mainstack != main_mainstack 1702 && coro->mainstack != main_mainstack
1542 && coro->slot 1703 && coro->slot
1543 && !PL_dirty) 1704 && !PL_dirty)
1544 coro_destruct_perl (aTHX_ coro); 1705 destroy_perl (aTHX_ coro);
1545 1706
1546 cctx_destroy (coro->cctx); 1707 cctx_destroy (coro->cctx);
1547 SvREFCNT_dec (coro->startcv); 1708 SvREFCNT_dec (coro->startcv);
1548 SvREFCNT_dec (coro->args); 1709 SvREFCNT_dec (coro->args);
1710 SvREFCNT_dec (coro->swap_sv);
1549 SvREFCNT_dec (CORO_THROW); 1711 SvREFCNT_dec (CORO_THROW);
1550 1712
1551 if (coro->next) coro->next->prev = coro->prev; 1713 coro_call_on_destroy (aTHX_ coro);
1552 if (coro->prev) coro->prev->next = coro->next;
1553 if (coro == coro_first) coro_first = coro->next;
1554 1714
1555 return 1; 1715 /* more destruction mayhem in coro_state_free */
1556} 1716}
1557 1717
1558static int 1718static int
1559coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1719coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1560{ 1720{
1561 struct coro *coro = (struct coro *)mg->mg_ptr; 1721 struct coro *coro = (struct coro *)mg->mg_ptr;
1562 mg->mg_ptr = 0; 1722 mg->mg_ptr = 0;
1563 1723
1564 coro->hv = 0;
1565
1566 if (--coro->refcnt < 0)
1567 {
1568 coro_state_destroy (aTHX_ coro); 1724 coro_state_destroy (aTHX_ coro);
1725 SvREFCNT_dec (coro->on_destroy);
1726 SvREFCNT_dec (coro->status);
1727
1569 Safefree (coro); 1728 Safefree (coro);
1570 }
1571 1729
1572 return 0; 1730 return 0;
1573} 1731}
1574 1732
1575static int 1733static int ecb_cold
1576coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1734coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1577{ 1735{
1578 struct coro *coro = (struct coro *)mg->mg_ptr; 1736 /* called when perl clones the current process the slow way (windows process emulation) */
1579 1737 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1580 ++coro->refcnt; 1738 mg->mg_ptr = 0;
1739 mg->mg_virtual = 0;
1581 1740
1582 return 0; 1741 return 0;
1583} 1742}
1584 1743
1585static MGVTBL coro_state_vtbl = { 1744static MGVTBL coro_state_vtbl = {
… …
1608 1767
1609 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1768 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1610 TRANSFER (ta, 1); 1769 TRANSFER (ta, 1);
1611} 1770}
1612 1771
1613/*****************************************************************************/
1614/* gensub: simple closure generation utility */
1615
1616#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1617
1618/* create a closure from XS, returns a code reference */
1619/* the arg can be accessed via GENSUB_ARG from the callback */
1620/* the callback must use dXSARGS/XSRETURN */
1621static SV *
1622gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1623{
1624 CV *cv = (CV *)newSV (0);
1625
1626 sv_upgrade ((SV *)cv, SVt_PVCV);
1627
1628 CvANON_on (cv);
1629 CvISXSUB_on (cv);
1630 CvXSUB (cv) = xsub;
1631 GENSUB_ARG = arg;
1632
1633 return newRV_noinc ((SV *)cv);
1634}
1635
1636/** Coro ********************************************************************/ 1772/** Coro ********************************************************************/
1637 1773
1638INLINE void 1774ecb_inline void
1639coro_enq (pTHX_ struct coro *coro) 1775coro_enq (pTHX_ struct coro *coro)
1640{ 1776{
1641 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1777 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1642 1778
1643 SvREFCNT_inc_NN (coro->hv); 1779 SvREFCNT_inc_NN (coro->hv);
… …
1645 coro->next_ready = 0; 1781 coro->next_ready = 0;
1646 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1782 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1647 ready [1] = coro; 1783 ready [1] = coro;
1648} 1784}
1649 1785
1650INLINE struct coro * 1786ecb_inline struct coro *
1651coro_deq (pTHX) 1787coro_deq (pTHX)
1652{ 1788{
1653 int prio; 1789 int prio;
1654 1790
1655 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1791 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1665 } 1801 }
1666 1802
1667 return 0; 1803 return 0;
1668} 1804}
1669 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
1670static int 1823static int
1671api_ready (pTHX_ SV *coro_sv) 1824api_ready (pTHX_ SV *coro_sv)
1672{ 1825{
1673 struct coro *coro;
1674 SV *sv_hook;
1675 void (*xs_hook)(void);
1676
1677 coro = SvSTATE (coro_sv); 1826 struct coro *coro = SvSTATE (coro_sv);
1678 1827
1679 if (coro->flags & CF_READY) 1828 if (coro->flags & CF_READY)
1680 return 0; 1829 return 0;
1681 1830
1682 coro->flags |= CF_READY; 1831 coro->flags |= CF_READY;
1683 1832
1684 sv_hook = coro_nready ? 0 : coro_readyhook;
1685 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1686
1687 coro_enq (aTHX_ coro); 1833 coro_enq (aTHX_ coro);
1688 ++coro_nready;
1689 1834
1690 if (sv_hook) 1835 if (!coro_nready++)
1691 { 1836 if (coroapi.readyhook)
1692 dSP; 1837 coroapi.readyhook ();
1693
1694 ENTER;
1695 SAVETMPS;
1696
1697 PUSHMARK (SP);
1698 PUTBACK;
1699 call_sv (sv_hook, G_VOID | G_DISCARD);
1700
1701 FREETMPS;
1702 LEAVE;
1703 }
1704
1705 if (xs_hook)
1706 xs_hook ();
1707 1838
1708 return 1; 1839 return 1;
1709} 1840}
1710 1841
1711static int 1842static int
… …
1713{ 1844{
1714 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1845 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1715} 1846}
1716 1847
1717/* expects to own a reference to next->hv */ 1848/* expects to own a reference to next->hv */
1718INLINE void 1849ecb_inline void
1719prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1850prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1720{ 1851{
1721 SV *prev_sv = SvRV (coro_current); 1852 SV *prev_sv = SvRV (coro_current);
1722 1853
1723 ta->prev = SvSTATE_hv (prev_sv); 1854 ta->prev = SvSTATE_hv (prev_sv);
… …
1736{ 1867{
1737 for (;;) 1868 for (;;)
1738 { 1869 {
1739 struct coro *next = coro_deq (aTHX); 1870 struct coro *next = coro_deq (aTHX);
1740 1871
1741 if (expect_true (next)) 1872 if (ecb_expect_true (next))
1742 { 1873 {
1743 /* cannot transfer to destroyed coros, skip and look for next */ 1874 /* cannot transfer to destroyed coros, skip and look for next */
1744 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1875 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1745 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1876 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1746 else 1877 else
1747 { 1878 {
1748 next->flags &= ~CF_READY; 1879 next->flags &= ~CF_READY;
1749 --coro_nready; 1880 --coro_nready;
… …
1756 { 1887 {
1757 /* nothing to schedule: call the idle handler */ 1888 /* nothing to schedule: call the idle handler */
1758 if (SvROK (sv_idle) 1889 if (SvROK (sv_idle)
1759 && SvOBJECT (SvRV (sv_idle))) 1890 && SvOBJECT (SvRV (sv_idle)))
1760 { 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
1761 ++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 */
1762 api_ready (aTHX_ SvRV (sv_idle)); 1896 api_ready (aTHX_ SvRV (sv_idle));
1763 --coro_nready; 1897 --coro_nready;
1764 } 1898 }
1765 else 1899 else
1766 { 1900 {
1901 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1767 dSP; 1902 dSP;
1768 1903
1769 ENTER; 1904 ENTER;
1770 SAVETMPS; 1905 SAVETMPS;
1771 1906
… …
1778 } 1913 }
1779 } 1914 }
1780 } 1915 }
1781} 1916}
1782 1917
1783INLINE void 1918ecb_inline void
1784prepare_cede (pTHX_ struct coro_transfer_args *ta) 1919prepare_cede (pTHX_ struct coro_transfer_args *ta)
1785{ 1920{
1786 api_ready (aTHX_ coro_current); 1921 api_ready (aTHX_ coro_current);
1787 prepare_schedule (aTHX_ ta); 1922 prepare_schedule (aTHX_ ta);
1788} 1923}
1789 1924
1790INLINE void 1925ecb_inline void
1791prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1926prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1792{ 1927{
1793 SV *prev = SvRV (coro_current); 1928 SV *prev = SvRV (coro_current);
1794 1929
1795 if (coro_nready) 1930 if (coro_nready)
… …
1825{ 1960{
1826 struct coro_transfer_args ta; 1961 struct coro_transfer_args ta;
1827 1962
1828 prepare_cede (aTHX_ &ta); 1963 prepare_cede (aTHX_ &ta);
1829 1964
1830 if (expect_true (ta.prev != ta.next)) 1965 if (ecb_expect_true (ta.prev != ta.next))
1831 { 1966 {
1832 TRANSFER (ta, 1); 1967 TRANSFER (ta, 1);
1833 return 1; 1968 return 1;
1834 } 1969 }
1835 else 1970 else
… …
1878 coro->slot->runops = RUNOPS_DEFAULT; 2013 coro->slot->runops = RUNOPS_DEFAULT;
1879 } 2014 }
1880} 2015}
1881 2016
1882static 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
1883coro_call_on_destroy (pTHX_ struct coro *coro) 2094coro_call_on_destroy (pTHX_ struct coro *coro)
1884{ 2095{
1885 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2096 AV *od = coro->on_destroy;
1886 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1887 2097
1888 if (on_destroyp) 2098 if (!od)
1889 { 2099 return;
1890 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1891 2100
1892 while (AvFILLp (on_destroy) >= 0) 2101 while (AvFILLp (od) >= 0)
2102 {
2103 SV *cb = sv_2mortal (av_pop (od));
2104
2105 /* coro hv's (and only hv's at the moment) are supported as well */
2106 if (SvSTATEhv_p (aTHX_ cb))
2107 api_ready (aTHX_ cb);
2108 else
1893 { 2109 {
1894 dSP; /* don't disturb outer sp */ 2110 dSP; /* don't disturb outer sp */
1895 SV *cb = av_pop (on_destroy);
1896
1897 PUSHMARK (SP); 2111 PUSHMARK (SP);
1898 2112
1899 if (statusp) 2113 if (coro->status)
1900 { 2114 {
1901 int i; 2115 PUTBACK;
1902 AV *status = (AV *)SvRV (*statusp); 2116 coro_push_av (aTHX_ coro->status, G_ARRAY);
1903 EXTEND (SP, AvFILLp (status) + 1); 2117 SPAGAIN;
1904
1905 for (i = 0; i <= AvFILLp (status); ++i)
1906 PUSHs (AvARRAY (status)[i]);
1907 } 2118 }
1908 2119
1909 PUTBACK; 2120 PUTBACK;
1910 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2121 call_sv (cb, G_VOID | G_DISCARD);
1911 } 2122 }
1912 } 2123 }
1913} 2124}
1914 2125
1915static void 2126static void
1916slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2127coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1917{ 2128{
2129 AV *av;
2130
2131 if (coro->status)
2132 {
2133 av = coro->status;
2134 av_clear (av);
2135 }
2136 else
2137 av = coro->status = newAV ();
2138
2139 /* items are actually not so common, so optimise for this case */
2140 if (items)
2141 {
1918 int i; 2142 int i;
1919 HV *hv = (HV *)SvRV (coro_current);
1920 AV *av = newAV ();
1921 2143
1922 av_extend (av, items - 1); 2144 av_extend (av, items - 1);
2145
1923 for (i = 0; i < items; ++i) 2146 for (i = 0; i < items; ++i)
1924 av_push (av, SvREFCNT_inc_NN (arg [i])); 2147 av_push (av, SvREFCNT_inc_NN (arg [i]));
2148 }
2149}
1925 2150
1926 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2151static void
1927 2152slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2153{
1928 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2154 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1929 api_ready (aTHX_ sv_manager); 2155 api_ready (aTHX_ sv_manager);
1930 2156
1931 frame->prepare = prepare_schedule; 2157 frame->prepare = prepare_schedule;
1932 frame->check = slf_check_repeat; 2158 frame->check = slf_check_repeat;
1933 2159
1934 /* as a minor optimisation, we could unwind all stacks here */ 2160 /* as a minor optimisation, we could unwind all stacks here */
1935 /* but that puts extra pressure on pp_slf, and is not worth much */ 2161 /* but that puts extra pressure on pp_slf, and is not worth much */
1936 /*coro_unwind_stacks (aTHX);*/ 2162 /*coro_unwind_stacks (aTHX);*/
2163}
2164
2165static void
2166slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2167{
2168 HV *coro_hv = (HV *)SvRV (coro_current);
2169
2170 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2171 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2172}
2173
2174static void
2175slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2176{
2177 HV *coro_hv;
2178 struct coro *coro;
2179
2180 if (items <= 0)
2181 croak ("Coro::cancel called without coro object,");
2182
2183 coro = SvSTATE (arg [0]);
2184 coro_hv = coro->hv;
2185
2186 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2187
2188 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2189 {
2190 /* coro currently busy cancelling something, so just notify it */
2191 coro->slf_frame.data = (void *)coro;
2192
2193 frame->prepare = prepare_nop;
2194 frame->check = slf_check_nop;
2195 }
2196 else if (coro_hv == (HV *)SvRV (coro_current))
2197 {
2198 /* cancelling the current coro is allowed, and equals terminate */
2199 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2200 }
2201 else
2202 {
2203 struct coro *self = SvSTATE_current;
2204
2205 /* otherwise we cancel directly, purely for speed reasons
2206 * unfortunately, this requires some magic trickery, as
2207 * somebody else could cancel us, so we have to fight the cancellation.
2208 * this is ugly, and hopefully fully worth the extra speed.
2209 * besides, I can't get the slow-but-safe version working...
2210 */
2211 slf_frame.data = 0;
2212 self->flags |= CF_NOCANCEL;
2213 coro_state_destroy (aTHX_ coro);
2214 self->flags &= ~CF_NOCANCEL;
2215
2216 if (slf_frame.data)
2217 {
2218 /* while we were busy we have been cancelled, so terminate */
2219 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2220 }
2221 else
2222 {
2223 frame->prepare = prepare_nop;
2224 frame->check = slf_check_nop;
2225 }
2226 }
2227}
2228
2229static int
2230slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2231{
2232 frame->prepare = 0;
2233 coro_unwind_stacks (aTHX);
2234
2235 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2236
2237 return 1;
2238}
2239
2240static int
2241safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2242{
2243 if (coro->cctx)
2244 croak ("coro inside C callback, unable to cancel at this time, caught");
2245
2246 if (coro->flags & CF_NEW)
2247 {
2248 coro_set_status (aTHX_ coro, arg, items);
2249 coro_state_destroy (aTHX_ coro);
2250 }
2251 else
2252 {
2253 if (!coro->slf_frame.prepare)
2254 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2255
2256 slf_destroy (aTHX_ coro);
2257
2258 coro_set_status (aTHX_ coro, arg, items);
2259 coro->slf_frame.prepare = prepare_nop;
2260 coro->slf_frame.check = slf_check_safe_cancel;
2261
2262 api_ready (aTHX_ (SV *)coro->hv);
2263 }
2264
2265 return 1;
1937} 2266}
1938 2267
1939/*****************************************************************************/ 2268/*****************************************************************************/
1940/* async pool handler */ 2269/* async pool handler */
1941 2270
… …
1972slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2301slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1973{ 2302{
1974 HV *hv = (HV *)SvRV (coro_current); 2303 HV *hv = (HV *)SvRV (coro_current);
1975 struct coro *coro = SvSTATE_hv ((SV *)hv); 2304 struct coro *coro = SvSTATE_hv ((SV *)hv);
1976 2305
1977 if (expect_true (coro->saved_deffh)) 2306 if (ecb_expect_true (coro->saved_deffh))
1978 { 2307 {
1979 /* subsequent iteration */ 2308 /* subsequent iteration */
1980 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2309 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1981 coro->saved_deffh = 0; 2310 coro->saved_deffh = 0;
1982 2311
1983 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2312 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1984 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2313 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1985 { 2314 {
1986 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2315 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1987 coro->invoke_av = newAV (); 2316 return;
1988
1989 frame->prepare = prepare_nop;
1990 } 2317 }
1991 else 2318 else
1992 { 2319 {
1993 av_clear (GvAV (PL_defgv)); 2320 av_clear (GvAV (PL_defgv));
1994 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2321 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2019 2346
2020static void 2347static void
2021coro_rouse_callback (pTHX_ CV *cv) 2348coro_rouse_callback (pTHX_ CV *cv)
2022{ 2349{
2023 dXSARGS; 2350 dXSARGS;
2024 SV *data = (SV *)GENSUB_ARG; 2351 SV *data = (SV *)S_GENSUB_ARG;
2025 2352
2026 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2353 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2027 { 2354 {
2028 /* first call, set args */ 2355 /* first call, set args */
2029 SV *coro = SvRV (data); 2356 SV *coro = SvRV (data);
… …
2044 2371
2045static int 2372static int
2046slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2373slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2047{ 2374{
2048 SV *data = (SV *)frame->data; 2375 SV *data = (SV *)frame->data;
2049 2376
2050 if (CORO_THROW) 2377 if (CORO_THROW)
2051 return 0; 2378 return 0;
2052 2379
2053 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2380 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2054 return 1; 2381 return 1;
… …
2090 cb = sv_2mortal (coro->rouse_cb); 2417 cb = sv_2mortal (coro->rouse_cb);
2091 coro->rouse_cb = 0; 2418 coro->rouse_cb = 0;
2092 } 2419 }
2093 2420
2094 if (!SvROK (cb) 2421 if (!SvROK (cb)
2095 || SvTYPE (SvRV (cb)) != SVt_PVCV 2422 || SvTYPE (SvRV (cb)) != SVt_PVCV
2096 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2423 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2097 croak ("Coro::rouse_wait called with illegal callback argument,"); 2424 croak ("Coro::rouse_wait called with illegal callback argument,");
2098 2425
2099 { 2426 {
2100 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2427 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2101 SV *data = (SV *)GENSUB_ARG; 2428 SV *data = (SV *)S_GENSUB_ARG;
2102 2429
2103 frame->data = (void *)data; 2430 frame->data = (void *)data;
2104 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2431 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2105 frame->check = slf_check_rouse_wait; 2432 frame->check = slf_check_rouse_wait;
2106 } 2433 }
… …
2110coro_new_rouse_cb (pTHX) 2437coro_new_rouse_cb (pTHX)
2111{ 2438{
2112 HV *hv = (HV *)SvRV (coro_current); 2439 HV *hv = (HV *)SvRV (coro_current);
2113 struct coro *coro = SvSTATE_hv (hv); 2440 struct coro *coro = SvSTATE_hv (hv);
2114 SV *data = newRV_inc ((SV *)hv); 2441 SV *data = newRV_inc ((SV *)hv);
2115 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2442 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2116 2443
2117 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2444 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2118 SvREFCNT_dec (data); /* magicext increases the refcount */ 2445 SvREFCNT_dec (data); /* magicext increases the refcount */
2119 2446
2120 SvREFCNT_dec (coro->rouse_cb); 2447 SvREFCNT_dec (coro->rouse_cb);
… …
2217static void 2544static void
2218slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2545slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2219{ 2546{
2220 frame->prepare = prepare_cede_notself; 2547 frame->prepare = prepare_cede_notself;
2221 frame->check = slf_check_nop; 2548 frame->check = slf_check_nop;
2549}
2550
2551/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2552static void
2553slf_destroy (pTHX_ struct coro *coro)
2554{
2555 /* this callback is reserved for slf functions needing to do cleanup */
2556 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2557 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2558
2559 /*
2560 * The on_destroy above most likely is from an SLF call.
2561 * Since by definition the SLF call will not finish when we destroy
2562 * the coro, we will have to force-finish it here, otherwise
2563 * cleanup functions cannot call SLF functions.
2564 */
2565 coro->slf_frame.prepare = 0;
2222} 2566}
2223 2567
2224/* 2568/*
2225 * these not obviously related functions are all rolled into one 2569 * these not obviously related functions are all rolled into one
2226 * function to increase chances that they all will call transfer with the same 2570 * function to increase chances that they all will call transfer with the same
… …
2233 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2577 I32 checkmark; /* mark SP to see how many elements check has pushed */
2234 2578
2235 /* set up the slf frame, unless it has already been set-up */ 2579 /* set up the slf frame, unless it has already been set-up */
2236 /* the latter happens when a new coro has been started */ 2580 /* the latter happens when a new coro has been started */
2237 /* or when a new cctx was attached to an existing coroutine */ 2581 /* or when a new cctx was attached to an existing coroutine */
2238 if (expect_true (!slf_frame.prepare)) 2582 if (ecb_expect_true (!slf_frame.prepare))
2239 { 2583 {
2240 /* first iteration */ 2584 /* first iteration */
2241 dSP; 2585 dSP;
2242 SV **arg = PL_stack_base + TOPMARK + 1; 2586 SV **arg = PL_stack_base + TOPMARK + 1;
2243 int items = SP - arg; /* args without function object */ 2587 int items = SP - arg; /* args without function object */
… …
2284 while (slf_frame.check (aTHX_ &slf_frame)); 2628 while (slf_frame.check (aTHX_ &slf_frame));
2285 2629
2286 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2630 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2287 2631
2288 /* exception handling */ 2632 /* exception handling */
2289 if (expect_false (CORO_THROW)) 2633 if (ecb_expect_false (CORO_THROW))
2290 { 2634 {
2291 SV *exception = sv_2mortal (CORO_THROW); 2635 SV *exception = sv_2mortal (CORO_THROW);
2292 2636
2293 CORO_THROW = 0; 2637 CORO_THROW = 0;
2294 sv_setsv (ERRSV, exception); 2638 sv_setsv (ERRSV, exception);
2295 croak (0); 2639 croak (0);
2296 } 2640 }
2297 2641
2298 /* return value handling - mostly like entersub */ 2642 /* return value handling - mostly like entersub */
2299 /* make sure we put something on the stack in scalar context */ 2643 /* make sure we put something on the stack in scalar context */
2300 if (GIMME_V == G_SCALAR) 2644 if (GIMME_V == G_SCALAR
2645 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2301 { 2646 {
2302 dSP; 2647 dSP;
2303 SV **bot = PL_stack_base + checkmark; 2648 SV **bot = PL_stack_base + checkmark;
2304 2649
2305 if (sp == bot) /* too few, push undef */ 2650 if (sp == bot) /* too few, push undef */
2306 bot [1] = &PL_sv_undef; 2651 bot [1] = &PL_sv_undef;
2307 else if (sp != bot + 1) /* too many, take last one */ 2652 else /* too many, take last one */
2308 bot [1] = *sp; 2653 bot [1] = *sp;
2309 2654
2310 SP = bot + 1; 2655 SP = bot + 1;
2311 2656
2312 PUTBACK; 2657 PUTBACK;
… …
2345 if (PL_op->op_flags & OPf_STACKED) 2690 if (PL_op->op_flags & OPf_STACKED)
2346 { 2691 {
2347 if (items > slf_arga) 2692 if (items > slf_arga)
2348 { 2693 {
2349 slf_arga = items; 2694 slf_arga = items;
2350 free (slf_argv); 2695 Safefree (slf_argv);
2351 slf_argv = malloc (slf_arga * sizeof (SV *)); 2696 New (0, slf_argv, slf_arga, SV *);
2352 } 2697 }
2353 2698
2354 slf_argc = items; 2699 slf_argc = items;
2355 2700
2356 for (i = 0; i < items; ++i) 2701 for (i = 0; i < items; ++i)
… …
2419{ 2764{
2420 PerlIOBuf base; 2765 PerlIOBuf base;
2421 NV next, every; 2766 NV next, every;
2422} PerlIOCede; 2767} PerlIOCede;
2423 2768
2424static IV 2769static IV ecb_cold
2425PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2770PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2426{ 2771{
2427 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2772 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2428 2773
2429 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2774 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2430 self->next = nvtime () + self->every; 2775 self->next = nvtime () + self->every;
2431 2776
2432 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2777 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2433} 2778}
2434 2779
2435static SV * 2780static SV * ecb_cold
2436PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2781PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2437{ 2782{
2438 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2783 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2439 2784
2440 return newSVnv (self->every); 2785 return newSVnv (self->every);
… …
2552 SvREFCNT_dec (cb); 2897 SvREFCNT_dec (cb);
2553 } 2898 }
2554} 2899}
2555 2900
2556static void 2901static void
2557coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2902coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2558{ 2903{
2559 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2904 /* call $sem->adjust (0) to possibly wake up some other waiters */
2560 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2905 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2561} 2906}
2562 2907
2563static int 2908static int
2564slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2909slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2565{ 2910{
2566 AV *av = (AV *)frame->data; 2911 AV *av = (AV *)frame->data;
2567 SV *count_sv = AvARRAY (av)[0]; 2912 SV *count_sv = AvARRAY (av)[0];
2913 SV *coro_hv = SvRV (coro_current);
2568 2914
2569 /* if we are about to throw, don't actually acquire the lock, just throw */ 2915 /* if we are about to throw, don't actually acquire the lock, just throw */
2570 if (CORO_THROW) 2916 if (CORO_THROW)
2571 return 0; 2917 return 0;
2572 else if (SvIVX (count_sv) > 0) 2918 else if (SvIVX (count_sv) > 0)
2573 { 2919 {
2574 SvSTATE_current->on_destroy = 0; 2920 frame->destroy = 0;
2575 2921
2576 if (acquire) 2922 if (acquire)
2577 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2923 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2578 else 2924 else
2579 coro_semaphore_adjust (aTHX_ av, 0); 2925 coro_semaphore_adjust (aTHX_ av, 0);
… …
2584 { 2930 {
2585 int i; 2931 int i;
2586 /* if we were woken up but can't down, we look through the whole */ 2932 /* if we were woken up but can't down, we look through the whole */
2587 /* waiters list and only add us if we aren't in there already */ 2933 /* waiters list and only add us if we aren't in there already */
2588 /* this avoids some degenerate memory usage cases */ 2934 /* this avoids some degenerate memory usage cases */
2589 2935 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2590 for (i = 1; i <= AvFILLp (av); ++i)
2591 if (AvARRAY (av)[i] == SvRV (coro_current)) 2936 if (AvARRAY (av)[i] == coro_hv)
2592 return 1; 2937 return 1;
2593 2938
2594 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2939 av_push (av, SvREFCNT_inc (coro_hv));
2595 return 1; 2940 return 1;
2596 } 2941 }
2597} 2942}
2598 2943
2599static int 2944static int
… …
2622 { 2967 {
2623 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2968 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2624 2969
2625 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2970 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2626 frame->prepare = prepare_schedule; 2971 frame->prepare = prepare_schedule;
2627
2628 /* to avoid race conditions when a woken-up coro gets terminated */ 2972 /* to avoid race conditions when a woken-up coro gets terminated */
2629 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2973 /* we arrange for a temporary on_destroy that calls adjust (0) */
2630 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2974 frame->destroy = coro_semaphore_destroy;
2631 } 2975 }
2632} 2976}
2633 2977
2634static void 2978static void
2635slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2979slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2643{ 2987{
2644 if (items >= 2) 2988 if (items >= 2)
2645 { 2989 {
2646 /* callback form */ 2990 /* callback form */
2647 AV *av = (AV *)SvRV (arg [0]); 2991 AV *av = (AV *)SvRV (arg [0]);
2648 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2992 SV *cb_cv = s_get_cv_croak (arg [1]);
2649 2993
2650 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2994 av_push (av, SvREFCNT_inc_NN (cb_cv));
2651 2995
2652 if (SvIVX (AvARRAY (av)[0]) > 0) 2996 if (SvIVX (AvARRAY (av)[0]) > 0)
2653 coro_semaphore_adjust (aTHX_ av, 0); 2997 coro_semaphore_adjust (aTHX_ av, 0);
… …
2713{ 3057{
2714 AV *av = (AV *)SvRV (arg [0]); 3058 AV *av = (AV *)SvRV (arg [0]);
2715 3059
2716 if (items >= 2) 3060 if (items >= 2)
2717 { 3061 {
2718 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3062 SV *cb_cv = s_get_cv_croak (arg [1]);
2719 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3063 av_push (av, SvREFCNT_inc_NN (cb_cv));
2720 3064
2721 if (SvIVX (AvARRAY (av)[0])) 3065 if (SvIVX (AvARRAY (av)[0]))
2722 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3066 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2723 3067
2724 frame->prepare = prepare_nop; 3068 frame->prepare = prepare_nop;
2725 frame->check = slf_check_nop; 3069 frame->check = slf_check_nop;
2726 } 3070 }
2727 else if (SvIVX (AvARRAY (av)[0])) 3071 else if (SvIVX (AvARRAY (av)[0]))
… …
2758 3102
2759static void 3103static void
2760coro_aio_callback (pTHX_ CV *cv) 3104coro_aio_callback (pTHX_ CV *cv)
2761{ 3105{
2762 dXSARGS; 3106 dXSARGS;
2763 AV *state = (AV *)GENSUB_ARG; 3107 AV *state = (AV *)S_GENSUB_ARG;
2764 SV *coro = av_pop (state); 3108 SV *coro = av_pop (state);
2765 SV *data_sv = newSV (sizeof (struct io_state)); 3109 SV *data_sv = newSV (sizeof (struct io_state));
2766 3110
2767 av_extend (state, items - 1); 3111 av_extend (state, items - 1);
2768 3112
… …
2853 dSP; 3197 dSP;
2854 3198
2855 static SV *prio_cv; 3199 static SV *prio_cv;
2856 static SV *prio_sv; 3200 static SV *prio_sv;
2857 3201
2858 if (expect_false (!prio_cv)) 3202 if (ecb_expect_false (!prio_cv))
2859 { 3203 {
2860 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3204 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2861 prio_sv = newSViv (0); 3205 prio_sv = newSViv (0);
2862 } 3206 }
2863 3207
… …
2882 3226
2883 for (i = 0; i < items; ++i) 3227 for (i = 0; i < items; ++i)
2884 PUSHs (arg [i]); 3228 PUSHs (arg [i]);
2885 3229
2886 /* now push the callback closure */ 3230 /* now push the callback closure */
2887 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3231 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2888 3232
2889 /* now call the AIO function - we assume our request is uncancelable */ 3233 /* now call the AIO function - we assume our request is uncancelable */
2890 PUTBACK; 3234 PUTBACK;
2891 call_sv ((SV *)req, G_VOID | G_DISCARD); 3235 call_sv ((SV *)req, G_VOID | G_DISCARD);
2892 } 3236 }
2893 3237
2894 /* now that the requets is going, we loop toll we have a result */ 3238 /* now that the request is going, we loop till we have a result */
2895 frame->data = (void *)state; 3239 frame->data = (void *)state;
2896 frame->prepare = prepare_schedule; 3240 frame->prepare = prepare_schedule;
2897 frame->check = slf_check_aio_req; 3241 frame->check = slf_check_aio_req;
2898} 3242}
2899 3243
… …
2909 3253
2910/*****************************************************************************/ 3254/*****************************************************************************/
2911 3255
2912#if CORO_CLONE 3256#if CORO_CLONE
2913# include "clone.c" 3257# include "clone.c"
3258#endif
3259
3260/*****************************************************************************/
3261
3262static SV *
3263coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3264{
3265 SV *coro_sv;
3266 struct coro *coro;
3267 MAGIC *mg;
3268 HV *hv;
3269 SV *cb;
3270 int i;
3271
3272 if (argc > 0)
3273 {
3274 cb = s_get_cv_croak (argv [0]);
3275
3276 if (!is_coro)
3277 {
3278 if (CvISXSUB (cb))
3279 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3280
3281 if (!CvROOT (cb))
3282 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3283 }
3284 }
3285
3286 Newz (0, coro, 1, struct coro);
3287 coro->args = newAV ();
3288 coro->flags = CF_NEW;
3289
3290 if (coro_first) coro_first->prev = coro;
3291 coro->next = coro_first;
3292 coro_first = coro;
3293
3294 coro->hv = hv = newHV ();
3295 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3296 mg->mg_flags |= MGf_DUP;
3297 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3298
3299 if (argc > 0)
3300 {
3301 av_extend (coro->args, argc + is_coro - 1);
3302
3303 if (is_coro)
3304 {
3305 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3306 cb = (SV *)cv_coro_run;
3307 }
3308
3309 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3310
3311 for (i = 1; i < argc; i++)
3312 av_push (coro->args, newSVsv (argv [i]));
3313 }
3314
3315 return coro_sv;
3316}
3317
3318#ifndef __cplusplus
3319ecb_cold XS(boot_Coro__State);
3320#endif
3321
3322#if CORO_JIT
3323
3324static void ecb_noinline ecb_cold
3325pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3326{
3327 dSP;
3328 AV *av = newAV ();
3329
3330 av_store (av, 3, newSVuv (d));
3331 av_store (av, 2, newSVuv (c));
3332 av_store (av, 1, newSVuv (b));
3333 av_store (av, 0, newSVuv (a));
3334
3335 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3336
3337 PUTBACK;
3338}
3339
3340static void ecb_noinline ecb_cold
3341jit_init (pTHX)
3342{
3343 dSP;
3344 SV *load, *save;
3345 char *map_base;
3346 char *load_ptr, *save_ptr;
3347 STRLEN load_len, save_len, map_len;
3348 int count;
3349
3350 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3351
3352 PUSHMARK (SP);
3353 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3354 #include "state.h"
3355 count = call_pv ("Coro::State::_jit", G_ARRAY);
3356 SPAGAIN;
3357
3358 save = POPs; save_ptr = SvPVbyte (save, save_len);
3359 load = POPs; load_ptr = SvPVbyte (load, load_len);
3360
3361 map_len = load_len + save_len + 16;
3362
3363 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3364
3365 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3366
3367 load_perl_slots = (load_save_perl_slots_type)map_base;
3368 memcpy (map_base, load_ptr, load_len);
3369
3370 map_base += (load_len + 15) & ~15;
3371
3372 save_perl_slots = (load_save_perl_slots_type)map_base;
3373 memcpy (map_base, save_ptr, save_len);
3374
3375 /* we are good citizens and try to make the page read-only, so the evil evil */
3376 /* hackers might have it a bit more difficult */
3377 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3378
3379 PUTBACK;
3380 eval_pv ("undef &Coro::State::_jit", 1);
3381}
3382
2914#endif 3383#endif
2915 3384
2916MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3385MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2917 3386
2918PROTOTYPES: DISABLE 3387PROTOTYPES: DISABLE
… …
2922#ifdef USE_ITHREADS 3391#ifdef USE_ITHREADS
2923# if CORO_PTHREAD 3392# if CORO_PTHREAD
2924 coro_thx = PERL_GET_CONTEXT; 3393 coro_thx = PERL_GET_CONTEXT;
2925# endif 3394# endif
2926#endif 3395#endif
2927 BOOT_PAGESIZE; 3396 /* perl defines these to check for existance first, but why it doesn't */
3397 /* just create them one at init time is not clear to me, except for */
3398 /* programs trying to delete them, but... */
3399 /* anyway, we declare this as invalid and make sure they are initialised here */
3400 DEFSV;
3401 ERRSV;
2928 3402
2929 cctx_current = cctx_new_empty (); 3403 cctx_current = cctx_new_empty ();
2930 3404
2931 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3405 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2932 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3406 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2972 coroapi.prepare_nop = prepare_nop; 3446 coroapi.prepare_nop = prepare_nop;
2973 coroapi.prepare_schedule = prepare_schedule; 3447 coroapi.prepare_schedule = prepare_schedule;
2974 coroapi.prepare_cede = prepare_cede; 3448 coroapi.prepare_cede = prepare_cede;
2975 coroapi.prepare_cede_notself = prepare_cede_notself; 3449 coroapi.prepare_cede_notself = prepare_cede_notself;
2976 3450
2977 { 3451 time_init (aTHX);
2978 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2979
2980 if (!svp) croak ("Time::HiRes is required");
2981 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2982
2983 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2984 }
2985 3452
2986 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3453 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3454#if CORO_JIT
3455 PUTBACK;
3456 jit_init (aTHX);
3457 SPAGAIN;
3458#endif
2987} 3459}
2988 3460
2989SV * 3461SV *
2990new (char *klass, ...) 3462new (SV *klass, ...)
2991 ALIAS: 3463 ALIAS:
2992 Coro::new = 1 3464 Coro::new = 1
2993 CODE: 3465 CODE:
2994{ 3466 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2995 struct coro *coro; 3467 OUTPUT:
2996 MAGIC *mg;
2997 HV *hv;
2998 CV *cb;
2999 int i;
3000
3001 if (items > 1)
3002 {
3003 cb = coro_sv_2cv (aTHX_ ST (1));
3004
3005 if (!ix)
3006 {
3007 if (CvISXSUB (cb))
3008 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3009
3010 if (!CvROOT (cb))
3011 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3012 }
3013 }
3014
3015 Newz (0, coro, 1, struct coro);
3016 coro->args = newAV ();
3017 coro->flags = CF_NEW;
3018
3019 if (coro_first) coro_first->prev = coro;
3020 coro->next = coro_first;
3021 coro_first = coro;
3022
3023 coro->hv = hv = newHV ();
3024 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3025 mg->mg_flags |= MGf_DUP;
3026 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3027
3028 if (items > 1)
3029 {
3030 av_extend (coro->args, items - 1 + ix - 1);
3031
3032 if (ix)
3033 {
3034 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3035 cb = cv_coro_run;
3036 }
3037
3038 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3039
3040 for (i = 2; i < items; i++)
3041 av_push (coro->args, newSVsv (ST (i)));
3042 }
3043}
3044 OUTPUT:
3045 RETVAL 3468 RETVAL
3046 3469
3047void 3470void
3048transfer (...) 3471transfer (...)
3049 PROTOTYPE: $$ 3472 PROTOTYPE: $$
3050 CODE: 3473 CODE:
3051 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3474 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3052
3053bool
3054_destroy (SV *coro_sv)
3055 CODE:
3056 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3057 OUTPUT:
3058 RETVAL
3059 3475
3060void 3476void
3061_exit (int code) 3477_exit (int code)
3062 PROTOTYPE: $ 3478 PROTOTYPE: $
3063 CODE: 3479 CODE:
… …
3124void 3540void
3125list () 3541list ()
3126 PROTOTYPE: 3542 PROTOTYPE:
3127 PPCODE: 3543 PPCODE:
3128{ 3544{
3129 struct coro *coro; 3545 struct coro *coro;
3130 for (coro = coro_first; coro; coro = coro->next) 3546 for (coro = coro_first; coro; coro = coro->next)
3131 if (coro->hv) 3547 if (coro->hv)
3132 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3548 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3133} 3549}
3134 3550
… …
3139 CODE: 3555 CODE:
3140{ 3556{
3141 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3557 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3142 { 3558 {
3143 struct coro *current = SvSTATE_current; 3559 struct coro *current = SvSTATE_current;
3560 struct CoroSLF slf_save;
3144 3561
3145 if (current != coro) 3562 if (current != coro)
3146 { 3563 {
3147 PUTBACK; 3564 PUTBACK;
3148 save_perl (aTHX_ current); 3565 save_perl (aTHX_ current);
3149 load_perl (aTHX_ coro); 3566 load_perl (aTHX_ coro);
3567 /* the coro is most likely in an active SLF call.
3568 * while not strictly required (the code we execute is
3569 * not allowed to call any SLF functions), it's cleaner
3570 * to reinitialise the slf_frame and restore it later.
3571 * This might one day allow us to actually do SLF calls
3572 * from code executed here.
3573 */
3574 slf_save = slf_frame;
3575 slf_frame.prepare = 0;
3150 SPAGAIN; 3576 SPAGAIN;
3151 } 3577 }
3152 3578
3153 PUSHSTACK; 3579 PUSHSTACK;
3154 3580
… …
3164 SPAGAIN; 3590 SPAGAIN;
3165 3591
3166 if (current != coro) 3592 if (current != coro)
3167 { 3593 {
3168 PUTBACK; 3594 PUTBACK;
3595 slf_frame = slf_save;
3169 save_perl (aTHX_ coro); 3596 save_perl (aTHX_ coro);
3170 load_perl (aTHX_ current); 3597 load_perl (aTHX_ current);
3171 SPAGAIN; 3598 SPAGAIN;
3172 } 3599 }
3173 } 3600 }
… …
3178 PROTOTYPE: $ 3605 PROTOTYPE: $
3179 ALIAS: 3606 ALIAS:
3180 is_ready = CF_READY 3607 is_ready = CF_READY
3181 is_running = CF_RUNNING 3608 is_running = CF_RUNNING
3182 is_new = CF_NEW 3609 is_new = CF_NEW
3183 is_destroyed = CF_DESTROYED 3610 is_destroyed = CF_ZOMBIE
3611 is_zombie = CF_ZOMBIE
3184 is_suspended = CF_SUSPENDED 3612 is_suspended = CF_SUSPENDED
3185 CODE: 3613 CODE:
3186 RETVAL = boolSV (coro->flags & ix); 3614 RETVAL = boolSV (coro->flags & ix);
3187 OUTPUT: 3615 OUTPUT:
3188 RETVAL 3616 RETVAL
3189 3617
3190void 3618void
3191throw (Coro::State self, SV *throw = &PL_sv_undef) 3619throw (SV *self, SV *exception = &PL_sv_undef)
3192 PROTOTYPE: $;$ 3620 PROTOTYPE: $;$
3193 CODE: 3621 CODE:
3194{ 3622{
3623 struct coro *coro = SvSTATE (self);
3195 struct coro *current = SvSTATE_current; 3624 struct coro *current = SvSTATE_current;
3196 SV **throwp = self == current ? &CORO_THROW : &self->except; 3625 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3197 SvREFCNT_dec (*throwp); 3626 SvREFCNT_dec (*exceptionp);
3198 SvGETMAGIC (throw); 3627 SvGETMAGIC (exception);
3199 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3628 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3629
3630 api_ready (aTHX_ self);
3200} 3631}
3201 3632
3202void 3633void
3203api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3634api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3204 PROTOTYPE: $;$ 3635 PROTOTYPE: $;$
… …
3259 3690
3260void 3691void
3261cancel (Coro::State self) 3692cancel (Coro::State self)
3262 CODE: 3693 CODE:
3263 coro_state_destroy (aTHX_ self); 3694 coro_state_destroy (aTHX_ self);
3264 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3695
3696SV *
3697enable_times (int enabled = enable_times)
3698 CODE:
3699{
3700 RETVAL = boolSV (enable_times);
3701
3702 if (enabled != enable_times)
3703 {
3704 enable_times = enabled;
3705
3706 coro_times_update ();
3707 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3708 }
3709}
3710 OUTPUT:
3711 RETVAL
3712
3713void
3714times (Coro::State self)
3715 PPCODE:
3716{
3717 struct coro *current = SvSTATE (coro_current);
3718
3719 if (ecb_expect_false (current == self))
3720 {
3721 coro_times_update ();
3722 coro_times_add (SvSTATE (coro_current));
3723 }
3724
3725 EXTEND (SP, 2);
3726 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3727 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3728
3729 if (ecb_expect_false (current == self))
3730 coro_times_sub (SvSTATE (coro_current));
3731}
3732
3733void
3734swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3735 CODE:
3736{
3737 struct coro *current = SvSTATE_current;
3738
3739 if (current == coro)
3740 SWAP_SVS (current);
3741
3742 if (!coro->swap_sv)
3743 coro->swap_sv = newAV ();
3744
3745 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3746 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3747
3748 if (current == coro)
3749 SWAP_SVS (current);
3750}
3265 3751
3266 3752
3267MODULE = Coro::State PACKAGE = Coro 3753MODULE = Coro::State PACKAGE = Coro
3268 3754
3269BOOT: 3755BOOT:
3270{ 3756{
3271 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3757 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3272 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3758 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3273 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3759 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3274 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3275 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3760 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3276 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3761 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3277 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3762 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3278 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3763 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3279 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3764 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3280 3765
3281 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3766 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3282 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3767 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3283 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3768 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3284 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3769 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3285 3770
3286 coro_stash = gv_stashpv ("Coro", TRUE); 3771 coro_stash = gv_stashpv ("Coro", TRUE);
3287 3772
3288 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3773 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3289 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3774 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
… …
3308 sv_setiv (sv, (IV)&coroapi); 3793 sv_setiv (sv, (IV)&coroapi);
3309 SvREADONLY_on (sv); 3794 SvREADONLY_on (sv);
3310 } 3795 }
3311} 3796}
3312 3797
3798SV *
3799async (...)
3800 PROTOTYPE: &@
3801 CODE:
3802 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3803 api_ready (aTHX_ RETVAL);
3804 OUTPUT:
3805 RETVAL
3806
3807void
3808_destroy (Coro::State coro)
3809 CODE:
3810 /* used by the manager thread */
3811 coro_state_destroy (aTHX_ coro);
3812
3813void
3814on_destroy (Coro::State coro, SV *cb)
3815 CODE:
3816 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3817
3818void
3819join (...)
3820 CODE:
3821 CORO_EXECUTE_SLF_XS (slf_init_join);
3822
3313void 3823void
3314terminate (...) 3824terminate (...)
3315 CODE: 3825 CODE:
3316 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3826 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3827
3828void
3829cancel (...)
3830 CODE:
3831 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3832
3833int
3834safe_cancel (Coro::State self, ...)
3835 C_ARGS: aTHX_ self, &ST (1), items - 1
3317 3836
3318void 3837void
3319schedule (...) 3838schedule (...)
3320 CODE: 3839 CODE:
3321 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3840 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3351_set_readyhook (SV *hook) 3870_set_readyhook (SV *hook)
3352 PROTOTYPE: $ 3871 PROTOTYPE: $
3353 CODE: 3872 CODE:
3354 SvREFCNT_dec (coro_readyhook); 3873 SvREFCNT_dec (coro_readyhook);
3355 SvGETMAGIC (hook); 3874 SvGETMAGIC (hook);
3875 if (SvOK (hook))
3876 {
3356 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3877 coro_readyhook = newSVsv (hook);
3878 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3879 }
3880 else
3881 {
3882 coro_readyhook = 0;
3883 CORO_READYHOOK = 0;
3884 }
3357 3885
3358int 3886int
3359prio (Coro::State coro, int newprio = 0) 3887prio (Coro::State coro, int newprio = 0)
3360 PROTOTYPE: $;$ 3888 PROTOTYPE: $;$
3361 ALIAS: 3889 ALIAS:
… …
3367 if (items > 1) 3895 if (items > 1)
3368 { 3896 {
3369 if (ix) 3897 if (ix)
3370 newprio = coro->prio - newprio; 3898 newprio = coro->prio - newprio;
3371 3899
3372 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3900 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3373 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3901 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3374 3902
3375 coro->prio = newprio; 3903 coro->prio = newprio;
3376 } 3904 }
3377} 3905}
3378 OUTPUT: 3906 OUTPUT:
… …
3425 for (i = 1; i < items; ++i) 3953 for (i = 1; i < items; ++i)
3426 av_push (av, SvREFCNT_inc_NN (ST (i))); 3954 av_push (av, SvREFCNT_inc_NN (ST (i)));
3427 3955
3428 if ((SV *)hv == &PL_sv_undef) 3956 if ((SV *)hv == &PL_sv_undef)
3429 { 3957 {
3430 PUSHMARK (SP); 3958 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3431 EXTEND (SP, 2);
3432 PUSHs (sv_Coro);
3433 PUSHs ((SV *)cv_pool_handler);
3434 PUTBACK;
3435 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3436 SPAGAIN;
3437
3438 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3959 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3960 SvREFCNT_dec (sv);
3439 } 3961 }
3440 3962
3441 { 3963 {
3442 struct coro *coro = SvSTATE_hv (hv); 3964 struct coro *coro = SvSTATE_hv (hv);
3443 3965
… …
3475 on_leave = 1 3997 on_leave = 1
3476 PROTOTYPE: & 3998 PROTOTYPE: &
3477 CODE: 3999 CODE:
3478{ 4000{
3479 struct coro *coro = SvSTATE_current; 4001 struct coro *coro = SvSTATE_current;
3480 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4002 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3481 4003
3482 block = (SV *)coro_sv_2cv (aTHX_ block); 4004 block = s_get_cv_croak (block);
3483 4005
3484 if (!*avp) 4006 if (!*avp)
3485 *avp = newAV (); 4007 *avp = newAV ();
3486 4008
3487 av_push (*avp, SvREFCNT_inc (block)); 4009 av_push (*avp, SvREFCNT_inc (block));
… …
3505 4027
3506SV * 4028SV *
3507new (SV *klass, SV *count = 0) 4029new (SV *klass, SV *count = 0)
3508 CODE: 4030 CODE:
3509{ 4031{
3510 int semcnt = 1; 4032 int semcnt = 1;
3511 4033
3512 if (count) 4034 if (count)
3513 { 4035 {
3514 SvGETMAGIC (count); 4036 SvGETMAGIC (count);
3515 4037
… …
3575 XSRETURN_NO; 4097 XSRETURN_NO;
3576} 4098}
3577 4099
3578void 4100void
3579waiters (SV *self) 4101waiters (SV *self)
3580 PPCODE: 4102 PPCODE:
3581{ 4103{
3582 AV *av = (AV *)SvRV (self); 4104 AV *av = (AV *)SvRV (self);
3583 int wcount = AvFILLp (av) + 1 - 1; 4105 int wcount = AvFILLp (av) + 1 - 1;
3584 4106
3585 if (GIMME_V == G_SCALAR) 4107 if (GIMME_V == G_SCALAR)
… …
3594} 4116}
3595 4117
3596MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4118MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3597 4119
3598void 4120void
3599_may_delete (SV *sem, int count, int extra_refs) 4121_may_delete (SV *sem, int count, unsigned int extra_refs)
3600 PPCODE: 4122 PPCODE:
3601{ 4123{
3602 AV *av = (AV *)SvRV (sem); 4124 AV *av = (AV *)SvRV (sem);
3603 4125
3604 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4126 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3605 && AvFILLp (av) == 0 /* no waiters, just count */ 4127 && AvFILLp (av) == 0 /* no waiters, just count */
3606 && SvIV (AvARRAY (av)[0]) == count) 4128 && SvIV (AvARRAY (av)[0]) == count)
3607 XSRETURN_YES; 4129 XSRETURN_YES;
… …
3628 4150
3629void 4151void
3630broadcast (SV *self) 4152broadcast (SV *self)
3631 CODE: 4153 CODE:
3632{ 4154{
3633 AV *av = (AV *)SvRV (self); 4155 AV *av = (AV *)SvRV (self);
3634 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4156 coro_signal_wake (aTHX_ av, AvFILLp (av));
3635} 4157}
3636 4158
3637void 4159void
3638send (SV *self) 4160send (SV *self)
… …
3646 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4168 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3647} 4169}
3648 4170
3649IV 4171IV
3650awaited (SV *self) 4172awaited (SV *self)
3651 CODE: 4173 CODE:
3652 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4174 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3653 OUTPUT: 4175 OUTPUT:
3654 RETVAL 4176 RETVAL
3655 4177
3656 4178
… …
3661 4183
3662void 4184void
3663_schedule (...) 4185_schedule (...)
3664 CODE: 4186 CODE:
3665{ 4187{
3666 static int incede; 4188 static int incede;
3667 4189
3668 api_cede_notself (aTHX); 4190 api_cede_notself (aTHX);
3669 4191
3670 ++incede; 4192 ++incede;
3671 while (coro_nready >= incede && api_cede (aTHX)) 4193 while (coro_nready >= incede && api_cede (aTHX))
… …
3687 4209
3688void 4210void
3689_register (char *target, char *proto, SV *req) 4211_register (char *target, char *proto, SV *req)
3690 CODE: 4212 CODE:
3691{ 4213{
3692 CV *req_cv = coro_sv_2cv (aTHX_ req); 4214 SV *req_cv = s_get_cv_croak (req);
3693 /* newXSproto doesn't return the CV on 5.8 */ 4215 /* newXSproto doesn't return the CV on 5.8 */
3694 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4216 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3695 sv_setpv ((SV *)slf_cv, proto); 4217 sv_setpv ((SV *)slf_cv, proto);
3696 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4218 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3697} 4219}
3698 4220
4221MODULE = Coro::State PACKAGE = Coro::Select
4222
4223void
4224patch_pp_sselect ()
4225 CODE:
4226 if (!coro_old_pp_sselect)
4227 {
4228 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4229 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4230 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4231 }
4232
4233void
4234unpatch_pp_sselect ()
4235 CODE:
4236 if (coro_old_pp_sselect)
4237 {
4238 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4239 coro_old_pp_sselect = 0;
4240 }
4241

Diff Legend

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