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

Diff Legend

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