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.340 by root, Mon Dec 15 00:30:40 2008 UTC vs.
Revision 1.462 by root, Wed Jun 22 20:24:38 2016 UTC

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

Diff Legend

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