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.362 by root, Wed Jul 1 07:58:45 2009 UTC vs.
Revision 1.448 by root, Thu Jun 4 22:58:28 2015 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#ifndef PadnamelistREFCNT
48# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
49#endif
50#ifndef PadnamelistREFCNT_dec
51# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
52#endif
53
54/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
55/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
56#if PERL_VERSION_ATLEAST(5,19,0)
57# define SVt_BIND SVt_IV
58#endif
59
60#if defined(_WIN32)
61# undef HAS_GETTIMEOFDAY
18# undef setjmp 62# undef setjmp
19# undef longjmp 63# undef longjmp
20# undef _exit 64# undef _exit
21# define setjmp _setjmp /* deep magic */ 65# define setjmp _setjmp /* deep magic */
22#else 66#else
23# include <inttypes.h> /* most portable stdint.h */ 67# include <inttypes.h> /* most portable stdint.h */
24#endif 68#endif
25 69
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 */ 70/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 71static int cctx_max_idle = 4;
55 72
56#define PERL_VERSION_ATLEAST(a,b,c) \ 73#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57 (PERL_REVISION > (a) \ 74# 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 75#endif
122 76
123/* prefer perl internal functions over our own? */ 77/* prefer perl internal functions over our own? */
124#ifndef CORO_PREFER_PERL_FUNCTIONS 78#ifndef CORO_PREFER_PERL_FUNCTIONS
125# define CORO_PREFER_PERL_FUNCTIONS 0 79# define CORO_PREFER_PERL_FUNCTIONS 0
… …
135# define STACKLEVEL ((void *)&stacklevel) 89# define STACKLEVEL ((void *)&stacklevel)
136#endif 90#endif
137 91
138#define IN_DESTRUCT PL_dirty 92#define IN_DESTRUCT PL_dirty
139 93
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" 94#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */ 95#define GCoroAPI (&coroapi) /* very sneaky */
157 96
158#ifdef USE_ITHREADS 97#ifdef USE_ITHREADS
159# if CORO_PTHREAD 98# if CORO_PTHREAD
… …
175static void (*u2time)(pTHX_ UV ret[2]); 114static void (*u2time)(pTHX_ UV ret[2]);
176 115
177/* we hijack an hopefully unused CV flag for our purposes */ 116/* we hijack an hopefully unused CV flag for our purposes */
178#define CVf_SLF 0x4000 117#define CVf_SLF 0x4000
179static OP *pp_slf (pTHX); 118static OP *pp_slf (pTHX);
119static void slf_destroy (pTHX_ struct coro *coro);
180 120
181static U32 cctx_gen; 121static U32 cctx_gen;
182static size_t cctx_stacksize = CORO_STACKSIZE; 122static size_t cctx_stacksize = CORO_STACKSIZE;
183static struct CoroAPI coroapi; 123static struct CoroAPI coroapi;
184static AV *main_mainstack; /* used to differentiate between $main and others */ 124static AV *main_mainstack; /* used to differentiate between $main and others */
… …
201static SV *sv_pool_size; 141static SV *sv_pool_size;
202static SV *sv_async_pool_idle; /* description string */ 142static SV *sv_async_pool_idle; /* description string */
203static AV *av_async_pool; /* idle pool */ 143static AV *av_async_pool; /* idle pool */
204static SV *sv_Coro; /* class string */ 144static SV *sv_Coro; /* class string */
205static CV *cv_pool_handler; 145static CV *cv_pool_handler;
206static CV *cv_coro_state_new;
207 146
208/* Coro::AnyEvent */ 147/* Coro::AnyEvent */
209static SV *sv_activity; 148static SV *sv_activity;
210 149
211/* enable processtime/realtime profiling */ 150/* enable processtime/realtime profiling */
… …
215static char times_valid; 154static char times_valid;
216 155
217static struct coro_cctx *cctx_first; 156static struct coro_cctx *cctx_first;
218static int cctx_count, cctx_idle; 157static int cctx_count, cctx_idle;
219 158
220enum { 159enum
160{
221 CC_MAPPED = 0x01, 161 CC_MAPPED = 0x01,
222 CC_NOREUSE = 0x02, /* throw this away after tracing */ 162 CC_NOREUSE = 0x02, /* throw this away after tracing */
223 CC_TRACE = 0x04, 163 CC_TRACE = 0x04,
224 CC_TRACE_SUB = 0x08, /* trace sub calls */ 164 CC_TRACE_SUB = 0x08, /* trace sub calls */
225 CC_TRACE_LINE = 0x10, /* trace each statement */ 165 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
230typedef struct coro_cctx 170typedef struct coro_cctx
231{ 171{
232 struct coro_cctx *next; 172 struct coro_cctx *next;
233 173
234 /* the stack */ 174 /* the stack */
235 void *sptr; 175 struct coro_stack stack;
236 size_t ssize;
237 176
238 /* cpu state */ 177 /* cpu state */
239 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 178 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
179#ifndef NDEBUG
240 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 180 JMPENV *idle_te; /* same as idle_sp, but for top_env */
181#endif
241 JMPENV *top_env; 182 JMPENV *top_env;
242 coro_context cctx; 183 coro_context cctx;
243 184
244 U32 gen; 185 U32 gen;
245#if CORO_USE_VALGRIND 186#if CORO_USE_VALGRIND
246 int valgrind_id; 187 int valgrind_id;
247#endif 188#endif
248 unsigned char flags; 189 unsigned char flags;
249} coro_cctx; 190} coro_cctx;
250 191
251coro_cctx *cctx_current; /* the currently running cctx */ 192static coro_cctx *cctx_current; /* the currently running cctx */
252 193
253/*****************************************************************************/ 194/*****************************************************************************/
254 195
196static MGVTBL coro_state_vtbl;
197
255enum { 198enum
199{
256 CF_RUNNING = 0x0001, /* coroutine is running */ 200 CF_RUNNING = 0x0001, /* coroutine is running */
257 CF_READY = 0x0002, /* coroutine is ready */ 201 CF_READY = 0x0002, /* coroutine is ready */
258 CF_NEW = 0x0004, /* has never been switched to */ 202 CF_NEW = 0x0004, /* has never been switched to */
259 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 203 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
260 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 204 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
205 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
261}; 206};
262 207
263/* the structure where most of the perl state is stored, overlaid on the cxstack */ 208/* the structure where most of the perl state is stored, overlaid on the cxstack */
264typedef struct 209typedef struct
265{ 210{
266 SV *defsv;
267 AV *defav;
268 SV *errsv;
269 SV *irsgv;
270 HV *hinthv;
271#define VAR(name,type) type name; 211 #define VARx(name,expr,type) type name;
272# include "state.h" 212 #include "state.h"
273#undef VAR
274} perl_slots; 213} perl_slots;
275 214
215/* 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)) 216#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
277 217
278/* this is a structure representing a perl-level coroutine */ 218/* this is a structure representing a perl-level coroutine */
279struct coro { 219struct coro
220{
280 /* the C coroutine allocated to this perl coroutine, if any */ 221 /* the C coroutine allocated to this perl coroutine, if any */
281 coro_cctx *cctx; 222 coro_cctx *cctx;
282 223
283 /* ready queue */ 224 /* ready queue */
284 struct coro *next_ready; 225 struct coro *next_ready;
… …
286 /* state data */ 227 /* state data */
287 struct CoroSLF slf_frame; /* saved slf frame */ 228 struct CoroSLF slf_frame; /* saved slf frame */
288 AV *mainstack; 229 AV *mainstack;
289 perl_slots *slot; /* basically the saved sp */ 230 perl_slots *slot; /* basically the saved sp */
290 231
291 CV *startcv; /* the CV to execute */ 232 CV *startcv; /* the CV to execute */
292 AV *args; /* data associated with this coroutine (initial args) */ 233 AV *args; /* data associated with this coroutine (initial args) */
293 int refcnt; /* coroutines are refcounted, yes */
294 int flags; /* CF_ flags */ 234 int flags; /* CF_ flags */
295 HV *hv; /* the perl hash associated with this coro, if any */ 235 HV *hv; /* the perl hash associated with this coro, if any */
296 void (*on_destroy)(pTHX_ struct coro *coro);
297 236
298 /* statistics */ 237 /* statistics */
299 int usecount; /* number of transfers to this coro */ 238 int usecount; /* number of transfers to this coro */
300 239
301 /* coro process data */ 240 /* coro process data */
302 int prio; 241 int prio;
303 SV *except; /* exception to be thrown */ 242 SV *except; /* exception to be thrown */
304 SV *rouse_cb; 243 SV *rouse_cb; /* last rouse callback */
244 AV *on_destroy; /* callbacks or coros to notify on destroy */
245 AV *status; /* the exit status list */
305 246
306 /* async_pool */ 247 /* async_pool */
307 SV *saved_deffh; 248 SV *saved_deffh;
308 SV *invoke_cb; 249 SV *invoke_cb;
309 AV *invoke_av; 250 AV *invoke_av;
310 251
311 /* on_enter/on_leave */ 252 /* on_enter/on_leave */
312 AV *on_enter; 253 AV *on_enter;
313 AV *on_leave; 254 AV *on_leave;
314 255
256 /* swap_sv */
257 AV *swap_sv;
258
315 /* times */ 259 /* times */
316 coro_ts t_cpu, t_real; 260 coro_ts t_cpu, t_real;
317 261
318 /* linked list */ 262 /* linked list */
319 struct coro *next, *prev; 263 struct coro *next, *prev;
… …
322typedef struct coro *Coro__State; 266typedef struct coro *Coro__State;
323typedef struct coro *Coro__State_or_hashref; 267typedef struct coro *Coro__State_or_hashref;
324 268
325/* the following variables are effectively part of the perl context */ 269/* the following variables are effectively part of the perl context */
326/* and get copied between struct coro and these variables */ 270/* and get copied between struct coro and these variables */
327/* the mainr easonw e don't support windows process emulation */ 271/* the main reason we don't support windows process emulation */
328static struct CoroSLF slf_frame; /* the current slf frame */ 272static struct CoroSLF slf_frame; /* the current slf frame */
329 273
330/** Coro ********************************************************************/ 274/** Coro ********************************************************************/
331 275
332#define CORO_PRIO_MAX 3 276#define CORO_PRIO_MAX 3
… …
338 282
339/* for Coro.pm */ 283/* for Coro.pm */
340static SV *coro_current; 284static SV *coro_current;
341static SV *coro_readyhook; 285static SV *coro_readyhook;
342static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 286static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
343static CV *cv_coro_run, *cv_coro_terminate; 287static CV *cv_coro_run;
344static struct coro *coro_first; 288static struct coro *coro_first;
345#define coro_nready coroapi.nready 289#define coro_nready coroapi.nready
346 290
291/** JIT *********************************************************************/
292
293#if CORO_JIT
294 /* APPLE doesn't have mmap though */
295 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
296 #ifndef CORO_JIT_TYPE
297 #if ECB_AMD64 && CORO_JIT_UNIXY
298 #define CORO_JIT_TYPE "amd64-unix"
299 #elif __i386 && CORO_JIT_UNIXY
300 #define CORO_JIT_TYPE "x86-unix"
301 #endif
302 #endif
303#endif
304
305#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
306 #undef CORO_JIT
307#endif
308
309#if CORO_JIT
310 typedef void (*load_save_perl_slots_type)(perl_slots *);
311 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
312#endif
313
314/** Coro::Select ************************************************************/
315
316static OP *(*coro_old_pp_sselect) (pTHX);
317static SV *coro_select_select;
318
319/* horrible hack, but if it works... */
320static OP *
321coro_pp_sselect (pTHX)
322{
323 dSP;
324 PUSHMARK (SP - 4); /* fake argument list */
325 XPUSHs (coro_select_select);
326 PUTBACK;
327
328 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
329 PL_op->op_flags |= OPf_STACKED;
330 PL_op->op_private = 0;
331 return PL_ppaddr [OP_ENTERSUB](aTHX);
332}
333
334/** time stuff **************************************************************/
335
336#ifdef HAS_GETTIMEOFDAY
337
338ecb_inline void
339coro_u2time (pTHX_ UV ret[2])
340{
341 struct timeval tv;
342 gettimeofday (&tv, 0);
343
344 ret [0] = tv.tv_sec;
345 ret [1] = tv.tv_usec;
346}
347
348ecb_inline double
349coro_nvtime (void)
350{
351 struct timeval tv;
352 gettimeofday (&tv, 0);
353
354 return tv.tv_sec + tv.tv_usec * 1e-6;
355}
356
357ecb_inline void
358time_init (pTHX)
359{
360 nvtime = coro_nvtime;
361 u2time = coro_u2time;
362}
363
364#else
365
366ecb_inline void
367time_init (pTHX)
368{
369 SV **svp;
370
371 require_pv ("Time/HiRes.pm");
372
373 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
374
375 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
376 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
377
378 nvtime = INT2PTR (double (*)(), SvIV (*svp));
379
380 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
381 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
382}
383
384#endif
385
347/** lowlevel stuff **********************************************************/ 386/** lowlevel stuff **********************************************************/
348 387
349static SV * 388static SV * ecb_noinline
350coro_get_sv (pTHX_ const char *name, int create) 389coro_get_sv (pTHX_ const char *name, int create)
351{ 390{
352#if PERL_VERSION_ATLEAST (5,10,0) 391#if PERL_VERSION_ATLEAST (5,10,0)
353 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 392 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
354 get_sv (name, create); 393 get_sv (name, create);
355#endif 394#endif
356 return get_sv (name, create); 395 return get_sv (name, create);
357} 396}
358 397
359static AV * 398static AV * ecb_noinline
360coro_get_av (pTHX_ const char *name, int create) 399coro_get_av (pTHX_ const char *name, int create)
361{ 400{
362#if PERL_VERSION_ATLEAST (5,10,0) 401#if PERL_VERSION_ATLEAST (5,10,0)
363 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 402 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
364 get_av (name, create); 403 get_av (name, create);
365#endif 404#endif
366 return get_av (name, create); 405 return get_av (name, create);
367} 406}
368 407
369static HV * 408static HV * ecb_noinline
370coro_get_hv (pTHX_ const char *name, int create) 409coro_get_hv (pTHX_ const char *name, int create)
371{ 410{
372#if PERL_VERSION_ATLEAST (5,10,0) 411#if PERL_VERSION_ATLEAST (5,10,0)
373 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 412 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
374 get_hv (name, create); 413 get_hv (name, create);
375#endif 414#endif
376 return get_hv (name, create); 415 return get_hv (name, create);
377} 416}
378 417
379/* may croak */ 418ecb_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 () 419coro_times_update (void)
395{ 420{
396#ifdef coro_clock_gettime 421#ifdef coro_clock_gettime
397 struct timespec ts; 422 struct timespec ts;
398 423
399 ts.tv_sec = ts.tv_nsec = 0; 424 ts.tv_sec = ts.tv_nsec = 0;
… …
411 time_real [0] = tv [0]; 436 time_real [0] = tv [0];
412 time_real [1] = tv [1] * 1000; 437 time_real [1] = tv [1] * 1000;
413#endif 438#endif
414} 439}
415 440
416INLINE void 441ecb_inline void
417coro_times_add (struct coro *c) 442coro_times_add (struct coro *c)
418{ 443{
419 c->t_real [1] += time_real [1]; 444 c->t_real [1] += time_real [1];
420 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 445 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
421 c->t_real [0] += time_real [0]; 446 c->t_real [0] += time_real [0];
… …
423 c->t_cpu [1] += time_cpu [1]; 448 c->t_cpu [1] += time_cpu [1];
424 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 449 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
425 c->t_cpu [0] += time_cpu [0]; 450 c->t_cpu [0] += time_cpu [0];
426} 451}
427 452
428INLINE void 453ecb_inline void
429coro_times_sub (struct coro *c) 454coro_times_sub (struct coro *c)
430{ 455{
431 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 456 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]; 457 c->t_real [1] -= time_real [1];
433 c->t_real [0] -= time_real [0]; 458 c->t_real [0] -= time_real [0];
… …
441/* magic glue */ 466/* magic glue */
442 467
443#define CORO_MAGIC_type_cv 26 468#define CORO_MAGIC_type_cv 26
444#define CORO_MAGIC_type_state PERL_MAGIC_ext 469#define CORO_MAGIC_type_state PERL_MAGIC_ext
445 470
446#define CORO_MAGIC_NN(sv, type) \ 471#define CORO_MAGIC_NN(sv, type) \
447 (expect_true (SvMAGIC (sv)->mg_type == type) \ 472 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
448 ? SvMAGIC (sv) \ 473 ? SvMAGIC (sv) \
449 : mg_find (sv, type)) 474 : mg_find (sv, type))
450 475
451#define CORO_MAGIC(sv, type) \ 476#define CORO_MAGIC(sv, type) \
452 (expect_true (SvMAGIC (sv)) \ 477 (ecb_expect_true (SvMAGIC (sv)) \
453 ? CORO_MAGIC_NN (sv, type) \ 478 ? CORO_MAGIC_NN (sv, type) \
454 : 0) 479 : 0)
455 480
456#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 481#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) 482#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
458 483
459INLINE struct coro * 484ecb_inline MAGIC *
485SvSTATEhv_p (pTHX_ SV *coro)
486{
487 MAGIC *mg;
488
489 if (ecb_expect_true (
490 SvTYPE (coro) == SVt_PVHV
491 && (mg = CORO_MAGIC_state (coro))
492 && mg->mg_virtual == &coro_state_vtbl
493 ))
494 return mg;
495
496 return 0;
497}
498
499ecb_inline struct coro *
460SvSTATE_ (pTHX_ SV *coro) 500SvSTATE_ (pTHX_ SV *coro)
461{ 501{
462 HV *stash;
463 MAGIC *mg; 502 MAGIC *mg;
464 503
465 if (SvROK (coro)) 504 if (SvROK (coro))
466 coro = SvRV (coro); 505 coro = SvRV (coro);
467 506
468 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 507 mg = SvSTATEhv_p (aTHX_ coro);
508 if (!mg)
469 croak ("Coro::State object required"); 509 croak ("Coro::State object required");
470 510
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; 511 return (struct coro *)mg->mg_ptr;
481} 512}
482 513
483#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 514#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
484 515
… …
487#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 518#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
488 519
489/*****************************************************************************/ 520/*****************************************************************************/
490/* padlist management and caching */ 521/* padlist management and caching */
491 522
492static AV * 523ecb_inline PADLIST *
493coro_derive_padlist (pTHX_ CV *cv) 524coro_derive_padlist (pTHX_ CV *cv)
494{ 525{
495 AV *padlist = CvPADLIST (cv); 526 PADLIST *padlist = CvPADLIST (cv);
496 AV *newpadlist, *newpad; 527 PADLIST *newpadlist;
528 PADNAMELIST *padnames;
529 PAD *newpad;
530 PADOFFSET off = PadlistMAX (padlist) + 1;
497 531
498 newpadlist = newAV (); 532#if NEWPADAPI
533
534 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
535 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
536 while (!PadlistARRAY (padlist)[off - 1])
537 --off;
538
539 Perl_pad_push (aTHX_ padlist, off);
540
541 newpad = PadlistARRAY (padlist)[off];
542 PadlistARRAY (padlist)[off] = 0;
543
544#else
545
546#if PERL_VERSION_ATLEAST (5,10,0)
547 Perl_pad_push (aTHX_ padlist, off);
548#else
549 Perl_pad_push (aTHX_ padlist, off, 1);
550#endif
551
552 newpad = PadlistARRAY (padlist)[off];
553 PadlistMAX (padlist) = off - 1;
554
555#endif
556
557 newPADLIST (newpadlist);
558#if !PERL_VERSION_ATLEAST(5,15,3)
559 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
499 AvREAL_off (newpadlist); 560 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 561#endif
505 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
506 --AvFILLp (padlist);
507 562
508 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 563 /* Already extended to 2 elements by newPADLIST. */
509 av_store (newpadlist, 1, (SV *)newpad); 564 PadlistMAX (newpadlist) = 1;
565
566 padnames = PadlistNAMES (padlist);
567 ++PadnamelistREFCNT (padnames);
568 PadlistNAMES (newpadlist) = padnames;
569
570 PadlistARRAY (newpadlist)[1] = newpad;
510 571
511 return newpadlist; 572 return newpadlist;
512} 573}
513 574
514static void 575ecb_inline void
515free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
516{ 577{
517 /* may be during global destruction */ 578 /* may be during global destruction */
518 if (!IN_DESTRUCT) 579 if (!IN_DESTRUCT)
519 { 580 {
520 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
521 582
522 while (i > 0) /* special-case index 0 */ 583 while (i > 0) /* special-case index 0 */
523 { 584 {
524 /* we try to be extra-careful here */ 585 /* we try to be extra-careful here */
525 AV *av = (AV *)AvARRAY (padlist)[i--]; 586 PAD *pad = PadlistARRAY (padlist)[i--];
526 I32 j = AvFILLp (av);
527 587
588 if (pad)
589 {
590 I32 j = PadMAX (pad);
591
528 while (j >= 0) 592 while (j >= 0)
529 SvREFCNT_dec (AvARRAY (av)[j--]); 593 SvREFCNT_dec (PadARRAY (pad)[j--]);
530 594
531 AvFILLp (av) = -1; 595 PadMAX (pad) = -1;
532 SvREFCNT_dec (av); 596 SvREFCNT_dec (pad);
597 }
533 } 598 }
534 599
535 SvREFCNT_dec (AvARRAY (padlist)[0]); 600 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
536 601
602#if NEWPADAPI
603 Safefree (PadlistARRAY (padlist));
604 Safefree (padlist);
605#else
537 AvFILLp (padlist) = -1; 606 AvFILLp (padlist) = -1;
607 AvREAL_off (padlist);
538 SvREFCNT_dec ((SV*)padlist); 608 SvREFCNT_dec ((SV*)padlist);
609#endif
539 } 610 }
540} 611}
541 612
542static int 613static int
543coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 614coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
544{ 615{
545 AV *padlist; 616 PADLIST *padlist;
546 AV *av = (AV *)mg->mg_obj; 617 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
618 size_t len = *(size_t *)mg->mg_ptr;
547 619
548 /* perl manages to free our internal AV and _then_ call us */ 620 /* perl manages to free our internal AV and _then_ call us */
549 if (IN_DESTRUCT) 621 if (IN_DESTRUCT)
550 return 0; 622 return 0;
551 623
552 /* casting is fun. */ 624 while (len--)
553 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
554 free_padlist (aTHX_ padlist); 625 free_padlist (aTHX_ padlists[len]);
555
556 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
557 626
558 return 0; 627 return 0;
559} 628}
560 629
561static MGVTBL coro_cv_vtbl = { 630static MGVTBL coro_cv_vtbl = {
562 0, 0, 0, 0, 631 0, 0, 0, 0,
563 coro_cv_free 632 coro_cv_free
564}; 633};
565 634
566/* the next two functions merely cache the padlists */ 635/* the next two functions merely cache the padlists */
567static void 636ecb_inline void
568get_padlist (pTHX_ CV *cv) 637get_padlist (pTHX_ CV *cv)
569{ 638{
570 MAGIC *mg = CORO_MAGIC_cv (cv); 639 MAGIC *mg = CORO_MAGIC_cv (cv);
571 AV *av; 640 size_t *lenp;
572 641
573 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 642 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
574 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 643 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
575 else 644 else
576 { 645 {
577#if CORO_PREFER_PERL_FUNCTIONS 646#if CORO_PREFER_PERL_FUNCTIONS
578 /* this is probably cleaner? but also slower! */ 647 /* this is probably cleaner? but also slower! */
579 /* in practise, it seems to be less stable */ 648 /* in practise, it seems to be less stable */
… …
585 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 654 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
586#endif 655#endif
587 } 656 }
588} 657}
589 658
590static void 659ecb_inline void
591put_padlist (pTHX_ CV *cv) 660put_padlist (pTHX_ CV *cv)
592{ 661{
593 MAGIC *mg = CORO_MAGIC_cv (cv); 662 MAGIC *mg = CORO_MAGIC_cv (cv);
594 AV *av;
595 663
596 if (expect_false (!mg)) 664 if (ecb_expect_false (!mg))
665 {
597 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 666 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
667 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
668 mg->mg_len = 1; /* so mg_free frees mg_ptr */
669 }
670 else
671 Renew (mg->mg_ptr,
672 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
673 char);
598 674
599 av = (AV *)mg->mg_obj; 675 ((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} 676}
606 677
607/** load & save, init *******************************************************/ 678/** load & save, init *******************************************************/
679
680ecb_inline void
681swap_sv (SV *a, SV *b)
682{
683 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
684 SV tmp;
685
686 /* swap sv_any */
687 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
688
689 /* swap sv_flags */
690 SvFLAGS (&tmp) = SvFLAGS (a);
691 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
692 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
693
694#if PERL_VERSION_ATLEAST (5,10,0)
695 /* perl 5.10 and later complicates this _quite_ a bit, but it also
696 * is much faster, so no quarrels here. alternatively, we could
697 * sv_upgrade to avoid this.
698 */
699 {
700 /* swap sv_u */
701 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
702
703 /* if SvANY points to the head, we need to adjust the pointers,
704 * as the pointer for a still points to b, and maybe vice versa.
705 */
706 #define svany_in_head(type) \
707 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
708
709 if (svany_in_head (SvTYPE (a)))
710 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
711
712 if (svany_in_head (SvTYPE (b)))
713 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
714 }
715#endif
716}
717
718/* swap sv heads, at least logically */
719static void
720swap_svs (pTHX_ Coro__State c)
721{
722 int i;
723
724 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
725 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
726}
727
728#define SWAP_SVS(coro) \
729 if (ecb_expect_false ((coro)->swap_sv)) \
730 swap_svs (aTHX_ (coro))
608 731
609static void 732static void
610on_enterleave_call (pTHX_ SV *cb); 733on_enterleave_call (pTHX_ SV *cb);
611 734
612static void 735static void
… …
615 perl_slots *slot = c->slot; 738 perl_slots *slot = c->slot;
616 c->slot = 0; 739 c->slot = 0;
617 740
618 PL_mainstack = c->mainstack; 741 PL_mainstack = c->mainstack;
619 742
620 GvSV (PL_defgv) = slot->defsv; 743#if CORO_JIT
621 GvAV (PL_defgv) = slot->defav; 744 load_perl_slots (slot);
622 GvSV (PL_errgv) = slot->errsv; 745#else
623 GvSV (irsgv) = slot->irsgv;
624 GvHV (PL_hintgv) = slot->hinthv;
625
626 #define VAR(name,type) PL_ ## name = slot->name; 746 #define VARx(name,expr,type) expr = slot->name;
627 # include "state.h" 747 #include "state.h"
628 #undef VAR 748#endif
629 749
630 { 750 {
631 dSP; 751 dSP;
632 752
633 CV *cv; 753 CV *cv;
634 754
635 /* now do the ugly restore mess */ 755 /* now do the ugly restore mess */
636 while (expect_true (cv = (CV *)POPs)) 756 while (ecb_expect_true (cv = (CV *)POPs))
637 { 757 {
638 put_padlist (aTHX_ cv); /* mark this padlist as available */ 758 put_padlist (aTHX_ cv); /* mark this padlist as available */
639 CvDEPTH (cv) = PTR2IV (POPs); 759 CvDEPTH (cv) = PTR2IV (POPs);
640 CvPADLIST (cv) = (AV *)POPs; 760 CvPADLIST (cv) = (PADLIST *)POPs;
641 } 761 }
642 762
643 PUTBACK; 763 PUTBACK;
644 } 764 }
645 765
646 slf_frame = c->slf_frame; 766 slf_frame = c->slf_frame;
647 CORO_THROW = c->except; 767 CORO_THROW = c->except;
648 768
649 if (expect_false (enable_times)) 769 if (ecb_expect_false (enable_times))
650 { 770 {
651 if (expect_false (!times_valid)) 771 if (ecb_expect_false (!times_valid))
652 coro_times_update (); 772 coro_times_update ();
653 773
654 coro_times_sub (c); 774 coro_times_sub (c);
655 } 775 }
656 776
657 if (expect_false (c->on_enter)) 777 if (ecb_expect_false (c->on_enter))
658 { 778 {
659 int i; 779 int i;
660 780
661 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 781 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
662 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 782 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
663 } 783 }
784
785 SWAP_SVS (c);
664} 786}
665 787
666static void 788static void
667save_perl (pTHX_ Coro__State c) 789save_perl (pTHX_ Coro__State c)
668{ 790{
791 SWAP_SVS (c);
792
669 if (expect_false (c->on_leave)) 793 if (ecb_expect_false (c->on_leave))
670 { 794 {
671 int i; 795 int i;
672 796
673 for (i = AvFILLp (c->on_leave); i >= 0; --i) 797 for (i = AvFILLp (c->on_leave); i >= 0; --i)
674 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 798 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
675 } 799 }
676 800
677 times_valid = 0; 801 times_valid = 0;
678 802
679 if (expect_false (enable_times)) 803 if (ecb_expect_false (enable_times))
680 { 804 {
681 coro_times_update (); times_valid = 1; 805 coro_times_update (); times_valid = 1;
682 coro_times_add (c); 806 coro_times_add (c);
683 } 807 }
684 808
… …
698 822
699 XPUSHs (Nullsv); 823 XPUSHs (Nullsv);
700 /* this loop was inspired by pp_caller */ 824 /* this loop was inspired by pp_caller */
701 for (;;) 825 for (;;)
702 { 826 {
703 while (expect_true (cxix >= 0)) 827 while (ecb_expect_true (cxix >= 0))
704 { 828 {
705 PERL_CONTEXT *cx = &ccstk[cxix--]; 829 PERL_CONTEXT *cx = &ccstk[cxix--];
706 830
707 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 831 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
708 { 832 {
709 CV *cv = cx->blk_sub.cv; 833 CV *cv = cx->blk_sub.cv;
710 834
711 if (expect_true (CvDEPTH (cv))) 835 if (ecb_expect_true (CvDEPTH (cv)))
712 { 836 {
713 EXTEND (SP, 3); 837 EXTEND (SP, 3);
714 PUSHs ((SV *)CvPADLIST (cv)); 838 PUSHs ((SV *)CvPADLIST (cv));
715 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 839 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
716 PUSHs ((SV *)cv); 840 PUSHs ((SV *)cv);
… …
719 get_padlist (aTHX_ cv); 843 get_padlist (aTHX_ cv);
720 } 844 }
721 } 845 }
722 } 846 }
723 847
724 if (expect_true (top_si->si_type == PERLSI_MAIN)) 848 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
725 break; 849 break;
726 850
727 top_si = top_si->si_prev; 851 top_si = top_si->si_prev;
728 ccstk = top_si->si_cxstack; 852 ccstk = top_si->si_cxstack;
729 cxix = top_si->si_cxix; 853 cxix = top_si->si_cxix;
… …
731 855
732 PUTBACK; 856 PUTBACK;
733 } 857 }
734 858
735 /* allocate some space on the context stack for our purposes */ 859 /* allocate some space on the context stack for our purposes */
736 /* we manually unroll here, as usually 2 slots is enough */ 860 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 { 861 {
741 unsigned int i; 862 unsigned int i;
863
742 for (i = 3; i < SLOT_COUNT; ++i) 864 for (i = 0; i < SLOT_COUNT; ++i)
743 CXINC; 865 CXINC;
744 } 866
745 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 867 cxstack_ix -= SLOT_COUNT; /* undo allocation */
868 }
746 869
747 c->mainstack = PL_mainstack; 870 c->mainstack = PL_mainstack;
748 871
749 { 872 {
750 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 873 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
751 874
752 slot->defav = GvAV (PL_defgv); 875#if CORO_JIT
753 slot->defsv = DEFSV; 876 save_perl_slots (slot);
754 slot->errsv = ERRSV; 877#else
755 slot->irsgv = GvSV (irsgv);
756 slot->hinthv = GvHV (PL_hintgv);
757
758 #define VAR(name,type) slot->name = PL_ ## name; 878 #define VARx(name,expr,type) slot->name = expr;
759 # include "state.h" 879 #include "state.h"
760 #undef VAR 880#endif
761 } 881 }
762} 882}
763 883
764/* 884/*
765 * allocate various perl stacks. This is almost an exact copy 885 * allocate various perl stacks. This is almost an exact copy
… …
771# define coro_init_stacks(thx) init_stacks () 891# define coro_init_stacks(thx) init_stacks ()
772#else 892#else
773static void 893static void
774coro_init_stacks (pTHX) 894coro_init_stacks (pTHX)
775{ 895{
776 PL_curstackinfo = new_stackinfo(32, 8); 896 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; 897 PL_curstackinfo->si_type = PERLSI_MAIN;
778 PL_curstack = PL_curstackinfo->si_stack; 898 PL_curstack = PL_curstackinfo->si_stack;
779 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 899 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
780 900
781 PL_stack_base = AvARRAY(PL_curstack); 901 PL_stack_base = AvARRAY(PL_curstack);
… …
796#endif 916#endif
797 917
798 New(54,PL_scopestack,8,I32); 918 New(54,PL_scopestack,8,I32);
799 PL_scopestack_ix = 0; 919 PL_scopestack_ix = 0;
800 PL_scopestack_max = 8; 920 PL_scopestack_max = 8;
921#if HAS_SCOPESTACK_NAME
922 New(54,PL_scopestack_name,8,const char*);
923#endif
801 924
802 New(54,PL_savestack,24,ANY); 925 New(54,PL_savestack,24,ANY);
803 PL_savestack_ix = 0; 926 PL_savestack_ix = 0;
804 PL_savestack_max = 24; 927 PL_savestack_max = 24;
805 928
… …
833 } 956 }
834 957
835 Safefree (PL_tmps_stack); 958 Safefree (PL_tmps_stack);
836 Safefree (PL_markstack); 959 Safefree (PL_markstack);
837 Safefree (PL_scopestack); 960 Safefree (PL_scopestack);
961#if HAS_SCOPESTACK_NAME
962 Safefree (PL_scopestack_name);
963#endif
838 Safefree (PL_savestack); 964 Safefree (PL_savestack);
839#if !PERL_VERSION_ATLEAST (5,10,0) 965#if !PERL_VERSION_ATLEAST (5,10,0)
840 Safefree (PL_retstack); 966 Safefree (PL_retstack);
841#endif 967#endif
842} 968}
… …
888#endif 1014#endif
889 1015
890/* 1016/*
891 * This overrides the default magic get method of %SIG elements. 1017 * 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 1018 * 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 1019 * and instead of trying to save and restore the hash elements (extremely slow),
894 * readback here. 1020 * we just provide our own readback here.
895 */ 1021 */
896static int 1022static int ecb_cold
897coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1023coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
898{ 1024{
899 const char *s = MgPV_nolen_const (mg); 1025 const char *s = MgPV_nolen_const (mg);
900 1026
901 if (*s == '_') 1027 if (*s == '_')
902 { 1028 {
903 SV **svp = 0; 1029 SV **svp = 0;
904 1030
905 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1031 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
906 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1032 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
907 1033
908 if (svp) 1034 if (svp)
909 { 1035 {
910 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1036 SV *ssv;
1037
1038 if (!*svp)
1039 ssv = &PL_sv_undef;
1040 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1041 ssv = sv_2mortal (newRV_inc (*svp));
1042 else
1043 ssv = *svp;
1044
1045 sv_setsv (sv, ssv);
911 return 0; 1046 return 0;
912 } 1047 }
913 } 1048 }
914 1049
915 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1050 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
916} 1051}
917 1052
918static int 1053static int ecb_cold
919coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1054coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
920{ 1055{
921 const char *s = MgPV_nolen_const (mg); 1056 const char *s = MgPV_nolen_const (mg);
922 1057
923 if (*s == '_') 1058 if (*s == '_')
… …
937 } 1072 }
938 1073
939 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1074 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
940} 1075}
941 1076
942static int 1077static int ecb_cold
943coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1078coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
944{ 1079{
945 const char *s = MgPV_nolen_const (mg); 1080 const char *s = MgPV_nolen_const (mg);
946 1081
947 if (*s == '_') 1082 if (*s == '_')
… …
980slf_check_repeat (pTHX_ struct CoroSLF *frame) 1115slf_check_repeat (pTHX_ struct CoroSLF *frame)
981{ 1116{
982 return 1; 1117 return 1;
983} 1118}
984 1119
985static UNOP coro_setup_op; 1120static UNOP init_perl_op;
986 1121
987static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1122ecb_noinline static void /* noinline to keep it out of the transfer fast path */
988coro_setup (pTHX_ struct coro *coro) 1123init_perl (pTHX_ struct coro *coro)
989{ 1124{
990 /* 1125 /*
991 * emulate part of the perl startup here. 1126 * emulate part of the perl startup here.
992 */ 1127 */
993 coro_init_stacks (aTHX); 1128 coro_init_stacks (aTHX);
… …
1000 PL_comppad_name_fill = 0; 1135 PL_comppad_name_fill = 0;
1001 PL_comppad_name_floor = 0; 1136 PL_comppad_name_floor = 0;
1002 PL_curpm = 0; 1137 PL_curpm = 0;
1003 PL_curpad = 0; 1138 PL_curpad = 0;
1004 PL_localizing = 0; 1139 PL_localizing = 0;
1005 PL_dirty = 0;
1006 PL_restartop = 0; 1140 PL_restartop = 0;
1007#if PERL_VERSION_ATLEAST (5,10,0) 1141#if PERL_VERSION_ATLEAST (5,10,0)
1008 PL_parser = 0; 1142 PL_parser = 0;
1009#endif 1143#endif
1010 PL_hints = 0; 1144 PL_hints = 0;
1011 1145
1012 /* recreate the die/warn hooks */ 1146 /* recreate the die/warn hooks */
1013 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1147 PL_diehook = SvREFCNT_inc (rv_diehook);
1014 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1148 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1015 1149
1016 GvSV (PL_defgv) = newSV (0); 1150 GvSV (PL_defgv) = newSV (0);
1017 GvAV (PL_defgv) = coro->args; coro->args = 0; 1151 GvAV (PL_defgv) = coro->args; coro->args = 0;
1018 GvSV (PL_errgv) = newSV (0); 1152 GvSV (PL_errgv) = newSV (0);
1019 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1153 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1020 GvHV (PL_hintgv) = 0; 1154 GvHV (PL_hintgv) = newHV ();
1155#if PERL_VERSION_ATLEAST (5,10,0)
1156 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1157#endif
1021 PL_rs = newSVsv (GvSV (irsgv)); 1158 PL_rs = newSVsv (GvSV (irsgv));
1022 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1159 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1023 1160
1024 { 1161 {
1025 dSP; 1162 dSP;
… …
1040 /* this newly created coroutine might be run on an existing cctx which most 1177 /* 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. 1178 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1042 */ 1179 */
1043 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1180 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 */ 1181 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1182 slf_frame.destroy = 0;
1045 1183
1046 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1184 /* 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; 1185 init_perl_op.op_next = PL_op;
1048 coro_setup_op.op_type = OP_ENTERSUB; 1186 init_perl_op.op_type = OP_ENTERSUB;
1049 coro_setup_op.op_ppaddr = pp_slf; 1187 init_perl_op.op_ppaddr = pp_slf;
1050 /* no flags etc. required, as an init function won't be called */ 1188 /* no flags etc. required, as an init function won't be called */
1051 1189
1052 PL_op = (OP *)&coro_setup_op; 1190 PL_op = (OP *)&init_perl_op;
1053 1191
1054 /* copy throw, in case it was set before coro_setup */ 1192 /* copy throw, in case it was set before init_perl */
1055 CORO_THROW = coro->except; 1193 CORO_THROW = coro->except;
1056 1194
1195 SWAP_SVS (coro);
1196
1057 if (expect_false (enable_times)) 1197 if (ecb_expect_false (enable_times))
1058 { 1198 {
1059 coro_times_update (); 1199 coro_times_update ();
1060 coro_times_sub (coro); 1200 coro_times_sub (coro);
1061 } 1201 }
1062} 1202}
… …
1081 dounwind (-1); 1221 dounwind (-1);
1082 } 1222 }
1083} 1223}
1084 1224
1085static void 1225static void
1086coro_destruct_perl (pTHX_ struct coro *coro) 1226destroy_perl (pTHX_ struct coro *coro)
1087{ 1227{
1088 SV *svf [9]; 1228 SV *svf [9];
1089 1229
1090 { 1230 {
1231 SV *old_current = SvRV (coro_current);
1091 struct coro *current = SvSTATE_current; 1232 struct coro *current = SvSTATE (old_current);
1092 1233
1093 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1234 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1094 1235
1095 save_perl (aTHX_ current); 1236 save_perl (aTHX_ current);
1237
1238 /* this will cause transfer_check to croak on block*/
1239 SvRV_set (coro_current, (SV *)coro->hv);
1240
1096 load_perl (aTHX_ coro); 1241 load_perl (aTHX_ coro);
1097 1242
1098 coro_unwind_stacks (aTHX); 1243 coro_unwind_stacks (aTHX);
1244
1245 /* restore swapped sv's */
1246 SWAP_SVS (coro);
1247
1099 coro_destruct_stacks (aTHX); 1248 coro_destruct_stacks (aTHX);
1100 1249
1101 // now save some sv's to be free'd later 1250 /* now save some sv's to be free'd later */
1102 svf [0] = GvSV (PL_defgv); 1251 svf [0] = GvSV (PL_defgv);
1103 svf [1] = (SV *)GvAV (PL_defgv); 1252 svf [1] = (SV *)GvAV (PL_defgv);
1104 svf [2] = GvSV (PL_errgv); 1253 svf [2] = GvSV (PL_errgv);
1105 svf [3] = (SV *)PL_defoutgv; 1254 svf [3] = (SV *)PL_defoutgv;
1106 svf [4] = PL_rs; 1255 svf [4] = PL_rs;
… …
1108 svf [6] = (SV *)GvHV (PL_hintgv); 1257 svf [6] = (SV *)GvHV (PL_hintgv);
1109 svf [7] = PL_diehook; 1258 svf [7] = PL_diehook;
1110 svf [8] = PL_warnhook; 1259 svf [8] = PL_warnhook;
1111 assert (9 == sizeof (svf) / sizeof (*svf)); 1260 assert (9 == sizeof (svf) / sizeof (*svf));
1112 1261
1262 SvRV_set (coro_current, old_current);
1263
1113 load_perl (aTHX_ current); 1264 load_perl (aTHX_ current);
1114 } 1265 }
1115 1266
1116 { 1267 {
1117 unsigned int i; 1268 unsigned int i;
… …
1124 SvREFCNT_dec (coro->invoke_cb); 1275 SvREFCNT_dec (coro->invoke_cb);
1125 SvREFCNT_dec (coro->invoke_av); 1276 SvREFCNT_dec (coro->invoke_av);
1126 } 1277 }
1127} 1278}
1128 1279
1129INLINE void 1280ecb_inline void
1130free_coro_mortal (pTHX) 1281free_coro_mortal (pTHX)
1131{ 1282{
1132 if (expect_true (coro_mortal)) 1283 if (ecb_expect_true (coro_mortal))
1133 { 1284 {
1134 SvREFCNT_dec (coro_mortal); 1285 SvREFCNT_dec ((SV *)coro_mortal);
1135 coro_mortal = 0; 1286 coro_mortal = 0;
1136 } 1287 }
1137} 1288}
1138 1289
1139static int 1290static int
… …
1272 1423
1273 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1424 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1274} 1425}
1275 1426
1276/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1427/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1277static void NOINLINE 1428static void ecb_noinline
1278cctx_prepare (pTHX) 1429cctx_prepare (pTHX)
1279{ 1430{
1280 PL_top_env = &PL_start_env; 1431 PL_top_env = &PL_start_env;
1281 1432
1282 if (cctx_current->flags & CC_TRACE) 1433 if (cctx_current->flags & CC_TRACE)
… …
1293 slf_frame.prepare = slf_prepare_set_stacklevel; 1444 slf_frame.prepare = slf_prepare_set_stacklevel;
1294 slf_frame.check = slf_check_set_stacklevel; 1445 slf_frame.check = slf_check_set_stacklevel;
1295} 1446}
1296 1447
1297/* the tail of transfer: execute stuff we can only do after a transfer */ 1448/* the tail of transfer: execute stuff we can only do after a transfer */
1298INLINE void 1449ecb_inline void
1299transfer_tail (pTHX) 1450transfer_tail (pTHX)
1300{ 1451{
1301 free_coro_mortal (aTHX); 1452 free_coro_mortal (aTHX);
1453}
1454
1455/* try to exit the same way perl's main function would do */
1456/* we do not bother resetting the environment or other things *7
1457/* that are not, uhm, essential */
1458/* this obviously also doesn't work when perl is embedded */
1459static void ecb_noinline ecb_cold
1460perlish_exit (pTHX)
1461{
1462 int exitstatus = perl_destruct (PL_curinterp);
1463 perl_free (PL_curinterp);
1464 exit (exitstatus);
1302} 1465}
1303 1466
1304/* 1467/*
1305 * this is a _very_ stripped down perl interpreter ;) 1468 * this is a _very_ stripped down perl interpreter ;)
1306 */ 1469 */
… …
1328 /* somebody or something will hit me for both perl_run and PL_restartop */ 1491 /* somebody or something will hit me for both perl_run and PL_restartop */
1329 PL_restartop = PL_op; 1492 PL_restartop = PL_op;
1330 perl_run (PL_curinterp); 1493 perl_run (PL_curinterp);
1331 /* 1494 /*
1332 * Unfortunately, there is no way to get at the return values of the 1495 * Unfortunately, there is no way to get at the return values of the
1333 * coro body here, as perl_run destroys these 1496 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1497 * runtime errors here, as this is just a random interpreter, not a thread.
1334 */ 1498 */
1335 1499
1336 /* 1500 /*
1337 * If perl-run returns we assume exit() was being called or the coro 1501 * 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) 1502 * 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 1503 * 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" 1504 * 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 */ 1505 */
1345 PL_top_env = main_top_env; 1506 perlish_exit (aTHX);
1346 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1347 } 1507 }
1348} 1508}
1349 1509
1350static coro_cctx * 1510static coro_cctx *
1351cctx_new () 1511cctx_new (void)
1352{ 1512{
1353 coro_cctx *cctx; 1513 coro_cctx *cctx;
1354 1514
1355 ++cctx_count; 1515 ++cctx_count;
1356 New (0, cctx, 1, coro_cctx); 1516 New (0, cctx, 1, coro_cctx);
… …
1362 return cctx; 1522 return cctx;
1363} 1523}
1364 1524
1365/* create a new cctx only suitable as source */ 1525/* create a new cctx only suitable as source */
1366static coro_cctx * 1526static coro_cctx *
1367cctx_new_empty () 1527cctx_new_empty (void)
1368{ 1528{
1369 coro_cctx *cctx = cctx_new (); 1529 coro_cctx *cctx = cctx_new ();
1370 1530
1371 cctx->sptr = 0; 1531 cctx->stack.sptr = 0;
1372 coro_create (&cctx->cctx, 0, 0, 0, 0); 1532 coro_create (&cctx->cctx, 0, 0, 0, 0);
1373 1533
1374 return cctx; 1534 return cctx;
1375} 1535}
1376 1536
1377/* create a new cctx suitable as destination/running a perl interpreter */ 1537/* create a new cctx suitable as destination/running a perl interpreter */
1378static coro_cctx * 1538static coro_cctx *
1379cctx_new_run () 1539cctx_new_run (void)
1380{ 1540{
1381 coro_cctx *cctx = cctx_new (); 1541 coro_cctx *cctx = cctx_new ();
1382 void *stack_start;
1383 size_t stack_size;
1384 1542
1385#if HAVE_MMAP 1543 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 } 1544 {
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."); 1545 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1408 _exit (EXIT_FAILURE); 1546 _exit (EXIT_FAILURE);
1409 }
1410
1411 stack_start = cctx->sptr;
1412 stack_size = cctx->ssize;
1413 } 1547 }
1414 1548
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); 1549 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1420 1550
1421 return cctx; 1551 return cctx;
1422} 1552}
1423 1553
1424static void 1554static void
1425cctx_destroy (coro_cctx *cctx) 1555cctx_destroy (coro_cctx *cctx)
1426{ 1556{
1427 if (!cctx) 1557 if (!cctx)
1428 return; 1558 return;
1429 1559
1430 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1560 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1431 1561
1432 --cctx_count; 1562 --cctx_count;
1433 coro_destroy (&cctx->cctx); 1563 coro_destroy (&cctx->cctx);
1434 1564
1435 /* coro_transfer creates new, empty cctx's */ 1565 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 1566
1450 Safefree (cctx); 1567 Safefree (cctx);
1451} 1568}
1452 1569
1453/* wether this cctx should be destructed */ 1570/* wether this cctx should be destructed */
1454#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1571#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1455 1572
1456static coro_cctx * 1573static coro_cctx *
1457cctx_get (pTHX) 1574cctx_get (pTHX)
1458{ 1575{
1459 while (expect_true (cctx_first)) 1576 while (ecb_expect_true (cctx_first))
1460 { 1577 {
1461 coro_cctx *cctx = cctx_first; 1578 coro_cctx *cctx = cctx_first;
1462 cctx_first = cctx->next; 1579 cctx_first = cctx->next;
1463 --cctx_idle; 1580 --cctx_idle;
1464 1581
1465 if (expect_true (!CCTX_EXPIRED (cctx))) 1582 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1466 return cctx; 1583 return cctx;
1467 1584
1468 cctx_destroy (cctx); 1585 cctx_destroy (cctx);
1469 } 1586 }
1470 1587
… …
1472} 1589}
1473 1590
1474static void 1591static void
1475cctx_put (coro_cctx *cctx) 1592cctx_put (coro_cctx *cctx)
1476{ 1593{
1477 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1594 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1478 1595
1479 /* free another cctx if overlimit */ 1596 /* free another cctx if overlimit */
1480 if (expect_false (cctx_idle >= cctx_max_idle)) 1597 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1481 { 1598 {
1482 coro_cctx *first = cctx_first; 1599 coro_cctx *first = cctx_first;
1483 cctx_first = first->next; 1600 cctx_first = first->next;
1484 --cctx_idle; 1601 --cctx_idle;
1485 1602
… …
1496static void 1613static void
1497transfer_check (pTHX_ struct coro *prev, struct coro *next) 1614transfer_check (pTHX_ struct coro *prev, struct coro *next)
1498{ 1615{
1499 /* TODO: throwing up here is considered harmful */ 1616 /* TODO: throwing up here is considered harmful */
1500 1617
1501 if (expect_true (prev != next)) 1618 if (ecb_expect_true (prev != next))
1502 { 1619 {
1503 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1620 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,"); 1621 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1505 1622
1506 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1623 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,"); 1624 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1508 1625
1509#if !PERL_VERSION_ATLEAST (5,10,0) 1626#if !PERL_VERSION_ATLEAST (5,10,0)
1510 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1627 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,"); 1628 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1512#endif 1629#endif
1513 } 1630 }
1514} 1631}
1515 1632
1516/* always use the TRANSFER macro */ 1633/* always use the TRANSFER macro */
1517static void NOINLINE /* noinline so we have a fixed stackframe */ 1634static void ecb_noinline /* noinline so we have a fixed stackframe */
1518transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1635transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1519{ 1636{
1520 dSTACKLEVEL; 1637 dSTACKLEVEL;
1521 1638
1522 /* sometimes transfer is only called to set idle_sp */ 1639 /* sometimes transfer is only called to set idle_sp */
1523 if (expect_false (!prev)) 1640 if (ecb_expect_false (!prev))
1524 { 1641 {
1525 cctx_current->idle_sp = STACKLEVEL; 1642 cctx_current->idle_sp = STACKLEVEL;
1526 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1643 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1527 } 1644 }
1528 else if (expect_true (prev != next)) 1645 else if (ecb_expect_true (prev != next))
1529 { 1646 {
1530 coro_cctx *cctx_prev; 1647 coro_cctx *cctx_prev;
1531 1648
1532 if (expect_false (prev->flags & CF_NEW)) 1649 if (ecb_expect_false (prev->flags & CF_NEW))
1533 { 1650 {
1534 /* create a new empty/source context */ 1651 /* create a new empty/source context */
1535 prev->flags &= ~CF_NEW; 1652 prev->flags &= ~CF_NEW;
1536 prev->flags |= CF_RUNNING; 1653 prev->flags |= CF_RUNNING;
1537 } 1654 }
… …
1540 next->flags |= CF_RUNNING; 1657 next->flags |= CF_RUNNING;
1541 1658
1542 /* first get rid of the old state */ 1659 /* first get rid of the old state */
1543 save_perl (aTHX_ prev); 1660 save_perl (aTHX_ prev);
1544 1661
1545 if (expect_false (next->flags & CF_NEW)) 1662 if (ecb_expect_false (next->flags & CF_NEW))
1546 { 1663 {
1547 /* need to start coroutine */ 1664 /* need to start coroutine */
1548 next->flags &= ~CF_NEW; 1665 next->flags &= ~CF_NEW;
1549 /* setup coroutine call */ 1666 /* setup coroutine call */
1550 coro_setup (aTHX_ next); 1667 init_perl (aTHX_ next);
1551 } 1668 }
1552 else 1669 else
1553 load_perl (aTHX_ next); 1670 load_perl (aTHX_ next);
1554 1671
1555 /* possibly untie and reuse the cctx */ 1672 /* possibly untie and reuse the cctx */
1556 if (expect_true ( 1673 if (ecb_expect_true (
1557 cctx_current->idle_sp == STACKLEVEL 1674 cctx_current->idle_sp == STACKLEVEL
1558 && !(cctx_current->flags & CC_TRACE) 1675 && !(cctx_current->flags & CC_TRACE)
1559 && !force_cctx 1676 && !force_cctx
1560 )) 1677 ))
1561 { 1678 {
1562 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1679 /* 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)); 1680 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1564 1681
1565 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1682 /* 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 */ 1683 /* without this the next cctx_get might destroy the running cctx while still in use */
1567 if (expect_false (CCTX_EXPIRED (cctx_current))) 1684 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1568 if (expect_true (!next->cctx)) 1685 if (ecb_expect_true (!next->cctx))
1569 next->cctx = cctx_get (aTHX); 1686 next->cctx = cctx_get (aTHX);
1570 1687
1571 cctx_put (cctx_current); 1688 cctx_put (cctx_current);
1572 } 1689 }
1573 else 1690 else
1574 prev->cctx = cctx_current; 1691 prev->cctx = cctx_current;
1575 1692
1576 ++next->usecount; 1693 ++next->usecount;
1577 1694
1578 cctx_prev = cctx_current; 1695 cctx_prev = cctx_current;
1579 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1696 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1580 1697
1581 next->cctx = 0; 1698 next->cctx = 0;
1582 1699
1583 if (expect_false (cctx_prev != cctx_current)) 1700 if (ecb_expect_false (cctx_prev != cctx_current))
1584 { 1701 {
1585 cctx_prev->top_env = PL_top_env; 1702 cctx_prev->top_env = PL_top_env;
1586 PL_top_env = cctx_current->top_env; 1703 PL_top_env = cctx_current->top_env;
1587 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1704 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1588 } 1705 }
… …
1594#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1711#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) 1712#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1596 1713
1597/** high level stuff ********************************************************/ 1714/** high level stuff ********************************************************/
1598 1715
1716/* this function is actually Coro, not Coro::State, but we call it from here */
1717/* because it is convenient - but it hasn't been declared yet for that reason */
1599static int 1718static void
1719coro_call_on_destroy (pTHX_ struct coro *coro);
1720
1721static void
1600coro_state_destroy (pTHX_ struct coro *coro) 1722coro_state_destroy (pTHX_ struct coro *coro)
1601{ 1723{
1602 if (coro->flags & CF_DESTROYED) 1724 if (coro->flags & CF_ZOMBIE)
1603 return 0; 1725 return;
1604 1726
1605 if (coro->on_destroy && !PL_dirty)
1606 coro->on_destroy (aTHX_ coro); 1727 slf_destroy (aTHX_ coro);
1607 1728
1608 coro->flags |= CF_DESTROYED; 1729 coro->flags |= CF_ZOMBIE;
1609 1730
1610 if (coro->flags & CF_READY) 1731 if (coro->flags & CF_READY)
1611 { 1732 {
1612 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1733 /* reduce nready, as destroying a ready coro effectively unreadies it */
1613 /* alternative: look through all ready queues and remove the coro */ 1734 /* alternative: look through all ready queues and remove the coro */
1614 --coro_nready; 1735 --coro_nready;
1615 } 1736 }
1616 else 1737 else
1617 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1738 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1739
1740 if (coro->next) coro->next->prev = coro->prev;
1741 if (coro->prev) coro->prev->next = coro->next;
1742 if (coro == coro_first) coro_first = coro->next;
1618 1743
1619 if (coro->mainstack 1744 if (coro->mainstack
1620 && coro->mainstack != main_mainstack 1745 && coro->mainstack != main_mainstack
1621 && coro->slot 1746 && coro->slot
1622 && !PL_dirty) 1747 && !PL_dirty)
1623 coro_destruct_perl (aTHX_ coro); 1748 destroy_perl (aTHX_ coro);
1624 1749
1625 cctx_destroy (coro->cctx); 1750 cctx_destroy (coro->cctx);
1626 SvREFCNT_dec (coro->startcv); 1751 SvREFCNT_dec (coro->startcv);
1627 SvREFCNT_dec (coro->args); 1752 SvREFCNT_dec (coro->args);
1753 SvREFCNT_dec (coro->swap_sv);
1628 SvREFCNT_dec (CORO_THROW); 1754 SvREFCNT_dec (CORO_THROW);
1629 1755
1630 if (coro->next) coro->next->prev = coro->prev; 1756 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 1757
1634 return 1; 1758 /* more destruction mayhem in coro_state_free */
1635} 1759}
1636 1760
1637static int 1761static int
1638coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1762coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1639{ 1763{
1640 struct coro *coro = (struct coro *)mg->mg_ptr; 1764 struct coro *coro = (struct coro *)mg->mg_ptr;
1641 mg->mg_ptr = 0; 1765 mg->mg_ptr = 0;
1642 1766
1643 coro->hv = 0;
1644
1645 if (--coro->refcnt < 0)
1646 {
1647 coro_state_destroy (aTHX_ coro); 1767 coro_state_destroy (aTHX_ coro);
1768 SvREFCNT_dec (coro->on_destroy);
1769 SvREFCNT_dec (coro->status);
1770
1648 Safefree (coro); 1771 Safefree (coro);
1649 }
1650 1772
1651 return 0; 1773 return 0;
1652} 1774}
1653 1775
1654static int 1776static int ecb_cold
1655coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1777coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1656{ 1778{
1657 struct coro *coro = (struct coro *)mg->mg_ptr; 1779 /* called when perl clones the current process the slow way (windows process emulation) */
1658 1780 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1659 ++coro->refcnt; 1781 mg->mg_ptr = 0;
1782 mg->mg_virtual = 0;
1660 1783
1661 return 0; 1784 return 0;
1662} 1785}
1663 1786
1664static MGVTBL coro_state_vtbl = { 1787static MGVTBL coro_state_vtbl = {
… …
1687 1810
1688 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1811 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1689 TRANSFER (ta, 1); 1812 TRANSFER (ta, 1);
1690} 1813}
1691 1814
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 ********************************************************************/ 1815/** Coro ********************************************************************/
1716 1816
1717INLINE void 1817ecb_inline void
1718coro_enq (pTHX_ struct coro *coro) 1818coro_enq (pTHX_ struct coro *coro)
1719{ 1819{
1720 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1820 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1721 1821
1722 SvREFCNT_inc_NN (coro->hv); 1822 SvREFCNT_inc_NN (coro->hv);
… …
1724 coro->next_ready = 0; 1824 coro->next_ready = 0;
1725 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1825 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1726 ready [1] = coro; 1826 ready [1] = coro;
1727} 1827}
1728 1828
1729INLINE struct coro * 1829ecb_inline struct coro *
1730coro_deq (pTHX) 1830coro_deq (pTHX)
1731{ 1831{
1732 int prio; 1832 int prio;
1733 1833
1734 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1834 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1744 } 1844 }
1745 1845
1746 return 0; 1846 return 0;
1747} 1847}
1748 1848
1849static void
1850invoke_sv_ready_hook_helper (void)
1851{
1852 dTHX;
1853 dSP;
1854
1855 ENTER;
1856 SAVETMPS;
1857
1858 PUSHMARK (SP);
1859 PUTBACK;
1860 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1861
1862 FREETMPS;
1863 LEAVE;
1864}
1865
1749static int 1866static int
1750api_ready (pTHX_ SV *coro_sv) 1867api_ready (pTHX_ SV *coro_sv)
1751{ 1868{
1752 struct coro *coro;
1753 SV *sv_hook;
1754 void (*xs_hook)(void);
1755
1756 coro = SvSTATE (coro_sv); 1869 struct coro *coro = SvSTATE (coro_sv);
1757 1870
1758 if (coro->flags & CF_READY) 1871 if (coro->flags & CF_READY)
1759 return 0; 1872 return 0;
1760 1873
1761 coro->flags |= CF_READY; 1874 coro->flags |= CF_READY;
1762 1875
1763 sv_hook = coro_nready ? 0 : coro_readyhook;
1764 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1765
1766 coro_enq (aTHX_ coro); 1876 coro_enq (aTHX_ coro);
1767 ++coro_nready;
1768 1877
1769 if (sv_hook) 1878 if (!coro_nready++)
1770 { 1879 if (coroapi.readyhook)
1771 dSP; 1880 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 1881
1787 return 1; 1882 return 1;
1788} 1883}
1789 1884
1790static int 1885static int
… …
1792{ 1887{
1793 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1888 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1794} 1889}
1795 1890
1796/* expects to own a reference to next->hv */ 1891/* expects to own a reference to next->hv */
1797INLINE void 1892ecb_inline void
1798prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1893prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1799{ 1894{
1800 SV *prev_sv = SvRV (coro_current); 1895 SV *prev_sv = SvRV (coro_current);
1801 1896
1802 ta->prev = SvSTATE_hv (prev_sv); 1897 ta->prev = SvSTATE_hv (prev_sv);
… …
1815{ 1910{
1816 for (;;) 1911 for (;;)
1817 { 1912 {
1818 struct coro *next = coro_deq (aTHX); 1913 struct coro *next = coro_deq (aTHX);
1819 1914
1820 if (expect_true (next)) 1915 if (ecb_expect_true (next))
1821 { 1916 {
1822 /* cannot transfer to destroyed coros, skip and look for next */ 1917 /* cannot transfer to destroyed coros, skip and look for next */
1823 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1918 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 */ 1919 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1825 else 1920 else
1826 { 1921 {
1827 next->flags &= ~CF_READY; 1922 next->flags &= ~CF_READY;
1828 --coro_nready; 1923 --coro_nready;
… …
1835 { 1930 {
1836 /* nothing to schedule: call the idle handler */ 1931 /* nothing to schedule: call the idle handler */
1837 if (SvROK (sv_idle) 1932 if (SvROK (sv_idle)
1838 && SvOBJECT (SvRV (sv_idle))) 1933 && SvOBJECT (SvRV (sv_idle)))
1839 { 1934 {
1935 if (SvRV (sv_idle) == SvRV (coro_current))
1936 {
1937 require_pv ("Carp");
1938
1939 {
1940 dSP;
1941
1942 ENTER;
1943 SAVETMPS;
1944
1945 PUSHMARK (SP);
1946 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1947 PUTBACK;
1948 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1949
1950 FREETMPS;
1951 LEAVE;
1952 }
1953 }
1954
1840 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1955 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1841 api_ready (aTHX_ SvRV (sv_idle)); 1956 api_ready (aTHX_ SvRV (sv_idle));
1842 --coro_nready; 1957 --coro_nready;
1843 } 1958 }
1844 else 1959 else
1845 { 1960 {
1961 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1846 dSP; 1962 dSP;
1847 1963
1848 ENTER; 1964 ENTER;
1849 SAVETMPS; 1965 SAVETMPS;
1850 1966
… …
1857 } 1973 }
1858 } 1974 }
1859 } 1975 }
1860} 1976}
1861 1977
1862INLINE void 1978ecb_inline void
1863prepare_cede (pTHX_ struct coro_transfer_args *ta) 1979prepare_cede (pTHX_ struct coro_transfer_args *ta)
1864{ 1980{
1865 api_ready (aTHX_ coro_current); 1981 api_ready (aTHX_ coro_current);
1866 prepare_schedule (aTHX_ ta); 1982 prepare_schedule (aTHX_ ta);
1867} 1983}
1868 1984
1869INLINE void 1985ecb_inline void
1870prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1986prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1871{ 1987{
1872 SV *prev = SvRV (coro_current); 1988 SV *prev = SvRV (coro_current);
1873 1989
1874 if (coro_nready) 1990 if (coro_nready)
… …
1904{ 2020{
1905 struct coro_transfer_args ta; 2021 struct coro_transfer_args ta;
1906 2022
1907 prepare_cede (aTHX_ &ta); 2023 prepare_cede (aTHX_ &ta);
1908 2024
1909 if (expect_true (ta.prev != ta.next)) 2025 if (ecb_expect_true (ta.prev != ta.next))
1910 { 2026 {
1911 TRANSFER (ta, 1); 2027 TRANSFER (ta, 1);
1912 return 1; 2028 return 1;
1913 } 2029 }
1914 else 2030 else
… …
1957 coro->slot->runops = RUNOPS_DEFAULT; 2073 coro->slot->runops = RUNOPS_DEFAULT;
1958 } 2074 }
1959} 2075}
1960 2076
1961static void 2077static void
2078coro_push_av (pTHX_ AV *av, I32 gimme_v)
2079{
2080 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2081 {
2082 dSP;
2083
2084 if (gimme_v == G_SCALAR)
2085 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2086 else
2087 {
2088 int i;
2089 EXTEND (SP, AvFILLp (av) + 1);
2090
2091 for (i = 0; i <= AvFILLp (av); ++i)
2092 PUSHs (AvARRAY (av)[i]);
2093 }
2094
2095 PUTBACK;
2096 }
2097}
2098
2099static void
2100coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2101{
2102 if (!coro->on_destroy)
2103 coro->on_destroy = newAV ();
2104
2105 av_push (coro->on_destroy, cb);
2106}
2107
2108static void
2109slf_destroy_join (pTHX_ struct CoroSLF *frame)
2110{
2111 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2112}
2113
2114static int
2115slf_check_join (pTHX_ struct CoroSLF *frame)
2116{
2117 struct coro *coro = (struct coro *)frame->data;
2118
2119 if (!coro->status)
2120 return 1;
2121
2122 frame->destroy = 0;
2123
2124 coro_push_av (aTHX_ coro->status, GIMME_V);
2125
2126 SvREFCNT_dec ((SV *)coro->hv);
2127
2128 return 0;
2129}
2130
2131static void
2132slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2133{
2134 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2135
2136 if (items > 1)
2137 croak ("join called with too many arguments");
2138
2139 if (coro->status)
2140 frame->prepare = prepare_nop;
2141 else
2142 {
2143 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2144 frame->prepare = prepare_schedule;
2145 }
2146
2147 frame->check = slf_check_join;
2148 frame->destroy = slf_destroy_join;
2149 frame->data = (void *)coro;
2150 SvREFCNT_inc (coro->hv);
2151}
2152
2153static void
1962coro_call_on_destroy (pTHX_ struct coro *coro) 2154coro_call_on_destroy (pTHX_ struct coro *coro)
1963{ 2155{
1964 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2156 AV *od = coro->on_destroy;
1965 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1966 2157
1967 if (on_destroyp) 2158 if (!od)
1968 { 2159 return;
1969 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1970 2160
2161 coro->on_destroy = 0;
2162 sv_2mortal ((SV *)od);
2163
1971 while (AvFILLp (on_destroy) >= 0) 2164 while (AvFILLp (od) >= 0)
2165 {
2166 SV *cb = sv_2mortal (av_pop (od));
2167
2168 /* coro hv's (and only hv's at the moment) are supported as well */
2169 if (SvSTATEhv_p (aTHX_ cb))
2170 api_ready (aTHX_ cb);
2171 else
1972 { 2172 {
1973 dSP; /* don't disturb outer sp */ 2173 dSP; /* don't disturb outer sp */
1974 SV *cb = av_pop (on_destroy);
1975
1976 PUSHMARK (SP); 2174 PUSHMARK (SP);
1977 2175
1978 if (statusp) 2176 if (coro->status)
1979 { 2177 {
1980 int i; 2178 PUTBACK;
1981 AV *status = (AV *)SvRV (*statusp); 2179 coro_push_av (aTHX_ coro->status, G_ARRAY);
1982 EXTEND (SP, AvFILLp (status) + 1); 2180 SPAGAIN;
1983
1984 for (i = 0; i <= AvFILLp (status); ++i)
1985 PUSHs (AvARRAY (status)[i]);
1986 } 2181 }
1987 2182
1988 PUTBACK; 2183 PUTBACK;
1989 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2184 call_sv (cb, G_VOID | G_DISCARD);
1990 } 2185 }
1991 } 2186 }
1992} 2187}
1993 2188
1994static void 2189static void
1995slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2190coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1996{ 2191{
2192 AV *av;
2193
2194 if (coro->status)
2195 {
2196 av = coro->status;
2197 av_clear (av);
2198 }
2199 else
2200 av = coro->status = newAV ();
2201
2202 /* items are actually not so common, so optimise for this case */
2203 if (items)
2204 {
1997 int i; 2205 int i;
1998 HV *hv = (HV *)SvRV (coro_current);
1999 AV *av = newAV ();
2000 2206
2001 av_extend (av, items - 1); 2207 av_extend (av, items - 1);
2208
2002 for (i = 0; i < items; ++i) 2209 for (i = 0; i < items; ++i)
2003 av_push (av, SvREFCNT_inc_NN (arg [i])); 2210 av_push (av, SvREFCNT_inc_NN (arg [i]));
2211 }
2212}
2004 2213
2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2214static void
2006 2215slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2216{
2007 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2217 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2008 api_ready (aTHX_ sv_manager); 2218 api_ready (aTHX_ sv_manager);
2009 2219
2010 frame->prepare = prepare_schedule; 2220 frame->prepare = prepare_schedule;
2011 frame->check = slf_check_repeat; 2221 frame->check = slf_check_repeat;
2012 2222
2013 /* as a minor optimisation, we could unwind all stacks here */ 2223 /* as a minor optimisation, we could unwind all stacks here */
2014 /* but that puts extra pressure on pp_slf, and is not worth much */ 2224 /* but that puts extra pressure on pp_slf, and is not worth much */
2015 /*coro_unwind_stacks (aTHX);*/ 2225 /*coro_unwind_stacks (aTHX);*/
2226}
2227
2228static void
2229slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2230{
2231 HV *coro_hv = (HV *)SvRV (coro_current);
2232
2233 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2234 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2235}
2236
2237static void
2238slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2239{
2240 HV *coro_hv;
2241 struct coro *coro;
2242
2243 if (items <= 0)
2244 croak ("Coro::cancel called without coro object,");
2245
2246 coro = SvSTATE (arg [0]);
2247 coro_hv = coro->hv;
2248
2249 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2250
2251 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2252 {
2253 /* coro currently busy cancelling something, so just notify it */
2254 coro->slf_frame.data = (void *)coro;
2255
2256 frame->prepare = prepare_nop;
2257 frame->check = slf_check_nop;
2258 }
2259 else if (coro_hv == (HV *)SvRV (coro_current))
2260 {
2261 /* cancelling the current coro is allowed, and equals terminate */
2262 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2263 }
2264 else
2265 {
2266 struct coro *self = SvSTATE_current;
2267
2268 if (!self)
2269 croak ("Coro::cancel called outside of thread content,");
2270
2271 /* otherwise we cancel directly, purely for speed reasons
2272 * unfortunately, this requires some magic trickery, as
2273 * somebody else could cancel us, so we have to fight the cancellation.
2274 * this is ugly, and hopefully fully worth the extra speed.
2275 * besides, I can't get the slow-but-safe version working...
2276 */
2277 slf_frame.data = 0;
2278 self->flags |= CF_NOCANCEL;
2279 coro_state_destroy (aTHX_ coro);
2280 self->flags &= ~CF_NOCANCEL;
2281
2282 if (slf_frame.data)
2283 {
2284 /* while we were busy we have been cancelled, so terminate */
2285 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2286 }
2287 else
2288 {
2289 frame->prepare = prepare_nop;
2290 frame->check = slf_check_nop;
2291 }
2292 }
2293}
2294
2295static int
2296slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2297{
2298 frame->prepare = 0;
2299 coro_unwind_stacks (aTHX);
2300
2301 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2302
2303 return 1;
2304}
2305
2306static int
2307safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2308{
2309 if (coro->cctx)
2310 croak ("coro inside C callback, unable to cancel at this time, caught");
2311
2312 if (coro->flags & CF_NEW)
2313 {
2314 coro_set_status (aTHX_ coro, arg, items);
2315 coro_state_destroy (aTHX_ coro);
2316 }
2317 else
2318 {
2319 if (!coro->slf_frame.prepare)
2320 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2321
2322 slf_destroy (aTHX_ coro);
2323
2324 coro_set_status (aTHX_ coro, arg, items);
2325 coro->slf_frame.prepare = prepare_nop;
2326 coro->slf_frame.check = slf_check_safe_cancel;
2327
2328 api_ready (aTHX_ (SV *)coro->hv);
2329 }
2330
2331 return 1;
2016} 2332}
2017 2333
2018/*****************************************************************************/ 2334/*****************************************************************************/
2019/* async pool handler */ 2335/* async pool handler */
2020 2336
… …
2051slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2367slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2052{ 2368{
2053 HV *hv = (HV *)SvRV (coro_current); 2369 HV *hv = (HV *)SvRV (coro_current);
2054 struct coro *coro = SvSTATE_hv ((SV *)hv); 2370 struct coro *coro = SvSTATE_hv ((SV *)hv);
2055 2371
2056 if (expect_true (coro->saved_deffh)) 2372 if (ecb_expect_true (coro->saved_deffh))
2057 { 2373 {
2058 /* subsequent iteration */ 2374 /* subsequent iteration */
2059 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2375 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2060 coro->saved_deffh = 0; 2376 coro->saved_deffh = 0;
2061 2377
2062 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2378 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2063 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2379 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2064 { 2380 {
2065 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2381 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2066 coro->invoke_av = newAV (); 2382 return;
2067
2068 frame->prepare = prepare_nop;
2069 } 2383 }
2070 else 2384 else
2071 { 2385 {
2072 av_clear (GvAV (PL_defgv)); 2386 av_clear (GvAV (PL_defgv));
2073 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2387 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2098 2412
2099static void 2413static void
2100coro_rouse_callback (pTHX_ CV *cv) 2414coro_rouse_callback (pTHX_ CV *cv)
2101{ 2415{
2102 dXSARGS; 2416 dXSARGS;
2103 SV *data = (SV *)GENSUB_ARG; 2417 SV *data = (SV *)S_GENSUB_ARG;
2104 2418
2105 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2419 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2106 { 2420 {
2107 /* first call, set args */ 2421 /* first call, set args */
2108 SV *coro = SvRV (data); 2422 SV *coro = SvRV (data);
… …
2123 2437
2124static int 2438static int
2125slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2439slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2126{ 2440{
2127 SV *data = (SV *)frame->data; 2441 SV *data = (SV *)frame->data;
2128 2442
2129 if (CORO_THROW) 2443 if (CORO_THROW)
2130 return 0; 2444 return 0;
2131 2445
2132 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2446 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2133 return 1; 2447 return 1;
… …
2169 cb = sv_2mortal (coro->rouse_cb); 2483 cb = sv_2mortal (coro->rouse_cb);
2170 coro->rouse_cb = 0; 2484 coro->rouse_cb = 0;
2171 } 2485 }
2172 2486
2173 if (!SvROK (cb) 2487 if (!SvROK (cb)
2174 || SvTYPE (SvRV (cb)) != SVt_PVCV 2488 || SvTYPE (SvRV (cb)) != SVt_PVCV
2175 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2489 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2176 croak ("Coro::rouse_wait called with illegal callback argument,"); 2490 croak ("Coro::rouse_wait called with illegal callback argument,");
2177 2491
2178 { 2492 {
2179 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2493 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2180 SV *data = (SV *)GENSUB_ARG; 2494 SV *data = (SV *)S_GENSUB_ARG;
2181 2495
2182 frame->data = (void *)data; 2496 frame->data = (void *)data;
2183 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2497 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2184 frame->check = slf_check_rouse_wait; 2498 frame->check = slf_check_rouse_wait;
2185 } 2499 }
… …
2189coro_new_rouse_cb (pTHX) 2503coro_new_rouse_cb (pTHX)
2190{ 2504{
2191 HV *hv = (HV *)SvRV (coro_current); 2505 HV *hv = (HV *)SvRV (coro_current);
2192 struct coro *coro = SvSTATE_hv (hv); 2506 struct coro *coro = SvSTATE_hv (hv);
2193 SV *data = newRV_inc ((SV *)hv); 2507 SV *data = newRV_inc ((SV *)hv);
2194 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2508 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2195 2509
2196 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2510 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2197 SvREFCNT_dec (data); /* magicext increases the refcount */ 2511 SvREFCNT_dec (data); /* magicext increases the refcount */
2198 2512
2199 SvREFCNT_dec (coro->rouse_cb); 2513 SvREFCNT_dec (coro->rouse_cb);
… …
2296static void 2610static void
2297slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2611slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2298{ 2612{
2299 frame->prepare = prepare_cede_notself; 2613 frame->prepare = prepare_cede_notself;
2300 frame->check = slf_check_nop; 2614 frame->check = slf_check_nop;
2615}
2616
2617/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2618static void
2619slf_destroy (pTHX_ struct coro *coro)
2620{
2621 struct CoroSLF frame = coro->slf_frame;
2622
2623 /*
2624 * The on_destroy below most likely is from an SLF call.
2625 * Since by definition the SLF call will not finish when we destroy
2626 * the coro, we will have to force-finish it here, otherwise
2627 * cleanup functions cannot call SLF functions.
2628 */
2629 coro->slf_frame.prepare = 0;
2630
2631 /* this callback is reserved for slf functions needing to do cleanup */
2632 if (frame.destroy && frame.prepare && !PL_dirty)
2633 frame.destroy (aTHX_ &frame);
2301} 2634}
2302 2635
2303/* 2636/*
2304 * these not obviously related functions are all rolled into one 2637 * these not obviously related functions are all rolled into one
2305 * function to increase chances that they all will call transfer with the same 2638 * 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 */ 2645 I32 checkmark; /* mark SP to see how many elements check has pushed */
2313 2646
2314 /* set up the slf frame, unless it has already been set-up */ 2647 /* set up the slf frame, unless it has already been set-up */
2315 /* the latter happens when a new coro has been started */ 2648 /* the latter happens when a new coro has been started */
2316 /* or when a new cctx was attached to an existing coroutine */ 2649 /* or when a new cctx was attached to an existing coroutine */
2317 if (expect_true (!slf_frame.prepare)) 2650 if (ecb_expect_true (!slf_frame.prepare))
2318 { 2651 {
2319 /* first iteration */ 2652 /* first iteration */
2320 dSP; 2653 dSP;
2321 SV **arg = PL_stack_base + TOPMARK + 1; 2654 SV **arg = PL_stack_base + TOPMARK + 1;
2322 int items = SP - arg; /* args without function object */ 2655 int items = SP - arg; /* args without function object */
… …
2363 while (slf_frame.check (aTHX_ &slf_frame)); 2696 while (slf_frame.check (aTHX_ &slf_frame));
2364 2697
2365 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2698 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2366 2699
2367 /* exception handling */ 2700 /* exception handling */
2368 if (expect_false (CORO_THROW)) 2701 if (ecb_expect_false (CORO_THROW))
2369 { 2702 {
2370 SV *exception = sv_2mortal (CORO_THROW); 2703 SV *exception = sv_2mortal (CORO_THROW);
2371 2704
2372 CORO_THROW = 0; 2705 CORO_THROW = 0;
2373 sv_setsv (ERRSV, exception); 2706 sv_setsv (ERRSV, exception);
2374 croak (0); 2707 croak (0);
2375 } 2708 }
2376 2709
2377 /* return value handling - mostly like entersub */ 2710 /* return value handling - mostly like entersub */
2378 /* make sure we put something on the stack in scalar context */ 2711 /* make sure we put something on the stack in scalar context */
2379 if (GIMME_V == G_SCALAR) 2712 if (GIMME_V == G_SCALAR
2713 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2380 { 2714 {
2381 dSP; 2715 dSP;
2382 SV **bot = PL_stack_base + checkmark; 2716 SV **bot = PL_stack_base + checkmark;
2383 2717
2384 if (sp == bot) /* too few, push undef */ 2718 if (sp == bot) /* too few, push undef */
2385 bot [1] = &PL_sv_undef; 2719 bot [1] = &PL_sv_undef;
2386 else if (sp != bot + 1) /* too many, take last one */ 2720 else /* too many, take last one */
2387 bot [1] = *sp; 2721 bot [1] = *sp;
2388 2722
2389 SP = bot + 1; 2723 SP = bot + 1;
2390 2724
2391 PUTBACK; 2725 PUTBACK;
… …
2424 if (PL_op->op_flags & OPf_STACKED) 2758 if (PL_op->op_flags & OPf_STACKED)
2425 { 2759 {
2426 if (items > slf_arga) 2760 if (items > slf_arga)
2427 { 2761 {
2428 slf_arga = items; 2762 slf_arga = items;
2429 free (slf_argv); 2763 Safefree (slf_argv);
2430 slf_argv = malloc (slf_arga * sizeof (SV *)); 2764 New (0, slf_argv, slf_arga, SV *);
2431 } 2765 }
2432 2766
2433 slf_argc = items; 2767 slf_argc = items;
2434 2768
2435 for (i = 0; i < items; ++i) 2769 for (i = 0; i < items; ++i)
… …
2498{ 2832{
2499 PerlIOBuf base; 2833 PerlIOBuf base;
2500 NV next, every; 2834 NV next, every;
2501} PerlIOCede; 2835} PerlIOCede;
2502 2836
2503static IV 2837static IV ecb_cold
2504PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2838PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2505{ 2839{
2506 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2840 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2507 2841
2508 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2842 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2509 self->next = nvtime () + self->every; 2843 self->next = nvtime () + self->every;
2510 2844
2511 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2845 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2512} 2846}
2513 2847
2514static SV * 2848static SV * ecb_cold
2515PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2849PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2516{ 2850{
2517 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2851 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2518 2852
2519 return newSVnv (self->every); 2853 return newSVnv (self->every);
… …
2631 SvREFCNT_dec (cb); 2965 SvREFCNT_dec (cb);
2632 } 2966 }
2633} 2967}
2634 2968
2635static void 2969static void
2636coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2970coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2637{ 2971{
2638 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2972 /* call $sem->adjust (0) to possibly wake up some other waiters */
2639 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2973 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2640} 2974}
2641 2975
2642static int 2976static int
2643slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2977slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2644{ 2978{
2645 AV *av = (AV *)frame->data; 2979 AV *av = (AV *)frame->data;
2646 SV *count_sv = AvARRAY (av)[0]; 2980 SV *count_sv = AvARRAY (av)[0];
2981 SV *coro_hv = SvRV (coro_current);
2982
2983 frame->destroy = 0;
2647 2984
2648 /* if we are about to throw, don't actually acquire the lock, just throw */ 2985 /* if we are about to throw, don't actually acquire the lock, just throw */
2649 if (CORO_THROW) 2986 if (ecb_expect_false (CORO_THROW))
2987 {
2988 /* we still might be responsible for the semaphore, so wake up others */
2989 coro_semaphore_adjust (aTHX_ av, 0);
2990
2650 return 0; 2991 return 0;
2992 }
2651 else if (SvIVX (count_sv) > 0) 2993 else if (SvIVX (count_sv) > 0)
2652 { 2994 {
2653 SvSTATE_current->on_destroy = 0;
2654
2655 if (acquire) 2995 if (acquire)
2656 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2996 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2657 else 2997 else
2658 coro_semaphore_adjust (aTHX_ av, 0); 2998 coro_semaphore_adjust (aTHX_ av, 0);
2659 2999
… …
2663 { 3003 {
2664 int i; 3004 int i;
2665 /* if we were woken up but can't down, we look through the whole */ 3005 /* 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 */ 3006 /* waiters list and only add us if we aren't in there already */
2667 /* this avoids some degenerate memory usage cases */ 3007 /* this avoids some degenerate memory usage cases */
2668 3008 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)) 3009 if (AvARRAY (av)[i] == coro_hv)
2671 return 1; 3010 return 1;
2672 3011
2673 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3012 av_push (av, SvREFCNT_inc (coro_hv));
2674 return 1; 3013 return 1;
2675 } 3014 }
2676} 3015}
2677 3016
2678static int 3017static int
… …
2701 { 3040 {
2702 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3041 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2703 3042
2704 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3043 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2705 frame->prepare = prepare_schedule; 3044 frame->prepare = prepare_schedule;
2706
2707 /* to avoid race conditions when a woken-up coro gets terminated */ 3045 /* to avoid race conditions when a woken-up coro gets terminated */
2708 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3046 /* we arrange for a temporary on_destroy that calls adjust (0) */
2709 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3047 frame->destroy = coro_semaphore_destroy;
2710 } 3048 }
2711} 3049}
2712 3050
2713static void 3051static void
2714slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3052slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2722{ 3060{
2723 if (items >= 2) 3061 if (items >= 2)
2724 { 3062 {
2725 /* callback form */ 3063 /* callback form */
2726 AV *av = (AV *)SvRV (arg [0]); 3064 AV *av = (AV *)SvRV (arg [0]);
2727 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3065 SV *cb_cv = s_get_cv_croak (arg [1]);
2728 3066
2729 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3067 av_push (av, SvREFCNT_inc_NN (cb_cv));
2730 3068
2731 if (SvIVX (AvARRAY (av)[0]) > 0) 3069 if (SvIVX (AvARRAY (av)[0]) > 0)
2732 coro_semaphore_adjust (aTHX_ av, 0); 3070 coro_semaphore_adjust (aTHX_ av, 0);
… …
2792{ 3130{
2793 AV *av = (AV *)SvRV (arg [0]); 3131 AV *av = (AV *)SvRV (arg [0]);
2794 3132
2795 if (items >= 2) 3133 if (items >= 2)
2796 { 3134 {
2797 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3135 SV *cb_cv = s_get_cv_croak (arg [1]);
2798 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3136 av_push (av, SvREFCNT_inc_NN (cb_cv));
2799 3137
2800 if (SvIVX (AvARRAY (av)[0])) 3138 if (SvIVX (AvARRAY (av)[0]))
2801 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3139 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2802 3140
2803 frame->prepare = prepare_nop; 3141 frame->prepare = prepare_nop;
2804 frame->check = slf_check_nop; 3142 frame->check = slf_check_nop;
2805 } 3143 }
2806 else if (SvIVX (AvARRAY (av)[0])) 3144 else if (SvIVX (AvARRAY (av)[0]))
… …
2837 3175
2838static void 3176static void
2839coro_aio_callback (pTHX_ CV *cv) 3177coro_aio_callback (pTHX_ CV *cv)
2840{ 3178{
2841 dXSARGS; 3179 dXSARGS;
2842 AV *state = (AV *)GENSUB_ARG; 3180 AV *state = (AV *)S_GENSUB_ARG;
2843 SV *coro = av_pop (state); 3181 SV *coro = av_pop (state);
2844 SV *data_sv = newSV (sizeof (struct io_state)); 3182 SV *data_sv = newSV (sizeof (struct io_state));
2845 3183
2846 av_extend (state, items - 1); 3184 av_extend (state, items - 1);
2847 3185
… …
2883 /* it quickly returns */ 3221 /* it quickly returns */
2884 if (CORO_THROW) 3222 if (CORO_THROW)
2885 return 0; 3223 return 0;
2886 3224
2887 /* one element that is an RV? repeat! */ 3225 /* one element that is an RV? repeat! */
2888 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3226 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2889 return 1; 3227 return 1;
2890 3228
2891 /* restore status */ 3229 /* restore status */
2892 { 3230 {
2893 SV *data_sv = av_pop (state); 3231 SV *data_sv = av_pop (state);
… …
2932 dSP; 3270 dSP;
2933 3271
2934 static SV *prio_cv; 3272 static SV *prio_cv;
2935 static SV *prio_sv; 3273 static SV *prio_sv;
2936 3274
2937 if (expect_false (!prio_cv)) 3275 if (ecb_expect_false (!prio_cv))
2938 { 3276 {
2939 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3277 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2940 prio_sv = newSViv (0); 3278 prio_sv = newSViv (0);
2941 } 3279 }
2942 3280
… …
2961 3299
2962 for (i = 0; i < items; ++i) 3300 for (i = 0; i < items; ++i)
2963 PUSHs (arg [i]); 3301 PUSHs (arg [i]);
2964 3302
2965 /* now push the callback closure */ 3303 /* now push the callback closure */
2966 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3304 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2967 3305
2968 /* now call the AIO function - we assume our request is uncancelable */ 3306 /* now call the AIO function - we assume our request is uncancelable */
2969 PUTBACK; 3307 PUTBACK;
2970 call_sv ((SV *)req, G_VOID | G_DISCARD); 3308 call_sv ((SV *)req, G_VOID | G_DISCARD);
2971 } 3309 }
2972 3310
2973 /* now that the requets is going, we loop toll we have a result */ 3311 /* now that the request is going, we loop till we have a result */
2974 frame->data = (void *)state; 3312 frame->data = (void *)state;
2975 frame->prepare = prepare_schedule; 3313 frame->prepare = prepare_schedule;
2976 frame->check = slf_check_aio_req; 3314 frame->check = slf_check_aio_req;
2977} 3315}
2978 3316
… …
2990 3328
2991#if CORO_CLONE 3329#if CORO_CLONE
2992# include "clone.c" 3330# include "clone.c"
2993#endif 3331#endif
2994 3332
3333/*****************************************************************************/
3334
3335static SV *
3336coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3337{
3338 SV *coro_sv;
3339 struct coro *coro;
3340 MAGIC *mg;
3341 HV *hv;
3342 SV *cb;
3343 int i;
3344
3345 if (argc > 0)
3346 {
3347 cb = s_get_cv_croak (argv [0]);
3348
3349 if (!is_coro)
3350 {
3351 if (CvISXSUB (cb))
3352 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3353
3354 if (!CvROOT (cb))
3355 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3356 }
3357 }
3358
3359 Newz (0, coro, 1, struct coro);
3360 coro->args = newAV ();
3361 coro->flags = CF_NEW;
3362
3363 if (coro_first) coro_first->prev = coro;
3364 coro->next = coro_first;
3365 coro_first = coro;
3366
3367 coro->hv = hv = newHV ();
3368 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3369 mg->mg_flags |= MGf_DUP;
3370 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3371
3372 if (argc > 0)
3373 {
3374 av_extend (coro->args, argc + is_coro - 1);
3375
3376 if (is_coro)
3377 {
3378 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3379 cb = (SV *)cv_coro_run;
3380 }
3381
3382 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3383
3384 for (i = 1; i < argc; i++)
3385 av_push (coro->args, newSVsv (argv [i]));
3386 }
3387
3388 return coro_sv;
3389}
3390
3391#ifndef __cplusplus
3392ecb_cold XS(boot_Coro__State);
3393#endif
3394
3395#if CORO_JIT
3396
3397static void ecb_noinline ecb_cold
3398pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3399{
3400 dSP;
3401 AV *av = newAV ();
3402
3403 av_store (av, 3, newSVuv (d));
3404 av_store (av, 2, newSVuv (c));
3405 av_store (av, 1, newSVuv (b));
3406 av_store (av, 0, newSVuv (a));
3407
3408 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3409
3410 PUTBACK;
3411}
3412
3413static void ecb_noinline ecb_cold
3414jit_init (pTHX)
3415{
3416 dSP;
3417 SV *load, *save;
3418 char *map_base;
3419 char *load_ptr, *save_ptr;
3420 STRLEN load_len, save_len, map_len;
3421 int count;
3422
3423 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3424
3425 PUSHMARK (SP);
3426 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3427 #include "state.h"
3428 count = call_pv ("Coro::State::_jit", G_ARRAY);
3429 SPAGAIN;
3430
3431 save = POPs; save_ptr = SvPVbyte (save, save_len);
3432 load = POPs; load_ptr = SvPVbyte (load, load_len);
3433
3434 map_len = load_len + save_len + 16;
3435
3436 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3437
3438 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3439
3440 load_perl_slots = (load_save_perl_slots_type)map_base;
3441 memcpy (map_base, load_ptr, load_len);
3442
3443 map_base += (load_len + 15) & ~15;
3444
3445 save_perl_slots = (load_save_perl_slots_type)map_base;
3446 memcpy (map_base, save_ptr, save_len);
3447
3448 /* we are good citizens and try to make the page read-only, so the evil evil */
3449 /* hackers might have it a bit more difficult */
3450 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3451
3452 PUTBACK;
3453 eval_pv ("undef &Coro::State::_jit", 1);
3454}
3455
3456#endif
3457
2995MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3458MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2996 3459
2997PROTOTYPES: DISABLE 3460PROTOTYPES: DISABLE
2998 3461
2999BOOT: 3462BOOT:
3000{ 3463{
3464#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3465#include "state.h"
3001#ifdef USE_ITHREADS 3466#ifdef USE_ITHREADS
3002# if CORO_PTHREAD 3467# if CORO_PTHREAD
3003 coro_thx = PERL_GET_CONTEXT; 3468 coro_thx = PERL_GET_CONTEXT;
3004# endif 3469# endif
3005#endif 3470#endif
3006 BOOT_PAGESIZE; 3471 /* perl defines these to check for existance first, but why it doesn't */
3472 /* just create them one at init time is not clear to me, except for */
3473 /* programs trying to delete them, but... */
3474 /* anyway, we declare this as invalid and make sure they are initialised here */
3475 DEFSV;
3476 ERRSV;
3007 3477
3008 cctx_current = cctx_new_empty (); 3478 cctx_current = cctx_new_empty ();
3009 3479
3010 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3480 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3011 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3481 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3051 coroapi.prepare_nop = prepare_nop; 3521 coroapi.prepare_nop = prepare_nop;
3052 coroapi.prepare_schedule = prepare_schedule; 3522 coroapi.prepare_schedule = prepare_schedule;
3053 coroapi.prepare_cede = prepare_cede; 3523 coroapi.prepare_cede = prepare_cede;
3054 coroapi.prepare_cede_notself = prepare_cede_notself; 3524 coroapi.prepare_cede_notself = prepare_cede_notself;
3055 3525
3056 { 3526 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 (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3066 }
3067 3527
3068 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3528 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3529#if CORO_JIT
3530 PUTBACK;
3531 jit_init (aTHX);
3532 SPAGAIN;
3533#endif
3069} 3534}
3070 3535
3071SV * 3536SV *
3072new (char *klass, ...) 3537new (SV *klass, ...)
3073 ALIAS: 3538 ALIAS:
3074 Coro::new = 1 3539 Coro::new = 1
3075 CODE: 3540 CODE:
3076{ 3541 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
3077 struct coro *coro; 3542 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 3543 RETVAL
3128 3544
3129void 3545void
3130transfer (...) 3546transfer (...)
3131 PROTOTYPE: $$ 3547 PROTOTYPE: $$
3132 CODE: 3548 CODE:
3133 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3549 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 3550
3148SV * 3551SV *
3149clone (Coro::State coro) 3552clone (Coro::State coro)
3150 CODE: 3553 CODE:
3151{ 3554{
… …
3206void 3609void
3207list () 3610list ()
3208 PROTOTYPE: 3611 PROTOTYPE:
3209 PPCODE: 3612 PPCODE:
3210{ 3613{
3211 struct coro *coro; 3614 struct coro *coro;
3212 for (coro = coro_first; coro; coro = coro->next) 3615 for (coro = coro_first; coro; coro = coro->next)
3213 if (coro->hv) 3616 if (coro->hv)
3214 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3617 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3215} 3618}
3216 3619
… …
3221 CODE: 3624 CODE:
3222{ 3625{
3223 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3626 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3224 { 3627 {
3225 struct coro *current = SvSTATE_current; 3628 struct coro *current = SvSTATE_current;
3629 struct CoroSLF slf_save;
3226 3630
3227 if (current != coro) 3631 if (current != coro)
3228 { 3632 {
3229 PUTBACK; 3633 PUTBACK;
3230 save_perl (aTHX_ current); 3634 save_perl (aTHX_ current);
3231 load_perl (aTHX_ coro); 3635 load_perl (aTHX_ coro);
3636 /* the coro is most likely in an active SLF call.
3637 * while not strictly required (the code we execute is
3638 * not allowed to call any SLF functions), it's cleaner
3639 * to reinitialise the slf_frame and restore it later.
3640 * This might one day allow us to actually do SLF calls
3641 * from code executed here.
3642 */
3643 slf_save = slf_frame;
3644 slf_frame.prepare = 0;
3232 SPAGAIN; 3645 SPAGAIN;
3233 } 3646 }
3234 3647
3235 PUSHSTACK; 3648 PUSHSTACK;
3236 3649
… …
3246 SPAGAIN; 3659 SPAGAIN;
3247 3660
3248 if (current != coro) 3661 if (current != coro)
3249 { 3662 {
3250 PUTBACK; 3663 PUTBACK;
3664 slf_frame = slf_save;
3251 save_perl (aTHX_ coro); 3665 save_perl (aTHX_ coro);
3252 load_perl (aTHX_ current); 3666 load_perl (aTHX_ current);
3253 SPAGAIN; 3667 SPAGAIN;
3254 } 3668 }
3255 } 3669 }
… …
3260 PROTOTYPE: $ 3674 PROTOTYPE: $
3261 ALIAS: 3675 ALIAS:
3262 is_ready = CF_READY 3676 is_ready = CF_READY
3263 is_running = CF_RUNNING 3677 is_running = CF_RUNNING
3264 is_new = CF_NEW 3678 is_new = CF_NEW
3265 is_destroyed = CF_DESTROYED 3679 is_destroyed = CF_ZOMBIE
3680 is_zombie = CF_ZOMBIE
3266 is_suspended = CF_SUSPENDED 3681 is_suspended = CF_SUSPENDED
3267 CODE: 3682 CODE:
3268 RETVAL = boolSV (coro->flags & ix); 3683 RETVAL = boolSV (coro->flags & ix);
3269 OUTPUT: 3684 OUTPUT:
3270 RETVAL 3685 RETVAL
3271 3686
3272void 3687void
3273throw (Coro::State self, SV *throw = &PL_sv_undef) 3688throw (SV *self, SV *exception = &PL_sv_undef)
3274 PROTOTYPE: $;$ 3689 PROTOTYPE: $;$
3275 CODE: 3690 CODE:
3276{ 3691{
3692 struct coro *coro = SvSTATE (self);
3277 struct coro *current = SvSTATE_current; 3693 struct coro *current = SvSTATE_current;
3278 SV **throwp = self == current ? &CORO_THROW : &self->except; 3694 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3279 SvREFCNT_dec (*throwp); 3695 SvREFCNT_dec (*exceptionp);
3280 SvGETMAGIC (throw); 3696 SvGETMAGIC (exception);
3281 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3697 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3698
3699 api_ready (aTHX_ self);
3282} 3700}
3283 3701
3284void 3702void
3285api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3703api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3286 PROTOTYPE: $;$ 3704 PROTOTYPE: $;$
… …
3341 3759
3342void 3760void
3343cancel (Coro::State self) 3761cancel (Coro::State self)
3344 CODE: 3762 CODE:
3345 coro_state_destroy (aTHX_ self); 3763 coro_state_destroy (aTHX_ self);
3346 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3347
3348 3764
3349SV * 3765SV *
3350enable_times (int enabled = enable_times) 3766enable_times (int enabled = enable_times)
3351 CODE: 3767 CODE:
3352{ 3768{
… …
3365 3781
3366void 3782void
3367times (Coro::State self) 3783times (Coro::State self)
3368 PPCODE: 3784 PPCODE:
3369{ 3785{
3370 struct coro *current = SvSTATE (coro_current); 3786 struct coro *current = SvSTATE (coro_current);
3371 3787
3372 if (expect_false (current == self)) 3788 if (ecb_expect_false (current == self))
3373 { 3789 {
3374 coro_times_update (); 3790 coro_times_update ();
3375 coro_times_add (SvSTATE (coro_current)); 3791 coro_times_add (SvSTATE (coro_current));
3376 } 3792 }
3377 3793
3378 EXTEND (SP, 2); 3794 EXTEND (SP, 2);
3379 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3795 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))); 3796 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3381 3797
3382 if (expect_false (current == self)) 3798 if (ecb_expect_false (current == self))
3383 coro_times_sub (SvSTATE (coro_current)); 3799 coro_times_sub (SvSTATE (coro_current));
3384} 3800}
3801
3802void
3803swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3804 CODE:
3805{
3806 struct coro *current = SvSTATE_current;
3807
3808 if (current == coro)
3809 SWAP_SVS (current);
3810
3811 if (!coro->swap_sv)
3812 coro->swap_sv = newAV ();
3813
3814 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3815 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3816
3817 if (current == coro)
3818 SWAP_SVS (current);
3819}
3820
3385 3821
3386MODULE = Coro::State PACKAGE = Coro 3822MODULE = Coro::State PACKAGE = Coro
3387 3823
3388BOOT: 3824BOOT:
3389{ 3825{
3390 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3826 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3391 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3827 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3392 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3828 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); 3829 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); 3830 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3396 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3831 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3397 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3832 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3398 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3833 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3399 3834
3400 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3835 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); 3836 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); 3837 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); 3838 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3404 3839
3405 coro_stash = gv_stashpv ("Coro", TRUE); 3840 coro_stash = gv_stashpv ("Coro", TRUE);
3406 3841
3407 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3842 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3408 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3843 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
… …
3427 sv_setiv (sv, (IV)&coroapi); 3862 sv_setiv (sv, (IV)&coroapi);
3428 SvREADONLY_on (sv); 3863 SvREADONLY_on (sv);
3429 } 3864 }
3430} 3865}
3431 3866
3867SV *
3868async (...)
3869 PROTOTYPE: &@
3870 CODE:
3871 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3872 api_ready (aTHX_ RETVAL);
3873 OUTPUT:
3874 RETVAL
3875
3876void
3877_destroy (Coro::State coro)
3878 CODE:
3879 /* used by the manager thread */
3880 coro_state_destroy (aTHX_ coro);
3881
3882void
3883on_destroy (Coro::State coro, SV *cb)
3884 CODE:
3885 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3886
3887void
3888join (...)
3889 CODE:
3890 CORO_EXECUTE_SLF_XS (slf_init_join);
3891
3432void 3892void
3433terminate (...) 3893terminate (...)
3434 CODE: 3894 CODE:
3435 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3895 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3896
3897void
3898cancel (...)
3899 CODE:
3900 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3901
3902int
3903safe_cancel (Coro::State self, ...)
3904 C_ARGS: aTHX_ self, &ST (1), items - 1
3436 3905
3437void 3906void
3438schedule (...) 3907schedule (...)
3439 CODE: 3908 CODE:
3440 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3909 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3470_set_readyhook (SV *hook) 3939_set_readyhook (SV *hook)
3471 PROTOTYPE: $ 3940 PROTOTYPE: $
3472 CODE: 3941 CODE:
3473 SvREFCNT_dec (coro_readyhook); 3942 SvREFCNT_dec (coro_readyhook);
3474 SvGETMAGIC (hook); 3943 SvGETMAGIC (hook);
3944 if (SvOK (hook))
3945 {
3475 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3946 coro_readyhook = newSVsv (hook);
3947 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3948 }
3949 else
3950 {
3951 coro_readyhook = 0;
3952 CORO_READYHOOK = 0;
3953 }
3476 3954
3477int 3955int
3478prio (Coro::State coro, int newprio = 0) 3956prio (Coro::State coro, int newprio = 0)
3479 PROTOTYPE: $;$ 3957 PROTOTYPE: $;$
3480 ALIAS: 3958 ALIAS:
… …
3544 for (i = 1; i < items; ++i) 4022 for (i = 1; i < items; ++i)
3545 av_push (av, SvREFCNT_inc_NN (ST (i))); 4023 av_push (av, SvREFCNT_inc_NN (ST (i)));
3546 4024
3547 if ((SV *)hv == &PL_sv_undef) 4025 if ((SV *)hv == &PL_sv_undef)
3548 { 4026 {
3549 PUSHMARK (SP); 4027 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)); 4028 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4029 SvREFCNT_dec (sv);
3558 } 4030 }
3559 4031
3560 { 4032 {
3561 struct coro *coro = SvSTATE_hv (hv); 4033 struct coro *coro = SvSTATE_hv (hv);
3562 4034
… …
3594 on_leave = 1 4066 on_leave = 1
3595 PROTOTYPE: & 4067 PROTOTYPE: &
3596 CODE: 4068 CODE:
3597{ 4069{
3598 struct coro *coro = SvSTATE_current; 4070 struct coro *coro = SvSTATE_current;
3599 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4071 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3600 4072
3601 block = (SV *)coro_sv_2cv (aTHX_ block); 4073 block = s_get_cv_croak (block);
3602 4074
3603 if (!*avp) 4075 if (!*avp)
3604 *avp = newAV (); 4076 *avp = newAV ();
3605 4077
3606 av_push (*avp, SvREFCNT_inc (block)); 4078 av_push (*avp, SvREFCNT_inc (block));
… …
3624 4096
3625SV * 4097SV *
3626new (SV *klass, SV *count = 0) 4098new (SV *klass, SV *count = 0)
3627 CODE: 4099 CODE:
3628{ 4100{
3629 int semcnt = 1; 4101 int semcnt = 1;
3630 4102
3631 if (count) 4103 if (count)
3632 { 4104 {
3633 SvGETMAGIC (count); 4105 SvGETMAGIC (count);
3634 4106
… …
3694 XSRETURN_NO; 4166 XSRETURN_NO;
3695} 4167}
3696 4168
3697void 4169void
3698waiters (SV *self) 4170waiters (SV *self)
3699 PPCODE: 4171 PPCODE:
3700{ 4172{
3701 AV *av = (AV *)SvRV (self); 4173 AV *av = (AV *)SvRV (self);
3702 int wcount = AvFILLp (av) + 1 - 1; 4174 int wcount = AvFILLp (av) + 1 - 1;
3703 4175
3704 if (GIMME_V == G_SCALAR) 4176 if (GIMME_V == G_SCALAR)
… …
3713} 4185}
3714 4186
3715MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4187MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3716 4188
3717void 4189void
3718_may_delete (SV *sem, int count, int extra_refs) 4190_may_delete (SV *sem, int count, unsigned int extra_refs)
3719 PPCODE: 4191 PPCODE:
3720{ 4192{
3721 AV *av = (AV *)SvRV (sem); 4193 AV *av = (AV *)SvRV (sem);
3722 4194
3723 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4195 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3724 && AvFILLp (av) == 0 /* no waiters, just count */ 4196 && AvFILLp (av) == 0 /* no waiters, just count */
3725 && SvIV (AvARRAY (av)[0]) == count) 4197 && SvIV (AvARRAY (av)[0]) == count)
3726 XSRETURN_YES; 4198 XSRETURN_YES;
… …
3747 4219
3748void 4220void
3749broadcast (SV *self) 4221broadcast (SV *self)
3750 CODE: 4222 CODE:
3751{ 4223{
3752 AV *av = (AV *)SvRV (self); 4224 AV *av = (AV *)SvRV (self);
3753 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4225 coro_signal_wake (aTHX_ av, AvFILLp (av));
3754} 4226}
3755 4227
3756void 4228void
3757send (SV *self) 4229send (SV *self)
… …
3765 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4237 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3766} 4238}
3767 4239
3768IV 4240IV
3769awaited (SV *self) 4241awaited (SV *self)
3770 CODE: 4242 CODE:
3771 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4243 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3772 OUTPUT: 4244 OUTPUT:
3773 RETVAL 4245 RETVAL
3774 4246
3775 4247
… …
3780 4252
3781void 4253void
3782_schedule (...) 4254_schedule (...)
3783 CODE: 4255 CODE:
3784{ 4256{
3785 static int incede; 4257 static int incede;
3786 4258
3787 api_cede_notself (aTHX); 4259 api_cede_notself (aTHX);
3788 4260
3789 ++incede; 4261 ++incede;
3790 while (coro_nready >= incede && api_cede (aTHX)) 4262 while (coro_nready >= incede && api_cede (aTHX))
… …
3806 4278
3807void 4279void
3808_register (char *target, char *proto, SV *req) 4280_register (char *target, char *proto, SV *req)
3809 CODE: 4281 CODE:
3810{ 4282{
3811 CV *req_cv = coro_sv_2cv (aTHX_ req); 4283 SV *req_cv = s_get_cv_croak (req);
3812 /* newXSproto doesn't return the CV on 5.8 */ 4284 /* newXSproto doesn't return the CV on 5.8 */
3813 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4285 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3814 sv_setpv ((SV *)slf_cv, proto); 4286 sv_setpv ((SV *)slf_cv, proto);
3815 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4287 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3816} 4288}
3817 4289
4290MODULE = Coro::State PACKAGE = Coro::Select
4291
4292void
4293patch_pp_sselect ()
4294 CODE:
4295 if (!coro_old_pp_sselect)
4296 {
4297 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4298 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4299 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4300 }
4301
4302void
4303unpatch_pp_sselect ()
4304 CODE:
4305 if (coro_old_pp_sselect)
4306 {
4307 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4308 coro_old_pp_sselect = 0;
4309 }
4310
4311MODULE = Coro::State PACKAGE = Coro::Util
4312
4313void
4314_exit (int code)
4315 CODE:
4316 _exit (code);
4317
4318NV
4319time ()
4320 CODE:
4321 RETVAL = nvtime (aTHX);
4322 OUTPUT:
4323 RETVAL
4324
4325NV
4326gettimeofday ()
4327 PPCODE:
4328{
4329 UV tv [2];
4330 u2time (aTHX_ tv);
4331 EXTEND (SP, 2);
4332 PUSHs (sv_2mortal (newSVuv (tv [0])));
4333 PUSHs (sv_2mortal (newSVuv (tv [1])));
4334}
4335

Diff Legend

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