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.333 by root, Thu Nov 27 12:39:00 2008 UTC vs.
Revision 1.450 by root, Sun Jun 28 22:31:03 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
160static void *coro_thx; 99static void *coro_thx;
161# endif 100# endif
162#endif 101#endif
163 102
103#ifdef __linux
104# include <time.h> /* for timespec */
105# include <syscall.h> /* for SYS_* */
106# ifdef SYS_clock_gettime
107# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
108# define CORO_CLOCK_MONOTONIC 1
109# define CORO_CLOCK_THREAD_CPUTIME_ID 3
110# endif
111#endif
112
164static double (*nvtime)(); /* so why doesn't it take void? */ 113static double (*nvtime)(); /* so why doesn't it take void? */
114static void (*u2time)(pTHX_ UV ret[2]);
165 115
166/* we hijack an hopefully unused CV flag for our purposes */ 116/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 117#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 118static OP *pp_slf (pTHX);
119static void slf_destroy (pTHX_ struct coro *coro);
169 120
170static U32 cctx_gen; 121static U32 cctx_gen;
171static size_t cctx_stacksize = CORO_STACKSIZE; 122static size_t cctx_stacksize = CORO_STACKSIZE;
172static struct CoroAPI coroapi; 123static struct CoroAPI coroapi;
173static AV *main_mainstack; /* used to differentiate between $main and others */ 124static AV *main_mainstack; /* used to differentiate between $main and others */
… …
190static SV *sv_pool_size; 141static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 142static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 143static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 144static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 145static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 146
197/* Coro::AnyEvent */ 147/* Coro::AnyEvent */
198static SV *sv_activity; 148static SV *sv_activity;
199 149
150/* enable processtime/realtime profiling */
151static char enable_times;
152typedef U32 coro_ts[2];
153static coro_ts time_real, time_cpu;
154static char times_valid;
155
200static struct coro_cctx *cctx_first; 156static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 157static int cctx_count, cctx_idle;
202 158
203enum { 159enum
160{
204 CC_MAPPED = 0x01, 161 CC_MAPPED = 0x01,
205 CC_NOREUSE = 0x02, /* throw this away after tracing */ 162 CC_NOREUSE = 0x02, /* throw this away after tracing */
206 CC_TRACE = 0x04, 163 CC_TRACE = 0x04,
207 CC_TRACE_SUB = 0x08, /* trace sub calls */ 164 CC_TRACE_SUB = 0x08, /* trace sub calls */
208 CC_TRACE_LINE = 0x10, /* trace each statement */ 165 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
213typedef struct coro_cctx 170typedef struct coro_cctx
214{ 171{
215 struct coro_cctx *next; 172 struct coro_cctx *next;
216 173
217 /* the stack */ 174 /* the stack */
218 void *sptr; 175 struct coro_stack stack;
219 size_t ssize;
220 176
221 /* cpu state */ 177 /* cpu state */
222 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
223 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
224 JMPENV *top_env; 182 JMPENV *top_env;
225 coro_context cctx; 183 coro_context cctx;
226 184
227 U32 gen; 185 U32 gen;
228#if CORO_USE_VALGRIND 186#if CORO_USE_VALGRIND
229 int valgrind_id; 187 int valgrind_id;
230#endif 188#endif
231 unsigned char flags; 189 unsigned char flags;
232} coro_cctx; 190} coro_cctx;
233 191
234coro_cctx *cctx_current; /* the currently running cctx */ 192static coro_cctx *cctx_current; /* the currently running cctx */
235 193
236/*****************************************************************************/ 194/*****************************************************************************/
237 195
196static MGVTBL coro_state_vtbl;
197
238enum { 198enum
199{
239 CF_RUNNING = 0x0001, /* coroutine is running */ 200 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 201 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 202 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 203 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
204 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
205 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
243}; 206};
244 207
245/* 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 */
246typedef struct 209typedef struct
247{ 210{
248 SV *defsv;
249 AV *defav;
250 SV *errsv;
251 SV *irsgv;
252 HV *hinthv;
253#define VAR(name,type) type name; 211 #define VARx(name,expr,type) type name;
254# include "state.h" 212 #include "state.h"
255#undef VAR
256} perl_slots; 213} perl_slots;
257 214
215/* how many context stack entries do we need for perl_slots */
258#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))
259 217
260/* this is a structure representing a perl-level coroutine */ 218/* this is a structure representing a perl-level coroutine */
261struct coro { 219struct coro
220{
262 /* the C coroutine allocated to this perl coroutine, if any */ 221 /* the C coroutine allocated to this perl coroutine, if any */
263 coro_cctx *cctx; 222 coro_cctx *cctx;
223
224 /* ready queue */
225 struct coro *next_ready;
264 226
265 /* state data */ 227 /* state data */
266 struct CoroSLF slf_frame; /* saved slf frame */ 228 struct CoroSLF slf_frame; /* saved slf frame */
267 AV *mainstack; 229 AV *mainstack;
268 perl_slots *slot; /* basically the saved sp */ 230 perl_slots *slot; /* basically the saved sp */
269 231
270 CV *startcv; /* the CV to execute */ 232 CV *startcv; /* the CV to execute */
271 AV *args; /* data associated with this coroutine (initial args) */ 233 AV *args; /* data associated with this coroutine (initial args) */
272 int refcnt; /* coroutines are refcounted, yes */
273 int flags; /* CF_ flags */ 234 int flags; /* CF_ flags */
274 HV *hv; /* the perl hash associated with this coro, if any */ 235 HV *hv; /* the perl hash associated with this coro, if any */
275 void (*on_destroy)(pTHX_ struct coro *coro);
276 236
277 /* statistics */ 237 /* statistics */
278 int usecount; /* number of transfers to this coro */ 238 int usecount; /* number of transfers to this coro */
279 239
280 /* coro process data */ 240 /* coro process data */
281 int prio; 241 int prio;
282 SV *except; /* exception to be thrown */ 242 SV *except; /* exception to be thrown */
283 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 */
284 246
285 /* async_pool */ 247 /* async_pool */
286 SV *saved_deffh; 248 SV *saved_deffh;
287 SV *invoke_cb; 249 SV *invoke_cb;
288 AV *invoke_av; 250 AV *invoke_av;
289 251
252 /* on_enter/on_leave */
253 AV *on_enter; AV *on_enter_xs;
254 AV *on_leave; AV *on_leave_xs;
255
256 /* swap_sv */
257 AV *swap_sv;
258
259 /* times */
260 coro_ts t_cpu, t_real;
261
290 /* linked list */ 262 /* linked list */
291 struct coro *next, *prev; 263 struct coro *next, *prev;
292}; 264};
293 265
294typedef struct coro *Coro__State; 266typedef struct coro *Coro__State;
295typedef struct coro *Coro__State_or_hashref; 267typedef struct coro *Coro__State_or_hashref;
296 268
297/* the following variables are effectively part of the perl context */ 269/* the following variables are effectively part of the perl context */
298/* and get copied between struct coro and these variables */ 270/* and get copied between struct coro and these variables */
299/* the mainr easonw e don't support windows process emulation */ 271/* the main reason we don't support windows process emulation */
300static struct CoroSLF slf_frame; /* the current slf frame */ 272static struct CoroSLF slf_frame; /* the current slf frame */
301 273
302/** Coro ********************************************************************/ 274/** Coro ********************************************************************/
303 275
304#define PRIO_MAX 3 276#define CORO_PRIO_MAX 3
305#define PRIO_HIGH 1 277#define CORO_PRIO_HIGH 1
306#define PRIO_NORMAL 0 278#define CORO_PRIO_NORMAL 0
307#define PRIO_LOW -1 279#define CORO_PRIO_LOW -1
308#define PRIO_IDLE -3 280#define CORO_PRIO_IDLE -3
309#define PRIO_MIN -4 281#define CORO_PRIO_MIN -4
310 282
311/* for Coro.pm */ 283/* for Coro.pm */
312static SV *coro_current; 284static SV *coro_current;
313static SV *coro_readyhook; 285static SV *coro_readyhook;
314static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 286static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
315static CV *cv_coro_run, *cv_coro_terminate; 287static CV *cv_coro_run;
316static struct coro *coro_first; 288static struct coro *coro_first;
317#define coro_nready coroapi.nready 289#define coro_nready coroapi.nready
318 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
319/** lowlevel stuff **********************************************************/ 386/** lowlevel stuff **********************************************************/
320 387
321static SV * 388static SV * ecb_noinline
322coro_get_sv (pTHX_ const char *name, int create) 389coro_get_sv (pTHX_ const char *name, int create)
323{ 390{
324#if PERL_VERSION_ATLEAST (5,10,0) 391#if PERL_VERSION_ATLEAST (5,10,0)
325 /* 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 */
326 get_sv (name, create); 393 get_sv (name, create);
327#endif 394#endif
328 return get_sv (name, create); 395 return get_sv (name, create);
329} 396}
330 397
331static AV * 398static AV * ecb_noinline
332coro_get_av (pTHX_ const char *name, int create) 399coro_get_av (pTHX_ const char *name, int create)
333{ 400{
334#if PERL_VERSION_ATLEAST (5,10,0) 401#if PERL_VERSION_ATLEAST (5,10,0)
335 /* 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 */
336 get_av (name, create); 403 get_av (name, create);
337#endif 404#endif
338 return get_av (name, create); 405 return get_av (name, create);
339} 406}
340 407
341static HV * 408static HV * ecb_noinline
342coro_get_hv (pTHX_ const char *name, int create) 409coro_get_hv (pTHX_ const char *name, int create)
343{ 410{
344#if PERL_VERSION_ATLEAST (5,10,0) 411#if PERL_VERSION_ATLEAST (5,10,0)
345 /* 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 */
346 get_hv (name, create); 413 get_hv (name, create);
347#endif 414#endif
348 return get_hv (name, create); 415 return get_hv (name, create);
349} 416}
350 417
351/* may croak */ 418ecb_inline void
352INLINE CV * 419coro_times_update (void)
353coro_sv_2cv (pTHX_ SV *sv)
354{ 420{
355 HV *st; 421#ifdef coro_clock_gettime
356 GV *gvp; 422 struct timespec ts;
357 return sv_2cv (sv, &st, &gvp, 0); 423
424 ts.tv_sec = ts.tv_nsec = 0;
425 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
426 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
427
428 ts.tv_sec = ts.tv_nsec = 0;
429 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
430 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
431#else
432 dTHX;
433 UV tv[2];
434
435 u2time (aTHX_ tv);
436 time_real [0] = tv [0];
437 time_real [1] = tv [1] * 1000;
438#endif
439}
440
441ecb_inline void
442coro_times_add (struct coro *c)
443{
444 c->t_real [1] += time_real [1];
445 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
446 c->t_real [0] += time_real [0];
447
448 c->t_cpu [1] += time_cpu [1];
449 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
450 c->t_cpu [0] += time_cpu [0];
451}
452
453ecb_inline void
454coro_times_sub (struct coro *c)
455{
456 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
457 c->t_real [1] -= time_real [1];
458 c->t_real [0] -= time_real [0];
459
460 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
461 c->t_cpu [1] -= time_cpu [1];
462 c->t_cpu [0] -= time_cpu [0];
358} 463}
359 464
360/*****************************************************************************/ 465/*****************************************************************************/
361/* magic glue */ 466/* magic glue */
362 467
363#define CORO_MAGIC_type_cv 26 468#define CORO_MAGIC_type_cv 26
364#define CORO_MAGIC_type_state PERL_MAGIC_ext 469#define CORO_MAGIC_type_state PERL_MAGIC_ext
365 470
366#define CORO_MAGIC_NN(sv, type) \ 471#define CORO_MAGIC_NN(sv, type) \
367 (expect_true (SvMAGIC (sv)->mg_type == type) \ 472 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
368 ? SvMAGIC (sv) \ 473 ? SvMAGIC (sv) \
369 : mg_find (sv, type)) 474 : mg_find (sv, type))
370 475
371#define CORO_MAGIC(sv, type) \ 476#define CORO_MAGIC(sv, type) \
372 (expect_true (SvMAGIC (sv)) \ 477 (ecb_expect_true (SvMAGIC (sv)) \
373 ? CORO_MAGIC_NN (sv, type) \ 478 ? CORO_MAGIC_NN (sv, type) \
374 : 0) 479 : 0)
375 480
376#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)
377#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)
378 483
379INLINE struct coro * 484ecb_inline MAGIC *
380SvSTATE_ (pTHX_ SV *coro) 485SvSTATEhv_p (pTHX_ SV *coro)
381{ 486{
382 HV *stash;
383 MAGIC *mg; 487 MAGIC *mg;
384 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 *
500SvSTATE_ (pTHX_ SV *coro_sv)
501{
502 MAGIC *mg;
503
385 if (SvROK (coro)) 504 if (SvROK (coro_sv))
386 coro = SvRV (coro); 505 coro_sv = SvRV (coro_sv);
387 506
388 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 507 mg = SvSTATEhv_p (aTHX_ coro_sv);
508 if (!mg)
389 croak ("Coro::State object required"); 509 croak ("Coro::State object required");
390 510
391 stash = SvSTASH (coro);
392 if (expect_false (stash != coro_stash && stash != coro_state_stash))
393 {
394 /* very slow, but rare, check */
395 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
396 croak ("Coro::State object required");
397 }
398
399 mg = CORO_MAGIC_state (coro);
400 return (struct coro *)mg->mg_ptr; 511 return (struct coro *)mg->mg_ptr;
401} 512}
402 513
403#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 514#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
404 515
… …
407#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 518#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
408 519
409/*****************************************************************************/ 520/*****************************************************************************/
410/* padlist management and caching */ 521/* padlist management and caching */
411 522
412static AV * 523ecb_inline PADLIST *
413coro_derive_padlist (pTHX_ CV *cv) 524coro_derive_padlist (pTHX_ CV *cv)
414{ 525{
415 AV *padlist = CvPADLIST (cv); 526 PADLIST *padlist = CvPADLIST (cv);
416 AV *newpadlist, *newpad; 527 PADLIST *newpadlist;
528 PADNAMELIST *padnames;
529 PAD *newpad;
530 PADOFFSET off = PadlistMAX (padlist) + 1;
417 531
418 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. */
419 AvREAL_off (newpadlist); 560 AvREAL_off (newpadlist);
420#if PERL_VERSION_ATLEAST (5,10,0)
421 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
422#else
423 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
424#endif 561#endif
425 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
426 --AvFILLp (padlist);
427 562
428 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 563 /* Already extended to 2 elements by newPADLIST. */
429 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;
430 571
431 return newpadlist; 572 return newpadlist;
432} 573}
433 574
434static void 575ecb_inline void
435free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
436{ 577{
437 /* may be during global destruction */ 578 /* may be during global destruction */
438 if (!IN_DESTRUCT) 579 if (!IN_DESTRUCT)
439 { 580 {
440 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
441 582
442 while (i > 0) /* special-case index 0 */ 583 while (i > 0) /* special-case index 0 */
443 { 584 {
444 /* we try to be extra-careful here */ 585 /* we try to be extra-careful here */
445 AV *av = (AV *)AvARRAY (padlist)[i--]; 586 PAD *pad = PadlistARRAY (padlist)[i--];
446 I32 j = AvFILLp (av);
447 587
588 if (pad)
589 {
590 I32 j = PadMAX (pad);
591
448 while (j >= 0) 592 while (j >= 0)
449 SvREFCNT_dec (AvARRAY (av)[j--]); 593 SvREFCNT_dec (PadARRAY (pad)[j--]);
450 594
451 AvFILLp (av) = -1; 595 PadMAX (pad) = -1;
452 SvREFCNT_dec (av); 596 SvREFCNT_dec (pad);
597 }
453 } 598 }
454 599
455 SvREFCNT_dec (AvARRAY (padlist)[0]); 600 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
456 601
602#if NEWPADAPI
603 Safefree (PadlistARRAY (padlist));
604 Safefree (padlist);
605#else
457 AvFILLp (padlist) = -1; 606 AvFILLp (padlist) = -1;
607 AvREAL_off (padlist);
458 SvREFCNT_dec ((SV*)padlist); 608 SvREFCNT_dec ((SV*)padlist);
609#endif
459 } 610 }
460} 611}
461 612
462static int 613static int
463coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 614coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
464{ 615{
465 AV *padlist; 616 PADLIST *padlist;
466 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;
467 619
468 /* casting is fun. */ 620 /* perl manages to free our internal AV and _then_ call us */
469 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 621 if (IN_DESTRUCT)
622 return 0;
623
624 while (len--)
470 free_padlist (aTHX_ padlist); 625 free_padlist (aTHX_ padlists[len]);
471
472 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
473 626
474 return 0; 627 return 0;
475} 628}
476 629
477static MGVTBL coro_cv_vtbl = { 630static MGVTBL coro_cv_vtbl = {
478 0, 0, 0, 0, 631 0, 0, 0, 0,
479 coro_cv_free 632 coro_cv_free
480}; 633};
481 634
482/* the next two functions merely cache the padlists */ 635/* the next two functions merely cache the padlists */
483static void 636ecb_inline void
484get_padlist (pTHX_ CV *cv) 637get_padlist (pTHX_ CV *cv)
485{ 638{
486 MAGIC *mg = CORO_MAGIC_cv (cv); 639 MAGIC *mg = CORO_MAGIC_cv (cv);
487 AV *av; 640 size_t *lenp;
488 641
489 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 642 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
490 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 643 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
491 else 644 else
492 { 645 {
493#if CORO_PREFER_PERL_FUNCTIONS 646#if CORO_PREFER_PERL_FUNCTIONS
494 /* this is probably cleaner? but also slower! */ 647 /* this is probably cleaner? but also slower! */
495 /* in practise, it seems to be less stable */ 648 /* in practise, it seems to be less stable */
… …
501 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 654 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
502#endif 655#endif
503 } 656 }
504} 657}
505 658
506static void 659ecb_inline void
507put_padlist (pTHX_ CV *cv) 660put_padlist (pTHX_ CV *cv)
508{ 661{
509 MAGIC *mg = CORO_MAGIC_cv (cv); 662 MAGIC *mg = CORO_MAGIC_cv (cv);
510 AV *av;
511 663
512 if (expect_false (!mg)) 664 if (ecb_expect_false (!mg))
665 {
513 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);
514 674
515 av = (AV *)mg->mg_obj; 675 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
516
517 if (expect_false (AvFILLp (av) >= AvMAX (av)))
518 av_extend (av, AvFILLp (av) + 1);
519
520 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
521} 676}
522 677
523/** 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))
731
732static void
733on_enterleave_call (pTHX_ SV *cb);
524 734
525static void 735static void
526load_perl (pTHX_ Coro__State c) 736load_perl (pTHX_ Coro__State c)
527{ 737{
528 perl_slots *slot = c->slot; 738 perl_slots *slot = c->slot;
529 c->slot = 0; 739 c->slot = 0;
530 740
531 PL_mainstack = c->mainstack; 741 PL_mainstack = c->mainstack;
532 742
533 GvSV (PL_defgv) = slot->defsv; 743#if CORO_JIT
534 GvAV (PL_defgv) = slot->defav; 744 load_perl_slots (slot);
535 GvSV (PL_errgv) = slot->errsv; 745#else
536 GvSV (irsgv) = slot->irsgv;
537 GvHV (PL_hintgv) = slot->hinthv;
538
539 #define VAR(name,type) PL_ ## name = slot->name; 746 #define VARx(name,expr,type) expr = slot->name;
540 # include "state.h" 747 #include "state.h"
541 #undef VAR 748#endif
542 749
543 { 750 {
544 dSP; 751 dSP;
545 752
546 CV *cv; 753 CV *cv;
547 754
548 /* now do the ugly restore mess */ 755 /* now do the ugly restore mess */
549 while (expect_true (cv = (CV *)POPs)) 756 while (ecb_expect_true (cv = (CV *)POPs))
550 { 757 {
551 put_padlist (aTHX_ cv); /* mark this padlist as available */ 758 put_padlist (aTHX_ cv); /* mark this padlist as available */
552 CvDEPTH (cv) = PTR2IV (POPs); 759 CvDEPTH (cv) = PTR2IV (POPs);
553 CvPADLIST (cv) = (AV *)POPs; 760 CvPADLIST (cv) = (PADLIST *)POPs;
554 } 761 }
555 762
556 PUTBACK; 763 PUTBACK;
557 } 764 }
558 765
559 slf_frame = c->slf_frame; 766 slf_frame = c->slf_frame;
560 CORO_THROW = c->except; 767 CORO_THROW = c->except;
768
769 if (ecb_expect_false (enable_times))
770 {
771 if (ecb_expect_false (!times_valid))
772 coro_times_update ();
773
774 coro_times_sub (c);
775 }
776
777 if (ecb_expect_false (c->on_enter))
778 {
779 int i;
780
781 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
782 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
783 }
784
785 if (ecb_expect_false (c->on_enter_xs))
786 {
787 int i;
788
789 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
790 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
791 }
792
793 SWAP_SVS (c);
561} 794}
562 795
563static void 796static void
564save_perl (pTHX_ Coro__State c) 797save_perl (pTHX_ Coro__State c)
565{ 798{
799 SWAP_SVS (c);
800
801 if (ecb_expect_false (c->on_leave_xs))
802 {
803 int i;
804
805 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
806 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
807 }
808
809 if (ecb_expect_false (c->on_leave))
810 {
811 int i;
812
813 for (i = AvFILLp (c->on_leave); i >= 0; --i)
814 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
815 }
816
817 times_valid = 0;
818
819 if (ecb_expect_false (enable_times))
820 {
821 coro_times_update (); times_valid = 1;
822 coro_times_add (c);
823 }
824
566 c->except = CORO_THROW; 825 c->except = CORO_THROW;
567 c->slf_frame = slf_frame; 826 c->slf_frame = slf_frame;
568 827
569 { 828 {
570 dSP; 829 dSP;
… …
579 838
580 XPUSHs (Nullsv); 839 XPUSHs (Nullsv);
581 /* this loop was inspired by pp_caller */ 840 /* this loop was inspired by pp_caller */
582 for (;;) 841 for (;;)
583 { 842 {
584 while (expect_true (cxix >= 0)) 843 while (ecb_expect_true (cxix >= 0))
585 { 844 {
586 PERL_CONTEXT *cx = &ccstk[cxix--]; 845 PERL_CONTEXT *cx = &ccstk[cxix--];
587 846
588 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 847 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
589 { 848 {
590 CV *cv = cx->blk_sub.cv; 849 CV *cv = cx->blk_sub.cv;
591 850
592 if (expect_true (CvDEPTH (cv))) 851 if (ecb_expect_true (CvDEPTH (cv)))
593 { 852 {
594 EXTEND (SP, 3); 853 EXTEND (SP, 3);
595 PUSHs ((SV *)CvPADLIST (cv)); 854 PUSHs ((SV *)CvPADLIST (cv));
596 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 855 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
597 PUSHs ((SV *)cv); 856 PUSHs ((SV *)cv);
… …
600 get_padlist (aTHX_ cv); 859 get_padlist (aTHX_ cv);
601 } 860 }
602 } 861 }
603 } 862 }
604 863
605 if (expect_true (top_si->si_type == PERLSI_MAIN)) 864 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
606 break; 865 break;
607 866
608 top_si = top_si->si_prev; 867 top_si = top_si->si_prev;
609 ccstk = top_si->si_cxstack; 868 ccstk = top_si->si_cxstack;
610 cxix = top_si->si_cxix; 869 cxix = top_si->si_cxix;
… …
612 871
613 PUTBACK; 872 PUTBACK;
614 } 873 }
615 874
616 /* allocate some space on the context stack for our purposes */ 875 /* allocate some space on the context stack for our purposes */
617 /* we manually unroll here, as usually 2 slots is enough */ 876 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
618 if (SLOT_COUNT >= 1) CXINC;
619 if (SLOT_COUNT >= 2) CXINC;
620 if (SLOT_COUNT >= 3) CXINC;
621 { 877 {
622 int i; 878 unsigned int i;
879
623 for (i = 3; i < SLOT_COUNT; ++i) 880 for (i = 0; i < SLOT_COUNT; ++i)
624 CXINC; 881 CXINC;
625 } 882
626 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 883 cxstack_ix -= SLOT_COUNT; /* undo allocation */
884 }
627 885
628 c->mainstack = PL_mainstack; 886 c->mainstack = PL_mainstack;
629 887
630 { 888 {
631 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 889 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
632 890
633 slot->defav = GvAV (PL_defgv); 891#if CORO_JIT
634 slot->defsv = DEFSV; 892 save_perl_slots (slot);
635 slot->errsv = ERRSV; 893#else
636 slot->irsgv = GvSV (irsgv);
637 slot->hinthv = GvHV (PL_hintgv);
638
639 #define VAR(name,type) slot->name = PL_ ## name; 894 #define VARx(name,expr,type) slot->name = expr;
640 # include "state.h" 895 #include "state.h"
641 #undef VAR 896#endif
642 } 897 }
643} 898}
644 899
645/* 900/*
646 * allocate various perl stacks. This is almost an exact copy 901 * allocate various perl stacks. This is almost an exact copy
… …
652# define coro_init_stacks(thx) init_stacks () 907# define coro_init_stacks(thx) init_stacks ()
653#else 908#else
654static void 909static void
655coro_init_stacks (pTHX) 910coro_init_stacks (pTHX)
656{ 911{
657 PL_curstackinfo = new_stackinfo(32, 8); 912 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
658 PL_curstackinfo->si_type = PERLSI_MAIN; 913 PL_curstackinfo->si_type = PERLSI_MAIN;
659 PL_curstack = PL_curstackinfo->si_stack; 914 PL_curstack = PL_curstackinfo->si_stack;
660 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 915 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
661 916
662 PL_stack_base = AvARRAY(PL_curstack); 917 PL_stack_base = AvARRAY(PL_curstack);
… …
677#endif 932#endif
678 933
679 New(54,PL_scopestack,8,I32); 934 New(54,PL_scopestack,8,I32);
680 PL_scopestack_ix = 0; 935 PL_scopestack_ix = 0;
681 PL_scopestack_max = 8; 936 PL_scopestack_max = 8;
937#if HAS_SCOPESTACK_NAME
938 New(54,PL_scopestack_name,8,const char*);
939#endif
682 940
683 New(54,PL_savestack,24,ANY); 941 New(54,PL_savestack,24,ANY);
684 PL_savestack_ix = 0; 942 PL_savestack_ix = 0;
685 PL_savestack_max = 24; 943 PL_savestack_max = 24;
686 944
… …
714 } 972 }
715 973
716 Safefree (PL_tmps_stack); 974 Safefree (PL_tmps_stack);
717 Safefree (PL_markstack); 975 Safefree (PL_markstack);
718 Safefree (PL_scopestack); 976 Safefree (PL_scopestack);
977#if HAS_SCOPESTACK_NAME
978 Safefree (PL_scopestack_name);
979#endif
719 Safefree (PL_savestack); 980 Safefree (PL_savestack);
720#if !PERL_VERSION_ATLEAST (5,10,0) 981#if !PERL_VERSION_ATLEAST (5,10,0)
721 Safefree (PL_retstack); 982 Safefree (PL_retstack);
722#endif 983#endif
723} 984}
… …
769#endif 1030#endif
770 1031
771/* 1032/*
772 * This overrides the default magic get method of %SIG elements. 1033 * This overrides the default magic get method of %SIG elements.
773 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1034 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
774 * and instead of tryign to save and restore the hash elements, we just provide 1035 * and instead of trying to save and restore the hash elements (extremely slow),
775 * readback here. 1036 * we just provide our own readback here.
776 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
777 * not expecting this to actually change the hook. This is a potential problem
778 * when a schedule happens then, but we ignore this.
779 */ 1037 */
780static int 1038static int ecb_cold
781coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1039coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
782{ 1040{
783 const char *s = MgPV_nolen_const (mg); 1041 const char *s = MgPV_nolen_const (mg);
784 1042
785 if (*s == '_') 1043 if (*s == '_')
786 { 1044 {
787 SV **svp = 0; 1045 SV **svp = 0;
788 1046
789 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1047 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
790 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1048 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
791 1049
792 if (svp) 1050 if (svp)
793 { 1051 {
794 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1052 SV *ssv;
1053
1054 if (!*svp)
1055 ssv = &PL_sv_undef;
1056 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1057 ssv = sv_2mortal (newRV_inc (*svp));
1058 else
1059 ssv = *svp;
1060
1061 sv_setsv (sv, ssv);
795 return 0; 1062 return 0;
796 } 1063 }
797 } 1064 }
798 1065
799 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1066 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
800} 1067}
801 1068
802static int 1069static int ecb_cold
803coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1070coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
804{ 1071{
805 const char *s = MgPV_nolen_const (mg); 1072 const char *s = MgPV_nolen_const (mg);
806 1073
807 if (*s == '_') 1074 if (*s == '_')
… …
821 } 1088 }
822 1089
823 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1090 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
824} 1091}
825 1092
826static int 1093static int ecb_cold
827coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1094coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
828{ 1095{
829 const char *s = MgPV_nolen_const (mg); 1096 const char *s = MgPV_nolen_const (mg);
830 1097
831 if (*s == '_') 1098 if (*s == '_')
… …
836 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1103 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
837 1104
838 if (svp) 1105 if (svp)
839 { 1106 {
840 SV *old = *svp; 1107 SV *old = *svp;
841 *svp = newSVsv (sv); 1108 *svp = SvOK (sv) ? newSVsv (sv) : 0;
842 SvREFCNT_dec (old); 1109 SvREFCNT_dec (old);
843 return 0; 1110 return 0;
844 } 1111 }
845 } 1112 }
846 1113
… …
864slf_check_repeat (pTHX_ struct CoroSLF *frame) 1131slf_check_repeat (pTHX_ struct CoroSLF *frame)
865{ 1132{
866 return 1; 1133 return 1;
867} 1134}
868 1135
869static UNOP coro_setup_op; 1136static UNOP init_perl_op;
870 1137
871static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1138ecb_noinline static void /* noinline to keep it out of the transfer fast path */
872coro_setup (pTHX_ struct coro *coro) 1139init_perl (pTHX_ struct coro *coro)
873{ 1140{
874 /* 1141 /*
875 * emulate part of the perl startup here. 1142 * emulate part of the perl startup here.
876 */ 1143 */
877 coro_init_stacks (aTHX); 1144 coro_init_stacks (aTHX);
… …
884 PL_comppad_name_fill = 0; 1151 PL_comppad_name_fill = 0;
885 PL_comppad_name_floor = 0; 1152 PL_comppad_name_floor = 0;
886 PL_curpm = 0; 1153 PL_curpm = 0;
887 PL_curpad = 0; 1154 PL_curpad = 0;
888 PL_localizing = 0; 1155 PL_localizing = 0;
889 PL_dirty = 0;
890 PL_restartop = 0; 1156 PL_restartop = 0;
891#if PERL_VERSION_ATLEAST (5,10,0) 1157#if PERL_VERSION_ATLEAST (5,10,0)
892 PL_parser = 0; 1158 PL_parser = 0;
893#endif 1159#endif
894 PL_hints = 0; 1160 PL_hints = 0;
895 1161
896 /* recreate the die/warn hooks */ 1162 /* recreate the die/warn hooks */
897 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1163 PL_diehook = SvREFCNT_inc (rv_diehook);
898 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1164 PL_warnhook = SvREFCNT_inc (rv_warnhook);
899 1165
900 GvSV (PL_defgv) = newSV (0); 1166 GvSV (PL_defgv) = newSV (0);
901 GvAV (PL_defgv) = coro->args; coro->args = 0; 1167 GvAV (PL_defgv) = coro->args; coro->args = 0;
902 GvSV (PL_errgv) = newSV (0); 1168 GvSV (PL_errgv) = newSV (0);
903 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1169 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
904 GvHV (PL_hintgv) = 0; 1170 GvHV (PL_hintgv) = newHV ();
1171#if PERL_VERSION_ATLEAST (5,10,0)
1172 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1173#endif
905 PL_rs = newSVsv (GvSV (irsgv)); 1174 PL_rs = newSVsv (GvSV (irsgv));
906 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1175 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
907 1176
908 { 1177 {
909 dSP; 1178 dSP;
… …
924 /* this newly created coroutine might be run on an existing cctx which most 1193 /* this newly created coroutine might be run on an existing cctx which most
925 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1194 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
926 */ 1195 */
927 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1196 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
928 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1197 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1198 slf_frame.destroy = 0;
929 1199
930 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1200 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
931 coro_setup_op.op_next = PL_op; 1201 init_perl_op.op_next = PL_op;
932 coro_setup_op.op_type = OP_ENTERSUB; 1202 init_perl_op.op_type = OP_ENTERSUB;
933 coro_setup_op.op_ppaddr = pp_slf; 1203 init_perl_op.op_ppaddr = pp_slf;
934 /* no flags etc. required, as an init function won't be called */ 1204 /* no flags etc. required, as an init function won't be called */
935 1205
936 PL_op = (OP *)&coro_setup_op; 1206 PL_op = (OP *)&init_perl_op;
937 1207
938 /* copy throw, in case it was set before coro_setup */ 1208 /* copy throw, in case it was set before init_perl */
939 CORO_THROW = coro->except; 1209 CORO_THROW = coro->except;
940}
941 1210
1211 SWAP_SVS (coro);
1212
1213 if (ecb_expect_false (enable_times))
1214 {
1215 coro_times_update ();
1216 coro_times_sub (coro);
1217 }
1218}
1219
942static void 1220static void
943coro_destruct (pTHX_ struct coro *coro) 1221coro_unwind_stacks (pTHX)
944{ 1222{
945 if (!IN_DESTRUCT) 1223 if (!IN_DESTRUCT)
946 { 1224 {
947 /* restore all saved variables and stuff */ 1225 /* restore all saved variables and stuff */
948 LEAVE_SCOPE (0); 1226 LEAVE_SCOPE (0);
… …
956 POPSTACK_TO (PL_mainstack); 1234 POPSTACK_TO (PL_mainstack);
957 1235
958 /* unwind main stack */ 1236 /* unwind main stack */
959 dounwind (-1); 1237 dounwind (-1);
960 } 1238 }
1239}
961 1240
962 SvREFCNT_dec (GvSV (PL_defgv)); 1241static void
963 SvREFCNT_dec (GvAV (PL_defgv)); 1242destroy_perl (pTHX_ struct coro *coro)
964 SvREFCNT_dec (GvSV (PL_errgv)); 1243{
965 SvREFCNT_dec (PL_defoutgv); 1244 SV *svf [9];
966 SvREFCNT_dec (PL_rs);
967 SvREFCNT_dec (GvSV (irsgv));
968 SvREFCNT_dec (GvHV (PL_hintgv));
969 1245
970 SvREFCNT_dec (PL_diehook);
971 SvREFCNT_dec (PL_warnhook);
972 1246 {
1247 SV *old_current = SvRV (coro_current);
1248 struct coro *current = SvSTATE (old_current);
1249
1250 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1251
1252 save_perl (aTHX_ current);
1253
1254 /* this will cause transfer_check to croak on block*/
1255 SvRV_set (coro_current, (SV *)coro->hv);
1256
1257 load_perl (aTHX_ coro);
1258
1259 coro_unwind_stacks (aTHX);
1260
1261 /* restore swapped sv's */
1262 SWAP_SVS (coro);
1263
1264 coro_destruct_stacks (aTHX);
1265
1266 /* now save some sv's to be free'd later */
1267 svf [0] = GvSV (PL_defgv);
1268 svf [1] = (SV *)GvAV (PL_defgv);
1269 svf [2] = GvSV (PL_errgv);
1270 svf [3] = (SV *)PL_defoutgv;
1271 svf [4] = PL_rs;
1272 svf [5] = GvSV (irsgv);
1273 svf [6] = (SV *)GvHV (PL_hintgv);
1274 svf [7] = PL_diehook;
1275 svf [8] = PL_warnhook;
1276 assert (9 == sizeof (svf) / sizeof (*svf));
1277
1278 SvRV_set (coro_current, old_current);
1279
1280 load_perl (aTHX_ current);
1281 }
1282
1283 {
1284 unsigned int i;
1285
1286 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1287 SvREFCNT_dec (svf [i]);
1288
973 SvREFCNT_dec (coro->saved_deffh); 1289 SvREFCNT_dec (coro->saved_deffh);
974 SvREFCNT_dec (coro->rouse_cb); 1290 SvREFCNT_dec (coro->rouse_cb);
975 SvREFCNT_dec (coro->invoke_cb); 1291 SvREFCNT_dec (coro->invoke_cb);
976 SvREFCNT_dec (coro->invoke_av); 1292 SvREFCNT_dec (coro->invoke_av);
977 1293 SvREFCNT_dec (coro->on_enter_xs);
978 coro_destruct_stacks (aTHX); 1294 SvREFCNT_dec (coro->on_leave_xs);
1295 }
979} 1296}
980 1297
981INLINE void 1298ecb_inline void
982free_coro_mortal (pTHX) 1299free_coro_mortal (pTHX)
983{ 1300{
984 if (expect_true (coro_mortal)) 1301 if (ecb_expect_true (coro_mortal))
985 { 1302 {
986 SvREFCNT_dec (coro_mortal); 1303 SvREFCNT_dec ((SV *)coro_mortal);
987 coro_mortal = 0; 1304 coro_mortal = 0;
988 } 1305 }
989} 1306}
990 1307
991static int 1308static int
… …
1045 1362
1046 if (PL_curcop != &PL_compiling) 1363 if (PL_curcop != &PL_compiling)
1047 { 1364 {
1048 SV **cb; 1365 SV **cb;
1049 1366
1050 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1367 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1051 { 1368 {
1052 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1369 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1053 1370
1054 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1371 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1055 { 1372 {
… …
1124 1441
1125 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1442 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1126} 1443}
1127 1444
1128/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1445/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1129static void NOINLINE 1446static void ecb_noinline
1130cctx_prepare (pTHX) 1447cctx_prepare (pTHX)
1131{ 1448{
1132 PL_top_env = &PL_start_env; 1449 PL_top_env = &PL_start_env;
1133 1450
1134 if (cctx_current->flags & CC_TRACE) 1451 if (cctx_current->flags & CC_TRACE)
… …
1145 slf_frame.prepare = slf_prepare_set_stacklevel; 1462 slf_frame.prepare = slf_prepare_set_stacklevel;
1146 slf_frame.check = slf_check_set_stacklevel; 1463 slf_frame.check = slf_check_set_stacklevel;
1147} 1464}
1148 1465
1149/* the tail of transfer: execute stuff we can only do after a transfer */ 1466/* the tail of transfer: execute stuff we can only do after a transfer */
1150INLINE void 1467ecb_inline void
1151transfer_tail (pTHX) 1468transfer_tail (pTHX)
1152{ 1469{
1153 free_coro_mortal (aTHX); 1470 free_coro_mortal (aTHX);
1471}
1472
1473/* try to exit the same way perl's main function would do */
1474/* we do not bother resetting the environment or other things *7
1475/* that are not, uhm, essential */
1476/* this obviously also doesn't work when perl is embedded */
1477static void ecb_noinline ecb_cold
1478perlish_exit (pTHX)
1479{
1480 int exitstatus = perl_destruct (PL_curinterp);
1481 perl_free (PL_curinterp);
1482 exit (exitstatus);
1154} 1483}
1155 1484
1156/* 1485/*
1157 * this is a _very_ stripped down perl interpreter ;) 1486 * this is a _very_ stripped down perl interpreter ;)
1158 */ 1487 */
… …
1180 /* somebody or something will hit me for both perl_run and PL_restartop */ 1509 /* somebody or something will hit me for both perl_run and PL_restartop */
1181 PL_restartop = PL_op; 1510 PL_restartop = PL_op;
1182 perl_run (PL_curinterp); 1511 perl_run (PL_curinterp);
1183 /* 1512 /*
1184 * Unfortunately, there is no way to get at the return values of the 1513 * Unfortunately, there is no way to get at the return values of the
1185 * coro body here, as perl_run destroys these 1514 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1515 * runtime errors here, as this is just a random interpreter, not a thread.
1186 */ 1516 */
1187 1517
1188 /* 1518 /*
1189 * If perl-run returns we assume exit() was being called or the coro 1519 * If perl-run returns we assume exit() was being called or the coro
1190 * fell off the end, which seems to be the only valid (non-bug) 1520 * fell off the end, which seems to be the only valid (non-bug)
1191 * reason for perl_run to return. We try to exit by jumping to the 1521 * reason for perl_run to return. We try to mimic whatever perl is normally
1192 * bootstrap-time "top" top_env, as we cannot restore the "main" 1522 * doing in that case. YMMV.
1193 * coroutine as Coro has no such concept.
1194 * This actually isn't valid with the pthread backend, but OSes requiring
1195 * that backend are too broken to do it in a standards-compliant way.
1196 */ 1523 */
1197 PL_top_env = main_top_env; 1524 perlish_exit (aTHX);
1198 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1199 } 1525 }
1200} 1526}
1201 1527
1202static coro_cctx * 1528static coro_cctx *
1203cctx_new () 1529cctx_new (void)
1204{ 1530{
1205 coro_cctx *cctx; 1531 coro_cctx *cctx;
1206 1532
1207 ++cctx_count; 1533 ++cctx_count;
1208 New (0, cctx, 1, coro_cctx); 1534 New (0, cctx, 1, coro_cctx);
… …
1214 return cctx; 1540 return cctx;
1215} 1541}
1216 1542
1217/* create a new cctx only suitable as source */ 1543/* create a new cctx only suitable as source */
1218static coro_cctx * 1544static coro_cctx *
1219cctx_new_empty () 1545cctx_new_empty (void)
1220{ 1546{
1221 coro_cctx *cctx = cctx_new (); 1547 coro_cctx *cctx = cctx_new ();
1222 1548
1223 cctx->sptr = 0; 1549 cctx->stack.sptr = 0;
1224 coro_create (&cctx->cctx, 0, 0, 0, 0); 1550 coro_create (&cctx->cctx, 0, 0, 0, 0);
1225 1551
1226 return cctx; 1552 return cctx;
1227} 1553}
1228 1554
1229/* create a new cctx suitable as destination/running a perl interpreter */ 1555/* create a new cctx suitable as destination/running a perl interpreter */
1230static coro_cctx * 1556static coro_cctx *
1231cctx_new_run () 1557cctx_new_run (void)
1232{ 1558{
1233 coro_cctx *cctx = cctx_new (); 1559 coro_cctx *cctx = cctx_new ();
1234 void *stack_start;
1235 size_t stack_size;
1236 1560
1237#if HAVE_MMAP 1561 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1238 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1239 /* mmap supposedly does allocate-on-write for us */
1240 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1241
1242 if (cctx->sptr != (void *)-1)
1243 {
1244 #if CORO_STACKGUARD
1245 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1246 #endif
1247 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1248 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1249 cctx->flags |= CC_MAPPED;
1250 } 1562 {
1251 else
1252#endif
1253 {
1254 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1255 New (0, cctx->sptr, cctx_stacksize, long);
1256
1257 if (!cctx->sptr)
1258 {
1259 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1563 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1260 _exit (EXIT_FAILURE); 1564 _exit (EXIT_FAILURE);
1261 }
1262
1263 stack_start = cctx->sptr;
1264 stack_size = cctx->ssize;
1265 } 1565 }
1266 1566
1267 #if CORO_USE_VALGRIND
1268 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1269 #endif
1270
1271 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1567 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1272 1568
1273 return cctx; 1569 return cctx;
1274} 1570}
1275 1571
1276static void 1572static void
1277cctx_destroy (coro_cctx *cctx) 1573cctx_destroy (coro_cctx *cctx)
1278{ 1574{
1279 if (!cctx) 1575 if (!cctx)
1280 return; 1576 return;
1281 1577
1282 assert (cctx != cctx_current);//D temporary 1578 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1283 1579
1284 --cctx_count; 1580 --cctx_count;
1285 coro_destroy (&cctx->cctx); 1581 coro_destroy (&cctx->cctx);
1286 1582
1287 /* coro_transfer creates new, empty cctx's */ 1583 coro_stack_free (&cctx->stack);
1288 if (cctx->sptr)
1289 {
1290 #if CORO_USE_VALGRIND
1291 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1292 #endif
1293
1294#if HAVE_MMAP
1295 if (cctx->flags & CC_MAPPED)
1296 munmap (cctx->sptr, cctx->ssize);
1297 else
1298#endif
1299 Safefree (cctx->sptr);
1300 }
1301 1584
1302 Safefree (cctx); 1585 Safefree (cctx);
1303} 1586}
1304 1587
1305/* wether this cctx should be destructed */ 1588/* wether this cctx should be destructed */
1306#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1589#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1307 1590
1308static coro_cctx * 1591static coro_cctx *
1309cctx_get (pTHX) 1592cctx_get (pTHX)
1310{ 1593{
1311 while (expect_true (cctx_first)) 1594 while (ecb_expect_true (cctx_first))
1312 { 1595 {
1313 coro_cctx *cctx = cctx_first; 1596 coro_cctx *cctx = cctx_first;
1314 cctx_first = cctx->next; 1597 cctx_first = cctx->next;
1315 --cctx_idle; 1598 --cctx_idle;
1316 1599
1317 if (expect_true (!CCTX_EXPIRED (cctx))) 1600 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1318 return cctx; 1601 return cctx;
1319 1602
1320 cctx_destroy (cctx); 1603 cctx_destroy (cctx);
1321 } 1604 }
1322 1605
… …
1324} 1607}
1325 1608
1326static void 1609static void
1327cctx_put (coro_cctx *cctx) 1610cctx_put (coro_cctx *cctx)
1328{ 1611{
1329 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1612 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1330 1613
1331 /* free another cctx if overlimit */ 1614 /* free another cctx if overlimit */
1332 if (expect_false (cctx_idle >= cctx_max_idle)) 1615 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1333 { 1616 {
1334 coro_cctx *first = cctx_first; 1617 coro_cctx *first = cctx_first;
1335 cctx_first = first->next; 1618 cctx_first = first->next;
1336 --cctx_idle; 1619 --cctx_idle;
1337 1620
… …
1348static void 1631static void
1349transfer_check (pTHX_ struct coro *prev, struct coro *next) 1632transfer_check (pTHX_ struct coro *prev, struct coro *next)
1350{ 1633{
1351 /* TODO: throwing up here is considered harmful */ 1634 /* TODO: throwing up here is considered harmful */
1352 1635
1353 if (expect_true (prev != next)) 1636 if (ecb_expect_true (prev != next))
1354 { 1637 {
1355 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1638 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1356 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,"); 1639 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1357 1640
1358 if (expect_false (next->flags & CF_RUNNING)) 1641 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1359 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1360
1361 if (expect_false (next->flags & CF_DESTROYED))
1362 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1642 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1363 1643
1364#if !PERL_VERSION_ATLEAST (5,10,0) 1644#if !PERL_VERSION_ATLEAST (5,10,0)
1365 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1645 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1366 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1646 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1367#endif 1647#endif
1368 } 1648 }
1369} 1649}
1370 1650
1371/* always use the TRANSFER macro */ 1651/* always use the TRANSFER macro */
1372static void NOINLINE /* noinline so we have a fixed stackframe */ 1652static void ecb_noinline /* noinline so we have a fixed stackframe */
1373transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1653transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1374{ 1654{
1375 dSTACKLEVEL; 1655 dSTACKLEVEL;
1376 1656
1377 /* sometimes transfer is only called to set idle_sp */ 1657 /* sometimes transfer is only called to set idle_sp */
1378 if (expect_false (!prev)) 1658 if (ecb_expect_false (!prev))
1379 { 1659 {
1380 cctx_current->idle_sp = STACKLEVEL; 1660 cctx_current->idle_sp = STACKLEVEL;
1381 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1661 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1382 } 1662 }
1383 else if (expect_true (prev != next)) 1663 else if (ecb_expect_true (prev != next))
1384 { 1664 {
1385 coro_cctx *cctx_prev; 1665 coro_cctx *cctx_prev;
1386 1666
1387 if (expect_false (prev->flags & CF_NEW)) 1667 if (ecb_expect_false (prev->flags & CF_NEW))
1388 { 1668 {
1389 /* create a new empty/source context */ 1669 /* create a new empty/source context */
1390 prev->flags &= ~CF_NEW; 1670 prev->flags &= ~CF_NEW;
1391 prev->flags |= CF_RUNNING; 1671 prev->flags |= CF_RUNNING;
1392 } 1672 }
… …
1395 next->flags |= CF_RUNNING; 1675 next->flags |= CF_RUNNING;
1396 1676
1397 /* first get rid of the old state */ 1677 /* first get rid of the old state */
1398 save_perl (aTHX_ prev); 1678 save_perl (aTHX_ prev);
1399 1679
1400 if (expect_false (next->flags & CF_NEW)) 1680 if (ecb_expect_false (next->flags & CF_NEW))
1401 { 1681 {
1402 /* need to start coroutine */ 1682 /* need to start coroutine */
1403 next->flags &= ~CF_NEW; 1683 next->flags &= ~CF_NEW;
1404 /* setup coroutine call */ 1684 /* setup coroutine call */
1405 coro_setup (aTHX_ next); 1685 init_perl (aTHX_ next);
1406 } 1686 }
1407 else 1687 else
1408 load_perl (aTHX_ next); 1688 load_perl (aTHX_ next);
1409 1689
1410 assert (!prev->cctx);//D temporary
1411
1412 /* possibly untie and reuse the cctx */ 1690 /* possibly untie and reuse the cctx */
1413 if (expect_true ( 1691 if (ecb_expect_true (
1414 cctx_current->idle_sp == STACKLEVEL 1692 cctx_current->idle_sp == STACKLEVEL
1415 && !(cctx_current->flags & CC_TRACE) 1693 && !(cctx_current->flags & CC_TRACE)
1416 && !force_cctx 1694 && !force_cctx
1417 )) 1695 ))
1418 { 1696 {
1419 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1697 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1420 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1698 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1421 1699
1422 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1700 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1423 /* without this the next cctx_get might destroy the running cctx while still in use */ 1701 /* without this the next cctx_get might destroy the running cctx while still in use */
1424 if (expect_false (CCTX_EXPIRED (cctx_current))) 1702 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1425 if (expect_true (!next->cctx)) 1703 if (ecb_expect_true (!next->cctx))
1426 next->cctx = cctx_get (aTHX); 1704 next->cctx = cctx_get (aTHX);
1427 1705
1428 cctx_put (cctx_current); 1706 cctx_put (cctx_current);
1429 } 1707 }
1430 else 1708 else
1431 prev->cctx = cctx_current; 1709 prev->cctx = cctx_current;
1432 1710
1433 ++next->usecount; 1711 ++next->usecount;
1434 1712
1435 cctx_prev = cctx_current; 1713 cctx_prev = cctx_current;
1436 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1714 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1437 1715
1438 next->cctx = 0; 1716 next->cctx = 0;
1439 1717
1440 if (expect_false (cctx_prev != cctx_current)) 1718 if (ecb_expect_false (cctx_prev != cctx_current))
1441 { 1719 {
1442 cctx_prev->top_env = PL_top_env; 1720 cctx_prev->top_env = PL_top_env;
1443 PL_top_env = cctx_current->top_env; 1721 PL_top_env = cctx_current->top_env;
1444 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1722 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1445 } 1723 }
… …
1451#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1729#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1452#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1730#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1453 1731
1454/** high level stuff ********************************************************/ 1732/** high level stuff ********************************************************/
1455 1733
1734/* this function is actually Coro, not Coro::State, but we call it from here */
1735/* because it is convenient - but it hasn't been declared yet for that reason */
1456static int 1736static void
1737coro_call_on_destroy (pTHX_ struct coro *coro);
1738
1739static void
1457coro_state_destroy (pTHX_ struct coro *coro) 1740coro_state_destroy (pTHX_ struct coro *coro)
1458{ 1741{
1459 if (coro->flags & CF_DESTROYED) 1742 if (coro->flags & CF_ZOMBIE)
1460 return 0; 1743 return;
1461 1744
1462 if (coro->on_destroy)
1463 coro->on_destroy (aTHX_ coro); 1745 slf_destroy (aTHX_ coro);
1464 1746
1465 coro->flags |= CF_DESTROYED; 1747 coro->flags |= CF_ZOMBIE;
1466 1748
1467 if (coro->flags & CF_READY) 1749 if (coro->flags & CF_READY)
1468 { 1750 {
1469 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1751 /* reduce nready, as destroying a ready coro effectively unreadies it */
1470 /* alternative: look through all ready queues and remove the coro */ 1752 /* alternative: look through all ready queues and remove the coro */
1471 --coro_nready; 1753 --coro_nready;
1472 } 1754 }
1473 else 1755 else
1474 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1756 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1475 1757
1476 if (coro->mainstack && coro->mainstack != main_mainstack) 1758 if (coro->next) coro->next->prev = coro->prev;
1477 { 1759 if (coro->prev) coro->prev->next = coro->next;
1478 struct coro temp; 1760 if (coro == coro_first) coro_first = coro->next;
1479 1761
1480 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1762 if (coro->mainstack
1481 1763 && coro->mainstack != main_mainstack
1482 save_perl (aTHX_ &temp); 1764 && coro->slot
1765 && !PL_dirty)
1483 load_perl (aTHX_ coro); 1766 destroy_perl (aTHX_ coro);
1484
1485 coro_destruct (aTHX_ coro);
1486
1487 load_perl (aTHX_ &temp);
1488
1489 coro->slot = 0;
1490 }
1491 1767
1492 cctx_destroy (coro->cctx); 1768 cctx_destroy (coro->cctx);
1493 SvREFCNT_dec (coro->startcv); 1769 SvREFCNT_dec (coro->startcv);
1494 SvREFCNT_dec (coro->args); 1770 SvREFCNT_dec (coro->args);
1771 SvREFCNT_dec (coro->swap_sv);
1495 SvREFCNT_dec (CORO_THROW); 1772 SvREFCNT_dec (CORO_THROW);
1496 1773
1497 if (coro->next) coro->next->prev = coro->prev; 1774 coro_call_on_destroy (aTHX_ coro);
1498 if (coro->prev) coro->prev->next = coro->next;
1499 if (coro == coro_first) coro_first = coro->next;
1500 1775
1501 return 1; 1776 /* more destruction mayhem in coro_state_free */
1502} 1777}
1503 1778
1504static int 1779static int
1505coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1780coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1506{ 1781{
1507 struct coro *coro = (struct coro *)mg->mg_ptr; 1782 struct coro *coro = (struct coro *)mg->mg_ptr;
1508 mg->mg_ptr = 0; 1783 mg->mg_ptr = 0;
1509 1784
1510 coro->hv = 0;
1511
1512 if (--coro->refcnt < 0)
1513 {
1514 coro_state_destroy (aTHX_ coro); 1785 coro_state_destroy (aTHX_ coro);
1786 SvREFCNT_dec (coro->on_destroy);
1787 SvREFCNT_dec (coro->status);
1788
1515 Safefree (coro); 1789 Safefree (coro);
1516 }
1517 1790
1518 return 0; 1791 return 0;
1519} 1792}
1520 1793
1521static int 1794static int ecb_cold
1522coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1795coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1523{ 1796{
1524 struct coro *coro = (struct coro *)mg->mg_ptr; 1797 /* called when perl clones the current process the slow way (windows process emulation) */
1525 1798 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1526 ++coro->refcnt; 1799 mg->mg_ptr = 0;
1800 mg->mg_virtual = 0;
1527 1801
1528 return 0; 1802 return 0;
1529} 1803}
1530 1804
1531static MGVTBL coro_state_vtbl = { 1805static MGVTBL coro_state_vtbl = {
… …
1554 1828
1555 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1829 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1556 TRANSFER (ta, 1); 1830 TRANSFER (ta, 1);
1557} 1831}
1558 1832
1559/*****************************************************************************/
1560/* gensub: simple closure generation utility */
1561
1562#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1563
1564/* create a closure from XS, returns a code reference */
1565/* the arg can be accessed via GENSUB_ARG from the callback */
1566/* the callback must use dXSARGS/XSRETURN */
1567static SV *
1568gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1569{
1570 CV *cv = (CV *)newSV (0);
1571
1572 sv_upgrade ((SV *)cv, SVt_PVCV);
1573
1574 CvANON_on (cv);
1575 CvISXSUB_on (cv);
1576 CvXSUB (cv) = xsub;
1577 GENSUB_ARG = arg;
1578
1579 return newRV_noinc ((SV *)cv);
1580}
1581
1582/** Coro ********************************************************************/ 1833/** Coro ********************************************************************/
1583 1834
1584INLINE void 1835ecb_inline void
1585coro_enq (pTHX_ struct coro *coro) 1836coro_enq (pTHX_ struct coro *coro)
1586{ 1837{
1587 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1838 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1588}
1589 1839
1590INLINE SV * 1840 SvREFCNT_inc_NN (coro->hv);
1841
1842 coro->next_ready = 0;
1843 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1844 ready [1] = coro;
1845}
1846
1847ecb_inline struct coro *
1591coro_deq (pTHX) 1848coro_deq (pTHX)
1592{ 1849{
1593 int prio; 1850 int prio;
1594 1851
1595 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1852 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1596 if (AvFILLp (coro_ready [prio]) >= 0) 1853 {
1597 return av_shift (coro_ready [prio]); 1854 struct coro **ready = coro_ready [prio];
1855
1856 if (ready [0])
1857 {
1858 struct coro *coro = ready [0];
1859 ready [0] = coro->next_ready;
1860 return coro;
1861 }
1862 }
1598 1863
1599 return 0; 1864 return 0;
1865}
1866
1867static void
1868invoke_sv_ready_hook_helper (void)
1869{
1870 dTHX;
1871 dSP;
1872
1873 ENTER;
1874 SAVETMPS;
1875
1876 PUSHMARK (SP);
1877 PUTBACK;
1878 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1879
1880 FREETMPS;
1881 LEAVE;
1600} 1882}
1601 1883
1602static int 1884static int
1603api_ready (pTHX_ SV *coro_sv) 1885api_ready (pTHX_ SV *coro_sv)
1604{ 1886{
1605 struct coro *coro;
1606 SV *sv_hook;
1607 void (*xs_hook)(void);
1608
1609 coro = SvSTATE (coro_sv); 1887 struct coro *coro = SvSTATE (coro_sv);
1610 1888
1611 if (coro->flags & CF_READY) 1889 if (coro->flags & CF_READY)
1612 return 0; 1890 return 0;
1613 1891
1614 coro->flags |= CF_READY; 1892 coro->flags |= CF_READY;
1615 1893
1616 sv_hook = coro_nready ? 0 : coro_readyhook;
1617 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1618
1619 coro_enq (aTHX_ coro); 1894 coro_enq (aTHX_ coro);
1620 ++coro_nready;
1621 1895
1622 if (sv_hook) 1896 if (!coro_nready++)
1623 { 1897 if (coroapi.readyhook)
1624 dSP; 1898 coroapi.readyhook ();
1625
1626 ENTER;
1627 SAVETMPS;
1628
1629 PUSHMARK (SP);
1630 PUTBACK;
1631 call_sv (sv_hook, G_VOID | G_DISCARD);
1632
1633 FREETMPS;
1634 LEAVE;
1635 }
1636
1637 if (xs_hook)
1638 xs_hook ();
1639 1899
1640 return 1; 1900 return 1;
1641} 1901}
1642 1902
1643static int 1903static int
… …
1645{ 1905{
1646 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1906 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1647} 1907}
1648 1908
1649/* expects to own a reference to next->hv */ 1909/* expects to own a reference to next->hv */
1650INLINE void 1910ecb_inline void
1651prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1911prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1652{ 1912{
1653 SV *prev_sv = SvRV (coro_current); 1913 SV *prev_sv = SvRV (coro_current);
1654 1914
1655 ta->prev = SvSTATE_hv (prev_sv); 1915 ta->prev = SvSTATE_hv (prev_sv);
… …
1666static void 1926static void
1667prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1927prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1668{ 1928{
1669 for (;;) 1929 for (;;)
1670 { 1930 {
1671 SV *next_sv = coro_deq (aTHX); 1931 struct coro *next = coro_deq (aTHX);
1672 1932
1673 if (expect_true (next_sv)) 1933 if (ecb_expect_true (next))
1674 { 1934 {
1675 struct coro *next = SvSTATE_hv (next_sv);
1676
1677 /* cannot transfer to destroyed coros, skip and look for next */ 1935 /* cannot transfer to destroyed coros, skip and look for next */
1678 if (expect_false (next->flags & CF_DESTROYED)) 1936 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1679 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1937 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1680 else 1938 else
1681 { 1939 {
1682 next->flags &= ~CF_READY; 1940 next->flags &= ~CF_READY;
1683 --coro_nready; 1941 --coro_nready;
1684 1942
… …
1690 { 1948 {
1691 /* nothing to schedule: call the idle handler */ 1949 /* nothing to schedule: call the idle handler */
1692 if (SvROK (sv_idle) 1950 if (SvROK (sv_idle)
1693 && SvOBJECT (SvRV (sv_idle))) 1951 && SvOBJECT (SvRV (sv_idle)))
1694 { 1952 {
1953 if (SvRV (sv_idle) == SvRV (coro_current))
1954 {
1955 require_pv ("Carp");
1956
1957 {
1958 dSP;
1959
1960 ENTER;
1961 SAVETMPS;
1962
1963 PUSHMARK (SP);
1964 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1965 PUTBACK;
1966 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1967
1968 FREETMPS;
1969 LEAVE;
1970 }
1971 }
1972
1695 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1973 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1696 api_ready (aTHX_ SvRV (sv_idle)); 1974 api_ready (aTHX_ SvRV (sv_idle));
1697 --coro_nready; 1975 --coro_nready;
1698 } 1976 }
1699 else 1977 else
1700 { 1978 {
1979 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1701 dSP; 1980 dSP;
1702 1981
1703 ENTER; 1982 ENTER;
1704 SAVETMPS; 1983 SAVETMPS;
1705 1984
… …
1712 } 1991 }
1713 } 1992 }
1714 } 1993 }
1715} 1994}
1716 1995
1717INLINE void 1996ecb_inline void
1718prepare_cede (pTHX_ struct coro_transfer_args *ta) 1997prepare_cede (pTHX_ struct coro_transfer_args *ta)
1719{ 1998{
1720 api_ready (aTHX_ coro_current); 1999 api_ready (aTHX_ coro_current);
1721 prepare_schedule (aTHX_ ta); 2000 prepare_schedule (aTHX_ ta);
1722} 2001}
1723 2002
1724INLINE void 2003ecb_inline void
1725prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2004prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1726{ 2005{
1727 SV *prev = SvRV (coro_current); 2006 SV *prev = SvRV (coro_current);
1728 2007
1729 if (coro_nready) 2008 if (coro_nready)
… …
1759{ 2038{
1760 struct coro_transfer_args ta; 2039 struct coro_transfer_args ta;
1761 2040
1762 prepare_cede (aTHX_ &ta); 2041 prepare_cede (aTHX_ &ta);
1763 2042
1764 if (expect_true (ta.prev != ta.next)) 2043 if (ecb_expect_true (ta.prev != ta.next))
1765 { 2044 {
1766 TRANSFER (ta, 1); 2045 TRANSFER (ta, 1);
1767 return 1; 2046 return 1;
1768 } 2047 }
1769 else 2048 else
… …
1812 coro->slot->runops = RUNOPS_DEFAULT; 2091 coro->slot->runops = RUNOPS_DEFAULT;
1813 } 2092 }
1814} 2093}
1815 2094
1816static void 2095static void
2096coro_push_av (pTHX_ AV *av, I32 gimme_v)
2097{
2098 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2099 {
2100 dSP;
2101
2102 if (gimme_v == G_SCALAR)
2103 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2104 else
2105 {
2106 int i;
2107 EXTEND (SP, AvFILLp (av) + 1);
2108
2109 for (i = 0; i <= AvFILLp (av); ++i)
2110 PUSHs (AvARRAY (av)[i]);
2111 }
2112
2113 PUTBACK;
2114 }
2115}
2116
2117static void
2118coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2119{
2120 if (!coro->on_destroy)
2121 coro->on_destroy = newAV ();
2122
2123 av_push (coro->on_destroy, cb);
2124}
2125
2126static void
2127slf_destroy_join (pTHX_ struct CoroSLF *frame)
2128{
2129 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2130}
2131
2132static int
2133slf_check_join (pTHX_ struct CoroSLF *frame)
2134{
2135 struct coro *coro = (struct coro *)frame->data;
2136
2137 if (!coro->status)
2138 return 1;
2139
2140 frame->destroy = 0;
2141
2142 coro_push_av (aTHX_ coro->status, GIMME_V);
2143
2144 SvREFCNT_dec ((SV *)coro->hv);
2145
2146 return 0;
2147}
2148
2149static void
2150slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2151{
2152 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2153
2154 if (items > 1)
2155 croak ("join called with too many arguments");
2156
2157 if (coro->status)
2158 frame->prepare = prepare_nop;
2159 else
2160 {
2161 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2162 frame->prepare = prepare_schedule;
2163 }
2164
2165 frame->check = slf_check_join;
2166 frame->destroy = slf_destroy_join;
2167 frame->data = (void *)coro;
2168 SvREFCNT_inc (coro->hv);
2169}
2170
2171static void
1817coro_call_on_destroy (pTHX_ struct coro *coro) 2172coro_call_on_destroy (pTHX_ struct coro *coro)
1818{ 2173{
1819 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2174 AV *od = coro->on_destroy;
1820 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1821 2175
1822 if (on_destroyp) 2176 if (!od)
1823 { 2177 return;
1824 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1825 2178
2179 coro->on_destroy = 0;
2180 sv_2mortal ((SV *)od);
2181
1826 while (AvFILLp (on_destroy) >= 0) 2182 while (AvFILLp (od) >= 0)
2183 {
2184 SV *cb = sv_2mortal (av_pop (od));
2185
2186 /* coro hv's (and only hv's at the moment) are supported as well */
2187 if (SvSTATEhv_p (aTHX_ cb))
2188 api_ready (aTHX_ cb);
2189 else
1827 { 2190 {
1828 dSP; /* don't disturb outer sp */ 2191 dSP; /* don't disturb outer sp */
1829 SV *cb = av_pop (on_destroy);
1830
1831 PUSHMARK (SP); 2192 PUSHMARK (SP);
1832 2193
1833 if (statusp) 2194 if (coro->status)
1834 { 2195 {
1835 int i; 2196 PUTBACK;
1836 AV *status = (AV *)SvRV (*statusp); 2197 coro_push_av (aTHX_ coro->status, G_ARRAY);
1837 EXTEND (SP, AvFILLp (status) + 1); 2198 SPAGAIN;
1838
1839 for (i = 0; i <= AvFILLp (status); ++i)
1840 PUSHs (AvARRAY (status)[i]);
1841 } 2199 }
1842 2200
1843 PUTBACK; 2201 PUTBACK;
1844 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2202 call_sv (cb, G_VOID | G_DISCARD);
1845 } 2203 }
1846 } 2204 }
1847} 2205}
1848 2206
1849static void 2207static void
1850slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2208coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1851{ 2209{
2210 AV *av;
2211
2212 if (coro->status)
2213 {
2214 av = coro->status;
2215 av_clear (av);
2216 }
2217 else
2218 av = coro->status = newAV ();
2219
2220 /* items are actually not so common, so optimise for this case */
2221 if (items)
2222 {
1852 int i; 2223 int i;
1853 HV *hv = (HV *)SvRV (coro_current);
1854 AV *av = newAV ();
1855 2224
1856 av_extend (av, items - 1); 2225 av_extend (av, items - 1);
2226
1857 for (i = 0; i < items; ++i) 2227 for (i = 0; i < items; ++i)
1858 av_push (av, SvREFCNT_inc_NN (arg [i])); 2228 av_push (av, SvREFCNT_inc_NN (arg [i]));
2229 }
2230}
1859 2231
1860 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2232static void
1861 2233slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2234{
1862 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2235 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1863 api_ready (aTHX_ sv_manager); 2236 api_ready (aTHX_ sv_manager);
1864 2237
1865 frame->prepare = prepare_schedule; 2238 frame->prepare = prepare_schedule;
1866 frame->check = slf_check_repeat; 2239 frame->check = slf_check_repeat;
2240
2241 /* as a minor optimisation, we could unwind all stacks here */
2242 /* but that puts extra pressure on pp_slf, and is not worth much */
2243 /*coro_unwind_stacks (aTHX);*/
2244}
2245
2246static void
2247slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2248{
2249 HV *coro_hv = (HV *)SvRV (coro_current);
2250
2251 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2252 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2253}
2254
2255static void
2256slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2257{
2258 HV *coro_hv;
2259 struct coro *coro;
2260
2261 if (items <= 0)
2262 croak ("Coro::cancel called without coro object,");
2263
2264 coro = SvSTATE (arg [0]);
2265 coro_hv = coro->hv;
2266
2267 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2268
2269 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2270 {
2271 /* coro currently busy cancelling something, so just notify it */
2272 coro->slf_frame.data = (void *)coro;
2273
2274 frame->prepare = prepare_nop;
2275 frame->check = slf_check_nop;
2276 }
2277 else if (coro_hv == (HV *)SvRV (coro_current))
2278 {
2279 /* cancelling the current coro is allowed, and equals terminate */
2280 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2281 }
2282 else
2283 {
2284 struct coro *self = SvSTATE_current;
2285
2286 if (!self)
2287 croak ("Coro::cancel called outside of thread content,");
2288
2289 /* otherwise we cancel directly, purely for speed reasons
2290 * unfortunately, this requires some magic trickery, as
2291 * somebody else could cancel us, so we have to fight the cancellation.
2292 * this is ugly, and hopefully fully worth the extra speed.
2293 * besides, I can't get the slow-but-safe version working...
2294 */
2295 slf_frame.data = 0;
2296 self->flags |= CF_NOCANCEL;
2297 coro_state_destroy (aTHX_ coro);
2298 self->flags &= ~CF_NOCANCEL;
2299
2300 if (slf_frame.data)
2301 {
2302 /* while we were busy we have been cancelled, so terminate */
2303 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2304 }
2305 else
2306 {
2307 frame->prepare = prepare_nop;
2308 frame->check = slf_check_nop;
2309 }
2310 }
2311}
2312
2313static int
2314slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2315{
2316 frame->prepare = 0;
2317 coro_unwind_stacks (aTHX);
2318
2319 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2320
2321 return 1;
2322}
2323
2324static int
2325safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2326{
2327 if (coro->cctx)
2328 croak ("coro inside C callback, unable to cancel at this time, caught");
2329
2330 if (coro->flags & CF_NEW)
2331 {
2332 coro_set_status (aTHX_ coro, arg, items);
2333 coro_state_destroy (aTHX_ coro);
2334 }
2335 else
2336 {
2337 if (!coro->slf_frame.prepare)
2338 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2339
2340 slf_destroy (aTHX_ coro);
2341
2342 coro_set_status (aTHX_ coro, arg, items);
2343 coro->slf_frame.prepare = prepare_nop;
2344 coro->slf_frame.check = slf_check_safe_cancel;
2345
2346 api_ready (aTHX_ (SV *)coro->hv);
2347 }
2348
2349 return 1;
1867} 2350}
1868 2351
1869/*****************************************************************************/ 2352/*****************************************************************************/
1870/* async pool handler */ 2353/* async pool handler */
1871 2354
… …
1902slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2385slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1903{ 2386{
1904 HV *hv = (HV *)SvRV (coro_current); 2387 HV *hv = (HV *)SvRV (coro_current);
1905 struct coro *coro = SvSTATE_hv ((SV *)hv); 2388 struct coro *coro = SvSTATE_hv ((SV *)hv);
1906 2389
1907 if (expect_true (coro->saved_deffh)) 2390 if (ecb_expect_true (coro->saved_deffh))
1908 { 2391 {
1909 /* subsequent iteration */ 2392 /* subsequent iteration */
1910 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2393 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1911 coro->saved_deffh = 0; 2394 coro->saved_deffh = 0;
1912 2395
1913 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2396 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1914 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2397 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1915 { 2398 {
1916 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2399 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1917 coro->invoke_av = newAV (); 2400 return;
1918
1919 frame->prepare = prepare_nop;
1920 } 2401 }
1921 else 2402 else
1922 { 2403 {
1923 av_clear (GvAV (PL_defgv)); 2404 av_clear (GvAV (PL_defgv));
1924 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2405 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
1949 2430
1950static void 2431static void
1951coro_rouse_callback (pTHX_ CV *cv) 2432coro_rouse_callback (pTHX_ CV *cv)
1952{ 2433{
1953 dXSARGS; 2434 dXSARGS;
1954 SV *data = (SV *)GENSUB_ARG; 2435 SV *data = (SV *)S_GENSUB_ARG;
1955 2436
1956 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2437 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1957 { 2438 {
1958 /* first call, set args */ 2439 /* first call, set args */
2440 SV *coro = SvRV (data);
1959 AV *av = newAV (); 2441 AV *av = newAV ();
1960 SV *coro = SvRV (data);
1961 2442
1962 SvRV_set (data, (SV *)av); 2443 SvRV_set (data, (SV *)av);
1963 api_ready (aTHX_ coro);
1964 SvREFCNT_dec (coro);
1965 2444
1966 /* better take a full copy of the arguments */ 2445 /* better take a full copy of the arguments */
1967 while (items--) 2446 while (items--)
1968 av_store (av, items, newSVsv (ST (items))); 2447 av_store (av, items, newSVsv (ST (items)));
2448
2449 api_ready (aTHX_ coro);
2450 SvREFCNT_dec (coro);
1969 } 2451 }
1970 2452
1971 XSRETURN_EMPTY; 2453 XSRETURN_EMPTY;
1972} 2454}
1973 2455
1974static int 2456static int
1975slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2457slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
1976{ 2458{
1977 SV *data = (SV *)frame->data; 2459 SV *data = (SV *)frame->data;
1978 2460
1979 if (CORO_THROW) 2461 if (CORO_THROW)
1980 return 0; 2462 return 0;
1981 2463
1982 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2464 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1983 return 1; 2465 return 1;
… …
1990 2472
1991 EXTEND (SP, AvFILLp (av) + 1); 2473 EXTEND (SP, AvFILLp (av) + 1);
1992 for (i = 0; i <= AvFILLp (av); ++i) 2474 for (i = 0; i <= AvFILLp (av); ++i)
1993 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2475 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1994 2476
1995 /* we have stolen the elements, so ste length to zero and free */ 2477 /* we have stolen the elements, so set length to zero and free */
1996 AvFILLp (av) = -1; 2478 AvFILLp (av) = -1;
1997 av_undef (av); 2479 av_undef (av);
1998 2480
1999 PUTBACK; 2481 PUTBACK;
2000 } 2482 }
… …
2019 cb = sv_2mortal (coro->rouse_cb); 2501 cb = sv_2mortal (coro->rouse_cb);
2020 coro->rouse_cb = 0; 2502 coro->rouse_cb = 0;
2021 } 2503 }
2022 2504
2023 if (!SvROK (cb) 2505 if (!SvROK (cb)
2024 || SvTYPE (SvRV (cb)) != SVt_PVCV 2506 || SvTYPE (SvRV (cb)) != SVt_PVCV
2025 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2507 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2026 croak ("Coro::rouse_wait called with illegal callback argument,"); 2508 croak ("Coro::rouse_wait called with illegal callback argument,");
2027 2509
2028 { 2510 {
2029 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2511 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2030 SV *data = (SV *)GENSUB_ARG; 2512 SV *data = (SV *)S_GENSUB_ARG;
2031 2513
2032 frame->data = (void *)data; 2514 frame->data = (void *)data;
2033 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2515 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2034 frame->check = slf_check_rouse_wait; 2516 frame->check = slf_check_rouse_wait;
2035 } 2517 }
… …
2039coro_new_rouse_cb (pTHX) 2521coro_new_rouse_cb (pTHX)
2040{ 2522{
2041 HV *hv = (HV *)SvRV (coro_current); 2523 HV *hv = (HV *)SvRV (coro_current);
2042 struct coro *coro = SvSTATE_hv (hv); 2524 struct coro *coro = SvSTATE_hv (hv);
2043 SV *data = newRV_inc ((SV *)hv); 2525 SV *data = newRV_inc ((SV *)hv);
2044 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2526 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2045 2527
2046 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2528 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2047 SvREFCNT_dec (data); /* magicext increases the refcount */ 2529 SvREFCNT_dec (data); /* magicext increases the refcount */
2048 2530
2049 SvREFCNT_dec (coro->rouse_cb); 2531 SvREFCNT_dec (coro->rouse_cb);
… …
2146static void 2628static void
2147slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2629slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2148{ 2630{
2149 frame->prepare = prepare_cede_notself; 2631 frame->prepare = prepare_cede_notself;
2150 frame->check = slf_check_nop; 2632 frame->check = slf_check_nop;
2633}
2634
2635/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2636static void
2637slf_destroy (pTHX_ struct coro *coro)
2638{
2639 struct CoroSLF frame = coro->slf_frame;
2640
2641 /*
2642 * The on_destroy below most likely is from an SLF call.
2643 * Since by definition the SLF call will not finish when we destroy
2644 * the coro, we will have to force-finish it here, otherwise
2645 * cleanup functions cannot call SLF functions.
2646 */
2647 coro->slf_frame.prepare = 0;
2648
2649 /* this callback is reserved for slf functions needing to do cleanup */
2650 if (frame.destroy && frame.prepare && !PL_dirty)
2651 frame.destroy (aTHX_ &frame);
2151} 2652}
2152 2653
2153/* 2654/*
2154 * these not obviously related functions are all rolled into one 2655 * these not obviously related functions are all rolled into one
2155 * function to increase chances that they all will call transfer with the same 2656 * function to increase chances that they all will call transfer with the same
… …
2162 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2663 I32 checkmark; /* mark SP to see how many elements check has pushed */
2163 2664
2164 /* set up the slf frame, unless it has already been set-up */ 2665 /* set up the slf frame, unless it has already been set-up */
2165 /* the latter happens when a new coro has been started */ 2666 /* the latter happens when a new coro has been started */
2166 /* or when a new cctx was attached to an existing coroutine */ 2667 /* or when a new cctx was attached to an existing coroutine */
2167 if (expect_true (!slf_frame.prepare)) 2668 if (ecb_expect_true (!slf_frame.prepare))
2168 { 2669 {
2169 /* first iteration */ 2670 /* first iteration */
2170 dSP; 2671 dSP;
2171 SV **arg = PL_stack_base + TOPMARK + 1; 2672 SV **arg = PL_stack_base + TOPMARK + 1;
2172 int items = SP - arg; /* args without function object */ 2673 int items = SP - arg; /* args without function object */
… …
2213 while (slf_frame.check (aTHX_ &slf_frame)); 2714 while (slf_frame.check (aTHX_ &slf_frame));
2214 2715
2215 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2716 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2216 2717
2217 /* exception handling */ 2718 /* exception handling */
2218 if (expect_false (CORO_THROW)) 2719 if (ecb_expect_false (CORO_THROW))
2219 { 2720 {
2220 SV *exception = sv_2mortal (CORO_THROW); 2721 SV *exception = sv_2mortal (CORO_THROW);
2221 2722
2222 CORO_THROW = 0; 2723 CORO_THROW = 0;
2223 sv_setsv (ERRSV, exception); 2724 sv_setsv (ERRSV, exception);
2224 croak (0); 2725 croak (0);
2225 } 2726 }
2226 2727
2227 /* return value handling - mostly like entersub */ 2728 /* return value handling - mostly like entersub */
2228 /* make sure we put something on the stack in scalar context */ 2729 /* make sure we put something on the stack in scalar context */
2229 if (GIMME_V == G_SCALAR) 2730 if (GIMME_V == G_SCALAR
2731 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2230 { 2732 {
2231 dSP; 2733 dSP;
2232 SV **bot = PL_stack_base + checkmark; 2734 SV **bot = PL_stack_base + checkmark;
2233 2735
2234 if (sp == bot) /* too few, push undef */ 2736 if (sp == bot) /* too few, push undef */
2235 bot [1] = &PL_sv_undef; 2737 bot [1] = &PL_sv_undef;
2236 else if (sp != bot + 1) /* too many, take last one */ 2738 else /* too many, take last one */
2237 bot [1] = *sp; 2739 bot [1] = *sp;
2238 2740
2239 SP = bot + 1; 2741 SP = bot + 1;
2240 2742
2241 PUTBACK; 2743 PUTBACK;
… …
2274 if (PL_op->op_flags & OPf_STACKED) 2776 if (PL_op->op_flags & OPf_STACKED)
2275 { 2777 {
2276 if (items > slf_arga) 2778 if (items > slf_arga)
2277 { 2779 {
2278 slf_arga = items; 2780 slf_arga = items;
2279 free (slf_argv); 2781 Safefree (slf_argv);
2280 slf_argv = malloc (slf_arga * sizeof (SV *)); 2782 New (0, slf_argv, slf_arga, SV *);
2281 } 2783 }
2282 2784
2283 slf_argc = items; 2785 slf_argc = items;
2284 2786
2285 for (i = 0; i < items; ++i) 2787 for (i = 0; i < items; ++i)
… …
2290 2792
2291 PL_op->op_ppaddr = pp_slf; 2793 PL_op->op_ppaddr = pp_slf;
2292 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2794 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2293 2795
2294 PL_op = (OP *)&slf_restore; 2796 PL_op = (OP *)&slf_restore;
2797}
2798
2799/*****************************************************************************/
2800/* dynamic wind */
2801
2802static void
2803on_enterleave_call (pTHX_ SV *cb)
2804{
2805 dSP;
2806
2807 PUSHSTACK;
2808
2809 PUSHMARK (SP);
2810 PUTBACK;
2811 call_sv (cb, G_VOID | G_DISCARD);
2812 SPAGAIN;
2813
2814 POPSTACK;
2815}
2816
2817static SV *
2818coro_avp_pop_and_free (pTHX_ AV **avp)
2819{
2820 AV *av = *avp;
2821 SV *res = av_pop (av);
2822
2823 if (AvFILLp (av) < 0)
2824 {
2825 *avp = 0;
2826 SvREFCNT_dec (av);
2827 }
2828
2829 return res;
2830}
2831
2832static void
2833coro_pop_on_enter (pTHX_ void *coro)
2834{
2835 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2836 SvREFCNT_dec (cb);
2837}
2838
2839static void
2840coro_pop_on_leave (pTHX_ void *coro)
2841{
2842 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2843 on_enterleave_call (aTHX_ sv_2mortal (cb));
2844}
2845
2846static void
2847enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2848{
2849 if (!hook)
2850 return;
2851
2852 if (!*avp)
2853 {
2854 *avp = newAV ();
2855 AvREAL_off (*avp);
2856 }
2857
2858 av_push (*avp, (SV *)hook);
2859 av_push (*avp, (SV *)arg);
2860}
2861
2862static void
2863enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2864{
2865 AV *av = *avp;
2866 int i;
2867
2868 if (!av)
2869 return;
2870
2871 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2872 if (AvARRAY (av)[i] == (SV *)hook)
2873 {
2874 if (execute)
2875 hook ((void *)AvARRAY (av)[i + 1]);
2876
2877 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2878 av_pop (av);
2879 av_pop (av);
2880 break;
2881 }
2882
2883 if (AvFILLp (av) >= 0)
2884 {
2885 *avp = 0;
2886 SvREFCNT_dec_NN (av);
2887 }
2888}
2889
2890static void
2891api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2892{
2893 struct coro *coro = SvSTATE (coro_sv);
2894
2895 if (SvSTATE_current == coro)
2896 if (enter)
2897 enter (aTHX enter_arg);
2898
2899 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2900 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2901}
2902
2903static void
2904api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2905{
2906 struct coro *coro = SvSTATE (coro_sv);
2907
2908 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2909 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2910}
2911
2912static void
2913savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2914{
2915 struct coro *coro = SvSTATE_current;
2916
2917 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2918}
2919
2920static void
2921savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2922{
2923 struct coro *coro = SvSTATE_current;
2924
2925 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2926}
2927
2928static void
2929api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2930{
2931 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2932
2933 /* this ought to be much cheaper than malloc + a single destructor call */
2934 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2935 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2295} 2936}
2296 2937
2297/*****************************************************************************/ 2938/*****************************************************************************/
2298/* PerlIO::cede */ 2939/* PerlIO::cede */
2299 2940
… …
2301{ 2942{
2302 PerlIOBuf base; 2943 PerlIOBuf base;
2303 NV next, every; 2944 NV next, every;
2304} PerlIOCede; 2945} PerlIOCede;
2305 2946
2306static IV 2947static IV ecb_cold
2307PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2948PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2308{ 2949{
2309 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2950 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2310 2951
2311 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2952 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2312 self->next = nvtime () + self->every; 2953 self->next = nvtime () + self->every;
2313 2954
2314 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2955 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2315} 2956}
2316 2957
2317static SV * 2958static SV * ecb_cold
2318PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2959PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2319{ 2960{
2320 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2961 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2321 2962
2322 return newSVnv (self->every); 2963 return newSVnv (self->every);
… …
2373/* Coro::Semaphore & Coro::Signal */ 3014/* Coro::Semaphore & Coro::Signal */
2374 3015
2375static SV * 3016static SV *
2376coro_waitarray_new (pTHX_ int count) 3017coro_waitarray_new (pTHX_ int count)
2377{ 3018{
2378 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3019 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2379 AV *av = newAV (); 3020 AV *av = newAV ();
2380 SV **ary; 3021 SV **ary;
2381 3022
2382 /* unfortunately, building manually saves memory */ 3023 /* unfortunately, building manually saves memory */
2383 Newx (ary, 2, SV *); 3024 Newx (ary, 2, SV *);
… …
2429 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3070 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2430 PUTBACK; 3071 PUTBACK;
2431 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3072 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2432 } 3073 }
2433 3074
2434 SvREFCNT_dec (cb); 3075 SvREFCNT_dec_NN (cb);
2435 } 3076 }
2436} 3077}
2437 3078
2438static void 3079static void
2439coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3080coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2440{ 3081{
2441 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3082 /* call $sem->adjust (0) to possibly wake up some other waiters */
2442 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3083 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2443} 3084}
2444 3085
2445static int 3086static int
2446slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3087slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2447{ 3088{
2448 AV *av = (AV *)frame->data; 3089 AV *av = (AV *)frame->data;
2449 SV *count_sv = AvARRAY (av)[0]; 3090 SV *count_sv = AvARRAY (av)[0];
3091 SV *coro_hv = SvRV (coro_current);
3092
3093 frame->destroy = 0;
2450 3094
2451 /* if we are about to throw, don't actually acquire the lock, just throw */ 3095 /* if we are about to throw, don't actually acquire the lock, just throw */
2452 if (CORO_THROW) 3096 if (ecb_expect_false (CORO_THROW))
3097 {
3098 /* we still might be responsible for the semaphore, so wake up others */
3099 coro_semaphore_adjust (aTHX_ av, 0);
3100
2453 return 0; 3101 return 0;
3102 }
2454 else if (SvIVX (count_sv) > 0) 3103 else if (SvIVX (count_sv) > 0)
2455 { 3104 {
2456 SvSTATE_current->on_destroy = 0;
2457
2458 if (acquire) 3105 if (acquire)
2459 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3106 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2460 else 3107 else
2461 coro_semaphore_adjust (aTHX_ av, 0); 3108 coro_semaphore_adjust (aTHX_ av, 0);
2462 3109
… …
2466 { 3113 {
2467 int i; 3114 int i;
2468 /* if we were woken up but can't down, we look through the whole */ 3115 /* if we were woken up but can't down, we look through the whole */
2469 /* waiters list and only add us if we aren't in there already */ 3116 /* waiters list and only add us if we aren't in there already */
2470 /* this avoids some degenerate memory usage cases */ 3117 /* this avoids some degenerate memory usage cases */
2471 3118 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2472 for (i = 1; i <= AvFILLp (av); ++i)
2473 if (AvARRAY (av)[i] == SvRV (coro_current)) 3119 if (AvARRAY (av)[i] == coro_hv)
2474 return 1; 3120 return 1;
2475 3121
2476 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3122 av_push (av, SvREFCNT_inc (coro_hv));
2477 return 1; 3123 return 1;
2478 } 3124 }
2479} 3125}
2480 3126
2481static int 3127static int
… …
2504 { 3150 {
2505 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3151 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2506 3152
2507 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3153 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2508 frame->prepare = prepare_schedule; 3154 frame->prepare = prepare_schedule;
2509
2510 /* to avoid race conditions when a woken-up coro gets terminated */ 3155 /* to avoid race conditions when a woken-up coro gets terminated */
2511 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3156 /* we arrange for a temporary on_destroy that calls adjust (0) */
2512 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3157 frame->destroy = coro_semaphore_destroy;
2513 } 3158 }
2514} 3159}
2515 3160
2516static void 3161static void
2517slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3162slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2525{ 3170{
2526 if (items >= 2) 3171 if (items >= 2)
2527 { 3172 {
2528 /* callback form */ 3173 /* callback form */
2529 AV *av = (AV *)SvRV (arg [0]); 3174 AV *av = (AV *)SvRV (arg [0]);
2530 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3175 SV *cb_cv = s_get_cv_croak (arg [1]);
2531 3176
2532 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3177 av_push (av, SvREFCNT_inc_NN (cb_cv));
2533 3178
2534 if (SvIVX (AvARRAY (av)[0]) > 0) 3179 if (SvIVX (AvARRAY (av)[0]) > 0)
2535 coro_semaphore_adjust (aTHX_ av, 0); 3180 coro_semaphore_adjust (aTHX_ av, 0);
2536 3181
2537 frame->prepare = prepare_nop; 3182 frame->prepare = prepare_nop;
… …
2561 AvARRAY (av)[0] = AvARRAY (av)[1]; 3206 AvARRAY (av)[0] = AvARRAY (av)[1];
2562 AvARRAY (av)[1] = cb; 3207 AvARRAY (av)[1] = cb;
2563 3208
2564 cb = av_shift (av); 3209 cb = av_shift (av);
2565 3210
3211 if (SvTYPE (cb) == SVt_PVCV)
3212 {
3213 dSP;
3214 PUSHMARK (SP);
3215 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3216 PUTBACK;
3217 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3218 }
3219 else
3220 {
2566 api_ready (aTHX_ cb); 3221 api_ready (aTHX_ cb);
2567 sv_setiv (cb, 0); /* signal waiter */ 3222 sv_setiv (cb, 0); /* signal waiter */
3223 }
3224
2568 SvREFCNT_dec (cb); 3225 SvREFCNT_dec_NN (cb);
2569 3226
2570 --count; 3227 --count;
2571 } 3228 }
2572} 3229}
2573 3230
… …
2581static void 3238static void
2582slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3239slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2583{ 3240{
2584 AV *av = (AV *)SvRV (arg [0]); 3241 AV *av = (AV *)SvRV (arg [0]);
2585 3242
3243 if (items >= 2)
3244 {
3245 SV *cb_cv = s_get_cv_croak (arg [1]);
3246 av_push (av, SvREFCNT_inc_NN (cb_cv));
3247
2586 if (SvIVX (AvARRAY (av)[0])) 3248 if (SvIVX (AvARRAY (av)[0]))
3249 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3250
3251 frame->prepare = prepare_nop;
3252 frame->check = slf_check_nop;
3253 }
3254 else if (SvIVX (AvARRAY (av)[0]))
2587 { 3255 {
2588 SvIVX (AvARRAY (av)[0]) = 0; 3256 SvIVX (AvARRAY (av)[0]) = 0;
2589 frame->prepare = prepare_nop; 3257 frame->prepare = prepare_nop;
2590 frame->check = slf_check_nop; 3258 frame->check = slf_check_nop;
2591 } 3259 }
2592 else 3260 else
2593 { 3261 {
2594 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3262 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2595 3263
2596 av_push (av, waiter); 3264 av_push (av, waiter);
2597 3265
2598 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3266 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2599 frame->prepare = prepare_schedule; 3267 frame->prepare = prepare_schedule;
… …
2617 3285
2618static void 3286static void
2619coro_aio_callback (pTHX_ CV *cv) 3287coro_aio_callback (pTHX_ CV *cv)
2620{ 3288{
2621 dXSARGS; 3289 dXSARGS;
2622 AV *state = (AV *)GENSUB_ARG; 3290 AV *state = (AV *)S_GENSUB_ARG;
2623 SV *coro = av_pop (state); 3291 SV *coro = av_pop (state);
2624 SV *data_sv = newSV (sizeof (struct io_state)); 3292 SV *data_sv = newSV (sizeof (struct io_state));
2625 3293
2626 av_extend (state, items - 1); 3294 av_extend (state, items - 1);
2627 3295
… …
2647 } 3315 }
2648 3316
2649 av_push (state, data_sv); 3317 av_push (state, data_sv);
2650 3318
2651 api_ready (aTHX_ coro); 3319 api_ready (aTHX_ coro);
2652 SvREFCNT_dec (coro); 3320 SvREFCNT_dec_NN (coro);
2653 SvREFCNT_dec ((AV *)state); 3321 SvREFCNT_dec_NN ((AV *)state);
2654} 3322}
2655 3323
2656static int 3324static int
2657slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3325slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2658{ 3326{
… …
2663 /* it quickly returns */ 3331 /* it quickly returns */
2664 if (CORO_THROW) 3332 if (CORO_THROW)
2665 return 0; 3333 return 0;
2666 3334
2667 /* one element that is an RV? repeat! */ 3335 /* one element that is an RV? repeat! */
2668 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3336 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2669 return 1; 3337 return 1;
2670 3338
2671 /* restore status */ 3339 /* restore status */
2672 { 3340 {
2673 SV *data_sv = av_pop (state); 3341 SV *data_sv = av_pop (state);
… …
2676 errno = data->errorno; 3344 errno = data->errorno;
2677 PL_laststype = data->laststype; 3345 PL_laststype = data->laststype;
2678 PL_laststatval = data->laststatval; 3346 PL_laststatval = data->laststatval;
2679 PL_statcache = data->statcache; 3347 PL_statcache = data->statcache;
2680 3348
2681 SvREFCNT_dec (data_sv); 3349 SvREFCNT_dec_NN (data_sv);
2682 } 3350 }
2683 3351
2684 /* push result values */ 3352 /* push result values */
2685 { 3353 {
2686 dSP; 3354 dSP;
… …
2712 dSP; 3380 dSP;
2713 3381
2714 static SV *prio_cv; 3382 static SV *prio_cv;
2715 static SV *prio_sv; 3383 static SV *prio_sv;
2716 3384
2717 if (expect_false (!prio_cv)) 3385 if (ecb_expect_false (!prio_cv))
2718 { 3386 {
2719 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3387 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2720 prio_sv = newSViv (0); 3388 prio_sv = newSViv (0);
2721 } 3389 }
2722 3390
… …
2741 3409
2742 for (i = 0; i < items; ++i) 3410 for (i = 0; i < items; ++i)
2743 PUSHs (arg [i]); 3411 PUSHs (arg [i]);
2744 3412
2745 /* now push the callback closure */ 3413 /* now push the callback closure */
2746 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3414 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2747 3415
2748 /* now call the AIO function - we assume our request is uncancelable */ 3416 /* now call the AIO function - we assume our request is uncancelable */
2749 PUTBACK; 3417 PUTBACK;
2750 call_sv ((SV *)req, G_VOID | G_DISCARD); 3418 call_sv ((SV *)req, G_VOID | G_DISCARD);
2751 } 3419 }
2752 3420
2753 /* now that the requets is going, we loop toll we have a result */ 3421 /* now that the request is going, we loop till we have a result */
2754 frame->data = (void *)state; 3422 frame->data = (void *)state;
2755 frame->prepare = prepare_schedule; 3423 frame->prepare = prepare_schedule;
2756 frame->check = slf_check_aio_req; 3424 frame->check = slf_check_aio_req;
2757} 3425}
2758 3426
… …
2770 3438
2771#if CORO_CLONE 3439#if CORO_CLONE
2772# include "clone.c" 3440# include "clone.c"
2773#endif 3441#endif
2774 3442
3443/*****************************************************************************/
3444
3445static SV *
3446coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3447{
3448 SV *coro_sv;
3449 struct coro *coro;
3450 MAGIC *mg;
3451 HV *hv;
3452 SV *cb;
3453 int i;
3454
3455 if (argc > 0)
3456 {
3457 cb = s_get_cv_croak (argv [0]);
3458
3459 if (!is_coro)
3460 {
3461 if (CvISXSUB (cb))
3462 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3463
3464 if (!CvROOT (cb))
3465 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3466 }
3467 }
3468
3469 Newz (0, coro, 1, struct coro);
3470 coro->args = newAV ();
3471 coro->flags = CF_NEW;
3472
3473 if (coro_first) coro_first->prev = coro;
3474 coro->next = coro_first;
3475 coro_first = coro;
3476
3477 coro->hv = hv = newHV ();
3478 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3479 mg->mg_flags |= MGf_DUP;
3480 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3481
3482 if (argc > 0)
3483 {
3484 av_extend (coro->args, argc + is_coro - 1);
3485
3486 if (is_coro)
3487 {
3488 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3489 cb = (SV *)cv_coro_run;
3490 }
3491
3492 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3493
3494 for (i = 1; i < argc; i++)
3495 av_push (coro->args, newSVsv (argv [i]));
3496 }
3497
3498 return coro_sv;
3499}
3500
3501#ifndef __cplusplus
3502ecb_cold XS(boot_Coro__State);
3503#endif
3504
3505#if CORO_JIT
3506
3507static void ecb_noinline ecb_cold
3508pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3509{
3510 dSP;
3511 AV *av = newAV ();
3512
3513 av_store (av, 3, newSVuv (d));
3514 av_store (av, 2, newSVuv (c));
3515 av_store (av, 1, newSVuv (b));
3516 av_store (av, 0, newSVuv (a));
3517
3518 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3519
3520 PUTBACK;
3521}
3522
3523static void ecb_noinline ecb_cold
3524jit_init (pTHX)
3525{
3526 dSP;
3527 SV *load, *save;
3528 char *map_base;
3529 char *load_ptr, *save_ptr;
3530 STRLEN load_len, save_len, map_len;
3531 int count;
3532
3533 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3534
3535 PUSHMARK (SP);
3536 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3537 #include "state.h"
3538 count = call_pv ("Coro::State::_jit", G_ARRAY);
3539 SPAGAIN;
3540
3541 save = POPs; save_ptr = SvPVbyte (save, save_len);
3542 load = POPs; load_ptr = SvPVbyte (load, load_len);
3543
3544 map_len = load_len + save_len + 16;
3545
3546 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3547
3548 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3549
3550 load_perl_slots = (load_save_perl_slots_type)map_base;
3551 memcpy (map_base, load_ptr, load_len);
3552
3553 map_base += (load_len + 15) & ~15;
3554
3555 save_perl_slots = (load_save_perl_slots_type)map_base;
3556 memcpy (map_base, save_ptr, save_len);
3557
3558 /* we are good citizens and try to make the page read-only, so the evil evil */
3559 /* hackers might have it a bit more difficult */
3560 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3561
3562 PUTBACK;
3563 eval_pv ("undef &Coro::State::_jit", 1);
3564}
3565
3566#endif
3567
2775MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3568MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2776 3569
2777PROTOTYPES: DISABLE 3570PROTOTYPES: DISABLE
2778 3571
2779BOOT: 3572BOOT:
2780{ 3573{
3574#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3575#include "state.h"
2781#ifdef USE_ITHREADS 3576#ifdef USE_ITHREADS
2782# if CORO_PTHREAD 3577# if CORO_PTHREAD
2783 coro_thx = PERL_GET_CONTEXT; 3578 coro_thx = PERL_GET_CONTEXT;
2784# endif 3579# endif
2785#endif 3580#endif
2786 BOOT_PAGESIZE; 3581 /* perl defines these to check for existance first, but why it doesn't */
3582 /* just create them one at init time is not clear to me, except for */
3583 /* programs trying to delete them, but... */
3584 /* anyway, we declare this as invalid and make sure they are initialised here */
3585 DEFSV;
3586 ERRSV;
2787 3587
2788 cctx_current = cctx_new_empty (); 3588 cctx_current = cctx_new_empty ();
2789 3589
2790 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3590 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2791 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3591 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2831 coroapi.prepare_nop = prepare_nop; 3631 coroapi.prepare_nop = prepare_nop;
2832 coroapi.prepare_schedule = prepare_schedule; 3632 coroapi.prepare_schedule = prepare_schedule;
2833 coroapi.prepare_cede = prepare_cede; 3633 coroapi.prepare_cede = prepare_cede;
2834 coroapi.prepare_cede_notself = prepare_cede_notself; 3634 coroapi.prepare_cede_notself = prepare_cede_notself;
2835 3635
2836 { 3636 time_init (aTHX);
2837 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2838 3637
2839 if (!svp) croak ("Time::HiRes is required");
2840 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2841
2842 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2843 }
2844
2845 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3638 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3639#if CORO_JIT
3640 PUTBACK;
3641 jit_init (aTHX);
3642 SPAGAIN;
3643#endif
2846} 3644}
2847 3645
2848SV * 3646SV *
2849new (char *klass, ...) 3647new (SV *klass, ...)
2850 ALIAS: 3648 ALIAS:
2851 Coro::new = 1 3649 Coro::new = 1
2852 CODE: 3650 CODE:
2853{ 3651 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2854 struct coro *coro; 3652 OUTPUT:
2855 MAGIC *mg;
2856 HV *hv;
2857 CV *cb;
2858 int i;
2859
2860 if (items > 1)
2861 {
2862 cb = coro_sv_2cv (aTHX_ ST (1));
2863
2864 if (!ix)
2865 {
2866 if (CvISXSUB (cb))
2867 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2868
2869 if (!CvROOT (cb))
2870 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2871 }
2872 }
2873
2874 Newz (0, coro, 1, struct coro);
2875 coro->args = newAV ();
2876 coro->flags = CF_NEW;
2877
2878 if (coro_first) coro_first->prev = coro;
2879 coro->next = coro_first;
2880 coro_first = coro;
2881
2882 coro->hv = hv = newHV ();
2883 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2884 mg->mg_flags |= MGf_DUP;
2885 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2886
2887 if (items > 1)
2888 {
2889 av_extend (coro->args, items - 1 + ix - 1);
2890
2891 if (ix)
2892 {
2893 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2894 cb = cv_coro_run;
2895 }
2896
2897 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2898
2899 for (i = 2; i < items; i++)
2900 av_push (coro->args, newSVsv (ST (i)));
2901 }
2902}
2903 OUTPUT:
2904 RETVAL 3653 RETVAL
2905 3654
2906void 3655void
2907transfer (...) 3656transfer (...)
2908 PROTOTYPE: $$ 3657 PROTOTYPE: $$
2909 CODE: 3658 CODE:
2910 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3659 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2911
2912bool
2913_destroy (SV *coro_sv)
2914 CODE:
2915 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2916 OUTPUT:
2917 RETVAL
2918
2919void
2920_exit (int code)
2921 PROTOTYPE: $
2922 CODE:
2923 _exit (code);
2924 3660
2925SV * 3661SV *
2926clone (Coro::State coro) 3662clone (Coro::State coro)
2927 CODE: 3663 CODE:
2928{ 3664{
… …
2983void 3719void
2984list () 3720list ()
2985 PROTOTYPE: 3721 PROTOTYPE:
2986 PPCODE: 3722 PPCODE:
2987{ 3723{
2988 struct coro *coro; 3724 struct coro *coro;
2989 for (coro = coro_first; coro; coro = coro->next) 3725 for (coro = coro_first; coro; coro = coro->next)
2990 if (coro->hv) 3726 if (coro->hv)
2991 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3727 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
2992} 3728}
2993 3729
… …
2997 eval = 1 3733 eval = 1
2998 CODE: 3734 CODE:
2999{ 3735{
3000 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3736 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3001 { 3737 {
3002 struct coro temp; 3738 struct coro *current = SvSTATE_current;
3739 struct CoroSLF slf_save;
3003 3740
3004 if (!(coro->flags & CF_RUNNING)) 3741 if (current != coro)
3005 { 3742 {
3006 PUTBACK; 3743 PUTBACK;
3007 save_perl (aTHX_ &temp); 3744 save_perl (aTHX_ current);
3008 load_perl (aTHX_ coro); 3745 load_perl (aTHX_ coro);
3746 /* the coro is most likely in an active SLF call.
3747 * while not strictly required (the code we execute is
3748 * not allowed to call any SLF functions), it's cleaner
3749 * to reinitialise the slf_frame and restore it later.
3750 * This might one day allow us to actually do SLF calls
3751 * from code executed here.
3752 */
3753 slf_save = slf_frame;
3754 slf_frame.prepare = 0;
3755 SPAGAIN;
3009 } 3756 }
3010 3757
3011 {
3012 dSP;
3013 ENTER;
3014 SAVETMPS;
3015 PUTBACK;
3016 PUSHSTACK; 3758 PUSHSTACK;
3759
3017 PUSHMARK (SP); 3760 PUSHMARK (SP);
3761 PUTBACK;
3018 3762
3019 if (ix) 3763 if (ix)
3020 eval_sv (coderef, 0); 3764 eval_sv (coderef, 0);
3021 else 3765 else
3022 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3766 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3023 3767
3024 POPSTACK; 3768 POPSTACK;
3025 SPAGAIN; 3769 SPAGAIN;
3026 FREETMPS;
3027 LEAVE;
3028 PUTBACK;
3029 }
3030 3770
3031 if (!(coro->flags & CF_RUNNING)) 3771 if (current != coro)
3032 { 3772 {
3773 PUTBACK;
3774 slf_frame = slf_save;
3033 save_perl (aTHX_ coro); 3775 save_perl (aTHX_ coro);
3034 load_perl (aTHX_ &temp); 3776 load_perl (aTHX_ current);
3035 SPAGAIN; 3777 SPAGAIN;
3036 } 3778 }
3037 } 3779 }
3038} 3780}
3039 3781
… …
3042 PROTOTYPE: $ 3784 PROTOTYPE: $
3043 ALIAS: 3785 ALIAS:
3044 is_ready = CF_READY 3786 is_ready = CF_READY
3045 is_running = CF_RUNNING 3787 is_running = CF_RUNNING
3046 is_new = CF_NEW 3788 is_new = CF_NEW
3047 is_destroyed = CF_DESTROYED 3789 is_destroyed = CF_ZOMBIE
3790 is_zombie = CF_ZOMBIE
3791 is_suspended = CF_SUSPENDED
3048 CODE: 3792 CODE:
3049 RETVAL = boolSV (coro->flags & ix); 3793 RETVAL = boolSV (coro->flags & ix);
3050 OUTPUT: 3794 OUTPUT:
3051 RETVAL 3795 RETVAL
3052 3796
3053void 3797void
3054throw (Coro::State self, SV *throw = &PL_sv_undef) 3798throw (SV *self, SV *exception = &PL_sv_undef)
3055 PROTOTYPE: $;$ 3799 PROTOTYPE: $;$
3056 CODE: 3800 CODE:
3057{ 3801{
3802 struct coro *coro = SvSTATE (self);
3058 struct coro *current = SvSTATE_current; 3803 struct coro *current = SvSTATE_current;
3059 SV **throwp = self == current ? &CORO_THROW : &self->except; 3804 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3060 SvREFCNT_dec (*throwp); 3805 SvREFCNT_dec (*exceptionp);
3061 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3806 SvGETMAGIC (exception);
3807 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3808
3809 api_ready (aTHX_ self);
3062} 3810}
3063 3811
3064void 3812void
3065api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3813api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3066 PROTOTYPE: $;$ 3814 PROTOTYPE: $;$
… …
3117 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3865 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3118 3866
3119 SV *tmp = *src; *src = *dst; *dst = tmp; 3867 SV *tmp = *src; *src = *dst; *dst = tmp;
3120 } 3868 }
3121 3869
3870void
3871cancel (Coro::State self)
3872 CODE:
3873 coro_state_destroy (aTHX_ self);
3874
3875SV *
3876enable_times (int enabled = enable_times)
3877 CODE:
3878{
3879 RETVAL = boolSV (enable_times);
3880
3881 if (enabled != enable_times)
3882 {
3883 enable_times = enabled;
3884
3885 coro_times_update ();
3886 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3887 }
3888}
3889 OUTPUT:
3890 RETVAL
3891
3892void
3893times (Coro::State self)
3894 PPCODE:
3895{
3896 struct coro *current = SvSTATE (coro_current);
3897
3898 if (ecb_expect_false (current == self))
3899 {
3900 coro_times_update ();
3901 coro_times_add (SvSTATE (coro_current));
3902 }
3903
3904 EXTEND (SP, 2);
3905 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3906 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3907
3908 if (ecb_expect_false (current == self))
3909 coro_times_sub (SvSTATE (coro_current));
3910}
3911
3912void
3913swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3914 CODE:
3915{
3916 struct coro *current = SvSTATE_current;
3917
3918 if (current == coro)
3919 SWAP_SVS (current);
3920
3921 if (!coro->swap_sv)
3922 coro->swap_sv = newAV ();
3923
3924 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3925 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3926
3927 if (current == coro)
3928 SWAP_SVS (current);
3929}
3930
3122 3931
3123MODULE = Coro::State PACKAGE = Coro 3932MODULE = Coro::State PACKAGE = Coro
3124 3933
3125BOOT: 3934BOOT:
3126{ 3935{
3127 int i;
3128
3129 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3936 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3130 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3937 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3131 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3938 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3132 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3133 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3939 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3134 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3940 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3135 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3941 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3136 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3942 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3137 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3943 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3138 3944
3139 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3945 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3140 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3946 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3141 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3947 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3142 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3948 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3143 3949
3144 coro_stash = gv_stashpv ("Coro", TRUE); 3950 coro_stash = gv_stashpv ("Coro", TRUE);
3145 3951
3146 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3952 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3147 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3953 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3148 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3954 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3149 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3955 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3150 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3956 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3151 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3957 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3152
3153 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3154 coro_ready[i] = newAV ();
3155 3958
3156 { 3959 {
3157 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3960 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3158 3961
3159 coroapi.schedule = api_schedule; 3962 coroapi.schedule = api_schedule;
… …
3163 coroapi.ready = api_ready; 3966 coroapi.ready = api_ready;
3164 coroapi.is_ready = api_is_ready; 3967 coroapi.is_ready = api_is_ready;
3165 coroapi.nready = coro_nready; 3968 coroapi.nready = coro_nready;
3166 coroapi.current = coro_current; 3969 coroapi.current = coro_current;
3167 3970
3971 coroapi.enterleave_hook = api_enterleave_hook;
3972 coroapi.enterleave_unhook = api_enterleave_unhook;
3973 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3974
3168 /*GCoroAPI = &coroapi;*/ 3975 /*GCoroAPI = &coroapi;*/
3169 sv_setiv (sv, (IV)&coroapi); 3976 sv_setiv (sv, (IV)&coroapi);
3170 SvREADONLY_on (sv); 3977 SvREADONLY_on (sv);
3171 } 3978 }
3172} 3979}
3173 3980
3981SV *
3982async (...)
3983 PROTOTYPE: &@
3984 CODE:
3985 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3986 api_ready (aTHX_ RETVAL);
3987 OUTPUT:
3988 RETVAL
3989
3990void
3991_destroy (Coro::State coro)
3992 CODE:
3993 /* used by the manager thread */
3994 coro_state_destroy (aTHX_ coro);
3995
3996void
3997on_destroy (Coro::State coro, SV *cb)
3998 CODE:
3999 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4000
4001void
4002join (...)
4003 CODE:
4004 CORO_EXECUTE_SLF_XS (slf_init_join);
4005
3174void 4006void
3175terminate (...) 4007terminate (...)
3176 CODE: 4008 CODE:
3177 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4009 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3178 4010
3179void 4011void
4012cancel (...)
4013 CODE:
4014 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4015
4016int
4017safe_cancel (Coro::State self, ...)
4018 C_ARGS: aTHX_ self, &ST (1), items - 1
4019
4020void
3180schedule (...) 4021schedule (...)
3181 CODE: 4022 CODE:
3182 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4023 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3183 4024
3184void 4025void
… …
3200cede_notself (...) 4041cede_notself (...)
3201 CODE: 4042 CODE:
3202 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 4043 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3203 4044
3204void 4045void
3205_cancel (Coro::State self)
3206 CODE:
3207 coro_state_destroy (aTHX_ self);
3208 coro_call_on_destroy (aTHX_ self);
3209
3210void
3211_set_current (SV *current) 4046_set_current (SV *current)
3212 PROTOTYPE: $ 4047 PROTOTYPE: $
3213 CODE: 4048 CODE:
3214 SvREFCNT_dec (SvRV (coro_current)); 4049 SvREFCNT_dec_NN (SvRV (coro_current));
3215 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4050 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3216 4051
3217void 4052void
3218_set_readyhook (SV *hook) 4053_set_readyhook (SV *hook)
3219 PROTOTYPE: $ 4054 PROTOTYPE: $
3220 CODE: 4055 CODE:
3221 SvREFCNT_dec (coro_readyhook); 4056 SvREFCNT_dec (coro_readyhook);
4057 SvGETMAGIC (hook);
4058 if (SvOK (hook))
4059 {
3222 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 4060 coro_readyhook = newSVsv (hook);
4061 CORO_READYHOOK = invoke_sv_ready_hook_helper;
4062 }
4063 else
4064 {
4065 coro_readyhook = 0;
4066 CORO_READYHOOK = 0;
4067 }
3223 4068
3224int 4069int
3225prio (Coro::State coro, int newprio = 0) 4070prio (Coro::State coro, int newprio = 0)
3226 PROTOTYPE: $;$ 4071 PROTOTYPE: $;$
3227 ALIAS: 4072 ALIAS:
… …
3233 if (items > 1) 4078 if (items > 1)
3234 { 4079 {
3235 if (ix) 4080 if (ix)
3236 newprio = coro->prio - newprio; 4081 newprio = coro->prio - newprio;
3237 4082
3238 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 4083 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3239 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 4084 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3240 4085
3241 coro->prio = newprio; 4086 coro->prio = newprio;
3242 } 4087 }
3243} 4088}
3244 OUTPUT: 4089 OUTPUT:
… …
3259 RETVAL = coro_nready; 4104 RETVAL = coro_nready;
3260 OUTPUT: 4105 OUTPUT:
3261 RETVAL 4106 RETVAL
3262 4107
3263void 4108void
4109suspend (Coro::State self)
4110 PROTOTYPE: $
4111 CODE:
4112 self->flags |= CF_SUSPENDED;
4113
4114void
4115resume (Coro::State self)
4116 PROTOTYPE: $
4117 CODE:
4118 self->flags &= ~CF_SUSPENDED;
4119
4120void
3264_pool_handler (...) 4121_pool_handler (...)
3265 CODE: 4122 CODE:
3266 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 4123 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3267 4124
3268void 4125void
… …
3279 for (i = 1; i < items; ++i) 4136 for (i = 1; i < items; ++i)
3280 av_push (av, SvREFCNT_inc_NN (ST (i))); 4137 av_push (av, SvREFCNT_inc_NN (ST (i)));
3281 4138
3282 if ((SV *)hv == &PL_sv_undef) 4139 if ((SV *)hv == &PL_sv_undef)
3283 { 4140 {
3284 PUSHMARK (SP); 4141 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3285 EXTEND (SP, 2);
3286 PUSHs (sv_Coro);
3287 PUSHs ((SV *)cv_pool_handler);
3288 PUTBACK;
3289 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3290 SPAGAIN;
3291
3292 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4142 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4143 SvREFCNT_dec_NN (sv);
3293 } 4144 }
3294 4145
3295 { 4146 {
3296 struct coro *coro = SvSTATE_hv (hv); 4147 struct coro *coro = SvSTATE_hv (hv);
3297 4148
… …
3304 api_ready (aTHX_ (SV *)hv); 4155 api_ready (aTHX_ (SV *)hv);
3305 4156
3306 if (GIMME_V != G_VOID) 4157 if (GIMME_V != G_VOID)
3307 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4158 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3308 else 4159 else
3309 SvREFCNT_dec (hv); 4160 SvREFCNT_dec_NN (hv);
3310} 4161}
3311 4162
3312SV * 4163SV *
3313rouse_cb () 4164rouse_cb ()
3314 PROTOTYPE: 4165 PROTOTYPE:
… …
3321rouse_wait (...) 4172rouse_wait (...)
3322 PROTOTYPE: ;$ 4173 PROTOTYPE: ;$
3323 PPCODE: 4174 PPCODE:
3324 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 4175 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3325 4176
4177void
4178on_enter (SV *block)
4179 ALIAS:
4180 on_leave = 1
4181 PROTOTYPE: &
4182 CODE:
4183{
4184 struct coro *coro = SvSTATE_current;
4185 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4186
4187 block = s_get_cv_croak (block);
4188
4189 if (!*avp)
4190 *avp = newAV ();
4191
4192 av_push (*avp, SvREFCNT_inc (block));
4193
4194 if (!ix)
4195 on_enterleave_call (aTHX_ block);
4196
4197 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4198 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
4199 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4200}
4201
3326 4202
3327MODULE = Coro::State PACKAGE = PerlIO::cede 4203MODULE = Coro::State PACKAGE = PerlIO::cede
3328 4204
3329BOOT: 4205BOOT:
3330 PerlIO_define_layer (aTHX_ &PerlIO_cede); 4206 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3333MODULE = Coro::State PACKAGE = Coro::Semaphore 4209MODULE = Coro::State PACKAGE = Coro::Semaphore
3334 4210
3335SV * 4211SV *
3336new (SV *klass, SV *count = 0) 4212new (SV *klass, SV *count = 0)
3337 CODE: 4213 CODE:
4214{
4215 int semcnt = 1;
4216
4217 if (count)
4218 {
4219 SvGETMAGIC (count);
4220
4221 if (SvOK (count))
4222 semcnt = SvIV (count);
4223 }
4224
3338 RETVAL = sv_bless ( 4225 RETVAL = sv_bless (
3339 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4226 coro_waitarray_new (aTHX_ semcnt),
3340 GvSTASH (CvGV (cv)) 4227 GvSTASH (CvGV (cv))
3341 ); 4228 );
4229}
3342 OUTPUT: 4230 OUTPUT:
3343 RETVAL 4231 RETVAL
3344 4232
3345# helper for Coro::Channel 4233# helper for Coro::Channel and others
3346SV * 4234SV *
3347_alloc (int count) 4235_alloc (int count)
3348 CODE: 4236 CODE:
3349 RETVAL = coro_waitarray_new (aTHX_ count); 4237 RETVAL = coro_waitarray_new (aTHX_ count);
3350 OUTPUT: 4238 OUTPUT:
… …
3392 XSRETURN_NO; 4280 XSRETURN_NO;
3393} 4281}
3394 4282
3395void 4283void
3396waiters (SV *self) 4284waiters (SV *self)
3397 PPCODE: 4285 PPCODE:
3398{ 4286{
3399 AV *av = (AV *)SvRV (self); 4287 AV *av = (AV *)SvRV (self);
3400 int wcount = AvFILLp (av) + 1 - 1; 4288 int wcount = AvFILLp (av) + 1 - 1;
3401 4289
3402 if (GIMME_V == G_SCALAR) 4290 if (GIMME_V == G_SCALAR)
… …
3408 for (i = 1; i <= wcount; ++i) 4296 for (i = 1; i <= wcount; ++i)
3409 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4297 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3410 } 4298 }
3411} 4299}
3412 4300
4301MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4302
4303void
4304_may_delete (SV *sem, int count, unsigned int extra_refs)
4305 PPCODE:
4306{
4307 AV *av = (AV *)SvRV (sem);
4308
4309 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4310 && AvFILLp (av) == 0 /* no waiters, just count */
4311 && SvIV (AvARRAY (av)[0]) == count)
4312 XSRETURN_YES;
4313
4314 XSRETURN_NO;
4315}
4316
3413MODULE = Coro::State PACKAGE = Coro::Signal 4317MODULE = Coro::State PACKAGE = Coro::Signal
3414 4318
3415SV * 4319SV *
3416new (SV *klass) 4320new (SV *klass)
3417 CODE: 4321 CODE:
… …
3429 4333
3430void 4334void
3431broadcast (SV *self) 4335broadcast (SV *self)
3432 CODE: 4336 CODE:
3433{ 4337{
3434 AV *av = (AV *)SvRV (self); 4338 AV *av = (AV *)SvRV (self);
3435 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4339 coro_signal_wake (aTHX_ av, AvFILLp (av));
3436} 4340}
3437 4341
3438void 4342void
3439send (SV *self) 4343send (SV *self)
… …
3447 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4351 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3448} 4352}
3449 4353
3450IV 4354IV
3451awaited (SV *self) 4355awaited (SV *self)
3452 CODE: 4356 CODE:
3453 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4357 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3454 OUTPUT: 4358 OUTPUT:
3455 RETVAL 4359 RETVAL
3456 4360
3457 4361
… …
3462 4366
3463void 4367void
3464_schedule (...) 4368_schedule (...)
3465 CODE: 4369 CODE:
3466{ 4370{
3467 static int incede; 4371 static int incede;
3468 4372
3469 api_cede_notself (aTHX); 4373 api_cede_notself (aTHX);
3470 4374
3471 ++incede; 4375 ++incede;
3472 while (coro_nready >= incede && api_cede (aTHX)) 4376 while (coro_nready >= incede && api_cede (aTHX))
… …
3488 4392
3489void 4393void
3490_register (char *target, char *proto, SV *req) 4394_register (char *target, char *proto, SV *req)
3491 CODE: 4395 CODE:
3492{ 4396{
3493 CV *req_cv = coro_sv_2cv (aTHX_ req); 4397 SV *req_cv = s_get_cv_croak (req);
3494 /* newXSproto doesn't return the CV on 5.8 */ 4398 /* newXSproto doesn't return the CV on 5.8 */
3495 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4399 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3496 sv_setpv ((SV *)slf_cv, proto); 4400 sv_setpv ((SV *)slf_cv, proto);
3497 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4401 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3498} 4402}
3499 4403
4404MODULE = Coro::State PACKAGE = Coro::Select
4405
4406void
4407patch_pp_sselect ()
4408 CODE:
4409 if (!coro_old_pp_sselect)
4410 {
4411 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4412 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4413 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4414 }
4415
4416void
4417unpatch_pp_sselect ()
4418 CODE:
4419 if (coro_old_pp_sselect)
4420 {
4421 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4422 coro_old_pp_sselect = 0;
4423 }
4424
4425MODULE = Coro::State PACKAGE = Coro::Util
4426
4427void
4428_exit (int code)
4429 CODE:
4430 _exit (code);
4431
4432NV
4433time ()
4434 CODE:
4435 RETVAL = nvtime (aTHX);
4436 OUTPUT:
4437 RETVAL
4438
4439NV
4440gettimeofday ()
4441 PPCODE:
4442{
4443 UV tv [2];
4444 u2time (aTHX_ tv);
4445 EXTEND (SP, 2);
4446 PUSHs (sv_2mortal (newSVuv (tv [0])));
4447 PUSHs (sv_2mortal (newSVuv (tv [1])));
4448}
4449

Diff Legend

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