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.345 by root, Wed Dec 17 04:57:07 2008 UTC vs.
Revision 1.469 by root, Fri Jul 14 02:43:50 2017 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
12 17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
13#include <stdio.h> 23#include <stdio.h>
14#include <errno.h> 24#include <errno.h>
15#include <assert.h> 25#include <assert.h>
16 26
17#ifdef WIN32 27#ifndef SvREFCNT_dec_NN
28 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
29#endif
30
31#ifndef SvREFCNT_inc_NN
32 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
33#endif
34
35#ifndef SVs_PADSTALE
36# define SVs_PADSTALE 0
37#endif
38
39#ifdef PadARRAY
40# define NEWPADAPI 1
41# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
42#else
43typedef AV PADNAMELIST;
44# if !PERL_VERSION_ATLEAST(5,8,0)
45typedef AV PADLIST;
46typedef AV PAD;
47# endif
48# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
49# define PadlistMAX(pl) AvFILLp (pl)
50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
51# define PadARRAY AvARRAY
52# define PadMAX AvFILLp
53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
54#endif
55#ifndef PadnamelistREFCNT
56# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
57#endif
58#ifndef PadnamelistREFCNT_dec
59# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
60#endif
61
62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
64#if PERL_VERSION_ATLEAST(5,19,0)
65# define SVt_BIND SVt_IV
66#endif
67
68#if defined(_WIN32)
69# undef HAS_GETTIMEOFDAY
18# undef setjmp 70# undef setjmp
19# undef longjmp 71# undef longjmp
20# undef _exit 72# undef _exit
21# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
22#else 74#else
23# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
24#endif 76#endif
25 77
26#ifdef HAVE_MMAP
27# include <unistd.h>
28# include <sys/mman.h>
29# ifndef MAP_ANONYMOUS
30# ifdef MAP_ANON
31# define MAP_ANONYMOUS MAP_ANON
32# else
33# undef HAVE_MMAP
34# endif
35# endif
36# include <limits.h>
37# ifndef PAGESIZE
38# define PAGESIZE pagesize
39# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
40static long pagesize;
41# else
42# define BOOT_PAGESIZE (void)0
43# endif
44#else
45# define PAGESIZE 0
46# define BOOT_PAGESIZE (void)0
47#endif
48
49#if CORO_USE_VALGRIND
50# include <valgrind/valgrind.h>
51#endif
52
53/* the maximum number of idle cctx that will be pooled */ 78/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
55 80
56#define PERL_VERSION_ATLEAST(a,b,c) \ 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57 (PERL_REVISION > (a) \ 82# define HAS_SCOPESTACK_NAME 1
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD
117#endif
118
119#ifndef CORO_STACKGUARD
120# define CORO_STACKGUARD 0
121#endif 83#endif
122 84
123/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
124#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
125# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
135# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
136#endif 98#endif
137 99
138#define IN_DESTRUCT PL_dirty 100#define IN_DESTRUCT PL_dirty
139 101
140#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value))
143# define INLINE static inline
144#else
145# define attribute(x)
146# define expect(expr,value) (expr)
147# define INLINE static
148#endif
149
150#define expect_false(expr) expect ((expr) != 0, 0)
151#define expect_true(expr) expect ((expr) != 0, 1)
152
153#define NOINLINE attribute ((noinline))
154
155#include "CoroAPI.h" 102#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
157 104
158#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
159# if CORO_PTHREAD 106# if CORO_PTHREAD
160static void *coro_thx; 107static void *coro_thx;
161# endif 108# endif
162#endif 109#endif
163 110
111#ifdef __linux
112# include <time.h> /* for timespec */
113# include <syscall.h> /* for SYS_* */
114# ifdef SYS_clock_gettime
115# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
116# define CORO_CLOCK_MONOTONIC 1
117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
118# endif
119#endif
120
121#if PERL_VERSION_ATLEAST(5,24,0)
122# define SUB_ARGARRAY PL_curpad[0]
123#else
124# define SUB_ARGARRAY (SV *)cx->blk_sub.argarray
125#endif
126
127/* perl usually suppressed asserts. for debugging, we sometimes force it to be on */
128#if 0
129# undef NDEBUG
130# include <assert.h>
131#endif
132
164static double (*nvtime)(); /* so why doesn't it take void? */ 133static double (*nvtime)(); /* so why doesn't it take void? */
134static void (*u2time)(pTHX_ UV ret[2]);
165 135
166/* we hijack an hopefully unused CV flag for our purposes */ 136/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 137#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 138static OP *pp_slf (pTHX);
139static void slf_destroy (pTHX_ struct coro *coro);
169 140
170static U32 cctx_gen; 141static U32 cctx_gen;
171static size_t cctx_stacksize = CORO_STACKSIZE; 142static size_t cctx_stacksize = CORO_STACKSIZE;
172static struct CoroAPI coroapi; 143static struct CoroAPI coroapi;
173static AV *main_mainstack; /* used to differentiate between $main and others */ 144static AV *main_mainstack; /* used to differentiate between $main and others */
… …
181 152
182static GV *irsgv; /* $/ */ 153static GV *irsgv; /* $/ */
183static GV *stdoutgv; /* *STDOUT */ 154static GV *stdoutgv; /* *STDOUT */
184static SV *rv_diehook; 155static SV *rv_diehook;
185static SV *rv_warnhook; 156static SV *rv_warnhook;
186static HV *hv_sig; /* %SIG */
187 157
188/* async_pool helper stuff */ 158/* async_pool helper stuff */
189static SV *sv_pool_rss; 159static SV *sv_pool_rss;
190static SV *sv_pool_size; 160static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 161static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 162static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 163static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 164static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 165
197/* Coro::AnyEvent */ 166/* Coro::AnyEvent */
198static SV *sv_activity; 167static SV *sv_activity;
199 168
169/* enable processtime/realtime profiling */
170static char enable_times;
171typedef U32 coro_ts[2];
172static coro_ts time_real, time_cpu;
173static char times_valid;
174
200static struct coro_cctx *cctx_first; 175static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 176static int cctx_count, cctx_idle;
202 177
203enum { 178enum
179{
204 CC_MAPPED = 0x01, 180 CC_MAPPED = 0x01,
205 CC_NOREUSE = 0x02, /* throw this away after tracing */ 181 CC_NOREUSE = 0x02, /* throw this away after tracing */
206 CC_TRACE = 0x04, 182 CC_TRACE = 0x04,
207 CC_TRACE_SUB = 0x08, /* trace sub calls */ 183 CC_TRACE_SUB = 0x08, /* trace sub calls */
208 CC_TRACE_LINE = 0x10, /* trace each statement */ 184 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
213typedef struct coro_cctx 189typedef struct coro_cctx
214{ 190{
215 struct coro_cctx *next; 191 struct coro_cctx *next;
216 192
217 /* the stack */ 193 /* the stack */
218 void *sptr; 194 struct coro_stack stack;
219 size_t ssize;
220 195
221 /* cpu state */ 196 /* cpu state */
222 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 197 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
198#ifndef NDEBUG
223 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 199 JMPENV *idle_te; /* same as idle_sp, but for top_env */
200#endif
224 JMPENV *top_env; 201 JMPENV *top_env;
225 coro_context cctx; 202 coro_context cctx;
226 203
227 U32 gen; 204 U32 gen;
228#if CORO_USE_VALGRIND 205#if CORO_USE_VALGRIND
229 int valgrind_id; 206 int valgrind_id;
230#endif 207#endif
231 unsigned char flags; 208 unsigned char flags;
232} coro_cctx; 209} coro_cctx;
233 210
234coro_cctx *cctx_current; /* the currently running cctx */ 211static coro_cctx *cctx_current; /* the currently running cctx */
235 212
236/*****************************************************************************/ 213/*****************************************************************************/
237 214
215static MGVTBL coro_state_vtbl;
216
238enum { 217enum
218{
239 CF_RUNNING = 0x0001, /* coroutine is running */ 219 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 220 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 221 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 222 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
243 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 223 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
224 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
244}; 225};
245 226
246/* the structure where most of the perl state is stored, overlaid on the cxstack */ 227/* the structure where most of the perl state is stored, overlaid on the cxstack */
247typedef struct 228typedef struct
248{ 229{
249 SV *defsv;
250 AV *defav;
251 SV *errsv;
252 SV *irsgv;
253 HV *hinthv;
254#define VAR(name,type) type name; 230 #define VARx(name,expr,type) type name;
255# include "state.h" 231 #include "state.h"
256#undef VAR
257} perl_slots; 232} perl_slots;
258 233
234/* how many context stack entries do we need for perl_slots */
259#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 235#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
260 236
261/* this is a structure representing a perl-level coroutine */ 237/* this is a structure representing a perl-level coroutine */
262struct coro { 238struct coro
239{
263 /* the C coroutine allocated to this perl coroutine, if any */ 240 /* the C coroutine allocated to this perl coroutine, if any */
264 coro_cctx *cctx; 241 coro_cctx *cctx;
242
243 /* ready queue */
244 struct coro *next_ready;
265 245
266 /* state data */ 246 /* state data */
267 struct CoroSLF slf_frame; /* saved slf frame */ 247 struct CoroSLF slf_frame; /* saved slf frame */
268 AV *mainstack; 248 AV *mainstack;
269 perl_slots *slot; /* basically the saved sp */ 249 perl_slots *slot; /* basically the saved sp */
270 250
271 CV *startcv; /* the CV to execute */ 251 CV *startcv; /* the CV to execute */
272 AV *args; /* data associated with this coroutine (initial args) */ 252 AV *args; /* data associated with this coroutine (initial args) */
273 int refcnt; /* coroutines are refcounted, yes */
274 int flags; /* CF_ flags */ 253 int flags; /* CF_ flags */
275 HV *hv; /* the perl hash associated with this coro, if any */ 254 HV *hv; /* the perl hash associated with this coro, if any */
276 void (*on_destroy)(pTHX_ struct coro *coro);
277 255
278 /* statistics */ 256 /* statistics */
279 int usecount; /* number of transfers to this coro */ 257 int usecount; /* number of transfers to this coro */
280 258
281 /* coro process data */ 259 /* coro process data */
282 int prio; 260 int prio;
283 SV *except; /* exception to be thrown */ 261 SV *except; /* exception to be thrown */
284 SV *rouse_cb; 262 SV *rouse_cb; /* last rouse callback */
263 AV *on_destroy; /* callbacks or coros to notify on destroy */
264 AV *status; /* the exit status list */
285 265
286 /* async_pool */ 266 /* async_pool */
287 SV *saved_deffh; 267 SV *saved_deffh;
288 SV *invoke_cb; 268 SV *invoke_cb;
289 AV *invoke_av; 269 AV *invoke_av;
290 270
291 /* on_enter/on_leave */ 271 /* on_enter/on_leave */
292 AV *on_enter; 272 AV *on_enter; AV *on_enter_xs;
293 AV *on_leave; 273 AV *on_leave; AV *on_leave_xs;
274
275 /* swap_sv */
276 AV *swap_sv;
277
278 /* times */
279 coro_ts t_cpu, t_real;
294 280
295 /* linked list */ 281 /* linked list */
296 struct coro *next, *prev; 282 struct coro *next, *prev;
297}; 283};
298 284
299typedef struct coro *Coro__State; 285typedef struct coro *Coro__State;
300typedef struct coro *Coro__State_or_hashref; 286typedef struct coro *Coro__State_or_hashref;
301 287
302/* the following variables are effectively part of the perl context */ 288/* the following variables are effectively part of the perl context */
303/* and get copied between struct coro and these variables */ 289/* and get copied between struct coro and these variables */
304/* the mainr easonw e don't support windows process emulation */ 290/* the main reason we don't support windows process emulation */
305static struct CoroSLF slf_frame; /* the current slf frame */ 291static struct CoroSLF slf_frame; /* the current slf frame */
306 292
307/** Coro ********************************************************************/ 293/** Coro ********************************************************************/
308 294
309#define PRIO_MAX 3 295#define CORO_PRIO_MAX 3
310#define PRIO_HIGH 1 296#define CORO_PRIO_HIGH 1
311#define PRIO_NORMAL 0 297#define CORO_PRIO_NORMAL 0
312#define PRIO_LOW -1 298#define CORO_PRIO_LOW -1
313#define PRIO_IDLE -3 299#define CORO_PRIO_IDLE -3
314#define PRIO_MIN -4 300#define CORO_PRIO_MIN -4
315 301
316/* for Coro.pm */ 302/* for Coro.pm */
317static SV *coro_current; 303static SV *coro_current;
318static SV *coro_readyhook; 304static SV *coro_readyhook;
319static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 305static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
320static CV *cv_coro_run, *cv_coro_terminate; 306static CV *cv_coro_run;
321static struct coro *coro_first; 307static struct coro *coro_first;
322#define coro_nready coroapi.nready 308#define coro_nready coroapi.nready
323 309
310/** JIT *********************************************************************/
311
312#if CORO_JIT
313 /* APPLE doesn't have mmap though */
314 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
315 #ifndef CORO_JIT_TYPE
316 #if ECB_AMD64 && CORO_JIT_UNIXY
317 #define CORO_JIT_TYPE "amd64-unix"
318 #elif __i386 && CORO_JIT_UNIXY
319 #define CORO_JIT_TYPE "x86-unix"
320 #endif
321 #endif
322#endif
323
324#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
325 #undef CORO_JIT
326#endif
327
328#if CORO_JIT
329 typedef void (*load_save_perl_slots_type)(perl_slots *);
330 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
331#endif
332
333/** Coro::Select ************************************************************/
334
335static OP *(*coro_old_pp_sselect) (pTHX);
336static SV *coro_select_select;
337
338/* horrible hack, but if it works... */
339static OP *
340coro_pp_sselect (pTHX)
341{
342 dSP;
343 PUSHMARK (SP - 4); /* fake argument list */
344 XPUSHs (coro_select_select);
345 PUTBACK;
346
347 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
348 PL_op->op_flags |= OPf_STACKED;
349 PL_op->op_private = 0;
350 return PL_ppaddr [OP_ENTERSUB](aTHX);
351}
352
353/** time stuff **************************************************************/
354
355#ifdef HAS_GETTIMEOFDAY
356
357ecb_inline void
358coro_u2time (pTHX_ UV ret[2])
359{
360 struct timeval tv;
361 gettimeofday (&tv, 0);
362
363 ret [0] = tv.tv_sec;
364 ret [1] = tv.tv_usec;
365}
366
367ecb_inline double
368coro_nvtime (void)
369{
370 struct timeval tv;
371 gettimeofday (&tv, 0);
372
373 return tv.tv_sec + tv.tv_usec * 1e-6;
374}
375
376ecb_inline void
377time_init (pTHX)
378{
379 nvtime = coro_nvtime;
380 u2time = coro_u2time;
381}
382
383#else
384
385ecb_inline void
386time_init (pTHX)
387{
388 SV **svp;
389
390 require_pv ("Time/HiRes.pm");
391
392 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
393
394 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
395 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
396
397 nvtime = INT2PTR (double (*)(), SvIV (*svp));
398
399 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
400 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
401}
402
403#endif
404
324/** lowlevel stuff **********************************************************/ 405/** lowlevel stuff **********************************************************/
325 406
326static SV * 407static SV * ecb_noinline
327coro_get_sv (pTHX_ const char *name, int create) 408coro_get_sv (pTHX_ const char *name, int create)
328{ 409{
329#if PERL_VERSION_ATLEAST (5,10,0) 410#if PERL_VERSION_ATLEAST (5,10,0)
330 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 411 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
331 get_sv (name, create); 412 get_sv (name, create);
332#endif 413#endif
333 return get_sv (name, create); 414 return get_sv (name, create);
334} 415}
335 416
336static AV * 417static AV * ecb_noinline
337coro_get_av (pTHX_ const char *name, int create) 418coro_get_av (pTHX_ const char *name, int create)
338{ 419{
339#if PERL_VERSION_ATLEAST (5,10,0) 420#if PERL_VERSION_ATLEAST (5,10,0)
340 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 421 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
341 get_av (name, create); 422 get_av (name, create);
342#endif 423#endif
343 return get_av (name, create); 424 return get_av (name, create);
344} 425}
345 426
346static HV * 427static HV * ecb_noinline
347coro_get_hv (pTHX_ const char *name, int create) 428coro_get_hv (pTHX_ const char *name, int create)
348{ 429{
349#if PERL_VERSION_ATLEAST (5,10,0) 430#if PERL_VERSION_ATLEAST (5,10,0)
350 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 431 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
351 get_hv (name, create); 432 get_hv (name, create);
352#endif 433#endif
353 return get_hv (name, create); 434 return get_hv (name, create);
354} 435}
355 436
356/* may croak */ 437ecb_inline void
357INLINE CV * 438coro_times_update (void)
358coro_sv_2cv (pTHX_ SV *sv)
359{ 439{
360 HV *st; 440#ifdef coro_clock_gettime
361 GV *gvp; 441 struct timespec ts;
362 CV *cv = sv_2cv (sv, &st, &gvp, 0);
363 442
364 if (!cv) 443 ts.tv_sec = ts.tv_nsec = 0;
365 croak ("code reference expected"); 444 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
445 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
366 446
367 return cv; 447 ts.tv_sec = ts.tv_nsec = 0;
448 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
449 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
450#else
451 dTHX;
452 UV tv[2];
453
454 u2time (aTHX_ tv);
455 time_real [0] = tv [0];
456 time_real [1] = tv [1] * 1000;
457#endif
458}
459
460ecb_inline void
461coro_times_add (struct coro *c)
462{
463 c->t_real [1] += time_real [1];
464 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
465 c->t_real [0] += time_real [0];
466
467 c->t_cpu [1] += time_cpu [1];
468 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
469 c->t_cpu [0] += time_cpu [0];
470}
471
472ecb_inline void
473coro_times_sub (struct coro *c)
474{
475 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
476 c->t_real [1] -= time_real [1];
477 c->t_real [0] -= time_real [0];
478
479 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
480 c->t_cpu [1] -= time_cpu [1];
481 c->t_cpu [0] -= time_cpu [0];
368} 482}
369 483
370/*****************************************************************************/ 484/*****************************************************************************/
371/* magic glue */ 485/* magic glue */
372 486
373#define CORO_MAGIC_type_cv 26 487#define CORO_MAGIC_type_cv 26
374#define CORO_MAGIC_type_state PERL_MAGIC_ext 488#define CORO_MAGIC_type_state PERL_MAGIC_ext
375 489
376#define CORO_MAGIC_NN(sv, type) \ 490#define CORO_MAGIC_NN(sv, type) \
377 (expect_true (SvMAGIC (sv)->mg_type == type) \ 491 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
378 ? SvMAGIC (sv) \ 492 ? SvMAGIC (sv) \
379 : mg_find (sv, type)) 493 : mg_find (sv, type))
380 494
381#define CORO_MAGIC(sv, type) \ 495#define CORO_MAGIC(sv, type) \
382 (expect_true (SvMAGIC (sv)) \ 496 (ecb_expect_true (SvMAGIC (sv)) \
383 ? CORO_MAGIC_NN (sv, type) \ 497 ? CORO_MAGIC_NN (sv, type) \
384 : 0) 498 : 0)
385 499
386#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 500#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
387#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 501#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
388 502
389INLINE struct coro * 503ecb_inline MAGIC *
390SvSTATE_ (pTHX_ SV *coro) 504SvSTATEhv_p (pTHX_ SV *coro)
391{ 505{
392 HV *stash;
393 MAGIC *mg; 506 MAGIC *mg;
394 507
508 if (ecb_expect_true (
509 SvTYPE (coro) == SVt_PVHV
510 && (mg = CORO_MAGIC_state (coro))
511 && mg->mg_virtual == &coro_state_vtbl
512 ))
513 return mg;
514
515 return 0;
516}
517
518ecb_inline struct coro *
519SvSTATE_ (pTHX_ SV *coro_sv)
520{
521 MAGIC *mg;
522
395 if (SvROK (coro)) 523 if (SvROK (coro_sv))
396 coro = SvRV (coro); 524 coro_sv = SvRV (coro_sv);
397 525
398 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 526 mg = SvSTATEhv_p (aTHX_ coro_sv);
527 if (!mg)
399 croak ("Coro::State object required"); 528 croak ("Coro::State object required");
400 529
401 stash = SvSTASH (coro);
402 if (expect_false (stash != coro_stash && stash != coro_state_stash))
403 {
404 /* very slow, but rare, check */
405 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
406 croak ("Coro::State object required");
407 }
408
409 mg = CORO_MAGIC_state (coro);
410 return (struct coro *)mg->mg_ptr; 530 return (struct coro *)mg->mg_ptr;
411} 531}
412 532
413#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 533#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
414 534
… …
417#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 537#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
418 538
419/*****************************************************************************/ 539/*****************************************************************************/
420/* padlist management and caching */ 540/* padlist management and caching */
421 541
422static AV * 542ecb_inline PADLIST *
423coro_derive_padlist (pTHX_ CV *cv) 543coro_derive_padlist (pTHX_ CV *cv)
424{ 544{
425 AV *padlist = CvPADLIST (cv); 545 PADLIST *padlist = CvPADLIST (cv);
426 AV *newpadlist, *newpad; 546 PADLIST *newpadlist;
547 PADNAMELIST *padnames;
548 PAD *newpad;
549 PADOFFSET off = PadlistMAX (padlist) + 1;
427 550
428 newpadlist = newAV (); 551#if NEWPADAPI
552
553 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
554 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
555 while (!PadlistARRAY (padlist)[off - 1])
556 --off;
557
558 Perl_pad_push (aTHX_ padlist, off);
559
560 newpad = PadlistARRAY (padlist)[off];
561 PadlistARRAY (padlist)[off] = 0;
562
563#else
564
565#if PERL_VERSION_ATLEAST (5,10,0)
566 Perl_pad_push (aTHX_ padlist, off);
567#else
568 Perl_pad_push (aTHX_ padlist, off, 1);
569#endif
570
571 newpad = PadlistARRAY (padlist)[off];
572 PadlistMAX (padlist) = off - 1;
573
574#endif
575
576 newPADLIST (newpadlist);
577#if !PERL_VERSION_ATLEAST(5,15,3)
578 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
429 AvREAL_off (newpadlist); 579 AvREAL_off (newpadlist);
430#if PERL_VERSION_ATLEAST (5,10,0)
431 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
432#else
433 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
434#endif 580#endif
435 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
436 --AvFILLp (padlist);
437 581
438 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 582 /* Already extended to 2 elements by newPADLIST. */
439 av_store (newpadlist, 1, (SV *)newpad); 583 PadlistMAX (newpadlist) = 1;
584
585 padnames = PadlistNAMES (padlist);
586 ++PadnamelistREFCNT (padnames);
587 PadlistNAMES (newpadlist) = padnames;
588
589 PadlistARRAY (newpadlist)[1] = newpad;
440 590
441 return newpadlist; 591 return newpadlist;
442} 592}
443 593
444static void 594ecb_inline void
445free_padlist (pTHX_ AV *padlist) 595free_padlist (pTHX_ PADLIST *padlist)
446{ 596{
447 /* may be during global destruction */ 597 /* may be during global destruction */
448 if (!IN_DESTRUCT) 598 if (!IN_DESTRUCT)
449 { 599 {
450 I32 i = AvFILLp (padlist); 600 I32 i = PadlistMAX (padlist);
451 601
452 while (i > 0) /* special-case index 0 */ 602 while (i > 0) /* special-case index 0 */
453 { 603 {
454 /* we try to be extra-careful here */ 604 /* we try to be extra-careful here */
455 AV *av = (AV *)AvARRAY (padlist)[i--]; 605 PAD *pad = PadlistARRAY (padlist)[i--];
456 I32 j = AvFILLp (av);
457 606
607 if (pad)
608 {
609 I32 j = PadMAX (pad);
610
458 while (j >= 0) 611 while (j >= 0)
459 SvREFCNT_dec (AvARRAY (av)[j--]); 612 SvREFCNT_dec (PadARRAY (pad)[j--]);
460 613
461 AvFILLp (av) = -1; 614 PadMAX (pad) = -1;
462 SvREFCNT_dec (av); 615 SvREFCNT_dec (pad);
616 }
463 } 617 }
464 618
465 SvREFCNT_dec (AvARRAY (padlist)[0]); 619 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
466 620
621#if NEWPADAPI
622 Safefree (PadlistARRAY (padlist));
623 Safefree (padlist);
624#else
467 AvFILLp (padlist) = -1; 625 AvFILLp (padlist) = -1;
626 AvREAL_off (padlist);
468 SvREFCNT_dec ((SV*)padlist); 627 SvREFCNT_dec ((SV*)padlist);
628#endif
469 } 629 }
470} 630}
471 631
472static int 632static int
473coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 633coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
474{ 634{
475 AV *padlist; 635 PADLIST *padlist;
476 AV *av = (AV *)mg->mg_obj; 636 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
637 size_t len = *(size_t *)mg->mg_ptr;
477 638
478 /* casting is fun. */ 639 /* perl manages to free our internal AV and _then_ call us */
479 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 640 if (IN_DESTRUCT)
641 return 0;
642
643 while (len--)
480 free_padlist (aTHX_ padlist); 644 free_padlist (aTHX_ padlists[len]);
481
482 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
483 645
484 return 0; 646 return 0;
485} 647}
486 648
487static MGVTBL coro_cv_vtbl = { 649static MGVTBL coro_cv_vtbl = {
488 0, 0, 0, 0, 650 0, 0, 0, 0,
489 coro_cv_free 651 coro_cv_free
490}; 652};
491 653
492/* the next two functions merely cache the padlists */ 654/* the next two functions merely cache the padlists */
493static void 655ecb_inline void
494get_padlist (pTHX_ CV *cv) 656get_padlist (pTHX_ CV *cv)
495{ 657{
496 MAGIC *mg = CORO_MAGIC_cv (cv); 658 MAGIC *mg = CORO_MAGIC_cv (cv);
497 AV *av; 659 size_t *lenp;
498 660
499 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 661 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
500 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 662 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
501 else 663 else
502 { 664 {
503#if CORO_PREFER_PERL_FUNCTIONS 665#if CORO_PREFER_PERL_FUNCTIONS
504 /* this is probably cleaner? but also slower! */ 666 /* this is probably cleaner? but also slower! */
505 /* in practise, it seems to be less stable */ 667 /* in practise, it seems to be less stable */
… …
511 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 673 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
512#endif 674#endif
513 } 675 }
514} 676}
515 677
516static void 678ecb_inline void
517put_padlist (pTHX_ CV *cv) 679put_padlist (pTHX_ CV *cv)
518{ 680{
519 MAGIC *mg = CORO_MAGIC_cv (cv); 681 MAGIC *mg = CORO_MAGIC_cv (cv);
520 AV *av;
521 682
522 if (expect_false (!mg)) 683 if (ecb_expect_false (!mg))
684 {
523 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 685 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
686 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
687 mg->mg_len = 1; /* so mg_free frees mg_ptr */
688 }
689 else
690 Renew (mg->mg_ptr,
691 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
692 char);
524 693
525 av = (AV *)mg->mg_obj; 694 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
526
527 if (expect_false (AvFILLp (av) >= AvMAX (av)))
528 av_extend (av, AvFILLp (av) + 1);
529
530 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
531} 695}
532 696
533/** load & save, init *******************************************************/ 697/** load & save, init *******************************************************/
698
699ecb_inline void
700swap_sv (SV *a, SV *b)
701{
702 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
703 SV tmp;
704
705 /* swap sv_any */
706 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
707
708 /* swap sv_flags */
709 SvFLAGS (&tmp) = SvFLAGS (a);
710 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
711 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
712
713#if PERL_VERSION_ATLEAST (5,10,0)
714 /* perl 5.10 and later complicates this _quite_ a bit, but it also
715 * is much faster, so no quarrels here. alternatively, we could
716 * sv_upgrade to avoid this.
717 */
718 {
719 /* swap sv_u */
720 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
721
722 /* if SvANY points to the head, we need to adjust the pointers,
723 * as the pointer for a still points to b, and maybe vice versa.
724 */
725 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
726 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
727 svany_in_head_set |= 1 << SVt_NV;
728 #endif
729
730 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
731
732 if (svany_in_head (SvTYPE (a)))
733 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
734
735 if (svany_in_head (SvTYPE (b)))
736 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
737 }
738#endif
739}
740
741/* swap sv heads, at least logically */
742static void
743swap_svs_enter (pTHX_ Coro__State c)
744{
745 int i;
746
747 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
748 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
749}
750
751static void
752swap_svs_leave (pTHX_ Coro__State c)
753{
754 int i;
755
756 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
757 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
758}
759
760#define SWAP_SVS_ENTER(coro) \
761 if (ecb_expect_false ((coro)->swap_sv)) \
762 swap_svs_enter (aTHX_ (coro))
763
764#define SWAP_SVS_LEAVE(coro) \
765 if (ecb_expect_false ((coro)->swap_sv)) \
766 swap_svs_leave (aTHX_ (coro))
534 767
535static void 768static void
536on_enterleave_call (pTHX_ SV *cb); 769on_enterleave_call (pTHX_ SV *cb);
537 770
538static void 771static void
… …
541 perl_slots *slot = c->slot; 774 perl_slots *slot = c->slot;
542 c->slot = 0; 775 c->slot = 0;
543 776
544 PL_mainstack = c->mainstack; 777 PL_mainstack = c->mainstack;
545 778
546 GvSV (PL_defgv) = slot->defsv; 779#if CORO_JIT
547 GvAV (PL_defgv) = slot->defav; 780 load_perl_slots (slot);
548 GvSV (PL_errgv) = slot->errsv; 781#else
549 GvSV (irsgv) = slot->irsgv;
550 GvHV (PL_hintgv) = slot->hinthv;
551
552 #define VAR(name,type) PL_ ## name = slot->name; 782 #define VARx(name,expr,type) expr = slot->name;
553 # include "state.h" 783 #include "state.h"
554 #undef VAR 784#endif
555 785
556 { 786 {
557 dSP; 787 dSP;
558 788
559 CV *cv; 789 CV *cv;
560 790
561 /* now do the ugly restore mess */ 791 /* now do the ugly restore mess */
562 while (expect_true (cv = (CV *)POPs)) 792 while (ecb_expect_true (cv = (CV *)POPs))
563 { 793 {
564 put_padlist (aTHX_ cv); /* mark this padlist as available */ 794 put_padlist (aTHX_ cv); /* mark this padlist as available */
565 CvDEPTH (cv) = PTR2IV (POPs); 795 CvDEPTH (cv) = PTR2IV (POPs);
566 CvPADLIST (cv) = (AV *)POPs; 796 CvPADLIST (cv) = (PADLIST *)POPs;
567 } 797 }
568 798
569 PUTBACK; 799 PUTBACK;
570 } 800 }
571 801
572 slf_frame = c->slf_frame; 802 slf_frame = c->slf_frame;
573 CORO_THROW = c->except; 803 CORO_THROW = c->except;
574 804
805 if (ecb_expect_false (enable_times))
806 {
807 if (ecb_expect_false (!times_valid))
808 coro_times_update ();
809
810 coro_times_sub (c);
811 }
812
575 if (expect_false (c->on_enter)) 813 if (ecb_expect_false (c->on_enter))
576 { 814 {
577 int i; 815 int i;
578 816
579 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 817 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
580 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 818 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
581 } 819 }
820
821 if (ecb_expect_false (c->on_enter_xs))
822 {
823 int i;
824
825 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
826 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
827 }
828
829 SWAP_SVS_ENTER (c);
582} 830}
583 831
584static void 832static void
585save_perl (pTHX_ Coro__State c) 833save_perl (pTHX_ Coro__State c)
586{ 834{
835 SWAP_SVS_LEAVE (c);
836
837 if (ecb_expect_false (c->on_leave_xs))
838 {
839 int i;
840
841 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
842 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
843 }
844
587 if (expect_false (c->on_leave)) 845 if (ecb_expect_false (c->on_leave))
588 { 846 {
589 int i; 847 int i;
590 848
591 for (i = AvFILLp (c->on_leave); i >= 0; --i) 849 for (i = AvFILLp (c->on_leave); i >= 0; --i)
592 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 850 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
851 }
852
853 times_valid = 0;
854
855 if (ecb_expect_false (enable_times))
856 {
857 coro_times_update (); times_valid = 1;
858 coro_times_add (c);
593 } 859 }
594 860
595 c->except = CORO_THROW; 861 c->except = CORO_THROW;
596 c->slf_frame = slf_frame; 862 c->slf_frame = slf_frame;
597 863
… …
608 874
609 XPUSHs (Nullsv); 875 XPUSHs (Nullsv);
610 /* this loop was inspired by pp_caller */ 876 /* this loop was inspired by pp_caller */
611 for (;;) 877 for (;;)
612 { 878 {
613 while (expect_true (cxix >= 0)) 879 while (ecb_expect_true (cxix >= 0))
614 { 880 {
615 PERL_CONTEXT *cx = &ccstk[cxix--]; 881 PERL_CONTEXT *cx = &ccstk[cxix--];
616 882
617 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 883 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
618 { 884 {
619 CV *cv = cx->blk_sub.cv; 885 CV *cv = cx->blk_sub.cv;
620 886
621 if (expect_true (CvDEPTH (cv))) 887 if (ecb_expect_true (CvDEPTH (cv)))
622 { 888 {
623 EXTEND (SP, 3); 889 EXTEND (SP, 3);
624 PUSHs ((SV *)CvPADLIST (cv)); 890 PUSHs ((SV *)CvPADLIST (cv));
625 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 891 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
626 PUSHs ((SV *)cv); 892 PUSHs ((SV *)cv);
… …
629 get_padlist (aTHX_ cv); 895 get_padlist (aTHX_ cv);
630 } 896 }
631 } 897 }
632 } 898 }
633 899
634 if (expect_true (top_si->si_type == PERLSI_MAIN)) 900 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
635 break; 901 break;
636 902
637 top_si = top_si->si_prev; 903 top_si = top_si->si_prev;
638 ccstk = top_si->si_cxstack; 904 ccstk = top_si->si_cxstack;
639 cxix = top_si->si_cxix; 905 cxix = top_si->si_cxix;
… …
641 907
642 PUTBACK; 908 PUTBACK;
643 } 909 }
644 910
645 /* allocate some space on the context stack for our purposes */ 911 /* allocate some space on the context stack for our purposes */
646 /* we manually unroll here, as usually 2 slots is enough */ 912 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
647 if (SLOT_COUNT >= 1) CXINC;
648 if (SLOT_COUNT >= 2) CXINC;
649 if (SLOT_COUNT >= 3) CXINC;
650 { 913 {
651 int i; 914 unsigned int i;
915
652 for (i = 3; i < SLOT_COUNT; ++i) 916 for (i = 0; i < SLOT_COUNT; ++i)
653 CXINC; 917 CXINC;
654 } 918
655 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 919 cxstack_ix -= SLOT_COUNT; /* undo allocation */
920 }
656 921
657 c->mainstack = PL_mainstack; 922 c->mainstack = PL_mainstack;
658 923
659 { 924 {
660 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 925 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
661 926
662 slot->defav = GvAV (PL_defgv); 927#if CORO_JIT
663 slot->defsv = DEFSV; 928 save_perl_slots (slot);
664 slot->errsv = ERRSV; 929#else
665 slot->irsgv = GvSV (irsgv);
666 slot->hinthv = GvHV (PL_hintgv);
667
668 #define VAR(name,type) slot->name = PL_ ## name; 930 #define VARx(name,expr,type) slot->name = expr;
669 # include "state.h" 931 #include "state.h"
670 #undef VAR 932#endif
671 } 933 }
672} 934}
673 935
674/* 936/*
675 * allocate various perl stacks. This is almost an exact copy 937 * allocate various perl stacks. This is almost an exact copy
… …
681# define coro_init_stacks(thx) init_stacks () 943# define coro_init_stacks(thx) init_stacks ()
682#else 944#else
683static void 945static void
684coro_init_stacks (pTHX) 946coro_init_stacks (pTHX)
685{ 947{
686 PL_curstackinfo = new_stackinfo(32, 8); 948 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
687 PL_curstackinfo->si_type = PERLSI_MAIN; 949 PL_curstackinfo->si_type = PERLSI_MAIN;
688 PL_curstack = PL_curstackinfo->si_stack; 950 PL_curstack = PL_curstackinfo->si_stack;
689 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 951 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
690 952
691 PL_stack_base = AvARRAY(PL_curstack); 953 PL_stack_base = AvARRAY(PL_curstack);
… …
706#endif 968#endif
707 969
708 New(54,PL_scopestack,8,I32); 970 New(54,PL_scopestack,8,I32);
709 PL_scopestack_ix = 0; 971 PL_scopestack_ix = 0;
710 PL_scopestack_max = 8; 972 PL_scopestack_max = 8;
973#if HAS_SCOPESTACK_NAME
974 New(54,PL_scopestack_name,8,const char*);
975#endif
711 976
712 New(54,PL_savestack,24,ANY); 977 New(54,PL_savestack,24,ANY);
713 PL_savestack_ix = 0; 978 PL_savestack_ix = 0;
714 PL_savestack_max = 24; 979 PL_savestack_max = 24;
980#if PERL_VERSION_ATLEAST (5,24,0)
981 /* perl 5.24 moves SS_MAXPUSH optimisation from */
982 /* the header macros to PL_savestack_max */
983 PL_savestack_max -= SS_MAXPUSH;
984#endif
715 985
716#if !PERL_VERSION_ATLEAST (5,10,0) 986#if !PERL_VERSION_ATLEAST (5,10,0)
717 New(54,PL_retstack,4,OP*); 987 New(54,PL_retstack,4,OP*);
718 PL_retstack_ix = 0; 988 PL_retstack_ix = 0;
719 PL_retstack_max = 4; 989 PL_retstack_max = 4;
… …
743 } 1013 }
744 1014
745 Safefree (PL_tmps_stack); 1015 Safefree (PL_tmps_stack);
746 Safefree (PL_markstack); 1016 Safefree (PL_markstack);
747 Safefree (PL_scopestack); 1017 Safefree (PL_scopestack);
1018#if HAS_SCOPESTACK_NAME
1019 Safefree (PL_scopestack_name);
1020#endif
748 Safefree (PL_savestack); 1021 Safefree (PL_savestack);
749#if !PERL_VERSION_ATLEAST (5,10,0) 1022#if !PERL_VERSION_ATLEAST (5,10,0)
750 Safefree (PL_retstack); 1023 Safefree (PL_retstack);
751#endif 1024#endif
752} 1025}
… …
782 } 1055 }
783 1056
784 return rss; 1057 return rss;
785} 1058}
786 1059
787/** coroutine stack handling ************************************************/ 1060/** provide custom get/set/clear methods for %SIG elements ******************/
788
789static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
790static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
791static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
792 1061
793/* apparently < 5.8.8 */ 1062/* apparently < 5.8.8 */
794#ifndef MgPV_nolen_const 1063#ifndef MgPV_nolen_const
795#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1064#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
796 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1065 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
797 (const char*)(mg)->mg_ptr) 1066 (const char*)(mg)->mg_ptr)
798#endif 1067#endif
799 1068
1069/* this will be a patched copy of PL_vtbl_sigelem */
1070static MGVTBL coro_sigelem_vtbl;
1071
1072static int ecb_cold
1073coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1074{
1075 char *key = SvPV_nolen ((SV *)name);
1076
1077 /* do what mg_copy normally does */
1078 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1079 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1080
1081 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1082 if (*key == '_'
1083 && (strEQ (key, "__DIE__")
1084 || strEQ (key, "__WARN__")))
1085 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1086
1087 return 1;
1088}
1089
1090/* perl does not have a %SIG vtbl, we provide one so we can override */
1091/* the magic vtbl for the __DIE__ and __WARN__ members */
1092static const MGVTBL coro_sig_vtbl = {
1093 0, 0, 0, 0, 0,
1094 coro_sig_copy
1095};
1096
800/* 1097/*
801 * This overrides the default magic get method of %SIG elements. 1098 * This overrides the default magic get method of %SIG elements.
802 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1099 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
803 * and instead of trying to save and restore the hash elements, we just provide 1100 * and instead of trying to save and restore the hash elements (extremely slow),
804 * readback here. 1101 * we just provide our own readback here.
805 */ 1102 */
806static int 1103static int ecb_cold
807coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1104coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
808{ 1105{
809 const char *s = MgPV_nolen_const (mg); 1106 const char *s = MgPV_nolen_const (mg);
1107 /* the key must be either __DIE__ or __WARN__ here */
1108 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
810 1109
811 if (*s == '_') 1110 SV *ssv;
812 {
813 SV **svp = 0;
814 1111
815 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
816 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
817
818 if (svp) 1112 if (!*svp)
819 { 1113 ssv = &PL_sv_undef;
820 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1114 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
821 return 0; 1115 ssv = sv_2mortal (newRV_inc (*svp));
822 } 1116 else
823 } 1117 ssv = *svp;
824 1118
825 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1119 sv_setsv (sv, ssv);
1120 return 0;
826} 1121}
827 1122
828static int 1123static int ecb_cold
829coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1124coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
830{ 1125{
831 const char *s = MgPV_nolen_const (mg); 1126 const char *s = MgPV_nolen_const (mg);
1127 /* the key must be either __DIE__ or __WARN__ here */
1128 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
832 1129
833 if (*s == '_')
834 {
835 SV **svp = 0;
836
837 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
838 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
839
840 if (svp)
841 {
842 SV *old = *svp; 1130 SV *old = *svp;
843 *svp = 0; 1131 *svp = 0;
844 SvREFCNT_dec (old); 1132 SvREFCNT_dec (old);
845 return 0; 1133 return 0;
846 }
847 }
848
849 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
850} 1134}
851 1135
852static int 1136static int ecb_cold
853coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1137coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
854{ 1138{
855 const char *s = MgPV_nolen_const (mg); 1139 const char *s = MgPV_nolen_const (mg);
1140 /* the key must be either __DIE__ or __WARN__ here */
1141 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
856 1142
857 if (*s == '_')
858 {
859 SV **svp = 0;
860
861 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
862 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
863
864 if (svp)
865 {
866 SV *old = *svp; 1143 SV *old = *svp;
867 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1144 *svp = SvOK (sv) ? newSVsv (sv) : 0;
868 SvREFCNT_dec (old); 1145 SvREFCNT_dec (old);
869 return 0; 1146 return 0;
870 }
871 }
872
873 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
874} 1147}
875 1148
876static void 1149static void
877prepare_nop (pTHX_ struct coro_transfer_args *ta) 1150prepare_nop (pTHX_ struct coro_transfer_args *ta)
878{ 1151{
… …
890slf_check_repeat (pTHX_ struct CoroSLF *frame) 1163slf_check_repeat (pTHX_ struct CoroSLF *frame)
891{ 1164{
892 return 1; 1165 return 1;
893} 1166}
894 1167
895static UNOP coro_setup_op; 1168/** coroutine stack handling ************************************************/
896 1169
897static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1170static UNOP init_perl_op;
1171
1172ecb_noinline static void /* noinline to keep it out of the transfer fast path */
898coro_setup (pTHX_ struct coro *coro) 1173init_perl (pTHX_ struct coro *coro)
899{ 1174{
900 /* 1175 /*
901 * emulate part of the perl startup here. 1176 * emulate part of the perl startup here.
902 */ 1177 */
903 coro_init_stacks (aTHX); 1178 coro_init_stacks (aTHX);
… …
910 PL_comppad_name_fill = 0; 1185 PL_comppad_name_fill = 0;
911 PL_comppad_name_floor = 0; 1186 PL_comppad_name_floor = 0;
912 PL_curpm = 0; 1187 PL_curpm = 0;
913 PL_curpad = 0; 1188 PL_curpad = 0;
914 PL_localizing = 0; 1189 PL_localizing = 0;
915 PL_dirty = 0;
916 PL_restartop = 0; 1190 PL_restartop = 0;
917#if PERL_VERSION_ATLEAST (5,10,0) 1191#if PERL_VERSION_ATLEAST (5,10,0)
918 PL_parser = 0; 1192 PL_parser = 0;
919#endif 1193#endif
920 PL_hints = 0; 1194 PL_hints = 0;
921 1195
922 /* recreate the die/warn hooks */ 1196 /* recreate the die/warn hooks */
923 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1197 PL_diehook = SvREFCNT_inc (rv_diehook);
924 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1198 PL_warnhook = SvREFCNT_inc (rv_warnhook);
925 1199
926 GvSV (PL_defgv) = newSV (0); 1200 GvSV (PL_defgv) = newSV (0);
927 GvAV (PL_defgv) = coro->args; coro->args = 0; 1201 GvAV (PL_defgv) = coro->args; coro->args = 0;
928 GvSV (PL_errgv) = newSV (0); 1202 GvSV (PL_errgv) = newSV (0);
929 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1203 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
930 GvHV (PL_hintgv) = 0; 1204 GvHV (PL_hintgv) = newHV ();
1205#if PERL_VERSION_ATLEAST (5,10,0)
1206 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1207#endif
931 PL_rs = newSVsv (GvSV (irsgv)); 1208 PL_rs = newSVsv (GvSV (irsgv));
932 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1209 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
933 1210
934 { 1211 {
935 dSP; 1212 dSP;
… …
950 /* this newly created coroutine might be run on an existing cctx which most 1227 /* this newly created coroutine might be run on an existing cctx which most
951 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1228 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
952 */ 1229 */
953 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1230 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
954 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1231 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1232 slf_frame.destroy = 0;
955 1233
956 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1234 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
957 coro_setup_op.op_next = PL_op; 1235 init_perl_op.op_next = PL_op;
958 coro_setup_op.op_type = OP_ENTERSUB; 1236 init_perl_op.op_type = OP_ENTERSUB;
959 coro_setup_op.op_ppaddr = pp_slf; 1237 init_perl_op.op_ppaddr = pp_slf;
960 /* no flags etc. required, as an init function won't be called */ 1238 /* no flags etc. required, as an init function won't be called */
961 1239
962 PL_op = (OP *)&coro_setup_op; 1240 PL_op = (OP *)&init_perl_op;
963 1241
964 /* copy throw, in case it was set before coro_setup */ 1242 /* copy throw, in case it was set before init_perl */
965 CORO_THROW = coro->except; 1243 CORO_THROW = coro->except;
1244
1245 SWAP_SVS_ENTER (coro);
1246
1247 if (ecb_expect_false (enable_times))
1248 {
1249 coro_times_update ();
1250 coro_times_sub (coro);
1251 }
966} 1252}
967 1253
968static void 1254static void
969coro_unwind_stacks (pTHX) 1255coro_unwind_stacks (pTHX)
970{ 1256{
… …
985 dounwind (-1); 1271 dounwind (-1);
986 } 1272 }
987} 1273}
988 1274
989static void 1275static void
990coro_destruct_perl (pTHX_ struct coro *coro) 1276destroy_perl (pTHX_ struct coro *coro)
991{ 1277{
1278 SV *svf [9];
1279
1280 {
1281 SV *old_current = SvRV (coro_current);
1282 struct coro *current = SvSTATE (old_current);
1283
1284 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1285
1286 save_perl (aTHX_ current);
1287
1288 /* this will cause transfer_check to croak on block*/
1289 SvRV_set (coro_current, (SV *)coro->hv);
1290
1291 load_perl (aTHX_ coro);
1292
1293 /* restore swapped sv's */
1294 SWAP_SVS_LEAVE (coro);
1295
992 coro_unwind_stacks (aTHX); 1296 coro_unwind_stacks (aTHX);
993 1297
994 SvREFCNT_dec (GvSV (PL_defgv)); 1298 coro_destruct_stacks (aTHX);
995 SvREFCNT_dec (GvAV (PL_defgv));
996 SvREFCNT_dec (GvSV (PL_errgv));
997 SvREFCNT_dec (PL_defoutgv);
998 SvREFCNT_dec (PL_rs);
999 SvREFCNT_dec (GvSV (irsgv));
1000 SvREFCNT_dec (GvHV (PL_hintgv));
1001 1299
1002 SvREFCNT_dec (PL_diehook); 1300 /* now save some sv's to be free'd later */
1003 SvREFCNT_dec (PL_warnhook); 1301 svf [0] = GvSV (PL_defgv);
1302 svf [1] = (SV *)GvAV (PL_defgv);
1303 svf [2] = GvSV (PL_errgv);
1304 svf [3] = (SV *)PL_defoutgv;
1305 svf [4] = PL_rs;
1306 svf [5] = GvSV (irsgv);
1307 svf [6] = (SV *)GvHV (PL_hintgv);
1308 svf [7] = PL_diehook;
1309 svf [8] = PL_warnhook;
1310 assert (9 == sizeof (svf) / sizeof (*svf));
1311
1312 SvRV_set (coro_current, old_current);
1313
1314 load_perl (aTHX_ current);
1004 1315 }
1316
1317 {
1318 unsigned int i;
1319
1320 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1321 SvREFCNT_dec (svf [i]);
1322
1005 SvREFCNT_dec (coro->saved_deffh); 1323 SvREFCNT_dec (coro->saved_deffh);
1006 SvREFCNT_dec (coro->rouse_cb); 1324 SvREFCNT_dec (coro->rouse_cb);
1007 SvREFCNT_dec (coro->invoke_cb); 1325 SvREFCNT_dec (coro->invoke_cb);
1008 SvREFCNT_dec (coro->invoke_av); 1326 SvREFCNT_dec (coro->invoke_av);
1009 1327 SvREFCNT_dec (coro->on_enter_xs);
1010 coro_destruct_stacks (aTHX); 1328 SvREFCNT_dec (coro->on_leave_xs);
1329 }
1011} 1330}
1012 1331
1013INLINE void 1332ecb_inline void
1014free_coro_mortal (pTHX) 1333free_coro_mortal (pTHX)
1015{ 1334{
1016 if (expect_true (coro_mortal)) 1335 if (ecb_expect_true (coro_mortal))
1017 { 1336 {
1018 SvREFCNT_dec (coro_mortal); 1337 SvREFCNT_dec ((SV *)coro_mortal);
1019 coro_mortal = 0; 1338 coro_mortal = 0;
1020 } 1339 }
1021} 1340}
1022 1341
1023static int 1342static int
… …
1077 1396
1078 if (PL_curcop != &PL_compiling) 1397 if (PL_curcop != &PL_compiling)
1079 { 1398 {
1080 SV **cb; 1399 SV **cb;
1081 1400
1082 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1401 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1083 { 1402 {
1084 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1403 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1085 1404
1086 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1405 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1087 { 1406 {
… …
1097 SAVETMPS; 1416 SAVETMPS;
1098 EXTEND (SP, 3); 1417 EXTEND (SP, 3);
1099 PUSHMARK (SP); 1418 PUSHMARK (SP);
1100 PUSHs (&PL_sv_yes); 1419 PUSHs (&PL_sv_yes);
1101 PUSHs (fullname); 1420 PUSHs (fullname);
1102 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1421 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (SUB_ARGARRAY)) : &PL_sv_undef);
1103 PUTBACK; 1422 PUTBACK;
1104 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1423 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1105 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1424 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1106 SPAGAIN; 1425 SPAGAIN;
1107 FREETMPS; 1426 FREETMPS;
… …
1156 1475
1157 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1476 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1158} 1477}
1159 1478
1160/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1479/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1161static void NOINLINE 1480static void ecb_noinline
1162cctx_prepare (pTHX) 1481cctx_prepare (pTHX)
1163{ 1482{
1164 PL_top_env = &PL_start_env; 1483 PL_top_env = &PL_start_env;
1165 1484
1166 if (cctx_current->flags & CC_TRACE) 1485 if (cctx_current->flags & CC_TRACE)
… …
1177 slf_frame.prepare = slf_prepare_set_stacklevel; 1496 slf_frame.prepare = slf_prepare_set_stacklevel;
1178 slf_frame.check = slf_check_set_stacklevel; 1497 slf_frame.check = slf_check_set_stacklevel;
1179} 1498}
1180 1499
1181/* the tail of transfer: execute stuff we can only do after a transfer */ 1500/* the tail of transfer: execute stuff we can only do after a transfer */
1182INLINE void 1501ecb_inline void
1183transfer_tail (pTHX) 1502transfer_tail (pTHX)
1184{ 1503{
1185 free_coro_mortal (aTHX); 1504 free_coro_mortal (aTHX);
1505}
1506
1507/* try to exit the same way perl's main function would do */
1508/* we do not bother resetting the environment or other things *7
1509/* that are not, uhm, essential */
1510/* this obviously also doesn't work when perl is embedded */
1511static void ecb_noinline ecb_cold
1512perlish_exit (pTHX)
1513{
1514 int exitstatus = perl_destruct (PL_curinterp);
1515 perl_free (PL_curinterp);
1516 exit (exitstatus);
1186} 1517}
1187 1518
1188/* 1519/*
1189 * this is a _very_ stripped down perl interpreter ;) 1520 * this is a _very_ stripped down perl interpreter ;)
1190 */ 1521 */
… …
1212 /* somebody or something will hit me for both perl_run and PL_restartop */ 1543 /* somebody or something will hit me for both perl_run and PL_restartop */
1213 PL_restartop = PL_op; 1544 PL_restartop = PL_op;
1214 perl_run (PL_curinterp); 1545 perl_run (PL_curinterp);
1215 /* 1546 /*
1216 * Unfortunately, there is no way to get at the return values of the 1547 * Unfortunately, there is no way to get at the return values of the
1217 * coro body here, as perl_run destroys these 1548 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1549 * runtime errors here, as this is just a random interpreter, not a thread.
1218 */ 1550 */
1551
1552 /*
1553 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1554 * requires PL_scopestack_ix, so do it here if required.
1555 */
1556 if (!PL_scopestack_ix)
1557 ENTER;
1219 1558
1220 /* 1559 /*
1221 * If perl-run returns we assume exit() was being called or the coro 1560 * If perl-run returns we assume exit() was being called or the coro
1222 * fell off the end, which seems to be the only valid (non-bug) 1561 * fell off the end, which seems to be the only valid (non-bug)
1223 * reason for perl_run to return. We try to exit by jumping to the 1562 * reason for perl_run to return. We try to mimic whatever perl is normally
1224 * bootstrap-time "top" top_env, as we cannot restore the "main" 1563 * doing in that case. YMMV.
1225 * coroutine as Coro has no such concept.
1226 * This actually isn't valid with the pthread backend, but OSes requiring
1227 * that backend are too broken to do it in a standards-compliant way.
1228 */ 1564 */
1229 PL_top_env = main_top_env; 1565 perlish_exit (aTHX);
1230 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1231 } 1566 }
1232} 1567}
1233 1568
1234static coro_cctx * 1569static coro_cctx *
1235cctx_new () 1570cctx_new (void)
1236{ 1571{
1237 coro_cctx *cctx; 1572 coro_cctx *cctx;
1238 1573
1239 ++cctx_count; 1574 ++cctx_count;
1240 New (0, cctx, 1, coro_cctx); 1575 New (0, cctx, 1, coro_cctx);
… …
1246 return cctx; 1581 return cctx;
1247} 1582}
1248 1583
1249/* create a new cctx only suitable as source */ 1584/* create a new cctx only suitable as source */
1250static coro_cctx * 1585static coro_cctx *
1251cctx_new_empty () 1586cctx_new_empty (void)
1252{ 1587{
1253 coro_cctx *cctx = cctx_new (); 1588 coro_cctx *cctx = cctx_new ();
1254 1589
1255 cctx->sptr = 0; 1590 cctx->stack.sptr = 0;
1256 coro_create (&cctx->cctx, 0, 0, 0, 0); 1591 coro_create (&cctx->cctx, 0, 0, 0, 0);
1257 1592
1258 return cctx; 1593 return cctx;
1259} 1594}
1260 1595
1261/* create a new cctx suitable as destination/running a perl interpreter */ 1596/* create a new cctx suitable as destination/running a perl interpreter */
1262static coro_cctx * 1597static coro_cctx *
1263cctx_new_run () 1598cctx_new_run (void)
1264{ 1599{
1265 coro_cctx *cctx = cctx_new (); 1600 coro_cctx *cctx = cctx_new ();
1266 void *stack_start;
1267 size_t stack_size;
1268 1601
1269#if HAVE_MMAP 1602 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1270 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1271 /* mmap supposedly does allocate-on-write for us */
1272 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1273
1274 if (cctx->sptr != (void *)-1)
1275 {
1276 #if CORO_STACKGUARD
1277 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1278 #endif
1279 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1280 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1281 cctx->flags |= CC_MAPPED;
1282 } 1603 {
1283 else
1284#endif
1285 {
1286 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1287 New (0, cctx->sptr, cctx_stacksize, long);
1288
1289 if (!cctx->sptr)
1290 {
1291 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1604 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1292 _exit (EXIT_FAILURE); 1605 _exit (EXIT_FAILURE);
1293 }
1294
1295 stack_start = cctx->sptr;
1296 stack_size = cctx->ssize;
1297 } 1606 }
1298 1607
1299 #if CORO_USE_VALGRIND
1300 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1301 #endif
1302
1303 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1608 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1304 1609
1305 return cctx; 1610 return cctx;
1306} 1611}
1307 1612
1308static void 1613static void
1309cctx_destroy (coro_cctx *cctx) 1614cctx_destroy (coro_cctx *cctx)
1310{ 1615{
1311 if (!cctx) 1616 if (!cctx)
1312 return; 1617 return;
1313 1618
1314 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1619 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1315 1620
1316 --cctx_count; 1621 --cctx_count;
1317 coro_destroy (&cctx->cctx); 1622 coro_destroy (&cctx->cctx);
1318 1623
1319 /* coro_transfer creates new, empty cctx's */ 1624 coro_stack_free (&cctx->stack);
1320 if (cctx->sptr)
1321 {
1322 #if CORO_USE_VALGRIND
1323 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1324 #endif
1325
1326#if HAVE_MMAP
1327 if (cctx->flags & CC_MAPPED)
1328 munmap (cctx->sptr, cctx->ssize);
1329 else
1330#endif
1331 Safefree (cctx->sptr);
1332 }
1333 1625
1334 Safefree (cctx); 1626 Safefree (cctx);
1335} 1627}
1336 1628
1337/* wether this cctx should be destructed */ 1629/* wether this cctx should be destructed */
1338#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1630#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1339 1631
1340static coro_cctx * 1632static coro_cctx *
1341cctx_get (pTHX) 1633cctx_get (pTHX)
1342{ 1634{
1343 while (expect_true (cctx_first)) 1635 while (ecb_expect_true (cctx_first))
1344 { 1636 {
1345 coro_cctx *cctx = cctx_first; 1637 coro_cctx *cctx = cctx_first;
1346 cctx_first = cctx->next; 1638 cctx_first = cctx->next;
1347 --cctx_idle; 1639 --cctx_idle;
1348 1640
1349 if (expect_true (!CCTX_EXPIRED (cctx))) 1641 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1350 return cctx; 1642 return cctx;
1351 1643
1352 cctx_destroy (cctx); 1644 cctx_destroy (cctx);
1353 } 1645 }
1354 1646
… …
1356} 1648}
1357 1649
1358static void 1650static void
1359cctx_put (coro_cctx *cctx) 1651cctx_put (coro_cctx *cctx)
1360{ 1652{
1361 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1653 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1362 1654
1363 /* free another cctx if overlimit */ 1655 /* free another cctx if overlimit */
1364 if (expect_false (cctx_idle >= cctx_max_idle)) 1656 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1365 { 1657 {
1366 coro_cctx *first = cctx_first; 1658 coro_cctx *first = cctx_first;
1367 cctx_first = first->next; 1659 cctx_first = first->next;
1368 --cctx_idle; 1660 --cctx_idle;
1369 1661
… …
1380static void 1672static void
1381transfer_check (pTHX_ struct coro *prev, struct coro *next) 1673transfer_check (pTHX_ struct coro *prev, struct coro *next)
1382{ 1674{
1383 /* TODO: throwing up here is considered harmful */ 1675 /* TODO: throwing up here is considered harmful */
1384 1676
1385 if (expect_true (prev != next)) 1677 if (ecb_expect_true (prev != next))
1386 { 1678 {
1387 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1679 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1388 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1680 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1389 1681
1390 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1682 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1391 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1683 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1392 1684
1393#if !PERL_VERSION_ATLEAST (5,10,0) 1685#if !PERL_VERSION_ATLEAST (5,10,0)
1394 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1686 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1395 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1687 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1396#endif 1688#endif
1397 } 1689 }
1398} 1690}
1399 1691
1400/* always use the TRANSFER macro */ 1692/* always use the TRANSFER macro */
1401static void NOINLINE /* noinline so we have a fixed stackframe */ 1693static void ecb_noinline /* noinline so we have a fixed stackframe */
1402transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1694transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1403{ 1695{
1404 dSTACKLEVEL; 1696 dSTACKLEVEL;
1405 1697
1406 /* sometimes transfer is only called to set idle_sp */ 1698 /* sometimes transfer is only called to set idle_sp */
1407 if (expect_false (!prev)) 1699 if (ecb_expect_false (!prev))
1408 { 1700 {
1409 cctx_current->idle_sp = STACKLEVEL; 1701 cctx_current->idle_sp = STACKLEVEL;
1410 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1702 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1411 } 1703 }
1412 else if (expect_true (prev != next)) 1704 else if (ecb_expect_true (prev != next))
1413 { 1705 {
1414 coro_cctx *cctx_prev; 1706 coro_cctx *cctx_prev;
1415 1707
1416 if (expect_false (prev->flags & CF_NEW)) 1708 if (ecb_expect_false (prev->flags & CF_NEW))
1417 { 1709 {
1418 /* create a new empty/source context */ 1710 /* create a new empty/source context */
1419 prev->flags &= ~CF_NEW; 1711 prev->flags &= ~CF_NEW;
1420 prev->flags |= CF_RUNNING; 1712 prev->flags |= CF_RUNNING;
1421 } 1713 }
… …
1424 next->flags |= CF_RUNNING; 1716 next->flags |= CF_RUNNING;
1425 1717
1426 /* first get rid of the old state */ 1718 /* first get rid of the old state */
1427 save_perl (aTHX_ prev); 1719 save_perl (aTHX_ prev);
1428 1720
1429 if (expect_false (next->flags & CF_NEW)) 1721 if (ecb_expect_false (next->flags & CF_NEW))
1430 { 1722 {
1431 /* need to start coroutine */ 1723 /* need to start coroutine */
1432 next->flags &= ~CF_NEW; 1724 next->flags &= ~CF_NEW;
1433 /* setup coroutine call */ 1725 /* setup coroutine call */
1434 coro_setup (aTHX_ next); 1726 init_perl (aTHX_ next);
1435 } 1727 }
1436 else 1728 else
1437 load_perl (aTHX_ next); 1729 load_perl (aTHX_ next);
1438 1730
1439 /* possibly untie and reuse the cctx */ 1731 /* possibly untie and reuse the cctx */
1440 if (expect_true ( 1732 if (ecb_expect_true (
1441 cctx_current->idle_sp == STACKLEVEL 1733 cctx_current->idle_sp == STACKLEVEL
1442 && !(cctx_current->flags & CC_TRACE) 1734 && !(cctx_current->flags & CC_TRACE)
1443 && !force_cctx 1735 && !force_cctx
1444 )) 1736 ))
1445 { 1737 {
1446 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1738 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1447 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1739 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1448 1740
1449 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1741 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1450 /* without this the next cctx_get might destroy the running cctx while still in use */ 1742 /* without this the next cctx_get might destroy the running cctx while still in use */
1451 if (expect_false (CCTX_EXPIRED (cctx_current))) 1743 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1452 if (expect_true (!next->cctx)) 1744 if (ecb_expect_true (!next->cctx))
1453 next->cctx = cctx_get (aTHX); 1745 next->cctx = cctx_get (aTHX);
1454 1746
1455 cctx_put (cctx_current); 1747 cctx_put (cctx_current);
1456 } 1748 }
1457 else 1749 else
1458 prev->cctx = cctx_current; 1750 prev->cctx = cctx_current;
1459 1751
1460 ++next->usecount; 1752 ++next->usecount;
1461 1753
1462 cctx_prev = cctx_current; 1754 cctx_prev = cctx_current;
1463 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1755 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1464 1756
1465 next->cctx = 0; 1757 next->cctx = 0;
1466 1758
1467 if (expect_false (cctx_prev != cctx_current)) 1759 if (ecb_expect_false (cctx_prev != cctx_current))
1468 { 1760 {
1469 cctx_prev->top_env = PL_top_env; 1761 cctx_prev->top_env = PL_top_env;
1470 PL_top_env = cctx_current->top_env; 1762 PL_top_env = cctx_current->top_env;
1471 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1763 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1472 } 1764 }
… …
1478#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1770#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1479#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1771#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1480 1772
1481/** high level stuff ********************************************************/ 1773/** high level stuff ********************************************************/
1482 1774
1775/* this function is actually Coro, not Coro::State, but we call it from here */
1776/* because it is convenient - but it hasn't been declared yet for that reason */
1483static int 1777static void
1778coro_call_on_destroy (pTHX_ struct coro *coro);
1779
1780static void
1484coro_state_destroy (pTHX_ struct coro *coro) 1781coro_state_destroy (pTHX_ struct coro *coro)
1485{ 1782{
1486 if (coro->flags & CF_DESTROYED) 1783 if (coro->flags & CF_ZOMBIE)
1487 return 0; 1784 return;
1488 1785
1489 if (coro->on_destroy && !PL_dirty)
1490 coro->on_destroy (aTHX_ coro); 1786 slf_destroy (aTHX_ coro);
1491 1787
1492 coro->flags |= CF_DESTROYED; 1788 coro->flags |= CF_ZOMBIE;
1493 1789
1494 if (coro->flags & CF_READY) 1790 if (coro->flags & CF_READY)
1495 { 1791 {
1496 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1792 /* reduce nready, as destroying a ready coro effectively unreadies it */
1497 /* alternative: look through all ready queues and remove the coro */ 1793 /* alternative: look through all ready queues and remove the coro */
1498 --coro_nready; 1794 --coro_nready;
1499 } 1795 }
1500 else 1796 else
1501 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1797 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1798
1799 if (coro->next) coro->next->prev = coro->prev;
1800 if (coro->prev) coro->prev->next = coro->next;
1801 if (coro == coro_first) coro_first = coro->next;
1502 1802
1503 if (coro->mainstack 1803 if (coro->mainstack
1504 && coro->mainstack != main_mainstack 1804 && coro->mainstack != main_mainstack
1505 && coro->slot 1805 && coro->slot
1506 && !PL_dirty) 1806 && !PL_dirty)
1507 {
1508 struct coro *current = SvSTATE_current;
1509
1510 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1511
1512 save_perl (aTHX_ current);
1513 load_perl (aTHX_ coro);
1514
1515 coro_destruct_perl (aTHX_ coro); 1807 destroy_perl (aTHX_ coro);
1516
1517 load_perl (aTHX_ current);
1518
1519 coro->slot = 0;
1520 }
1521 1808
1522 cctx_destroy (coro->cctx); 1809 cctx_destroy (coro->cctx);
1523 SvREFCNT_dec (coro->startcv); 1810 SvREFCNT_dec (coro->startcv);
1524 SvREFCNT_dec (coro->args); 1811 SvREFCNT_dec (coro->args);
1812 SvREFCNT_dec (coro->swap_sv);
1525 SvREFCNT_dec (CORO_THROW); 1813 SvREFCNT_dec (CORO_THROW);
1526 1814
1527 if (coro->next) coro->next->prev = coro->prev; 1815 coro_call_on_destroy (aTHX_ coro);
1528 if (coro->prev) coro->prev->next = coro->next;
1529 if (coro == coro_first) coro_first = coro->next;
1530 1816
1531 return 1; 1817 /* more destruction mayhem in coro_state_free */
1532} 1818}
1533 1819
1534static int 1820static int
1535coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1821coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1536{ 1822{
1537 struct coro *coro = (struct coro *)mg->mg_ptr; 1823 struct coro *coro = (struct coro *)mg->mg_ptr;
1538 mg->mg_ptr = 0; 1824 mg->mg_ptr = 0;
1539 1825
1540 coro->hv = 0;
1541
1542 if (--coro->refcnt < 0)
1543 {
1544 coro_state_destroy (aTHX_ coro); 1826 coro_state_destroy (aTHX_ coro);
1827 SvREFCNT_dec (coro->on_destroy);
1828 SvREFCNT_dec (coro->status);
1829
1545 Safefree (coro); 1830 Safefree (coro);
1546 }
1547 1831
1548 return 0; 1832 return 0;
1549} 1833}
1550 1834
1551static int 1835static int ecb_cold
1552coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1836coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1553{ 1837{
1554 struct coro *coro = (struct coro *)mg->mg_ptr; 1838 /* called when perl clones the current process the slow way (windows process emulation) */
1555 1839 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1556 ++coro->refcnt; 1840 mg->mg_ptr = 0;
1841 mg->mg_virtual = 0;
1557 1842
1558 return 0; 1843 return 0;
1559} 1844}
1560 1845
1561static MGVTBL coro_state_vtbl = { 1846static MGVTBL coro_state_vtbl = {
… …
1584 1869
1585 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1870 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1586 TRANSFER (ta, 1); 1871 TRANSFER (ta, 1);
1587} 1872}
1588 1873
1589/*****************************************************************************/
1590/* gensub: simple closure generation utility */
1591
1592#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1593
1594/* create a closure from XS, returns a code reference */
1595/* the arg can be accessed via GENSUB_ARG from the callback */
1596/* the callback must use dXSARGS/XSRETURN */
1597static SV *
1598gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1599{
1600 CV *cv = (CV *)newSV (0);
1601
1602 sv_upgrade ((SV *)cv, SVt_PVCV);
1603
1604 CvANON_on (cv);
1605 CvISXSUB_on (cv);
1606 CvXSUB (cv) = xsub;
1607 GENSUB_ARG = arg;
1608
1609 return newRV_noinc ((SV *)cv);
1610}
1611
1612/** Coro ********************************************************************/ 1874/** Coro ********************************************************************/
1613 1875
1614INLINE void 1876ecb_inline void
1615coro_enq (pTHX_ struct coro *coro) 1877coro_enq (pTHX_ struct coro *coro)
1616{ 1878{
1617 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1879 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1618}
1619 1880
1620INLINE SV * 1881 SvREFCNT_inc_NN (coro->hv);
1882
1883 coro->next_ready = 0;
1884 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1885 ready [1] = coro;
1886}
1887
1888ecb_inline struct coro *
1621coro_deq (pTHX) 1889coro_deq (pTHX)
1622{ 1890{
1623 int prio; 1891 int prio;
1624 1892
1625 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1893 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1626 if (AvFILLp (coro_ready [prio]) >= 0) 1894 {
1627 return av_shift (coro_ready [prio]); 1895 struct coro **ready = coro_ready [prio];
1896
1897 if (ready [0])
1898 {
1899 struct coro *coro = ready [0];
1900 ready [0] = coro->next_ready;
1901 return coro;
1902 }
1903 }
1628 1904
1629 return 0; 1905 return 0;
1906}
1907
1908static void
1909invoke_sv_ready_hook_helper (void)
1910{
1911 dTHX;
1912 dSP;
1913
1914 ENTER;
1915 SAVETMPS;
1916
1917 PUSHMARK (SP);
1918 PUTBACK;
1919 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1920
1921 FREETMPS;
1922 LEAVE;
1630} 1923}
1631 1924
1632static int 1925static int
1633api_ready (pTHX_ SV *coro_sv) 1926api_ready (pTHX_ SV *coro_sv)
1634{ 1927{
1635 struct coro *coro;
1636 SV *sv_hook;
1637 void (*xs_hook)(void);
1638
1639 coro = SvSTATE (coro_sv); 1928 struct coro *coro = SvSTATE (coro_sv);
1640 1929
1641 if (coro->flags & CF_READY) 1930 if (coro->flags & CF_READY)
1642 return 0; 1931 return 0;
1643 1932
1644 coro->flags |= CF_READY; 1933 coro->flags |= CF_READY;
1645 1934
1646 sv_hook = coro_nready ? 0 : coro_readyhook;
1647 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1648
1649 coro_enq (aTHX_ coro); 1935 coro_enq (aTHX_ coro);
1650 ++coro_nready;
1651 1936
1652 if (sv_hook) 1937 if (!coro_nready++)
1653 { 1938 if (coroapi.readyhook)
1654 dSP; 1939 coroapi.readyhook ();
1655
1656 ENTER;
1657 SAVETMPS;
1658
1659 PUSHMARK (SP);
1660 PUTBACK;
1661 call_sv (sv_hook, G_VOID | G_DISCARD);
1662
1663 FREETMPS;
1664 LEAVE;
1665 }
1666
1667 if (xs_hook)
1668 xs_hook ();
1669 1940
1670 return 1; 1941 return 1;
1671} 1942}
1672 1943
1673static int 1944static int
… …
1675{ 1946{
1676 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1947 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1677} 1948}
1678 1949
1679/* expects to own a reference to next->hv */ 1950/* expects to own a reference to next->hv */
1680INLINE void 1951ecb_inline void
1681prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1952prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1682{ 1953{
1683 SV *prev_sv = SvRV (coro_current); 1954 SV *prev_sv = SvRV (coro_current);
1684 1955
1685 ta->prev = SvSTATE_hv (prev_sv); 1956 ta->prev = SvSTATE_hv (prev_sv);
… …
1696static void 1967static void
1697prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1968prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1698{ 1969{
1699 for (;;) 1970 for (;;)
1700 { 1971 {
1701 SV *next_sv = coro_deq (aTHX); 1972 struct coro *next = coro_deq (aTHX);
1702 1973
1703 if (expect_true (next_sv)) 1974 if (ecb_expect_true (next))
1704 { 1975 {
1705 struct coro *next = SvSTATE_hv (next_sv);
1706
1707 /* cannot transfer to destroyed coros, skip and look for next */ 1976 /* cannot transfer to destroyed coros, skip and look for next */
1708 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1977 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1709 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1978 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1710 else 1979 else
1711 { 1980 {
1712 next->flags &= ~CF_READY; 1981 next->flags &= ~CF_READY;
1713 --coro_nready; 1982 --coro_nready;
1714 1983
… …
1720 { 1989 {
1721 /* nothing to schedule: call the idle handler */ 1990 /* nothing to schedule: call the idle handler */
1722 if (SvROK (sv_idle) 1991 if (SvROK (sv_idle)
1723 && SvOBJECT (SvRV (sv_idle))) 1992 && SvOBJECT (SvRV (sv_idle)))
1724 { 1993 {
1994 if (SvRV (sv_idle) == SvRV (coro_current))
1995 {
1996 require_pv ("Carp");
1997
1998 {
1999 dSP;
2000
2001 ENTER;
2002 SAVETMPS;
2003
2004 PUSHMARK (SP);
2005 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2006 PUTBACK;
2007 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2008
2009 FREETMPS;
2010 LEAVE;
2011 }
2012 }
2013
1725 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2014 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1726 api_ready (aTHX_ SvRV (sv_idle)); 2015 api_ready (aTHX_ SvRV (sv_idle));
1727 --coro_nready; 2016 --coro_nready;
1728 } 2017 }
1729 else 2018 else
1730 { 2019 {
2020 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1731 dSP; 2021 dSP;
1732 2022
1733 ENTER; 2023 ENTER;
1734 SAVETMPS; 2024 SAVETMPS;
1735 2025
… …
1742 } 2032 }
1743 } 2033 }
1744 } 2034 }
1745} 2035}
1746 2036
1747INLINE void 2037ecb_inline void
1748prepare_cede (pTHX_ struct coro_transfer_args *ta) 2038prepare_cede (pTHX_ struct coro_transfer_args *ta)
1749{ 2039{
1750 api_ready (aTHX_ coro_current); 2040 api_ready (aTHX_ coro_current);
1751 prepare_schedule (aTHX_ ta); 2041 prepare_schedule (aTHX_ ta);
1752} 2042}
1753 2043
1754INLINE void 2044ecb_inline void
1755prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2045prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1756{ 2046{
1757 SV *prev = SvRV (coro_current); 2047 SV *prev = SvRV (coro_current);
1758 2048
1759 if (coro_nready) 2049 if (coro_nready)
… …
1789{ 2079{
1790 struct coro_transfer_args ta; 2080 struct coro_transfer_args ta;
1791 2081
1792 prepare_cede (aTHX_ &ta); 2082 prepare_cede (aTHX_ &ta);
1793 2083
1794 if (expect_true (ta.prev != ta.next)) 2084 if (ecb_expect_true (ta.prev != ta.next))
1795 { 2085 {
1796 TRANSFER (ta, 1); 2086 TRANSFER (ta, 1);
1797 return 1; 2087 return 1;
1798 } 2088 }
1799 else 2089 else
… …
1842 coro->slot->runops = RUNOPS_DEFAULT; 2132 coro->slot->runops = RUNOPS_DEFAULT;
1843 } 2133 }
1844} 2134}
1845 2135
1846static void 2136static void
2137coro_push_av (pTHX_ AV *av, I32 gimme_v)
2138{
2139 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2140 {
2141 dSP;
2142
2143 if (gimme_v == G_SCALAR)
2144 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2145 else
2146 {
2147 int i;
2148 EXTEND (SP, AvFILLp (av) + 1);
2149
2150 for (i = 0; i <= AvFILLp (av); ++i)
2151 PUSHs (AvARRAY (av)[i]);
2152 }
2153
2154 PUTBACK;
2155 }
2156}
2157
2158static void
2159coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2160{
2161 if (!coro->on_destroy)
2162 coro->on_destroy = newAV ();
2163
2164 av_push (coro->on_destroy, cb);
2165}
2166
2167static void
2168slf_destroy_join (pTHX_ struct CoroSLF *frame)
2169{
2170 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2171}
2172
2173static int
2174slf_check_join (pTHX_ struct CoroSLF *frame)
2175{
2176 struct coro *coro = (struct coro *)frame->data;
2177
2178 if (!coro->status)
2179 return 1;
2180
2181 frame->destroy = 0;
2182
2183 coro_push_av (aTHX_ coro->status, GIMME_V);
2184
2185 SvREFCNT_dec ((SV *)coro->hv);
2186
2187 return 0;
2188}
2189
2190static void
2191slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2192{
2193 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2194
2195 if (items > 1)
2196 croak ("join called with too many arguments");
2197
2198 if (coro->status)
2199 frame->prepare = prepare_nop;
2200 else
2201 {
2202 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2203 frame->prepare = prepare_schedule;
2204 }
2205
2206 frame->check = slf_check_join;
2207 frame->destroy = slf_destroy_join;
2208 frame->data = (void *)coro;
2209 SvREFCNT_inc (coro->hv);
2210}
2211
2212static void
1847coro_call_on_destroy (pTHX_ struct coro *coro) 2213coro_call_on_destroy (pTHX_ struct coro *coro)
1848{ 2214{
1849 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2215 AV *od = coro->on_destroy;
1850 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1851 2216
1852 if (on_destroyp) 2217 if (!od)
1853 { 2218 return;
1854 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1855 2219
2220 coro->on_destroy = 0;
2221 sv_2mortal ((SV *)od);
2222
1856 while (AvFILLp (on_destroy) >= 0) 2223 while (AvFILLp (od) >= 0)
2224 {
2225 SV *cb = sv_2mortal (av_pop (od));
2226
2227 /* coro hv's (and only hv's at the moment) are supported as well */
2228 if (SvSTATEhv_p (aTHX_ cb))
2229 api_ready (aTHX_ cb);
2230 else
1857 { 2231 {
1858 dSP; /* don't disturb outer sp */ 2232 dSP; /* don't disturb outer sp */
1859 SV *cb = av_pop (on_destroy);
1860
1861 PUSHMARK (SP); 2233 PUSHMARK (SP);
1862 2234
1863 if (statusp) 2235 if (coro->status)
1864 { 2236 {
1865 int i; 2237 PUTBACK;
1866 AV *status = (AV *)SvRV (*statusp); 2238 coro_push_av (aTHX_ coro->status, G_ARRAY);
1867 EXTEND (SP, AvFILLp (status) + 1); 2239 SPAGAIN;
1868
1869 for (i = 0; i <= AvFILLp (status); ++i)
1870 PUSHs (AvARRAY (status)[i]);
1871 } 2240 }
1872 2241
1873 PUTBACK; 2242 PUTBACK;
1874 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2243 call_sv (cb, G_VOID | G_DISCARD);
1875 } 2244 }
1876 } 2245 }
1877} 2246}
1878 2247
1879static void 2248static void
1880slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2249coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1881{ 2250{
2251 AV *av;
2252
2253 if (coro->status)
2254 {
2255 av = coro->status;
2256 av_clear (av);
2257 }
2258 else
2259 av = coro->status = newAV ();
2260
2261 /* items are actually not so common, so optimise for this case */
2262 if (items)
2263 {
1882 int i; 2264 int i;
1883 HV *hv = (HV *)SvRV (coro_current);
1884 AV *av = newAV ();
1885 2265
1886 av_extend (av, items - 1); 2266 av_extend (av, items - 1);
2267
1887 for (i = 0; i < items; ++i) 2268 for (i = 0; i < items; ++i)
1888 av_push (av, SvREFCNT_inc_NN (arg [i])); 2269 av_push (av, SvREFCNT_inc_NN (arg [i]));
2270 }
2271}
1889 2272
1890 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2273static void
1891 2274slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2275{
1892 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2276 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1893 api_ready (aTHX_ sv_manager); 2277 api_ready (aTHX_ sv_manager);
1894 2278
1895 frame->prepare = prepare_schedule; 2279 frame->prepare = prepare_schedule;
1896 frame->check = slf_check_repeat; 2280 frame->check = slf_check_repeat;
1897 2281
1898 /* as a minor optimisation, we could unwind all stacks here */ 2282 /* as a minor optimisation, we could unwind all stacks here */
1899 /* but that puts extra pressure on pp_slf, and is not worth much */ 2283 /* but that puts extra pressure on pp_slf, and is not worth much */
1900 /*coro_unwind_stacks (aTHX);*/ 2284 /*coro_unwind_stacks (aTHX);*/
2285}
2286
2287static void
2288slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2289{
2290 HV *coro_hv = (HV *)SvRV (coro_current);
2291
2292 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2293 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2294}
2295
2296static void
2297slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2298{
2299 HV *coro_hv;
2300 struct coro *coro;
2301
2302 if (items <= 0)
2303 croak ("Coro::cancel called without coro object,");
2304
2305 coro = SvSTATE (arg [0]);
2306 coro_hv = coro->hv;
2307
2308 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2309
2310 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2311 {
2312 /* coro currently busy cancelling something, so just notify it */
2313 coro->slf_frame.data = (void *)coro;
2314
2315 frame->prepare = prepare_nop;
2316 frame->check = slf_check_nop;
2317 }
2318 else if (coro_hv == (HV *)SvRV (coro_current))
2319 {
2320 /* cancelling the current coro is allowed, and equals terminate */
2321 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2322 }
2323 else
2324 {
2325 struct coro *self = SvSTATE_current;
2326
2327 if (!self)
2328 croak ("Coro::cancel called outside of thread content,");
2329
2330 /* otherwise we cancel directly, purely for speed reasons
2331 * unfortunately, this requires some magic trickery, as
2332 * somebody else could cancel us, so we have to fight the cancellation.
2333 * this is ugly, and hopefully fully worth the extra speed.
2334 * besides, I can't get the slow-but-safe version working...
2335 */
2336 slf_frame.data = 0;
2337 self->flags |= CF_NOCANCEL;
2338 coro_state_destroy (aTHX_ coro);
2339 self->flags &= ~CF_NOCANCEL;
2340
2341 if (slf_frame.data)
2342 {
2343 /* while we were busy we have been cancelled, so terminate */
2344 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2345 }
2346 else
2347 {
2348 frame->prepare = prepare_nop;
2349 frame->check = slf_check_nop;
2350 }
2351 }
2352}
2353
2354static int
2355slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2356{
2357 frame->prepare = 0;
2358 coro_unwind_stacks (aTHX);
2359
2360 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2361
2362 return 1;
2363}
2364
2365static int
2366safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2367{
2368 if (coro->cctx)
2369 croak ("coro inside C callback, unable to cancel at this time, caught");
2370
2371 if (coro->flags & CF_NEW)
2372 {
2373 coro_set_status (aTHX_ coro, arg, items);
2374 coro_state_destroy (aTHX_ coro);
2375 }
2376 else
2377 {
2378 if (!coro->slf_frame.prepare)
2379 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2380
2381 slf_destroy (aTHX_ coro);
2382
2383 coro_set_status (aTHX_ coro, arg, items);
2384 coro->slf_frame.prepare = prepare_nop;
2385 coro->slf_frame.check = slf_check_safe_cancel;
2386
2387 api_ready (aTHX_ (SV *)coro->hv);
2388 }
2389
2390 return 1;
1901} 2391}
1902 2392
1903/*****************************************************************************/ 2393/*****************************************************************************/
1904/* async pool handler */ 2394/* async pool handler */
1905 2395
… …
1936slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2426slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1937{ 2427{
1938 HV *hv = (HV *)SvRV (coro_current); 2428 HV *hv = (HV *)SvRV (coro_current);
1939 struct coro *coro = SvSTATE_hv ((SV *)hv); 2429 struct coro *coro = SvSTATE_hv ((SV *)hv);
1940 2430
1941 if (expect_true (coro->saved_deffh)) 2431 if (ecb_expect_true (coro->saved_deffh))
1942 { 2432 {
1943 /* subsequent iteration */ 2433 /* subsequent iteration */
1944 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2434 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1945 coro->saved_deffh = 0; 2435 coro->saved_deffh = 0;
1946 2436
1947 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2437 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1948 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2438 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1949 { 2439 {
1950 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2440 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1951 coro->invoke_av = newAV (); 2441 return;
1952
1953 frame->prepare = prepare_nop;
1954 } 2442 }
1955 else 2443 else
1956 { 2444 {
1957 av_clear (GvAV (PL_defgv)); 2445 av_clear (GvAV (PL_defgv));
1958 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2446 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1959 2447
2448 if (ecb_expect_false (coro->swap_sv))
2449 {
2450 SWAP_SVS_LEAVE (coro);
2451 SvREFCNT_dec_NN (coro->swap_sv);
2452 coro->swap_sv = 0;
2453 }
2454
1960 coro->prio = 0; 2455 coro->prio = 0;
1961 2456
1962 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2457 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
1963 api_trace (aTHX_ coro_current, 0); 2458 api_trace (aTHX_ coro_current, 0);
1964 2459
1965 frame->prepare = prepare_schedule; 2460 frame->prepare = prepare_schedule;
1966 av_push (av_async_pool, SvREFCNT_inc (hv)); 2461 av_push (av_async_pool, SvREFCNT_inc (hv));
1967 } 2462 }
… …
1983 2478
1984static void 2479static void
1985coro_rouse_callback (pTHX_ CV *cv) 2480coro_rouse_callback (pTHX_ CV *cv)
1986{ 2481{
1987 dXSARGS; 2482 dXSARGS;
1988 SV *data = (SV *)GENSUB_ARG; 2483 SV *data = (SV *)S_GENSUB_ARG;
1989 2484
1990 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2485 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1991 { 2486 {
1992 /* first call, set args */ 2487 /* first call, set args */
2488 SV *coro = SvRV (data);
1993 AV *av = newAV (); 2489 AV *av = newAV ();
1994 SV *coro = SvRV (data);
1995 2490
1996 SvRV_set (data, (SV *)av); 2491 SvRV_set (data, (SV *)av);
1997 api_ready (aTHX_ coro);
1998 SvREFCNT_dec (coro);
1999 2492
2000 /* better take a full copy of the arguments */ 2493 /* better take a full copy of the arguments */
2001 while (items--) 2494 while (items--)
2002 av_store (av, items, newSVsv (ST (items))); 2495 av_store (av, items, newSVsv (ST (items)));
2496
2497 api_ready (aTHX_ coro);
2498 SvREFCNT_dec (coro);
2003 } 2499 }
2004 2500
2005 XSRETURN_EMPTY; 2501 XSRETURN_EMPTY;
2006} 2502}
2007 2503
2008static int 2504static int
2009slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2505slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2010{ 2506{
2011 SV *data = (SV *)frame->data; 2507 SV *data = (SV *)frame->data;
2012 2508
2013 if (CORO_THROW) 2509 if (CORO_THROW)
2014 return 0; 2510 return 0;
2015 2511
2016 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2512 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2017 return 1; 2513 return 1;
… …
2024 2520
2025 EXTEND (SP, AvFILLp (av) + 1); 2521 EXTEND (SP, AvFILLp (av) + 1);
2026 for (i = 0; i <= AvFILLp (av); ++i) 2522 for (i = 0; i <= AvFILLp (av); ++i)
2027 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2523 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2028 2524
2029 /* we have stolen the elements, so ste length to zero and free */ 2525 /* we have stolen the elements, so set length to zero and free */
2030 AvFILLp (av) = -1; 2526 AvFILLp (av) = -1;
2031 av_undef (av); 2527 av_undef (av);
2032 2528
2033 PUTBACK; 2529 PUTBACK;
2034 } 2530 }
… …
2053 cb = sv_2mortal (coro->rouse_cb); 2549 cb = sv_2mortal (coro->rouse_cb);
2054 coro->rouse_cb = 0; 2550 coro->rouse_cb = 0;
2055 } 2551 }
2056 2552
2057 if (!SvROK (cb) 2553 if (!SvROK (cb)
2058 || SvTYPE (SvRV (cb)) != SVt_PVCV 2554 || SvTYPE (SvRV (cb)) != SVt_PVCV
2059 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2555 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2060 croak ("Coro::rouse_wait called with illegal callback argument,"); 2556 croak ("Coro::rouse_wait called with illegal callback argument,");
2061 2557
2062 { 2558 {
2063 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2559 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2064 SV *data = (SV *)GENSUB_ARG; 2560 SV *data = (SV *)S_GENSUB_ARG;
2065 2561
2066 frame->data = (void *)data; 2562 frame->data = (void *)data;
2067 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2563 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2068 frame->check = slf_check_rouse_wait; 2564 frame->check = slf_check_rouse_wait;
2069 } 2565 }
… …
2073coro_new_rouse_cb (pTHX) 2569coro_new_rouse_cb (pTHX)
2074{ 2570{
2075 HV *hv = (HV *)SvRV (coro_current); 2571 HV *hv = (HV *)SvRV (coro_current);
2076 struct coro *coro = SvSTATE_hv (hv); 2572 struct coro *coro = SvSTATE_hv (hv);
2077 SV *data = newRV_inc ((SV *)hv); 2573 SV *data = newRV_inc ((SV *)hv);
2078 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2574 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2079 2575
2080 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2576 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2081 SvREFCNT_dec (data); /* magicext increases the refcount */ 2577 SvREFCNT_dec (data); /* magicext increases the refcount */
2082 2578
2083 SvREFCNT_dec (coro->rouse_cb); 2579 SvREFCNT_dec (coro->rouse_cb);
… …
2180static void 2676static void
2181slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2677slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2182{ 2678{
2183 frame->prepare = prepare_cede_notself; 2679 frame->prepare = prepare_cede_notself;
2184 frame->check = slf_check_nop; 2680 frame->check = slf_check_nop;
2681}
2682
2683/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2684static void
2685slf_destroy (pTHX_ struct coro *coro)
2686{
2687 struct CoroSLF frame = coro->slf_frame;
2688
2689 /*
2690 * The on_destroy below most likely is from an SLF call.
2691 * Since by definition the SLF call will not finish when we destroy
2692 * the coro, we will have to force-finish it here, otherwise
2693 * cleanup functions cannot call SLF functions.
2694 */
2695 coro->slf_frame.prepare = 0;
2696
2697 /* this callback is reserved for slf functions needing to do cleanup */
2698 if (frame.destroy && frame.prepare && !PL_dirty)
2699 frame.destroy (aTHX_ &frame);
2185} 2700}
2186 2701
2187/* 2702/*
2188 * these not obviously related functions are all rolled into one 2703 * these not obviously related functions are all rolled into one
2189 * function to increase chances that they all will call transfer with the same 2704 * function to increase chances that they all will call transfer with the same
… …
2196 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2711 I32 checkmark; /* mark SP to see how many elements check has pushed */
2197 2712
2198 /* set up the slf frame, unless it has already been set-up */ 2713 /* set up the slf frame, unless it has already been set-up */
2199 /* the latter happens when a new coro has been started */ 2714 /* the latter happens when a new coro has been started */
2200 /* or when a new cctx was attached to an existing coroutine */ 2715 /* or when a new cctx was attached to an existing coroutine */
2201 if (expect_true (!slf_frame.prepare)) 2716 if (ecb_expect_true (!slf_frame.prepare))
2202 { 2717 {
2203 /* first iteration */ 2718 /* first iteration */
2204 dSP; 2719 dSP;
2205 SV **arg = PL_stack_base + TOPMARK + 1; 2720 SV **arg = PL_stack_base + TOPMARK + 1;
2206 int items = SP - arg; /* args without function object */ 2721 int items = SP - arg; /* args without function object */
… …
2247 while (slf_frame.check (aTHX_ &slf_frame)); 2762 while (slf_frame.check (aTHX_ &slf_frame));
2248 2763
2249 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2764 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2250 2765
2251 /* exception handling */ 2766 /* exception handling */
2252 if (expect_false (CORO_THROW)) 2767 if (ecb_expect_false (CORO_THROW))
2253 { 2768 {
2254 SV *exception = sv_2mortal (CORO_THROW); 2769 SV *exception = sv_2mortal (CORO_THROW);
2255 2770
2256 CORO_THROW = 0; 2771 CORO_THROW = 0;
2257 sv_setsv (ERRSV, exception); 2772 sv_setsv (ERRSV, exception);
2258 croak (0); 2773 croak (0);
2259 } 2774 }
2260 2775
2261 /* return value handling - mostly like entersub */ 2776 /* return value handling - mostly like entersub */
2262 /* make sure we put something on the stack in scalar context */ 2777 /* make sure we put something on the stack in scalar context */
2263 if (GIMME_V == G_SCALAR) 2778 if (GIMME_V == G_SCALAR
2779 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2264 { 2780 {
2265 dSP; 2781 dSP;
2266 SV **bot = PL_stack_base + checkmark; 2782 SV **bot = PL_stack_base + checkmark;
2267 2783
2268 if (sp == bot) /* too few, push undef */ 2784 if (sp == bot) /* too few, push undef */
2269 bot [1] = &PL_sv_undef; 2785 bot [1] = &PL_sv_undef;
2270 else if (sp != bot + 1) /* too many, take last one */ 2786 else /* too many, take last one */
2271 bot [1] = *sp; 2787 bot [1] = *sp;
2272 2788
2273 SP = bot + 1; 2789 SP = bot + 1;
2274 2790
2275 PUTBACK; 2791 PUTBACK;
… …
2308 if (PL_op->op_flags & OPf_STACKED) 2824 if (PL_op->op_flags & OPf_STACKED)
2309 { 2825 {
2310 if (items > slf_arga) 2826 if (items > slf_arga)
2311 { 2827 {
2312 slf_arga = items; 2828 slf_arga = items;
2313 free (slf_argv); 2829 Safefree (slf_argv);
2314 slf_argv = malloc (slf_arga * sizeof (SV *)); 2830 New (0, slf_argv, slf_arga, SV *);
2315 } 2831 }
2316 2832
2317 slf_argc = items; 2833 slf_argc = items;
2318 2834
2319 for (i = 0; i < items; ++i) 2835 for (i = 0; i < items; ++i)
… …
2373{ 2889{
2374 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2890 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2375 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2891 on_enterleave_call (aTHX_ sv_2mortal (cb));
2376} 2892}
2377 2893
2894static void
2895enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2896{
2897 if (!hook)
2898 return;
2899
2900 if (!*avp)
2901 {
2902 *avp = newAV ();
2903 AvREAL_off (*avp);
2904 }
2905
2906 av_push (*avp, (SV *)hook);
2907 av_push (*avp, (SV *)arg);
2908}
2909
2910static void
2911enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2912{
2913 AV *av = *avp;
2914 int i;
2915
2916 if (!av)
2917 return;
2918
2919 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2920 if (AvARRAY (av)[i] == (SV *)hook)
2921 {
2922 if (execute)
2923 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2924
2925 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2926 av_pop (av);
2927 av_pop (av);
2928 break;
2929 }
2930
2931 if (AvFILLp (av) >= 0)
2932 {
2933 *avp = 0;
2934 SvREFCNT_dec_NN (av);
2935 }
2936}
2937
2938static void
2939api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2940{
2941 struct coro *coro = SvSTATE (coro_sv);
2942
2943 if (SvSTATE_current == coro)
2944 if (enter)
2945 enter (aTHX_ enter_arg);
2946
2947 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2948 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2949}
2950
2951static void
2952api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2953{
2954 struct coro *coro = SvSTATE (coro_sv);
2955
2956 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2957 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2958}
2959
2960static void
2961savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2962{
2963 struct coro *coro = SvSTATE_current;
2964
2965 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2966}
2967
2968static void
2969savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2970{
2971 struct coro *coro = SvSTATE_current;
2972
2973 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2974}
2975
2976static void
2977api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2978{
2979 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2980
2981 /* this ought to be much cheaper than malloc + a single destructor call */
2982 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2983 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2984}
2985
2378/*****************************************************************************/ 2986/*****************************************************************************/
2379/* PerlIO::cede */ 2987/* PerlIO::cede */
2380 2988
2381typedef struct 2989typedef struct
2382{ 2990{
2383 PerlIOBuf base; 2991 PerlIOBuf base;
2384 NV next, every; 2992 NV next, every;
2385} PerlIOCede; 2993} PerlIOCede;
2386 2994
2387static IV 2995static IV ecb_cold
2388PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2996PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2389{ 2997{
2390 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2998 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2391 2999
2392 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 3000 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2393 self->next = nvtime () + self->every; 3001 self->next = nvtime () + self->every;
2394 3002
2395 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 3003 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2396} 3004}
2397 3005
2398static SV * 3006static SV * ecb_cold
2399PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3007PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2400{ 3008{
2401 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3009 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2402 3010
2403 return newSVnv (self->every); 3011 return newSVnv (self->every);
… …
2454/* Coro::Semaphore & Coro::Signal */ 3062/* Coro::Semaphore & Coro::Signal */
2455 3063
2456static SV * 3064static SV *
2457coro_waitarray_new (pTHX_ int count) 3065coro_waitarray_new (pTHX_ int count)
2458{ 3066{
2459 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3067 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2460 AV *av = newAV (); 3068 AV *av = newAV ();
2461 SV **ary; 3069 SV **ary;
2462 3070
2463 /* unfortunately, building manually saves memory */ 3071 /* unfortunately, building manually saves memory */
2464 Newx (ary, 2, SV *); 3072 Newx (ary, 2, SV *);
… …
2510 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3118 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2511 PUTBACK; 3119 PUTBACK;
2512 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3120 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2513 } 3121 }
2514 3122
2515 SvREFCNT_dec (cb); 3123 SvREFCNT_dec_NN (cb);
2516 } 3124 }
2517} 3125}
2518 3126
2519static void 3127static void
2520coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3128coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2521{ 3129{
2522 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3130 /* call $sem->adjust (0) to possibly wake up some other waiters */
2523 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3131 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2524} 3132}
2525 3133
2526static int 3134static int
2527slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3135slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2528{ 3136{
2529 AV *av = (AV *)frame->data; 3137 AV *av = (AV *)frame->data;
2530 SV *count_sv = AvARRAY (av)[0]; 3138 SV *count_sv = AvARRAY (av)[0];
3139 SV *coro_hv = SvRV (coro_current);
3140
3141 frame->destroy = 0;
2531 3142
2532 /* if we are about to throw, don't actually acquire the lock, just throw */ 3143 /* if we are about to throw, don't actually acquire the lock, just throw */
2533 if (CORO_THROW) 3144 if (ecb_expect_false (CORO_THROW))
3145 {
3146 /* we still might be responsible for the semaphore, so wake up others */
3147 coro_semaphore_adjust (aTHX_ av, 0);
3148
2534 return 0; 3149 return 0;
3150 }
2535 else if (SvIVX (count_sv) > 0) 3151 else if (SvIVX (count_sv) > 0)
2536 { 3152 {
2537 SvSTATE_current->on_destroy = 0;
2538
2539 if (acquire) 3153 if (acquire)
2540 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3154 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2541 else 3155 else
2542 coro_semaphore_adjust (aTHX_ av, 0); 3156 coro_semaphore_adjust (aTHX_ av, 0);
2543 3157
… …
2547 { 3161 {
2548 int i; 3162 int i;
2549 /* if we were woken up but can't down, we look through the whole */ 3163 /* if we were woken up but can't down, we look through the whole */
2550 /* waiters list and only add us if we aren't in there already */ 3164 /* waiters list and only add us if we aren't in there already */
2551 /* this avoids some degenerate memory usage cases */ 3165 /* this avoids some degenerate memory usage cases */
2552 3166 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2553 for (i = 1; i <= AvFILLp (av); ++i)
2554 if (AvARRAY (av)[i] == SvRV (coro_current)) 3167 if (AvARRAY (av)[i] == coro_hv)
2555 return 1; 3168 return 1;
2556 3169
2557 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3170 av_push (av, SvREFCNT_inc (coro_hv));
2558 return 1; 3171 return 1;
2559 } 3172 }
2560} 3173}
2561 3174
2562static int 3175static int
… …
2585 { 3198 {
2586 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3199 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2587 3200
2588 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3201 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2589 frame->prepare = prepare_schedule; 3202 frame->prepare = prepare_schedule;
2590
2591 /* to avoid race conditions when a woken-up coro gets terminated */ 3203 /* to avoid race conditions when a woken-up coro gets terminated */
2592 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3204 /* we arrange for a temporary on_destroy that calls adjust (0) */
2593 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3205 frame->destroy = coro_semaphore_destroy;
2594 } 3206 }
2595} 3207}
2596 3208
2597static void 3209static void
2598slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3210slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2606{ 3218{
2607 if (items >= 2) 3219 if (items >= 2)
2608 { 3220 {
2609 /* callback form */ 3221 /* callback form */
2610 AV *av = (AV *)SvRV (arg [0]); 3222 AV *av = (AV *)SvRV (arg [0]);
2611 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3223 SV *cb_cv = s_get_cv_croak (arg [1]);
2612 3224
2613 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3225 av_push (av, SvREFCNT_inc_NN (cb_cv));
2614 3226
2615 if (SvIVX (AvARRAY (av)[0]) > 0) 3227 if (SvIVX (AvARRAY (av)[0]) > 0)
2616 coro_semaphore_adjust (aTHX_ av, 0); 3228 coro_semaphore_adjust (aTHX_ av, 0);
2617 3229
2618 frame->prepare = prepare_nop; 3230 frame->prepare = prepare_nop;
… …
2642 AvARRAY (av)[0] = AvARRAY (av)[1]; 3254 AvARRAY (av)[0] = AvARRAY (av)[1];
2643 AvARRAY (av)[1] = cb; 3255 AvARRAY (av)[1] = cb;
2644 3256
2645 cb = av_shift (av); 3257 cb = av_shift (av);
2646 3258
3259 if (SvTYPE (cb) == SVt_PVCV)
3260 {
3261 dSP;
3262 PUSHMARK (SP);
3263 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3264 PUTBACK;
3265 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3266 }
3267 else
3268 {
2647 api_ready (aTHX_ cb); 3269 api_ready (aTHX_ cb);
2648 sv_setiv (cb, 0); /* signal waiter */ 3270 sv_setiv (cb, 0); /* signal waiter */
3271 }
3272
2649 SvREFCNT_dec (cb); 3273 SvREFCNT_dec_NN (cb);
2650 3274
2651 --count; 3275 --count;
2652 } 3276 }
2653} 3277}
2654 3278
… …
2662static void 3286static void
2663slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3287slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2664{ 3288{
2665 AV *av = (AV *)SvRV (arg [0]); 3289 AV *av = (AV *)SvRV (arg [0]);
2666 3290
3291 if (items >= 2)
3292 {
3293 SV *cb_cv = s_get_cv_croak (arg [1]);
3294 av_push (av, SvREFCNT_inc_NN (cb_cv));
3295
2667 if (SvIVX (AvARRAY (av)[0])) 3296 if (SvIVX (AvARRAY (av)[0]))
3297 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3298
3299 frame->prepare = prepare_nop;
3300 frame->check = slf_check_nop;
3301 }
3302 else if (SvIVX (AvARRAY (av)[0]))
2668 { 3303 {
2669 SvIVX (AvARRAY (av)[0]) = 0; 3304 SvIVX (AvARRAY (av)[0]) = 0;
2670 frame->prepare = prepare_nop; 3305 frame->prepare = prepare_nop;
2671 frame->check = slf_check_nop; 3306 frame->check = slf_check_nop;
2672 } 3307 }
2673 else 3308 else
2674 { 3309 {
2675 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3310 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2676 3311
2677 av_push (av, waiter); 3312 av_push (av, waiter);
2678 3313
2679 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3314 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2680 frame->prepare = prepare_schedule; 3315 frame->prepare = prepare_schedule;
… …
2698 3333
2699static void 3334static void
2700coro_aio_callback (pTHX_ CV *cv) 3335coro_aio_callback (pTHX_ CV *cv)
2701{ 3336{
2702 dXSARGS; 3337 dXSARGS;
2703 AV *state = (AV *)GENSUB_ARG; 3338 AV *state = (AV *)S_GENSUB_ARG;
2704 SV *coro = av_pop (state); 3339 SV *coro = av_pop (state);
2705 SV *data_sv = newSV (sizeof (struct io_state)); 3340 SV *data_sv = newSV (sizeof (struct io_state));
2706 3341
2707 av_extend (state, items - 1); 3342 av_extend (state, items - 1);
2708 3343
… …
2728 } 3363 }
2729 3364
2730 av_push (state, data_sv); 3365 av_push (state, data_sv);
2731 3366
2732 api_ready (aTHX_ coro); 3367 api_ready (aTHX_ coro);
2733 SvREFCNT_dec (coro); 3368 SvREFCNT_dec_NN (coro);
2734 SvREFCNT_dec ((AV *)state); 3369 SvREFCNT_dec_NN ((AV *)state);
2735} 3370}
2736 3371
2737static int 3372static int
2738slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3373slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2739{ 3374{
… …
2744 /* it quickly returns */ 3379 /* it quickly returns */
2745 if (CORO_THROW) 3380 if (CORO_THROW)
2746 return 0; 3381 return 0;
2747 3382
2748 /* one element that is an RV? repeat! */ 3383 /* one element that is an RV? repeat! */
2749 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3384 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2750 return 1; 3385 return 1;
2751 3386
2752 /* restore status */ 3387 /* restore status */
2753 { 3388 {
2754 SV *data_sv = av_pop (state); 3389 SV *data_sv = av_pop (state);
… …
2757 errno = data->errorno; 3392 errno = data->errorno;
2758 PL_laststype = data->laststype; 3393 PL_laststype = data->laststype;
2759 PL_laststatval = data->laststatval; 3394 PL_laststatval = data->laststatval;
2760 PL_statcache = data->statcache; 3395 PL_statcache = data->statcache;
2761 3396
2762 SvREFCNT_dec (data_sv); 3397 SvREFCNT_dec_NN (data_sv);
2763 } 3398 }
2764 3399
2765 /* push result values */ 3400 /* push result values */
2766 { 3401 {
2767 dSP; 3402 dSP;
… …
2793 dSP; 3428 dSP;
2794 3429
2795 static SV *prio_cv; 3430 static SV *prio_cv;
2796 static SV *prio_sv; 3431 static SV *prio_sv;
2797 3432
2798 if (expect_false (!prio_cv)) 3433 if (ecb_expect_false (!prio_cv))
2799 { 3434 {
2800 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3435 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2801 prio_sv = newSViv (0); 3436 prio_sv = newSViv (0);
2802 } 3437 }
2803 3438
… …
2822 3457
2823 for (i = 0; i < items; ++i) 3458 for (i = 0; i < items; ++i)
2824 PUSHs (arg [i]); 3459 PUSHs (arg [i]);
2825 3460
2826 /* now push the callback closure */ 3461 /* now push the callback closure */
2827 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3462 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2828 3463
2829 /* now call the AIO function - we assume our request is uncancelable */ 3464 /* now call the AIO function - we assume our request is uncancelable */
2830 PUTBACK; 3465 PUTBACK;
2831 call_sv ((SV *)req, G_VOID | G_DISCARD); 3466 call_sv ((SV *)req, G_VOID | G_DISCARD);
2832 } 3467 }
2833 3468
2834 /* now that the requets is going, we loop toll we have a result */ 3469 /* now that the request is going, we loop till we have a result */
2835 frame->data = (void *)state; 3470 frame->data = (void *)state;
2836 frame->prepare = prepare_schedule; 3471 frame->prepare = prepare_schedule;
2837 frame->check = slf_check_aio_req; 3472 frame->check = slf_check_aio_req;
2838} 3473}
2839 3474
… …
2851 3486
2852#if CORO_CLONE 3487#if CORO_CLONE
2853# include "clone.c" 3488# include "clone.c"
2854#endif 3489#endif
2855 3490
3491/*****************************************************************************/
3492
3493static SV *
3494coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3495{
3496 SV *coro_sv;
3497 struct coro *coro;
3498 MAGIC *mg;
3499 HV *hv;
3500 SV *cb;
3501 int i;
3502
3503 if (argc > 0)
3504 {
3505 cb = s_get_cv_croak (argv [0]);
3506
3507 if (!is_coro)
3508 {
3509 if (CvISXSUB (cb))
3510 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3511
3512 if (!CvROOT (cb))
3513 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3514 }
3515 }
3516
3517 Newz (0, coro, 1, struct coro);
3518 coro->args = newAV ();
3519 coro->flags = CF_NEW;
3520
3521 if (coro_first) coro_first->prev = coro;
3522 coro->next = coro_first;
3523 coro_first = coro;
3524
3525 coro->hv = hv = newHV ();
3526 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3527 mg->mg_flags |= MGf_DUP;
3528 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3529
3530 if (argc > 0)
3531 {
3532 av_extend (coro->args, argc + is_coro - 1);
3533
3534 if (is_coro)
3535 {
3536 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3537 cb = (SV *)cv_coro_run;
3538 }
3539
3540 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3541
3542 for (i = 1; i < argc; i++)
3543 av_push (coro->args, newSVsv (argv [i]));
3544 }
3545
3546 return coro_sv;
3547}
3548
3549#ifndef __cplusplus
3550ecb_cold XS(boot_Coro__State);
3551#endif
3552
3553#if CORO_JIT
3554
3555static void ecb_noinline ecb_cold
3556pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3557{
3558 dSP;
3559 AV *av = newAV ();
3560
3561 av_store (av, 3, newSVuv (d));
3562 av_store (av, 2, newSVuv (c));
3563 av_store (av, 1, newSVuv (b));
3564 av_store (av, 0, newSVuv (a));
3565
3566 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3567
3568 PUTBACK;
3569}
3570
3571static void ecb_noinline ecb_cold
3572jit_init (pTHX)
3573{
3574 dSP;
3575 SV *load, *save;
3576 char *map_base;
3577 char *load_ptr, *save_ptr;
3578 STRLEN load_len, save_len, map_len;
3579 int count;
3580
3581 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3582
3583 PUSHMARK (SP);
3584 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3585 #include "state.h"
3586 count = call_pv ("Coro::State::_jit", G_ARRAY);
3587 SPAGAIN;
3588
3589 save = POPs; save_ptr = SvPVbyte (save, save_len);
3590 load = POPs; load_ptr = SvPVbyte (load, load_len);
3591
3592 map_len = load_len + save_len + 16;
3593
3594 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3595
3596 if (map_base == (char *)MAP_FAILED)
3597 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3598
3599 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3600
3601 load_perl_slots = (load_save_perl_slots_type)map_base;
3602 memcpy (map_base, load_ptr, load_len);
3603
3604 map_base += (load_len + 15) & ~15;
3605
3606 save_perl_slots = (load_save_perl_slots_type)map_base;
3607 memcpy (map_base, save_ptr, save_len);
3608
3609 /* we are good citizens and try to make the page read-only, so the evil evil */
3610 /* hackers might have it a bit more difficult */
3611 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3612
3613 PUTBACK;
3614 eval_pv ("undef &Coro::State::_jit", 1);
3615}
3616
3617#endif
3618
2856MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3619MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2857 3620
2858PROTOTYPES: DISABLE 3621PROTOTYPES: DISABLE
2859 3622
2860BOOT: 3623BOOT:
2861{ 3624{
3625#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3626#include "state.h"
2862#ifdef USE_ITHREADS 3627#ifdef USE_ITHREADS
2863# if CORO_PTHREAD 3628# if CORO_PTHREAD
2864 coro_thx = PERL_GET_CONTEXT; 3629 coro_thx = PERL_GET_CONTEXT;
2865# endif 3630# endif
2866#endif 3631#endif
2867 BOOT_PAGESIZE; 3632 /* perl defines these to check for existance first, but why it doesn't */
3633 /* just create them one at init time is not clear to me, except for */
3634 /* programs trying to delete them, but... */
3635 /* anyway, we declare this as invalid and make sure they are initialised here */
3636 DEFSV;
3637 ERRSV;
2868 3638
2869 cctx_current = cctx_new_empty (); 3639 cctx_current = cctx_new_empty ();
2870 3640
2871 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3641 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2872 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3642 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2873 3643
2874 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3644 {
2875 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3645 /*
2876 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3646 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3647 * by coro_sig_vtbl in hash values.
3648 */
3649 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3650
3651 /* this only works if perl doesn't have a vtbl for %SIG */
3652 assert (!mg->mg_virtual);
3653
3654 /*
3655 * The irony is that the perl API itself asserts that mg_virtual
3656 * must be non-const, yet perl5porters insisted on marking their
3657 * vtbls as read-only, just to thwart perl modules from patching
3658 * them.
3659 */
3660 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3661 mg->mg_flags |= MGf_COPY;
3662
3663 coro_sigelem_vtbl = PL_vtbl_sigelem;
3664 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3665 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3666 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3667 }
2877 3668
2878 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
2879 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3669 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
2880 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3670 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
2881 3671
2882 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3672 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
2883 3673
… …
2912 coroapi.prepare_nop = prepare_nop; 3702 coroapi.prepare_nop = prepare_nop;
2913 coroapi.prepare_schedule = prepare_schedule; 3703 coroapi.prepare_schedule = prepare_schedule;
2914 coroapi.prepare_cede = prepare_cede; 3704 coroapi.prepare_cede = prepare_cede;
2915 coroapi.prepare_cede_notself = prepare_cede_notself; 3705 coroapi.prepare_cede_notself = prepare_cede_notself;
2916 3706
2917 { 3707 time_init (aTHX);
2918 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2919 3708
2920 if (!svp) croak ("Time::HiRes is required");
2921 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2922
2923 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2924 }
2925
2926 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3709 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3710#if CORO_JIT
3711 PUTBACK;
3712 jit_init (aTHX);
3713 SPAGAIN;
3714#endif
2927} 3715}
2928 3716
2929SV * 3717SV *
2930new (char *klass, ...) 3718new (SV *klass, ...)
2931 ALIAS: 3719 ALIAS:
2932 Coro::new = 1 3720 Coro::new = 1
2933 CODE: 3721 CODE:
2934{ 3722 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2935 struct coro *coro; 3723 OUTPUT:
2936 MAGIC *mg;
2937 HV *hv;
2938 CV *cb;
2939 int i;
2940
2941 if (items > 1)
2942 {
2943 cb = coro_sv_2cv (aTHX_ ST (1));
2944
2945 if (!ix)
2946 {
2947 if (CvISXSUB (cb))
2948 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2949
2950 if (!CvROOT (cb))
2951 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2952 }
2953 }
2954
2955 Newz (0, coro, 1, struct coro);
2956 coro->args = newAV ();
2957 coro->flags = CF_NEW;
2958
2959 if (coro_first) coro_first->prev = coro;
2960 coro->next = coro_first;
2961 coro_first = coro;
2962
2963 coro->hv = hv = newHV ();
2964 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2965 mg->mg_flags |= MGf_DUP;
2966 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2967
2968 if (items > 1)
2969 {
2970 av_extend (coro->args, items - 1 + ix - 1);
2971
2972 if (ix)
2973 {
2974 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2975 cb = cv_coro_run;
2976 }
2977
2978 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2979
2980 for (i = 2; i < items; i++)
2981 av_push (coro->args, newSVsv (ST (i)));
2982 }
2983}
2984 OUTPUT:
2985 RETVAL 3724 RETVAL
2986 3725
2987void 3726void
2988transfer (...) 3727transfer (...)
2989 PROTOTYPE: $$ 3728 PROTOTYPE: $$
2990 CODE: 3729 CODE:
2991 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3730 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2992
2993bool
2994_destroy (SV *coro_sv)
2995 CODE:
2996 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2997 OUTPUT:
2998 RETVAL
2999
3000void
3001_exit (int code)
3002 PROTOTYPE: $
3003 CODE:
3004 _exit (code);
3005 3731
3006SV * 3732SV *
3007clone (Coro::State coro) 3733clone (Coro::State coro)
3008 CODE: 3734 CODE:
3009{ 3735{
… …
3064void 3790void
3065list () 3791list ()
3066 PROTOTYPE: 3792 PROTOTYPE:
3067 PPCODE: 3793 PPCODE:
3068{ 3794{
3069 struct coro *coro; 3795 struct coro *coro;
3070 for (coro = coro_first; coro; coro = coro->next) 3796 for (coro = coro_first; coro; coro = coro->next)
3071 if (coro->hv) 3797 if (coro->hv)
3072 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3798 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3073} 3799}
3074 3800
… …
3079 CODE: 3805 CODE:
3080{ 3806{
3081 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3807 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3082 { 3808 {
3083 struct coro *current = SvSTATE_current; 3809 struct coro *current = SvSTATE_current;
3810 struct CoroSLF slf_save;
3084 3811
3085 if (current != coro) 3812 if (current != coro)
3086 { 3813 {
3087 PUTBACK; 3814 PUTBACK;
3088 save_perl (aTHX_ current); 3815 save_perl (aTHX_ current);
3089 load_perl (aTHX_ coro); 3816 load_perl (aTHX_ coro);
3817 /* the coro is most likely in an active SLF call.
3818 * while not strictly required (the code we execute is
3819 * not allowed to call any SLF functions), it's cleaner
3820 * to reinitialise the slf_frame and restore it later.
3821 * This might one day allow us to actually do SLF calls
3822 * from code executed here.
3823 */
3824 slf_save = slf_frame;
3825 slf_frame.prepare = 0;
3090 SPAGAIN; 3826 SPAGAIN;
3091 } 3827 }
3092 3828
3093 PUSHSTACK; 3829 PUSHSTACK;
3094 3830
… …
3104 SPAGAIN; 3840 SPAGAIN;
3105 3841
3106 if (current != coro) 3842 if (current != coro)
3107 { 3843 {
3108 PUTBACK; 3844 PUTBACK;
3845 slf_frame = slf_save;
3109 save_perl (aTHX_ coro); 3846 save_perl (aTHX_ coro);
3110 load_perl (aTHX_ current); 3847 load_perl (aTHX_ current);
3111 SPAGAIN; 3848 SPAGAIN;
3112 } 3849 }
3113 } 3850 }
… …
3118 PROTOTYPE: $ 3855 PROTOTYPE: $
3119 ALIAS: 3856 ALIAS:
3120 is_ready = CF_READY 3857 is_ready = CF_READY
3121 is_running = CF_RUNNING 3858 is_running = CF_RUNNING
3122 is_new = CF_NEW 3859 is_new = CF_NEW
3123 is_destroyed = CF_DESTROYED 3860 is_destroyed = CF_ZOMBIE
3861 is_zombie = CF_ZOMBIE
3124 is_suspended = CF_SUSPENDED 3862 is_suspended = CF_SUSPENDED
3125 CODE: 3863 CODE:
3126 RETVAL = boolSV (coro->flags & ix); 3864 RETVAL = boolSV (coro->flags & ix);
3127 OUTPUT: 3865 OUTPUT:
3128 RETVAL 3866 RETVAL
3129 3867
3130void 3868void
3131throw (Coro::State self, SV *throw = &PL_sv_undef) 3869throw (SV *self, SV *exception = &PL_sv_undef)
3132 PROTOTYPE: $;$ 3870 PROTOTYPE: $;$
3133 CODE: 3871 CODE:
3134{ 3872{
3873 struct coro *coro = SvSTATE (self);
3135 struct coro *current = SvSTATE_current; 3874 struct coro *current = SvSTATE_current;
3136 SV **throwp = self == current ? &CORO_THROW : &self->except; 3875 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3137 SvREFCNT_dec (*throwp); 3876 SvREFCNT_dec (*exceptionp);
3138 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3877 SvGETMAGIC (exception);
3878 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3879
3880 api_ready (aTHX_ self);
3139} 3881}
3140 3882
3141void 3883void
3142api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3884api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3143 PROTOTYPE: $;$ 3885 PROTOTYPE: $;$
… …
3198 3940
3199void 3941void
3200cancel (Coro::State self) 3942cancel (Coro::State self)
3201 CODE: 3943 CODE:
3202 coro_state_destroy (aTHX_ self); 3944 coro_state_destroy (aTHX_ self);
3203 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3945
3946SV *
3947enable_times (int enabled = enable_times)
3948 CODE:
3949{
3950 RETVAL = boolSV (enable_times);
3951
3952 if (enabled != enable_times)
3953 {
3954 enable_times = enabled;
3955
3956 coro_times_update ();
3957 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3958 }
3959}
3960 OUTPUT:
3961 RETVAL
3962
3963void
3964times (Coro::State self)
3965 PPCODE:
3966{
3967 struct coro *current = SvSTATE (coro_current);
3968
3969 if (ecb_expect_false (current == self))
3970 {
3971 coro_times_update ();
3972 coro_times_add (SvSTATE (coro_current));
3973 }
3974
3975 EXTEND (SP, 2);
3976 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3977 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3978
3979 if (ecb_expect_false (current == self))
3980 coro_times_sub (SvSTATE (coro_current));
3981}
3982
3983void
3984swap_sv (Coro::State coro, SV *sva, SV *svb)
3985 CODE:
3986{
3987 struct coro *current = SvSTATE_current;
3988 AV *swap_sv;
3989 int i;
3990
3991 sva = SvRV (sva);
3992 svb = SvRV (svb);
3993
3994 if (current == coro)
3995 SWAP_SVS_LEAVE (current);
3996
3997 if (!coro->swap_sv)
3998 coro->swap_sv = newAV ();
3999
4000 swap_sv = coro->swap_sv;
4001
4002 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4003 {
4004 SV *a = AvARRAY (swap_sv)[i ];
4005 SV *b = AvARRAY (swap_sv)[i + 1];
4006
4007 if (a == sva && b == svb)
4008 {
4009 SvREFCNT_dec_NN (a);
4010 SvREFCNT_dec_NN (b);
4011
4012 for (; i <= AvFILLp (swap_sv) - 2; i++)
4013 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4014
4015 AvFILLp (swap_sv) -= 2;
4016
4017 goto removed;
4018 }
4019 }
4020
4021 av_push (swap_sv, SvREFCNT_inc_NN (sva));
4022 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4023
4024 removed:
4025
4026 if (current == coro)
4027 SWAP_SVS_ENTER (current);
4028}
3204 4029
3205 4030
3206MODULE = Coro::State PACKAGE = Coro 4031MODULE = Coro::State PACKAGE = Coro
3207 4032
3208BOOT: 4033BOOT:
3209{ 4034{
3210 int i; 4035 if (SVt_LAST > 32)
4036 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3211 4037
3212 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4038 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3213 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4039 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3214 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4040 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3215 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3216 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4041 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3217 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4042 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3218 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4043 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3219 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4044 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3220 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4045 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3221 4046
3222 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4047 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3223 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4048 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3224 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4049 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3225 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 4050 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3226 4051
3227 coro_stash = gv_stashpv ("Coro", TRUE); 4052 coro_stash = gv_stashpv ("Coro", TRUE);
3228 4053
3229 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 4054 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3230 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 4055 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3231 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 4056 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3232 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 4057 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3233 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 4058 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3234 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 4059 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3235
3236 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3237 coro_ready[i] = newAV ();
3238 4060
3239 { 4061 {
3240 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 4062 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3241 4063
3242 coroapi.schedule = api_schedule; 4064 coroapi.schedule = api_schedule;
… …
3246 coroapi.ready = api_ready; 4068 coroapi.ready = api_ready;
3247 coroapi.is_ready = api_is_ready; 4069 coroapi.is_ready = api_is_ready;
3248 coroapi.nready = coro_nready; 4070 coroapi.nready = coro_nready;
3249 coroapi.current = coro_current; 4071 coroapi.current = coro_current;
3250 4072
4073 coroapi.enterleave_hook = api_enterleave_hook;
4074 coroapi.enterleave_unhook = api_enterleave_unhook;
4075 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4076
3251 /*GCoroAPI = &coroapi;*/ 4077 /*GCoroAPI = &coroapi;*/
3252 sv_setiv (sv, (IV)&coroapi); 4078 sv_setiv (sv, (IV)&coroapi);
3253 SvREADONLY_on (sv); 4079 SvREADONLY_on (sv);
3254 } 4080 }
3255} 4081}
3256 4082
4083SV *
4084async (...)
4085 PROTOTYPE: &@
4086 CODE:
4087 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
4088 api_ready (aTHX_ RETVAL);
4089 OUTPUT:
4090 RETVAL
4091
4092void
4093_destroy (Coro::State coro)
4094 CODE:
4095 /* used by the manager thread */
4096 coro_state_destroy (aTHX_ coro);
4097
4098void
4099on_destroy (Coro::State coro, SV *cb)
4100 CODE:
4101 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4102
4103void
4104join (...)
4105 CODE:
4106 CORO_EXECUTE_SLF_XS (slf_init_join);
4107
3257void 4108void
3258terminate (...) 4109terminate (...)
3259 CODE: 4110 CODE:
3260 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4111 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3261 4112
3262void 4113void
4114cancel (...)
4115 CODE:
4116 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4117
4118int
4119safe_cancel (Coro::State self, ...)
4120 C_ARGS: aTHX_ self, &ST (1), items - 1
4121
4122void
3263schedule (...) 4123schedule (...)
3264 CODE: 4124 CODE:
3265 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4125 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3266 4126
3267void 4127void
… …
3286 4146
3287void 4147void
3288_set_current (SV *current) 4148_set_current (SV *current)
3289 PROTOTYPE: $ 4149 PROTOTYPE: $
3290 CODE: 4150 CODE:
3291 SvREFCNT_dec (SvRV (coro_current)); 4151 SvREFCNT_dec_NN (SvRV (coro_current));
3292 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4152 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3293 4153
3294void 4154void
3295_set_readyhook (SV *hook) 4155_set_readyhook (SV *hook)
3296 PROTOTYPE: $ 4156 PROTOTYPE: $
3297 CODE: 4157 CODE:
3298 SvREFCNT_dec (coro_readyhook); 4158 SvREFCNT_dec (coro_readyhook);
4159 SvGETMAGIC (hook);
4160 if (SvOK (hook))
4161 {
3299 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 4162 coro_readyhook = newSVsv (hook);
4163 CORO_READYHOOK = invoke_sv_ready_hook_helper;
4164 }
4165 else
4166 {
4167 coro_readyhook = 0;
4168 CORO_READYHOOK = 0;
4169 }
3300 4170
3301int 4171int
3302prio (Coro::State coro, int newprio = 0) 4172prio (Coro::State coro, int newprio = 0)
3303 PROTOTYPE: $;$ 4173 PROTOTYPE: $;$
3304 ALIAS: 4174 ALIAS:
… …
3310 if (items > 1) 4180 if (items > 1)
3311 { 4181 {
3312 if (ix) 4182 if (ix)
3313 newprio = coro->prio - newprio; 4183 newprio = coro->prio - newprio;
3314 4184
3315 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 4185 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3316 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 4186 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3317 4187
3318 coro->prio = newprio; 4188 coro->prio = newprio;
3319 } 4189 }
3320} 4190}
3321 OUTPUT: 4191 OUTPUT:
… …
3368 for (i = 1; i < items; ++i) 4238 for (i = 1; i < items; ++i)
3369 av_push (av, SvREFCNT_inc_NN (ST (i))); 4239 av_push (av, SvREFCNT_inc_NN (ST (i)));
3370 4240
3371 if ((SV *)hv == &PL_sv_undef) 4241 if ((SV *)hv == &PL_sv_undef)
3372 { 4242 {
3373 PUSHMARK (SP); 4243 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3374 EXTEND (SP, 2);
3375 PUSHs (sv_Coro);
3376 PUSHs ((SV *)cv_pool_handler);
3377 PUTBACK;
3378 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3379 SPAGAIN;
3380
3381 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4244 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4245 SvREFCNT_dec_NN (sv);
3382 } 4246 }
3383 4247
3384 { 4248 {
3385 struct coro *coro = SvSTATE_hv (hv); 4249 struct coro *coro = SvSTATE_hv (hv);
3386 4250
… …
3393 api_ready (aTHX_ (SV *)hv); 4257 api_ready (aTHX_ (SV *)hv);
3394 4258
3395 if (GIMME_V != G_VOID) 4259 if (GIMME_V != G_VOID)
3396 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4260 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3397 else 4261 else
3398 SvREFCNT_dec (hv); 4262 SvREFCNT_dec_NN (hv);
3399} 4263}
3400 4264
3401SV * 4265SV *
3402rouse_cb () 4266rouse_cb ()
3403 PROTOTYPE: 4267 PROTOTYPE:
… …
3418 on_leave = 1 4282 on_leave = 1
3419 PROTOTYPE: & 4283 PROTOTYPE: &
3420 CODE: 4284 CODE:
3421{ 4285{
3422 struct coro *coro = SvSTATE_current; 4286 struct coro *coro = SvSTATE_current;
3423 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4287 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3424 4288
3425 block = (SV *)coro_sv_2cv (aTHX_ block); 4289 block = s_get_cv_croak (block);
3426 4290
3427 if (!*avp) 4291 if (!*avp)
3428 *avp = newAV (); 4292 *avp = newAV ();
3429 4293
3430 av_push (*avp, SvREFCNT_inc (block)); 4294 av_push (*avp, SvREFCNT_inc (block));
3431 4295
3432 if (!ix) 4296 if (!ix)
3433 on_enterleave_call (aTHX_ block); 4297 on_enterleave_call (aTHX_ block);
3434 4298
3435 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 4299 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3436 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro); 4300 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3437 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 4301 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3438} 4302}
3439 4303
3440 4304
3441MODULE = Coro::State PACKAGE = PerlIO::cede 4305MODULE = Coro::State PACKAGE = PerlIO::cede
3442 4306
… …
3447MODULE = Coro::State PACKAGE = Coro::Semaphore 4311MODULE = Coro::State PACKAGE = Coro::Semaphore
3448 4312
3449SV * 4313SV *
3450new (SV *klass, SV *count = 0) 4314new (SV *klass, SV *count = 0)
3451 CODE: 4315 CODE:
4316{
4317 int semcnt = 1;
4318
4319 if (count)
4320 {
4321 SvGETMAGIC (count);
4322
4323 if (SvOK (count))
4324 semcnt = SvIV (count);
4325 }
4326
3452 RETVAL = sv_bless ( 4327 RETVAL = sv_bless (
3453 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4328 coro_waitarray_new (aTHX_ semcnt),
3454 GvSTASH (CvGV (cv)) 4329 GvSTASH (CvGV (cv))
3455 ); 4330 );
4331}
3456 OUTPUT: 4332 OUTPUT:
3457 RETVAL 4333 RETVAL
3458 4334
3459# helper for Coro::Channel and others 4335# helper for Coro::Channel and others
3460SV * 4336SV *
… …
3470 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4346 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3471 OUTPUT: 4347 OUTPUT:
3472 RETVAL 4348 RETVAL
3473 4349
3474void 4350void
3475up (SV *self, int adjust = 1) 4351up (SV *self)
3476 ALIAS:
3477 adjust = 1
3478 CODE: 4352 CODE:
4353 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4354
4355void
4356adjust (SV *self, int adjust)
4357 CODE:
3479 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4358 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3480 4359
3481void 4360void
3482down (...) 4361down (...)
3483 CODE: 4362 CODE:
3484 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4363 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3506 XSRETURN_NO; 4385 XSRETURN_NO;
3507} 4386}
3508 4387
3509void 4388void
3510waiters (SV *self) 4389waiters (SV *self)
3511 PPCODE: 4390 PPCODE:
3512{ 4391{
3513 AV *av = (AV *)SvRV (self); 4392 AV *av = (AV *)SvRV (self);
3514 int wcount = AvFILLp (av) + 1 - 1; 4393 int wcount = AvFILLp (av) + 1 - 1;
3515 4394
3516 if (GIMME_V == G_SCALAR) 4395 if (GIMME_V == G_SCALAR)
… …
3525} 4404}
3526 4405
3527MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4406MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3528 4407
3529void 4408void
3530_may_delete (SV *sem, int count, int extra_refs) 4409_may_delete (SV *sem, int count, unsigned int extra_refs)
3531 PPCODE: 4410 PPCODE:
3532{ 4411{
3533 AV *av = (AV *)SvRV (sem); 4412 AV *av = (AV *)SvRV (sem);
3534 4413
3535 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4414 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3536 && AvFILLp (av) == 0 /* no waiters, just count */ 4415 && AvFILLp (av) == 0 /* no waiters, just count */
3537 && SvIV (AvARRAY (av)[0]) == count) 4416 && SvIV (AvARRAY (av)[0]) == count)
3538 XSRETURN_YES; 4417 XSRETURN_YES;
… …
3559 4438
3560void 4439void
3561broadcast (SV *self) 4440broadcast (SV *self)
3562 CODE: 4441 CODE:
3563{ 4442{
3564 AV *av = (AV *)SvRV (self); 4443 AV *av = (AV *)SvRV (self);
3565 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4444 coro_signal_wake (aTHX_ av, AvFILLp (av));
3566} 4445}
3567 4446
3568void 4447void
3569send (SV *self) 4448send (SV *self)
… …
3577 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4456 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3578} 4457}
3579 4458
3580IV 4459IV
3581awaited (SV *self) 4460awaited (SV *self)
3582 CODE: 4461 CODE:
3583 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4462 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3584 OUTPUT: 4463 OUTPUT:
3585 RETVAL 4464 RETVAL
3586 4465
3587 4466
… …
3592 4471
3593void 4472void
3594_schedule (...) 4473_schedule (...)
3595 CODE: 4474 CODE:
3596{ 4475{
3597 static int incede; 4476 static int incede;
3598 4477
3599 api_cede_notself (aTHX); 4478 api_cede_notself (aTHX);
3600 4479
3601 ++incede; 4480 ++incede;
3602 while (coro_nready >= incede && api_cede (aTHX)) 4481 while (coro_nready >= incede && api_cede (aTHX))
… …
3618 4497
3619void 4498void
3620_register (char *target, char *proto, SV *req) 4499_register (char *target, char *proto, SV *req)
3621 CODE: 4500 CODE:
3622{ 4501{
3623 CV *req_cv = coro_sv_2cv (aTHX_ req); 4502 SV *req_cv = s_get_cv_croak (req);
3624 /* newXSproto doesn't return the CV on 5.8 */ 4503 /* newXSproto doesn't return the CV on 5.8 */
3625 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4504 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3626 sv_setpv ((SV *)slf_cv, proto); 4505 sv_setpv ((SV *)slf_cv, proto);
3627 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4506 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3628} 4507}
3629 4508
4509MODULE = Coro::State PACKAGE = Coro::Select
4510
4511void
4512patch_pp_sselect ()
4513 CODE:
4514 if (!coro_old_pp_sselect)
4515 {
4516 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4517 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4518 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4519 }
4520
4521void
4522unpatch_pp_sselect ()
4523 CODE:
4524 if (coro_old_pp_sselect)
4525 {
4526 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4527 coro_old_pp_sselect = 0;
4528 }
4529
4530MODULE = Coro::State PACKAGE = Coro::Util
4531
4532void
4533_exit (int code)
4534 CODE:
4535 _exit (code);
4536
4537NV
4538time ()
4539 CODE:
4540 RETVAL = nvtime (aTHX);
4541 OUTPUT:
4542 RETVAL
4543
4544NV
4545gettimeofday ()
4546 PPCODE:
4547{
4548 UV tv [2];
4549 u2time (aTHX_ tv);
4550 EXTEND (SP, 2);
4551 PUSHs (sv_2mortal (newSVuv (tv [0])));
4552 PUSHs (sv_2mortal (newSVuv (tv [1])));
4553}
4554

Diff Legend

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