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.328 by root, Tue Nov 25 09:49:43 2008 UTC vs.
Revision 1.451 by root, Mon Jun 29 23:49:34 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
… …
133#else 95#else
134# define dSTACKLEVEL volatile void *stacklevel 96# define dSTACKLEVEL volatile void *stacklevel
135# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
136#endif 98#endif
137 99
138#define IN_DESTRUCT (PL_main_cv == Nullcv) 100#define IN_DESTRUCT PL_dirty
139
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 101
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);
358}
359 431
360static AV * 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];
471}
472
473/*****************************************************************************/
474/* magic glue */
475
476#define CORO_MAGIC_type_cv 26
477#define CORO_MAGIC_type_state PERL_MAGIC_ext
478
479#define CORO_MAGIC_NN(sv, type) \
480 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
481 ? SvMAGIC (sv) \
482 : mg_find (sv, type))
483
484#define CORO_MAGIC(sv, type) \
485 (ecb_expect_true (SvMAGIC (sv)) \
486 ? CORO_MAGIC_NN (sv, type) \
487 : 0)
488
489#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
490#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
491
492ecb_inline MAGIC *
493SvSTATEhv_p (pTHX_ SV *coro)
494{
495 MAGIC *mg;
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
512 if (SvROK (coro_sv))
513 coro_sv = SvRV (coro_sv);
514
515 mg = SvSTATEhv_p (aTHX_ coro_sv);
516 if (!mg)
517 croak ("Coro::State object required");
518
519 return (struct coro *)mg->mg_ptr;
520}
521
522#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
523
524/* faster than SvSTATE, but expects a coroutine hv */
525#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
526#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
527
528/*****************************************************************************/
529/* padlist management and caching */
530
531ecb_inline PADLIST *
361coro_derive_padlist (pTHX_ CV *cv) 532coro_derive_padlist (pTHX_ CV *cv)
362{ 533{
363 AV *padlist = CvPADLIST (cv); 534 PADLIST *padlist = CvPADLIST (cv);
364 AV *newpadlist, *newpad; 535 PADLIST *newpadlist;
536 PADNAMELIST *padnames;
537 PAD *newpad;
538 PADOFFSET off = PadlistMAX (padlist) + 1;
365 539
366 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. */
367 AvREAL_off (newpadlist); 568 AvREAL_off (newpadlist);
368#if PERL_VERSION_ATLEAST (5,10,0)
369 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
370#else
371 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
372#endif 569#endif
373 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
374 --AvFILLp (padlist);
375 570
376 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 571 /* Already extended to 2 elements by newPADLIST. */
377 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;
378 579
379 return newpadlist; 580 return newpadlist;
380} 581}
381 582
382static void 583ecb_inline void
383free_padlist (pTHX_ AV *padlist) 584free_padlist (pTHX_ PADLIST *padlist)
384{ 585{
385 /* may be during global destruction */ 586 /* may be during global destruction */
386 if (SvREFCNT (padlist)) 587 if (!IN_DESTRUCT)
387 { 588 {
388 I32 i = AvFILLp (padlist); 589 I32 i = PadlistMAX (padlist);
389 while (i >= 0) 590
591 while (i > 0) /* special-case index 0 */
390 { 592 {
391 SV **svp = av_fetch (padlist, i--, FALSE); 593 /* we try to be extra-careful here */
594 PAD *pad = PadlistARRAY (padlist)[i--];
595
392 if (svp) 596 if (pad)
393 { 597 {
394 SV *sv; 598 I32 j = PadMAX (pad);
395 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 599
600 while (j >= 0)
396 SvREFCNT_dec (sv); 601 SvREFCNT_dec (PadARRAY (pad)[j--]);
397 602
603 PadMAX (pad) = -1;
398 SvREFCNT_dec (*svp); 604 SvREFCNT_dec (pad);
399 } 605 }
400 } 606 }
401 607
608 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
609
610#if NEWPADAPI
611 Safefree (PadlistARRAY (padlist));
612 Safefree (padlist);
613#else
614 AvFILLp (padlist) = -1;
615 AvREAL_off (padlist);
402 SvREFCNT_dec ((SV*)padlist); 616 SvREFCNT_dec ((SV*)padlist);
617#endif
403 } 618 }
404} 619}
405 620
406static int 621static int
407coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 622coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
408{ 623{
409 AV *padlist; 624 PADLIST *padlist;
410 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;
411 627
412 /* casting is fun. */ 628 /* perl manages to free our internal AV and _then_ call us */
413 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 629 if (IN_DESTRUCT)
630 return 0;
631
632 while (len--)
414 free_padlist (aTHX_ padlist); 633 free_padlist (aTHX_ padlists[len]);
415
416 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
417 634
418 return 0; 635 return 0;
419} 636}
420
421#define CORO_MAGIC_type_cv 26
422#define CORO_MAGIC_type_state PERL_MAGIC_ext
423 637
424static MGVTBL coro_cv_vtbl = { 638static MGVTBL coro_cv_vtbl = {
425 0, 0, 0, 0, 639 0, 0, 0, 0,
426 coro_cv_free 640 coro_cv_free
427}; 641};
428 642
429#define CORO_MAGIC_NN(sv, type) \
430 (expect_true (SvMAGIC (sv)->mg_type == type) \
431 ? SvMAGIC (sv) \
432 : mg_find (sv, type))
433
434#define CORO_MAGIC(sv, type) \
435 (expect_true (SvMAGIC (sv)) \
436 ? CORO_MAGIC_NN (sv, type) \
437 : 0)
438
439#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
440#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
441
442INLINE struct coro *
443SvSTATE_ (pTHX_ SV *coro)
444{
445 HV *stash;
446 MAGIC *mg;
447
448 if (SvROK (coro))
449 coro = SvRV (coro);
450
451 if (expect_false (SvTYPE (coro) != SVt_PVHV))
452 croak ("Coro::State object required");
453
454 stash = SvSTASH (coro);
455 if (expect_false (stash != coro_stash && stash != coro_state_stash))
456 {
457 /* very slow, but rare, check */
458 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
459 croak ("Coro::State object required");
460 }
461
462 mg = CORO_MAGIC_state (coro);
463 return (struct coro *)mg->mg_ptr;
464}
465
466#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
467
468/* faster than SvSTATE, but expects a coroutine hv */
469#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
470#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
471
472/* the next two functions merely cache the padlists */ 643/* the next two functions merely cache the padlists */
473static void 644ecb_inline void
474get_padlist (pTHX_ CV *cv) 645get_padlist (pTHX_ CV *cv)
475{ 646{
476 MAGIC *mg = CORO_MAGIC_cv (cv); 647 MAGIC *mg = CORO_MAGIC_cv (cv);
477 AV *av; 648 size_t *lenp;
478 649
479 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 650 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
480 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 651 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
481 else 652 else
482 { 653 {
483#if CORO_PREFER_PERL_FUNCTIONS 654#if CORO_PREFER_PERL_FUNCTIONS
484 /* this is probably cleaner? but also slower! */ 655 /* this is probably cleaner? but also slower! */
485 /* in practise, it seems to be less stable */ 656 /* in practise, it seems to be less stable */
… …
491 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 662 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
492#endif 663#endif
493 } 664 }
494} 665}
495 666
496static void 667ecb_inline void
497put_padlist (pTHX_ CV *cv) 668put_padlist (pTHX_ CV *cv)
498{ 669{
499 MAGIC *mg = CORO_MAGIC_cv (cv); 670 MAGIC *mg = CORO_MAGIC_cv (cv);
500 AV *av;
501 671
502 if (expect_false (!mg)) 672 if (ecb_expect_false (!mg))
673 {
503 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);
504 682
505 av = (AV *)mg->mg_obj; 683 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
506
507 if (expect_false (AvFILLp (av) >= AvMAX (av)))
508 av_extend (av, AvMAX (av) + 1);
509
510 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
511} 684}
512 685
513/** 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 #define svany_in_head(type) \
715 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
716
717 if (svany_in_head (SvTYPE (a)))
718 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
719
720 if (svany_in_head (SvTYPE (b)))
721 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
722 }
723#endif
724}
725
726/* swap sv heads, at least logically */
727static void
728swap_svs (pTHX_ Coro__State c)
729{
730 int i;
731
732 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
733 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
734}
735
736#define SWAP_SVS(coro) \
737 if (ecb_expect_false ((coro)->swap_sv)) \
738 swap_svs (aTHX_ (coro))
739
740static void
741on_enterleave_call (pTHX_ SV *cb);
514 742
515static void 743static void
516load_perl (pTHX_ Coro__State c) 744load_perl (pTHX_ Coro__State c)
517{ 745{
518 perl_slots *slot = c->slot; 746 perl_slots *slot = c->slot;
519 c->slot = 0; 747 c->slot = 0;
520 748
521 PL_mainstack = c->mainstack; 749 PL_mainstack = c->mainstack;
522 750
523 GvSV (PL_defgv) = slot->defsv; 751#if CORO_JIT
524 GvAV (PL_defgv) = slot->defav; 752 load_perl_slots (slot);
525 GvSV (PL_errgv) = slot->errsv; 753#else
526 GvSV (irsgv) = slot->irsgv;
527 GvHV (PL_hintgv) = slot->hinthv;
528
529 #define VAR(name,type) PL_ ## name = slot->name; 754 #define VARx(name,expr,type) expr = slot->name;
530 # include "state.h" 755 #include "state.h"
531 #undef VAR 756#endif
532 757
533 { 758 {
534 dSP; 759 dSP;
535 760
536 CV *cv; 761 CV *cv;
537 762
538 /* now do the ugly restore mess */ 763 /* now do the ugly restore mess */
539 while (expect_true (cv = (CV *)POPs)) 764 while (ecb_expect_true (cv = (CV *)POPs))
540 { 765 {
541 put_padlist (aTHX_ cv); /* mark this padlist as available */ 766 put_padlist (aTHX_ cv); /* mark this padlist as available */
542 CvDEPTH (cv) = PTR2IV (POPs); 767 CvDEPTH (cv) = PTR2IV (POPs);
543 CvPADLIST (cv) = (AV *)POPs; 768 CvPADLIST (cv) = (PADLIST *)POPs;
544 } 769 }
545 770
546 PUTBACK; 771 PUTBACK;
547 } 772 }
548 773
549 slf_frame = c->slf_frame; 774 slf_frame = c->slf_frame;
550 CORO_THROW = c->except; 775 CORO_THROW = c->except;
776
777 if (ecb_expect_false (enable_times))
778 {
779 if (ecb_expect_false (!times_valid))
780 coro_times_update ();
781
782 coro_times_sub (c);
783 }
784
785 if (ecb_expect_false (c->on_enter))
786 {
787 int i;
788
789 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
790 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
791 }
792
793 if (ecb_expect_false (c->on_enter_xs))
794 {
795 int i;
796
797 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
798 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
799 }
800
801 SWAP_SVS (c);
551} 802}
552 803
553static void 804static void
554save_perl (pTHX_ Coro__State c) 805save_perl (pTHX_ Coro__State c)
555{ 806{
807 SWAP_SVS (c);
808
809 if (ecb_expect_false (c->on_leave_xs))
810 {
811 int i;
812
813 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
814 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
815 }
816
817 if (ecb_expect_false (c->on_leave))
818 {
819 int i;
820
821 for (i = AvFILLp (c->on_leave); i >= 0; --i)
822 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
823 }
824
825 times_valid = 0;
826
827 if (ecb_expect_false (enable_times))
828 {
829 coro_times_update (); times_valid = 1;
830 coro_times_add (c);
831 }
832
556 c->except = CORO_THROW; 833 c->except = CORO_THROW;
557 c->slf_frame = slf_frame; 834 c->slf_frame = slf_frame;
558 835
559 { 836 {
560 dSP; 837 dSP;
… …
569 846
570 XPUSHs (Nullsv); 847 XPUSHs (Nullsv);
571 /* this loop was inspired by pp_caller */ 848 /* this loop was inspired by pp_caller */
572 for (;;) 849 for (;;)
573 { 850 {
574 while (expect_true (cxix >= 0)) 851 while (ecb_expect_true (cxix >= 0))
575 { 852 {
576 PERL_CONTEXT *cx = &ccstk[cxix--]; 853 PERL_CONTEXT *cx = &ccstk[cxix--];
577 854
578 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 855 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
579 { 856 {
580 CV *cv = cx->blk_sub.cv; 857 CV *cv = cx->blk_sub.cv;
581 858
582 if (expect_true (CvDEPTH (cv))) 859 if (ecb_expect_true (CvDEPTH (cv)))
583 { 860 {
584 EXTEND (SP, 3); 861 EXTEND (SP, 3);
585 PUSHs ((SV *)CvPADLIST (cv)); 862 PUSHs ((SV *)CvPADLIST (cv));
586 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 863 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
587 PUSHs ((SV *)cv); 864 PUSHs ((SV *)cv);
… …
590 get_padlist (aTHX_ cv); 867 get_padlist (aTHX_ cv);
591 } 868 }
592 } 869 }
593 } 870 }
594 871
595 if (expect_true (top_si->si_type == PERLSI_MAIN)) 872 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
596 break; 873 break;
597 874
598 top_si = top_si->si_prev; 875 top_si = top_si->si_prev;
599 ccstk = top_si->si_cxstack; 876 ccstk = top_si->si_cxstack;
600 cxix = top_si->si_cxix; 877 cxix = top_si->si_cxix;
… …
602 879
603 PUTBACK; 880 PUTBACK;
604 } 881 }
605 882
606 /* allocate some space on the context stack for our purposes */ 883 /* allocate some space on the context stack for our purposes */
607 /* we manually unroll here, as usually 2 slots is enough */ 884 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
608 if (SLOT_COUNT >= 1) CXINC;
609 if (SLOT_COUNT >= 2) CXINC;
610 if (SLOT_COUNT >= 3) CXINC;
611 { 885 {
612 int i; 886 unsigned int i;
887
613 for (i = 3; i < SLOT_COUNT; ++i) 888 for (i = 0; i < SLOT_COUNT; ++i)
614 CXINC; 889 CXINC;
615 } 890
616 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 891 cxstack_ix -= SLOT_COUNT; /* undo allocation */
892 }
617 893
618 c->mainstack = PL_mainstack; 894 c->mainstack = PL_mainstack;
619 895
620 { 896 {
621 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 897 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
622 898
623 slot->defav = GvAV (PL_defgv); 899#if CORO_JIT
624 slot->defsv = DEFSV; 900 save_perl_slots (slot);
625 slot->errsv = ERRSV; 901#else
626 slot->irsgv = GvSV (irsgv);
627 slot->hinthv = GvHV (PL_hintgv);
628
629 #define VAR(name,type) slot->name = PL_ ## name; 902 #define VARx(name,expr,type) slot->name = expr;
630 # include "state.h" 903 #include "state.h"
631 #undef VAR 904#endif
632 } 905 }
633} 906}
634 907
635/* 908/*
636 * allocate various perl stacks. This is almost an exact copy 909 * allocate various perl stacks. This is almost an exact copy
… …
642# define coro_init_stacks(thx) init_stacks () 915# define coro_init_stacks(thx) init_stacks ()
643#else 916#else
644static void 917static void
645coro_init_stacks (pTHX) 918coro_init_stacks (pTHX)
646{ 919{
647 PL_curstackinfo = new_stackinfo(32, 8); 920 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
648 PL_curstackinfo->si_type = PERLSI_MAIN; 921 PL_curstackinfo->si_type = PERLSI_MAIN;
649 PL_curstack = PL_curstackinfo->si_stack; 922 PL_curstack = PL_curstackinfo->si_stack;
650 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 923 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
651 924
652 PL_stack_base = AvARRAY(PL_curstack); 925 PL_stack_base = AvARRAY(PL_curstack);
… …
667#endif 940#endif
668 941
669 New(54,PL_scopestack,8,I32); 942 New(54,PL_scopestack,8,I32);
670 PL_scopestack_ix = 0; 943 PL_scopestack_ix = 0;
671 PL_scopestack_max = 8; 944 PL_scopestack_max = 8;
945#if HAS_SCOPESTACK_NAME
946 New(54,PL_scopestack_name,8,const char*);
947#endif
672 948
673 New(54,PL_savestack,24,ANY); 949 New(54,PL_savestack,24,ANY);
674 PL_savestack_ix = 0; 950 PL_savestack_ix = 0;
675 PL_savestack_max = 24; 951 PL_savestack_max = 24;
676 952
… …
704 } 980 }
705 981
706 Safefree (PL_tmps_stack); 982 Safefree (PL_tmps_stack);
707 Safefree (PL_markstack); 983 Safefree (PL_markstack);
708 Safefree (PL_scopestack); 984 Safefree (PL_scopestack);
985#if HAS_SCOPESTACK_NAME
986 Safefree (PL_scopestack_name);
987#endif
709 Safefree (PL_savestack); 988 Safefree (PL_savestack);
710#if !PERL_VERSION_ATLEAST (5,10,0) 989#if !PERL_VERSION_ATLEAST (5,10,0)
711 Safefree (PL_retstack); 990 Safefree (PL_retstack);
712#endif 991#endif
713} 992}
… …
759#endif 1038#endif
760 1039
761/* 1040/*
762 * This overrides the default magic get method of %SIG elements. 1041 * This overrides the default magic get method of %SIG elements.
763 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1042 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
764 * and instead of tryign to save and restore the hash elements, we just provide 1043 * and instead of trying to save and restore the hash elements (extremely slow),
765 * readback here. 1044 * we just provide our own readback here.
766 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
767 * not expecting this to actually change the hook. This is a potential problem
768 * when a schedule happens then, but we ignore this.
769 */ 1045 */
770static int 1046static int ecb_cold
771coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1047coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
772{ 1048{
773 const char *s = MgPV_nolen_const (mg); 1049 const char *s = MgPV_nolen_const (mg);
774 1050
775 if (*s == '_') 1051 if (*s == '_')
776 { 1052 {
777 SV **svp = 0; 1053 SV **svp = 0;
778 1054
779 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1055 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
780 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1056 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
781 1057
782 if (svp) 1058 if (svp)
783 { 1059 {
784 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1060 SV *ssv;
1061
1062 if (!*svp)
1063 ssv = &PL_sv_undef;
1064 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1065 ssv = sv_2mortal (newRV_inc (*svp));
1066 else
1067 ssv = *svp;
1068
1069 sv_setsv (sv, ssv);
785 return 0; 1070 return 0;
786 } 1071 }
787 } 1072 }
788 1073
789 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1074 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
790} 1075}
791 1076
792static int 1077static int ecb_cold
793coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1078coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
794{ 1079{
795 const char *s = MgPV_nolen_const (mg); 1080 const char *s = MgPV_nolen_const (mg);
796 1081
797 if (*s == '_') 1082 if (*s == '_')
… …
811 } 1096 }
812 1097
813 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1098 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
814} 1099}
815 1100
816static int 1101static int ecb_cold
817coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1102coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
818{ 1103{
819 const char *s = MgPV_nolen_const (mg); 1104 const char *s = MgPV_nolen_const (mg);
820 1105
821 if (*s == '_') 1106 if (*s == '_')
… …
826 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1111 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
827 1112
828 if (svp) 1113 if (svp)
829 { 1114 {
830 SV *old = *svp; 1115 SV *old = *svp;
831 *svp = newSVsv (sv); 1116 *svp = SvOK (sv) ? newSVsv (sv) : 0;
832 SvREFCNT_dec (old); 1117 SvREFCNT_dec (old);
833 return 0; 1118 return 0;
834 } 1119 }
835 } 1120 }
836 1121
… …
854slf_check_repeat (pTHX_ struct CoroSLF *frame) 1139slf_check_repeat (pTHX_ struct CoroSLF *frame)
855{ 1140{
856 return 1; 1141 return 1;
857} 1142}
858 1143
859static UNOP coro_setup_op; 1144static UNOP init_perl_op;
860 1145
861static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1146ecb_noinline static void /* noinline to keep it out of the transfer fast path */
862coro_setup (pTHX_ struct coro *coro) 1147init_perl (pTHX_ struct coro *coro)
863{ 1148{
864 /* 1149 /*
865 * emulate part of the perl startup here. 1150 * emulate part of the perl startup here.
866 */ 1151 */
867 coro_init_stacks (aTHX); 1152 coro_init_stacks (aTHX);
… …
874 PL_comppad_name_fill = 0; 1159 PL_comppad_name_fill = 0;
875 PL_comppad_name_floor = 0; 1160 PL_comppad_name_floor = 0;
876 PL_curpm = 0; 1161 PL_curpm = 0;
877 PL_curpad = 0; 1162 PL_curpad = 0;
878 PL_localizing = 0; 1163 PL_localizing = 0;
879 PL_dirty = 0;
880 PL_restartop = 0; 1164 PL_restartop = 0;
881#if PERL_VERSION_ATLEAST (5,10,0) 1165#if PERL_VERSION_ATLEAST (5,10,0)
882 PL_parser = 0; 1166 PL_parser = 0;
883#endif 1167#endif
884 PL_hints = 0; 1168 PL_hints = 0;
885 1169
886 /* recreate the die/warn hooks */ 1170 /* recreate the die/warn hooks */
887 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1171 PL_diehook = SvREFCNT_inc (rv_diehook);
888 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1172 PL_warnhook = SvREFCNT_inc (rv_warnhook);
889 1173
890 GvSV (PL_defgv) = newSV (0); 1174 GvSV (PL_defgv) = newSV (0);
891 GvAV (PL_defgv) = coro->args; coro->args = 0; 1175 GvAV (PL_defgv) = coro->args; coro->args = 0;
892 GvSV (PL_errgv) = newSV (0); 1176 GvSV (PL_errgv) = newSV (0);
893 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1177 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
894 GvHV (PL_hintgv) = 0; 1178 GvHV (PL_hintgv) = newHV ();
1179#if PERL_VERSION_ATLEAST (5,10,0)
1180 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1181#endif
895 PL_rs = newSVsv (GvSV (irsgv)); 1182 PL_rs = newSVsv (GvSV (irsgv));
896 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1183 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
897 1184
898 { 1185 {
899 dSP; 1186 dSP;
… …
914 /* this newly created coroutine might be run on an existing cctx which most 1201 /* this newly created coroutine might be run on an existing cctx which most
915 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1202 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
916 */ 1203 */
917 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1204 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
918 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1205 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1206 slf_frame.destroy = 0;
919 1207
920 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1208 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
921 coro_setup_op.op_next = PL_op; 1209 init_perl_op.op_next = PL_op;
922 coro_setup_op.op_type = OP_ENTERSUB; 1210 init_perl_op.op_type = OP_ENTERSUB;
923 coro_setup_op.op_ppaddr = pp_slf; 1211 init_perl_op.op_ppaddr = pp_slf;
924 /* no flags etc. required, as an init function won't be called */ 1212 /* no flags etc. required, as an init function won't be called */
925 1213
926 PL_op = (OP *)&coro_setup_op; 1214 PL_op = (OP *)&init_perl_op;
927 1215
928 /* copy throw, in case it was set before coro_setup */ 1216 /* copy throw, in case it was set before init_perl */
929 CORO_THROW = coro->except; 1217 CORO_THROW = coro->except;
930}
931 1218
1219 SWAP_SVS (coro);
1220
1221 if (ecb_expect_false (enable_times))
1222 {
1223 coro_times_update ();
1224 coro_times_sub (coro);
1225 }
1226}
1227
932static void 1228static void
933coro_destruct (pTHX_ struct coro *coro) 1229coro_unwind_stacks (pTHX)
934{ 1230{
935 if (!IN_DESTRUCT) 1231 if (!IN_DESTRUCT)
936 { 1232 {
937 /* restore all saved variables and stuff */ 1233 /* restore all saved variables and stuff */
938 LEAVE_SCOPE (0); 1234 LEAVE_SCOPE (0);
… …
946 POPSTACK_TO (PL_mainstack); 1242 POPSTACK_TO (PL_mainstack);
947 1243
948 /* unwind main stack */ 1244 /* unwind main stack */
949 dounwind (-1); 1245 dounwind (-1);
950 } 1246 }
1247}
951 1248
952 SvREFCNT_dec (GvSV (PL_defgv)); 1249static void
953 SvREFCNT_dec (GvAV (PL_defgv)); 1250destroy_perl (pTHX_ struct coro *coro)
954 SvREFCNT_dec (GvSV (PL_errgv)); 1251{
955 SvREFCNT_dec (PL_defoutgv); 1252 SV *svf [9];
956 SvREFCNT_dec (PL_rs);
957 SvREFCNT_dec (GvSV (irsgv));
958 SvREFCNT_dec (GvHV (PL_hintgv));
959 1253
960 SvREFCNT_dec (PL_diehook);
961 SvREFCNT_dec (PL_warnhook);
962 1254 {
1255 SV *old_current = SvRV (coro_current);
1256 struct coro *current = SvSTATE (old_current);
1257
1258 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1259
1260 save_perl (aTHX_ current);
1261
1262 /* this will cause transfer_check to croak on block*/
1263 SvRV_set (coro_current, (SV *)coro->hv);
1264
1265 load_perl (aTHX_ coro);
1266
1267 coro_unwind_stacks (aTHX);
1268
1269 /* restore swapped sv's */
1270 SWAP_SVS (coro);
1271
1272 coro_destruct_stacks (aTHX);
1273
1274 /* now save some sv's to be free'd later */
1275 svf [0] = GvSV (PL_defgv);
1276 svf [1] = (SV *)GvAV (PL_defgv);
1277 svf [2] = GvSV (PL_errgv);
1278 svf [3] = (SV *)PL_defoutgv;
1279 svf [4] = PL_rs;
1280 svf [5] = GvSV (irsgv);
1281 svf [6] = (SV *)GvHV (PL_hintgv);
1282 svf [7] = PL_diehook;
1283 svf [8] = PL_warnhook;
1284 assert (9 == sizeof (svf) / sizeof (*svf));
1285
1286 SvRV_set (coro_current, old_current);
1287
1288 load_perl (aTHX_ current);
1289 }
1290
1291 {
1292 unsigned int i;
1293
1294 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1295 SvREFCNT_dec (svf [i]);
1296
963 SvREFCNT_dec (coro->saved_deffh); 1297 SvREFCNT_dec (coro->saved_deffh);
964 SvREFCNT_dec (coro->rouse_cb); 1298 SvREFCNT_dec (coro->rouse_cb);
965 SvREFCNT_dec (coro->invoke_cb); 1299 SvREFCNT_dec (coro->invoke_cb);
966 SvREFCNT_dec (coro->invoke_av); 1300 SvREFCNT_dec (coro->invoke_av);
967 1301 SvREFCNT_dec (coro->on_enter_xs);
968 coro_destruct_stacks (aTHX); 1302 SvREFCNT_dec (coro->on_leave_xs);
1303 }
969} 1304}
970 1305
971INLINE void 1306ecb_inline void
972free_coro_mortal (pTHX) 1307free_coro_mortal (pTHX)
973{ 1308{
974 if (expect_true (coro_mortal)) 1309 if (ecb_expect_true (coro_mortal))
975 { 1310 {
976 SvREFCNT_dec (coro_mortal); 1311 SvREFCNT_dec ((SV *)coro_mortal);
977 coro_mortal = 0; 1312 coro_mortal = 0;
978 } 1313 }
979} 1314}
980 1315
981static int 1316static int
… …
1035 1370
1036 if (PL_curcop != &PL_compiling) 1371 if (PL_curcop != &PL_compiling)
1037 { 1372 {
1038 SV **cb; 1373 SV **cb;
1039 1374
1040 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1375 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1041 { 1376 {
1042 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1377 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1043 1378
1044 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1379 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1045 { 1380 {
… …
1114 1449
1115 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1450 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1116} 1451}
1117 1452
1118/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1453/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1119static void NOINLINE 1454static void ecb_noinline
1120cctx_prepare (pTHX) 1455cctx_prepare (pTHX)
1121{ 1456{
1122 PL_top_env = &PL_start_env; 1457 PL_top_env = &PL_start_env;
1123 1458
1124 if (cctx_current->flags & CC_TRACE) 1459 if (cctx_current->flags & CC_TRACE)
… …
1135 slf_frame.prepare = slf_prepare_set_stacklevel; 1470 slf_frame.prepare = slf_prepare_set_stacklevel;
1136 slf_frame.check = slf_check_set_stacklevel; 1471 slf_frame.check = slf_check_set_stacklevel;
1137} 1472}
1138 1473
1139/* the tail of transfer: execute stuff we can only do after a transfer */ 1474/* the tail of transfer: execute stuff we can only do after a transfer */
1140INLINE void 1475ecb_inline void
1141transfer_tail (pTHX) 1476transfer_tail (pTHX)
1142{ 1477{
1143 free_coro_mortal (aTHX); 1478 free_coro_mortal (aTHX);
1479}
1480
1481/* try to exit the same way perl's main function would do */
1482/* we do not bother resetting the environment or other things *7
1483/* that are not, uhm, essential */
1484/* this obviously also doesn't work when perl is embedded */
1485static void ecb_noinline ecb_cold
1486perlish_exit (pTHX)
1487{
1488 int exitstatus = perl_destruct (PL_curinterp);
1489 perl_free (PL_curinterp);
1490 exit (exitstatus);
1144} 1491}
1145 1492
1146/* 1493/*
1147 * this is a _very_ stripped down perl interpreter ;) 1494 * this is a _very_ stripped down perl interpreter ;)
1148 */ 1495 */
… …
1170 /* somebody or something will hit me for both perl_run and PL_restartop */ 1517 /* somebody or something will hit me for both perl_run and PL_restartop */
1171 PL_restartop = PL_op; 1518 PL_restartop = PL_op;
1172 perl_run (PL_curinterp); 1519 perl_run (PL_curinterp);
1173 /* 1520 /*
1174 * Unfortunately, there is no way to get at the return values of the 1521 * Unfortunately, there is no way to get at the return values of the
1175 * coro body here, as perl_run destroys these 1522 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1523 * runtime errors here, as this is just a random interpreter, not a thread.
1176 */ 1524 */
1177 1525
1178 /* 1526 /*
1179 * If perl-run returns we assume exit() was being called or the coro 1527 * If perl-run returns we assume exit() was being called or the coro
1180 * fell off the end, which seems to be the only valid (non-bug) 1528 * fell off the end, which seems to be the only valid (non-bug)
1181 * reason for perl_run to return. We try to exit by jumping to the 1529 * reason for perl_run to return. We try to mimic whatever perl is normally
1182 * bootstrap-time "top" top_env, as we cannot restore the "main" 1530 * doing in that case. YMMV.
1183 * coroutine as Coro has no such concept.
1184 * This actually isn't valid with the pthread backend, but OSes requiring
1185 * that backend are too broken to do it in a standards-compliant way.
1186 */ 1531 */
1187 PL_top_env = main_top_env; 1532 perlish_exit (aTHX);
1188 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1189 } 1533 }
1190} 1534}
1191 1535
1192static coro_cctx * 1536static coro_cctx *
1193cctx_new () 1537cctx_new (void)
1194{ 1538{
1195 coro_cctx *cctx; 1539 coro_cctx *cctx;
1196 1540
1197 ++cctx_count; 1541 ++cctx_count;
1198 New (0, cctx, 1, coro_cctx); 1542 New (0, cctx, 1, coro_cctx);
… …
1204 return cctx; 1548 return cctx;
1205} 1549}
1206 1550
1207/* create a new cctx only suitable as source */ 1551/* create a new cctx only suitable as source */
1208static coro_cctx * 1552static coro_cctx *
1209cctx_new_empty () 1553cctx_new_empty (void)
1210{ 1554{
1211 coro_cctx *cctx = cctx_new (); 1555 coro_cctx *cctx = cctx_new ();
1212 1556
1213 cctx->sptr = 0; 1557 cctx->stack.sptr = 0;
1214 coro_create (&cctx->cctx, 0, 0, 0, 0); 1558 coro_create (&cctx->cctx, 0, 0, 0, 0);
1215 1559
1216 return cctx; 1560 return cctx;
1217} 1561}
1218 1562
1219/* create a new cctx suitable as destination/running a perl interpreter */ 1563/* create a new cctx suitable as destination/running a perl interpreter */
1220static coro_cctx * 1564static coro_cctx *
1221cctx_new_run () 1565cctx_new_run (void)
1222{ 1566{
1223 coro_cctx *cctx = cctx_new (); 1567 coro_cctx *cctx = cctx_new ();
1224 void *stack_start;
1225 size_t stack_size;
1226 1568
1227#if HAVE_MMAP 1569 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1228 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1229 /* mmap supposedly does allocate-on-write for us */
1230 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1231
1232 if (cctx->sptr != (void *)-1)
1233 {
1234 #if CORO_STACKGUARD
1235 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1236 #endif
1237 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1238 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1239 cctx->flags |= CC_MAPPED;
1240 } 1570 {
1241 else
1242#endif
1243 {
1244 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1245 New (0, cctx->sptr, cctx_stacksize, long);
1246
1247 if (!cctx->sptr)
1248 {
1249 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1571 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1250 _exit (EXIT_FAILURE); 1572 _exit (EXIT_FAILURE);
1251 }
1252
1253 stack_start = cctx->sptr;
1254 stack_size = cctx->ssize;
1255 } 1573 }
1256 1574
1257 #if CORO_USE_VALGRIND
1258 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1259 #endif
1260
1261 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1575 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1262 1576
1263 return cctx; 1577 return cctx;
1264} 1578}
1265 1579
1266static void 1580static void
1267cctx_destroy (coro_cctx *cctx) 1581cctx_destroy (coro_cctx *cctx)
1268{ 1582{
1269 if (!cctx) 1583 if (!cctx)
1270 return; 1584 return;
1271 1585
1272 assert (cctx != cctx_current);//D temporary 1586 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1273 1587
1274 --cctx_count; 1588 --cctx_count;
1275 coro_destroy (&cctx->cctx); 1589 coro_destroy (&cctx->cctx);
1276 1590
1277 /* coro_transfer creates new, empty cctx's */ 1591 coro_stack_free (&cctx->stack);
1278 if (cctx->sptr)
1279 {
1280 #if CORO_USE_VALGRIND
1281 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1282 #endif
1283
1284#if HAVE_MMAP
1285 if (cctx->flags & CC_MAPPED)
1286 munmap (cctx->sptr, cctx->ssize);
1287 else
1288#endif
1289 Safefree (cctx->sptr);
1290 }
1291 1592
1292 Safefree (cctx); 1593 Safefree (cctx);
1293} 1594}
1294 1595
1295/* wether this cctx should be destructed */ 1596/* wether this cctx should be destructed */
1296#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1597#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1297 1598
1298static coro_cctx * 1599static coro_cctx *
1299cctx_get (pTHX) 1600cctx_get (pTHX)
1300{ 1601{
1301 while (expect_true (cctx_first)) 1602 while (ecb_expect_true (cctx_first))
1302 { 1603 {
1303 coro_cctx *cctx = cctx_first; 1604 coro_cctx *cctx = cctx_first;
1304 cctx_first = cctx->next; 1605 cctx_first = cctx->next;
1305 --cctx_idle; 1606 --cctx_idle;
1306 1607
1307 if (expect_true (!CCTX_EXPIRED (cctx))) 1608 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1308 return cctx; 1609 return cctx;
1309 1610
1310 cctx_destroy (cctx); 1611 cctx_destroy (cctx);
1311 } 1612 }
1312 1613
… …
1314} 1615}
1315 1616
1316static void 1617static void
1317cctx_put (coro_cctx *cctx) 1618cctx_put (coro_cctx *cctx)
1318{ 1619{
1319 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1620 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1320 1621
1321 /* free another cctx if overlimit */ 1622 /* free another cctx if overlimit */
1322 if (expect_false (cctx_idle >= cctx_max_idle)) 1623 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1323 { 1624 {
1324 coro_cctx *first = cctx_first; 1625 coro_cctx *first = cctx_first;
1325 cctx_first = first->next; 1626 cctx_first = first->next;
1326 --cctx_idle; 1627 --cctx_idle;
1327 1628
… …
1338static void 1639static void
1339transfer_check (pTHX_ struct coro *prev, struct coro *next) 1640transfer_check (pTHX_ struct coro *prev, struct coro *next)
1340{ 1641{
1341 /* TODO: throwing up here is considered harmful */ 1642 /* TODO: throwing up here is considered harmful */
1342 1643
1343 if (expect_true (prev != next)) 1644 if (ecb_expect_true (prev != next))
1344 { 1645 {
1345 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1646 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1346 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,"); 1647 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1347 1648
1348 if (expect_false (next->flags & CF_RUNNING)) 1649 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1349 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1350
1351 if (expect_false (next->flags & CF_DESTROYED))
1352 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1650 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1353 1651
1354#if !PERL_VERSION_ATLEAST (5,10,0) 1652#if !PERL_VERSION_ATLEAST (5,10,0)
1355 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1653 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1356 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1654 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1357#endif 1655#endif
1358 } 1656 }
1359} 1657}
1360 1658
1361/* always use the TRANSFER macro */ 1659/* always use the TRANSFER macro */
1362static void NOINLINE /* noinline so we have a fixed stackframe */ 1660static void ecb_noinline /* noinline so we have a fixed stackframe */
1363transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1661transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1364{ 1662{
1365 dSTACKLEVEL; 1663 dSTACKLEVEL;
1366 1664
1367 /* sometimes transfer is only called to set idle_sp */ 1665 /* sometimes transfer is only called to set idle_sp */
1368 if (expect_false (!prev)) 1666 if (ecb_expect_false (!prev))
1369 { 1667 {
1370 cctx_current->idle_sp = STACKLEVEL; 1668 cctx_current->idle_sp = STACKLEVEL;
1371 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1669 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1372 } 1670 }
1373 else if (expect_true (prev != next)) 1671 else if (ecb_expect_true (prev != next))
1374 { 1672 {
1375 coro_cctx *cctx_prev; 1673 coro_cctx *cctx_prev;
1376 1674
1377 if (expect_false (prev->flags & CF_NEW)) 1675 if (ecb_expect_false (prev->flags & CF_NEW))
1378 { 1676 {
1379 /* create a new empty/source context */ 1677 /* create a new empty/source context */
1380 prev->flags &= ~CF_NEW; 1678 prev->flags &= ~CF_NEW;
1381 prev->flags |= CF_RUNNING; 1679 prev->flags |= CF_RUNNING;
1382 } 1680 }
… …
1385 next->flags |= CF_RUNNING; 1683 next->flags |= CF_RUNNING;
1386 1684
1387 /* first get rid of the old state */ 1685 /* first get rid of the old state */
1388 save_perl (aTHX_ prev); 1686 save_perl (aTHX_ prev);
1389 1687
1390 if (expect_false (next->flags & CF_NEW)) 1688 if (ecb_expect_false (next->flags & CF_NEW))
1391 { 1689 {
1392 /* need to start coroutine */ 1690 /* need to start coroutine */
1393 next->flags &= ~CF_NEW; 1691 next->flags &= ~CF_NEW;
1394 /* setup coroutine call */ 1692 /* setup coroutine call */
1395 coro_setup (aTHX_ next); 1693 init_perl (aTHX_ next);
1396 } 1694 }
1397 else 1695 else
1398 load_perl (aTHX_ next); 1696 load_perl (aTHX_ next);
1399 1697
1400 assert (!prev->cctx);//D temporary
1401
1402 /* possibly untie and reuse the cctx */ 1698 /* possibly untie and reuse the cctx */
1403 if (expect_true ( 1699 if (ecb_expect_true (
1404 cctx_current->idle_sp == STACKLEVEL 1700 cctx_current->idle_sp == STACKLEVEL
1405 && !(cctx_current->flags & CC_TRACE) 1701 && !(cctx_current->flags & CC_TRACE)
1406 && !force_cctx 1702 && !force_cctx
1407 )) 1703 ))
1408 { 1704 {
1409 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1705 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1410 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1706 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1411 1707
1412 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1708 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1413 /* without this the next cctx_get might destroy the running cctx while still in use */ 1709 /* without this the next cctx_get might destroy the running cctx while still in use */
1414 if (expect_false (CCTX_EXPIRED (cctx_current))) 1710 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1415 if (expect_true (!next->cctx)) 1711 if (ecb_expect_true (!next->cctx))
1416 next->cctx = cctx_get (aTHX); 1712 next->cctx = cctx_get (aTHX);
1417 1713
1418 cctx_put (cctx_current); 1714 cctx_put (cctx_current);
1419 } 1715 }
1420 else 1716 else
1421 prev->cctx = cctx_current; 1717 prev->cctx = cctx_current;
1422 1718
1423 ++next->usecount; 1719 ++next->usecount;
1424 1720
1425 cctx_prev = cctx_current; 1721 cctx_prev = cctx_current;
1426 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1722 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1427 1723
1428 next->cctx = 0; 1724 next->cctx = 0;
1429 1725
1430 if (expect_false (cctx_prev != cctx_current)) 1726 if (ecb_expect_false (cctx_prev != cctx_current))
1431 { 1727 {
1432 cctx_prev->top_env = PL_top_env; 1728 cctx_prev->top_env = PL_top_env;
1433 PL_top_env = cctx_current->top_env; 1729 PL_top_env = cctx_current->top_env;
1434 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1730 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1435 } 1731 }
… …
1441#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1737#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1442#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1738#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1443 1739
1444/** high level stuff ********************************************************/ 1740/** high level stuff ********************************************************/
1445 1741
1742/* this function is actually Coro, not Coro::State, but we call it from here */
1743/* because it is convenient - but it hasn't been declared yet for that reason */
1446static int 1744static void
1745coro_call_on_destroy (pTHX_ struct coro *coro);
1746
1747static void
1447coro_state_destroy (pTHX_ struct coro *coro) 1748coro_state_destroy (pTHX_ struct coro *coro)
1448{ 1749{
1449 if (coro->flags & CF_DESTROYED) 1750 if (coro->flags & CF_ZOMBIE)
1450 return 0; 1751 return;
1451 1752
1452 if (coro->on_destroy)
1453 coro->on_destroy (aTHX_ coro); 1753 slf_destroy (aTHX_ coro);
1454 1754
1455 coro->flags |= CF_DESTROYED; 1755 coro->flags |= CF_ZOMBIE;
1456 1756
1457 if (coro->flags & CF_READY) 1757 if (coro->flags & CF_READY)
1458 { 1758 {
1459 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1759 /* reduce nready, as destroying a ready coro effectively unreadies it */
1460 /* alternative: look through all ready queues and remove the coro */ 1760 /* alternative: look through all ready queues and remove the coro */
1461 --coro_nready; 1761 --coro_nready;
1462 } 1762 }
1463 else 1763 else
1464 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1764 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1465 1765
1466 if (coro->mainstack && coro->mainstack != main_mainstack) 1766 if (coro->next) coro->next->prev = coro->prev;
1467 { 1767 if (coro->prev) coro->prev->next = coro->next;
1468 struct coro temp; 1768 if (coro == coro_first) coro_first = coro->next;
1469 1769
1470 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1770 if (coro->mainstack
1471 1771 && coro->mainstack != main_mainstack
1472 save_perl (aTHX_ &temp); 1772 && coro->slot
1773 && !PL_dirty)
1473 load_perl (aTHX_ coro); 1774 destroy_perl (aTHX_ coro);
1474
1475 coro_destruct (aTHX_ coro);
1476
1477 load_perl (aTHX_ &temp);
1478
1479 coro->slot = 0;
1480 }
1481 1775
1482 cctx_destroy (coro->cctx); 1776 cctx_destroy (coro->cctx);
1483 SvREFCNT_dec (coro->startcv); 1777 SvREFCNT_dec (coro->startcv);
1484 SvREFCNT_dec (coro->args); 1778 SvREFCNT_dec (coro->args);
1779 SvREFCNT_dec (coro->swap_sv);
1485 SvREFCNT_dec (CORO_THROW); 1780 SvREFCNT_dec (CORO_THROW);
1486 1781
1487 if (coro->next) coro->next->prev = coro->prev; 1782 coro_call_on_destroy (aTHX_ coro);
1488 if (coro->prev) coro->prev->next = coro->next;
1489 if (coro == coro_first) coro_first = coro->next;
1490 1783
1491 return 1; 1784 /* more destruction mayhem in coro_state_free */
1492} 1785}
1493 1786
1494static int 1787static int
1495coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1788coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1496{ 1789{
1497 struct coro *coro = (struct coro *)mg->mg_ptr; 1790 struct coro *coro = (struct coro *)mg->mg_ptr;
1498 mg->mg_ptr = 0; 1791 mg->mg_ptr = 0;
1499 1792
1500 coro->hv = 0;
1501
1502 if (--coro->refcnt < 0)
1503 {
1504 coro_state_destroy (aTHX_ coro); 1793 coro_state_destroy (aTHX_ coro);
1794 SvREFCNT_dec (coro->on_destroy);
1795 SvREFCNT_dec (coro->status);
1796
1505 Safefree (coro); 1797 Safefree (coro);
1506 }
1507 1798
1508 return 0; 1799 return 0;
1509} 1800}
1510 1801
1511static int 1802static int ecb_cold
1512coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1803coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1513{ 1804{
1514 struct coro *coro = (struct coro *)mg->mg_ptr; 1805 /* called when perl clones the current process the slow way (windows process emulation) */
1515 1806 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1516 ++coro->refcnt; 1807 mg->mg_ptr = 0;
1808 mg->mg_virtual = 0;
1517 1809
1518 return 0; 1810 return 0;
1519} 1811}
1520 1812
1521static MGVTBL coro_state_vtbl = { 1813static MGVTBL coro_state_vtbl = {
… …
1544 1836
1545 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1837 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1546 TRANSFER (ta, 1); 1838 TRANSFER (ta, 1);
1547} 1839}
1548 1840
1549/*****************************************************************************/
1550/* gensub: simple closure generation utility */
1551
1552#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1553
1554/* create a closure from XS, returns a code reference */
1555/* the arg can be accessed via GENSUB_ARG from the callback */
1556/* the callback must use dXSARGS/XSRETURN */
1557static SV *
1558gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1559{
1560 CV *cv = (CV *)newSV (0);
1561
1562 sv_upgrade ((SV *)cv, SVt_PVCV);
1563
1564 CvANON_on (cv);
1565 CvISXSUB_on (cv);
1566 CvXSUB (cv) = xsub;
1567 GENSUB_ARG = arg;
1568
1569 return newRV_noinc ((SV *)cv);
1570}
1571
1572/** Coro ********************************************************************/ 1841/** Coro ********************************************************************/
1573 1842
1574INLINE void 1843ecb_inline void
1575coro_enq (pTHX_ struct coro *coro) 1844coro_enq (pTHX_ struct coro *coro)
1576{ 1845{
1577 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1846 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1578}
1579 1847
1580INLINE SV * 1848 SvREFCNT_inc_NN (coro->hv);
1849
1850 coro->next_ready = 0;
1851 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1852 ready [1] = coro;
1853}
1854
1855ecb_inline struct coro *
1581coro_deq (pTHX) 1856coro_deq (pTHX)
1582{ 1857{
1583 int prio; 1858 int prio;
1584 1859
1585 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1860 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1586 if (AvFILLp (coro_ready [prio]) >= 0) 1861 {
1587 return av_shift (coro_ready [prio]); 1862 struct coro **ready = coro_ready [prio];
1863
1864 if (ready [0])
1865 {
1866 struct coro *coro = ready [0];
1867 ready [0] = coro->next_ready;
1868 return coro;
1869 }
1870 }
1588 1871
1589 return 0; 1872 return 0;
1873}
1874
1875static void
1876invoke_sv_ready_hook_helper (void)
1877{
1878 dTHX;
1879 dSP;
1880
1881 ENTER;
1882 SAVETMPS;
1883
1884 PUSHMARK (SP);
1885 PUTBACK;
1886 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1887
1888 FREETMPS;
1889 LEAVE;
1590} 1890}
1591 1891
1592static int 1892static int
1593api_ready (pTHX_ SV *coro_sv) 1893api_ready (pTHX_ SV *coro_sv)
1594{ 1894{
1595 struct coro *coro;
1596 SV *sv_hook;
1597 void (*xs_hook)(void);
1598
1599 coro = SvSTATE (coro_sv); 1895 struct coro *coro = SvSTATE (coro_sv);
1600 1896
1601 if (coro->flags & CF_READY) 1897 if (coro->flags & CF_READY)
1602 return 0; 1898 return 0;
1603 1899
1604 coro->flags |= CF_READY; 1900 coro->flags |= CF_READY;
1605 1901
1606 sv_hook = coro_nready ? 0 : coro_readyhook;
1607 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1608
1609 coro_enq (aTHX_ coro); 1902 coro_enq (aTHX_ coro);
1610 ++coro_nready;
1611 1903
1612 if (sv_hook) 1904 if (!coro_nready++)
1613 { 1905 if (coroapi.readyhook)
1614 dSP; 1906 coroapi.readyhook ();
1615
1616 ENTER;
1617 SAVETMPS;
1618
1619 PUSHMARK (SP);
1620 PUTBACK;
1621 call_sv (sv_hook, G_VOID | G_DISCARD);
1622
1623 FREETMPS;
1624 LEAVE;
1625 }
1626
1627 if (xs_hook)
1628 xs_hook ();
1629 1907
1630 return 1; 1908 return 1;
1631} 1909}
1632 1910
1633static int 1911static int
… …
1635{ 1913{
1636 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1914 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1637} 1915}
1638 1916
1639/* expects to own a reference to next->hv */ 1917/* expects to own a reference to next->hv */
1640INLINE void 1918ecb_inline void
1641prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1919prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1642{ 1920{
1643 SV *prev_sv = SvRV (coro_current); 1921 SV *prev_sv = SvRV (coro_current);
1644 1922
1645 ta->prev = SvSTATE_hv (prev_sv); 1923 ta->prev = SvSTATE_hv (prev_sv);
… …
1656static void 1934static void
1657prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1935prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1658{ 1936{
1659 for (;;) 1937 for (;;)
1660 { 1938 {
1661 SV *next_sv = coro_deq (aTHX); 1939 struct coro *next = coro_deq (aTHX);
1662 1940
1663 if (expect_true (next_sv)) 1941 if (ecb_expect_true (next))
1664 { 1942 {
1665 struct coro *next = SvSTATE_hv (next_sv);
1666
1667 /* cannot transfer to destroyed coros, skip and look for next */ 1943 /* cannot transfer to destroyed coros, skip and look for next */
1668 if (expect_false (next->flags & CF_DESTROYED)) 1944 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1669 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1945 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1670 else 1946 else
1671 { 1947 {
1672 next->flags &= ~CF_READY; 1948 next->flags &= ~CF_READY;
1673 --coro_nready; 1949 --coro_nready;
1674 1950
… …
1680 { 1956 {
1681 /* nothing to schedule: call the idle handler */ 1957 /* nothing to schedule: call the idle handler */
1682 if (SvROK (sv_idle) 1958 if (SvROK (sv_idle)
1683 && SvOBJECT (SvRV (sv_idle))) 1959 && SvOBJECT (SvRV (sv_idle)))
1684 { 1960 {
1961 if (SvRV (sv_idle) == SvRV (coro_current))
1962 {
1963 require_pv ("Carp");
1964
1965 {
1966 dSP;
1967
1968 ENTER;
1969 SAVETMPS;
1970
1971 PUSHMARK (SP);
1972 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1973 PUTBACK;
1974 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1975
1976 FREETMPS;
1977 LEAVE;
1978 }
1979 }
1980
1685 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1981 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1686 api_ready (aTHX_ SvRV (sv_idle)); 1982 api_ready (aTHX_ SvRV (sv_idle));
1687 --coro_nready; 1983 --coro_nready;
1688 } 1984 }
1689 else 1985 else
1690 { 1986 {
1987 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1691 dSP; 1988 dSP;
1692 1989
1693 ENTER; 1990 ENTER;
1694 SAVETMPS; 1991 SAVETMPS;
1695 1992
… …
1702 } 1999 }
1703 } 2000 }
1704 } 2001 }
1705} 2002}
1706 2003
1707INLINE void 2004ecb_inline void
1708prepare_cede (pTHX_ struct coro_transfer_args *ta) 2005prepare_cede (pTHX_ struct coro_transfer_args *ta)
1709{ 2006{
1710 api_ready (aTHX_ coro_current); 2007 api_ready (aTHX_ coro_current);
1711 prepare_schedule (aTHX_ ta); 2008 prepare_schedule (aTHX_ ta);
1712} 2009}
1713 2010
1714INLINE void 2011ecb_inline void
1715prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2012prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1716{ 2013{
1717 SV *prev = SvRV (coro_current); 2014 SV *prev = SvRV (coro_current);
1718 2015
1719 if (coro_nready) 2016 if (coro_nready)
… …
1749{ 2046{
1750 struct coro_transfer_args ta; 2047 struct coro_transfer_args ta;
1751 2048
1752 prepare_cede (aTHX_ &ta); 2049 prepare_cede (aTHX_ &ta);
1753 2050
1754 if (expect_true (ta.prev != ta.next)) 2051 if (ecb_expect_true (ta.prev != ta.next))
1755 { 2052 {
1756 TRANSFER (ta, 1); 2053 TRANSFER (ta, 1);
1757 return 1; 2054 return 1;
1758 } 2055 }
1759 else 2056 else
… …
1802 coro->slot->runops = RUNOPS_DEFAULT; 2099 coro->slot->runops = RUNOPS_DEFAULT;
1803 } 2100 }
1804} 2101}
1805 2102
1806static void 2103static void
2104coro_push_av (pTHX_ AV *av, I32 gimme_v)
2105{
2106 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2107 {
2108 dSP;
2109
2110 if (gimme_v == G_SCALAR)
2111 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2112 else
2113 {
2114 int i;
2115 EXTEND (SP, AvFILLp (av) + 1);
2116
2117 for (i = 0; i <= AvFILLp (av); ++i)
2118 PUSHs (AvARRAY (av)[i]);
2119 }
2120
2121 PUTBACK;
2122 }
2123}
2124
2125static void
2126coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2127{
2128 if (!coro->on_destroy)
2129 coro->on_destroy = newAV ();
2130
2131 av_push (coro->on_destroy, cb);
2132}
2133
2134static void
2135slf_destroy_join (pTHX_ struct CoroSLF *frame)
2136{
2137 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2138}
2139
2140static int
2141slf_check_join (pTHX_ struct CoroSLF *frame)
2142{
2143 struct coro *coro = (struct coro *)frame->data;
2144
2145 if (!coro->status)
2146 return 1;
2147
2148 frame->destroy = 0;
2149
2150 coro_push_av (aTHX_ coro->status, GIMME_V);
2151
2152 SvREFCNT_dec ((SV *)coro->hv);
2153
2154 return 0;
2155}
2156
2157static void
2158slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2159{
2160 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2161
2162 if (items > 1)
2163 croak ("join called with too many arguments");
2164
2165 if (coro->status)
2166 frame->prepare = prepare_nop;
2167 else
2168 {
2169 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2170 frame->prepare = prepare_schedule;
2171 }
2172
2173 frame->check = slf_check_join;
2174 frame->destroy = slf_destroy_join;
2175 frame->data = (void *)coro;
2176 SvREFCNT_inc (coro->hv);
2177}
2178
2179static void
1807coro_call_on_destroy (pTHX_ struct coro *coro) 2180coro_call_on_destroy (pTHX_ struct coro *coro)
1808{ 2181{
1809 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2182 AV *od = coro->on_destroy;
1810 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1811 2183
1812 if (on_destroyp) 2184 if (!od)
1813 { 2185 return;
1814 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1815 2186
2187 coro->on_destroy = 0;
2188 sv_2mortal ((SV *)od);
2189
1816 while (AvFILLp (on_destroy) >= 0) 2190 while (AvFILLp (od) >= 0)
2191 {
2192 SV *cb = sv_2mortal (av_pop (od));
2193
2194 /* coro hv's (and only hv's at the moment) are supported as well */
2195 if (SvSTATEhv_p (aTHX_ cb))
2196 api_ready (aTHX_ cb);
2197 else
1817 { 2198 {
1818 dSP; /* don't disturb outer sp */ 2199 dSP; /* don't disturb outer sp */
1819 SV *cb = av_pop (on_destroy);
1820
1821 PUSHMARK (SP); 2200 PUSHMARK (SP);
1822 2201
1823 if (statusp) 2202 if (coro->status)
1824 { 2203 {
1825 int i; 2204 PUTBACK;
1826 AV *status = (AV *)SvRV (*statusp); 2205 coro_push_av (aTHX_ coro->status, G_ARRAY);
1827 EXTEND (SP, AvFILLp (status) + 1); 2206 SPAGAIN;
1828
1829 for (i = 0; i <= AvFILLp (status); ++i)
1830 PUSHs (AvARRAY (status)[i]);
1831 } 2207 }
1832 2208
1833 PUTBACK; 2209 PUTBACK;
1834 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2210 call_sv (cb, G_VOID | G_DISCARD);
1835 } 2211 }
1836 } 2212 }
1837} 2213}
1838 2214
1839static void 2215static void
1840slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2216coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1841{ 2217{
2218 AV *av;
2219
2220 if (coro->status)
2221 {
2222 av = coro->status;
2223 av_clear (av);
2224 }
2225 else
2226 av = coro->status = newAV ();
2227
2228 /* items are actually not so common, so optimise for this case */
2229 if (items)
2230 {
1842 int i; 2231 int i;
1843 HV *hv = (HV *)SvRV (coro_current);
1844 AV *av = newAV ();
1845 2232
1846 av_extend (av, items - 1); 2233 av_extend (av, items - 1);
2234
1847 for (i = 0; i < items; ++i) 2235 for (i = 0; i < items; ++i)
1848 av_push (av, SvREFCNT_inc_NN (arg [i])); 2236 av_push (av, SvREFCNT_inc_NN (arg [i]));
2237 }
2238}
1849 2239
1850 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2240static void
1851 2241slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2242{
1852 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2243 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1853 api_ready (aTHX_ sv_manager); 2244 api_ready (aTHX_ sv_manager);
1854 2245
1855 frame->prepare = prepare_schedule; 2246 frame->prepare = prepare_schedule;
1856 frame->check = slf_check_repeat; 2247 frame->check = slf_check_repeat;
2248
2249 /* as a minor optimisation, we could unwind all stacks here */
2250 /* but that puts extra pressure on pp_slf, and is not worth much */
2251 /*coro_unwind_stacks (aTHX);*/
2252}
2253
2254static void
2255slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2256{
2257 HV *coro_hv = (HV *)SvRV (coro_current);
2258
2259 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2260 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2261}
2262
2263static void
2264slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2265{
2266 HV *coro_hv;
2267 struct coro *coro;
2268
2269 if (items <= 0)
2270 croak ("Coro::cancel called without coro object,");
2271
2272 coro = SvSTATE (arg [0]);
2273 coro_hv = coro->hv;
2274
2275 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2276
2277 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2278 {
2279 /* coro currently busy cancelling something, so just notify it */
2280 coro->slf_frame.data = (void *)coro;
2281
2282 frame->prepare = prepare_nop;
2283 frame->check = slf_check_nop;
2284 }
2285 else if (coro_hv == (HV *)SvRV (coro_current))
2286 {
2287 /* cancelling the current coro is allowed, and equals terminate */
2288 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2289 }
2290 else
2291 {
2292 struct coro *self = SvSTATE_current;
2293
2294 if (!self)
2295 croak ("Coro::cancel called outside of thread content,");
2296
2297 /* otherwise we cancel directly, purely for speed reasons
2298 * unfortunately, this requires some magic trickery, as
2299 * somebody else could cancel us, so we have to fight the cancellation.
2300 * this is ugly, and hopefully fully worth the extra speed.
2301 * besides, I can't get the slow-but-safe version working...
2302 */
2303 slf_frame.data = 0;
2304 self->flags |= CF_NOCANCEL;
2305 coro_state_destroy (aTHX_ coro);
2306 self->flags &= ~CF_NOCANCEL;
2307
2308 if (slf_frame.data)
2309 {
2310 /* while we were busy we have been cancelled, so terminate */
2311 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2312 }
2313 else
2314 {
2315 frame->prepare = prepare_nop;
2316 frame->check = slf_check_nop;
2317 }
2318 }
2319}
2320
2321static int
2322slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2323{
2324 frame->prepare = 0;
2325 coro_unwind_stacks (aTHX);
2326
2327 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2328
2329 return 1;
2330}
2331
2332static int
2333safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2334{
2335 if (coro->cctx)
2336 croak ("coro inside C callback, unable to cancel at this time, caught");
2337
2338 if (coro->flags & CF_NEW)
2339 {
2340 coro_set_status (aTHX_ coro, arg, items);
2341 coro_state_destroy (aTHX_ coro);
2342 }
2343 else
2344 {
2345 if (!coro->slf_frame.prepare)
2346 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2347
2348 slf_destroy (aTHX_ coro);
2349
2350 coro_set_status (aTHX_ coro, arg, items);
2351 coro->slf_frame.prepare = prepare_nop;
2352 coro->slf_frame.check = slf_check_safe_cancel;
2353
2354 api_ready (aTHX_ (SV *)coro->hv);
2355 }
2356
2357 return 1;
1857} 2358}
1858 2359
1859/*****************************************************************************/ 2360/*****************************************************************************/
1860/* async pool handler */ 2361/* async pool handler */
1861 2362
… …
1892slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2393slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1893{ 2394{
1894 HV *hv = (HV *)SvRV (coro_current); 2395 HV *hv = (HV *)SvRV (coro_current);
1895 struct coro *coro = SvSTATE_hv ((SV *)hv); 2396 struct coro *coro = SvSTATE_hv ((SV *)hv);
1896 2397
1897 if (expect_true (coro->saved_deffh)) 2398 if (ecb_expect_true (coro->saved_deffh))
1898 { 2399 {
1899 /* subsequent iteration */ 2400 /* subsequent iteration */
1900 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2401 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1901 coro->saved_deffh = 0; 2402 coro->saved_deffh = 0;
1902 2403
1903 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2404 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1904 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2405 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1905 { 2406 {
1906 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2407 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1907 coro->invoke_av = newAV (); 2408 return;
1908
1909 frame->prepare = prepare_nop;
1910 } 2409 }
1911 else 2410 else
1912 { 2411 {
1913 av_clear (GvAV (PL_defgv)); 2412 av_clear (GvAV (PL_defgv));
1914 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2413 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
1939 2438
1940static void 2439static void
1941coro_rouse_callback (pTHX_ CV *cv) 2440coro_rouse_callback (pTHX_ CV *cv)
1942{ 2441{
1943 dXSARGS; 2442 dXSARGS;
1944 SV *data = (SV *)GENSUB_ARG; 2443 SV *data = (SV *)S_GENSUB_ARG;
1945 2444
1946 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2445 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1947 { 2446 {
1948 /* first call, set args */ 2447 /* first call, set args */
2448 SV *coro = SvRV (data);
1949 AV *av = newAV (); 2449 AV *av = newAV ();
1950 SV *coro = SvRV (data);
1951 2450
1952 SvRV_set (data, (SV *)av); 2451 SvRV_set (data, (SV *)av);
1953 api_ready (aTHX_ coro);
1954 SvREFCNT_dec (coro);
1955 2452
1956 /* better take a full copy of the arguments */ 2453 /* better take a full copy of the arguments */
1957 while (items--) 2454 while (items--)
1958 av_store (av, items, newSVsv (ST (items))); 2455 av_store (av, items, newSVsv (ST (items)));
2456
2457 api_ready (aTHX_ coro);
2458 SvREFCNT_dec (coro);
1959 } 2459 }
1960 2460
1961 XSRETURN_EMPTY; 2461 XSRETURN_EMPTY;
1962} 2462}
1963 2463
1964static int 2464static int
1965slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2465slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
1966{ 2466{
1967 SV *data = (SV *)frame->data; 2467 SV *data = (SV *)frame->data;
1968 2468
1969 if (CORO_THROW) 2469 if (CORO_THROW)
1970 return 0; 2470 return 0;
1971 2471
1972 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2472 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1973 return 1; 2473 return 1;
… …
1980 2480
1981 EXTEND (SP, AvFILLp (av) + 1); 2481 EXTEND (SP, AvFILLp (av) + 1);
1982 for (i = 0; i <= AvFILLp (av); ++i) 2482 for (i = 0; i <= AvFILLp (av); ++i)
1983 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2483 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1984 2484
1985 /* we have stolen the elements, so ste length to zero and free */ 2485 /* we have stolen the elements, so set length to zero and free */
1986 AvFILLp (av) = -1; 2486 AvFILLp (av) = -1;
1987 av_undef (av); 2487 av_undef (av);
1988 2488
1989 PUTBACK; 2489 PUTBACK;
1990 } 2490 }
… …
2009 cb = sv_2mortal (coro->rouse_cb); 2509 cb = sv_2mortal (coro->rouse_cb);
2010 coro->rouse_cb = 0; 2510 coro->rouse_cb = 0;
2011 } 2511 }
2012 2512
2013 if (!SvROK (cb) 2513 if (!SvROK (cb)
2014 || SvTYPE (SvRV (cb)) != SVt_PVCV 2514 || SvTYPE (SvRV (cb)) != SVt_PVCV
2015 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2515 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2016 croak ("Coro::rouse_wait called with illegal callback argument,"); 2516 croak ("Coro::rouse_wait called with illegal callback argument,");
2017 2517
2018 { 2518 {
2019 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2519 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2020 SV *data = (SV *)GENSUB_ARG; 2520 SV *data = (SV *)S_GENSUB_ARG;
2021 2521
2022 frame->data = (void *)data; 2522 frame->data = (void *)data;
2023 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2523 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2024 frame->check = slf_check_rouse_wait; 2524 frame->check = slf_check_rouse_wait;
2025 } 2525 }
… …
2029coro_new_rouse_cb (pTHX) 2529coro_new_rouse_cb (pTHX)
2030{ 2530{
2031 HV *hv = (HV *)SvRV (coro_current); 2531 HV *hv = (HV *)SvRV (coro_current);
2032 struct coro *coro = SvSTATE_hv (hv); 2532 struct coro *coro = SvSTATE_hv (hv);
2033 SV *data = newRV_inc ((SV *)hv); 2533 SV *data = newRV_inc ((SV *)hv);
2034 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2534 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2035 2535
2036 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2536 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2037 SvREFCNT_dec (data); /* magicext increases the refcount */ 2537 SvREFCNT_dec (data); /* magicext increases the refcount */
2038 2538
2039 SvREFCNT_dec (coro->rouse_cb); 2539 SvREFCNT_dec (coro->rouse_cb);
… …
2136static void 2636static void
2137slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2637slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2138{ 2638{
2139 frame->prepare = prepare_cede_notself; 2639 frame->prepare = prepare_cede_notself;
2140 frame->check = slf_check_nop; 2640 frame->check = slf_check_nop;
2641}
2642
2643/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2644static void
2645slf_destroy (pTHX_ struct coro *coro)
2646{
2647 struct CoroSLF frame = coro->slf_frame;
2648
2649 /*
2650 * The on_destroy below most likely is from an SLF call.
2651 * Since by definition the SLF call will not finish when we destroy
2652 * the coro, we will have to force-finish it here, otherwise
2653 * cleanup functions cannot call SLF functions.
2654 */
2655 coro->slf_frame.prepare = 0;
2656
2657 /* this callback is reserved for slf functions needing to do cleanup */
2658 if (frame.destroy && frame.prepare && !PL_dirty)
2659 frame.destroy (aTHX_ &frame);
2141} 2660}
2142 2661
2143/* 2662/*
2144 * these not obviously related functions are all rolled into one 2663 * these not obviously related functions are all rolled into one
2145 * function to increase chances that they all will call transfer with the same 2664 * function to increase chances that they all will call transfer with the same
… …
2152 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2671 I32 checkmark; /* mark SP to see how many elements check has pushed */
2153 2672
2154 /* set up the slf frame, unless it has already been set-up */ 2673 /* set up the slf frame, unless it has already been set-up */
2155 /* the latter happens when a new coro has been started */ 2674 /* the latter happens when a new coro has been started */
2156 /* or when a new cctx was attached to an existing coroutine */ 2675 /* or when a new cctx was attached to an existing coroutine */
2157 if (expect_true (!slf_frame.prepare)) 2676 if (ecb_expect_true (!slf_frame.prepare))
2158 { 2677 {
2159 /* first iteration */ 2678 /* first iteration */
2160 dSP; 2679 dSP;
2161 SV **arg = PL_stack_base + TOPMARK + 1; 2680 SV **arg = PL_stack_base + TOPMARK + 1;
2162 int items = SP - arg; /* args without function object */ 2681 int items = SP - arg; /* args without function object */
… …
2203 while (slf_frame.check (aTHX_ &slf_frame)); 2722 while (slf_frame.check (aTHX_ &slf_frame));
2204 2723
2205 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2724 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2206 2725
2207 /* exception handling */ 2726 /* exception handling */
2208 if (expect_false (CORO_THROW)) 2727 if (ecb_expect_false (CORO_THROW))
2209 { 2728 {
2210 SV *exception = sv_2mortal (CORO_THROW); 2729 SV *exception = sv_2mortal (CORO_THROW);
2211 2730
2212 CORO_THROW = 0; 2731 CORO_THROW = 0;
2213 sv_setsv (ERRSV, exception); 2732 sv_setsv (ERRSV, exception);
2214 croak (0); 2733 croak (0);
2215 } 2734 }
2216 2735
2217 /* return value handling - mostly like entersub */ 2736 /* return value handling - mostly like entersub */
2218 /* make sure we put something on the stack in scalar context */ 2737 /* make sure we put something on the stack in scalar context */
2219 if (GIMME_V == G_SCALAR) 2738 if (GIMME_V == G_SCALAR
2739 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2220 { 2740 {
2221 dSP; 2741 dSP;
2222 SV **bot = PL_stack_base + checkmark; 2742 SV **bot = PL_stack_base + checkmark;
2223 2743
2224 if (sp == bot) /* too few, push undef */ 2744 if (sp == bot) /* too few, push undef */
2225 bot [1] = &PL_sv_undef; 2745 bot [1] = &PL_sv_undef;
2226 else if (sp != bot + 1) /* too many, take last one */ 2746 else /* too many, take last one */
2227 bot [1] = *sp; 2747 bot [1] = *sp;
2228 2748
2229 SP = bot + 1; 2749 SP = bot + 1;
2230 2750
2231 PUTBACK; 2751 PUTBACK;
… …
2264 if (PL_op->op_flags & OPf_STACKED) 2784 if (PL_op->op_flags & OPf_STACKED)
2265 { 2785 {
2266 if (items > slf_arga) 2786 if (items > slf_arga)
2267 { 2787 {
2268 slf_arga = items; 2788 slf_arga = items;
2269 free (slf_argv); 2789 Safefree (slf_argv);
2270 slf_argv = malloc (slf_arga * sizeof (SV *)); 2790 New (0, slf_argv, slf_arga, SV *);
2271 } 2791 }
2272 2792
2273 slf_argc = items; 2793 slf_argc = items;
2274 2794
2275 for (i = 0; i < items; ++i) 2795 for (i = 0; i < items; ++i)
… …
2280 2800
2281 PL_op->op_ppaddr = pp_slf; 2801 PL_op->op_ppaddr = pp_slf;
2282 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2802 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2283 2803
2284 PL_op = (OP *)&slf_restore; 2804 PL_op = (OP *)&slf_restore;
2805}
2806
2807/*****************************************************************************/
2808/* dynamic wind */
2809
2810static void
2811on_enterleave_call (pTHX_ SV *cb)
2812{
2813 dSP;
2814
2815 PUSHSTACK;
2816
2817 PUSHMARK (SP);
2818 PUTBACK;
2819 call_sv (cb, G_VOID | G_DISCARD);
2820 SPAGAIN;
2821
2822 POPSTACK;
2823}
2824
2825static SV *
2826coro_avp_pop_and_free (pTHX_ AV **avp)
2827{
2828 AV *av = *avp;
2829 SV *res = av_pop (av);
2830
2831 if (AvFILLp (av) < 0)
2832 {
2833 *avp = 0;
2834 SvREFCNT_dec (av);
2835 }
2836
2837 return res;
2838}
2839
2840static void
2841coro_pop_on_enter (pTHX_ void *coro)
2842{
2843 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2844 SvREFCNT_dec (cb);
2845}
2846
2847static void
2848coro_pop_on_leave (pTHX_ void *coro)
2849{
2850 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2851 on_enterleave_call (aTHX_ sv_2mortal (cb));
2852}
2853
2854static void
2855enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2856{
2857 if (!hook)
2858 return;
2859
2860 if (!*avp)
2861 {
2862 *avp = newAV ();
2863 AvREAL_off (*avp);
2864 }
2865
2866 av_push (*avp, (SV *)hook);
2867 av_push (*avp, (SV *)arg);
2868}
2869
2870static void
2871enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2872{
2873 AV *av = *avp;
2874 int i;
2875
2876 if (!av)
2877 return;
2878
2879 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2880 if (AvARRAY (av)[i] == (SV *)hook)
2881 {
2882 if (execute)
2883 hook ((void *)AvARRAY (av)[i + 1]);
2884
2885 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2886 av_pop (av);
2887 av_pop (av);
2888 break;
2889 }
2890
2891 if (AvFILLp (av) >= 0)
2892 {
2893 *avp = 0;
2894 SvREFCNT_dec_NN (av);
2895 }
2896}
2897
2898static void
2899api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2900{
2901 struct coro *coro = SvSTATE (coro_sv);
2902
2903 if (SvSTATE_current == coro)
2904 if (enter)
2905 enter (aTHX enter_arg);
2906
2907 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2908 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2909}
2910
2911static void
2912api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2913{
2914 struct coro *coro = SvSTATE (coro_sv);
2915
2916 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2917 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2918}
2919
2920static void
2921savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2922{
2923 struct coro *coro = SvSTATE_current;
2924
2925 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2926}
2927
2928static void
2929savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2930{
2931 struct coro *coro = SvSTATE_current;
2932
2933 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2934}
2935
2936static void
2937api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2938{
2939 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2940
2941 /* this ought to be much cheaper than malloc + a single destructor call */
2942 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2943 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2285} 2944}
2286 2945
2287/*****************************************************************************/ 2946/*****************************************************************************/
2288/* PerlIO::cede */ 2947/* PerlIO::cede */
2289 2948
… …
2291{ 2950{
2292 PerlIOBuf base; 2951 PerlIOBuf base;
2293 NV next, every; 2952 NV next, every;
2294} PerlIOCede; 2953} PerlIOCede;
2295 2954
2296static IV 2955static IV ecb_cold
2297PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2956PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2298{ 2957{
2299 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2958 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2300 2959
2301 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2960 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2302 self->next = nvtime () + self->every; 2961 self->next = nvtime () + self->every;
2303 2962
2304 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2963 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2305} 2964}
2306 2965
2307static SV * 2966static SV * ecb_cold
2308PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2967PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2309{ 2968{
2310 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2969 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2311 2970
2312 return newSVnv (self->every); 2971 return newSVnv (self->every);
… …
2363/* Coro::Semaphore & Coro::Signal */ 3022/* Coro::Semaphore & Coro::Signal */
2364 3023
2365static SV * 3024static SV *
2366coro_waitarray_new (pTHX_ int count) 3025coro_waitarray_new (pTHX_ int count)
2367{ 3026{
2368 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3027 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2369 AV *av = newAV (); 3028 AV *av = newAV ();
2370 SV **ary; 3029 SV **ary;
2371 3030
2372 /* unfortunately, building manually saves memory */ 3031 /* unfortunately, building manually saves memory */
2373 Newx (ary, 2, SV *); 3032 Newx (ary, 2, SV *);
2374 AvALLOC (av) = ary; 3033 AvALLOC (av) = ary;
3034#if PERL_VERSION_ATLEAST (5,10,0)
2375 /*AvARRAY (av) = ary;*/ 3035 AvARRAY (av) = ary;
3036#else
2376 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 3037 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
3038 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
3039 SvPVX ((SV *)av) = (char *)ary;
3040#endif
2377 AvMAX (av) = 1; 3041 AvMAX (av) = 1;
2378 AvFILLp (av) = 0; 3042 AvFILLp (av) = 0;
2379 ary [0] = newSViv (count); 3043 ary [0] = newSViv (count);
2380 3044
2381 return newRV_noinc ((SV *)av); 3045 return newRV_noinc ((SV *)av);
… …
2414 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3078 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2415 PUTBACK; 3079 PUTBACK;
2416 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3080 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2417 } 3081 }
2418 3082
2419 SvREFCNT_dec (cb); 3083 SvREFCNT_dec_NN (cb);
2420 } 3084 }
2421} 3085}
2422 3086
2423static void 3087static void
2424coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3088coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2425{ 3089{
2426 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3090 /* call $sem->adjust (0) to possibly wake up some other waiters */
2427 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3091 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2428} 3092}
2429 3093
2430static int 3094static int
2431slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3095slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2432{ 3096{
2433 AV *av = (AV *)frame->data; 3097 AV *av = (AV *)frame->data;
2434 SV *count_sv = AvARRAY (av)[0]; 3098 SV *count_sv = AvARRAY (av)[0];
3099 SV *coro_hv = SvRV (coro_current);
3100
3101 frame->destroy = 0;
2435 3102
2436 /* if we are about to throw, don't actually acquire the lock, just throw */ 3103 /* if we are about to throw, don't actually acquire the lock, just throw */
2437 if (CORO_THROW) 3104 if (ecb_expect_false (CORO_THROW))
3105 {
3106 /* we still might be responsible for the semaphore, so wake up others */
3107 coro_semaphore_adjust (aTHX_ av, 0);
3108
2438 return 0; 3109 return 0;
3110 }
2439 else if (SvIVX (count_sv) > 0) 3111 else if (SvIVX (count_sv) > 0)
2440 { 3112 {
2441 SvSTATE_current->on_destroy = 0;
2442
2443 if (acquire) 3113 if (acquire)
2444 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3114 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2445 else 3115 else
2446 coro_semaphore_adjust (aTHX_ av, 0); 3116 coro_semaphore_adjust (aTHX_ av, 0);
2447 3117
… …
2451 { 3121 {
2452 int i; 3122 int i;
2453 /* if we were woken up but can't down, we look through the whole */ 3123 /* if we were woken up but can't down, we look through the whole */
2454 /* waiters list and only add us if we aren't in there already */ 3124 /* waiters list and only add us if we aren't in there already */
2455 /* this avoids some degenerate memory usage cases */ 3125 /* this avoids some degenerate memory usage cases */
2456 3126 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2457 for (i = 1; i <= AvFILLp (av); ++i)
2458 if (AvARRAY (av)[i] == SvRV (coro_current)) 3127 if (AvARRAY (av)[i] == coro_hv)
2459 return 1; 3128 return 1;
2460 3129
2461 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3130 av_push (av, SvREFCNT_inc (coro_hv));
2462 return 1; 3131 return 1;
2463 } 3132 }
2464} 3133}
2465 3134
2466static int 3135static int
… …
2489 { 3158 {
2490 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3159 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2491 3160
2492 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3161 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2493 frame->prepare = prepare_schedule; 3162 frame->prepare = prepare_schedule;
2494
2495 /* to avoid race conditions when a woken-up coro gets terminated */ 3163 /* to avoid race conditions when a woken-up coro gets terminated */
2496 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3164 /* we arrange for a temporary on_destroy that calls adjust (0) */
2497 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3165 frame->destroy = coro_semaphore_destroy;
2498 } 3166 }
2499} 3167}
2500 3168
2501static void 3169static void
2502slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3170slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2510{ 3178{
2511 if (items >= 2) 3179 if (items >= 2)
2512 { 3180 {
2513 /* callback form */ 3181 /* callback form */
2514 AV *av = (AV *)SvRV (arg [0]); 3182 AV *av = (AV *)SvRV (arg [0]);
2515 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3183 SV *cb_cv = s_get_cv_croak (arg [1]);
2516 3184
2517 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3185 av_push (av, SvREFCNT_inc_NN (cb_cv));
2518 3186
2519 if (SvIVX (AvARRAY (av)[0]) > 0) 3187 if (SvIVX (AvARRAY (av)[0]) > 0)
2520 coro_semaphore_adjust (aTHX_ av, 0); 3188 coro_semaphore_adjust (aTHX_ av, 0);
2521 3189
2522 frame->prepare = prepare_nop; 3190 frame->prepare = prepare_nop;
… …
2546 AvARRAY (av)[0] = AvARRAY (av)[1]; 3214 AvARRAY (av)[0] = AvARRAY (av)[1];
2547 AvARRAY (av)[1] = cb; 3215 AvARRAY (av)[1] = cb;
2548 3216
2549 cb = av_shift (av); 3217 cb = av_shift (av);
2550 3218
3219 if (SvTYPE (cb) == SVt_PVCV)
3220 {
3221 dSP;
3222 PUSHMARK (SP);
3223 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3224 PUTBACK;
3225 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3226 }
3227 else
3228 {
2551 api_ready (aTHX_ cb); 3229 api_ready (aTHX_ cb);
2552 sv_setiv (cb, 0); /* signal waiter */ 3230 sv_setiv (cb, 0); /* signal waiter */
3231 }
3232
2553 SvREFCNT_dec (cb); 3233 SvREFCNT_dec_NN (cb);
2554 3234
2555 --count; 3235 --count;
2556 } 3236 }
2557} 3237}
2558 3238
… …
2566static void 3246static void
2567slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3247slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2568{ 3248{
2569 AV *av = (AV *)SvRV (arg [0]); 3249 AV *av = (AV *)SvRV (arg [0]);
2570 3250
3251 if (items >= 2)
3252 {
3253 SV *cb_cv = s_get_cv_croak (arg [1]);
3254 av_push (av, SvREFCNT_inc_NN (cb_cv));
3255
2571 if (SvIVX (AvARRAY (av)[0])) 3256 if (SvIVX (AvARRAY (av)[0]))
3257 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3258
3259 frame->prepare = prepare_nop;
3260 frame->check = slf_check_nop;
3261 }
3262 else if (SvIVX (AvARRAY (av)[0]))
2572 { 3263 {
2573 SvIVX (AvARRAY (av)[0]) = 0; 3264 SvIVX (AvARRAY (av)[0]) = 0;
2574 frame->prepare = prepare_nop; 3265 frame->prepare = prepare_nop;
2575 frame->check = slf_check_nop; 3266 frame->check = slf_check_nop;
2576 } 3267 }
2577 else 3268 else
2578 { 3269 {
2579 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3270 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2580 3271
2581 av_push (av, waiter); 3272 av_push (av, waiter);
2582 3273
2583 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3274 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2584 frame->prepare = prepare_schedule; 3275 frame->prepare = prepare_schedule;
… …
2602 3293
2603static void 3294static void
2604coro_aio_callback (pTHX_ CV *cv) 3295coro_aio_callback (pTHX_ CV *cv)
2605{ 3296{
2606 dXSARGS; 3297 dXSARGS;
2607 AV *state = (AV *)GENSUB_ARG; 3298 AV *state = (AV *)S_GENSUB_ARG;
2608 SV *coro = av_pop (state); 3299 SV *coro = av_pop (state);
2609 SV *data_sv = newSV (sizeof (struct io_state)); 3300 SV *data_sv = newSV (sizeof (struct io_state));
2610 3301
2611 av_extend (state, items - 1); 3302 av_extend (state, items - 1);
2612 3303
… …
2632 } 3323 }
2633 3324
2634 av_push (state, data_sv); 3325 av_push (state, data_sv);
2635 3326
2636 api_ready (aTHX_ coro); 3327 api_ready (aTHX_ coro);
2637 SvREFCNT_dec (coro); 3328 SvREFCNT_dec_NN (coro);
2638 SvREFCNT_dec ((AV *)state); 3329 SvREFCNT_dec_NN ((AV *)state);
2639} 3330}
2640 3331
2641static int 3332static int
2642slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3333slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2643{ 3334{
… …
2648 /* it quickly returns */ 3339 /* it quickly returns */
2649 if (CORO_THROW) 3340 if (CORO_THROW)
2650 return 0; 3341 return 0;
2651 3342
2652 /* one element that is an RV? repeat! */ 3343 /* one element that is an RV? repeat! */
2653 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3344 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2654 return 1; 3345 return 1;
2655 3346
2656 /* restore status */ 3347 /* restore status */
2657 { 3348 {
2658 SV *data_sv = av_pop (state); 3349 SV *data_sv = av_pop (state);
… …
2661 errno = data->errorno; 3352 errno = data->errorno;
2662 PL_laststype = data->laststype; 3353 PL_laststype = data->laststype;
2663 PL_laststatval = data->laststatval; 3354 PL_laststatval = data->laststatval;
2664 PL_statcache = data->statcache; 3355 PL_statcache = data->statcache;
2665 3356
2666 SvREFCNT_dec (data_sv); 3357 SvREFCNT_dec_NN (data_sv);
2667 } 3358 }
2668 3359
2669 /* push result values */ 3360 /* push result values */
2670 { 3361 {
2671 dSP; 3362 dSP;
… …
2697 dSP; 3388 dSP;
2698 3389
2699 static SV *prio_cv; 3390 static SV *prio_cv;
2700 static SV *prio_sv; 3391 static SV *prio_sv;
2701 3392
2702 if (expect_false (!prio_cv)) 3393 if (ecb_expect_false (!prio_cv))
2703 { 3394 {
2704 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3395 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2705 prio_sv = newSViv (0); 3396 prio_sv = newSViv (0);
2706 } 3397 }
2707 3398
… …
2726 3417
2727 for (i = 0; i < items; ++i) 3418 for (i = 0; i < items; ++i)
2728 PUSHs (arg [i]); 3419 PUSHs (arg [i]);
2729 3420
2730 /* now push the callback closure */ 3421 /* now push the callback closure */
2731 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3422 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2732 3423
2733 /* now call the AIO function - we assume our request is uncancelable */ 3424 /* now call the AIO function - we assume our request is uncancelable */
2734 PUTBACK; 3425 PUTBACK;
2735 call_sv ((SV *)req, G_VOID | G_DISCARD); 3426 call_sv ((SV *)req, G_VOID | G_DISCARD);
2736 } 3427 }
2737 3428
2738 /* now that the requets is going, we loop toll we have a result */ 3429 /* now that the request is going, we loop till we have a result */
2739 frame->data = (void *)state; 3430 frame->data = (void *)state;
2740 frame->prepare = prepare_schedule; 3431 frame->prepare = prepare_schedule;
2741 frame->check = slf_check_aio_req; 3432 frame->check = slf_check_aio_req;
2742} 3433}
2743 3434
… …
2755 3446
2756#if CORO_CLONE 3447#if CORO_CLONE
2757# include "clone.c" 3448# include "clone.c"
2758#endif 3449#endif
2759 3450
3451/*****************************************************************************/
3452
3453static SV *
3454coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3455{
3456 SV *coro_sv;
3457 struct coro *coro;
3458 MAGIC *mg;
3459 HV *hv;
3460 SV *cb;
3461 int i;
3462
3463 if (argc > 0)
3464 {
3465 cb = s_get_cv_croak (argv [0]);
3466
3467 if (!is_coro)
3468 {
3469 if (CvISXSUB (cb))
3470 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3471
3472 if (!CvROOT (cb))
3473 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3474 }
3475 }
3476
3477 Newz (0, coro, 1, struct coro);
3478 coro->args = newAV ();
3479 coro->flags = CF_NEW;
3480
3481 if (coro_first) coro_first->prev = coro;
3482 coro->next = coro_first;
3483 coro_first = coro;
3484
3485 coro->hv = hv = newHV ();
3486 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3487 mg->mg_flags |= MGf_DUP;
3488 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3489
3490 if (argc > 0)
3491 {
3492 av_extend (coro->args, argc + is_coro - 1);
3493
3494 if (is_coro)
3495 {
3496 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3497 cb = (SV *)cv_coro_run;
3498 }
3499
3500 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3501
3502 for (i = 1; i < argc; i++)
3503 av_push (coro->args, newSVsv (argv [i]));
3504 }
3505
3506 return coro_sv;
3507}
3508
3509#ifndef __cplusplus
3510ecb_cold XS(boot_Coro__State);
3511#endif
3512
3513#if CORO_JIT
3514
3515static void ecb_noinline ecb_cold
3516pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3517{
3518 dSP;
3519 AV *av = newAV ();
3520
3521 av_store (av, 3, newSVuv (d));
3522 av_store (av, 2, newSVuv (c));
3523 av_store (av, 1, newSVuv (b));
3524 av_store (av, 0, newSVuv (a));
3525
3526 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3527
3528 PUTBACK;
3529}
3530
3531static void ecb_noinline ecb_cold
3532jit_init (pTHX)
3533{
3534 dSP;
3535 SV *load, *save;
3536 char *map_base;
3537 char *load_ptr, *save_ptr;
3538 STRLEN load_len, save_len, map_len;
3539 int count;
3540
3541 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3542
3543 PUSHMARK (SP);
3544 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3545 #include "state.h"
3546 count = call_pv ("Coro::State::_jit", G_ARRAY);
3547 SPAGAIN;
3548
3549 save = POPs; save_ptr = SvPVbyte (save, save_len);
3550 load = POPs; load_ptr = SvPVbyte (load, load_len);
3551
3552 map_len = load_len + save_len + 16;
3553
3554 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3555
3556 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3557
3558 load_perl_slots = (load_save_perl_slots_type)map_base;
3559 memcpy (map_base, load_ptr, load_len);
3560
3561 map_base += (load_len + 15) & ~15;
3562
3563 save_perl_slots = (load_save_perl_slots_type)map_base;
3564 memcpy (map_base, save_ptr, save_len);
3565
3566 /* we are good citizens and try to make the page read-only, so the evil evil */
3567 /* hackers might have it a bit more difficult */
3568 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3569
3570 PUTBACK;
3571 eval_pv ("undef &Coro::State::_jit", 1);
3572}
3573
3574#endif
3575
2760MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3576MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2761 3577
2762PROTOTYPES: DISABLE 3578PROTOTYPES: DISABLE
2763 3579
2764BOOT: 3580BOOT:
2765{ 3581{
3582#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3583#include "state.h"
2766#ifdef USE_ITHREADS 3584#ifdef USE_ITHREADS
2767# if CORO_PTHREAD 3585# if CORO_PTHREAD
2768 coro_thx = PERL_GET_CONTEXT; 3586 coro_thx = PERL_GET_CONTEXT;
2769# endif 3587# endif
2770#endif 3588#endif
2771 BOOT_PAGESIZE; 3589 /* perl defines these to check for existance first, but why it doesn't */
3590 /* just create them one at init time is not clear to me, except for */
3591 /* programs trying to delete them, but... */
3592 /* anyway, we declare this as invalid and make sure they are initialised here */
3593 DEFSV;
3594 ERRSV;
2772 3595
2773 cctx_current = cctx_new_empty (); 3596 cctx_current = cctx_new_empty ();
2774 3597
2775 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3598 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2776 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3599 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2816 coroapi.prepare_nop = prepare_nop; 3639 coroapi.prepare_nop = prepare_nop;
2817 coroapi.prepare_schedule = prepare_schedule; 3640 coroapi.prepare_schedule = prepare_schedule;
2818 coroapi.prepare_cede = prepare_cede; 3641 coroapi.prepare_cede = prepare_cede;
2819 coroapi.prepare_cede_notself = prepare_cede_notself; 3642 coroapi.prepare_cede_notself = prepare_cede_notself;
2820 3643
2821 { 3644 time_init (aTHX);
2822 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2823 3645
2824 if (!svp) croak ("Time::HiRes is required");
2825 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2826
2827 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2828 }
2829
2830 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3646 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3647#if CORO_JIT
3648 PUTBACK;
3649 jit_init (aTHX);
3650 SPAGAIN;
3651#endif
2831} 3652}
2832 3653
2833SV * 3654SV *
2834new (char *klass, ...) 3655new (SV *klass, ...)
2835 ALIAS: 3656 ALIAS:
2836 Coro::new = 1 3657 Coro::new = 1
2837 CODE: 3658 CODE:
2838{ 3659 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2839 struct coro *coro; 3660 OUTPUT:
2840 MAGIC *mg;
2841 HV *hv;
2842 CV *cb;
2843 int i;
2844
2845 if (items > 1)
2846 {
2847 cb = coro_sv_2cv (aTHX_ ST (1));
2848
2849 if (!ix)
2850 {
2851 if (CvISXSUB (cb))
2852 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2853
2854 if (!CvROOT (cb))
2855 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2856 }
2857 }
2858
2859 Newz (0, coro, 1, struct coro);
2860 coro->args = newAV ();
2861 coro->flags = CF_NEW;
2862
2863 if (coro_first) coro_first->prev = coro;
2864 coro->next = coro_first;
2865 coro_first = coro;
2866
2867 coro->hv = hv = newHV ();
2868 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2869 mg->mg_flags |= MGf_DUP;
2870 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2871
2872 if (items > 1)
2873 {
2874 av_extend (coro->args, items - 1 + ix - 1);
2875
2876 if (ix)
2877 {
2878 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2879 cb = cv_coro_run;
2880 }
2881
2882 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2883
2884 for (i = 2; i < items; i++)
2885 av_push (coro->args, newSVsv (ST (i)));
2886 }
2887}
2888 OUTPUT:
2889 RETVAL 3661 RETVAL
2890 3662
2891void 3663void
2892transfer (...) 3664transfer (...)
2893 PROTOTYPE: $$ 3665 PROTOTYPE: $$
2894 CODE: 3666 CODE:
2895 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3667 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2896 3668
2897bool
2898_destroy (SV *coro_sv)
2899 CODE:
2900 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2901 OUTPUT:
2902 RETVAL
2903
2904void
2905_exit (int code)
2906 PROTOTYPE: $
2907 CODE:
2908 _exit (code);
2909
2910SV * 3669SV *
2911clone (Coro::State coro) 3670clone (Coro::State coro)
2912 CODE: 3671 CODE:
2913{ 3672{
2914#if CORO_CLONE 3673#if CORO_CLONE
2915 struct coro *ncoro = coro_clone (coro); 3674 struct coro *ncoro = coro_clone (aTHX_ coro);
2916 MAGIC *mg; 3675 MAGIC *mg;
2917 /* TODO: too much duplication */ 3676 /* TODO: too much duplication */
2918 ncoro->hv = newHV (); 3677 ncoro->hv = newHV ();
2919 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3678 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2920 mg->mg_flags |= MGf_DUP; 3679 mg->mg_flags |= MGf_DUP;
… …
2968void 3727void
2969list () 3728list ()
2970 PROTOTYPE: 3729 PROTOTYPE:
2971 PPCODE: 3730 PPCODE:
2972{ 3731{
2973 struct coro *coro; 3732 struct coro *coro;
2974 for (coro = coro_first; coro; coro = coro->next) 3733 for (coro = coro_first; coro; coro = coro->next)
2975 if (coro->hv) 3734 if (coro->hv)
2976 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3735 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
2977} 3736}
2978 3737
… …
2982 eval = 1 3741 eval = 1
2983 CODE: 3742 CODE:
2984{ 3743{
2985 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3744 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2986 { 3745 {
2987 struct coro temp; 3746 struct coro *current = SvSTATE_current;
3747 struct CoroSLF slf_save;
2988 3748
2989 if (!(coro->flags & CF_RUNNING)) 3749 if (current != coro)
2990 { 3750 {
2991 PUTBACK; 3751 PUTBACK;
2992 save_perl (aTHX_ &temp); 3752 save_perl (aTHX_ current);
2993 load_perl (aTHX_ coro); 3753 load_perl (aTHX_ coro);
3754 /* the coro is most likely in an active SLF call.
3755 * while not strictly required (the code we execute is
3756 * not allowed to call any SLF functions), it's cleaner
3757 * to reinitialise the slf_frame and restore it later.
3758 * This might one day allow us to actually do SLF calls
3759 * from code executed here.
3760 */
3761 slf_save = slf_frame;
3762 slf_frame.prepare = 0;
3763 SPAGAIN;
2994 } 3764 }
2995 3765
2996 {
2997 dSP;
2998 ENTER;
2999 SAVETMPS;
3000 PUTBACK;
3001 PUSHSTACK; 3766 PUSHSTACK;
3767
3002 PUSHMARK (SP); 3768 PUSHMARK (SP);
3769 PUTBACK;
3003 3770
3004 if (ix) 3771 if (ix)
3005 eval_sv (coderef, 0); 3772 eval_sv (coderef, 0);
3006 else 3773 else
3007 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3774 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3008 3775
3009 POPSTACK; 3776 POPSTACK;
3010 SPAGAIN; 3777 SPAGAIN;
3011 FREETMPS;
3012 LEAVE;
3013 PUTBACK;
3014 }
3015 3778
3016 if (!(coro->flags & CF_RUNNING)) 3779 if (current != coro)
3017 { 3780 {
3781 PUTBACK;
3782 slf_frame = slf_save;
3018 save_perl (aTHX_ coro); 3783 save_perl (aTHX_ coro);
3019 load_perl (aTHX_ &temp); 3784 load_perl (aTHX_ current);
3020 SPAGAIN; 3785 SPAGAIN;
3021 } 3786 }
3022 } 3787 }
3023} 3788}
3024 3789
… …
3027 PROTOTYPE: $ 3792 PROTOTYPE: $
3028 ALIAS: 3793 ALIAS:
3029 is_ready = CF_READY 3794 is_ready = CF_READY
3030 is_running = CF_RUNNING 3795 is_running = CF_RUNNING
3031 is_new = CF_NEW 3796 is_new = CF_NEW
3032 is_destroyed = CF_DESTROYED 3797 is_destroyed = CF_ZOMBIE
3798 is_zombie = CF_ZOMBIE
3799 is_suspended = CF_SUSPENDED
3033 CODE: 3800 CODE:
3034 RETVAL = boolSV (coro->flags & ix); 3801 RETVAL = boolSV (coro->flags & ix);
3035 OUTPUT: 3802 OUTPUT:
3036 RETVAL 3803 RETVAL
3037 3804
3038void 3805void
3039throw (Coro::State self, SV *throw = &PL_sv_undef) 3806throw (SV *self, SV *exception = &PL_sv_undef)
3040 PROTOTYPE: $;$ 3807 PROTOTYPE: $;$
3041 CODE: 3808 CODE:
3042{ 3809{
3810 struct coro *coro = SvSTATE (self);
3043 struct coro *current = SvSTATE_current; 3811 struct coro *current = SvSTATE_current;
3044 SV **throwp = self == current ? &CORO_THROW : &self->except; 3812 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3045 SvREFCNT_dec (*throwp); 3813 SvREFCNT_dec (*exceptionp);
3046 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3814 SvGETMAGIC (exception);
3815 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3816
3817 api_ready (aTHX_ self);
3047} 3818}
3048 3819
3049void 3820void
3050api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3821api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3051 PROTOTYPE: $;$ 3822 PROTOTYPE: $;$
… …
3102 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3873 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3103 3874
3104 SV *tmp = *src; *src = *dst; *dst = tmp; 3875 SV *tmp = *src; *src = *dst; *dst = tmp;
3105 } 3876 }
3106 3877
3878void
3879cancel (Coro::State self)
3880 CODE:
3881 coro_state_destroy (aTHX_ self);
3882
3883SV *
3884enable_times (int enabled = enable_times)
3885 CODE:
3886{
3887 RETVAL = boolSV (enable_times);
3888
3889 if (enabled != enable_times)
3890 {
3891 enable_times = enabled;
3892
3893 coro_times_update ();
3894 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3895 }
3896}
3897 OUTPUT:
3898 RETVAL
3899
3900void
3901times (Coro::State self)
3902 PPCODE:
3903{
3904 struct coro *current = SvSTATE (coro_current);
3905
3906 if (ecb_expect_false (current == self))
3907 {
3908 coro_times_update ();
3909 coro_times_add (SvSTATE (coro_current));
3910 }
3911
3912 EXTEND (SP, 2);
3913 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3914 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3915
3916 if (ecb_expect_false (current == self))
3917 coro_times_sub (SvSTATE (coro_current));
3918}
3919
3920void
3921swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3922 CODE:
3923{
3924 struct coro *current = SvSTATE_current;
3925
3926 if (current == coro)
3927 SWAP_SVS (current);
3928
3929 if (!coro->swap_sv)
3930 coro->swap_sv = newAV ();
3931
3932 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3933 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3934
3935 if (current == coro)
3936 SWAP_SVS (current);
3937}
3938
3107 3939
3108MODULE = Coro::State PACKAGE = Coro 3940MODULE = Coro::State PACKAGE = Coro
3109 3941
3110BOOT: 3942BOOT:
3111{ 3943{
3112 int i;
3113
3114 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3944 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3115 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3945 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3116 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3946 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3117 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3118 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3947 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3119 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3948 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3120 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3949 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3121 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3950 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3122 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3951 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3123 3952
3124 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3953 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3125 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3954 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3126 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3955 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3127 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3956 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3128 3957
3129 coro_stash = gv_stashpv ("Coro", TRUE); 3958 coro_stash = gv_stashpv ("Coro", TRUE);
3130 3959
3131 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3960 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3132 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3961 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3133 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3962 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3134 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3963 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3135 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3964 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3136 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3965 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3137
3138 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3139 coro_ready[i] = newAV ();
3140 3966
3141 { 3967 {
3142 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3968 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3143 3969
3144 coroapi.schedule = api_schedule; 3970 coroapi.schedule = api_schedule;
… …
3148 coroapi.ready = api_ready; 3974 coroapi.ready = api_ready;
3149 coroapi.is_ready = api_is_ready; 3975 coroapi.is_ready = api_is_ready;
3150 coroapi.nready = coro_nready; 3976 coroapi.nready = coro_nready;
3151 coroapi.current = coro_current; 3977 coroapi.current = coro_current;
3152 3978
3979 coroapi.enterleave_hook = api_enterleave_hook;
3980 coroapi.enterleave_unhook = api_enterleave_unhook;
3981 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3982
3153 /*GCoroAPI = &coroapi;*/ 3983 /*GCoroAPI = &coroapi;*/
3154 sv_setiv (sv, (IV)&coroapi); 3984 sv_setiv (sv, (IV)&coroapi);
3155 SvREADONLY_on (sv); 3985 SvREADONLY_on (sv);
3156 } 3986 }
3157} 3987}
3158 3988
3989SV *
3990async (...)
3991 PROTOTYPE: &@
3992 CODE:
3993 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3994 api_ready (aTHX_ RETVAL);
3995 OUTPUT:
3996 RETVAL
3997
3998void
3999_destroy (Coro::State coro)
4000 CODE:
4001 /* used by the manager thread */
4002 coro_state_destroy (aTHX_ coro);
4003
4004void
4005on_destroy (Coro::State coro, SV *cb)
4006 CODE:
4007 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4008
4009void
4010join (...)
4011 CODE:
4012 CORO_EXECUTE_SLF_XS (slf_init_join);
4013
3159void 4014void
3160terminate (...) 4015terminate (...)
3161 CODE: 4016 CODE:
3162 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4017 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3163 4018
3164void 4019void
4020cancel (...)
4021 CODE:
4022 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4023
4024int
4025safe_cancel (Coro::State self, ...)
4026 C_ARGS: aTHX_ self, &ST (1), items - 1
4027
4028void
3165schedule (...) 4029schedule (...)
3166 CODE: 4030 CODE:
3167 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4031 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3168 4032
3169void 4033void
… …
3185cede_notself (...) 4049cede_notself (...)
3186 CODE: 4050 CODE:
3187 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 4051 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3188 4052
3189void 4053void
3190_cancel (Coro::State self)
3191 CODE:
3192 coro_state_destroy (aTHX_ self);
3193 coro_call_on_destroy (aTHX_ self);
3194
3195void
3196_set_current (SV *current) 4054_set_current (SV *current)
3197 PROTOTYPE: $ 4055 PROTOTYPE: $
3198 CODE: 4056 CODE:
3199 SvREFCNT_dec (SvRV (coro_current)); 4057 SvREFCNT_dec_NN (SvRV (coro_current));
3200 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4058 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3201 4059
3202void 4060void
3203_set_readyhook (SV *hook) 4061_set_readyhook (SV *hook)
3204 PROTOTYPE: $ 4062 PROTOTYPE: $
3205 CODE: 4063 CODE:
3206 SvREFCNT_dec (coro_readyhook); 4064 SvREFCNT_dec (coro_readyhook);
4065 SvGETMAGIC (hook);
4066 if (SvOK (hook))
4067 {
3207 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 4068 coro_readyhook = newSVsv (hook);
4069 CORO_READYHOOK = invoke_sv_ready_hook_helper;
4070 }
4071 else
4072 {
4073 coro_readyhook = 0;
4074 CORO_READYHOOK = 0;
4075 }
3208 4076
3209int 4077int
3210prio (Coro::State coro, int newprio = 0) 4078prio (Coro::State coro, int newprio = 0)
3211 PROTOTYPE: $;$ 4079 PROTOTYPE: $;$
3212 ALIAS: 4080 ALIAS:
… …
3218 if (items > 1) 4086 if (items > 1)
3219 { 4087 {
3220 if (ix) 4088 if (ix)
3221 newprio = coro->prio - newprio; 4089 newprio = coro->prio - newprio;
3222 4090
3223 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 4091 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3224 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 4092 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3225 4093
3226 coro->prio = newprio; 4094 coro->prio = newprio;
3227 } 4095 }
3228} 4096}
3229 OUTPUT: 4097 OUTPUT:
… …
3244 RETVAL = coro_nready; 4112 RETVAL = coro_nready;
3245 OUTPUT: 4113 OUTPUT:
3246 RETVAL 4114 RETVAL
3247 4115
3248void 4116void
4117suspend (Coro::State self)
4118 PROTOTYPE: $
4119 CODE:
4120 self->flags |= CF_SUSPENDED;
4121
4122void
4123resume (Coro::State self)
4124 PROTOTYPE: $
4125 CODE:
4126 self->flags &= ~CF_SUSPENDED;
4127
4128void
3249_pool_handler (...) 4129_pool_handler (...)
3250 CODE: 4130 CODE:
3251 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 4131 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3252 4132
3253void 4133void
… …
3264 for (i = 1; i < items; ++i) 4144 for (i = 1; i < items; ++i)
3265 av_push (av, SvREFCNT_inc_NN (ST (i))); 4145 av_push (av, SvREFCNT_inc_NN (ST (i)));
3266 4146
3267 if ((SV *)hv == &PL_sv_undef) 4147 if ((SV *)hv == &PL_sv_undef)
3268 { 4148 {
3269 PUSHMARK (SP); 4149 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3270 EXTEND (SP, 2);
3271 PUSHs (sv_Coro);
3272 PUSHs ((SV *)cv_pool_handler);
3273 PUTBACK;
3274 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3275 SPAGAIN;
3276
3277 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4150 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4151 SvREFCNT_dec_NN (sv);
3278 } 4152 }
3279 4153
3280 { 4154 {
3281 struct coro *coro = SvSTATE_hv (hv); 4155 struct coro *coro = SvSTATE_hv (hv);
3282 4156
… …
3289 api_ready (aTHX_ (SV *)hv); 4163 api_ready (aTHX_ (SV *)hv);
3290 4164
3291 if (GIMME_V != G_VOID) 4165 if (GIMME_V != G_VOID)
3292 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4166 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3293 else 4167 else
3294 SvREFCNT_dec (hv); 4168 SvREFCNT_dec_NN (hv);
3295} 4169}
3296 4170
3297SV * 4171SV *
3298rouse_cb () 4172rouse_cb ()
3299 PROTOTYPE: 4173 PROTOTYPE:
… …
3306rouse_wait (...) 4180rouse_wait (...)
3307 PROTOTYPE: ;$ 4181 PROTOTYPE: ;$
3308 PPCODE: 4182 PPCODE:
3309 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 4183 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3310 4184
4185void
4186on_enter (SV *block)
4187 ALIAS:
4188 on_leave = 1
4189 PROTOTYPE: &
4190 CODE:
4191{
4192 struct coro *coro = SvSTATE_current;
4193 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4194
4195 block = s_get_cv_croak (block);
4196
4197 if (!*avp)
4198 *avp = newAV ();
4199
4200 av_push (*avp, SvREFCNT_inc (block));
4201
4202 if (!ix)
4203 on_enterleave_call (aTHX_ block);
4204
4205 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4206 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
4207 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4208}
4209
3311 4210
3312MODULE = Coro::State PACKAGE = PerlIO::cede 4211MODULE = Coro::State PACKAGE = PerlIO::cede
3313 4212
3314BOOT: 4213BOOT:
3315 PerlIO_define_layer (aTHX_ &PerlIO_cede); 4214 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3318MODULE = Coro::State PACKAGE = Coro::Semaphore 4217MODULE = Coro::State PACKAGE = Coro::Semaphore
3319 4218
3320SV * 4219SV *
3321new (SV *klass, SV *count = 0) 4220new (SV *klass, SV *count = 0)
3322 CODE: 4221 CODE:
4222{
4223 int semcnt = 1;
4224
4225 if (count)
4226 {
4227 SvGETMAGIC (count);
4228
4229 if (SvOK (count))
4230 semcnt = SvIV (count);
4231 }
4232
3323 RETVAL = sv_bless ( 4233 RETVAL = sv_bless (
3324 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4234 coro_waitarray_new (aTHX_ semcnt),
3325 GvSTASH (CvGV (cv)) 4235 GvSTASH (CvGV (cv))
3326 ); 4236 );
4237}
3327 OUTPUT: 4238 OUTPUT:
3328 RETVAL 4239 RETVAL
3329 4240
3330# helper for Coro::Channel 4241# helper for Coro::Channel and others
3331SV * 4242SV *
3332_alloc (int count) 4243_alloc (int count)
3333 CODE: 4244 CODE:
3334 RETVAL = coro_waitarray_new (aTHX_ count); 4245 RETVAL = coro_waitarray_new (aTHX_ count);
3335 OUTPUT: 4246 OUTPUT:
… …
3377 XSRETURN_NO; 4288 XSRETURN_NO;
3378} 4289}
3379 4290
3380void 4291void
3381waiters (SV *self) 4292waiters (SV *self)
3382 PPCODE: 4293 PPCODE:
3383{ 4294{
3384 AV *av = (AV *)SvRV (self); 4295 AV *av = (AV *)SvRV (self);
3385 int wcount = AvFILLp (av) + 1 - 1; 4296 int wcount = AvFILLp (av) + 1 - 1;
3386 4297
3387 if (GIMME_V == G_SCALAR) 4298 if (GIMME_V == G_SCALAR)
… …
3393 for (i = 1; i <= wcount; ++i) 4304 for (i = 1; i <= wcount; ++i)
3394 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4305 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3395 } 4306 }
3396} 4307}
3397 4308
4309MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4310
4311void
4312_may_delete (SV *sem, int count, unsigned int extra_refs)
4313 PPCODE:
4314{
4315 AV *av = (AV *)SvRV (sem);
4316
4317 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4318 && AvFILLp (av) == 0 /* no waiters, just count */
4319 && SvIV (AvARRAY (av)[0]) == count)
4320 XSRETURN_YES;
4321
4322 XSRETURN_NO;
4323}
4324
3398MODULE = Coro::State PACKAGE = Coro::Signal 4325MODULE = Coro::State PACKAGE = Coro::Signal
3399 4326
3400SV * 4327SV *
3401new (SV *klass) 4328new (SV *klass)
3402 CODE: 4329 CODE:
… …
3414 4341
3415void 4342void
3416broadcast (SV *self) 4343broadcast (SV *self)
3417 CODE: 4344 CODE:
3418{ 4345{
3419 AV *av = (AV *)SvRV (self); 4346 AV *av = (AV *)SvRV (self);
3420 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4347 coro_signal_wake (aTHX_ av, AvFILLp (av));
3421} 4348}
3422 4349
3423void 4350void
3424send (SV *self) 4351send (SV *self)
… …
3432 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4359 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3433} 4360}
3434 4361
3435IV 4362IV
3436awaited (SV *self) 4363awaited (SV *self)
3437 CODE: 4364 CODE:
3438 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4365 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3439 OUTPUT: 4366 OUTPUT:
3440 RETVAL 4367 RETVAL
3441 4368
3442 4369
… …
3447 4374
3448void 4375void
3449_schedule (...) 4376_schedule (...)
3450 CODE: 4377 CODE:
3451{ 4378{
3452 static int incede; 4379 static int incede;
3453 4380
3454 api_cede_notself (aTHX); 4381 api_cede_notself (aTHX);
3455 4382
3456 ++incede; 4383 ++incede;
3457 while (coro_nready >= incede && api_cede (aTHX)) 4384 while (coro_nready >= incede && api_cede (aTHX))
… …
3473 4400
3474void 4401void
3475_register (char *target, char *proto, SV *req) 4402_register (char *target, char *proto, SV *req)
3476 CODE: 4403 CODE:
3477{ 4404{
3478 CV *req_cv = coro_sv_2cv (aTHX_ req); 4405 SV *req_cv = s_get_cv_croak (req);
3479 /* newXSproto doesn't return the CV on 5.8 */ 4406 /* newXSproto doesn't return the CV on 5.8 */
3480 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4407 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3481 sv_setpv ((SV *)slf_cv, proto); 4408 sv_setpv ((SV *)slf_cv, proto);
3482 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4409 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3483} 4410}
3484 4411
4412MODULE = Coro::State PACKAGE = Coro::Select
4413
4414void
4415patch_pp_sselect ()
4416 CODE:
4417 if (!coro_old_pp_sselect)
4418 {
4419 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4420 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4421 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4422 }
4423
4424void
4425unpatch_pp_sselect ()
4426 CODE:
4427 if (coro_old_pp_sselect)
4428 {
4429 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4430 coro_old_pp_sselect = 0;
4431 }
4432
4433MODULE = Coro::State PACKAGE = Coro::Util
4434
4435void
4436_exit (int code)
4437 CODE:
4438 _exit (code);
4439
4440NV
4441time ()
4442 CODE:
4443 RETVAL = nvtime (aTHX);
4444 OUTPUT:
4445 RETVAL
4446
4447NV
4448gettimeofday ()
4449 PPCODE:
4450{
4451 UV tv [2];
4452 u2time (aTHX_ tv);
4453 EXTEND (SP, 2);
4454 PUSHs (sv_2mortal (newSVuv (tv [0])));
4455 PUSHs (sv_2mortal (newSVuv (tv [1])));
4456}
4457

Diff Legend

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