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.434 by root, Sat Nov 2 19:48:50 2013 UTC

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

Diff Legend

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