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.362 by root, Wed Jul 1 07:58:45 2009 UTC vs.
Revision 1.466 by root, Sat Jun 25 19:22:33 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
… …
169# define CORO_CLOCK_MONOTONIC 1 116# define CORO_CLOCK_MONOTONIC 1
170# define CORO_CLOCK_THREAD_CPUTIME_ID 3 117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
171# endif 118# endif
172#endif 119#endif
173 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
174static double (*nvtime)(); /* so why doesn't it take void? */ 127static double (*nvtime)(); /* so why doesn't it take void? */
175static void (*u2time)(pTHX_ UV ret[2]); 128static void (*u2time)(pTHX_ UV ret[2]);
176 129
177/* we hijack an hopefully unused CV flag for our purposes */ 130/* we hijack an hopefully unused CV flag for our purposes */
178#define CVf_SLF 0x4000 131#define CVf_SLF 0x4000
179static OP *pp_slf (pTHX); 132static OP *pp_slf (pTHX);
133static void slf_destroy (pTHX_ struct coro *coro);
180 134
181static U32 cctx_gen; 135static U32 cctx_gen;
182static size_t cctx_stacksize = CORO_STACKSIZE; 136static size_t cctx_stacksize = CORO_STACKSIZE;
183static struct CoroAPI coroapi; 137static struct CoroAPI coroapi;
184static AV *main_mainstack; /* used to differentiate between $main and others */ 138static AV *main_mainstack; /* used to differentiate between $main and others */
… …
192 146
193static GV *irsgv; /* $/ */ 147static GV *irsgv; /* $/ */
194static GV *stdoutgv; /* *STDOUT */ 148static GV *stdoutgv; /* *STDOUT */
195static SV *rv_diehook; 149static SV *rv_diehook;
196static SV *rv_warnhook; 150static SV *rv_warnhook;
197static HV *hv_sig; /* %SIG */
198 151
199/* async_pool helper stuff */ 152/* async_pool helper stuff */
200static SV *sv_pool_rss; 153static SV *sv_pool_rss;
201static SV *sv_pool_size; 154static SV *sv_pool_size;
202static SV *sv_async_pool_idle; /* description string */ 155static SV *sv_async_pool_idle; /* description string */
203static AV *av_async_pool; /* idle pool */ 156static AV *av_async_pool; /* idle pool */
204static SV *sv_Coro; /* class string */ 157static SV *sv_Coro; /* class string */
205static CV *cv_pool_handler; 158static CV *cv_pool_handler;
206static CV *cv_coro_state_new;
207 159
208/* Coro::AnyEvent */ 160/* Coro::AnyEvent */
209static SV *sv_activity; 161static SV *sv_activity;
210 162
211/* enable processtime/realtime profiling */ 163/* enable processtime/realtime profiling */
… …
215static char times_valid; 167static char times_valid;
216 168
217static struct coro_cctx *cctx_first; 169static struct coro_cctx *cctx_first;
218static int cctx_count, cctx_idle; 170static int cctx_count, cctx_idle;
219 171
220enum { 172enum
173{
221 CC_MAPPED = 0x01, 174 CC_MAPPED = 0x01,
222 CC_NOREUSE = 0x02, /* throw this away after tracing */ 175 CC_NOREUSE = 0x02, /* throw this away after tracing */
223 CC_TRACE = 0x04, 176 CC_TRACE = 0x04,
224 CC_TRACE_SUB = 0x08, /* trace sub calls */ 177 CC_TRACE_SUB = 0x08, /* trace sub calls */
225 CC_TRACE_LINE = 0x10, /* trace each statement */ 178 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
230typedef struct coro_cctx 183typedef struct coro_cctx
231{ 184{
232 struct coro_cctx *next; 185 struct coro_cctx *next;
233 186
234 /* the stack */ 187 /* the stack */
235 void *sptr; 188 struct coro_stack stack;
236 size_t ssize;
237 189
238 /* cpu state */ 190 /* cpu state */
239 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
240 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
241 JMPENV *top_env; 195 JMPENV *top_env;
242 coro_context cctx; 196 coro_context cctx;
243 197
244 U32 gen; 198 U32 gen;
245#if CORO_USE_VALGRIND 199#if CORO_USE_VALGRIND
246 int valgrind_id; 200 int valgrind_id;
247#endif 201#endif
248 unsigned char flags; 202 unsigned char flags;
249} coro_cctx; 203} coro_cctx;
250 204
251coro_cctx *cctx_current; /* the currently running cctx */ 205static coro_cctx *cctx_current; /* the currently running cctx */
252 206
253/*****************************************************************************/ 207/*****************************************************************************/
254 208
209static MGVTBL coro_state_vtbl;
210
255enum { 211enum
212{
256 CF_RUNNING = 0x0001, /* coroutine is running */ 213 CF_RUNNING = 0x0001, /* coroutine is running */
257 CF_READY = 0x0002, /* coroutine is ready */ 214 CF_READY = 0x0002, /* coroutine is ready */
258 CF_NEW = 0x0004, /* has never been switched to */ 215 CF_NEW = 0x0004, /* has never been switched to */
259 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 216 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
260 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 217 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
218 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
261}; 219};
262 220
263/* 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 */
264typedef struct 222typedef struct
265{ 223{
266 SV *defsv;
267 AV *defav;
268 SV *errsv;
269 SV *irsgv;
270 HV *hinthv;
271#define VAR(name,type) type name; 224 #define VARx(name,expr,type) type name;
272# include "state.h" 225 #include "state.h"
273#undef VAR
274} perl_slots; 226} perl_slots;
275 227
228/* how many context stack entries do we need for perl_slots */
276#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))
277 230
278/* this is a structure representing a perl-level coroutine */ 231/* this is a structure representing a perl-level coroutine */
279struct coro { 232struct coro
233{
280 /* the C coroutine allocated to this perl coroutine, if any */ 234 /* the C coroutine allocated to this perl coroutine, if any */
281 coro_cctx *cctx; 235 coro_cctx *cctx;
282 236
283 /* ready queue */ 237 /* ready queue */
284 struct coro *next_ready; 238 struct coro *next_ready;
… …
286 /* state data */ 240 /* state data */
287 struct CoroSLF slf_frame; /* saved slf frame */ 241 struct CoroSLF slf_frame; /* saved slf frame */
288 AV *mainstack; 242 AV *mainstack;
289 perl_slots *slot; /* basically the saved sp */ 243 perl_slots *slot; /* basically the saved sp */
290 244
291 CV *startcv; /* the CV to execute */ 245 CV *startcv; /* the CV to execute */
292 AV *args; /* data associated with this coroutine (initial args) */ 246 AV *args; /* data associated with this coroutine (initial args) */
293 int refcnt; /* coroutines are refcounted, yes */
294 int flags; /* CF_ flags */ 247 int flags; /* CF_ flags */
295 HV *hv; /* the perl hash associated with this coro, if any */ 248 HV *hv; /* the perl hash associated with this coro, if any */
296 void (*on_destroy)(pTHX_ struct coro *coro);
297 249
298 /* statistics */ 250 /* statistics */
299 int usecount; /* number of transfers to this coro */ 251 int usecount; /* number of transfers to this coro */
300 252
301 /* coro process data */ 253 /* coro process data */
302 int prio; 254 int prio;
303 SV *except; /* exception to be thrown */ 255 SV *except; /* exception to be thrown */
304 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 */
305 259
306 /* async_pool */ 260 /* async_pool */
307 SV *saved_deffh; 261 SV *saved_deffh;
308 SV *invoke_cb; 262 SV *invoke_cb;
309 AV *invoke_av; 263 AV *invoke_av;
310 264
311 /* on_enter/on_leave */ 265 /* on_enter/on_leave */
312 AV *on_enter; 266 AV *on_enter; AV *on_enter_xs;
313 AV *on_leave; 267 AV *on_leave; AV *on_leave_xs;
268
269 /* swap_sv */
270 AV *swap_sv;
314 271
315 /* times */ 272 /* times */
316 coro_ts t_cpu, t_real; 273 coro_ts t_cpu, t_real;
317 274
318 /* linked list */ 275 /* linked list */
… …
322typedef struct coro *Coro__State; 279typedef struct coro *Coro__State;
323typedef struct coro *Coro__State_or_hashref; 280typedef struct coro *Coro__State_or_hashref;
324 281
325/* the following variables are effectively part of the perl context */ 282/* the following variables are effectively part of the perl context */
326/* and get copied between struct coro and these variables */ 283/* and get copied between struct coro and these variables */
327/* the mainr easonw e don't support windows process emulation */ 284/* the main reason we don't support windows process emulation */
328static struct CoroSLF slf_frame; /* the current slf frame */ 285static struct CoroSLF slf_frame; /* the current slf frame */
329 286
330/** Coro ********************************************************************/ 287/** Coro ********************************************************************/
331 288
332#define CORO_PRIO_MAX 3 289#define CORO_PRIO_MAX 3
… …
338 295
339/* for Coro.pm */ 296/* for Coro.pm */
340static SV *coro_current; 297static SV *coro_current;
341static SV *coro_readyhook; 298static SV *coro_readyhook;
342static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 299static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
343static CV *cv_coro_run, *cv_coro_terminate; 300static CV *cv_coro_run;
344static struct coro *coro_first; 301static struct coro *coro_first;
345#define coro_nready coroapi.nready 302#define coro_nready coroapi.nready
346 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
347/** lowlevel stuff **********************************************************/ 399/** lowlevel stuff **********************************************************/
348 400
349static SV * 401static SV * ecb_noinline
350coro_get_sv (pTHX_ const char *name, int create) 402coro_get_sv (pTHX_ const char *name, int create)
351{ 403{
352#if PERL_VERSION_ATLEAST (5,10,0) 404#if PERL_VERSION_ATLEAST (5,10,0)
353 /* 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 */
354 get_sv (name, create); 406 get_sv (name, create);
355#endif 407#endif
356 return get_sv (name, create); 408 return get_sv (name, create);
357} 409}
358 410
359static AV * 411static AV * ecb_noinline
360coro_get_av (pTHX_ const char *name, int create) 412coro_get_av (pTHX_ const char *name, int create)
361{ 413{
362#if PERL_VERSION_ATLEAST (5,10,0) 414#if PERL_VERSION_ATLEAST (5,10,0)
363 /* 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 */
364 get_av (name, create); 416 get_av (name, create);
365#endif 417#endif
366 return get_av (name, create); 418 return get_av (name, create);
367} 419}
368 420
369static HV * 421static HV * ecb_noinline
370coro_get_hv (pTHX_ const char *name, int create) 422coro_get_hv (pTHX_ const char *name, int create)
371{ 423{
372#if PERL_VERSION_ATLEAST (5,10,0) 424#if PERL_VERSION_ATLEAST (5,10,0)
373 /* 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 */
374 get_hv (name, create); 426 get_hv (name, create);
375#endif 427#endif
376 return get_hv (name, create); 428 return get_hv (name, create);
377} 429}
378 430
379/* may croak */ 431ecb_inline void
380INLINE CV *
381coro_sv_2cv (pTHX_ SV *sv)
382{
383 HV *st;
384 GV *gvp;
385 CV *cv = sv_2cv (sv, &st, &gvp, 0);
386
387 if (!cv)
388 croak ("code reference expected");
389
390 return cv;
391}
392
393INLINE void
394coro_times_update () 432coro_times_update (void)
395{ 433{
396#ifdef coro_clock_gettime 434#ifdef coro_clock_gettime
397 struct timespec ts; 435 struct timespec ts;
398 436
399 ts.tv_sec = ts.tv_nsec = 0; 437 ts.tv_sec = ts.tv_nsec = 0;
… …
411 time_real [0] = tv [0]; 449 time_real [0] = tv [0];
412 time_real [1] = tv [1] * 1000; 450 time_real [1] = tv [1] * 1000;
413#endif 451#endif
414} 452}
415 453
416INLINE void 454ecb_inline void
417coro_times_add (struct coro *c) 455coro_times_add (struct coro *c)
418{ 456{
419 c->t_real [1] += time_real [1]; 457 c->t_real [1] += time_real [1];
420 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 458 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
421 c->t_real [0] += time_real [0]; 459 c->t_real [0] += time_real [0];
… …
423 c->t_cpu [1] += time_cpu [1]; 461 c->t_cpu [1] += time_cpu [1];
424 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 462 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
425 c->t_cpu [0] += time_cpu [0]; 463 c->t_cpu [0] += time_cpu [0];
426} 464}
427 465
428INLINE void 466ecb_inline void
429coro_times_sub (struct coro *c) 467coro_times_sub (struct coro *c)
430{ 468{
431 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 469 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
432 c->t_real [1] -= time_real [1]; 470 c->t_real [1] -= time_real [1];
433 c->t_real [0] -= time_real [0]; 471 c->t_real [0] -= time_real [0];
… …
441/* magic glue */ 479/* magic glue */
442 480
443#define CORO_MAGIC_type_cv 26 481#define CORO_MAGIC_type_cv 26
444#define CORO_MAGIC_type_state PERL_MAGIC_ext 482#define CORO_MAGIC_type_state PERL_MAGIC_ext
445 483
446#define CORO_MAGIC_NN(sv, type) \ 484#define CORO_MAGIC_NN(sv, type) \
447 (expect_true (SvMAGIC (sv)->mg_type == type) \ 485 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
448 ? SvMAGIC (sv) \ 486 ? SvMAGIC (sv) \
449 : mg_find (sv, type)) 487 : mg_find (sv, type))
450 488
451#define CORO_MAGIC(sv, type) \ 489#define CORO_MAGIC(sv, type) \
452 (expect_true (SvMAGIC (sv)) \ 490 (ecb_expect_true (SvMAGIC (sv)) \
453 ? CORO_MAGIC_NN (sv, type) \ 491 ? CORO_MAGIC_NN (sv, type) \
454 : 0) 492 : 0)
455 493
456#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)
457#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)
458 496
459INLINE struct coro * 497ecb_inline MAGIC *
460SvSTATE_ (pTHX_ SV *coro) 498SvSTATEhv_p (pTHX_ SV *coro)
461{ 499{
462 HV *stash;
463 MAGIC *mg; 500 MAGIC *mg;
464 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
465 if (SvROK (coro)) 517 if (SvROK (coro_sv))
466 coro = SvRV (coro); 518 coro_sv = SvRV (coro_sv);
467 519
468 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 520 mg = SvSTATEhv_p (aTHX_ coro_sv);
521 if (!mg)
469 croak ("Coro::State object required"); 522 croak ("Coro::State object required");
470 523
471 stash = SvSTASH (coro);
472 if (expect_false (stash != coro_stash && stash != coro_state_stash))
473 {
474 /* very slow, but rare, check */
475 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
476 croak ("Coro::State object required");
477 }
478
479 mg = CORO_MAGIC_state (coro);
480 return (struct coro *)mg->mg_ptr; 524 return (struct coro *)mg->mg_ptr;
481} 525}
482 526
483#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 527#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
484 528
… …
487#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 531#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
488 532
489/*****************************************************************************/ 533/*****************************************************************************/
490/* padlist management and caching */ 534/* padlist management and caching */
491 535
492static AV * 536ecb_inline PADLIST *
493coro_derive_padlist (pTHX_ CV *cv) 537coro_derive_padlist (pTHX_ CV *cv)
494{ 538{
495 AV *padlist = CvPADLIST (cv); 539 PADLIST *padlist = CvPADLIST (cv);
496 AV *newpadlist, *newpad; 540 PADLIST *newpadlist;
541 PADNAMELIST *padnames;
542 PAD *newpad;
543 PADOFFSET off = PadlistMAX (padlist) + 1;
497 544
498 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. */
499 AvREAL_off (newpadlist); 573 AvREAL_off (newpadlist);
500#if PERL_VERSION_ATLEAST (5,10,0)
501 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
502#else
503 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
504#endif 574#endif
505 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
506 --AvFILLp (padlist);
507 575
508 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 576 /* Already extended to 2 elements by newPADLIST. */
509 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;
510 584
511 return newpadlist; 585 return newpadlist;
512} 586}
513 587
514static void 588ecb_inline void
515free_padlist (pTHX_ AV *padlist) 589free_padlist (pTHX_ PADLIST *padlist)
516{ 590{
517 /* may be during global destruction */ 591 /* may be during global destruction */
518 if (!IN_DESTRUCT) 592 if (!IN_DESTRUCT)
519 { 593 {
520 I32 i = AvFILLp (padlist); 594 I32 i = PadlistMAX (padlist);
521 595
522 while (i > 0) /* special-case index 0 */ 596 while (i > 0) /* special-case index 0 */
523 { 597 {
524 /* we try to be extra-careful here */ 598 /* we try to be extra-careful here */
525 AV *av = (AV *)AvARRAY (padlist)[i--]; 599 PAD *pad = PadlistARRAY (padlist)[i--];
526 I32 j = AvFILLp (av);
527 600
601 if (pad)
602 {
603 I32 j = PadMAX (pad);
604
528 while (j >= 0) 605 while (j >= 0)
529 SvREFCNT_dec (AvARRAY (av)[j--]); 606 SvREFCNT_dec (PadARRAY (pad)[j--]);
530 607
531 AvFILLp (av) = -1; 608 PadMAX (pad) = -1;
532 SvREFCNT_dec (av); 609 SvREFCNT_dec (pad);
610 }
533 } 611 }
534 612
535 SvREFCNT_dec (AvARRAY (padlist)[0]); 613 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
536 614
615#if NEWPADAPI
616 Safefree (PadlistARRAY (padlist));
617 Safefree (padlist);
618#else
537 AvFILLp (padlist) = -1; 619 AvFILLp (padlist) = -1;
620 AvREAL_off (padlist);
538 SvREFCNT_dec ((SV*)padlist); 621 SvREFCNT_dec ((SV*)padlist);
622#endif
539 } 623 }
540} 624}
541 625
542static int 626static int
543coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 627coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
544{ 628{
545 AV *padlist; 629 PADLIST *padlist;
546 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;
547 632
548 /* perl manages to free our internal AV and _then_ call us */ 633 /* perl manages to free our internal AV and _then_ call us */
549 if (IN_DESTRUCT) 634 if (IN_DESTRUCT)
550 return 0; 635 return 0;
551 636
552 /* casting is fun. */ 637 while (len--)
553 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
554 free_padlist (aTHX_ padlist); 638 free_padlist (aTHX_ padlists[len]);
555
556 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
557 639
558 return 0; 640 return 0;
559} 641}
560 642
561static MGVTBL coro_cv_vtbl = { 643static MGVTBL coro_cv_vtbl = {
562 0, 0, 0, 0, 644 0, 0, 0, 0,
563 coro_cv_free 645 coro_cv_free
564}; 646};
565 647
566/* the next two functions merely cache the padlists */ 648/* the next two functions merely cache the padlists */
567static void 649ecb_inline void
568get_padlist (pTHX_ CV *cv) 650get_padlist (pTHX_ CV *cv)
569{ 651{
570 MAGIC *mg = CORO_MAGIC_cv (cv); 652 MAGIC *mg = CORO_MAGIC_cv (cv);
571 AV *av; 653 size_t *lenp;
572 654
573 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 655 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
574 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 656 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
575 else 657 else
576 { 658 {
577#if CORO_PREFER_PERL_FUNCTIONS 659#if CORO_PREFER_PERL_FUNCTIONS
578 /* this is probably cleaner? but also slower! */ 660 /* this is probably cleaner? but also slower! */
579 /* in practise, it seems to be less stable */ 661 /* in practise, it seems to be less stable */
… …
585 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 667 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
586#endif 668#endif
587 } 669 }
588} 670}
589 671
590static void 672ecb_inline void
591put_padlist (pTHX_ CV *cv) 673put_padlist (pTHX_ CV *cv)
592{ 674{
593 MAGIC *mg = CORO_MAGIC_cv (cv); 675 MAGIC *mg = CORO_MAGIC_cv (cv);
594 AV *av;
595 676
596 if (expect_false (!mg)) 677 if (ecb_expect_false (!mg))
678 {
597 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);
598 687
599 av = (AV *)mg->mg_obj; 688 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
600
601 if (expect_false (AvFILLp (av) >= AvMAX (av)))
602 av_extend (av, AvFILLp (av) + 1);
603
604 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
605} 689}
606 690
607/** 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))
608 761
609static void 762static void
610on_enterleave_call (pTHX_ SV *cb); 763on_enterleave_call (pTHX_ SV *cb);
611 764
612static void 765static void
… …
615 perl_slots *slot = c->slot; 768 perl_slots *slot = c->slot;
616 c->slot = 0; 769 c->slot = 0;
617 770
618 PL_mainstack = c->mainstack; 771 PL_mainstack = c->mainstack;
619 772
620 GvSV (PL_defgv) = slot->defsv; 773#if CORO_JIT
621 GvAV (PL_defgv) = slot->defav; 774 load_perl_slots (slot);
622 GvSV (PL_errgv) = slot->errsv; 775#else
623 GvSV (irsgv) = slot->irsgv;
624 GvHV (PL_hintgv) = slot->hinthv;
625
626 #define VAR(name,type) PL_ ## name = slot->name; 776 #define VARx(name,expr,type) expr = slot->name;
627 # include "state.h" 777 #include "state.h"
628 #undef VAR 778#endif
629 779
630 { 780 {
631 dSP; 781 dSP;
632 782
633 CV *cv; 783 CV *cv;
634 784
635 /* now do the ugly restore mess */ 785 /* now do the ugly restore mess */
636 while (expect_true (cv = (CV *)POPs)) 786 while (ecb_expect_true (cv = (CV *)POPs))
637 { 787 {
638 put_padlist (aTHX_ cv); /* mark this padlist as available */ 788 put_padlist (aTHX_ cv); /* mark this padlist as available */
639 CvDEPTH (cv) = PTR2IV (POPs); 789 CvDEPTH (cv) = PTR2IV (POPs);
640 CvPADLIST (cv) = (AV *)POPs; 790 CvPADLIST (cv) = (PADLIST *)POPs;
641 } 791 }
642 792
643 PUTBACK; 793 PUTBACK;
644 } 794 }
645 795
646 slf_frame = c->slf_frame; 796 slf_frame = c->slf_frame;
647 CORO_THROW = c->except; 797 CORO_THROW = c->except;
648 798
649 if (expect_false (enable_times)) 799 if (ecb_expect_false (enable_times))
650 { 800 {
651 if (expect_false (!times_valid)) 801 if (ecb_expect_false (!times_valid))
652 coro_times_update (); 802 coro_times_update ();
653 803
654 coro_times_sub (c); 804 coro_times_sub (c);
655 } 805 }
656 806
657 if (expect_false (c->on_enter)) 807 if (ecb_expect_false (c->on_enter))
658 { 808 {
659 int i; 809 int i;
660 810
661 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 811 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
662 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 812 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
663 } 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);
664} 824}
665 825
666static void 826static void
667save_perl (pTHX_ Coro__State c) 827save_perl (pTHX_ Coro__State c)
668{ 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
669 if (expect_false (c->on_leave)) 839 if (ecb_expect_false (c->on_leave))
670 { 840 {
671 int i; 841 int i;
672 842
673 for (i = AvFILLp (c->on_leave); i >= 0; --i) 843 for (i = AvFILLp (c->on_leave); i >= 0; --i)
674 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 844 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
675 } 845 }
676 846
677 times_valid = 0; 847 times_valid = 0;
678 848
679 if (expect_false (enable_times)) 849 if (ecb_expect_false (enable_times))
680 { 850 {
681 coro_times_update (); times_valid = 1; 851 coro_times_update (); times_valid = 1;
682 coro_times_add (c); 852 coro_times_add (c);
683 } 853 }
684 854
… …
698 868
699 XPUSHs (Nullsv); 869 XPUSHs (Nullsv);
700 /* this loop was inspired by pp_caller */ 870 /* this loop was inspired by pp_caller */
701 for (;;) 871 for (;;)
702 { 872 {
703 while (expect_true (cxix >= 0)) 873 while (ecb_expect_true (cxix >= 0))
704 { 874 {
705 PERL_CONTEXT *cx = &ccstk[cxix--]; 875 PERL_CONTEXT *cx = &ccstk[cxix--];
706 876
707 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 877 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
708 { 878 {
709 CV *cv = cx->blk_sub.cv; 879 CV *cv = cx->blk_sub.cv;
710 880
711 if (expect_true (CvDEPTH (cv))) 881 if (ecb_expect_true (CvDEPTH (cv)))
712 { 882 {
713 EXTEND (SP, 3); 883 EXTEND (SP, 3);
714 PUSHs ((SV *)CvPADLIST (cv)); 884 PUSHs ((SV *)CvPADLIST (cv));
715 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 885 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
716 PUSHs ((SV *)cv); 886 PUSHs ((SV *)cv);
… …
719 get_padlist (aTHX_ cv); 889 get_padlist (aTHX_ cv);
720 } 890 }
721 } 891 }
722 } 892 }
723 893
724 if (expect_true (top_si->si_type == PERLSI_MAIN)) 894 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
725 break; 895 break;
726 896
727 top_si = top_si->si_prev; 897 top_si = top_si->si_prev;
728 ccstk = top_si->si_cxstack; 898 ccstk = top_si->si_cxstack;
729 cxix = top_si->si_cxix; 899 cxix = top_si->si_cxix;
… …
731 901
732 PUTBACK; 902 PUTBACK;
733 } 903 }
734 904
735 /* allocate some space on the context stack for our purposes */ 905 /* allocate some space on the context stack for our purposes */
736 /* we manually unroll here, as usually 2 slots is enough */ 906 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
737 if (SLOT_COUNT >= 1) CXINC;
738 if (SLOT_COUNT >= 2) CXINC;
739 if (SLOT_COUNT >= 3) CXINC;
740 { 907 {
741 unsigned int i; 908 unsigned int i;
909
742 for (i = 3; i < SLOT_COUNT; ++i) 910 for (i = 0; i < SLOT_COUNT; ++i)
743 CXINC; 911 CXINC;
744 } 912
745 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 913 cxstack_ix -= SLOT_COUNT; /* undo allocation */
914 }
746 915
747 c->mainstack = PL_mainstack; 916 c->mainstack = PL_mainstack;
748 917
749 { 918 {
750 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 919 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
751 920
752 slot->defav = GvAV (PL_defgv); 921#if CORO_JIT
753 slot->defsv = DEFSV; 922 save_perl_slots (slot);
754 slot->errsv = ERRSV; 923#else
755 slot->irsgv = GvSV (irsgv);
756 slot->hinthv = GvHV (PL_hintgv);
757
758 #define VAR(name,type) slot->name = PL_ ## name; 924 #define VARx(name,expr,type) slot->name = expr;
759 # include "state.h" 925 #include "state.h"
760 #undef VAR 926#endif
761 } 927 }
762} 928}
763 929
764/* 930/*
765 * allocate various perl stacks. This is almost an exact copy 931 * allocate various perl stacks. This is almost an exact copy
… …
771# define coro_init_stacks(thx) init_stacks () 937# define coro_init_stacks(thx) init_stacks ()
772#else 938#else
773static void 939static void
774coro_init_stacks (pTHX) 940coro_init_stacks (pTHX)
775{ 941{
776 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() */
777 PL_curstackinfo->si_type = PERLSI_MAIN; 943 PL_curstackinfo->si_type = PERLSI_MAIN;
778 PL_curstack = PL_curstackinfo->si_stack; 944 PL_curstack = PL_curstackinfo->si_stack;
779 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 945 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
780 946
781 PL_stack_base = AvARRAY(PL_curstack); 947 PL_stack_base = AvARRAY(PL_curstack);
… …
796#endif 962#endif
797 963
798 New(54,PL_scopestack,8,I32); 964 New(54,PL_scopestack,8,I32);
799 PL_scopestack_ix = 0; 965 PL_scopestack_ix = 0;
800 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
801 970
802 New(54,PL_savestack,24,ANY); 971 New(54,PL_savestack,24,ANY);
803 PL_savestack_ix = 0; 972 PL_savestack_ix = 0;
804 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
805 979
806#if !PERL_VERSION_ATLEAST (5,10,0) 980#if !PERL_VERSION_ATLEAST (5,10,0)
807 New(54,PL_retstack,4,OP*); 981 New(54,PL_retstack,4,OP*);
808 PL_retstack_ix = 0; 982 PL_retstack_ix = 0;
809 PL_retstack_max = 4; 983 PL_retstack_max = 4;
… …
833 } 1007 }
834 1008
835 Safefree (PL_tmps_stack); 1009 Safefree (PL_tmps_stack);
836 Safefree (PL_markstack); 1010 Safefree (PL_markstack);
837 Safefree (PL_scopestack); 1011 Safefree (PL_scopestack);
1012#if HAS_SCOPESTACK_NAME
1013 Safefree (PL_scopestack_name);
1014#endif
838 Safefree (PL_savestack); 1015 Safefree (PL_savestack);
839#if !PERL_VERSION_ATLEAST (5,10,0) 1016#if !PERL_VERSION_ATLEAST (5,10,0)
840 Safefree (PL_retstack); 1017 Safefree (PL_retstack);
841#endif 1018#endif
842} 1019}
… …
872 } 1049 }
873 1050
874 return rss; 1051 return rss;
875} 1052}
876 1053
877/** coroutine stack handling ************************************************/ 1054/** provide custom get/set/clear methods for %SIG elements ******************/
878
879static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
880static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
881static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
882 1055
883/* apparently < 5.8.8 */ 1056/* apparently < 5.8.8 */
884#ifndef MgPV_nolen_const 1057#ifndef MgPV_nolen_const
885#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1058#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
886 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1059 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
887 (const char*)(mg)->mg_ptr) 1060 (const char*)(mg)->mg_ptr)
888#endif 1061#endif
889 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
890/* 1091/*
891 * This overrides the default magic get method of %SIG elements. 1092 * This overrides the default magic get method of %SIG elements.
892 * 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
893 * and instead of trying to save and restore the hash elements, we just provide 1094 * and instead of trying to save and restore the hash elements (extremely slow),
894 * readback here. 1095 * we just provide our own readback here.
895 */ 1096 */
896static int 1097static int ecb_cold
897coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1098coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
898{ 1099{
899 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;
900 1103
901 if (*s == '_') 1104 SV *ssv;
902 {
903 SV **svp = 0;
904 1105
905 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
906 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
907
908 if (svp) 1106 if (!*svp)
909 { 1107 ssv = &PL_sv_undef;
910 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1108 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
911 return 0; 1109 ssv = sv_2mortal (newRV_inc (*svp));
912 } 1110 else
913 } 1111 ssv = *svp;
914 1112
915 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1113 sv_setsv (sv, ssv);
1114 return 0;
916} 1115}
917 1116
918static int 1117static int ecb_cold
919coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1118coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
920{ 1119{
921 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;
922 1123
923 if (*s == '_')
924 {
925 SV **svp = 0;
926
927 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
928 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
929
930 if (svp)
931 {
932 SV *old = *svp; 1124 SV *old = *svp;
933 *svp = 0; 1125 *svp = 0;
934 SvREFCNT_dec (old); 1126 SvREFCNT_dec (old);
935 return 0; 1127 return 0;
936 }
937 }
938
939 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
940} 1128}
941 1129
942static int 1130static int ecb_cold
943coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1131coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
944{ 1132{
945 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;
946 1136
947 if (*s == '_')
948 {
949 SV **svp = 0;
950
951 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
952 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
953
954 if (svp)
955 {
956 SV *old = *svp; 1137 SV *old = *svp;
957 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1138 *svp = SvOK (sv) ? newSVsv (sv) : 0;
958 SvREFCNT_dec (old); 1139 SvREFCNT_dec (old);
959 return 0; 1140 return 0;
960 }
961 }
962
963 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
964} 1141}
965 1142
966static void 1143static void
967prepare_nop (pTHX_ struct coro_transfer_args *ta) 1144prepare_nop (pTHX_ struct coro_transfer_args *ta)
968{ 1145{
… …
980slf_check_repeat (pTHX_ struct CoroSLF *frame) 1157slf_check_repeat (pTHX_ struct CoroSLF *frame)
981{ 1158{
982 return 1; 1159 return 1;
983} 1160}
984 1161
985static UNOP coro_setup_op; 1162/** coroutine stack handling ************************************************/
986 1163
987static 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 */
988coro_setup (pTHX_ struct coro *coro) 1167init_perl (pTHX_ struct coro *coro)
989{ 1168{
990 /* 1169 /*
991 * emulate part of the perl startup here. 1170 * emulate part of the perl startup here.
992 */ 1171 */
993 coro_init_stacks (aTHX); 1172 coro_init_stacks (aTHX);
… …
1000 PL_comppad_name_fill = 0; 1179 PL_comppad_name_fill = 0;
1001 PL_comppad_name_floor = 0; 1180 PL_comppad_name_floor = 0;
1002 PL_curpm = 0; 1181 PL_curpm = 0;
1003 PL_curpad = 0; 1182 PL_curpad = 0;
1004 PL_localizing = 0; 1183 PL_localizing = 0;
1005 PL_dirty = 0;
1006 PL_restartop = 0; 1184 PL_restartop = 0;
1007#if PERL_VERSION_ATLEAST (5,10,0) 1185#if PERL_VERSION_ATLEAST (5,10,0)
1008 PL_parser = 0; 1186 PL_parser = 0;
1009#endif 1187#endif
1010 PL_hints = 0; 1188 PL_hints = 0;
1011 1189
1012 /* recreate the die/warn hooks */ 1190 /* recreate the die/warn hooks */
1013 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1191 PL_diehook = SvREFCNT_inc (rv_diehook);
1014 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1192 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1015 1193
1016 GvSV (PL_defgv) = newSV (0); 1194 GvSV (PL_defgv) = newSV (0);
1017 GvAV (PL_defgv) = coro->args; coro->args = 0; 1195 GvAV (PL_defgv) = coro->args; coro->args = 0;
1018 GvSV (PL_errgv) = newSV (0); 1196 GvSV (PL_errgv) = newSV (0);
1019 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);
1020 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
1021 PL_rs = newSVsv (GvSV (irsgv)); 1202 PL_rs = newSVsv (GvSV (irsgv));
1022 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1203 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1023 1204
1024 { 1205 {
1025 dSP; 1206 dSP;
… …
1040 /* 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
1041 * 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.
1042 */ 1223 */
1043 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 */
1044 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;
1045 1227
1046 /* 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 */
1047 coro_setup_op.op_next = PL_op; 1229 init_perl_op.op_next = PL_op;
1048 coro_setup_op.op_type = OP_ENTERSUB; 1230 init_perl_op.op_type = OP_ENTERSUB;
1049 coro_setup_op.op_ppaddr = pp_slf; 1231 init_perl_op.op_ppaddr = pp_slf;
1050 /* 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 */
1051 1233
1052 PL_op = (OP *)&coro_setup_op; 1234 PL_op = (OP *)&init_perl_op;
1053 1235
1054 /* copy throw, in case it was set before coro_setup */ 1236 /* copy throw, in case it was set before init_perl */
1055 CORO_THROW = coro->except; 1237 CORO_THROW = coro->except;
1056 1238
1239 SWAP_SVS_ENTER (coro);
1240
1057 if (expect_false (enable_times)) 1241 if (ecb_expect_false (enable_times))
1058 { 1242 {
1059 coro_times_update (); 1243 coro_times_update ();
1060 coro_times_sub (coro); 1244 coro_times_sub (coro);
1061 } 1245 }
1062} 1246}
… …
1081 dounwind (-1); 1265 dounwind (-1);
1082 } 1266 }
1083} 1267}
1084 1268
1085static void 1269static void
1086coro_destruct_perl (pTHX_ struct coro *coro) 1270destroy_perl (pTHX_ struct coro *coro)
1087{ 1271{
1088 SV *svf [9]; 1272 SV *svf [9];
1089 1273
1090 { 1274 {
1275 SV *old_current = SvRV (coro_current);
1091 struct coro *current = SvSTATE_current; 1276 struct coro *current = SvSTATE (old_current);
1092 1277
1093 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1278 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1094 1279
1095 save_perl (aTHX_ current); 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
1096 load_perl (aTHX_ coro); 1285 load_perl (aTHX_ coro);
1097 1286
1287 /* restore swapped sv's */
1288 SWAP_SVS_LEAVE (coro);
1289
1098 coro_unwind_stacks (aTHX); 1290 coro_unwind_stacks (aTHX);
1291
1099 coro_destruct_stacks (aTHX); 1292 coro_destruct_stacks (aTHX);
1100 1293
1101 // now save some sv's to be free'd later 1294 /* now save some sv's to be free'd later */
1102 svf [0] = GvSV (PL_defgv); 1295 svf [0] = GvSV (PL_defgv);
1103 svf [1] = (SV *)GvAV (PL_defgv); 1296 svf [1] = (SV *)GvAV (PL_defgv);
1104 svf [2] = GvSV (PL_errgv); 1297 svf [2] = GvSV (PL_errgv);
1105 svf [3] = (SV *)PL_defoutgv; 1298 svf [3] = (SV *)PL_defoutgv;
1106 svf [4] = PL_rs; 1299 svf [4] = PL_rs;
… …
1108 svf [6] = (SV *)GvHV (PL_hintgv); 1301 svf [6] = (SV *)GvHV (PL_hintgv);
1109 svf [7] = PL_diehook; 1302 svf [7] = PL_diehook;
1110 svf [8] = PL_warnhook; 1303 svf [8] = PL_warnhook;
1111 assert (9 == sizeof (svf) / sizeof (*svf)); 1304 assert (9 == sizeof (svf) / sizeof (*svf));
1112 1305
1306 SvRV_set (coro_current, old_current);
1307
1113 load_perl (aTHX_ current); 1308 load_perl (aTHX_ current);
1114 } 1309 }
1115 1310
1116 { 1311 {
1117 unsigned int i; 1312 unsigned int i;
… …
1121 1316
1122 SvREFCNT_dec (coro->saved_deffh); 1317 SvREFCNT_dec (coro->saved_deffh);
1123 SvREFCNT_dec (coro->rouse_cb); 1318 SvREFCNT_dec (coro->rouse_cb);
1124 SvREFCNT_dec (coro->invoke_cb); 1319 SvREFCNT_dec (coro->invoke_cb);
1125 SvREFCNT_dec (coro->invoke_av); 1320 SvREFCNT_dec (coro->invoke_av);
1321 SvREFCNT_dec (coro->on_enter_xs);
1322 SvREFCNT_dec (coro->on_leave_xs);
1126 } 1323 }
1127} 1324}
1128 1325
1129INLINE void 1326ecb_inline void
1130free_coro_mortal (pTHX) 1327free_coro_mortal (pTHX)
1131{ 1328{
1132 if (expect_true (coro_mortal)) 1329 if (ecb_expect_true (coro_mortal))
1133 { 1330 {
1134 SvREFCNT_dec (coro_mortal); 1331 SvREFCNT_dec ((SV *)coro_mortal);
1135 coro_mortal = 0; 1332 coro_mortal = 0;
1136 } 1333 }
1137} 1334}
1138 1335
1139static int 1336static int
… …
1193 1390
1194 if (PL_curcop != &PL_compiling) 1391 if (PL_curcop != &PL_compiling)
1195 { 1392 {
1196 SV **cb; 1393 SV **cb;
1197 1394
1198 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1395 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1199 { 1396 {
1200 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1397 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1201 1398
1202 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1399 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1203 { 1400 {
… …
1272 1469
1273 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 */
1274} 1471}
1275 1472
1276/* 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 */
1277static void NOINLINE 1474static void ecb_noinline
1278cctx_prepare (pTHX) 1475cctx_prepare (pTHX)
1279{ 1476{
1280 PL_top_env = &PL_start_env; 1477 PL_top_env = &PL_start_env;
1281 1478
1282 if (cctx_current->flags & CC_TRACE) 1479 if (cctx_current->flags & CC_TRACE)
… …
1293 slf_frame.prepare = slf_prepare_set_stacklevel; 1490 slf_frame.prepare = slf_prepare_set_stacklevel;
1294 slf_frame.check = slf_check_set_stacklevel; 1491 slf_frame.check = slf_check_set_stacklevel;
1295} 1492}
1296 1493
1297/* 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 */
1298INLINE void 1495ecb_inline void
1299transfer_tail (pTHX) 1496transfer_tail (pTHX)
1300{ 1497{
1301 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);
1302} 1511}
1303 1512
1304/* 1513/*
1305 * this is a _very_ stripped down perl interpreter ;) 1514 * this is a _very_ stripped down perl interpreter ;)
1306 */ 1515 */
… …
1328 /* 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 */
1329 PL_restartop = PL_op; 1538 PL_restartop = PL_op;
1330 perl_run (PL_curinterp); 1539 perl_run (PL_curinterp);
1331 /* 1540 /*
1332 * 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
1333 * 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.
1334 */ 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;
1335 1552
1336 /* 1553 /*
1337 * 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
1338 * 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)
1339 * 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
1340 * bootstrap-time "top" top_env, as we cannot restore the "main" 1557 * doing in that case. YMMV.
1341 * coroutine as Coro has no such concept.
1342 * This actually isn't valid with the pthread backend, but OSes requiring
1343 * that backend are too broken to do it in a standards-compliant way.
1344 */ 1558 */
1345 PL_top_env = main_top_env; 1559 perlish_exit (aTHX);
1346 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1347 } 1560 }
1348} 1561}
1349 1562
1350static coro_cctx * 1563static coro_cctx *
1351cctx_new () 1564cctx_new (void)
1352{ 1565{
1353 coro_cctx *cctx; 1566 coro_cctx *cctx;
1354 1567
1355 ++cctx_count; 1568 ++cctx_count;
1356 New (0, cctx, 1, coro_cctx); 1569 New (0, cctx, 1, coro_cctx);
… …
1362 return cctx; 1575 return cctx;
1363} 1576}
1364 1577
1365/* create a new cctx only suitable as source */ 1578/* create a new cctx only suitable as source */
1366static coro_cctx * 1579static coro_cctx *
1367cctx_new_empty () 1580cctx_new_empty (void)
1368{ 1581{
1369 coro_cctx *cctx = cctx_new (); 1582 coro_cctx *cctx = cctx_new ();
1370 1583
1371 cctx->sptr = 0; 1584 cctx->stack.sptr = 0;
1372 coro_create (&cctx->cctx, 0, 0, 0, 0); 1585 coro_create (&cctx->cctx, 0, 0, 0, 0);
1373 1586
1374 return cctx; 1587 return cctx;
1375} 1588}
1376 1589
1377/* create a new cctx suitable as destination/running a perl interpreter */ 1590/* create a new cctx suitable as destination/running a perl interpreter */
1378static coro_cctx * 1591static coro_cctx *
1379cctx_new_run () 1592cctx_new_run (void)
1380{ 1593{
1381 coro_cctx *cctx = cctx_new (); 1594 coro_cctx *cctx = cctx_new ();
1382 void *stack_start;
1383 size_t stack_size;
1384 1595
1385#if HAVE_MMAP 1596 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1386 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1387 /* mmap supposedly does allocate-on-write for us */
1388 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1389
1390 if (cctx->sptr != (void *)-1)
1391 {
1392 #if CORO_STACKGUARD
1393 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1394 #endif
1395 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1396 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1397 cctx->flags |= CC_MAPPED;
1398 } 1597 {
1399 else
1400#endif
1401 {
1402 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1403 New (0, cctx->sptr, cctx_stacksize, long);
1404
1405 if (!cctx->sptr)
1406 {
1407 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1598 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1408 _exit (EXIT_FAILURE); 1599 _exit (EXIT_FAILURE);
1409 }
1410
1411 stack_start = cctx->sptr;
1412 stack_size = cctx->ssize;
1413 } 1600 }
1414 1601
1415 #if CORO_USE_VALGRIND
1416 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1417 #endif
1418
1419 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);
1420 1603
1421 return cctx; 1604 return cctx;
1422} 1605}
1423 1606
1424static void 1607static void
1425cctx_destroy (coro_cctx *cctx) 1608cctx_destroy (coro_cctx *cctx)
1426{ 1609{
1427 if (!cctx) 1610 if (!cctx)
1428 return; 1611 return;
1429 1612
1430 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1613 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1431 1614
1432 --cctx_count; 1615 --cctx_count;
1433 coro_destroy (&cctx->cctx); 1616 coro_destroy (&cctx->cctx);
1434 1617
1435 /* coro_transfer creates new, empty cctx's */ 1618 coro_stack_free (&cctx->stack);
1436 if (cctx->sptr)
1437 {
1438 #if CORO_USE_VALGRIND
1439 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1440 #endif
1441
1442#if HAVE_MMAP
1443 if (cctx->flags & CC_MAPPED)
1444 munmap (cctx->sptr, cctx->ssize);
1445 else
1446#endif
1447 Safefree (cctx->sptr);
1448 }
1449 1619
1450 Safefree (cctx); 1620 Safefree (cctx);
1451} 1621}
1452 1622
1453/* wether this cctx should be destructed */ 1623/* wether this cctx should be destructed */
1454#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))
1455 1625
1456static coro_cctx * 1626static coro_cctx *
1457cctx_get (pTHX) 1627cctx_get (pTHX)
1458{ 1628{
1459 while (expect_true (cctx_first)) 1629 while (ecb_expect_true (cctx_first))
1460 { 1630 {
1461 coro_cctx *cctx = cctx_first; 1631 coro_cctx *cctx = cctx_first;
1462 cctx_first = cctx->next; 1632 cctx_first = cctx->next;
1463 --cctx_idle; 1633 --cctx_idle;
1464 1634
1465 if (expect_true (!CCTX_EXPIRED (cctx))) 1635 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1466 return cctx; 1636 return cctx;
1467 1637
1468 cctx_destroy (cctx); 1638 cctx_destroy (cctx);
1469 } 1639 }
1470 1640
… …
1472} 1642}
1473 1643
1474static void 1644static void
1475cctx_put (coro_cctx *cctx) 1645cctx_put (coro_cctx *cctx)
1476{ 1646{
1477 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));
1478 1648
1479 /* free another cctx if overlimit */ 1649 /* free another cctx if overlimit */
1480 if (expect_false (cctx_idle >= cctx_max_idle)) 1650 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1481 { 1651 {
1482 coro_cctx *first = cctx_first; 1652 coro_cctx *first = cctx_first;
1483 cctx_first = first->next; 1653 cctx_first = first->next;
1484 --cctx_idle; 1654 --cctx_idle;
1485 1655
… …
1496static void 1666static void
1497transfer_check (pTHX_ struct coro *prev, struct coro *next) 1667transfer_check (pTHX_ struct coro *prev, struct coro *next)
1498{ 1668{
1499 /* TODO: throwing up here is considered harmful */ 1669 /* TODO: throwing up here is considered harmful */
1500 1670
1501 if (expect_true (prev != next)) 1671 if (ecb_expect_true (prev != next))
1502 { 1672 {
1503 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1673 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1504 croak ("Coro::State::transfer called with a blocked 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,");
1505 1675
1506 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1676 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1507 croak ("Coro::State::transfer called with running, destroyed or suspended 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,");
1508 1678
1509#if !PERL_VERSION_ATLEAST (5,10,0) 1679#if !PERL_VERSION_ATLEAST (5,10,0)
1510 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1680 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1511 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,");
1512#endif 1682#endif
1513 } 1683 }
1514} 1684}
1515 1685
1516/* always use the TRANSFER macro */ 1686/* always use the TRANSFER macro */
1517static void NOINLINE /* noinline so we have a fixed stackframe */ 1687static void ecb_noinline /* noinline so we have a fixed stackframe */
1518transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1688transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1519{ 1689{
1520 dSTACKLEVEL; 1690 dSTACKLEVEL;
1521 1691
1522 /* sometimes transfer is only called to set idle_sp */ 1692 /* sometimes transfer is only called to set idle_sp */
1523 if (expect_false (!prev)) 1693 if (ecb_expect_false (!prev))
1524 { 1694 {
1525 cctx_current->idle_sp = STACKLEVEL; 1695 cctx_current->idle_sp = STACKLEVEL;
1526 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 */
1527 } 1697 }
1528 else if (expect_true (prev != next)) 1698 else if (ecb_expect_true (prev != next))
1529 { 1699 {
1530 coro_cctx *cctx_prev; 1700 coro_cctx *cctx_prev;
1531 1701
1532 if (expect_false (prev->flags & CF_NEW)) 1702 if (ecb_expect_false (prev->flags & CF_NEW))
1533 { 1703 {
1534 /* create a new empty/source context */ 1704 /* create a new empty/source context */
1535 prev->flags &= ~CF_NEW; 1705 prev->flags &= ~CF_NEW;
1536 prev->flags |= CF_RUNNING; 1706 prev->flags |= CF_RUNNING;
1537 } 1707 }
… …
1540 next->flags |= CF_RUNNING; 1710 next->flags |= CF_RUNNING;
1541 1711
1542 /* first get rid of the old state */ 1712 /* first get rid of the old state */
1543 save_perl (aTHX_ prev); 1713 save_perl (aTHX_ prev);
1544 1714
1545 if (expect_false (next->flags & CF_NEW)) 1715 if (ecb_expect_false (next->flags & CF_NEW))
1546 { 1716 {
1547 /* need to start coroutine */ 1717 /* need to start coroutine */
1548 next->flags &= ~CF_NEW; 1718 next->flags &= ~CF_NEW;
1549 /* setup coroutine call */ 1719 /* setup coroutine call */
1550 coro_setup (aTHX_ next); 1720 init_perl (aTHX_ next);
1551 } 1721 }
1552 else 1722 else
1553 load_perl (aTHX_ next); 1723 load_perl (aTHX_ next);
1554 1724
1555 /* possibly untie and reuse the cctx */ 1725 /* possibly untie and reuse the cctx */
1556 if (expect_true ( 1726 if (ecb_expect_true (
1557 cctx_current->idle_sp == STACKLEVEL 1727 cctx_current->idle_sp == STACKLEVEL
1558 && !(cctx_current->flags & CC_TRACE) 1728 && !(cctx_current->flags & CC_TRACE)
1559 && !force_cctx 1729 && !force_cctx
1560 )) 1730 ))
1561 { 1731 {
1562 /* 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 */
1563 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));
1564 1734
1565 /* 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. */
1566 /* 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 */
1567 if (expect_false (CCTX_EXPIRED (cctx_current))) 1737 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1568 if (expect_true (!next->cctx)) 1738 if (ecb_expect_true (!next->cctx))
1569 next->cctx = cctx_get (aTHX); 1739 next->cctx = cctx_get (aTHX);
1570 1740
1571 cctx_put (cctx_current); 1741 cctx_put (cctx_current);
1572 } 1742 }
1573 else 1743 else
1574 prev->cctx = cctx_current; 1744 prev->cctx = cctx_current;
1575 1745
1576 ++next->usecount; 1746 ++next->usecount;
1577 1747
1578 cctx_prev = cctx_current; 1748 cctx_prev = cctx_current;
1579 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1749 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1580 1750
1581 next->cctx = 0; 1751 next->cctx = 0;
1582 1752
1583 if (expect_false (cctx_prev != cctx_current)) 1753 if (ecb_expect_false (cctx_prev != cctx_current))
1584 { 1754 {
1585 cctx_prev->top_env = PL_top_env; 1755 cctx_prev->top_env = PL_top_env;
1586 PL_top_env = cctx_current->top_env; 1756 PL_top_env = cctx_current->top_env;
1587 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1757 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1588 } 1758 }
… …
1594#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))
1595#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1765#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1596 1766
1597/** high level stuff ********************************************************/ 1767/** high level stuff ********************************************************/
1598 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 */
1599static int 1771static void
1772coro_call_on_destroy (pTHX_ struct coro *coro);
1773
1774static void
1600coro_state_destroy (pTHX_ struct coro *coro) 1775coro_state_destroy (pTHX_ struct coro *coro)
1601{ 1776{
1602 if (coro->flags & CF_DESTROYED) 1777 if (coro->flags & CF_ZOMBIE)
1603 return 0; 1778 return;
1604 1779
1605 if (coro->on_destroy && !PL_dirty)
1606 coro->on_destroy (aTHX_ coro); 1780 slf_destroy (aTHX_ coro);
1607 1781
1608 coro->flags |= CF_DESTROYED; 1782 coro->flags |= CF_ZOMBIE;
1609 1783
1610 if (coro->flags & CF_READY) 1784 if (coro->flags & CF_READY)
1611 { 1785 {
1612 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1786 /* reduce nready, as destroying a ready coro effectively unreadies it */
1613 /* alternative: look through all ready queues and remove the coro */ 1787 /* alternative: look through all ready queues and remove the coro */
1614 --coro_nready; 1788 --coro_nready;
1615 } 1789 }
1616 else 1790 else
1617 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 */
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;
1618 1796
1619 if (coro->mainstack 1797 if (coro->mainstack
1620 && coro->mainstack != main_mainstack 1798 && coro->mainstack != main_mainstack
1621 && coro->slot 1799 && coro->slot
1622 && !PL_dirty) 1800 && !PL_dirty)
1623 coro_destruct_perl (aTHX_ coro); 1801 destroy_perl (aTHX_ coro);
1624 1802
1625 cctx_destroy (coro->cctx); 1803 cctx_destroy (coro->cctx);
1626 SvREFCNT_dec (coro->startcv); 1804 SvREFCNT_dec (coro->startcv);
1627 SvREFCNT_dec (coro->args); 1805 SvREFCNT_dec (coro->args);
1806 SvREFCNT_dec (coro->swap_sv);
1628 SvREFCNT_dec (CORO_THROW); 1807 SvREFCNT_dec (CORO_THROW);
1629 1808
1630 if (coro->next) coro->next->prev = coro->prev; 1809 coro_call_on_destroy (aTHX_ coro);
1631 if (coro->prev) coro->prev->next = coro->next;
1632 if (coro == coro_first) coro_first = coro->next;
1633 1810
1634 return 1; 1811 /* more destruction mayhem in coro_state_free */
1635} 1812}
1636 1813
1637static int 1814static int
1638coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1815coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1639{ 1816{
1640 struct coro *coro = (struct coro *)mg->mg_ptr; 1817 struct coro *coro = (struct coro *)mg->mg_ptr;
1641 mg->mg_ptr = 0; 1818 mg->mg_ptr = 0;
1642 1819
1643 coro->hv = 0;
1644
1645 if (--coro->refcnt < 0)
1646 {
1647 coro_state_destroy (aTHX_ coro); 1820 coro_state_destroy (aTHX_ coro);
1821 SvREFCNT_dec (coro->on_destroy);
1822 SvREFCNT_dec (coro->status);
1823
1648 Safefree (coro); 1824 Safefree (coro);
1649 }
1650 1825
1651 return 0; 1826 return 0;
1652} 1827}
1653 1828
1654static int 1829static int ecb_cold
1655coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1830coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1656{ 1831{
1657 struct coro *coro = (struct coro *)mg->mg_ptr; 1832 /* called when perl clones the current process the slow way (windows process emulation) */
1658 1833 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1659 ++coro->refcnt; 1834 mg->mg_ptr = 0;
1835 mg->mg_virtual = 0;
1660 1836
1661 return 0; 1837 return 0;
1662} 1838}
1663 1839
1664static MGVTBL coro_state_vtbl = { 1840static MGVTBL coro_state_vtbl = {
… …
1687 1863
1688 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1864 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1689 TRANSFER (ta, 1); 1865 TRANSFER (ta, 1);
1690} 1866}
1691 1867
1692/*****************************************************************************/
1693/* gensub: simple closure generation utility */
1694
1695#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1696
1697/* create a closure from XS, returns a code reference */
1698/* the arg can be accessed via GENSUB_ARG from the callback */
1699/* the callback must use dXSARGS/XSRETURN */
1700static SV *
1701gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1702{
1703 CV *cv = (CV *)newSV (0);
1704
1705 sv_upgrade ((SV *)cv, SVt_PVCV);
1706
1707 CvANON_on (cv);
1708 CvISXSUB_on (cv);
1709 CvXSUB (cv) = xsub;
1710 GENSUB_ARG = arg;
1711
1712 return newRV_noinc ((SV *)cv);
1713}
1714
1715/** Coro ********************************************************************/ 1868/** Coro ********************************************************************/
1716 1869
1717INLINE void 1870ecb_inline void
1718coro_enq (pTHX_ struct coro *coro) 1871coro_enq (pTHX_ struct coro *coro)
1719{ 1872{
1720 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1873 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1721 1874
1722 SvREFCNT_inc_NN (coro->hv); 1875 SvREFCNT_inc_NN (coro->hv);
… …
1724 coro->next_ready = 0; 1877 coro->next_ready = 0;
1725 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1878 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1726 ready [1] = coro; 1879 ready [1] = coro;
1727} 1880}
1728 1881
1729INLINE struct coro * 1882ecb_inline struct coro *
1730coro_deq (pTHX) 1883coro_deq (pTHX)
1731{ 1884{
1732 int prio; 1885 int prio;
1733 1886
1734 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1887 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1744 } 1897 }
1745 1898
1746 return 0; 1899 return 0;
1747} 1900}
1748 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;
1917}
1918
1749static int 1919static int
1750api_ready (pTHX_ SV *coro_sv) 1920api_ready (pTHX_ SV *coro_sv)
1751{ 1921{
1752 struct coro *coro;
1753 SV *sv_hook;
1754 void (*xs_hook)(void);
1755
1756 coro = SvSTATE (coro_sv); 1922 struct coro *coro = SvSTATE (coro_sv);
1757 1923
1758 if (coro->flags & CF_READY) 1924 if (coro->flags & CF_READY)
1759 return 0; 1925 return 0;
1760 1926
1761 coro->flags |= CF_READY; 1927 coro->flags |= CF_READY;
1762 1928
1763 sv_hook = coro_nready ? 0 : coro_readyhook;
1764 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1765
1766 coro_enq (aTHX_ coro); 1929 coro_enq (aTHX_ coro);
1767 ++coro_nready;
1768 1930
1769 if (sv_hook) 1931 if (!coro_nready++)
1770 { 1932 if (coroapi.readyhook)
1771 dSP; 1933 coroapi.readyhook ();
1772
1773 ENTER;
1774 SAVETMPS;
1775
1776 PUSHMARK (SP);
1777 PUTBACK;
1778 call_sv (sv_hook, G_VOID | G_DISCARD);
1779
1780 FREETMPS;
1781 LEAVE;
1782 }
1783
1784 if (xs_hook)
1785 xs_hook ();
1786 1934
1787 return 1; 1935 return 1;
1788} 1936}
1789 1937
1790static int 1938static int
… …
1792{ 1940{
1793 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1941 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1794} 1942}
1795 1943
1796/* expects to own a reference to next->hv */ 1944/* expects to own a reference to next->hv */
1797INLINE void 1945ecb_inline void
1798prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1946prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1799{ 1947{
1800 SV *prev_sv = SvRV (coro_current); 1948 SV *prev_sv = SvRV (coro_current);
1801 1949
1802 ta->prev = SvSTATE_hv (prev_sv); 1950 ta->prev = SvSTATE_hv (prev_sv);
… …
1815{ 1963{
1816 for (;;) 1964 for (;;)
1817 { 1965 {
1818 struct coro *next = coro_deq (aTHX); 1966 struct coro *next = coro_deq (aTHX);
1819 1967
1820 if (expect_true (next)) 1968 if (ecb_expect_true (next))
1821 { 1969 {
1822 /* cannot transfer to destroyed coros, skip and look for next */ 1970 /* cannot transfer to destroyed coros, skip and look for next */
1823 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1971 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1824 SvREFCNT_dec (next->hv); /* 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 */
1825 else 1973 else
1826 { 1974 {
1827 next->flags &= ~CF_READY; 1975 next->flags &= ~CF_READY;
1828 --coro_nready; 1976 --coro_nready;
… …
1835 { 1983 {
1836 /* nothing to schedule: call the idle handler */ 1984 /* nothing to schedule: call the idle handler */
1837 if (SvROK (sv_idle) 1985 if (SvROK (sv_idle)
1838 && SvOBJECT (SvRV (sv_idle))) 1986 && SvOBJECT (SvRV (sv_idle)))
1839 { 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
1840 ++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 */
1841 api_ready (aTHX_ SvRV (sv_idle)); 2009 api_ready (aTHX_ SvRV (sv_idle));
1842 --coro_nready; 2010 --coro_nready;
1843 } 2011 }
1844 else 2012 else
1845 { 2013 {
2014 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1846 dSP; 2015 dSP;
1847 2016
1848 ENTER; 2017 ENTER;
1849 SAVETMPS; 2018 SAVETMPS;
1850 2019
… …
1857 } 2026 }
1858 } 2027 }
1859 } 2028 }
1860} 2029}
1861 2030
1862INLINE void 2031ecb_inline void
1863prepare_cede (pTHX_ struct coro_transfer_args *ta) 2032prepare_cede (pTHX_ struct coro_transfer_args *ta)
1864{ 2033{
1865 api_ready (aTHX_ coro_current); 2034 api_ready (aTHX_ coro_current);
1866 prepare_schedule (aTHX_ ta); 2035 prepare_schedule (aTHX_ ta);
1867} 2036}
1868 2037
1869INLINE void 2038ecb_inline void
1870prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2039prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1871{ 2040{
1872 SV *prev = SvRV (coro_current); 2041 SV *prev = SvRV (coro_current);
1873 2042
1874 if (coro_nready) 2043 if (coro_nready)
… …
1904{ 2073{
1905 struct coro_transfer_args ta; 2074 struct coro_transfer_args ta;
1906 2075
1907 prepare_cede (aTHX_ &ta); 2076 prepare_cede (aTHX_ &ta);
1908 2077
1909 if (expect_true (ta.prev != ta.next)) 2078 if (ecb_expect_true (ta.prev != ta.next))
1910 { 2079 {
1911 TRANSFER (ta, 1); 2080 TRANSFER (ta, 1);
1912 return 1; 2081 return 1;
1913 } 2082 }
1914 else 2083 else
… …
1957 coro->slot->runops = RUNOPS_DEFAULT; 2126 coro->slot->runops = RUNOPS_DEFAULT;
1958 } 2127 }
1959} 2128}
1960 2129
1961static 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
1962coro_call_on_destroy (pTHX_ struct coro *coro) 2207coro_call_on_destroy (pTHX_ struct coro *coro)
1963{ 2208{
1964 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2209 AV *od = coro->on_destroy;
1965 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1966 2210
1967 if (on_destroyp) 2211 if (!od)
1968 { 2212 return;
1969 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1970 2213
2214 coro->on_destroy = 0;
2215 sv_2mortal ((SV *)od);
2216
1971 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
1972 { 2225 {
1973 dSP; /* don't disturb outer sp */ 2226 dSP; /* don't disturb outer sp */
1974 SV *cb = av_pop (on_destroy);
1975
1976 PUSHMARK (SP); 2227 PUSHMARK (SP);
1977 2228
1978 if (statusp) 2229 if (coro->status)
1979 { 2230 {
1980 int i; 2231 PUTBACK;
1981 AV *status = (AV *)SvRV (*statusp); 2232 coro_push_av (aTHX_ coro->status, G_ARRAY);
1982 EXTEND (SP, AvFILLp (status) + 1); 2233 SPAGAIN;
1983
1984 for (i = 0; i <= AvFILLp (status); ++i)
1985 PUSHs (AvARRAY (status)[i]);
1986 } 2234 }
1987 2235
1988 PUTBACK; 2236 PUTBACK;
1989 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2237 call_sv (cb, G_VOID | G_DISCARD);
1990 } 2238 }
1991 } 2239 }
1992} 2240}
1993 2241
1994static void 2242static void
1995slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2243coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1996{ 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 {
1997 int i; 2258 int i;
1998 HV *hv = (HV *)SvRV (coro_current);
1999 AV *av = newAV ();
2000 2259
2001 av_extend (av, items - 1); 2260 av_extend (av, items - 1);
2261
2002 for (i = 0; i < items; ++i) 2262 for (i = 0; i < items; ++i)
2003 av_push (av, SvREFCNT_inc_NN (arg [i])); 2263 av_push (av, SvREFCNT_inc_NN (arg [i]));
2264 }
2265}
2004 2266
2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2267static void
2006 2268slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2269{
2007 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 */
2008 api_ready (aTHX_ sv_manager); 2271 api_ready (aTHX_ sv_manager);
2009 2272
2010 frame->prepare = prepare_schedule; 2273 frame->prepare = prepare_schedule;
2011 frame->check = slf_check_repeat; 2274 frame->check = slf_check_repeat;
2012 2275
2013 /* as a minor optimisation, we could unwind all stacks here */ 2276 /* as a minor optimisation, we could unwind all stacks here */
2014 /* but that puts extra pressure on pp_slf, and is not worth much */ 2277 /* but that puts extra pressure on pp_slf, and is not worth much */
2015 /*coro_unwind_stacks (aTHX);*/ 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;
2016} 2385}
2017 2386
2018/*****************************************************************************/ 2387/*****************************************************************************/
2019/* async pool handler */ 2388/* async pool handler */
2020 2389
… …
2051slf_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)
2052{ 2421{
2053 HV *hv = (HV *)SvRV (coro_current); 2422 HV *hv = (HV *)SvRV (coro_current);
2054 struct coro *coro = SvSTATE_hv ((SV *)hv); 2423 struct coro *coro = SvSTATE_hv ((SV *)hv);
2055 2424
2056 if (expect_true (coro->saved_deffh)) 2425 if (ecb_expect_true (coro->saved_deffh))
2057 { 2426 {
2058 /* subsequent iteration */ 2427 /* subsequent iteration */
2059 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2428 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2060 coro->saved_deffh = 0; 2429 coro->saved_deffh = 0;
2061 2430
2062 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2431 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2063 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2432 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2064 { 2433 {
2065 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2434 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2066 coro->invoke_av = newAV (); 2435 return;
2067
2068 frame->prepare = prepare_nop;
2069 } 2436 }
2070 else 2437 else
2071 { 2438 {
2072 av_clear (GvAV (PL_defgv)); 2439 av_clear (GvAV (PL_defgv));
2073 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);
2074 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
2075 coro->prio = 0; 2449 coro->prio = 0;
2076 2450
2077 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2451 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2078 api_trace (aTHX_ coro_current, 0); 2452 api_trace (aTHX_ coro_current, 0);
2079 2453
2080 frame->prepare = prepare_schedule; 2454 frame->prepare = prepare_schedule;
2081 av_push (av_async_pool, SvREFCNT_inc (hv)); 2455 av_push (av_async_pool, SvREFCNT_inc (hv));
2082 } 2456 }
… …
2098 2472
2099static void 2473static void
2100coro_rouse_callback (pTHX_ CV *cv) 2474coro_rouse_callback (pTHX_ CV *cv)
2101{ 2475{
2102 dXSARGS; 2476 dXSARGS;
2103 SV *data = (SV *)GENSUB_ARG; 2477 SV *data = (SV *)S_GENSUB_ARG;
2104 2478
2105 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2479 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2106 { 2480 {
2107 /* first call, set args */ 2481 /* first call, set args */
2108 SV *coro = SvRV (data); 2482 SV *coro = SvRV (data);
… …
2123 2497
2124static int 2498static int
2125slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2499slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2126{ 2500{
2127 SV *data = (SV *)frame->data; 2501 SV *data = (SV *)frame->data;
2128 2502
2129 if (CORO_THROW) 2503 if (CORO_THROW)
2130 return 0; 2504 return 0;
2131 2505
2132 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2506 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2133 return 1; 2507 return 1;
… …
2169 cb = sv_2mortal (coro->rouse_cb); 2543 cb = sv_2mortal (coro->rouse_cb);
2170 coro->rouse_cb = 0; 2544 coro->rouse_cb = 0;
2171 } 2545 }
2172 2546
2173 if (!SvROK (cb) 2547 if (!SvROK (cb)
2174 || SvTYPE (SvRV (cb)) != SVt_PVCV 2548 || SvTYPE (SvRV (cb)) != SVt_PVCV
2175 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2549 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2176 croak ("Coro::rouse_wait called with illegal callback argument,"); 2550 croak ("Coro::rouse_wait called with illegal callback argument,");
2177 2551
2178 { 2552 {
2179 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2553 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2180 SV *data = (SV *)GENSUB_ARG; 2554 SV *data = (SV *)S_GENSUB_ARG;
2181 2555
2182 frame->data = (void *)data; 2556 frame->data = (void *)data;
2183 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2557 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2184 frame->check = slf_check_rouse_wait; 2558 frame->check = slf_check_rouse_wait;
2185 } 2559 }
… …
2189coro_new_rouse_cb (pTHX) 2563coro_new_rouse_cb (pTHX)
2190{ 2564{
2191 HV *hv = (HV *)SvRV (coro_current); 2565 HV *hv = (HV *)SvRV (coro_current);
2192 struct coro *coro = SvSTATE_hv (hv); 2566 struct coro *coro = SvSTATE_hv (hv);
2193 SV *data = newRV_inc ((SV *)hv); 2567 SV *data = newRV_inc ((SV *)hv);
2194 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2568 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2195 2569
2196 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);
2197 SvREFCNT_dec (data); /* magicext increases the refcount */ 2571 SvREFCNT_dec (data); /* magicext increases the refcount */
2198 2572
2199 SvREFCNT_dec (coro->rouse_cb); 2573 SvREFCNT_dec (coro->rouse_cb);
… …
2296static void 2670static void
2297slf_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)
2298{ 2672{
2299 frame->prepare = prepare_cede_notself; 2673 frame->prepare = prepare_cede_notself;
2300 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);
2301} 2694}
2302 2695
2303/* 2696/*
2304 * these not obviously related functions are all rolled into one 2697 * these not obviously related functions are all rolled into one
2305 * 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
… …
2312 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 */
2313 2706
2314 /* 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 */
2315 /* the latter happens when a new coro has been started */ 2708 /* the latter happens when a new coro has been started */
2316 /* or when a new cctx was attached to an existing coroutine */ 2709 /* or when a new cctx was attached to an existing coroutine */
2317 if (expect_true (!slf_frame.prepare)) 2710 if (ecb_expect_true (!slf_frame.prepare))
2318 { 2711 {
2319 /* first iteration */ 2712 /* first iteration */
2320 dSP; 2713 dSP;
2321 SV **arg = PL_stack_base + TOPMARK + 1; 2714 SV **arg = PL_stack_base + TOPMARK + 1;
2322 int items = SP - arg; /* args without function object */ 2715 int items = SP - arg; /* args without function object */
… …
2363 while (slf_frame.check (aTHX_ &slf_frame)); 2756 while (slf_frame.check (aTHX_ &slf_frame));
2364 2757
2365 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 */
2366 2759
2367 /* exception handling */ 2760 /* exception handling */
2368 if (expect_false (CORO_THROW)) 2761 if (ecb_expect_false (CORO_THROW))
2369 { 2762 {
2370 SV *exception = sv_2mortal (CORO_THROW); 2763 SV *exception = sv_2mortal (CORO_THROW);
2371 2764
2372 CORO_THROW = 0; 2765 CORO_THROW = 0;
2373 sv_setsv (ERRSV, exception); 2766 sv_setsv (ERRSV, exception);
2374 croak (0); 2767 croak (0);
2375 } 2768 }
2376 2769
2377 /* return value handling - mostly like entersub */ 2770 /* return value handling - mostly like entersub */
2378 /* make sure we put something on the stack in scalar context */ 2771 /* make sure we put something on the stack in scalar context */
2379 if (GIMME_V == G_SCALAR) 2772 if (GIMME_V == G_SCALAR
2773 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2380 { 2774 {
2381 dSP; 2775 dSP;
2382 SV **bot = PL_stack_base + checkmark; 2776 SV **bot = PL_stack_base + checkmark;
2383 2777
2384 if (sp == bot) /* too few, push undef */ 2778 if (sp == bot) /* too few, push undef */
2385 bot [1] = &PL_sv_undef; 2779 bot [1] = &PL_sv_undef;
2386 else if (sp != bot + 1) /* too many, take last one */ 2780 else /* too many, take last one */
2387 bot [1] = *sp; 2781 bot [1] = *sp;
2388 2782
2389 SP = bot + 1; 2783 SP = bot + 1;
2390 2784
2391 PUTBACK; 2785 PUTBACK;
… …
2424 if (PL_op->op_flags & OPf_STACKED) 2818 if (PL_op->op_flags & OPf_STACKED)
2425 { 2819 {
2426 if (items > slf_arga) 2820 if (items > slf_arga)
2427 { 2821 {
2428 slf_arga = items; 2822 slf_arga = items;
2429 free (slf_argv); 2823 Safefree (slf_argv);
2430 slf_argv = malloc (slf_arga * sizeof (SV *)); 2824 New (0, slf_argv, slf_arga, SV *);
2431 } 2825 }
2432 2826
2433 slf_argc = items; 2827 slf_argc = items;
2434 2828
2435 for (i = 0; i < items; ++i) 2829 for (i = 0; i < items; ++i)
… …
2489{ 2883{
2490 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2884 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2491 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2885 on_enterleave_call (aTHX_ sv_2mortal (cb));
2492} 2886}
2493 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);
2978}
2979
2494/*****************************************************************************/ 2980/*****************************************************************************/
2495/* PerlIO::cede */ 2981/* PerlIO::cede */
2496 2982
2497typedef struct 2983typedef struct
2498{ 2984{
2499 PerlIOBuf base; 2985 PerlIOBuf base;
2500 NV next, every; 2986 NV next, every;
2501} PerlIOCede; 2987} PerlIOCede;
2502 2988
2503static IV 2989static IV ecb_cold
2504PerlIOCede_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)
2505{ 2991{
2506 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2992 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2507 2993
2508 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2994 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2509 self->next = nvtime () + self->every; 2995 self->next = nvtime () + self->every;
2510 2996
2511 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2997 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2512} 2998}
2513 2999
2514static SV * 3000static SV * ecb_cold
2515PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3001PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2516{ 3002{
2517 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3003 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2518 3004
2519 return newSVnv (self->every); 3005 return newSVnv (self->every);
… …
2626 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3112 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2627 PUTBACK; 3113 PUTBACK;
2628 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3114 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2629 } 3115 }
2630 3116
2631 SvREFCNT_dec (cb); 3117 SvREFCNT_dec_NN (cb);
2632 } 3118 }
2633} 3119}
2634 3120
2635static void 3121static void
2636coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3122coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2637{ 3123{
2638 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3124 /* call $sem->adjust (0) to possibly wake up some other waiters */
2639 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3125 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2640} 3126}
2641 3127
2642static int 3128static int
2643slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3129slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2644{ 3130{
2645 AV *av = (AV *)frame->data; 3131 AV *av = (AV *)frame->data;
2646 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;
2647 3136
2648 /* 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 */
2649 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
2650 return 0; 3143 return 0;
3144 }
2651 else if (SvIVX (count_sv) > 0) 3145 else if (SvIVX (count_sv) > 0)
2652 { 3146 {
2653 SvSTATE_current->on_destroy = 0;
2654
2655 if (acquire) 3147 if (acquire)
2656 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3148 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2657 else 3149 else
2658 coro_semaphore_adjust (aTHX_ av, 0); 3150 coro_semaphore_adjust (aTHX_ av, 0);
2659 3151
… …
2663 { 3155 {
2664 int i; 3156 int i;
2665 /* 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 */
2666 /* 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 */
2667 /* this avoids some degenerate memory usage cases */ 3159 /* this avoids some degenerate memory usage cases */
2668 3160 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2669 for (i = 1; i <= AvFILLp (av); ++i)
2670 if (AvARRAY (av)[i] == SvRV (coro_current)) 3161 if (AvARRAY (av)[i] == coro_hv)
2671 return 1; 3162 return 1;
2672 3163
2673 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3164 av_push (av, SvREFCNT_inc (coro_hv));
2674 return 1; 3165 return 1;
2675 } 3166 }
2676} 3167}
2677 3168
2678static int 3169static int
… …
2701 { 3192 {
2702 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3193 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2703 3194
2704 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3195 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2705 frame->prepare = prepare_schedule; 3196 frame->prepare = prepare_schedule;
2706
2707 /* to avoid race conditions when a woken-up coro gets terminated */ 3197 /* to avoid race conditions when a woken-up coro gets terminated */
2708 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3198 /* we arrange for a temporary on_destroy that calls adjust (0) */
2709 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3199 frame->destroy = coro_semaphore_destroy;
2710 } 3200 }
2711} 3201}
2712 3202
2713static void 3203static void
2714slf_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)
… …
2722{ 3212{
2723 if (items >= 2) 3213 if (items >= 2)
2724 { 3214 {
2725 /* callback form */ 3215 /* callback form */
2726 AV *av = (AV *)SvRV (arg [0]); 3216 AV *av = (AV *)SvRV (arg [0]);
2727 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3217 SV *cb_cv = s_get_cv_croak (arg [1]);
2728 3218
2729 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3219 av_push (av, SvREFCNT_inc_NN (cb_cv));
2730 3220
2731 if (SvIVX (AvARRAY (av)[0]) > 0) 3221 if (SvIVX (AvARRAY (av)[0]) > 0)
2732 coro_semaphore_adjust (aTHX_ av, 0); 3222 coro_semaphore_adjust (aTHX_ av, 0);
… …
2772 { 3262 {
2773 api_ready (aTHX_ cb); 3263 api_ready (aTHX_ cb);
2774 sv_setiv (cb, 0); /* signal waiter */ 3264 sv_setiv (cb, 0); /* signal waiter */
2775 } 3265 }
2776 3266
2777 SvREFCNT_dec (cb); 3267 SvREFCNT_dec_NN (cb);
2778 3268
2779 --count; 3269 --count;
2780 } 3270 }
2781} 3271}
2782 3272
… …
2792{ 3282{
2793 AV *av = (AV *)SvRV (arg [0]); 3283 AV *av = (AV *)SvRV (arg [0]);
2794 3284
2795 if (items >= 2) 3285 if (items >= 2)
2796 { 3286 {
2797 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3287 SV *cb_cv = s_get_cv_croak (arg [1]);
2798 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3288 av_push (av, SvREFCNT_inc_NN (cb_cv));
2799 3289
2800 if (SvIVX (AvARRAY (av)[0])) 3290 if (SvIVX (AvARRAY (av)[0]))
2801 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3291 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2802 3292
2803 frame->prepare = prepare_nop; 3293 frame->prepare = prepare_nop;
2804 frame->check = slf_check_nop; 3294 frame->check = slf_check_nop;
2805 } 3295 }
2806 else if (SvIVX (AvARRAY (av)[0])) 3296 else if (SvIVX (AvARRAY (av)[0]))
… …
2837 3327
2838static void 3328static void
2839coro_aio_callback (pTHX_ CV *cv) 3329coro_aio_callback (pTHX_ CV *cv)
2840{ 3330{
2841 dXSARGS; 3331 dXSARGS;
2842 AV *state = (AV *)GENSUB_ARG; 3332 AV *state = (AV *)S_GENSUB_ARG;
2843 SV *coro = av_pop (state); 3333 SV *coro = av_pop (state);
2844 SV *data_sv = newSV (sizeof (struct io_state)); 3334 SV *data_sv = newSV (sizeof (struct io_state));
2845 3335
2846 av_extend (state, items - 1); 3336 av_extend (state, items - 1);
2847 3337
… …
2867 } 3357 }
2868 3358
2869 av_push (state, data_sv); 3359 av_push (state, data_sv);
2870 3360
2871 api_ready (aTHX_ coro); 3361 api_ready (aTHX_ coro);
2872 SvREFCNT_dec (coro); 3362 SvREFCNT_dec_NN (coro);
2873 SvREFCNT_dec ((AV *)state); 3363 SvREFCNT_dec_NN ((AV *)state);
2874} 3364}
2875 3365
2876static int 3366static int
2877slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3367slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2878{ 3368{
… …
2883 /* it quickly returns */ 3373 /* it quickly returns */
2884 if (CORO_THROW) 3374 if (CORO_THROW)
2885 return 0; 3375 return 0;
2886 3376
2887 /* one element that is an RV? repeat! */ 3377 /* one element that is an RV? repeat! */
2888 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3378 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2889 return 1; 3379 return 1;
2890 3380
2891 /* restore status */ 3381 /* restore status */
2892 { 3382 {
2893 SV *data_sv = av_pop (state); 3383 SV *data_sv = av_pop (state);
… …
2896 errno = data->errorno; 3386 errno = data->errorno;
2897 PL_laststype = data->laststype; 3387 PL_laststype = data->laststype;
2898 PL_laststatval = data->laststatval; 3388 PL_laststatval = data->laststatval;
2899 PL_statcache = data->statcache; 3389 PL_statcache = data->statcache;
2900 3390
2901 SvREFCNT_dec (data_sv); 3391 SvREFCNT_dec_NN (data_sv);
2902 } 3392 }
2903 3393
2904 /* push result values */ 3394 /* push result values */
2905 { 3395 {
2906 dSP; 3396 dSP;
… …
2932 dSP; 3422 dSP;
2933 3423
2934 static SV *prio_cv; 3424 static SV *prio_cv;
2935 static SV *prio_sv; 3425 static SV *prio_sv;
2936 3426
2937 if (expect_false (!prio_cv)) 3427 if (ecb_expect_false (!prio_cv))
2938 { 3428 {
2939 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3429 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2940 prio_sv = newSViv (0); 3430 prio_sv = newSViv (0);
2941 } 3431 }
2942 3432
… …
2961 3451
2962 for (i = 0; i < items; ++i) 3452 for (i = 0; i < items; ++i)
2963 PUSHs (arg [i]); 3453 PUSHs (arg [i]);
2964 3454
2965 /* now push the callback closure */ 3455 /* now push the callback closure */
2966 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))));
2967 3457
2968 /* now call the AIO function - we assume our request is uncancelable */ 3458 /* now call the AIO function - we assume our request is uncancelable */
2969 PUTBACK; 3459 PUTBACK;
2970 call_sv ((SV *)req, G_VOID | G_DISCARD); 3460 call_sv ((SV *)req, G_VOID | G_DISCARD);
2971 } 3461 }
2972 3462
2973 /* 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 */
2974 frame->data = (void *)state; 3464 frame->data = (void *)state;
2975 frame->prepare = prepare_schedule; 3465 frame->prepare = prepare_schedule;
2976 frame->check = slf_check_aio_req; 3466 frame->check = slf_check_aio_req;
2977} 3467}
2978 3468
… …
2990 3480
2991#if CORO_CLONE 3481#if CORO_CLONE
2992# include "clone.c" 3482# include "clone.c"
2993#endif 3483#endif
2994 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
2995MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3610MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2996 3611
2997PROTOTYPES: DISABLE 3612PROTOTYPES: DISABLE
2998 3613
2999BOOT: 3614BOOT:
3000{ 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"
3001#ifdef USE_ITHREADS 3618#ifdef USE_ITHREADS
3002# if CORO_PTHREAD 3619# if CORO_PTHREAD
3003 coro_thx = PERL_GET_CONTEXT; 3620 coro_thx = PERL_GET_CONTEXT;
3004# endif 3621# endif
3005#endif 3622#endif
3006 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;
3007 3629
3008 cctx_current = cctx_new_empty (); 3630 cctx_current = cctx_new_empty ();
3009 3631
3010 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3632 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3011 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3633 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3012 3634
3013 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3635 {
3014 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3636 /*
3015 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 }
3016 3659
3017 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3018 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));
3019 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));
3020 3662
3021 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3663 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3022 3664
… …
3051 coroapi.prepare_nop = prepare_nop; 3693 coroapi.prepare_nop = prepare_nop;
3052 coroapi.prepare_schedule = prepare_schedule; 3694 coroapi.prepare_schedule = prepare_schedule;
3053 coroapi.prepare_cede = prepare_cede; 3695 coroapi.prepare_cede = prepare_cede;
3054 coroapi.prepare_cede_notself = prepare_cede_notself; 3696 coroapi.prepare_cede_notself = prepare_cede_notself;
3055 3697
3056 { 3698 time_init (aTHX);
3057 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3058
3059 if (!svp) croak ("Time::HiRes is required");
3060 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3061
3062 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3063
3064 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3065 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3066 }
3067 3699
3068 assert (("PRIO_NORMAL must be 0", !CORO_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
3069} 3706}
3070 3707
3071SV * 3708SV *
3072new (char *klass, ...) 3709new (SV *klass, ...)
3073 ALIAS: 3710 ALIAS:
3074 Coro::new = 1 3711 Coro::new = 1
3075 CODE: 3712 CODE:
3076{ 3713 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
3077 struct coro *coro; 3714 OUTPUT:
3078 MAGIC *mg;
3079 HV *hv;
3080 CV *cb;
3081 int i;
3082
3083 if (items > 1)
3084 {
3085 cb = coro_sv_2cv (aTHX_ ST (1));
3086
3087 if (!ix)
3088 {
3089 if (CvISXSUB (cb))
3090 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3091
3092 if (!CvROOT (cb))
3093 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3094 }
3095 }
3096
3097 Newz (0, coro, 1, struct coro);
3098 coro->args = newAV ();
3099 coro->flags = CF_NEW;
3100
3101 if (coro_first) coro_first->prev = coro;
3102 coro->next = coro_first;
3103 coro_first = coro;
3104
3105 coro->hv = hv = newHV ();
3106 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3107 mg->mg_flags |= MGf_DUP;
3108 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3109
3110 if (items > 1)
3111 {
3112 av_extend (coro->args, items - 1 + ix - 1);
3113
3114 if (ix)
3115 {
3116 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3117 cb = cv_coro_run;
3118 }
3119
3120 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3121
3122 for (i = 2; i < items; i++)
3123 av_push (coro->args, newSVsv (ST (i)));
3124 }
3125}
3126 OUTPUT:
3127 RETVAL 3715 RETVAL
3128 3716
3129void 3717void
3130transfer (...) 3718transfer (...)
3131 PROTOTYPE: $$ 3719 PROTOTYPE: $$
3132 CODE: 3720 CODE:
3133 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3721 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3134
3135bool
3136_destroy (SV *coro_sv)
3137 CODE:
3138 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3139 OUTPUT:
3140 RETVAL
3141
3142void
3143_exit (int code)
3144 PROTOTYPE: $
3145 CODE:
3146 _exit (code);
3147 3722
3148SV * 3723SV *
3149clone (Coro::State coro) 3724clone (Coro::State coro)
3150 CODE: 3725 CODE:
3151{ 3726{
… …
3206void 3781void
3207list () 3782list ()
3208 PROTOTYPE: 3783 PROTOTYPE:
3209 PPCODE: 3784 PPCODE:
3210{ 3785{
3211 struct coro *coro; 3786 struct coro *coro;
3212 for (coro = coro_first; coro; coro = coro->next) 3787 for (coro = coro_first; coro; coro = coro->next)
3213 if (coro->hv) 3788 if (coro->hv)
3214 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3789 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3215} 3790}
3216 3791
… …
3221 CODE: 3796 CODE:
3222{ 3797{
3223 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3798 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3224 { 3799 {
3225 struct coro *current = SvSTATE_current; 3800 struct coro *current = SvSTATE_current;
3801 struct CoroSLF slf_save;
3226 3802
3227 if (current != coro) 3803 if (current != coro)
3228 { 3804 {
3229 PUTBACK; 3805 PUTBACK;
3230 save_perl (aTHX_ current); 3806 save_perl (aTHX_ current);
3231 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;
3232 SPAGAIN; 3817 SPAGAIN;
3233 } 3818 }
3234 3819
3235 PUSHSTACK; 3820 PUSHSTACK;
3236 3821
… …
3246 SPAGAIN; 3831 SPAGAIN;
3247 3832
3248 if (current != coro) 3833 if (current != coro)
3249 { 3834 {
3250 PUTBACK; 3835 PUTBACK;
3836 slf_frame = slf_save;
3251 save_perl (aTHX_ coro); 3837 save_perl (aTHX_ coro);
3252 load_perl (aTHX_ current); 3838 load_perl (aTHX_ current);
3253 SPAGAIN; 3839 SPAGAIN;
3254 } 3840 }
3255 } 3841 }
… …
3260 PROTOTYPE: $ 3846 PROTOTYPE: $
3261 ALIAS: 3847 ALIAS:
3262 is_ready = CF_READY 3848 is_ready = CF_READY
3263 is_running = CF_RUNNING 3849 is_running = CF_RUNNING
3264 is_new = CF_NEW 3850 is_new = CF_NEW
3265 is_destroyed = CF_DESTROYED 3851 is_destroyed = CF_ZOMBIE
3852 is_zombie = CF_ZOMBIE
3266 is_suspended = CF_SUSPENDED 3853 is_suspended = CF_SUSPENDED
3267 CODE: 3854 CODE:
3268 RETVAL = boolSV (coro->flags & ix); 3855 RETVAL = boolSV (coro->flags & ix);
3269 OUTPUT: 3856 OUTPUT:
3270 RETVAL 3857 RETVAL
3271 3858
3272void 3859void
3273throw (Coro::State self, SV *throw = &PL_sv_undef) 3860throw (SV *self, SV *exception = &PL_sv_undef)
3274 PROTOTYPE: $;$ 3861 PROTOTYPE: $;$
3275 CODE: 3862 CODE:
3276{ 3863{
3864 struct coro *coro = SvSTATE (self);
3277 struct coro *current = SvSTATE_current; 3865 struct coro *current = SvSTATE_current;
3278 SV **throwp = self == current ? &CORO_THROW : &self->except; 3866 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3279 SvREFCNT_dec (*throwp); 3867 SvREFCNT_dec (*exceptionp);
3280 SvGETMAGIC (throw); 3868 SvGETMAGIC (exception);
3281 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3869 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3870
3871 api_ready (aTHX_ self);
3282} 3872}
3283 3873
3284void 3874void
3285api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3875api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3286 PROTOTYPE: $;$ 3876 PROTOTYPE: $;$
… …
3341 3931
3342void 3932void
3343cancel (Coro::State self) 3933cancel (Coro::State self)
3344 CODE: 3934 CODE:
3345 coro_state_destroy (aTHX_ self); 3935 coro_state_destroy (aTHX_ self);
3346 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3347
3348 3936
3349SV * 3937SV *
3350enable_times (int enabled = enable_times) 3938enable_times (int enabled = enable_times)
3351 CODE: 3939 CODE:
3352{ 3940{
… …
3365 3953
3366void 3954void
3367times (Coro::State self) 3955times (Coro::State self)
3368 PPCODE: 3956 PPCODE:
3369{ 3957{
3370 struct coro *current = SvSTATE (coro_current); 3958 struct coro *current = SvSTATE (coro_current);
3371 3959
3372 if (expect_false (current == self)) 3960 if (ecb_expect_false (current == self))
3373 { 3961 {
3374 coro_times_update (); 3962 coro_times_update ();
3375 coro_times_add (SvSTATE (coro_current)); 3963 coro_times_add (SvSTATE (coro_current));
3376 } 3964 }
3377 3965
3378 EXTEND (SP, 2); 3966 EXTEND (SP, 2);
3379 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3967 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3380 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3968 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3381 3969
3382 if (expect_false (current == self)) 3970 if (ecb_expect_false (current == self))
3383 coro_times_sub (SvSTATE (coro_current)); 3971 coro_times_sub (SvSTATE (coro_current));
3384} 3972}
3385 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
4021
3386MODULE = Coro::State PACKAGE = Coro 4022MODULE = Coro::State PACKAGE = Coro
3387 4023
3388BOOT: 4024BOOT:
3389{ 4025{
4026 if (SVt_LAST > 32)
4027 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4028
3390 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4029 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3391 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4030 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3392 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4031 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3393 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3394 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);
3395 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4033 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3396 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4034 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3397 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4035 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3398 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4036 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3399 4037
3400 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);
3401 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4039 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3402 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);
3403 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 */
3404 4042
3405 coro_stash = gv_stashpv ("Coro", TRUE); 4043 coro_stash = gv_stashpv ("Coro", TRUE);
3406 4044
3407 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4045 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3408 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4046 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
… …
3421 coroapi.ready = api_ready; 4059 coroapi.ready = api_ready;
3422 coroapi.is_ready = api_is_ready; 4060 coroapi.is_ready = api_is_ready;
3423 coroapi.nready = coro_nready; 4061 coroapi.nready = coro_nready;
3424 coroapi.current = coro_current; 4062 coroapi.current = coro_current;
3425 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
3426 /*GCoroAPI = &coroapi;*/ 4068 /*GCoroAPI = &coroapi;*/
3427 sv_setiv (sv, (IV)&coroapi); 4069 sv_setiv (sv, (IV)&coroapi);
3428 SvREADONLY_on (sv); 4070 SvREADONLY_on (sv);
3429 } 4071 }
3430} 4072}
3431 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
3432void 4099void
3433terminate (...) 4100terminate (...)
3434 CODE: 4101 CODE:
3435 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4102 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3436 4103
3437void 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
3438schedule (...) 4114schedule (...)
3439 CODE: 4115 CODE:
3440 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4116 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3441 4117
3442void 4118void
… …
3461 4137
3462void 4138void
3463_set_current (SV *current) 4139_set_current (SV *current)
3464 PROTOTYPE: $ 4140 PROTOTYPE: $
3465 CODE: 4141 CODE:
3466 SvREFCNT_dec (SvRV (coro_current)); 4142 SvREFCNT_dec_NN (SvRV (coro_current));
3467 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4143 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3468 4144
3469void 4145void
3470_set_readyhook (SV *hook) 4146_set_readyhook (SV *hook)
3471 PROTOTYPE: $ 4147 PROTOTYPE: $
3472 CODE: 4148 CODE:
3473 SvREFCNT_dec (coro_readyhook); 4149 SvREFCNT_dec (coro_readyhook);
3474 SvGETMAGIC (hook); 4150 SvGETMAGIC (hook);
4151 if (SvOK (hook))
4152 {
3475 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 }
3476 4161
3477int 4162int
3478prio (Coro::State coro, int newprio = 0) 4163prio (Coro::State coro, int newprio = 0)
3479 PROTOTYPE: $;$ 4164 PROTOTYPE: $;$
3480 ALIAS: 4165 ALIAS:
… …
3544 for (i = 1; i < items; ++i) 4229 for (i = 1; i < items; ++i)
3545 av_push (av, SvREFCNT_inc_NN (ST (i))); 4230 av_push (av, SvREFCNT_inc_NN (ST (i)));
3546 4231
3547 if ((SV *)hv == &PL_sv_undef) 4232 if ((SV *)hv == &PL_sv_undef)
3548 { 4233 {
3549 PUSHMARK (SP); 4234 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3550 EXTEND (SP, 2);
3551 PUSHs (sv_Coro);
3552 PUSHs ((SV *)cv_pool_handler);
3553 PUTBACK;
3554 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3555 SPAGAIN;
3556
3557 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4235 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4236 SvREFCNT_dec_NN (sv);
3558 } 4237 }
3559 4238
3560 { 4239 {
3561 struct coro *coro = SvSTATE_hv (hv); 4240 struct coro *coro = SvSTATE_hv (hv);
3562 4241
… …
3569 api_ready (aTHX_ (SV *)hv); 4248 api_ready (aTHX_ (SV *)hv);
3570 4249
3571 if (GIMME_V != G_VOID) 4250 if (GIMME_V != G_VOID)
3572 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4251 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3573 else 4252 else
3574 SvREFCNT_dec (hv); 4253 SvREFCNT_dec_NN (hv);
3575} 4254}
3576 4255
3577SV * 4256SV *
3578rouse_cb () 4257rouse_cb ()
3579 PROTOTYPE: 4258 PROTOTYPE:
… …
3594 on_leave = 1 4273 on_leave = 1
3595 PROTOTYPE: & 4274 PROTOTYPE: &
3596 CODE: 4275 CODE:
3597{ 4276{
3598 struct coro *coro = SvSTATE_current; 4277 struct coro *coro = SvSTATE_current;
3599 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4278 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3600 4279
3601 block = (SV *)coro_sv_2cv (aTHX_ block); 4280 block = s_get_cv_croak (block);
3602 4281
3603 if (!*avp) 4282 if (!*avp)
3604 *avp = newAV (); 4283 *avp = newAV ();
3605 4284
3606 av_push (*avp, SvREFCNT_inc (block)); 4285 av_push (*avp, SvREFCNT_inc (block));
… …
3624 4303
3625SV * 4304SV *
3626new (SV *klass, SV *count = 0) 4305new (SV *klass, SV *count = 0)
3627 CODE: 4306 CODE:
3628{ 4307{
3629 int semcnt = 1; 4308 int semcnt = 1;
3630 4309
3631 if (count) 4310 if (count)
3632 { 4311 {
3633 SvGETMAGIC (count); 4312 SvGETMAGIC (count);
3634 4313
… …
3658 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4337 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3659 OUTPUT: 4338 OUTPUT:
3660 RETVAL 4339 RETVAL
3661 4340
3662void 4341void
3663up (SV *self, int adjust = 1) 4342up (SV *self)
3664 ALIAS:
3665 adjust = 1
3666 CODE: 4343 CODE:
4344 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4345
4346void
4347adjust (SV *self, int adjust)
4348 CODE:
3667 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4349 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3668 4350
3669void 4351void
3670down (...) 4352down (...)
3671 CODE: 4353 CODE:
3672 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4354 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3694 XSRETURN_NO; 4376 XSRETURN_NO;
3695} 4377}
3696 4378
3697void 4379void
3698waiters (SV *self) 4380waiters (SV *self)
3699 PPCODE: 4381 PPCODE:
3700{ 4382{
3701 AV *av = (AV *)SvRV (self); 4383 AV *av = (AV *)SvRV (self);
3702 int wcount = AvFILLp (av) + 1 - 1; 4384 int wcount = AvFILLp (av) + 1 - 1;
3703 4385
3704 if (GIMME_V == G_SCALAR) 4386 if (GIMME_V == G_SCALAR)
… …
3713} 4395}
3714 4396
3715MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4397MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3716 4398
3717void 4399void
3718_may_delete (SV *sem, int count, int extra_refs) 4400_may_delete (SV *sem, int count, unsigned int extra_refs)
3719 PPCODE: 4401 PPCODE:
3720{ 4402{
3721 AV *av = (AV *)SvRV (sem); 4403 AV *av = (AV *)SvRV (sem);
3722 4404
3723 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4405 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3724 && AvFILLp (av) == 0 /* no waiters, just count */ 4406 && AvFILLp (av) == 0 /* no waiters, just count */
3725 && SvIV (AvARRAY (av)[0]) == count) 4407 && SvIV (AvARRAY (av)[0]) == count)
3726 XSRETURN_YES; 4408 XSRETURN_YES;
… …
3747 4429
3748void 4430void
3749broadcast (SV *self) 4431broadcast (SV *self)
3750 CODE: 4432 CODE:
3751{ 4433{
3752 AV *av = (AV *)SvRV (self); 4434 AV *av = (AV *)SvRV (self);
3753 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4435 coro_signal_wake (aTHX_ av, AvFILLp (av));
3754} 4436}
3755 4437
3756void 4438void
3757send (SV *self) 4439send (SV *self)
… …
3765 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4447 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3766} 4448}
3767 4449
3768IV 4450IV
3769awaited (SV *self) 4451awaited (SV *self)
3770 CODE: 4452 CODE:
3771 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4453 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3772 OUTPUT: 4454 OUTPUT:
3773 RETVAL 4455 RETVAL
3774 4456
3775 4457
… …
3780 4462
3781void 4463void
3782_schedule (...) 4464_schedule (...)
3783 CODE: 4465 CODE:
3784{ 4466{
3785 static int incede; 4467 static int incede;
3786 4468
3787 api_cede_notself (aTHX); 4469 api_cede_notself (aTHX);
3788 4470
3789 ++incede; 4471 ++incede;
3790 while (coro_nready >= incede && api_cede (aTHX)) 4472 while (coro_nready >= incede && api_cede (aTHX))
… …
3806 4488
3807void 4489void
3808_register (char *target, char *proto, SV *req) 4490_register (char *target, char *proto, SV *req)
3809 CODE: 4491 CODE:
3810{ 4492{
3811 CV *req_cv = coro_sv_2cv (aTHX_ req); 4493 SV *req_cv = s_get_cv_croak (req);
3812 /* newXSproto doesn't return the CV on 5.8 */ 4494 /* newXSproto doesn't return the CV on 5.8 */
3813 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4495 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3814 sv_setpv ((SV *)slf_cv, proto); 4496 sv_setpv ((SV *)slf_cv, proto);
3815 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);
3816} 4498}
3817 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