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

Diff Legend

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