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.360 by root, Mon Jun 29 06:14:23 2009 UTC vs.
Revision 1.472 by root, Thu Aug 31 16:24:19 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
… …
169# define CORO_CLOCK_MONOTONIC 1 116# define CORO_CLOCK_MONOTONIC 1
170# define CORO_CLOCK_THREAD_CPUTIME_ID 3 117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
171# endif 118# endif
172#endif 119#endif
173 120
121/* 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
174static double (*nvtime)(); /* so why doesn't it take void? */ 139static double (*nvtime)(); /* so why doesn't it take void? */
175static void (*u2time)(pTHX_ UV ret[2]); 140static void (*u2time)(pTHX_ UV ret[2]);
176 141
177/* we hijack an hopefully unused CV flag for our purposes */ 142/* we hijack an hopefully unused CV flag for our purposes */
178#define CVf_SLF 0x4000 143#define CVf_SLF 0x4000
179static OP *pp_slf (pTHX); 144static OP *pp_slf (pTHX);
145static void slf_destroy (pTHX_ struct coro *coro);
180 146
181static U32 cctx_gen; 147static U32 cctx_gen;
182static size_t cctx_stacksize = CORO_STACKSIZE; 148static size_t cctx_stacksize = CORO_STACKSIZE;
183static struct CoroAPI coroapi; 149static struct CoroAPI coroapi;
184static AV *main_mainstack; /* used to differentiate between $main and others */ 150static AV *main_mainstack; /* used to differentiate between $main and others */
… …
192 158
193static GV *irsgv; /* $/ */ 159static GV *irsgv; /* $/ */
194static GV *stdoutgv; /* *STDOUT */ 160static GV *stdoutgv; /* *STDOUT */
195static SV *rv_diehook; 161static SV *rv_diehook;
196static SV *rv_warnhook; 162static SV *rv_warnhook;
197static HV *hv_sig; /* %SIG */
198 163
199/* async_pool helper stuff */ 164/* async_pool helper stuff */
200static SV *sv_pool_rss; 165static SV *sv_pool_rss;
201static SV *sv_pool_size; 166static SV *sv_pool_size;
202static SV *sv_async_pool_idle; /* description string */ 167static SV *sv_async_pool_idle; /* description string */
203static AV *av_async_pool; /* idle pool */ 168static AV *av_async_pool; /* idle pool */
204static SV *sv_Coro; /* class string */ 169static SV *sv_Coro; /* class string */
205static CV *cv_pool_handler; 170static CV *cv_pool_handler;
206static CV *cv_coro_state_new;
207 171
208/* Coro::AnyEvent */ 172/* Coro::AnyEvent */
209static SV *sv_activity; 173static SV *sv_activity;
210 174
211/* enable processtime/realtime profiling */ 175/* enable processtime/realtime profiling */
… …
215static char times_valid; 179static char times_valid;
216 180
217static struct coro_cctx *cctx_first; 181static struct coro_cctx *cctx_first;
218static int cctx_count, cctx_idle; 182static int cctx_count, cctx_idle;
219 183
220enum { 184enum
185{
221 CC_MAPPED = 0x01, 186 CC_MAPPED = 0x01,
222 CC_NOREUSE = 0x02, /* throw this away after tracing */ 187 CC_NOREUSE = 0x02, /* throw this away after tracing */
223 CC_TRACE = 0x04, 188 CC_TRACE = 0x04,
224 CC_TRACE_SUB = 0x08, /* trace sub calls */ 189 CC_TRACE_SUB = 0x08, /* trace sub calls */
225 CC_TRACE_LINE = 0x10, /* trace each statement */ 190 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
230typedef struct coro_cctx 195typedef struct coro_cctx
231{ 196{
232 struct coro_cctx *next; 197 struct coro_cctx *next;
233 198
234 /* the stack */ 199 /* the stack */
235 void *sptr; 200 struct coro_stack stack;
236 size_t ssize;
237 201
238 /* cpu state */ 202 /* cpu state */
239 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
240 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
241 JMPENV *top_env; 207 JMPENV *top_env;
242 coro_context cctx; 208 coro_context cctx;
243 209
244 U32 gen; 210 U32 gen;
245#if CORO_USE_VALGRIND 211#if CORO_USE_VALGRIND
246 int valgrind_id; 212 int valgrind_id;
247#endif 213#endif
248 unsigned char flags; 214 unsigned char flags;
249} coro_cctx; 215} coro_cctx;
250 216
251coro_cctx *cctx_current; /* the currently running cctx */ 217static coro_cctx *cctx_current; /* the currently running cctx */
252 218
253/*****************************************************************************/ 219/*****************************************************************************/
254 220
221static MGVTBL coro_state_vtbl;
222
255enum { 223enum
224{
256 CF_RUNNING = 0x0001, /* coroutine is running */ 225 CF_RUNNING = 0x0001, /* coroutine is running */
257 CF_READY = 0x0002, /* coroutine is ready */ 226 CF_READY = 0x0002, /* coroutine is ready */
258 CF_NEW = 0x0004, /* has never been switched to */ 227 CF_NEW = 0x0004, /* has never been switched to */
259 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 228 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
260 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) */
261}; 231};
262 232
263/* 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 */
264typedef struct 234typedef struct
265{ 235{
266 SV *defsv;
267 AV *defav;
268 SV *errsv;
269 SV *irsgv;
270 HV *hinthv;
271#define VAR(name,type) type name; 236 #define VARx(name,expr,type) type name;
272# include "state.h" 237 #include "state.h"
273#undef VAR
274} perl_slots; 238} perl_slots;
275 239
240/* how many context stack entries do we need for perl_slots */
276#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 241#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
277 242
278/* this is a structure representing a perl-level coroutine */ 243/* this is a structure representing a perl-level coroutine */
279struct coro { 244struct coro
245{
280 /* the C coroutine allocated to this perl coroutine, if any */ 246 /* the C coroutine allocated to this perl coroutine, if any */
281 coro_cctx *cctx; 247 coro_cctx *cctx;
282 248
283 /* ready queue */ 249 /* ready queue */
284 struct coro *next_ready; 250 struct coro *next_ready;
… …
286 /* state data */ 252 /* state data */
287 struct CoroSLF slf_frame; /* saved slf frame */ 253 struct CoroSLF slf_frame; /* saved slf frame */
288 AV *mainstack; 254 AV *mainstack;
289 perl_slots *slot; /* basically the saved sp */ 255 perl_slots *slot; /* basically the saved sp */
290 256
291 CV *startcv; /* the CV to execute */ 257 CV *startcv; /* the CV to execute */
292 AV *args; /* data associated with this coroutine (initial args) */ 258 AV *args; /* data associated with this coroutine (initial args) */
293 int refcnt; /* coroutines are refcounted, yes */
294 int flags; /* CF_ flags */ 259 int flags; /* CF_ flags */
295 HV *hv; /* the perl hash associated with this coro, if any */ 260 HV *hv; /* the perl hash associated with this coro, if any */
296 void (*on_destroy)(pTHX_ struct coro *coro);
297 261
298 /* statistics */ 262 /* statistics */
299 int usecount; /* number of transfers to this coro */ 263 int usecount; /* number of transfers to this coro */
300 264
301 /* coro process data */ 265 /* coro process data */
302 int prio; 266 int prio;
303 SV *except; /* exception to be thrown */ 267 SV *except; /* exception to be thrown */
304 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 */
305 271
306 /* async_pool */ 272 /* async_pool */
307 SV *saved_deffh; 273 SV *saved_deffh;
308 SV *invoke_cb; 274 SV *invoke_cb;
309 AV *invoke_av; 275 AV *invoke_av;
310 276
311 /* on_enter/on_leave */ 277 /* on_enter/on_leave */
312 AV *on_enter; 278 AV *on_enter; AV *on_enter_xs;
313 AV *on_leave; 279 AV *on_leave; AV *on_leave_xs;
280
281 /* swap_sv */
282 AV *swap_sv;
314 283
315 /* times */ 284 /* times */
316 coro_ts t_cpu, t_real; 285 coro_ts t_cpu, t_real;
317 286
318 /* linked list */ 287 /* linked list */
… …
322typedef struct coro *Coro__State; 291typedef struct coro *Coro__State;
323typedef struct coro *Coro__State_or_hashref; 292typedef struct coro *Coro__State_or_hashref;
324 293
325/* the following variables are effectively part of the perl context */ 294/* the following variables are effectively part of the perl context */
326/* and get copied between struct coro and these variables */ 295/* and get copied between struct coro and these variables */
327/* the mainr easonw e don't support windows process emulation */ 296/* the main reason we don't support windows process emulation */
328static struct CoroSLF slf_frame; /* the current slf frame */ 297static struct CoroSLF slf_frame; /* the current slf frame */
329 298
330/** Coro ********************************************************************/ 299/** Coro ********************************************************************/
331 300
332#define CORO_PRIO_MAX 3 301#define CORO_PRIO_MAX 3
… …
338 307
339/* for Coro.pm */ 308/* for Coro.pm */
340static SV *coro_current; 309static SV *coro_current;
341static SV *coro_readyhook; 310static SV *coro_readyhook;
342static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 311static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
343static CV *cv_coro_run, *cv_coro_terminate; 312static CV *cv_coro_run;
344static struct coro *coro_first; 313static struct coro *coro_first;
345#define coro_nready coroapi.nready 314#define coro_nready coroapi.nready
346 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
347/** lowlevel stuff **********************************************************/ 411/** lowlevel stuff **********************************************************/
348 412
349static SV * 413static SV * ecb_noinline
350coro_get_sv (pTHX_ const char *name, int create) 414coro_get_sv (pTHX_ const char *name, int create)
351{ 415{
352#if PERL_VERSION_ATLEAST (5,10,0) 416#if PERL_VERSION_ATLEAST (5,10,0)
353 /* 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 */
354 get_sv (name, create); 418 get_sv (name, create);
355#endif 419#endif
356 return get_sv (name, create); 420 return get_sv (name, create);
357} 421}
358 422
359static AV * 423static AV * ecb_noinline
360coro_get_av (pTHX_ const char *name, int create) 424coro_get_av (pTHX_ const char *name, int create)
361{ 425{
362#if PERL_VERSION_ATLEAST (5,10,0) 426#if PERL_VERSION_ATLEAST (5,10,0)
363 /* 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 */
364 get_av (name, create); 428 get_av (name, create);
365#endif 429#endif
366 return get_av (name, create); 430 return get_av (name, create);
367} 431}
368 432
369static HV * 433static HV * ecb_noinline
370coro_get_hv (pTHX_ const char *name, int create) 434coro_get_hv (pTHX_ const char *name, int create)
371{ 435{
372#if PERL_VERSION_ATLEAST (5,10,0) 436#if PERL_VERSION_ATLEAST (5,10,0)
373 /* 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 */
374 get_hv (name, create); 438 get_hv (name, create);
375#endif 439#endif
376 return get_hv (name, create); 440 return get_hv (name, create);
377} 441}
378 442
379/* may croak */ 443ecb_inline void
380INLINE CV *
381coro_sv_2cv (pTHX_ SV *sv)
382{
383 HV *st;
384 GV *gvp;
385 CV *cv = sv_2cv (sv, &st, &gvp, 0);
386
387 if (!cv)
388 croak ("code reference expected");
389
390 return cv;
391}
392
393INLINE void
394coro_times_update () 444coro_times_update (void)
395{ 445{
396#ifdef coro_clock_gettime 446#ifdef coro_clock_gettime
397 struct timespec ts; 447 struct timespec ts;
398 448
399 ts.tv_sec = ts.tv_nsec = 0; 449 ts.tv_sec = ts.tv_nsec = 0;
… …
402 452
403 ts.tv_sec = ts.tv_nsec = 0; 453 ts.tv_sec = ts.tv_nsec = 0;
404 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts); 454 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
405 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec; 455 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
406#else 456#else
457 dTHX;
407 UV tv[2]; 458 UV tv[2];
408 459
409 u2time (aTHX_ &tv); 460 u2time (aTHX_ tv);
410 time_real [0] = tv [0]; 461 time_real [0] = tv [0];
411 time_real [1] = tv [1] * 1000; 462 time_real [1] = tv [1] * 1000;
412#endif 463#endif
413} 464}
414 465
415INLINE void 466ecb_inline void
416coro_times_add (struct coro *c) 467coro_times_add (struct coro *c)
417{ 468{
418 c->t_real [1] += time_real [1]; 469 c->t_real [1] += time_real [1];
419 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 470 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
420 c->t_real [0] += time_real [0]; 471 c->t_real [0] += time_real [0];
… …
422 c->t_cpu [1] += time_cpu [1]; 473 c->t_cpu [1] += time_cpu [1];
423 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 474 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
424 c->t_cpu [0] += time_cpu [0]; 475 c->t_cpu [0] += time_cpu [0];
425} 476}
426 477
427INLINE void 478ecb_inline void
428coro_times_sub (struct coro *c) 479coro_times_sub (struct coro *c)
429{ 480{
430 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 481 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
431 c->t_real [1] -= time_real [1]; 482 c->t_real [1] -= time_real [1];
432 c->t_real [0] -= time_real [0]; 483 c->t_real [0] -= time_real [0];
… …
440/* magic glue */ 491/* magic glue */
441 492
442#define CORO_MAGIC_type_cv 26 493#define CORO_MAGIC_type_cv 26
443#define CORO_MAGIC_type_state PERL_MAGIC_ext 494#define CORO_MAGIC_type_state PERL_MAGIC_ext
444 495
445#define CORO_MAGIC_NN(sv, type) \ 496#define CORO_MAGIC_NN(sv, type) \
446 (expect_true (SvMAGIC (sv)->mg_type == type) \ 497 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
447 ? SvMAGIC (sv) \ 498 ? SvMAGIC (sv) \
448 : mg_find (sv, type)) 499 : mg_find (sv, type))
449 500
450#define CORO_MAGIC(sv, type) \ 501#define CORO_MAGIC(sv, type) \
451 (expect_true (SvMAGIC (sv)) \ 502 (ecb_expect_true (SvMAGIC (sv)) \
452 ? CORO_MAGIC_NN (sv, type) \ 503 ? CORO_MAGIC_NN (sv, type) \
453 : 0) 504 : 0)
454 505
455#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)
456#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)
457 508
458INLINE struct coro * 509ecb_inline MAGIC *
459SvSTATE_ (pTHX_ SV *coro) 510SvSTATEhv_p (pTHX_ SV *coro)
460{ 511{
461 HV *stash;
462 MAGIC *mg; 512 MAGIC *mg;
463 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
464 if (SvROK (coro)) 529 if (SvROK (coro_sv))
465 coro = SvRV (coro); 530 coro_sv = SvRV (coro_sv);
466 531
467 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 532 mg = SvSTATEhv_p (aTHX_ coro_sv);
533 if (!mg)
468 croak ("Coro::State object required"); 534 croak ("Coro::State object required");
469 535
470 stash = SvSTASH (coro);
471 if (expect_false (stash != coro_stash && stash != coro_state_stash))
472 {
473 /* very slow, but rare, check */
474 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
475 croak ("Coro::State object required");
476 }
477
478 mg = CORO_MAGIC_state (coro);
479 return (struct coro *)mg->mg_ptr; 536 return (struct coro *)mg->mg_ptr;
480} 537}
481 538
482#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 539#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
483 540
… …
486#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 543#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
487 544
488/*****************************************************************************/ 545/*****************************************************************************/
489/* padlist management and caching */ 546/* padlist management and caching */
490 547
491static AV * 548ecb_inline PADLIST *
492coro_derive_padlist (pTHX_ CV *cv) 549coro_derive_padlist (pTHX_ CV *cv)
493{ 550{
494 AV *padlist = CvPADLIST (cv); 551 PADLIST *padlist = CvPADLIST (cv);
495 AV *newpadlist, *newpad; 552 PADLIST *newpadlist;
553 PADNAMELIST *padnames;
554 PAD *newpad;
555 PADOFFSET off = PadlistMAX (padlist) + 1;
496 556
497 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. */
498 AvREAL_off (newpadlist); 585 AvREAL_off (newpadlist);
499#if PERL_VERSION_ATLEAST (5,10,0)
500 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
501#else
502 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
503#endif 586#endif
504 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
505 --AvFILLp (padlist);
506 587
507 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 588 /* Already extended to 2 elements by newPADLIST. */
508 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;
509 596
510 return newpadlist; 597 return newpadlist;
511} 598}
512 599
513static void 600ecb_inline void
514free_padlist (pTHX_ AV *padlist) 601free_padlist (pTHX_ PADLIST *padlist)
515{ 602{
516 /* may be during global destruction */ 603 /* may be during global destruction */
517 if (!IN_DESTRUCT) 604 if (!IN_DESTRUCT)
518 { 605 {
519 I32 i = AvFILLp (padlist); 606 I32 i = PadlistMAX (padlist);
520 607
521 while (i > 0) /* special-case index 0 */ 608 while (i > 0) /* special-case index 0 */
522 { 609 {
523 /* we try to be extra-careful here */ 610 /* we try to be extra-careful here */
524 AV *av = (AV *)AvARRAY (padlist)[i--]; 611 PAD *pad = PadlistARRAY (padlist)[i--];
525 I32 j = AvFILLp (av);
526 612
613 if (pad)
614 {
615 I32 j = PadMAX (pad);
616
527 while (j >= 0) 617 while (j >= 0)
528 SvREFCNT_dec (AvARRAY (av)[j--]); 618 SvREFCNT_dec (PadARRAY (pad)[j--]);
529 619
530 AvFILLp (av) = -1; 620 PadMAX (pad) = -1;
531 SvREFCNT_dec (av); 621 SvREFCNT_dec (pad);
622 }
532 } 623 }
533 624
534 SvREFCNT_dec (AvARRAY (padlist)[0]); 625 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
535 626
627#if NEWPADAPI
628 Safefree (PadlistARRAY (padlist));
629 Safefree (padlist);
630#else
536 AvFILLp (padlist) = -1; 631 AvFILLp (padlist) = -1;
632 AvREAL_off (padlist);
537 SvREFCNT_dec ((SV*)padlist); 633 SvREFCNT_dec ((SV*)padlist);
634#endif
538 } 635 }
539} 636}
540 637
541static int 638static int
542coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 639coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
543{ 640{
544 AV *padlist; 641 PADLIST *padlist;
545 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;
546 644
547 /* perl manages to free our internal AV and _then_ call us */ 645 /* perl manages to free our internal AV and _then_ call us */
548 if (IN_DESTRUCT) 646 if (IN_DESTRUCT)
549 return; 647 return 0;
550 648
551 /* casting is fun. */ 649 while (len--)
552 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
553 free_padlist (aTHX_ padlist); 650 free_padlist (aTHX_ padlists[len]);
554
555 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
556 651
557 return 0; 652 return 0;
558} 653}
559 654
560static MGVTBL coro_cv_vtbl = { 655static MGVTBL coro_cv_vtbl = {
561 0, 0, 0, 0, 656 0, 0, 0, 0,
562 coro_cv_free 657 coro_cv_free
563}; 658};
564 659
565/* the next two functions merely cache the padlists */ 660/* the next two functions merely cache the padlists */
566static void 661ecb_inline void
567get_padlist (pTHX_ CV *cv) 662get_padlist (pTHX_ CV *cv)
568{ 663{
569 MAGIC *mg = CORO_MAGIC_cv (cv); 664 MAGIC *mg = CORO_MAGIC_cv (cv);
570 AV *av; 665 size_t *lenp;
571 666
572 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 667 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
573 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 668 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
574 else 669 else
575 { 670 {
576#if CORO_PREFER_PERL_FUNCTIONS 671#if CORO_PREFER_PERL_FUNCTIONS
577 /* this is probably cleaner? but also slower! */ 672 /* this is probably cleaner? but also slower! */
578 /* in practise, it seems to be less stable */ 673 /* in practise, it seems to be less stable */
… …
584 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 679 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
585#endif 680#endif
586 } 681 }
587} 682}
588 683
589static void 684ecb_inline void
590put_padlist (pTHX_ CV *cv) 685put_padlist (pTHX_ CV *cv)
591{ 686{
592 MAGIC *mg = CORO_MAGIC_cv (cv); 687 MAGIC *mg = CORO_MAGIC_cv (cv);
593 AV *av;
594 688
595 if (expect_false (!mg)) 689 if (ecb_expect_false (!mg))
690 {
596 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);
597 699
598 av = (AV *)mg->mg_obj; 700 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
599
600 if (expect_false (AvFILLp (av) >= AvMAX (av)))
601 av_extend (av, AvFILLp (av) + 1);
602
603 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
604} 701}
605 702
606/** 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))
607 773
608static void 774static void
609on_enterleave_call (pTHX_ SV *cb); 775on_enterleave_call (pTHX_ SV *cb);
610 776
611static void 777static void
… …
614 perl_slots *slot = c->slot; 780 perl_slots *slot = c->slot;
615 c->slot = 0; 781 c->slot = 0;
616 782
617 PL_mainstack = c->mainstack; 783 PL_mainstack = c->mainstack;
618 784
619 GvSV (PL_defgv) = slot->defsv; 785#if CORO_JIT
620 GvAV (PL_defgv) = slot->defav; 786 load_perl_slots (slot);
621 GvSV (PL_errgv) = slot->errsv; 787#else
622 GvSV (irsgv) = slot->irsgv;
623 GvHV (PL_hintgv) = slot->hinthv;
624
625 #define VAR(name,type) PL_ ## name = slot->name; 788 #define VARx(name,expr,type) expr = slot->name;
626 # include "state.h" 789 #include "state.h"
627 #undef VAR 790#endif
628 791
629 { 792 {
630 dSP; 793 dSP;
631 794
632 CV *cv; 795 CV *cv;
633 796
634 /* now do the ugly restore mess */ 797 /* now do the ugly restore mess */
635 while (expect_true (cv = (CV *)POPs)) 798 while (ecb_expect_true (cv = (CV *)POPs))
636 { 799 {
637 put_padlist (aTHX_ cv); /* mark this padlist as available */ 800 put_padlist (aTHX_ cv); /* mark this padlist as available */
638 CvDEPTH (cv) = PTR2IV (POPs); 801 CvDEPTH (cv) = PTR2IV (POPs);
639 CvPADLIST (cv) = (AV *)POPs; 802 CvPADLIST (cv) = (PADLIST *)POPs;
640 } 803 }
641 804
642 PUTBACK; 805 PUTBACK;
643 } 806 }
644 807
645 slf_frame = c->slf_frame; 808 slf_frame = c->slf_frame;
646 CORO_THROW = c->except; 809 CORO_THROW = c->except;
647 810
648 if (expect_false (enable_times)) 811 if (ecb_expect_false (enable_times))
649 { 812 {
650 if (expect_false (!times_valid)) 813 if (ecb_expect_false (!times_valid))
651 coro_times_update (); 814 coro_times_update ();
652 815
653 coro_times_sub (c); 816 coro_times_sub (c);
654 } 817 }
655 818
656 if (expect_false (c->on_enter)) 819 if (ecb_expect_false (c->on_enter))
657 { 820 {
658 int i; 821 int i;
659 822
660 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 823 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
661 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 824 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
662 } 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);
663} 836}
664 837
665static void 838static void
666save_perl (pTHX_ Coro__State c) 839save_perl (pTHX_ Coro__State c)
667{ 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
668 if (expect_false (c->on_leave)) 851 if (ecb_expect_false (c->on_leave))
669 { 852 {
670 int i; 853 int i;
671 854
672 for (i = AvFILLp (c->on_leave); i >= 0; --i) 855 for (i = AvFILLp (c->on_leave); i >= 0; --i)
673 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 856 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
674 } 857 }
675 858
676 times_valid = 0; 859 times_valid = 0;
677 860
678 if (expect_false (enable_times)) 861 if (ecb_expect_false (enable_times))
679 { 862 {
680 coro_times_update (); times_valid = 1; 863 coro_times_update (); times_valid = 1;
681 coro_times_add (c); 864 coro_times_add (c);
682 } 865 }
683 866
… …
697 880
698 XPUSHs (Nullsv); 881 XPUSHs (Nullsv);
699 /* this loop was inspired by pp_caller */ 882 /* this loop was inspired by pp_caller */
700 for (;;) 883 for (;;)
701 { 884 {
702 while (expect_true (cxix >= 0)) 885 while (ecb_expect_true (cxix >= 0))
703 { 886 {
704 PERL_CONTEXT *cx = &ccstk[cxix--]; 887 PERL_CONTEXT *cx = &ccstk[cxix--];
705 888
706 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))
707 { 890 {
708 CV *cv = cx->blk_sub.cv; 891 CV *cv = cx->blk_sub.cv;
709 892
710 if (expect_true (CvDEPTH (cv))) 893 if (ecb_expect_true (CvDEPTH (cv)))
711 { 894 {
712 EXTEND (SP, 3); 895 EXTEND (SP, 3);
713 PUSHs ((SV *)CvPADLIST (cv)); 896 PUSHs ((SV *)CvPADLIST (cv));
714 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 897 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
715 PUSHs ((SV *)cv); 898 PUSHs ((SV *)cv);
… …
718 get_padlist (aTHX_ cv); 901 get_padlist (aTHX_ cv);
719 } 902 }
720 } 903 }
721 } 904 }
722 905
723 if (expect_true (top_si->si_type == PERLSI_MAIN)) 906 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
724 break; 907 break;
725 908
726 top_si = top_si->si_prev; 909 top_si = top_si->si_prev;
727 ccstk = top_si->si_cxstack; 910 ccstk = top_si->si_cxstack;
728 cxix = top_si->si_cxix; 911 cxix = top_si->si_cxix;
… …
730 913
731 PUTBACK; 914 PUTBACK;
732 } 915 }
733 916
734 /* allocate some space on the context stack for our purposes */ 917 /* allocate some space on the context stack for our purposes */
735 /* we manually unroll here, as usually 2 slots is enough */ 918 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
736 if (SLOT_COUNT >= 1) CXINC;
737 if (SLOT_COUNT >= 2) CXINC;
738 if (SLOT_COUNT >= 3) CXINC;
739 { 919 {
740 int i; 920 unsigned int i;
921
741 for (i = 3; i < SLOT_COUNT; ++i) 922 for (i = 0; i < SLOT_COUNT; ++i)
742 CXINC; 923 CXINC;
743 } 924
744 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 925 cxstack_ix -= SLOT_COUNT; /* undo allocation */
926 }
745 927
746 c->mainstack = PL_mainstack; 928 c->mainstack = PL_mainstack;
747 929
748 { 930 {
749 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 931 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
750 932
751 slot->defav = GvAV (PL_defgv); 933#if CORO_JIT
752 slot->defsv = DEFSV; 934 save_perl_slots (slot);
753 slot->errsv = ERRSV; 935#else
754 slot->irsgv = GvSV (irsgv);
755 slot->hinthv = GvHV (PL_hintgv);
756
757 #define VAR(name,type) slot->name = PL_ ## name; 936 #define VARx(name,expr,type) slot->name = expr;
758 # include "state.h" 937 #include "state.h"
759 #undef VAR 938#endif
760 } 939 }
761} 940}
762 941
763/* 942/*
764 * allocate various perl stacks. This is almost an exact copy 943 * allocate various perl stacks. This is almost an exact copy
… …
770# define coro_init_stacks(thx) init_stacks () 949# define coro_init_stacks(thx) init_stacks ()
771#else 950#else
772static void 951static void
773coro_init_stacks (pTHX) 952coro_init_stacks (pTHX)
774{ 953{
775 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() */
776 PL_curstackinfo->si_type = PERLSI_MAIN; 955 PL_curstackinfo->si_type = PERLSI_MAIN;
777 PL_curstack = PL_curstackinfo->si_stack; 956 PL_curstack = PL_curstackinfo->si_stack;
778 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 957 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
779 958
780 PL_stack_base = AvARRAY(PL_curstack); 959 PL_stack_base = AvARRAY(PL_curstack);
… …
795#endif 974#endif
796 975
797 New(54,PL_scopestack,8,I32); 976 New(54,PL_scopestack,8,I32);
798 PL_scopestack_ix = 0; 977 PL_scopestack_ix = 0;
799 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
800 982
801 New(54,PL_savestack,24,ANY); 983 New(54,PL_savestack,24,ANY);
802 PL_savestack_ix = 0; 984 PL_savestack_ix = 0;
803 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
804 991
805#if !PERL_VERSION_ATLEAST (5,10,0) 992#if !PERL_VERSION_ATLEAST (5,10,0)
806 New(54,PL_retstack,4,OP*); 993 New(54,PL_retstack,4,OP*);
807 PL_retstack_ix = 0; 994 PL_retstack_ix = 0;
808 PL_retstack_max = 4; 995 PL_retstack_max = 4;
… …
832 } 1019 }
833 1020
834 Safefree (PL_tmps_stack); 1021 Safefree (PL_tmps_stack);
835 Safefree (PL_markstack); 1022 Safefree (PL_markstack);
836 Safefree (PL_scopestack); 1023 Safefree (PL_scopestack);
1024#if HAS_SCOPESTACK_NAME
1025 Safefree (PL_scopestack_name);
1026#endif
837 Safefree (PL_savestack); 1027 Safefree (PL_savestack);
838#if !PERL_VERSION_ATLEAST (5,10,0) 1028#if !PERL_VERSION_ATLEAST (5,10,0)
839 Safefree (PL_retstack); 1029 Safefree (PL_retstack);
840#endif 1030#endif
841} 1031}
… …
871 } 1061 }
872 1062
873 return rss; 1063 return rss;
874} 1064}
875 1065
876/** coroutine stack handling ************************************************/ 1066/** provide custom get/set/clear methods for %SIG elements ******************/
877
878static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
879static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
880static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
881 1067
882/* apparently < 5.8.8 */ 1068/* apparently < 5.8.8 */
883#ifndef MgPV_nolen_const 1069#ifndef MgPV_nolen_const
884#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1070#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
885 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1071 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
886 (const char*)(mg)->mg_ptr) 1072 (const char*)(mg)->mg_ptr)
887#endif 1073#endif
888 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
889/* 1103/*
890 * This overrides the default magic get method of %SIG elements. 1104 * This overrides the default magic get method of %SIG elements.
891 * 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
892 * 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),
893 * readback here. 1107 * we just provide our own readback here.
894 */ 1108 */
895static int 1109static int ecb_cold
896coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1110coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
897{ 1111{
898 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;
899 1115
900 if (*s == '_') 1116 SV *ssv;
901 {
902 SV **svp = 0;
903 1117
904 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
905 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
906
907 if (svp) 1118 if (!*svp)
908 { 1119 ssv = &PL_sv_undef;
909 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1120 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
910 return 0; 1121 ssv = sv_2mortal (newRV_inc (*svp));
911 } 1122 else
912 } 1123 ssv = *svp;
913 1124
914 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1125 sv_setsv (sv, ssv);
1126 return 0;
915} 1127}
916 1128
917static int 1129static int ecb_cold
918coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
919{ 1131{
920 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;
921 1135
922 if (*s == '_')
923 {
924 SV **svp = 0;
925
926 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
927 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
928
929 if (svp)
930 {
931 SV *old = *svp; 1136 SV *old = *svp;
932 *svp = 0; 1137 *svp = 0;
933 SvREFCNT_dec (old); 1138 SvREFCNT_dec (old);
934 return 0; 1139 return 0;
935 }
936 }
937
938 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
939} 1140}
940 1141
941static int 1142static int ecb_cold
942coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1143coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
943{ 1144{
944 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;
945 1148
946 if (*s == '_')
947 {
948 SV **svp = 0;
949
950 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
951 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
952
953 if (svp)
954 {
955 SV *old = *svp; 1149 SV *old = *svp;
956 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1150 *svp = SvOK (sv) ? newSVsv (sv) : 0;
957 SvREFCNT_dec (old); 1151 SvREFCNT_dec (old);
958 return 0; 1152 return 0;
959 }
960 }
961
962 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
963} 1153}
964 1154
965static void 1155static void
966prepare_nop (pTHX_ struct coro_transfer_args *ta) 1156prepare_nop (pTHX_ struct coro_transfer_args *ta)
967{ 1157{
… …
979slf_check_repeat (pTHX_ struct CoroSLF *frame) 1169slf_check_repeat (pTHX_ struct CoroSLF *frame)
980{ 1170{
981 return 1; 1171 return 1;
982} 1172}
983 1173
984static UNOP coro_setup_op; 1174/** coroutine stack handling ************************************************/
985 1175
986static 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 */
987coro_setup (pTHX_ struct coro *coro) 1179init_perl (pTHX_ struct coro *coro)
988{ 1180{
989 /* 1181 /*
990 * emulate part of the perl startup here. 1182 * emulate part of the perl startup here.
991 */ 1183 */
992 coro_init_stacks (aTHX); 1184 coro_init_stacks (aTHX);
… …
999 PL_comppad_name_fill = 0; 1191 PL_comppad_name_fill = 0;
1000 PL_comppad_name_floor = 0; 1192 PL_comppad_name_floor = 0;
1001 PL_curpm = 0; 1193 PL_curpm = 0;
1002 PL_curpad = 0; 1194 PL_curpad = 0;
1003 PL_localizing = 0; 1195 PL_localizing = 0;
1004 PL_dirty = 0;
1005 PL_restartop = 0; 1196 PL_restartop = 0;
1006#if PERL_VERSION_ATLEAST (5,10,0) 1197#if PERL_VERSION_ATLEAST (5,10,0)
1007 PL_parser = 0; 1198 PL_parser = 0;
1008#endif 1199#endif
1009 PL_hints = 0; 1200 PL_hints = 0;
1010 1201
1011 /* recreate the die/warn hooks */ 1202 /* recreate the die/warn hooks */
1012 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1203 PL_diehook = SvREFCNT_inc (rv_diehook);
1013 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1204 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1014 1205
1015 GvSV (PL_defgv) = newSV (0); 1206 GvSV (PL_defgv) = newSV (0);
1016 GvAV (PL_defgv) = coro->args; coro->args = 0; 1207 GvAV (PL_defgv) = coro->args; coro->args = 0;
1017 GvSV (PL_errgv) = newSV (0); 1208 GvSV (PL_errgv) = newSV (0);
1018 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);
1019 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
1020 PL_rs = newSVsv (GvSV (irsgv)); 1214 PL_rs = newSVsv (GvSV (irsgv));
1021 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1215 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1022 1216
1023 { 1217 {
1024 dSP; 1218 dSP;
… …
1039 /* 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
1040 * 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.
1041 */ 1235 */
1042 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 */
1043 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;
1044 1239
1045 /* 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 */
1046 coro_setup_op.op_next = PL_op; 1241 init_perl_op.op_next = PL_op;
1047 coro_setup_op.op_type = OP_ENTERSUB; 1242 init_perl_op.op_type = OP_ENTERSUB;
1048 coro_setup_op.op_ppaddr = pp_slf; 1243 init_perl_op.op_ppaddr = pp_slf;
1049 /* 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 */
1050 1245
1051 PL_op = (OP *)&coro_setup_op; 1246 PL_op = (OP *)&init_perl_op;
1052 1247
1053 /* copy throw, in case it was set before coro_setup */ 1248 /* copy throw, in case it was set before init_perl */
1054 CORO_THROW = coro->except; 1249 CORO_THROW = coro->except;
1055 1250
1251 SWAP_SVS_ENTER (coro);
1252
1056 if (expect_false (enable_times)) 1253 if (ecb_expect_false (enable_times))
1057 { 1254 {
1058 coro_times_update (); 1255 coro_times_update ();
1059 coro_times_sub (coro); 1256 coro_times_sub (coro);
1060 } 1257 }
1061} 1258}
… …
1080 dounwind (-1); 1277 dounwind (-1);
1081 } 1278 }
1082} 1279}
1083 1280
1084static void 1281static void
1085coro_destruct_perl (pTHX_ struct coro *coro) 1282destroy_perl (pTHX_ struct coro *coro)
1086{ 1283{
1087 SV *svf [9]; 1284 SV *svf [9];
1088 1285
1089 { 1286 {
1287 SV *old_current = SvRV (coro_current);
1090 struct coro *current = SvSTATE_current; 1288 struct coro *current = SvSTATE (old_current);
1091 1289
1092 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));
1093 1291
1094 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
1095 load_perl (aTHX_ coro); 1297 load_perl (aTHX_ coro);
1096 1298
1299 /* restore swapped sv's */
1300 SWAP_SVS_LEAVE (coro);
1301
1097 coro_unwind_stacks (aTHX); 1302 coro_unwind_stacks (aTHX);
1303
1098 coro_destruct_stacks (aTHX); 1304 coro_destruct_stacks (aTHX);
1099 1305
1100 // now save some sv's to be free'd later 1306 /* now save some sv's to be free'd later */
1101 svf [0] = GvSV (PL_defgv); 1307 svf [0] = GvSV (PL_defgv);
1102 svf [1] = (SV *)GvAV (PL_defgv); 1308 svf [1] = (SV *)GvAV (PL_defgv);
1103 svf [2] = GvSV (PL_errgv); 1309 svf [2] = GvSV (PL_errgv);
1104 svf [3] = (SV *)PL_defoutgv; 1310 svf [3] = (SV *)PL_defoutgv;
1105 svf [4] = PL_rs; 1311 svf [4] = PL_rs;
… …
1107 svf [6] = (SV *)GvHV (PL_hintgv); 1313 svf [6] = (SV *)GvHV (PL_hintgv);
1108 svf [7] = PL_diehook; 1314 svf [7] = PL_diehook;
1109 svf [8] = PL_warnhook; 1315 svf [8] = PL_warnhook;
1110 assert (9 == sizeof (svf) / sizeof (*svf)); 1316 assert (9 == sizeof (svf) / sizeof (*svf));
1111 1317
1318 SvRV_set (coro_current, old_current);
1319
1112 load_perl (aTHX_ current); 1320 load_perl (aTHX_ current);
1113 } 1321 }
1114 1322
1115 { 1323 {
1116 int i; 1324 unsigned int i;
1117 1325
1118 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1326 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1119 SvREFCNT_dec (svf [i]); 1327 SvREFCNT_dec (svf [i]);
1120 1328
1121 SvREFCNT_dec (coro->saved_deffh); 1329 SvREFCNT_dec (coro->saved_deffh);
1122 SvREFCNT_dec (coro->rouse_cb); 1330 SvREFCNT_dec (coro->rouse_cb);
1123 SvREFCNT_dec (coro->invoke_cb); 1331 SvREFCNT_dec (coro->invoke_cb);
1124 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);
1125 } 1335 }
1126} 1336}
1127 1337
1128INLINE void 1338ecb_inline void
1129free_coro_mortal (pTHX) 1339free_coro_mortal (pTHX)
1130{ 1340{
1131 if (expect_true (coro_mortal)) 1341 if (ecb_expect_true (coro_mortal))
1132 { 1342 {
1133 SvREFCNT_dec (coro_mortal); 1343 SvREFCNT_dec ((SV *)coro_mortal);
1134 coro_mortal = 0; 1344 coro_mortal = 0;
1135 } 1345 }
1136} 1346}
1137 1347
1138static int 1348static int
… …
1192 1402
1193 if (PL_curcop != &PL_compiling) 1403 if (PL_curcop != &PL_compiling)
1194 { 1404 {
1195 SV **cb; 1405 SV **cb;
1196 1406
1197 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1407 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1198 { 1408 {
1199 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1409 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1200 1410
1201 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1411 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1202 { 1412 {
… …
1212 SAVETMPS; 1422 SAVETMPS;
1213 EXTEND (SP, 3); 1423 EXTEND (SP, 3);
1214 PUSHMARK (SP); 1424 PUSHMARK (SP);
1215 PUSHs (&PL_sv_yes); 1425 PUSHs (&PL_sv_yes);
1216 PUSHs (fullname); 1426 PUSHs (fullname);
1217 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);
1218 PUTBACK; 1428 PUTBACK;
1219 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);
1220 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);
1221 SPAGAIN; 1431 SPAGAIN;
1222 FREETMPS; 1432 FREETMPS;
… …
1271 1481
1272 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 */
1273} 1483}
1274 1484
1275/* 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 */
1276static void NOINLINE 1486static void ecb_noinline
1277cctx_prepare (pTHX) 1487cctx_prepare (pTHX)
1278{ 1488{
1279 PL_top_env = &PL_start_env; 1489 PL_top_env = &PL_start_env;
1280 1490
1281 if (cctx_current->flags & CC_TRACE) 1491 if (cctx_current->flags & CC_TRACE)
… …
1292 slf_frame.prepare = slf_prepare_set_stacklevel; 1502 slf_frame.prepare = slf_prepare_set_stacklevel;
1293 slf_frame.check = slf_check_set_stacklevel; 1503 slf_frame.check = slf_check_set_stacklevel;
1294} 1504}
1295 1505
1296/* 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 */
1297INLINE void 1507ecb_inline void
1298transfer_tail (pTHX) 1508transfer_tail (pTHX)
1299{ 1509{
1300 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);
1301} 1523}
1302 1524
1303/* 1525/*
1304 * this is a _very_ stripped down perl interpreter ;) 1526 * this is a _very_ stripped down perl interpreter ;)
1305 */ 1527 */
… …
1327 /* 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 */
1328 PL_restartop = PL_op; 1550 PL_restartop = PL_op;
1329 perl_run (PL_curinterp); 1551 perl_run (PL_curinterp);
1330 /* 1552 /*
1331 * 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
1332 * 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.
1333 */ 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;
1334 1564
1335 /* 1565 /*
1336 * 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
1337 * 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)
1338 * 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
1339 * bootstrap-time "top" top_env, as we cannot restore the "main" 1569 * doing in that case. YMMV.
1340 * coroutine as Coro has no such concept.
1341 * This actually isn't valid with the pthread backend, but OSes requiring
1342 * that backend are too broken to do it in a standards-compliant way.
1343 */ 1570 */
1344 PL_top_env = main_top_env; 1571 perlish_exit (aTHX);
1345 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1346 } 1572 }
1347} 1573}
1348 1574
1349static coro_cctx * 1575static coro_cctx *
1350cctx_new () 1576cctx_new (void)
1351{ 1577{
1352 coro_cctx *cctx; 1578 coro_cctx *cctx;
1353 1579
1354 ++cctx_count; 1580 ++cctx_count;
1355 New (0, cctx, 1, coro_cctx); 1581 New (0, cctx, 1, coro_cctx);
… …
1361 return cctx; 1587 return cctx;
1362} 1588}
1363 1589
1364/* create a new cctx only suitable as source */ 1590/* create a new cctx only suitable as source */
1365static coro_cctx * 1591static coro_cctx *
1366cctx_new_empty () 1592cctx_new_empty (void)
1367{ 1593{
1368 coro_cctx *cctx = cctx_new (); 1594 coro_cctx *cctx = cctx_new ();
1369 1595
1370 cctx->sptr = 0; 1596 cctx->stack.sptr = 0;
1371 coro_create (&cctx->cctx, 0, 0, 0, 0); 1597 coro_create (&cctx->cctx, 0, 0, 0, 0);
1372 1598
1373 return cctx; 1599 return cctx;
1374} 1600}
1375 1601
1376/* create a new cctx suitable as destination/running a perl interpreter */ 1602/* create a new cctx suitable as destination/running a perl interpreter */
1377static coro_cctx * 1603static coro_cctx *
1378cctx_new_run () 1604cctx_new_run (void)
1379{ 1605{
1380 coro_cctx *cctx = cctx_new (); 1606 coro_cctx *cctx = cctx_new ();
1381 void *stack_start;
1382 size_t stack_size;
1383 1607
1384#if HAVE_MMAP 1608 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1385 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1386 /* mmap supposedly does allocate-on-write for us */
1387 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1388
1389 if (cctx->sptr != (void *)-1)
1390 {
1391 #if CORO_STACKGUARD
1392 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1393 #endif
1394 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1395 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1396 cctx->flags |= CC_MAPPED;
1397 } 1609 {
1398 else
1399#endif
1400 {
1401 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1402 New (0, cctx->sptr, cctx_stacksize, long);
1403
1404 if (!cctx->sptr)
1405 {
1406 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1610 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1407 _exit (EXIT_FAILURE); 1611 _exit (EXIT_FAILURE);
1408 }
1409
1410 stack_start = cctx->sptr;
1411 stack_size = cctx->ssize;
1412 } 1612 }
1413 1613
1414 #if CORO_USE_VALGRIND
1415 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1416 #endif
1417
1418 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);
1419 1615
1420 return cctx; 1616 return cctx;
1421} 1617}
1422 1618
1423static void 1619static void
1424cctx_destroy (coro_cctx *cctx) 1620cctx_destroy (coro_cctx *cctx)
1425{ 1621{
1426 if (!cctx) 1622 if (!cctx)
1427 return; 1623 return;
1428 1624
1429 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1625 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1430 1626
1431 --cctx_count; 1627 --cctx_count;
1432 coro_destroy (&cctx->cctx); 1628 coro_destroy (&cctx->cctx);
1433 1629
1434 /* coro_transfer creates new, empty cctx's */ 1630 coro_stack_free (&cctx->stack);
1435 if (cctx->sptr)
1436 {
1437 #if CORO_USE_VALGRIND
1438 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1439 #endif
1440
1441#if HAVE_MMAP
1442 if (cctx->flags & CC_MAPPED)
1443 munmap (cctx->sptr, cctx->ssize);
1444 else
1445#endif
1446 Safefree (cctx->sptr);
1447 }
1448 1631
1449 Safefree (cctx); 1632 Safefree (cctx);
1450} 1633}
1451 1634
1452/* wether this cctx should be destructed */ 1635/* wether this cctx should be destructed */
1453#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))
1454 1637
1455static coro_cctx * 1638static coro_cctx *
1456cctx_get (pTHX) 1639cctx_get (pTHX)
1457{ 1640{
1458 while (expect_true (cctx_first)) 1641 while (ecb_expect_true (cctx_first))
1459 { 1642 {
1460 coro_cctx *cctx = cctx_first; 1643 coro_cctx *cctx = cctx_first;
1461 cctx_first = cctx->next; 1644 cctx_first = cctx->next;
1462 --cctx_idle; 1645 --cctx_idle;
1463 1646
1464 if (expect_true (!CCTX_EXPIRED (cctx))) 1647 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1465 return cctx; 1648 return cctx;
1466 1649
1467 cctx_destroy (cctx); 1650 cctx_destroy (cctx);
1468 } 1651 }
1469 1652
… …
1471} 1654}
1472 1655
1473static void 1656static void
1474cctx_put (coro_cctx *cctx) 1657cctx_put (coro_cctx *cctx)
1475{ 1658{
1476 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));
1477 1660
1478 /* free another cctx if overlimit */ 1661 /* free another cctx if overlimit */
1479 if (expect_false (cctx_idle >= cctx_max_idle)) 1662 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1480 { 1663 {
1481 coro_cctx *first = cctx_first; 1664 coro_cctx *first = cctx_first;
1482 cctx_first = first->next; 1665 cctx_first = first->next;
1483 --cctx_idle; 1666 --cctx_idle;
1484 1667
… …
1495static void 1678static void
1496transfer_check (pTHX_ struct coro *prev, struct coro *next) 1679transfer_check (pTHX_ struct coro *prev, struct coro *next)
1497{ 1680{
1498 /* TODO: throwing up here is considered harmful */ 1681 /* TODO: throwing up here is considered harmful */
1499 1682
1500 if (expect_true (prev != next)) 1683 if (ecb_expect_true (prev != next))
1501 { 1684 {
1502 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1685 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1503 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,");
1504 1687
1505 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1688 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1506 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,");
1507 1690
1508#if !PERL_VERSION_ATLEAST (5,10,0) 1691#if !PERL_VERSION_ATLEAST (5,10,0)
1509 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1692 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1510 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,");
1511#endif 1694#endif
1512 } 1695 }
1513} 1696}
1514 1697
1515/* always use the TRANSFER macro */ 1698/* always use the TRANSFER macro */
1516static void NOINLINE /* noinline so we have a fixed stackframe */ 1699static void ecb_noinline /* noinline so we have a fixed stackframe */
1517transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1700transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1518{ 1701{
1519 dSTACKLEVEL; 1702 dSTACKLEVEL;
1520 1703
1521 /* sometimes transfer is only called to set idle_sp */ 1704 /* sometimes transfer is only called to set idle_sp */
1522 if (expect_false (!prev)) 1705 if (ecb_expect_false (!prev))
1523 { 1706 {
1524 cctx_current->idle_sp = STACKLEVEL; 1707 cctx_current->idle_sp = STACKLEVEL;
1525 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 */
1526 } 1709 }
1527 else if (expect_true (prev != next)) 1710 else if (ecb_expect_true (prev != next))
1528 { 1711 {
1529 coro_cctx *cctx_prev; 1712 coro_cctx *cctx_prev;
1530 1713
1531 if (expect_false (prev->flags & CF_NEW)) 1714 if (ecb_expect_false (prev->flags & CF_NEW))
1532 { 1715 {
1533 /* create a new empty/source context */ 1716 /* create a new empty/source context */
1534 prev->flags &= ~CF_NEW; 1717 prev->flags &= ~CF_NEW;
1535 prev->flags |= CF_RUNNING; 1718 prev->flags |= CF_RUNNING;
1536 } 1719 }
… …
1539 next->flags |= CF_RUNNING; 1722 next->flags |= CF_RUNNING;
1540 1723
1541 /* first get rid of the old state */ 1724 /* first get rid of the old state */
1542 save_perl (aTHX_ prev); 1725 save_perl (aTHX_ prev);
1543 1726
1544 if (expect_false (next->flags & CF_NEW)) 1727 if (ecb_expect_false (next->flags & CF_NEW))
1545 { 1728 {
1546 /* need to start coroutine */ 1729 /* need to start coroutine */
1547 next->flags &= ~CF_NEW; 1730 next->flags &= ~CF_NEW;
1548 /* setup coroutine call */ 1731 /* setup coroutine call */
1549 coro_setup (aTHX_ next); 1732 init_perl (aTHX_ next);
1550 } 1733 }
1551 else 1734 else
1552 load_perl (aTHX_ next); 1735 load_perl (aTHX_ next);
1553 1736
1554 /* possibly untie and reuse the cctx */ 1737 /* possibly untie and reuse the cctx */
1555 if (expect_true ( 1738 if (ecb_expect_true (
1556 cctx_current->idle_sp == STACKLEVEL 1739 cctx_current->idle_sp == STACKLEVEL
1557 && !(cctx_current->flags & CC_TRACE) 1740 && !(cctx_current->flags & CC_TRACE)
1558 && !force_cctx 1741 && !force_cctx
1559 )) 1742 ))
1560 { 1743 {
1561 /* 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 */
1562 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));
1563 1746
1564 /* 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. */
1565 /* 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 */
1566 if (expect_false (CCTX_EXPIRED (cctx_current))) 1749 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1567 if (expect_true (!next->cctx)) 1750 if (ecb_expect_true (!next->cctx))
1568 next->cctx = cctx_get (aTHX); 1751 next->cctx = cctx_get (aTHX);
1569 1752
1570 cctx_put (cctx_current); 1753 cctx_put (cctx_current);
1571 } 1754 }
1572 else 1755 else
1573 prev->cctx = cctx_current; 1756 prev->cctx = cctx_current;
1574 1757
1575 ++next->usecount; 1758 ++next->usecount;
1576 1759
1577 cctx_prev = cctx_current; 1760 cctx_prev = cctx_current;
1578 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1761 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1579 1762
1580 next->cctx = 0; 1763 next->cctx = 0;
1581 1764
1582 if (expect_false (cctx_prev != cctx_current)) 1765 if (ecb_expect_false (cctx_prev != cctx_current))
1583 { 1766 {
1584 cctx_prev->top_env = PL_top_env; 1767 cctx_prev->top_env = PL_top_env;
1585 PL_top_env = cctx_current->top_env; 1768 PL_top_env = cctx_current->top_env;
1586 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1769 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1587 } 1770 }
… …
1593#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))
1594#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1777#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1595 1778
1596/** high level stuff ********************************************************/ 1779/** high level stuff ********************************************************/
1597 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 */
1598static int 1783static void
1784coro_call_on_destroy (pTHX_ struct coro *coro);
1785
1786static void
1599coro_state_destroy (pTHX_ struct coro *coro) 1787coro_state_destroy (pTHX_ struct coro *coro)
1600{ 1788{
1601 if (coro->flags & CF_DESTROYED) 1789 if (coro->flags & CF_ZOMBIE)
1602 return 0; 1790 return;
1603 1791
1604 if (coro->on_destroy && !PL_dirty)
1605 coro->on_destroy (aTHX_ coro); 1792 slf_destroy (aTHX_ coro);
1606 1793
1607 coro->flags |= CF_DESTROYED; 1794 coro->flags |= CF_ZOMBIE;
1608 1795
1609 if (coro->flags & CF_READY) 1796 if (coro->flags & CF_READY)
1610 { 1797 {
1611 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1798 /* reduce nready, as destroying a ready coro effectively unreadies it */
1612 /* alternative: look through all ready queues and remove the coro */ 1799 /* alternative: look through all ready queues and remove the coro */
1613 --coro_nready; 1800 --coro_nready;
1614 } 1801 }
1615 else 1802 else
1616 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;
1617 1808
1618 if (coro->mainstack 1809 if (coro->mainstack
1619 && coro->mainstack != main_mainstack 1810 && coro->mainstack != main_mainstack
1620 && coro->slot 1811 && coro->slot
1621 && !PL_dirty) 1812 && !PL_dirty)
1622 coro_destruct_perl (aTHX_ coro); 1813 destroy_perl (aTHX_ coro);
1623 1814
1624 cctx_destroy (coro->cctx); 1815 cctx_destroy (coro->cctx);
1625 SvREFCNT_dec (coro->startcv); 1816 SvREFCNT_dec (coro->startcv);
1626 SvREFCNT_dec (coro->args); 1817 SvREFCNT_dec (coro->args);
1818 SvREFCNT_dec (coro->swap_sv);
1627 SvREFCNT_dec (CORO_THROW); 1819 SvREFCNT_dec (CORO_THROW);
1628 1820
1629 if (coro->next) coro->next->prev = coro->prev; 1821 coro_call_on_destroy (aTHX_ coro);
1630 if (coro->prev) coro->prev->next = coro->next;
1631 if (coro == coro_first) coro_first = coro->next;
1632 1822
1633 return 1; 1823 /* more destruction mayhem in coro_state_free */
1634} 1824}
1635 1825
1636static int 1826static int
1637coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1827coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1638{ 1828{
1639 struct coro *coro = (struct coro *)mg->mg_ptr; 1829 struct coro *coro = (struct coro *)mg->mg_ptr;
1640 mg->mg_ptr = 0; 1830 mg->mg_ptr = 0;
1641 1831
1642 coro->hv = 0;
1643
1644 if (--coro->refcnt < 0)
1645 {
1646 coro_state_destroy (aTHX_ coro); 1832 coro_state_destroy (aTHX_ coro);
1833 SvREFCNT_dec (coro->on_destroy);
1834 SvREFCNT_dec (coro->status);
1835
1647 Safefree (coro); 1836 Safefree (coro);
1648 }
1649 1837
1650 return 0; 1838 return 0;
1651} 1839}
1652 1840
1653static int 1841static int ecb_cold
1654coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1842coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1655{ 1843{
1656 struct coro *coro = (struct coro *)mg->mg_ptr; 1844 /* called when perl clones the current process the slow way (windows process emulation) */
1657 1845 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1658 ++coro->refcnt; 1846 mg->mg_ptr = 0;
1847 mg->mg_virtual = 0;
1659 1848
1660 return 0; 1849 return 0;
1661} 1850}
1662 1851
1663static MGVTBL coro_state_vtbl = { 1852static MGVTBL coro_state_vtbl = {
… …
1686 1875
1687 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1876 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1688 TRANSFER (ta, 1); 1877 TRANSFER (ta, 1);
1689} 1878}
1690 1879
1691/*****************************************************************************/
1692/* gensub: simple closure generation utility */
1693
1694#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1695
1696/* create a closure from XS, returns a code reference */
1697/* the arg can be accessed via GENSUB_ARG from the callback */
1698/* the callback must use dXSARGS/XSRETURN */
1699static SV *
1700gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1701{
1702 CV *cv = (CV *)newSV (0);
1703
1704 sv_upgrade ((SV *)cv, SVt_PVCV);
1705
1706 CvANON_on (cv);
1707 CvISXSUB_on (cv);
1708 CvXSUB (cv) = xsub;
1709 GENSUB_ARG = arg;
1710
1711 return newRV_noinc ((SV *)cv);
1712}
1713
1714/** Coro ********************************************************************/ 1880/** Coro ********************************************************************/
1715 1881
1716INLINE void 1882ecb_inline void
1717coro_enq (pTHX_ struct coro *coro) 1883coro_enq (pTHX_ struct coro *coro)
1718{ 1884{
1719 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1885 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1720 1886
1721 SvREFCNT_inc_NN (coro->hv); 1887 SvREFCNT_inc_NN (coro->hv);
… …
1723 coro->next_ready = 0; 1889 coro->next_ready = 0;
1724 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1890 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1725 ready [1] = coro; 1891 ready [1] = coro;
1726} 1892}
1727 1893
1728INLINE struct coro * 1894ecb_inline struct coro *
1729coro_deq (pTHX) 1895coro_deq (pTHX)
1730{ 1896{
1731 int prio; 1897 int prio;
1732 1898
1733 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1899 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1743 } 1909 }
1744 1910
1745 return 0; 1911 return 0;
1746} 1912}
1747 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
1748static int 1931static int
1749api_ready (pTHX_ SV *coro_sv) 1932api_ready (pTHX_ SV *coro_sv)
1750{ 1933{
1751 struct coro *coro;
1752 SV *sv_hook;
1753 void (*xs_hook)(void);
1754
1755 coro = SvSTATE (coro_sv); 1934 struct coro *coro = SvSTATE (coro_sv);
1756 1935
1757 if (coro->flags & CF_READY) 1936 if (coro->flags & CF_READY)
1758 return 0; 1937 return 0;
1759 1938
1760 coro->flags |= CF_READY; 1939 coro->flags |= CF_READY;
1761 1940
1762 sv_hook = coro_nready ? 0 : coro_readyhook;
1763 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1764
1765 coro_enq (aTHX_ coro); 1941 coro_enq (aTHX_ coro);
1766 ++coro_nready;
1767 1942
1768 if (sv_hook) 1943 if (!coro_nready++)
1769 { 1944 if (coroapi.readyhook)
1770 dSP; 1945 coroapi.readyhook ();
1771
1772 ENTER;
1773 SAVETMPS;
1774
1775 PUSHMARK (SP);
1776 PUTBACK;
1777 call_sv (sv_hook, G_VOID | G_DISCARD);
1778
1779 FREETMPS;
1780 LEAVE;
1781 }
1782
1783 if (xs_hook)
1784 xs_hook ();
1785 1946
1786 return 1; 1947 return 1;
1787} 1948}
1788 1949
1789static int 1950static int
… …
1791{ 1952{
1792 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1953 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1793} 1954}
1794 1955
1795/* expects to own a reference to next->hv */ 1956/* expects to own a reference to next->hv */
1796INLINE void 1957ecb_inline void
1797prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1958prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1798{ 1959{
1799 SV *prev_sv = SvRV (coro_current); 1960 SV *prev_sv = SvRV (coro_current);
1800 1961
1801 ta->prev = SvSTATE_hv (prev_sv); 1962 ta->prev = SvSTATE_hv (prev_sv);
… …
1814{ 1975{
1815 for (;;) 1976 for (;;)
1816 { 1977 {
1817 struct coro *next = coro_deq (aTHX); 1978 struct coro *next = coro_deq (aTHX);
1818 1979
1819 if (expect_true (next)) 1980 if (ecb_expect_true (next))
1820 { 1981 {
1821 /* cannot transfer to destroyed coros, skip and look for next */ 1982 /* cannot transfer to destroyed coros, skip and look for next */
1822 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1983 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1823 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 */
1824 else 1985 else
1825 { 1986 {
1826 next->flags &= ~CF_READY; 1987 next->flags &= ~CF_READY;
1827 --coro_nready; 1988 --coro_nready;
… …
1834 { 1995 {
1835 /* nothing to schedule: call the idle handler */ 1996 /* nothing to schedule: call the idle handler */
1836 if (SvROK (sv_idle) 1997 if (SvROK (sv_idle)
1837 && SvOBJECT (SvRV (sv_idle))) 1998 && SvOBJECT (SvRV (sv_idle)))
1838 { 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
1839 ++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 */
1840 api_ready (aTHX_ SvRV (sv_idle)); 2021 api_ready (aTHX_ SvRV (sv_idle));
1841 --coro_nready; 2022 --coro_nready;
1842 } 2023 }
1843 else 2024 else
1844 { 2025 {
2026 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1845 dSP; 2027 dSP;
1846 2028
1847 ENTER; 2029 ENTER;
1848 SAVETMPS; 2030 SAVETMPS;
1849 2031
… …
1856 } 2038 }
1857 } 2039 }
1858 } 2040 }
1859} 2041}
1860 2042
1861INLINE void 2043ecb_inline void
1862prepare_cede (pTHX_ struct coro_transfer_args *ta) 2044prepare_cede (pTHX_ struct coro_transfer_args *ta)
1863{ 2045{
1864 api_ready (aTHX_ coro_current); 2046 api_ready (aTHX_ coro_current);
1865 prepare_schedule (aTHX_ ta); 2047 prepare_schedule (aTHX_ ta);
1866} 2048}
1867 2049
1868INLINE void 2050ecb_inline void
1869prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2051prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1870{ 2052{
1871 SV *prev = SvRV (coro_current); 2053 SV *prev = SvRV (coro_current);
1872 2054
1873 if (coro_nready) 2055 if (coro_nready)
… …
1903{ 2085{
1904 struct coro_transfer_args ta; 2086 struct coro_transfer_args ta;
1905 2087
1906 prepare_cede (aTHX_ &ta); 2088 prepare_cede (aTHX_ &ta);
1907 2089
1908 if (expect_true (ta.prev != ta.next)) 2090 if (ecb_expect_true (ta.prev != ta.next))
1909 { 2091 {
1910 TRANSFER (ta, 1); 2092 TRANSFER (ta, 1);
1911 return 1; 2093 return 1;
1912 } 2094 }
1913 else 2095 else
… …
1956 coro->slot->runops = RUNOPS_DEFAULT; 2138 coro->slot->runops = RUNOPS_DEFAULT;
1957 } 2139 }
1958} 2140}
1959 2141
1960static 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
1961coro_call_on_destroy (pTHX_ struct coro *coro) 2219coro_call_on_destroy (pTHX_ struct coro *coro)
1962{ 2220{
1963 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2221 AV *od = coro->on_destroy;
1964 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1965 2222
1966 if (on_destroyp) 2223 if (!od)
1967 { 2224 return;
1968 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1969 2225
2226 coro->on_destroy = 0;
2227 sv_2mortal ((SV *)od);
2228
1970 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
1971 { 2237 {
1972 dSP; /* don't disturb outer sp */ 2238 dSP; /* don't disturb outer sp */
1973 SV *cb = av_pop (on_destroy);
1974
1975 PUSHMARK (SP); 2239 PUSHMARK (SP);
1976 2240
1977 if (statusp) 2241 if (coro->status)
1978 { 2242 {
1979 int i; 2243 PUTBACK;
1980 AV *status = (AV *)SvRV (*statusp); 2244 coro_push_av (aTHX_ coro->status, G_ARRAY);
1981 EXTEND (SP, AvFILLp (status) + 1); 2245 SPAGAIN;
1982
1983 for (i = 0; i <= AvFILLp (status); ++i)
1984 PUSHs (AvARRAY (status)[i]);
1985 } 2246 }
1986 2247
1987 PUTBACK; 2248 PUTBACK;
1988 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2249 call_sv (cb, G_VOID | G_DISCARD);
1989 } 2250 }
1990 } 2251 }
1991} 2252}
1992 2253
1993static void 2254static void
1994slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2255coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1995{ 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 {
1996 int i; 2270 int i;
1997 HV *hv = (HV *)SvRV (coro_current);
1998 AV *av = newAV ();
1999 2271
2000 av_extend (av, items - 1); 2272 av_extend (av, items - 1);
2273
2001 for (i = 0; i < items; ++i) 2274 for (i = 0; i < items; ++i)
2002 av_push (av, SvREFCNT_inc_NN (arg [i])); 2275 av_push (av, SvREFCNT_inc_NN (arg [i]));
2276 }
2277}
2003 2278
2004 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2279static void
2005 2280slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2281{
2006 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 */
2007 api_ready (aTHX_ sv_manager); 2283 api_ready (aTHX_ sv_manager);
2008 2284
2009 frame->prepare = prepare_schedule; 2285 frame->prepare = prepare_schedule;
2010 frame->check = slf_check_repeat; 2286 frame->check = slf_check_repeat;
2011 2287
2012 /* as a minor optimisation, we could unwind all stacks here */ 2288 /* as a minor optimisation, we could unwind all stacks here */
2013 /* 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 */
2014 /*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 | CF_ZOMBIE))
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;
2015} 2397}
2016 2398
2017/*****************************************************************************/ 2399/*****************************************************************************/
2018/* async pool handler */ 2400/* async pool handler */
2019 2401
… …
2050slf_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)
2051{ 2433{
2052 HV *hv = (HV *)SvRV (coro_current); 2434 HV *hv = (HV *)SvRV (coro_current);
2053 struct coro *coro = SvSTATE_hv ((SV *)hv); 2435 struct coro *coro = SvSTATE_hv ((SV *)hv);
2054 2436
2055 if (expect_true (coro->saved_deffh)) 2437 if (ecb_expect_true (coro->saved_deffh))
2056 { 2438 {
2057 /* subsequent iteration */ 2439 /* subsequent iteration */
2058 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2440 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2059 coro->saved_deffh = 0; 2441 coro->saved_deffh = 0;
2060 2442
2061 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2443 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2062 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2444 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2063 { 2445 {
2064 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2446 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2065 coro->invoke_av = newAV (); 2447 return;
2066
2067 frame->prepare = prepare_nop;
2068 } 2448 }
2069 else 2449 else
2070 { 2450 {
2071 av_clear (GvAV (PL_defgv)); 2451 av_clear (GvAV (PL_defgv));
2072 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);
2073 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
2074 coro->prio = 0; 2461 coro->prio = 0;
2075 2462
2076 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2463 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2077 api_trace (aTHX_ coro_current, 0); 2464 api_trace (aTHX_ coro_current, 0);
2078 2465
2079 frame->prepare = prepare_schedule; 2466 frame->prepare = prepare_schedule;
2080 av_push (av_async_pool, SvREFCNT_inc (hv)); 2467 av_push (av_async_pool, SvREFCNT_inc (hv));
2081 } 2468 }
… …
2097 2484
2098static void 2485static void
2099coro_rouse_callback (pTHX_ CV *cv) 2486coro_rouse_callback (pTHX_ CV *cv)
2100{ 2487{
2101 dXSARGS; 2488 dXSARGS;
2102 SV *data = (SV *)GENSUB_ARG; 2489 SV *data = (SV *)S_GENSUB_ARG;
2103 2490
2104 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2491 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2105 { 2492 {
2106 /* first call, set args */ 2493 /* first call, set args */
2107 SV *coro = SvRV (data); 2494 SV *coro = SvRV (data);
… …
2122 2509
2123static int 2510static int
2124slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2511slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2125{ 2512{
2126 SV *data = (SV *)frame->data; 2513 SV *data = (SV *)frame->data;
2127 2514
2128 if (CORO_THROW) 2515 if (CORO_THROW)
2129 return 0; 2516 return 0;
2130 2517
2131 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2518 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2132 return 1; 2519 return 1;
… …
2168 cb = sv_2mortal (coro->rouse_cb); 2555 cb = sv_2mortal (coro->rouse_cb);
2169 coro->rouse_cb = 0; 2556 coro->rouse_cb = 0;
2170 } 2557 }
2171 2558
2172 if (!SvROK (cb) 2559 if (!SvROK (cb)
2173 || SvTYPE (SvRV (cb)) != SVt_PVCV 2560 || SvTYPE (SvRV (cb)) != SVt_PVCV
2174 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2561 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2175 croak ("Coro::rouse_wait called with illegal callback argument,"); 2562 croak ("Coro::rouse_wait called with illegal callback argument,");
2176 2563
2177 { 2564 {
2178 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2565 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2179 SV *data = (SV *)GENSUB_ARG; 2566 SV *data = (SV *)S_GENSUB_ARG;
2180 2567
2181 frame->data = (void *)data; 2568 frame->data = (void *)data;
2182 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2569 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2183 frame->check = slf_check_rouse_wait; 2570 frame->check = slf_check_rouse_wait;
2184 } 2571 }
… …
2188coro_new_rouse_cb (pTHX) 2575coro_new_rouse_cb (pTHX)
2189{ 2576{
2190 HV *hv = (HV *)SvRV (coro_current); 2577 HV *hv = (HV *)SvRV (coro_current);
2191 struct coro *coro = SvSTATE_hv (hv); 2578 struct coro *coro = SvSTATE_hv (hv);
2192 SV *data = newRV_inc ((SV *)hv); 2579 SV *data = newRV_inc ((SV *)hv);
2193 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2580 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2194 2581
2195 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);
2196 SvREFCNT_dec (data); /* magicext increases the refcount */ 2583 SvREFCNT_dec (data); /* magicext increases the refcount */
2197 2584
2198 SvREFCNT_dec (coro->rouse_cb); 2585 SvREFCNT_dec (coro->rouse_cb);
… …
2295static void 2682static void
2296slf_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)
2297{ 2684{
2298 frame->prepare = prepare_cede_notself; 2685 frame->prepare = prepare_cede_notself;
2299 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);
2300} 2706}
2301 2707
2302/* 2708/*
2303 * these not obviously related functions are all rolled into one 2709 * these not obviously related functions are all rolled into one
2304 * 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
… …
2311 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 */
2312 2718
2313 /* 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 */
2314 /* the latter happens when a new coro has been started */ 2720 /* the latter happens when a new coro has been started */
2315 /* or when a new cctx was attached to an existing coroutine */ 2721 /* or when a new cctx was attached to an existing coroutine */
2316 if (expect_true (!slf_frame.prepare)) 2722 if (ecb_expect_true (!slf_frame.prepare))
2317 { 2723 {
2318 /* first iteration */ 2724 /* first iteration */
2319 dSP; 2725 dSP;
2320 SV **arg = PL_stack_base + TOPMARK + 1; 2726 SV **arg = PL_stack_base + TOPMARK + 1;
2321 int items = SP - arg; /* args without function object */ 2727 int items = SP - arg; /* args without function object */
… …
2362 while (slf_frame.check (aTHX_ &slf_frame)); 2768 while (slf_frame.check (aTHX_ &slf_frame));
2363 2769
2364 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 */
2365 2771
2366 /* exception handling */ 2772 /* exception handling */
2367 if (expect_false (CORO_THROW)) 2773 if (ecb_expect_false (CORO_THROW))
2368 { 2774 {
2369 SV *exception = sv_2mortal (CORO_THROW); 2775 SV *exception = sv_2mortal (CORO_THROW);
2370 2776
2371 CORO_THROW = 0; 2777 CORO_THROW = 0;
2372 sv_setsv (ERRSV, exception); 2778 sv_setsv (ERRSV, exception);
2373 croak (0); 2779 croak (0);
2374 } 2780 }
2375 2781
2376 /* return value handling - mostly like entersub */ 2782 /* return value handling - mostly like entersub */
2377 /* make sure we put something on the stack in scalar context */ 2783 /* make sure we put something on the stack in scalar context */
2378 if (GIMME_V == G_SCALAR) 2784 if (GIMME_V == G_SCALAR
2785 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2379 { 2786 {
2380 dSP; 2787 dSP;
2381 SV **bot = PL_stack_base + checkmark; 2788 SV **bot = PL_stack_base + checkmark;
2382 2789
2383 if (sp == bot) /* too few, push undef */ 2790 if (sp == bot) /* too few, push undef */
2384 bot [1] = &PL_sv_undef; 2791 bot [1] = &PL_sv_undef;
2385 else if (sp != bot + 1) /* too many, take last one */ 2792 else /* too many, take last one */
2386 bot [1] = *sp; 2793 bot [1] = *sp;
2387 2794
2388 SP = bot + 1; 2795 SP = bot + 1;
2389 2796
2390 PUTBACK; 2797 PUTBACK;
… …
2423 if (PL_op->op_flags & OPf_STACKED) 2830 if (PL_op->op_flags & OPf_STACKED)
2424 { 2831 {
2425 if (items > slf_arga) 2832 if (items > slf_arga)
2426 { 2833 {
2427 slf_arga = items; 2834 slf_arga = items;
2428 free (slf_argv); 2835 Safefree (slf_argv);
2429 slf_argv = malloc (slf_arga * sizeof (SV *)); 2836 New (0, slf_argv, slf_arga, SV *);
2430 } 2837 }
2431 2838
2432 slf_argc = items; 2839 slf_argc = items;
2433 2840
2434 for (i = 0; i < items; ++i) 2841 for (i = 0; i < items; ++i)
… …
2488{ 2895{
2489 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);
2490 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2897 on_enterleave_call (aTHX_ sv_2mortal (cb));
2491} 2898}
2492 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
2493/*****************************************************************************/ 2992/*****************************************************************************/
2494/* PerlIO::cede */ 2993/* PerlIO::cede */
2495 2994
2496typedef struct 2995typedef struct
2497{ 2996{
2498 PerlIOBuf base; 2997 PerlIOBuf base;
2499 NV next, every; 2998 NV next, every;
2500} PerlIOCede; 2999} PerlIOCede;
2501 3000
2502static IV 3001static IV ecb_cold
2503PerlIOCede_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)
2504{ 3003{
2505 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3004 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2506 3005
2507 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 3006 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2508 self->next = nvtime () + self->every; 3007 self->next = nvtime () + self->every;
2509 3008
2510 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 3009 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2511} 3010}
2512 3011
2513static SV * 3012static SV * ecb_cold
2514PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3013PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2515{ 3014{
2516 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3015 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2517 3016
2518 return newSVnv (self->every); 3017 return newSVnv (self->every);
… …
2625 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3124 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2626 PUTBACK; 3125 PUTBACK;
2627 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3126 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2628 } 3127 }
2629 3128
2630 SvREFCNT_dec (cb); 3129 SvREFCNT_dec_NN (cb);
2631 } 3130 }
2632} 3131}
2633 3132
2634static void 3133static void
2635coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3134coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2636{ 3135{
2637 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3136 /* call $sem->adjust (0) to possibly wake up some other waiters */
2638 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3137 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2639} 3138}
2640 3139
2641static int 3140static int
2642slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3141slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2643{ 3142{
2644 AV *av = (AV *)frame->data; 3143 AV *av = (AV *)frame->data;
2645 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;
2646 3148
2647 /* 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 */
2648 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
2649 return 0; 3155 return 0;
3156 }
2650 else if (SvIVX (count_sv) > 0) 3157 else if (SvIVX (count_sv) > 0)
2651 { 3158 {
2652 SvSTATE_current->on_destroy = 0;
2653
2654 if (acquire) 3159 if (acquire)
2655 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3160 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2656 else 3161 else
2657 coro_semaphore_adjust (aTHX_ av, 0); 3162 coro_semaphore_adjust (aTHX_ av, 0);
2658 3163
… …
2662 { 3167 {
2663 int i; 3168 int i;
2664 /* 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 */
2665 /* 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 */
2666 /* this avoids some degenerate memory usage cases */ 3171 /* this avoids some degenerate memory usage cases */
2667 3172 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2668 for (i = 1; i <= AvFILLp (av); ++i)
2669 if (AvARRAY (av)[i] == SvRV (coro_current)) 3173 if (AvARRAY (av)[i] == coro_hv)
2670 return 1; 3174 return 1;
2671 3175
2672 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3176 av_push (av, SvREFCNT_inc (coro_hv));
2673 return 1; 3177 return 1;
2674 } 3178 }
2675} 3179}
2676 3180
2677static int 3181static int
… …
2700 { 3204 {
2701 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3205 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2702 3206
2703 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3207 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2704 frame->prepare = prepare_schedule; 3208 frame->prepare = prepare_schedule;
2705
2706 /* to avoid race conditions when a woken-up coro gets terminated */ 3209 /* to avoid race conditions when a woken-up coro gets terminated */
2707 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3210 /* we arrange for a temporary on_destroy that calls adjust (0) */
2708 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3211 frame->destroy = coro_semaphore_destroy;
2709 } 3212 }
2710} 3213}
2711 3214
2712static void 3215static void
2713slf_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)
… …
2721{ 3224{
2722 if (items >= 2) 3225 if (items >= 2)
2723 { 3226 {
2724 /* callback form */ 3227 /* callback form */
2725 AV *av = (AV *)SvRV (arg [0]); 3228 AV *av = (AV *)SvRV (arg [0]);
2726 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3229 SV *cb_cv = s_get_cv_croak (arg [1]);
2727 3230
2728 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3231 av_push (av, SvREFCNT_inc_NN (cb_cv));
2729 3232
2730 if (SvIVX (AvARRAY (av)[0]) > 0) 3233 if (SvIVX (AvARRAY (av)[0]) > 0)
2731 coro_semaphore_adjust (aTHX_ av, 0); 3234 coro_semaphore_adjust (aTHX_ av, 0);
… …
2771 { 3274 {
2772 api_ready (aTHX_ cb); 3275 api_ready (aTHX_ cb);
2773 sv_setiv (cb, 0); /* signal waiter */ 3276 sv_setiv (cb, 0); /* signal waiter */
2774 } 3277 }
2775 3278
2776 SvREFCNT_dec (cb); 3279 SvREFCNT_dec_NN (cb);
2777 3280
2778 --count; 3281 --count;
2779 } 3282 }
2780} 3283}
2781 3284
… …
2791{ 3294{
2792 AV *av = (AV *)SvRV (arg [0]); 3295 AV *av = (AV *)SvRV (arg [0]);
2793 3296
2794 if (items >= 2) 3297 if (items >= 2)
2795 { 3298 {
2796 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3299 SV *cb_cv = s_get_cv_croak (arg [1]);
2797 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3300 av_push (av, SvREFCNT_inc_NN (cb_cv));
2798 3301
2799 if (SvIVX (AvARRAY (av)[0])) 3302 if (SvIVX (AvARRAY (av)[0]))
2800 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3303 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2801 3304
2802 frame->prepare = prepare_nop; 3305 frame->prepare = prepare_nop;
2803 frame->check = slf_check_nop; 3306 frame->check = slf_check_nop;
2804 } 3307 }
2805 else if (SvIVX (AvARRAY (av)[0])) 3308 else if (SvIVX (AvARRAY (av)[0]))
… …
2836 3339
2837static void 3340static void
2838coro_aio_callback (pTHX_ CV *cv) 3341coro_aio_callback (pTHX_ CV *cv)
2839{ 3342{
2840 dXSARGS; 3343 dXSARGS;
2841 AV *state = (AV *)GENSUB_ARG; 3344 AV *state = (AV *)S_GENSUB_ARG;
2842 SV *coro = av_pop (state); 3345 SV *coro = av_pop (state);
2843 SV *data_sv = newSV (sizeof (struct io_state)); 3346 SV *data_sv = newSV (sizeof (struct io_state));
2844 3347
2845 av_extend (state, items - 1); 3348 av_extend (state, items - 1);
2846 3349
… …
2866 } 3369 }
2867 3370
2868 av_push (state, data_sv); 3371 av_push (state, data_sv);
2869 3372
2870 api_ready (aTHX_ coro); 3373 api_ready (aTHX_ coro);
2871 SvREFCNT_dec (coro); 3374 SvREFCNT_dec_NN (coro);
2872 SvREFCNT_dec ((AV *)state); 3375 SvREFCNT_dec_NN ((AV *)state);
2873} 3376}
2874 3377
2875static int 3378static int
2876slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3379slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2877{ 3380{
… …
2882 /* it quickly returns */ 3385 /* it quickly returns */
2883 if (CORO_THROW) 3386 if (CORO_THROW)
2884 return 0; 3387 return 0;
2885 3388
2886 /* one element that is an RV? repeat! */ 3389 /* one element that is an RV? repeat! */
2887 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3390 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2888 return 1; 3391 return 1;
2889 3392
2890 /* restore status */ 3393 /* restore status */
2891 { 3394 {
2892 SV *data_sv = av_pop (state); 3395 SV *data_sv = av_pop (state);
… …
2895 errno = data->errorno; 3398 errno = data->errorno;
2896 PL_laststype = data->laststype; 3399 PL_laststype = data->laststype;
2897 PL_laststatval = data->laststatval; 3400 PL_laststatval = data->laststatval;
2898 PL_statcache = data->statcache; 3401 PL_statcache = data->statcache;
2899 3402
2900 SvREFCNT_dec (data_sv); 3403 SvREFCNT_dec_NN (data_sv);
2901 } 3404 }
2902 3405
2903 /* push result values */ 3406 /* push result values */
2904 { 3407 {
2905 dSP; 3408 dSP;
… …
2931 dSP; 3434 dSP;
2932 3435
2933 static SV *prio_cv; 3436 static SV *prio_cv;
2934 static SV *prio_sv; 3437 static SV *prio_sv;
2935 3438
2936 if (expect_false (!prio_cv)) 3439 if (ecb_expect_false (!prio_cv))
2937 { 3440 {
2938 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3441 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2939 prio_sv = newSViv (0); 3442 prio_sv = newSViv (0);
2940 } 3443 }
2941 3444
… …
2960 3463
2961 for (i = 0; i < items; ++i) 3464 for (i = 0; i < items; ++i)
2962 PUSHs (arg [i]); 3465 PUSHs (arg [i]);
2963 3466
2964 /* now push the callback closure */ 3467 /* now push the callback closure */
2965 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))));
2966 3469
2967 /* now call the AIO function - we assume our request is uncancelable */ 3470 /* now call the AIO function - we assume our request is uncancelable */
2968 PUTBACK; 3471 PUTBACK;
2969 call_sv ((SV *)req, G_VOID | G_DISCARD); 3472 call_sv ((SV *)req, G_VOID | G_DISCARD);
2970 } 3473 }
2971 3474
2972 /* 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 */
2973 frame->data = (void *)state; 3476 frame->data = (void *)state;
2974 frame->prepare = prepare_schedule; 3477 frame->prepare = prepare_schedule;
2975 frame->check = slf_check_aio_req; 3478 frame->check = slf_check_aio_req;
2976} 3479}
2977 3480
… …
2989 3492
2990#if CORO_CLONE 3493#if CORO_CLONE
2991# include "clone.c" 3494# include "clone.c"
2992#endif 3495#endif
2993 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
2994MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3625MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2995 3626
2996PROTOTYPES: DISABLE 3627PROTOTYPES: DISABLE
2997 3628
2998BOOT: 3629BOOT:
2999{ 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"
3000#ifdef USE_ITHREADS 3633#ifdef USE_ITHREADS
3001# if CORO_PTHREAD 3634# if CORO_PTHREAD
3002 coro_thx = PERL_GET_CONTEXT; 3635 coro_thx = PERL_GET_CONTEXT;
3003# endif 3636# endif
3004#endif 3637#endif
3005 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;
3006 3644
3007 cctx_current = cctx_new_empty (); 3645 cctx_current = cctx_new_empty ();
3008 3646
3009 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3647 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3010 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3648 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3011 3649
3012 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3650 {
3013 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3651 /*
3014 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 }
3015 3674
3016 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3017 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));
3018 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));
3019 3677
3020 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3678 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3021 3679
… …
3050 coroapi.prepare_nop = prepare_nop; 3708 coroapi.prepare_nop = prepare_nop;
3051 coroapi.prepare_schedule = prepare_schedule; 3709 coroapi.prepare_schedule = prepare_schedule;
3052 coroapi.prepare_cede = prepare_cede; 3710 coroapi.prepare_cede = prepare_cede;
3053 coroapi.prepare_cede_notself = prepare_cede_notself; 3711 coroapi.prepare_cede_notself = prepare_cede_notself;
3054 3712
3055 { 3713 time_init (aTHX);
3056 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3057
3058 if (!svp) croak ("Time::HiRes is required");
3059 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3060
3061 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3062
3063 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3064 u2time = INT2PTR (double (*)(), SvIV (*svp));
3065 }
3066 3714
3067 assert (("PRIO_NORMAL must be 0", !CORO_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
3068} 3721}
3069 3722
3070SV * 3723SV *
3071new (char *klass, ...) 3724new (SV *klass, ...)
3072 ALIAS: 3725 ALIAS:
3073 Coro::new = 1 3726 Coro::new = 1
3074 CODE: 3727 CODE:
3075{ 3728 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
3076 struct coro *coro; 3729 OUTPUT:
3077 MAGIC *mg;
3078 HV *hv;
3079 CV *cb;
3080 int i;
3081
3082 if (items > 1)
3083 {
3084 cb = coro_sv_2cv (aTHX_ ST (1));
3085
3086 if (!ix)
3087 {
3088 if (CvISXSUB (cb))
3089 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3090
3091 if (!CvROOT (cb))
3092 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3093 }
3094 }
3095
3096 Newz (0, coro, 1, struct coro);
3097 coro->args = newAV ();
3098 coro->flags = CF_NEW;
3099
3100 if (coro_first) coro_first->prev = coro;
3101 coro->next = coro_first;
3102 coro_first = coro;
3103
3104 coro->hv = hv = newHV ();
3105 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3106 mg->mg_flags |= MGf_DUP;
3107 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3108
3109 if (items > 1)
3110 {
3111 av_extend (coro->args, items - 1 + ix - 1);
3112
3113 if (ix)
3114 {
3115 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3116 cb = cv_coro_run;
3117 }
3118
3119 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3120
3121 for (i = 2; i < items; i++)
3122 av_push (coro->args, newSVsv (ST (i)));
3123 }
3124}
3125 OUTPUT:
3126 RETVAL 3730 RETVAL
3127 3731
3128void 3732void
3129transfer (...) 3733transfer (...)
3130 PROTOTYPE: $$ 3734 PROTOTYPE: $$
3131 CODE: 3735 CODE:
3132 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3736 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3133
3134bool
3135_destroy (SV *coro_sv)
3136 CODE:
3137 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3138 OUTPUT:
3139 RETVAL
3140
3141void
3142_exit (int code)
3143 PROTOTYPE: $
3144 CODE:
3145 _exit (code);
3146 3737
3147SV * 3738SV *
3148clone (Coro::State coro) 3739clone (Coro::State coro)
3149 CODE: 3740 CODE:
3150{ 3741{
… …
3205void 3796void
3206list () 3797list ()
3207 PROTOTYPE: 3798 PROTOTYPE:
3208 PPCODE: 3799 PPCODE:
3209{ 3800{
3210 struct coro *coro; 3801 struct coro *coro;
3211 for (coro = coro_first; coro; coro = coro->next) 3802 for (coro = coro_first; coro; coro = coro->next)
3212 if (coro->hv) 3803 if (coro->hv)
3213 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3804 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3214} 3805}
3215 3806
… …
3220 CODE: 3811 CODE:
3221{ 3812{
3222 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3813 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3223 { 3814 {
3224 struct coro *current = SvSTATE_current; 3815 struct coro *current = SvSTATE_current;
3816 struct CoroSLF slf_save;
3225 3817
3226 if (current != coro) 3818 if (current != coro)
3227 { 3819 {
3228 PUTBACK; 3820 PUTBACK;
3229 save_perl (aTHX_ current); 3821 save_perl (aTHX_ current);
3230 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;
3231 SPAGAIN; 3832 SPAGAIN;
3232 } 3833 }
3233 3834
3234 PUSHSTACK; 3835 PUSHSTACK;
3235 3836
… …
3245 SPAGAIN; 3846 SPAGAIN;
3246 3847
3247 if (current != coro) 3848 if (current != coro)
3248 { 3849 {
3249 PUTBACK; 3850 PUTBACK;
3851 slf_frame = slf_save;
3250 save_perl (aTHX_ coro); 3852 save_perl (aTHX_ coro);
3251 load_perl (aTHX_ current); 3853 load_perl (aTHX_ current);
3252 SPAGAIN; 3854 SPAGAIN;
3253 } 3855 }
3254 } 3856 }
… …
3259 PROTOTYPE: $ 3861 PROTOTYPE: $
3260 ALIAS: 3862 ALIAS:
3261 is_ready = CF_READY 3863 is_ready = CF_READY
3262 is_running = CF_RUNNING 3864 is_running = CF_RUNNING
3263 is_new = CF_NEW 3865 is_new = CF_NEW
3264 is_destroyed = CF_DESTROYED 3866 is_destroyed = CF_ZOMBIE
3867 is_zombie = CF_ZOMBIE
3265 is_suspended = CF_SUSPENDED 3868 is_suspended = CF_SUSPENDED
3266 CODE: 3869 CODE:
3267 RETVAL = boolSV (coro->flags & ix); 3870 RETVAL = boolSV (coro->flags & ix);
3268 OUTPUT: 3871 OUTPUT:
3269 RETVAL 3872 RETVAL
3270 3873
3271void 3874void
3272throw (Coro::State self, SV *throw = &PL_sv_undef) 3875throw (SV *self, SV *exception = &PL_sv_undef)
3273 PROTOTYPE: $;$ 3876 PROTOTYPE: $;$
3274 CODE: 3877 CODE:
3275{ 3878{
3879 struct coro *coro = SvSTATE (self);
3276 struct coro *current = SvSTATE_current; 3880 struct coro *current = SvSTATE_current;
3277 SV **throwp = self == current ? &CORO_THROW : &self->except; 3881 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3278 SvREFCNT_dec (*throwp); 3882 SvREFCNT_dec (*exceptionp);
3279 SvGETMAGIC (throw); 3883 SvGETMAGIC (exception);
3280 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3884 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3885
3886 api_ready (aTHX_ self);
3281} 3887}
3282 3888
3283void 3889void
3284api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3890api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3285 PROTOTYPE: $;$ 3891 PROTOTYPE: $;$
… …
3340 3946
3341void 3947void
3342cancel (Coro::State self) 3948cancel (Coro::State self)
3343 CODE: 3949 CODE:
3344 coro_state_destroy (aTHX_ self); 3950 coro_state_destroy (aTHX_ self);
3345 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3346
3347 3951
3348SV * 3952SV *
3349enable_times (int enabled = enable_times) 3953enable_times (int enabled = enable_times)
3350 CODE: 3954 CODE:
3351{ 3955{
… …
3364 3968
3365void 3969void
3366times (Coro::State self) 3970times (Coro::State self)
3367 PPCODE: 3971 PPCODE:
3368{ 3972{
3369 struct coro *current = SvSTATE (coro_current); 3973 struct coro *current = SvSTATE (coro_current);
3370 3974
3371 if (expect_false (current == self)) 3975 if (ecb_expect_false (current == self))
3372 { 3976 {
3373 coro_times_update (); 3977 coro_times_update ();
3374 coro_times_add (SvSTATE (coro_current)); 3978 coro_times_add (SvSTATE (coro_current));
3375 } 3979 }
3376 3980
3377 EXTEND (SP, 2); 3981 EXTEND (SP, 2);
3378 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3982 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3379 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3983 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3380 3984
3381 if (expect_false (current == self)) 3985 if (ecb_expect_false (current == self))
3382 coro_times_sub (SvSTATE (coro_current)); 3986 coro_times_sub (SvSTATE (coro_current));
3383} 3987}
3384 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}
4035
4036
3385MODULE = Coro::State PACKAGE = Coro 4037MODULE = Coro::State PACKAGE = Coro
3386 4038
3387BOOT: 4039BOOT:
3388{ 4040{
4041 if (SVt_LAST > 32)
4042 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4043
3389 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4044 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3390 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4045 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3391 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4046 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3392 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3393 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);
3394 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4048 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3395 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4049 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3396 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4050 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3397 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4051 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3398 4052
3399 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);
3400 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4054 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3401 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);
3402 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 */
3403 4057
3404 coro_stash = gv_stashpv ("Coro", TRUE); 4058 coro_stash = gv_stashpv ("Coro", TRUE);
3405 4059
3406 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4060 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3407 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4061 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
… …
3420 coroapi.ready = api_ready; 4074 coroapi.ready = api_ready;
3421 coroapi.is_ready = api_is_ready; 4075 coroapi.is_ready = api_is_ready;
3422 coroapi.nready = coro_nready; 4076 coroapi.nready = coro_nready;
3423 coroapi.current = coro_current; 4077 coroapi.current = coro_current;
3424 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
3425 /*GCoroAPI = &coroapi;*/ 4083 /*GCoroAPI = &coroapi;*/
3426 sv_setiv (sv, (IV)&coroapi); 4084 sv_setiv (sv, PTR2IV (&coroapi));
3427 SvREADONLY_on (sv); 4085 SvREADONLY_on (sv);
3428 } 4086 }
3429} 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);
3430 4113
3431void 4114void
3432terminate (...) 4115terminate (...)
3433 CODE: 4116 CODE:
3434 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4117 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3435 4118
3436void 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
3437schedule (...) 4129schedule (...)
3438 CODE: 4130 CODE:
3439 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4131 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3440 4132
3441void 4133void
… …
3460 4152
3461void 4153void
3462_set_current (SV *current) 4154_set_current (SV *current)
3463 PROTOTYPE: $ 4155 PROTOTYPE: $
3464 CODE: 4156 CODE:
3465 SvREFCNT_dec (SvRV (coro_current)); 4157 SvREFCNT_dec_NN (SvRV (coro_current));
3466 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4158 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3467 4159
3468void 4160void
3469_set_readyhook (SV *hook) 4161_set_readyhook (SV *hook)
3470 PROTOTYPE: $ 4162 PROTOTYPE: $
3471 CODE: 4163 CODE:
3472 SvREFCNT_dec (coro_readyhook); 4164 SvREFCNT_dec (coro_readyhook);
3473 SvGETMAGIC (hook); 4165 SvGETMAGIC (hook);
4166 if (SvOK (hook))
4167 {
3474 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 }
3475 4176
3476int 4177int
3477prio (Coro::State coro, int newprio = 0) 4178prio (Coro::State coro, int newprio = 0)
3478 PROTOTYPE: $;$ 4179 PROTOTYPE: $;$
3479 ALIAS: 4180 ALIAS:
… …
3543 for (i = 1; i < items; ++i) 4244 for (i = 1; i < items; ++i)
3544 av_push (av, SvREFCNT_inc_NN (ST (i))); 4245 av_push (av, SvREFCNT_inc_NN (ST (i)));
3545 4246
3546 if ((SV *)hv == &PL_sv_undef) 4247 if ((SV *)hv == &PL_sv_undef)
3547 { 4248 {
3548 PUSHMARK (SP); 4249 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3549 EXTEND (SP, 2);
3550 PUSHs (sv_Coro);
3551 PUSHs ((SV *)cv_pool_handler);
3552 PUTBACK;
3553 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3554 SPAGAIN;
3555
3556 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4250 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4251 SvREFCNT_dec_NN (sv);
3557 } 4252 }
3558 4253
3559 { 4254 {
3560 struct coro *coro = SvSTATE_hv (hv); 4255 struct coro *coro = SvSTATE_hv (hv);
3561 4256
… …
3568 api_ready (aTHX_ (SV *)hv); 4263 api_ready (aTHX_ (SV *)hv);
3569 4264
3570 if (GIMME_V != G_VOID) 4265 if (GIMME_V != G_VOID)
3571 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4266 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3572 else 4267 else
3573 SvREFCNT_dec (hv); 4268 SvREFCNT_dec_NN (hv);
3574} 4269}
3575 4270
3576SV * 4271SV *
3577rouse_cb () 4272rouse_cb ()
3578 PROTOTYPE: 4273 PROTOTYPE:
… …
3593 on_leave = 1 4288 on_leave = 1
3594 PROTOTYPE: & 4289 PROTOTYPE: &
3595 CODE: 4290 CODE:
3596{ 4291{
3597 struct coro *coro = SvSTATE_current; 4292 struct coro *coro = SvSTATE_current;
3598 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4293 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3599 4294
3600 block = (SV *)coro_sv_2cv (aTHX_ block); 4295 block = s_get_cv_croak (block);
3601 4296
3602 if (!*avp) 4297 if (!*avp)
3603 *avp = newAV (); 4298 *avp = newAV ();
3604 4299
3605 av_push (*avp, SvREFCNT_inc (block)); 4300 av_push (*avp, SvREFCNT_inc (block));
… …
3623 4318
3624SV * 4319SV *
3625new (SV *klass, SV *count = 0) 4320new (SV *klass, SV *count = 0)
3626 CODE: 4321 CODE:
3627{ 4322{
3628 int semcnt = 1; 4323 int semcnt = 1;
3629 4324
3630 if (count) 4325 if (count)
3631 { 4326 {
3632 SvGETMAGIC (count); 4327 SvGETMAGIC (count);
3633 4328
… …
3657 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4352 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3658 OUTPUT: 4353 OUTPUT:
3659 RETVAL 4354 RETVAL
3660 4355
3661void 4356void
3662up (SV *self, int adjust = 1) 4357up (SV *self)
3663 ALIAS:
3664 adjust = 1
3665 CODE: 4358 CODE:
4359 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4360
4361void
4362adjust (SV *self, int adjust)
4363 CODE:
3666 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4364 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3667 4365
3668void 4366void
3669down (...) 4367down (...)
3670 CODE: 4368 CODE:
3671 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4369 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3693 XSRETURN_NO; 4391 XSRETURN_NO;
3694} 4392}
3695 4393
3696void 4394void
3697waiters (SV *self) 4395waiters (SV *self)
3698 PPCODE: 4396 PPCODE:
3699{ 4397{
3700 AV *av = (AV *)SvRV (self); 4398 AV *av = (AV *)SvRV (self);
3701 int wcount = AvFILLp (av) + 1 - 1; 4399 int wcount = AvFILLp (av) + 1 - 1;
3702 4400
3703 if (GIMME_V == G_SCALAR) 4401 if (GIMME_V == G_SCALAR)
… …
3712} 4410}
3713 4411
3714MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4412MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3715 4413
3716void 4414void
3717_may_delete (SV *sem, int count, int extra_refs) 4415_may_delete (SV *sem, int count, unsigned int extra_refs)
3718 PPCODE: 4416 PPCODE:
3719{ 4417{
3720 AV *av = (AV *)SvRV (sem); 4418 AV *av = (AV *)SvRV (sem);
3721 4419
3722 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4420 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3723 && AvFILLp (av) == 0 /* no waiters, just count */ 4421 && AvFILLp (av) == 0 /* no waiters, just count */
3724 && SvIV (AvARRAY (av)[0]) == count) 4422 && SvIV (AvARRAY (av)[0]) == count)
3725 XSRETURN_YES; 4423 XSRETURN_YES;
… …
3746 4444
3747void 4445void
3748broadcast (SV *self) 4446broadcast (SV *self)
3749 CODE: 4447 CODE:
3750{ 4448{
3751 AV *av = (AV *)SvRV (self); 4449 AV *av = (AV *)SvRV (self);
3752 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4450 coro_signal_wake (aTHX_ av, AvFILLp (av));
3753} 4451}
3754 4452
3755void 4453void
3756send (SV *self) 4454send (SV *self)
… …
3764 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4462 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3765} 4463}
3766 4464
3767IV 4465IV
3768awaited (SV *self) 4466awaited (SV *self)
3769 CODE: 4467 CODE:
3770 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4468 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3771 OUTPUT: 4469 OUTPUT:
3772 RETVAL 4470 RETVAL
3773 4471
3774 4472
… …
3779 4477
3780void 4478void
3781_schedule (...) 4479_schedule (...)
3782 CODE: 4480 CODE:
3783{ 4481{
3784 static int incede; 4482 static int incede;
3785 4483
3786 api_cede_notself (aTHX); 4484 api_cede_notself (aTHX);
3787 4485
3788 ++incede; 4486 ++incede;
3789 while (coro_nready >= incede && api_cede (aTHX)) 4487 while (coro_nready >= incede && api_cede (aTHX))
… …
3805 4503
3806void 4504void
3807_register (char *target, char *proto, SV *req) 4505_register (char *target, char *proto, SV *req)
3808 CODE: 4506 CODE:
3809{ 4507{
3810 CV *req_cv = coro_sv_2cv (aTHX_ req); 4508 SV *req_cv = s_get_cv_croak (req);
3811 /* newXSproto doesn't return the CV on 5.8 */ 4509 /* newXSproto doesn't return the CV on 5.8 */
3812 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4510 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3813 sv_setpv ((SV *)slf_cv, proto); 4511 sv_setpv ((SV *)slf_cv, proto);
3814 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);
3815} 4513}
3816 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