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

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

Diff Legend

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