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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.361 by root, Wed Jul 1 07:26:40 2009 UTC vs.
Revision 1.441 by root, Tue Mar 4 05:07:44 2014 UTC

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

Diff Legend

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