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.355 by root, Wed Jun 24 02:52:38 2009 UTC vs.
Revision 1.471 by root, Fri Jul 14 23:20:07 2017 UTC

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

Diff Legend

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