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.317 by root, Thu Nov 20 06:28:52 2008 UTC vs.
Revision 1.455 by root, Sun Oct 4 13:07:55 2015 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
107/* 5.8.7 */
108#ifndef SvRV_set
109# define SvRV_set(s,v) SvRV(s) = (v)
110#endif
111
112#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
113# undef CORO_STACKGUARD
114#endif
115
116#ifndef CORO_STACKGUARD
117# define CORO_STACKGUARD 0
118#endif 83#endif
119 84
120/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
121#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
122# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
130#else 95#else
131# define dSTACKLEVEL volatile void *stacklevel 96# define dSTACKLEVEL volatile void *stacklevel
132# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
133#endif 98#endif
134 99
135#define IN_DESTRUCT (PL_main_cv == Nullcv) 100#define IN_DESTRUCT PL_dirty
136
137#if __GNUC__ >= 3
138# define attribute(x) __attribute__(x)
139# define expect(expr,value) __builtin_expect ((expr),(value))
140# define INLINE static inline
141#else
142# define attribute(x)
143# define expect(expr,value) (expr)
144# define INLINE static
145#endif
146
147#define expect_false(expr) expect ((expr) != 0, 0)
148#define expect_true(expr) expect ((expr) != 0, 1)
149
150#define NOINLINE attribute ((noinline))
151 101
152#include "CoroAPI.h" 102#include "CoroAPI.h"
153#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
154 104
155#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
156# if CORO_PTHREAD 106# if CORO_PTHREAD
157static void *coro_thx; 107static void *coro_thx;
158# endif 108# endif
159#endif 109#endif
160 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
161static 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]);
162 123
163/* we hijack an hopefully unused CV flag for our purposes */ 124/* we hijack an hopefully unused CV flag for our purposes */
164#define CVf_SLF 0x4000 125#define CVf_SLF 0x4000
165static OP *pp_slf (pTHX); 126static OP *pp_slf (pTHX);
127static void slf_destroy (pTHX_ struct coro *coro);
166 128
167static U32 cctx_gen; 129static U32 cctx_gen;
168static size_t cctx_stacksize = CORO_STACKSIZE; 130static size_t cctx_stacksize = CORO_STACKSIZE;
169static struct CoroAPI coroapi; 131static struct CoroAPI coroapi;
170static AV *main_mainstack; /* used to differentiate between $main and others */ 132static AV *main_mainstack; /* used to differentiate between $main and others */
171static JMPENV *main_top_env; 133static JMPENV *main_top_env;
172static HV *coro_state_stash, *coro_stash; 134static HV *coro_state_stash, *coro_stash;
173static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 135static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
174 136
137static AV *av_destroy; /* destruction queue */
138static SV *sv_manager; /* the manager coro */
139static SV *sv_idle; /* $Coro::idle */
140
175static GV *irsgv; /* $/ */ 141static GV *irsgv; /* $/ */
176static GV *stdoutgv; /* *STDOUT */ 142static GV *stdoutgv; /* *STDOUT */
177static SV *rv_diehook; 143static SV *rv_diehook;
178static SV *rv_warnhook; 144static SV *rv_warnhook;
179static HV *hv_sig; /* %SIG */
180 145
181/* async_pool helper stuff */ 146/* async_pool helper stuff */
182static SV *sv_pool_rss; 147static SV *sv_pool_rss;
183static SV *sv_pool_size; 148static SV *sv_pool_size;
184static SV *sv_async_pool_idle; 149static SV *sv_async_pool_idle; /* description string */
185static AV *av_async_pool; 150static AV *av_async_pool; /* idle pool */
186static SV *sv_Coro; 151static SV *sv_Coro; /* class string */
187static CV *cv_pool_handler; 152static CV *cv_pool_handler;
188static CV *cv_coro_state_new;
189 153
190/* Coro::AnyEvent */ 154/* Coro::AnyEvent */
191static SV *sv_activity; 155static SV *sv_activity;
192 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
193static struct coro_cctx *cctx_first; 163static struct coro_cctx *cctx_first;
194static int cctx_count, cctx_idle; 164static int cctx_count, cctx_idle;
195 165
196enum { 166enum
167{
197 CC_MAPPED = 0x01, 168 CC_MAPPED = 0x01,
198 CC_NOREUSE = 0x02, /* throw this away after tracing */ 169 CC_NOREUSE = 0x02, /* throw this away after tracing */
199 CC_TRACE = 0x04, 170 CC_TRACE = 0x04,
200 CC_TRACE_SUB = 0x08, /* trace sub calls */ 171 CC_TRACE_SUB = 0x08, /* trace sub calls */
201 CC_TRACE_LINE = 0x10, /* trace each statement */ 172 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
206typedef struct coro_cctx 177typedef struct coro_cctx
207{ 178{
208 struct coro_cctx *next; 179 struct coro_cctx *next;
209 180
210 /* the stack */ 181 /* the stack */
211 void *sptr; 182 struct coro_stack stack;
212 size_t ssize;
213 183
214 /* cpu state */ 184 /* cpu state */
215 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
216 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
217 JMPENV *top_env; 189 JMPENV *top_env;
218 coro_context cctx; 190 coro_context cctx;
219 191
220 U32 gen; 192 U32 gen;
221#if CORO_USE_VALGRIND 193#if CORO_USE_VALGRIND
222 int valgrind_id; 194 int valgrind_id;
223#endif 195#endif
224 unsigned char flags; 196 unsigned char flags;
225} coro_cctx; 197} coro_cctx;
226 198
199static coro_cctx *cctx_current; /* the currently running cctx */
200
201/*****************************************************************************/
202
203static MGVTBL coro_state_vtbl;
204
227enum { 205enum
206{
228 CF_RUNNING = 0x0001, /* coroutine is running */ 207 CF_RUNNING = 0x0001, /* coroutine is running */
229 CF_READY = 0x0002, /* coroutine is ready */ 208 CF_READY = 0x0002, /* coroutine is ready */
230 CF_NEW = 0x0004, /* has never been switched to */ 209 CF_NEW = 0x0004, /* has never been switched to */
231 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) */
232}; 213};
233 214
234/* 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 */
235typedef struct 216typedef struct
236{ 217{
237 SV *defsv;
238 AV *defav;
239 SV *errsv;
240 SV *irsgv;
241#define VAR(name,type) type name; 218 #define VARx(name,expr,type) type name;
242# include "state.h" 219 #include "state.h"
243#undef VAR
244} perl_slots; 220} perl_slots;
245 221
222/* how many context stack entries do we need for perl_slots */
246#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))
247 224
248/* this is a structure representing a perl-level coroutine */ 225/* this is a structure representing a perl-level coroutine */
249struct coro { 226struct coro
227{
250 /* the C coroutine allocated to this perl coroutine, if any */ 228 /* the C coroutine allocated to this perl coroutine, if any */
251 coro_cctx *cctx; 229 coro_cctx *cctx;
230
231 /* ready queue */
232 struct coro *next_ready;
252 233
253 /* state data */ 234 /* state data */
254 struct CoroSLF slf_frame; /* saved slf frame */ 235 struct CoroSLF slf_frame; /* saved slf frame */
255 AV *mainstack; 236 AV *mainstack;
256 perl_slots *slot; /* basically the saved sp */ 237 perl_slots *slot; /* basically the saved sp */
257 238
258 CV *startcv; /* the CV to execute */ 239 CV *startcv; /* the CV to execute */
259 AV *args; /* data associated with this coroutine (initial args) */ 240 AV *args; /* data associated with this coroutine (initial args) */
260 int refcnt; /* coroutines are refcounted, yes */
261 int flags; /* CF_ flags */ 241 int flags; /* CF_ flags */
262 HV *hv; /* the perl hash associated with this coro, if any */ 242 HV *hv; /* the perl hash associated with this coro, if any */
263 void (*on_destroy)(pTHX_ struct coro *coro);
264 243
265 /* statistics */ 244 /* statistics */
266 int usecount; /* number of transfers to this coro */ 245 int usecount; /* number of transfers to this coro */
267 246
268 /* coro process data */ 247 /* coro process data */
269 int prio; 248 int prio;
270 SV *except; /* exception to be thrown */ 249 SV *except; /* exception to be thrown */
271 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 */
272 253
273 /* async_pool */ 254 /* async_pool */
274 SV *saved_deffh; 255 SV *saved_deffh;
275 SV *invoke_cb; 256 SV *invoke_cb;
276 AV *invoke_av; 257 AV *invoke_av;
277 258
259 /* on_enter/on_leave */
260 AV *on_enter; AV *on_enter_xs;
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;
268
278 /* linked list */ 269 /* linked list */
279 struct coro *next, *prev; 270 struct coro *next, *prev;
280}; 271};
281 272
282typedef struct coro *Coro__State; 273typedef struct coro *Coro__State;
283typedef struct coro *Coro__State_or_hashref; 274typedef struct coro *Coro__State_or_hashref;
284 275
285/* the following variables are effectively part of the perl context */ 276/* the following variables are effectively part of the perl context */
286/* and get copied between struct coro and these variables */ 277/* and get copied between struct coro and these variables */
287/* the mainr easonw e don't support windows process emulation */ 278/* the main reason we don't support windows process emulation */
288static struct CoroSLF slf_frame; /* the current slf frame */ 279static struct CoroSLF slf_frame; /* the current slf frame */
289 280
290/** Coro ********************************************************************/ 281/** Coro ********************************************************************/
291 282
292#define PRIO_MAX 3 283#define CORO_PRIO_MAX 3
293#define PRIO_HIGH 1 284#define CORO_PRIO_HIGH 1
294#define PRIO_NORMAL 0 285#define CORO_PRIO_NORMAL 0
295#define PRIO_LOW -1 286#define CORO_PRIO_LOW -1
296#define PRIO_IDLE -3 287#define CORO_PRIO_IDLE -3
297#define PRIO_MIN -4 288#define CORO_PRIO_MIN -4
298 289
299/* for Coro.pm */ 290/* for Coro.pm */
300static SV *coro_current; 291static SV *coro_current;
301static SV *coro_readyhook; 292static SV *coro_readyhook;
302static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 293static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
303static CV *cv_coro_run, *cv_coro_terminate; 294static CV *cv_coro_run;
304static struct coro *coro_first; 295static struct coro *coro_first;
305#define coro_nready coroapi.nready 296#define coro_nready coroapi.nready
306 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
307/** lowlevel stuff **********************************************************/ 393/** lowlevel stuff **********************************************************/
308 394
309static SV * 395static SV * ecb_noinline
310coro_get_sv (pTHX_ const char *name, int create) 396coro_get_sv (pTHX_ const char *name, int create)
311{ 397{
312#if PERL_VERSION_ATLEAST (5,10,0) 398#if PERL_VERSION_ATLEAST (5,10,0)
313 /* 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 */
314 get_sv (name, create); 400 get_sv (name, create);
315#endif 401#endif
316 return get_sv (name, create); 402 return get_sv (name, create);
317} 403}
318 404
319static AV * 405static AV * ecb_noinline
320coro_get_av (pTHX_ const char *name, int create) 406coro_get_av (pTHX_ const char *name, int create)
321{ 407{
322#if PERL_VERSION_ATLEAST (5,10,0) 408#if PERL_VERSION_ATLEAST (5,10,0)
323 /* 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 */
324 get_av (name, create); 410 get_av (name, create);
325#endif 411#endif
326 return get_av (name, create); 412 return get_av (name, create);
327} 413}
328 414
329static HV * 415static HV * ecb_noinline
330coro_get_hv (pTHX_ const char *name, int create) 416coro_get_hv (pTHX_ const char *name, int create)
331{ 417{
332#if PERL_VERSION_ATLEAST (5,10,0) 418#if PERL_VERSION_ATLEAST (5,10,0)
333 /* 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 */
334 get_hv (name, create); 420 get_hv (name, create);
335#endif 421#endif
336 return get_hv (name, create); 422 return get_hv (name, create);
337} 423}
338 424
339/* may croak */ 425ecb_inline void
340INLINE CV * 426coro_times_update (void)
341coro_sv_2cv (pTHX_ SV *sv)
342{ 427{
343 HV *st; 428#ifdef coro_clock_gettime
344 GV *gvp; 429 struct timespec ts;
345 return sv_2cv (sv, &st, &gvp, 0);
346}
347 430
348static AV * 431 ts.tv_sec = ts.tv_nsec = 0;
432 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
433 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
434
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];
470}
471
472/*****************************************************************************/
473/* magic glue */
474
475#define CORO_MAGIC_type_cv 26
476#define CORO_MAGIC_type_state PERL_MAGIC_ext
477
478#define CORO_MAGIC_NN(sv, type) \
479 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
480 ? SvMAGIC (sv) \
481 : mg_find (sv, type))
482
483#define CORO_MAGIC(sv, type) \
484 (ecb_expect_true (SvMAGIC (sv)) \
485 ? CORO_MAGIC_NN (sv, type) \
486 : 0)
487
488#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
489#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
490
491ecb_inline MAGIC *
492SvSTATEhv_p (pTHX_ SV *coro)
493{
494 MAGIC *mg;
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
511 if (SvROK (coro_sv))
512 coro_sv = SvRV (coro_sv);
513
514 mg = SvSTATEhv_p (aTHX_ coro_sv);
515 if (!mg)
516 croak ("Coro::State object required");
517
518 return (struct coro *)mg->mg_ptr;
519}
520
521#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
522
523/* faster than SvSTATE, but expects a coroutine hv */
524#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
525#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
526
527/*****************************************************************************/
528/* padlist management and caching */
529
530ecb_inline PADLIST *
349coro_clone_padlist (pTHX_ CV *cv) 531coro_derive_padlist (pTHX_ CV *cv)
350{ 532{
351 AV *padlist = CvPADLIST (cv); 533 PADLIST *padlist = CvPADLIST (cv);
352 AV *newpadlist, *newpad; 534 PADLIST *newpadlist;
535 PADNAMELIST *padnames;
536 PAD *newpad;
537 PADOFFSET off = PadlistMAX (padlist) + 1;
353 538
354 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. */
355 AvREAL_off (newpadlist); 567 AvREAL_off (newpadlist);
356#if PERL_VERSION_ATLEAST (5,10,0)
357 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
358#else
359 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
360#endif 568#endif
361 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
362 --AvFILLp (padlist);
363 569
364 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 570 /* Already extended to 2 elements by newPADLIST. */
365 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;
366 578
367 return newpadlist; 579 return newpadlist;
368} 580}
369 581
370static void 582ecb_inline void
371free_padlist (pTHX_ AV *padlist) 583free_padlist (pTHX_ PADLIST *padlist)
372{ 584{
373 /* may be during global destruction */ 585 /* may be during global destruction */
374 if (SvREFCNT (padlist)) 586 if (!IN_DESTRUCT)
375 { 587 {
376 I32 i = AvFILLp (padlist); 588 I32 i = PadlistMAX (padlist);
377 while (i >= 0) 589
590 while (i > 0) /* special-case index 0 */
378 { 591 {
379 SV **svp = av_fetch (padlist, i--, FALSE); 592 /* we try to be extra-careful here */
593 PAD *pad = PadlistARRAY (padlist)[i--];
594
380 if (svp) 595 if (pad)
381 { 596 {
382 SV *sv; 597 I32 j = PadMAX (pad);
383 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 598
599 while (j >= 0)
384 SvREFCNT_dec (sv); 600 SvREFCNT_dec (PadARRAY (pad)[j--]);
385 601
602 PadMAX (pad) = -1;
386 SvREFCNT_dec (*svp); 603 SvREFCNT_dec (pad);
387 } 604 }
388 } 605 }
389 606
607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
608
609#if NEWPADAPI
610 Safefree (PadlistARRAY (padlist));
611 Safefree (padlist);
612#else
613 AvFILLp (padlist) = -1;
614 AvREAL_off (padlist);
390 SvREFCNT_dec ((SV*)padlist); 615 SvREFCNT_dec ((SV*)padlist);
616#endif
391 } 617 }
392} 618}
393 619
394static int 620static int
395coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 621coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
396{ 622{
397 AV *padlist; 623 PADLIST *padlist;
398 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;
399 626
400 /* casting is fun. */ 627 /* perl manages to free our internal AV and _then_ call us */
401 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 628 if (IN_DESTRUCT)
629 return 0;
630
631 while (len--)
402 free_padlist (aTHX_ padlist); 632 free_padlist (aTHX_ padlists[len]);
403
404 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
405 633
406 return 0; 634 return 0;
407} 635}
408
409#define CORO_MAGIC_type_cv 26
410#define CORO_MAGIC_type_state PERL_MAGIC_ext
411 636
412static MGVTBL coro_cv_vtbl = { 637static MGVTBL coro_cv_vtbl = {
413 0, 0, 0, 0, 638 0, 0, 0, 0,
414 coro_cv_free 639 coro_cv_free
415}; 640};
416 641
417#define CORO_MAGIC_NN(sv, type) \
418 (expect_true (SvMAGIC (sv)->mg_type == type) \
419 ? SvMAGIC (sv) \
420 : mg_find (sv, type))
421
422#define CORO_MAGIC(sv, type) \
423 (expect_true (SvMAGIC (sv)) \
424 ? CORO_MAGIC_NN (sv, type) \
425 : 0)
426
427#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
428#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
429
430INLINE struct coro *
431SvSTATE_ (pTHX_ SV *coro)
432{
433 HV *stash;
434 MAGIC *mg;
435
436 if (SvROK (coro))
437 coro = SvRV (coro);
438
439 if (expect_false (SvTYPE (coro) != SVt_PVHV))
440 croak ("Coro::State object required");
441
442 stash = SvSTASH (coro);
443 if (expect_false (stash != coro_stash && stash != coro_state_stash))
444 {
445 /* very slow, but rare, check */
446 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
447 croak ("Coro::State object required");
448 }
449
450 mg = CORO_MAGIC_state (coro);
451 return (struct coro *)mg->mg_ptr;
452}
453
454#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
455
456/* faster than SvSTATE, but expects a coroutine hv */
457#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
458#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
459
460/* the next two functions merely cache the padlists */ 642/* the next two functions merely cache the padlists */
461static void 643ecb_inline void
462get_padlist (pTHX_ CV *cv) 644get_padlist (pTHX_ CV *cv)
463{ 645{
464 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
465 AV *av; 647 size_t *lenp;
466 648
467 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 649 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
468 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 650 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
469 else 651 else
470 { 652 {
471#if CORO_PREFER_PERL_FUNCTIONS 653#if CORO_PREFER_PERL_FUNCTIONS
472 /* this is probably cleaner? but also slower! */ 654 /* this is probably cleaner? but also slower! */
473 /* in practise, it seems to be less stable */ 655 /* in practise, it seems to be less stable */
474 CV *cp = Perl_cv_clone (aTHX_ cv); 656 CV *cp = Perl_cv_clone (aTHX_ cv);
475 CvPADLIST (cv) = CvPADLIST (cp); 657 CvPADLIST (cv) = CvPADLIST (cp);
476 CvPADLIST (cp) = 0; 658 CvPADLIST (cp) = 0;
477 SvREFCNT_dec (cp); 659 SvREFCNT_dec (cp);
478#else 660#else
479 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 661 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
480#endif 662#endif
481 } 663 }
482} 664}
483 665
484static void 666ecb_inline void
485put_padlist (pTHX_ CV *cv) 667put_padlist (pTHX_ CV *cv)
486{ 668{
487 MAGIC *mg = CORO_MAGIC_cv (cv); 669 MAGIC *mg = CORO_MAGIC_cv (cv);
488 AV *av;
489 670
490 if (expect_false (!mg)) 671 if (ecb_expect_false (!mg))
672 {
491 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);
492 681
493 av = (AV *)mg->mg_obj; 682 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
494
495 if (expect_false (AvFILLp (av) >= AvMAX (av)))
496 av_extend (av, AvMAX (av) + 1);
497
498 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
499} 683}
500 684
501/** 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 (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
739#define SWAP_SVS(coro) \
740 if (ecb_expect_false ((coro)->swap_sv)) \
741 swap_svs (aTHX_ (coro))
742
743static void
744on_enterleave_call (pTHX_ SV *cb);
502 745
503static void 746static void
504load_perl (pTHX_ Coro__State c) 747load_perl (pTHX_ Coro__State c)
505{ 748{
506 perl_slots *slot = c->slot; 749 perl_slots *slot = c->slot;
507 c->slot = 0; 750 c->slot = 0;
508 751
509 PL_mainstack = c->mainstack; 752 PL_mainstack = c->mainstack;
510 753
511 GvSV (PL_defgv) = slot->defsv; 754#if CORO_JIT
512 GvAV (PL_defgv) = slot->defav; 755 load_perl_slots (slot);
513 GvSV (PL_errgv) = slot->errsv; 756#else
514 GvSV (irsgv) = slot->irsgv;
515
516 #define VAR(name,type) PL_ ## name = slot->name; 757 #define VARx(name,expr,type) expr = slot->name;
517 # include "state.h" 758 #include "state.h"
518 #undef VAR 759#endif
519 760
520 { 761 {
521 dSP; 762 dSP;
522 763
523 CV *cv; 764 CV *cv;
524 765
525 /* now do the ugly restore mess */ 766 /* now do the ugly restore mess */
526 while (expect_true (cv = (CV *)POPs)) 767 while (ecb_expect_true (cv = (CV *)POPs))
527 { 768 {
528 put_padlist (aTHX_ cv); /* mark this padlist as available */ 769 put_padlist (aTHX_ cv); /* mark this padlist as available */
529 CvDEPTH (cv) = PTR2IV (POPs); 770 CvDEPTH (cv) = PTR2IV (POPs);
530 CvPADLIST (cv) = (AV *)POPs; 771 CvPADLIST (cv) = (PADLIST *)POPs;
531 } 772 }
532 773
533 PUTBACK; 774 PUTBACK;
534 } 775 }
535 776
536 slf_frame = c->slf_frame; 777 slf_frame = c->slf_frame;
537 CORO_THROW = c->except; 778 CORO_THROW = c->except;
779
780 if (ecb_expect_false (enable_times))
781 {
782 if (ecb_expect_false (!times_valid))
783 coro_times_update ();
784
785 coro_times_sub (c);
786 }
787
788 if (ecb_expect_false (c->on_enter))
789 {
790 int i;
791
792 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
793 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
794 }
795
796 if (ecb_expect_false (c->on_enter_xs))
797 {
798 int i;
799
800 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
801 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
802 }
803
804 SWAP_SVS (c);
538} 805}
539 806
540static void 807static void
541save_perl (pTHX_ Coro__State c) 808save_perl (pTHX_ Coro__State c)
542{ 809{
810 SWAP_SVS (c);
811
812 if (ecb_expect_false (c->on_leave_xs))
813 {
814 int i;
815
816 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
817 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
818 }
819
820 if (ecb_expect_false (c->on_leave))
821 {
822 int i;
823
824 for (i = AvFILLp (c->on_leave); i >= 0; --i)
825 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
826 }
827
828 times_valid = 0;
829
830 if (ecb_expect_false (enable_times))
831 {
832 coro_times_update (); times_valid = 1;
833 coro_times_add (c);
834 }
835
543 c->except = CORO_THROW; 836 c->except = CORO_THROW;
544 c->slf_frame = slf_frame; 837 c->slf_frame = slf_frame;
545 838
546 { 839 {
547 dSP; 840 dSP;
… …
556 849
557 XPUSHs (Nullsv); 850 XPUSHs (Nullsv);
558 /* this loop was inspired by pp_caller */ 851 /* this loop was inspired by pp_caller */
559 for (;;) 852 for (;;)
560 { 853 {
561 while (expect_true (cxix >= 0)) 854 while (ecb_expect_true (cxix >= 0))
562 { 855 {
563 PERL_CONTEXT *cx = &ccstk[cxix--]; 856 PERL_CONTEXT *cx = &ccstk[cxix--];
564 857
565 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 858 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
566 { 859 {
567 CV *cv = cx->blk_sub.cv; 860 CV *cv = cx->blk_sub.cv;
568 861
569 if (expect_true (CvDEPTH (cv))) 862 if (ecb_expect_true (CvDEPTH (cv)))
570 { 863 {
571 EXTEND (SP, 3); 864 EXTEND (SP, 3);
572 PUSHs ((SV *)CvPADLIST (cv)); 865 PUSHs ((SV *)CvPADLIST (cv));
573 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 866 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
574 PUSHs ((SV *)cv); 867 PUSHs ((SV *)cv);
… …
577 get_padlist (aTHX_ cv); 870 get_padlist (aTHX_ cv);
578 } 871 }
579 } 872 }
580 } 873 }
581 874
582 if (expect_true (top_si->si_type == PERLSI_MAIN)) 875 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
583 break; 876 break;
584 877
585 top_si = top_si->si_prev; 878 top_si = top_si->si_prev;
586 ccstk = top_si->si_cxstack; 879 ccstk = top_si->si_cxstack;
587 cxix = top_si->si_cxix; 880 cxix = top_si->si_cxix;
… …
589 882
590 PUTBACK; 883 PUTBACK;
591 } 884 }
592 885
593 /* allocate some space on the context stack for our purposes */ 886 /* allocate some space on the context stack for our purposes */
594 /* we manually unroll here, as usually 2 slots is enough */ 887 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
595 if (SLOT_COUNT >= 1) CXINC;
596 if (SLOT_COUNT >= 2) CXINC;
597 if (SLOT_COUNT >= 3) CXINC;
598 { 888 {
599 int i; 889 unsigned int i;
890
600 for (i = 3; i < SLOT_COUNT; ++i) 891 for (i = 0; i < SLOT_COUNT; ++i)
601 CXINC; 892 CXINC;
602 } 893
603 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 894 cxstack_ix -= SLOT_COUNT; /* undo allocation */
895 }
604 896
605 c->mainstack = PL_mainstack; 897 c->mainstack = PL_mainstack;
606 898
607 { 899 {
608 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 900 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
609 901
610 slot->defav = GvAV (PL_defgv); 902#if CORO_JIT
611 slot->defsv = DEFSV; 903 save_perl_slots (slot);
612 slot->errsv = ERRSV; 904#else
613 slot->irsgv = GvSV (irsgv);
614
615 #define VAR(name,type) slot->name = PL_ ## name; 905 #define VARx(name,expr,type) slot->name = expr;
616 # include "state.h" 906 #include "state.h"
617 #undef VAR 907#endif
618 } 908 }
619} 909}
620 910
621/* 911/*
622 * allocate various perl stacks. This is almost an exact copy 912 * allocate various perl stacks. This is almost an exact copy
… …
628# define coro_init_stacks(thx) init_stacks () 918# define coro_init_stacks(thx) init_stacks ()
629#else 919#else
630static void 920static void
631coro_init_stacks (pTHX) 921coro_init_stacks (pTHX)
632{ 922{
633 PL_curstackinfo = new_stackinfo(32, 8); 923 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
634 PL_curstackinfo->si_type = PERLSI_MAIN; 924 PL_curstackinfo->si_type = PERLSI_MAIN;
635 PL_curstack = PL_curstackinfo->si_stack; 925 PL_curstack = PL_curstackinfo->si_stack;
636 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 926 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
637 927
638 PL_stack_base = AvARRAY(PL_curstack); 928 PL_stack_base = AvARRAY(PL_curstack);
… …
653#endif 943#endif
654 944
655 New(54,PL_scopestack,8,I32); 945 New(54,PL_scopestack,8,I32);
656 PL_scopestack_ix = 0; 946 PL_scopestack_ix = 0;
657 PL_scopestack_max = 8; 947 PL_scopestack_max = 8;
948#if HAS_SCOPESTACK_NAME
949 New(54,PL_scopestack_name,8,const char*);
950#endif
658 951
659 New(54,PL_savestack,24,ANY); 952 New(54,PL_savestack,24,ANY);
660 PL_savestack_ix = 0; 953 PL_savestack_ix = 0;
661 PL_savestack_max = 24; 954 PL_savestack_max = 24;
662 955
… …
690 } 983 }
691 984
692 Safefree (PL_tmps_stack); 985 Safefree (PL_tmps_stack);
693 Safefree (PL_markstack); 986 Safefree (PL_markstack);
694 Safefree (PL_scopestack); 987 Safefree (PL_scopestack);
988#if HAS_SCOPESTACK_NAME
989 Safefree (PL_scopestack_name);
990#endif
695 Safefree (PL_savestack); 991 Safefree (PL_savestack);
696#if !PERL_VERSION_ATLEAST (5,10,0) 992#if !PERL_VERSION_ATLEAST (5,10,0)
697 Safefree (PL_retstack); 993 Safefree (PL_retstack);
698#endif 994#endif
699} 995}
… …
745#endif 1041#endif
746 1042
747/* 1043/*
748 * This overrides the default magic get method of %SIG elements. 1044 * This overrides the default magic get method of %SIG elements.
749 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1045 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
750 * and instead of tryign to save and restore the hash elements, we just provide 1046 * and instead of trying to save and restore the hash elements (extremely slow),
751 * readback here. 1047 * we just provide our own readback here.
752 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
753 * not expecting this to actually change the hook. This is a potential problem
754 * when a schedule happens then, but we ignore this.
755 */ 1048 */
756static int 1049static int ecb_cold
757coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1050coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
758{ 1051{
759 const char *s = MgPV_nolen_const (mg); 1052 const char *s = MgPV_nolen_const (mg);
760 1053
761 if (*s == '_') 1054 if (*s == '_')
762 { 1055 {
763 SV **svp = 0; 1056 SV **svp = 0;
764 1057
765 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1058 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
766 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1059 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
767 1060
768 if (svp) 1061 if (svp)
769 { 1062 {
770 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1063 SV *ssv;
1064
1065 if (!*svp)
1066 ssv = &PL_sv_undef;
1067 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1068 ssv = sv_2mortal (newRV_inc (*svp));
1069 else
1070 ssv = *svp;
1071
1072 sv_setsv (sv, ssv);
771 return 0; 1073 return 0;
772 } 1074 }
773 } 1075 }
774 1076
775 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1077 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
776} 1078}
777 1079
778static int 1080static int ecb_cold
779coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1081coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
780{ 1082{
781 const char *s = MgPV_nolen_const (mg); 1083 const char *s = MgPV_nolen_const (mg);
782 1084
783 if (*s == '_') 1085 if (*s == '_')
… …
797 } 1099 }
798 1100
799 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1101 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
800} 1102}
801 1103
802static int 1104static int ecb_cold
803coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1105coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
804{ 1106{
805 const char *s = MgPV_nolen_const (mg); 1107 const char *s = MgPV_nolen_const (mg);
806 1108
807 if (*s == '_') 1109 if (*s == '_')
… …
812 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1114 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
813 1115
814 if (svp) 1116 if (svp)
815 { 1117 {
816 SV *old = *svp; 1118 SV *old = *svp;
817 *svp = newSVsv (sv); 1119 *svp = SvOK (sv) ? newSVsv (sv) : 0;
818 SvREFCNT_dec (old); 1120 SvREFCNT_dec (old);
819 return 0; 1121 return 0;
820 } 1122 }
821 } 1123 }
822 1124
… …
834slf_check_nop (pTHX_ struct CoroSLF *frame) 1136slf_check_nop (pTHX_ struct CoroSLF *frame)
835{ 1137{
836 return 0; 1138 return 0;
837} 1139}
838 1140
839static UNOP coro_setup_op; 1141static int
1142slf_check_repeat (pTHX_ struct CoroSLF *frame)
1143{
1144 return 1;
1145}
840 1146
841static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1147static UNOP init_perl_op;
1148
1149ecb_noinline static void /* noinline to keep it out of the transfer fast path */
842coro_setup (pTHX_ struct coro *coro) 1150init_perl (pTHX_ struct coro *coro)
843{ 1151{
844 /* 1152 /*
845 * emulate part of the perl startup here. 1153 * emulate part of the perl startup here.
846 */ 1154 */
847 coro_init_stacks (aTHX); 1155 coro_init_stacks (aTHX);
848 1156
849 PL_runops = RUNOPS_DEFAULT; 1157 PL_runops = RUNOPS_DEFAULT;
850 PL_curcop = &PL_compiling; 1158 PL_curcop = &PL_compiling;
851 PL_in_eval = EVAL_NULL; 1159 PL_in_eval = EVAL_NULL;
852 PL_comppad = 0; 1160 PL_comppad = 0;
1161 PL_comppad_name = 0;
1162 PL_comppad_name_fill = 0;
1163 PL_comppad_name_floor = 0;
853 PL_curpm = 0; 1164 PL_curpm = 0;
854 PL_curpad = 0; 1165 PL_curpad = 0;
855 PL_localizing = 0; 1166 PL_localizing = 0;
856 PL_dirty = 0;
857 PL_restartop = 0; 1167 PL_restartop = 0;
858#if PERL_VERSION_ATLEAST (5,10,0) 1168#if PERL_VERSION_ATLEAST (5,10,0)
859 PL_parser = 0; 1169 PL_parser = 0;
860#endif 1170#endif
1171 PL_hints = 0;
861 1172
862 /* recreate the die/warn hooks */ 1173 /* recreate the die/warn hooks */
863 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1174 PL_diehook = SvREFCNT_inc (rv_diehook);
864 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1175 PL_warnhook = SvREFCNT_inc (rv_warnhook);
865 1176
866 GvSV (PL_defgv) = newSV (0); 1177 GvSV (PL_defgv) = newSV (0);
867 GvAV (PL_defgv) = coro->args; coro->args = 0; 1178 GvAV (PL_defgv) = coro->args; coro->args = 0;
868 GvSV (PL_errgv) = newSV (0); 1179 GvSV (PL_errgv) = newSV (0);
869 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1180 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1181 GvHV (PL_hintgv) = newHV ();
1182#if PERL_VERSION_ATLEAST (5,10,0)
1183 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1184#endif
870 PL_rs = newSVsv (GvSV (irsgv)); 1185 PL_rs = newSVsv (GvSV (irsgv));
871 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1186 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
872 1187
873 { 1188 {
874 dSP; 1189 dSP;
… …
889 /* this newly created coroutine might be run on an existing cctx which most 1204 /* this newly created coroutine might be run on an existing cctx which most
890 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1205 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
891 */ 1206 */
892 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1207 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
893 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1208 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1209 slf_frame.destroy = 0;
894 1210
895 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1211 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
896 coro_setup_op.op_next = PL_op; 1212 init_perl_op.op_next = PL_op;
897 coro_setup_op.op_type = OP_CUSTOM; 1213 init_perl_op.op_type = OP_ENTERSUB;
898 coro_setup_op.op_ppaddr = pp_slf; 1214 init_perl_op.op_ppaddr = pp_slf;
899 /* no flags etc. required, as an init function won't be called */ 1215 /* no flags etc. required, as an init function won't be called */
900 1216
901 PL_op = (OP *)&coro_setup_op; 1217 PL_op = (OP *)&init_perl_op;
902 1218
903 /* copy throw, in case it was set before coro_setup */ 1219 /* copy throw, in case it was set before init_perl */
904 CORO_THROW = coro->except; 1220 CORO_THROW = coro->except;
905}
906 1221
1222 SWAP_SVS (coro);
1223
1224 if (ecb_expect_false (enable_times))
1225 {
1226 coro_times_update ();
1227 coro_times_sub (coro);
1228 }
1229}
1230
907static void 1231static void
908coro_destruct (pTHX_ struct coro *coro) 1232coro_unwind_stacks (pTHX)
909{ 1233{
910 if (!IN_DESTRUCT) 1234 if (!IN_DESTRUCT)
911 { 1235 {
912 /* restore all saved variables and stuff */ 1236 /* restore all saved variables and stuff */
913 LEAVE_SCOPE (0); 1237 LEAVE_SCOPE (0);
… …
921 POPSTACK_TO (PL_mainstack); 1245 POPSTACK_TO (PL_mainstack);
922 1246
923 /* unwind main stack */ 1247 /* unwind main stack */
924 dounwind (-1); 1248 dounwind (-1);
925 } 1249 }
1250}
926 1251
927 SvREFCNT_dec (GvSV (PL_defgv)); 1252static void
928 SvREFCNT_dec (GvAV (PL_defgv)); 1253destroy_perl (pTHX_ struct coro *coro)
929 SvREFCNT_dec (GvSV (PL_errgv)); 1254{
930 SvREFCNT_dec (PL_defoutgv); 1255 SV *svf [9];
931 SvREFCNT_dec (PL_rs);
932 SvREFCNT_dec (GvSV (irsgv));
933 1256
934 SvREFCNT_dec (PL_diehook);
935 SvREFCNT_dec (PL_warnhook);
936 1257 {
1258 SV *old_current = SvRV (coro_current);
1259 struct coro *current = SvSTATE (old_current);
1260
1261 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1262
1263 save_perl (aTHX_ current);
1264
1265 /* this will cause transfer_check to croak on block*/
1266 SvRV_set (coro_current, (SV *)coro->hv);
1267
1268 load_perl (aTHX_ coro);
1269
1270 coro_unwind_stacks (aTHX);
1271
1272 /* restore swapped sv's */
1273 SWAP_SVS (coro);
1274
1275 coro_destruct_stacks (aTHX);
1276
1277 /* now save some sv's to be free'd later */
1278 svf [0] = GvSV (PL_defgv);
1279 svf [1] = (SV *)GvAV (PL_defgv);
1280 svf [2] = GvSV (PL_errgv);
1281 svf [3] = (SV *)PL_defoutgv;
1282 svf [4] = PL_rs;
1283 svf [5] = GvSV (irsgv);
1284 svf [6] = (SV *)GvHV (PL_hintgv);
1285 svf [7] = PL_diehook;
1286 svf [8] = PL_warnhook;
1287 assert (9 == sizeof (svf) / sizeof (*svf));
1288
1289 SvRV_set (coro_current, old_current);
1290
1291 load_perl (aTHX_ current);
1292 }
1293
1294 {
1295 unsigned int i;
1296
1297 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1298 SvREFCNT_dec (svf [i]);
1299
937 SvREFCNT_dec (coro->saved_deffh); 1300 SvREFCNT_dec (coro->saved_deffh);
938 SvREFCNT_dec (coro->rouse_cb); 1301 SvREFCNT_dec (coro->rouse_cb);
939 SvREFCNT_dec (coro->invoke_cb); 1302 SvREFCNT_dec (coro->invoke_cb);
940 SvREFCNT_dec (coro->invoke_av); 1303 SvREFCNT_dec (coro->invoke_av);
941 1304 SvREFCNT_dec (coro->on_enter_xs);
942 coro_destruct_stacks (aTHX); 1305 SvREFCNT_dec (coro->on_leave_xs);
1306 }
943} 1307}
944 1308
945INLINE void 1309ecb_inline void
946free_coro_mortal (pTHX) 1310free_coro_mortal (pTHX)
947{ 1311{
948 if (expect_true (coro_mortal)) 1312 if (ecb_expect_true (coro_mortal))
949 { 1313 {
950 SvREFCNT_dec (coro_mortal); 1314 SvREFCNT_dec ((SV *)coro_mortal);
951 coro_mortal = 0; 1315 coro_mortal = 0;
952 } 1316 }
953} 1317}
954 1318
955static int 1319static int
956runops_trace (pTHX) 1320runops_trace (pTHX)
957{ 1321{
958 COP *oldcop = 0; 1322 COP *oldcop = 0;
959 int oldcxix = -2; 1323 int oldcxix = -2;
960 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
961 coro_cctx *cctx = coro->cctx;
962 1324
963 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1325 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
964 { 1326 {
965 PERL_ASYNC_CHECK (); 1327 PERL_ASYNC_CHECK ();
966 1328
967 if (cctx->flags & CC_TRACE_ALL) 1329 if (cctx_current->flags & CC_TRACE_ALL)
968 { 1330 {
969 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1331 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
970 { 1332 {
971 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1333 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
972 SV **bot, **top; 1334 SV **bot, **top;
973 AV *av = newAV (); /* return values */ 1335 AV *av = newAV (); /* return values */
974 SV **cb; 1336 SV **cb;
… …
1011 1373
1012 if (PL_curcop != &PL_compiling) 1374 if (PL_curcop != &PL_compiling)
1013 { 1375 {
1014 SV **cb; 1376 SV **cb;
1015 1377
1016 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1378 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1017 { 1379 {
1018 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1380 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1019 1381
1020 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1382 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1021 { 1383 {
1022 runops_proc_t old_runops = PL_runops;
1023 dSP; 1384 dSP;
1024 GV *gv = CvGV (cx->blk_sub.cv); 1385 GV *gv = CvGV (cx->blk_sub.cv);
1025 SV *fullname = sv_2mortal (newSV (0)); 1386 SV *fullname = sv_2mortal (newSV (0));
1026 1387
1027 if (isGV (gv)) 1388 if (isGV (gv))
… …
1045 } 1406 }
1046 1407
1047 oldcxix = cxstack_ix; 1408 oldcxix = cxstack_ix;
1048 } 1409 }
1049 1410
1050 if (cctx->flags & CC_TRACE_LINE) 1411 if (cctx_current->flags & CC_TRACE_LINE)
1051 { 1412 {
1052 dSP; 1413 dSP;
1053 1414
1054 PL_runops = RUNOPS_DEFAULT; 1415 PL_runops = RUNOPS_DEFAULT;
1055 ENTER; 1416 ENTER;
… …
1074 1435
1075 TAINT_NOT; 1436 TAINT_NOT;
1076 return 0; 1437 return 0;
1077} 1438}
1078 1439
1079static struct coro_cctx *cctx_ssl_cctx;
1080static struct CoroSLF cctx_ssl_frame; 1440static struct CoroSLF cctx_ssl_frame;
1081 1441
1082static void 1442static void
1083slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1443slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1084{ 1444{
1085 ta->prev = (struct coro *)cctx_ssl_cctx;
1086 ta->next = 0; 1445 ta->prev = 0;
1087} 1446}
1088 1447
1089static int 1448static int
1090slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1449slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1091{ 1450{
… …
1093 1452
1094 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1453 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1095} 1454}
1096 1455
1097/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1456/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1098static void NOINLINE 1457static void ecb_noinline
1099cctx_prepare (pTHX_ coro_cctx *cctx) 1458cctx_prepare (pTHX)
1100{ 1459{
1101 PL_top_env = &PL_start_env; 1460 PL_top_env = &PL_start_env;
1102 1461
1103 if (cctx->flags & CC_TRACE) 1462 if (cctx_current->flags & CC_TRACE)
1104 PL_runops = runops_trace; 1463 PL_runops = runops_trace;
1105 1464
1106 /* we already must be executing an SLF op, there is no other valid way 1465 /* we already must be executing an SLF op, there is no other valid way
1107 * that can lead to creation of a new cctx */ 1466 * that can lead to creation of a new cctx */
1108 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1467 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1109 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1468 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1110 1469
1111 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1470 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1112 cctx_ssl_cctx = cctx;
1113 cctx_ssl_frame = slf_frame; 1471 cctx_ssl_frame = slf_frame;
1114 1472
1115 slf_frame.prepare = slf_prepare_set_stacklevel; 1473 slf_frame.prepare = slf_prepare_set_stacklevel;
1116 slf_frame.check = slf_check_set_stacklevel; 1474 slf_frame.check = slf_check_set_stacklevel;
1117} 1475}
1118 1476
1119/* the tail of transfer: execute stuff we can only do after a transfer */ 1477/* the tail of transfer: execute stuff we can only do after a transfer */
1120INLINE void 1478ecb_inline void
1121transfer_tail (pTHX) 1479transfer_tail (pTHX)
1122{ 1480{
1123 free_coro_mortal (aTHX); 1481 free_coro_mortal (aTHX);
1482}
1483
1484/* try to exit the same way perl's main function would do */
1485/* we do not bother resetting the environment or other things *7
1486/* that are not, uhm, essential */
1487/* this obviously also doesn't work when perl is embedded */
1488static void ecb_noinline ecb_cold
1489perlish_exit (pTHX)
1490{
1491 int exitstatus = perl_destruct (PL_curinterp);
1492 perl_free (PL_curinterp);
1493 exit (exitstatus);
1124} 1494}
1125 1495
1126/* 1496/*
1127 * this is a _very_ stripped down perl interpreter ;) 1497 * this is a _very_ stripped down perl interpreter ;)
1128 */ 1498 */
… …
1140 /* normally we would need to skip the entersub here */ 1510 /* normally we would need to skip the entersub here */
1141 /* not doing so will re-execute it, which is exactly what we want */ 1511 /* not doing so will re-execute it, which is exactly what we want */
1142 /* PL_nop = PL_nop->op_next */ 1512 /* PL_nop = PL_nop->op_next */
1143 1513
1144 /* inject a fake subroutine call to cctx_init */ 1514 /* inject a fake subroutine call to cctx_init */
1145 cctx_prepare (aTHX_ (coro_cctx *)arg); 1515 cctx_prepare (aTHX);
1146 1516
1147 /* cctx_run is the alternative tail of transfer() */ 1517 /* cctx_run is the alternative tail of transfer() */
1148 transfer_tail (aTHX); 1518 transfer_tail (aTHX);
1149 1519
1150 /* somebody or something will hit me for both perl_run and PL_restartop */ 1520 /* somebody or something will hit me for both perl_run and PL_restartop */
1151 PL_restartop = PL_op; 1521 PL_restartop = PL_op;
1152 perl_run (PL_curinterp); 1522 perl_run (PL_curinterp);
1153 /* 1523 /*
1154 * Unfortunately, there is no way to get at the return values of the 1524 * Unfortunately, there is no way to get at the return values of the
1155 * coro body here, as perl_run destroys these 1525 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1526 * runtime errors here, as this is just a random interpreter, not a thread.
1156 */ 1527 */
1157 1528
1158 /* 1529 /*
1159 * If perl-run returns we assume exit() was being called or the coro 1530 * If perl-run returns we assume exit() was being called or the coro
1160 * fell off the end, which seems to be the only valid (non-bug) 1531 * fell off the end, which seems to be the only valid (non-bug)
1161 * reason for perl_run to return. We try to exit by jumping to the 1532 * reason for perl_run to return. We try to mimic whatever perl is normally
1162 * bootstrap-time "top" top_env, as we cannot restore the "main" 1533 * doing in that case. YMMV.
1163 * coroutine as Coro has no such concept
1164 */ 1534 */
1165 PL_top_env = main_top_env; 1535 perlish_exit (aTHX);
1166 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1167 } 1536 }
1168} 1537}
1169 1538
1170static coro_cctx * 1539static coro_cctx *
1171cctx_new () 1540cctx_new (void)
1172{ 1541{
1173 coro_cctx *cctx; 1542 coro_cctx *cctx;
1174 1543
1175 ++cctx_count; 1544 ++cctx_count;
1176 New (0, cctx, 1, coro_cctx); 1545 New (0, cctx, 1, coro_cctx);
… …
1182 return cctx; 1551 return cctx;
1183} 1552}
1184 1553
1185/* create a new cctx only suitable as source */ 1554/* create a new cctx only suitable as source */
1186static coro_cctx * 1555static coro_cctx *
1187cctx_new_empty () 1556cctx_new_empty (void)
1188{ 1557{
1189 coro_cctx *cctx = cctx_new (); 1558 coro_cctx *cctx = cctx_new ();
1190 1559
1191 cctx->sptr = 0; 1560 cctx->stack.sptr = 0;
1192 coro_create (&cctx->cctx, 0, 0, 0, 0); 1561 coro_create (&cctx->cctx, 0, 0, 0, 0);
1193 1562
1194 return cctx; 1563 return cctx;
1195} 1564}
1196 1565
1197/* create a new cctx suitable as destination/running a perl interpreter */ 1566/* create a new cctx suitable as destination/running a perl interpreter */
1198static coro_cctx * 1567static coro_cctx *
1199cctx_new_run () 1568cctx_new_run (void)
1200{ 1569{
1201 coro_cctx *cctx = cctx_new (); 1570 coro_cctx *cctx = cctx_new ();
1202 void *stack_start;
1203 size_t stack_size;
1204 1571
1205#if HAVE_MMAP 1572 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1206 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1207 /* mmap supposedly does allocate-on-write for us */
1208 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1209
1210 if (cctx->sptr != (void *)-1)
1211 {
1212 #if CORO_STACKGUARD
1213 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1214 #endif
1215 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1216 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1217 cctx->flags |= CC_MAPPED;
1218 } 1573 {
1219 else
1220#endif
1221 {
1222 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1223 New (0, cctx->sptr, cctx_stacksize, long);
1224
1225 if (!cctx->sptr)
1226 {
1227 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1574 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1228 _exit (EXIT_FAILURE); 1575 _exit (EXIT_FAILURE);
1229 }
1230
1231 stack_start = cctx->sptr;
1232 stack_size = cctx->ssize;
1233 } 1576 }
1234 1577
1235 #if CORO_USE_VALGRIND
1236 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1237 #endif
1238
1239 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1578 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1240 1579
1241 return cctx; 1580 return cctx;
1242} 1581}
1243 1582
1244static void 1583static void
1245cctx_destroy (coro_cctx *cctx) 1584cctx_destroy (coro_cctx *cctx)
1246{ 1585{
1247 if (!cctx) 1586 if (!cctx)
1248 return; 1587 return;
1249 1588
1589 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1590
1250 --cctx_count; 1591 --cctx_count;
1251 coro_destroy (&cctx->cctx); 1592 coro_destroy (&cctx->cctx);
1252 1593
1253 /* coro_transfer creates new, empty cctx's */ 1594 coro_stack_free (&cctx->stack);
1254 if (cctx->sptr)
1255 {
1256 #if CORO_USE_VALGRIND
1257 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1258 #endif
1259
1260#if HAVE_MMAP
1261 if (cctx->flags & CC_MAPPED)
1262 munmap (cctx->sptr, cctx->ssize);
1263 else
1264#endif
1265 Safefree (cctx->sptr);
1266 }
1267 1595
1268 Safefree (cctx); 1596 Safefree (cctx);
1269} 1597}
1270 1598
1271/* wether this cctx should be destructed */ 1599/* wether this cctx should be destructed */
1272#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1600#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1273 1601
1274static coro_cctx * 1602static coro_cctx *
1275cctx_get (pTHX) 1603cctx_get (pTHX)
1276{ 1604{
1277 while (expect_true (cctx_first)) 1605 while (ecb_expect_true (cctx_first))
1278 { 1606 {
1279 coro_cctx *cctx = cctx_first; 1607 coro_cctx *cctx = cctx_first;
1280 cctx_first = cctx->next; 1608 cctx_first = cctx->next;
1281 --cctx_idle; 1609 --cctx_idle;
1282 1610
1283 if (expect_true (!CCTX_EXPIRED (cctx))) 1611 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1284 return cctx; 1612 return cctx;
1285 1613
1286 cctx_destroy (cctx); 1614 cctx_destroy (cctx);
1287 } 1615 }
1288 1616
… …
1290} 1618}
1291 1619
1292static void 1620static void
1293cctx_put (coro_cctx *cctx) 1621cctx_put (coro_cctx *cctx)
1294{ 1622{
1295 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1623 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1296 1624
1297 /* free another cctx if overlimit */ 1625 /* free another cctx if overlimit */
1298 if (expect_false (cctx_idle >= cctx_max_idle)) 1626 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1299 { 1627 {
1300 coro_cctx *first = cctx_first; 1628 coro_cctx *first = cctx_first;
1301 cctx_first = first->next; 1629 cctx_first = first->next;
1302 --cctx_idle; 1630 --cctx_idle;
1303 1631
… …
1314static void 1642static void
1315transfer_check (pTHX_ struct coro *prev, struct coro *next) 1643transfer_check (pTHX_ struct coro *prev, struct coro *next)
1316{ 1644{
1317 /* TODO: throwing up here is considered harmful */ 1645 /* TODO: throwing up here is considered harmful */
1318 1646
1319 if (expect_true (prev != next)) 1647 if (ecb_expect_true (prev != next))
1320 { 1648 {
1321 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1649 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1322 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1650 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1323 1651
1324 if (expect_false (next->flags & CF_RUNNING)) 1652 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1325 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1326
1327 if (expect_false (next->flags & CF_DESTROYED))
1328 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1653 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1329 1654
1330#if !PERL_VERSION_ATLEAST (5,10,0) 1655#if !PERL_VERSION_ATLEAST (5,10,0)
1331 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1656 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1332 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1657 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1333#endif 1658#endif
1334 } 1659 }
1335} 1660}
1336 1661
1337/* always use the TRANSFER macro */ 1662/* always use the TRANSFER macro */
1338static void NOINLINE /* noinline so we have a fixed stackframe */ 1663static void ecb_noinline /* noinline so we have a fixed stackframe */
1339transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1664transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1340{ 1665{
1341 dSTACKLEVEL; 1666 dSTACKLEVEL;
1342 1667
1343 /* sometimes transfer is only called to set idle_sp */ 1668 /* sometimes transfer is only called to set idle_sp */
1344 if (expect_false (!next)) 1669 if (ecb_expect_false (!prev))
1345 { 1670 {
1346 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1671 cctx_current->idle_sp = STACKLEVEL;
1347 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1672 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1348 } 1673 }
1349 else if (expect_true (prev != next)) 1674 else if (ecb_expect_true (prev != next))
1350 { 1675 {
1351 coro_cctx *prev__cctx; 1676 coro_cctx *cctx_prev;
1352 1677
1353 if (expect_false (prev->flags & CF_NEW)) 1678 if (ecb_expect_false (prev->flags & CF_NEW))
1354 { 1679 {
1355 /* create a new empty/source context */ 1680 /* create a new empty/source context */
1356 prev->cctx = cctx_new_empty ();
1357 prev->flags &= ~CF_NEW; 1681 prev->flags &= ~CF_NEW;
1358 prev->flags |= CF_RUNNING; 1682 prev->flags |= CF_RUNNING;
1359 } 1683 }
1360 1684
1361 prev->flags &= ~CF_RUNNING; 1685 prev->flags &= ~CF_RUNNING;
1362 next->flags |= CF_RUNNING; 1686 next->flags |= CF_RUNNING;
1363 1687
1364 /* first get rid of the old state */ 1688 /* first get rid of the old state */
1365 save_perl (aTHX_ prev); 1689 save_perl (aTHX_ prev);
1366 1690
1367 if (expect_false (next->flags & CF_NEW)) 1691 if (ecb_expect_false (next->flags & CF_NEW))
1368 { 1692 {
1369 /* need to start coroutine */ 1693 /* need to start coroutine */
1370 next->flags &= ~CF_NEW; 1694 next->flags &= ~CF_NEW;
1371 /* setup coroutine call */ 1695 /* setup coroutine call */
1372 coro_setup (aTHX_ next); 1696 init_perl (aTHX_ next);
1373 } 1697 }
1374 else 1698 else
1375 load_perl (aTHX_ next); 1699 load_perl (aTHX_ next);
1376 1700
1377 prev__cctx = prev->cctx;
1378
1379 /* possibly untie and reuse the cctx */ 1701 /* possibly untie and reuse the cctx */
1380 if (expect_true ( 1702 if (ecb_expect_true (
1381 prev__cctx->idle_sp == STACKLEVEL 1703 cctx_current->idle_sp == STACKLEVEL
1382 && !(prev__cctx->flags & CC_TRACE) 1704 && !(cctx_current->flags & CC_TRACE)
1383 && !force_cctx 1705 && !force_cctx
1384 )) 1706 ))
1385 { 1707 {
1386 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1708 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1387 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1709 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1388 1710
1389 prev->cctx = 0;
1390
1391 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1711 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1392 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1712 /* without this the next cctx_get might destroy the running cctx while still in use */
1393 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1713 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1394 if (!next->cctx) 1714 if (ecb_expect_true (!next->cctx))
1395 next->cctx = cctx_get (aTHX); 1715 next->cctx = cctx_get (aTHX);
1396 1716
1397 cctx_put (prev__cctx); 1717 cctx_put (cctx_current);
1398 } 1718 }
1719 else
1720 prev->cctx = cctx_current;
1399 1721
1400 ++next->usecount; 1722 ++next->usecount;
1401 1723
1402 if (expect_true (!next->cctx)) 1724 cctx_prev = cctx_current;
1403 next->cctx = cctx_get (aTHX); 1725 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1404 1726
1405 if (expect_false (prev__cctx != next->cctx)) 1727 next->cctx = 0;
1728
1729 if (ecb_expect_false (cctx_prev != cctx_current))
1406 { 1730 {
1407 prev__cctx->top_env = PL_top_env; 1731 cctx_prev->top_env = PL_top_env;
1408 PL_top_env = next->cctx->top_env; 1732 PL_top_env = cctx_current->top_env;
1409 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1733 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1410 } 1734 }
1411 1735
1412 transfer_tail (aTHX); 1736 transfer_tail (aTHX);
1413 } 1737 }
1414} 1738}
… …
1416#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1740#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1417#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1741#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1418 1742
1419/** high level stuff ********************************************************/ 1743/** high level stuff ********************************************************/
1420 1744
1745/* this function is actually Coro, not Coro::State, but we call it from here */
1746/* because it is convenient - but it hasn't been declared yet for that reason */
1421static int 1747static void
1748coro_call_on_destroy (pTHX_ struct coro *coro);
1749
1750static void
1422coro_state_destroy (pTHX_ struct coro *coro) 1751coro_state_destroy (pTHX_ struct coro *coro)
1423{ 1752{
1424 if (coro->flags & CF_DESTROYED) 1753 if (coro->flags & CF_ZOMBIE)
1425 return 0; 1754 return;
1426 1755
1427 if (coro->on_destroy)
1428 coro->on_destroy (aTHX_ coro); 1756 slf_destroy (aTHX_ coro);
1429 1757
1430 coro->flags |= CF_DESTROYED; 1758 coro->flags |= CF_ZOMBIE;
1431 1759
1432 if (coro->flags & CF_READY) 1760 if (coro->flags & CF_READY)
1433 { 1761 {
1434 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1762 /* reduce nready, as destroying a ready coro effectively unreadies it */
1435 /* alternative: look through all ready queues and remove the coro */ 1763 /* alternative: look through all ready queues and remove the coro */
1436 --coro_nready; 1764 --coro_nready;
1437 } 1765 }
1438 else 1766 else
1439 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1767 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1440 1768
1441 if (coro->mainstack && coro->mainstack != main_mainstack) 1769 if (coro->next) coro->next->prev = coro->prev;
1442 { 1770 if (coro->prev) coro->prev->next = coro->next;
1443 struct coro temp; 1771 if (coro == coro_first) coro_first = coro->next;
1444 1772
1445 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1773 if (coro->mainstack
1446 1774 && coro->mainstack != main_mainstack
1447 save_perl (aTHX_ &temp); 1775 && coro->slot
1776 && !PL_dirty)
1448 load_perl (aTHX_ coro); 1777 destroy_perl (aTHX_ coro);
1449
1450 coro_destruct (aTHX_ coro);
1451
1452 load_perl (aTHX_ &temp);
1453
1454 coro->slot = 0;
1455 }
1456 1778
1457 cctx_destroy (coro->cctx); 1779 cctx_destroy (coro->cctx);
1458 SvREFCNT_dec (coro->startcv); 1780 SvREFCNT_dec (coro->startcv);
1459 SvREFCNT_dec (coro->args); 1781 SvREFCNT_dec (coro->args);
1782 SvREFCNT_dec (coro->swap_sv);
1460 SvREFCNT_dec (CORO_THROW); 1783 SvREFCNT_dec (CORO_THROW);
1461 1784
1462 if (coro->next) coro->next->prev = coro->prev; 1785 coro_call_on_destroy (aTHX_ coro);
1463 if (coro->prev) coro->prev->next = coro->next;
1464 if (coro == coro_first) coro_first = coro->next;
1465 1786
1466 return 1; 1787 /* more destruction mayhem in coro_state_free */
1467} 1788}
1468 1789
1469static int 1790static int
1470coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1791coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1471{ 1792{
1472 struct coro *coro = (struct coro *)mg->mg_ptr; 1793 struct coro *coro = (struct coro *)mg->mg_ptr;
1473 mg->mg_ptr = 0; 1794 mg->mg_ptr = 0;
1474 1795
1475 coro->hv = 0;
1476
1477 if (--coro->refcnt < 0)
1478 {
1479 coro_state_destroy (aTHX_ coro); 1796 coro_state_destroy (aTHX_ coro);
1797 SvREFCNT_dec (coro->on_destroy);
1798 SvREFCNT_dec (coro->status);
1799
1480 Safefree (coro); 1800 Safefree (coro);
1481 }
1482 1801
1483 return 0; 1802 return 0;
1484} 1803}
1485 1804
1486static int 1805static int ecb_cold
1487coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1806coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1488{ 1807{
1489 struct coro *coro = (struct coro *)mg->mg_ptr; 1808 /* called when perl clones the current process the slow way (windows process emulation) */
1490 1809 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1491 ++coro->refcnt; 1810 mg->mg_ptr = 0;
1811 mg->mg_virtual = 0;
1492 1812
1493 return 0; 1813 return 0;
1494} 1814}
1495 1815
1496static MGVTBL coro_state_vtbl = { 1816static MGVTBL coro_state_vtbl = {
… …
1519 1839
1520 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1840 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1521 TRANSFER (ta, 1); 1841 TRANSFER (ta, 1);
1522} 1842}
1523 1843
1524/*****************************************************************************/
1525/* gensub: simple closure generation utility */
1526
1527#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1528
1529/* create a closure from XS, returns a code reference */
1530/* the arg can be accessed via GENSUB_ARG from the callback */
1531/* the callback must use dXSARGS/XSRETURN */
1532static SV *
1533gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1534{
1535 CV *cv = (CV *)newSV (0);
1536
1537 sv_upgrade ((SV *)cv, SVt_PVCV);
1538
1539 CvANON_on (cv);
1540 CvISXSUB_on (cv);
1541 CvXSUB (cv) = xsub;
1542 GENSUB_ARG = arg;
1543
1544 return newRV_noinc ((SV *)cv);
1545}
1546
1547/** Coro ********************************************************************/ 1844/** Coro ********************************************************************/
1548 1845
1549INLINE void 1846ecb_inline void
1550coro_enq (pTHX_ struct coro *coro) 1847coro_enq (pTHX_ struct coro *coro)
1551{ 1848{
1552 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1849 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1553}
1554 1850
1555INLINE SV * 1851 SvREFCNT_inc_NN (coro->hv);
1852
1853 coro->next_ready = 0;
1854 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1855 ready [1] = coro;
1856}
1857
1858ecb_inline struct coro *
1556coro_deq (pTHX) 1859coro_deq (pTHX)
1557{ 1860{
1558 int prio; 1861 int prio;
1559 1862
1560 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1863 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1561 if (AvFILLp (coro_ready [prio]) >= 0) 1864 {
1562 return av_shift (coro_ready [prio]); 1865 struct coro **ready = coro_ready [prio];
1866
1867 if (ready [0])
1868 {
1869 struct coro *coro = ready [0];
1870 ready [0] = coro->next_ready;
1871 return coro;
1872 }
1873 }
1563 1874
1564 return 0; 1875 return 0;
1876}
1877
1878static void
1879invoke_sv_ready_hook_helper (void)
1880{
1881 dTHX;
1882 dSP;
1883
1884 ENTER;
1885 SAVETMPS;
1886
1887 PUSHMARK (SP);
1888 PUTBACK;
1889 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1890
1891 FREETMPS;
1892 LEAVE;
1565} 1893}
1566 1894
1567static int 1895static int
1568api_ready (pTHX_ SV *coro_sv) 1896api_ready (pTHX_ SV *coro_sv)
1569{ 1897{
1570 struct coro *coro;
1571 SV *sv_hook;
1572 void (*xs_hook)(void);
1573
1574 if (SvROK (coro_sv))
1575 coro_sv = SvRV (coro_sv);
1576
1577 coro = SvSTATE (coro_sv); 1898 struct coro *coro = SvSTATE (coro_sv);
1578 1899
1579 if (coro->flags & CF_READY) 1900 if (coro->flags & CF_READY)
1580 return 0; 1901 return 0;
1581 1902
1582 coro->flags |= CF_READY; 1903 coro->flags |= CF_READY;
1583 1904
1584 sv_hook = coro_nready ? 0 : coro_readyhook;
1585 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1586
1587 coro_enq (aTHX_ coro); 1905 coro_enq (aTHX_ coro);
1588 ++coro_nready;
1589 1906
1590 if (sv_hook) 1907 if (!coro_nready++)
1591 { 1908 if (coroapi.readyhook)
1592 dSP; 1909 coroapi.readyhook ();
1593
1594 ENTER;
1595 SAVETMPS;
1596
1597 PUSHMARK (SP);
1598 PUTBACK;
1599 call_sv (sv_hook, G_VOID | G_DISCARD);
1600
1601 FREETMPS;
1602 LEAVE;
1603 }
1604
1605 if (xs_hook)
1606 xs_hook ();
1607 1910
1608 return 1; 1911 return 1;
1609} 1912}
1610 1913
1611static int 1914static int
… …
1613{ 1916{
1614 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1917 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1615} 1918}
1616 1919
1617/* expects to own a reference to next->hv */ 1920/* expects to own a reference to next->hv */
1618INLINE void 1921ecb_inline void
1619prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1922prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1620{ 1923{
1621 SV *prev_sv = SvRV (coro_current); 1924 SV *prev_sv = SvRV (coro_current);
1622 1925
1623 ta->prev = SvSTATE_hv (prev_sv); 1926 ta->prev = SvSTATE_hv (prev_sv);
… …
1634static void 1937static void
1635prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1938prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1636{ 1939{
1637 for (;;) 1940 for (;;)
1638 { 1941 {
1639 SV *next_sv = coro_deq (aTHX); 1942 struct coro *next = coro_deq (aTHX);
1640 1943
1641 if (expect_true (next_sv)) 1944 if (ecb_expect_true (next))
1642 { 1945 {
1643 struct coro *next = SvSTATE_hv (next_sv);
1644
1645 /* cannot transfer to destroyed coros, skip and look for next */ 1946 /* cannot transfer to destroyed coros, skip and look for next */
1646 if (expect_false (next->flags & CF_DESTROYED)) 1947 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1647 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1948 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1648 else 1949 else
1649 { 1950 {
1650 next->flags &= ~CF_READY; 1951 next->flags &= ~CF_READY;
1651 --coro_nready; 1952 --coro_nready;
1652 1953
1653 return prepare_schedule_to (aTHX_ ta, next); 1954 prepare_schedule_to (aTHX_ ta, next);
1955 break;
1654 } 1956 }
1655 } 1957 }
1656 else 1958 else
1657 { 1959 {
1658 /* nothing to schedule: call the idle handler */ 1960 /* nothing to schedule: call the idle handler */
1961 if (SvROK (sv_idle)
1962 && SvOBJECT (SvRV (sv_idle)))
1963 {
1964 if (SvRV (sv_idle) == SvRV (coro_current))
1965 {
1966 require_pv ("Carp");
1967
1968 {
1969 dSP;
1970
1971 ENTER;
1972 SAVETMPS;
1973
1974 PUSHMARK (SP);
1975 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1976 PUTBACK;
1977 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1978
1979 FREETMPS;
1980 LEAVE;
1981 }
1982 }
1983
1984 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1985 api_ready (aTHX_ SvRV (sv_idle));
1986 --coro_nready;
1987 }
1988 else
1989 {
1990 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1659 dSP; 1991 dSP;
1660 1992
1661 ENTER; 1993 ENTER;
1662 SAVETMPS; 1994 SAVETMPS;
1663 1995
1664 PUSHMARK (SP); 1996 PUSHMARK (SP);
1665 PUTBACK; 1997 PUTBACK;
1666 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1998 call_sv (sv_idle, G_VOID | G_DISCARD);
1667 1999
1668 FREETMPS; 2000 FREETMPS;
1669 LEAVE; 2001 LEAVE;
2002 }
1670 } 2003 }
1671 } 2004 }
1672} 2005}
1673 2006
1674INLINE void 2007ecb_inline void
1675prepare_cede (pTHX_ struct coro_transfer_args *ta) 2008prepare_cede (pTHX_ struct coro_transfer_args *ta)
1676{ 2009{
1677 api_ready (aTHX_ coro_current); 2010 api_ready (aTHX_ coro_current);
1678 prepare_schedule (aTHX_ ta); 2011 prepare_schedule (aTHX_ ta);
1679} 2012}
1680 2013
1681INLINE void 2014ecb_inline void
1682prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2015prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1683{ 2016{
1684 SV *prev = SvRV (coro_current); 2017 SV *prev = SvRV (coro_current);
1685 2018
1686 if (coro_nready) 2019 if (coro_nready)
… …
1716{ 2049{
1717 struct coro_transfer_args ta; 2050 struct coro_transfer_args ta;
1718 2051
1719 prepare_cede (aTHX_ &ta); 2052 prepare_cede (aTHX_ &ta);
1720 2053
1721 if (expect_true (ta.prev != ta.next)) 2054 if (ecb_expect_true (ta.prev != ta.next))
1722 { 2055 {
1723 TRANSFER (ta, 1); 2056 TRANSFER (ta, 1);
1724 return 1; 2057 return 1;
1725 } 2058 }
1726 else 2059 else
… …
1745static void 2078static void
1746api_trace (pTHX_ SV *coro_sv, int flags) 2079api_trace (pTHX_ SV *coro_sv, int flags)
1747{ 2080{
1748 struct coro *coro = SvSTATE (coro_sv); 2081 struct coro *coro = SvSTATE (coro_sv);
1749 2082
2083 if (coro->flags & CF_RUNNING)
2084 croak ("cannot enable tracing on a running coroutine, caught");
2085
1750 if (flags & CC_TRACE) 2086 if (flags & CC_TRACE)
1751 { 2087 {
1752 if (!coro->cctx) 2088 if (!coro->cctx)
1753 coro->cctx = cctx_new_run (); 2089 coro->cctx = cctx_new_run ();
1754 else if (!(coro->cctx->flags & CC_TRACE)) 2090 else if (!(coro->cctx->flags & CC_TRACE))
1755 croak ("cannot enable tracing on coroutine with custom stack,"); 2091 croak ("cannot enable tracing on coroutine with custom stack, caught");
1756 2092
1757 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 2093 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1758 } 2094 }
1759 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 2095 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1760 { 2096 {
… …
1763 if (coro->flags & CF_RUNNING) 2099 if (coro->flags & CF_RUNNING)
1764 PL_runops = RUNOPS_DEFAULT; 2100 PL_runops = RUNOPS_DEFAULT;
1765 else 2101 else
1766 coro->slot->runops = RUNOPS_DEFAULT; 2102 coro->slot->runops = RUNOPS_DEFAULT;
1767 } 2103 }
2104}
2105
2106static void
2107coro_push_av (pTHX_ AV *av, I32 gimme_v)
2108{
2109 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2110 {
2111 dSP;
2112
2113 if (gimme_v == G_SCALAR)
2114 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2115 else
2116 {
2117 int i;
2118 EXTEND (SP, AvFILLp (av) + 1);
2119
2120 for (i = 0; i <= AvFILLp (av); ++i)
2121 PUSHs (AvARRAY (av)[i]);
2122 }
2123
2124 PUTBACK;
2125 }
2126}
2127
2128static void
2129coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2130{
2131 if (!coro->on_destroy)
2132 coro->on_destroy = newAV ();
2133
2134 av_push (coro->on_destroy, cb);
2135}
2136
2137static void
2138slf_destroy_join (pTHX_ struct CoroSLF *frame)
2139{
2140 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2141}
2142
2143static int
2144slf_check_join (pTHX_ struct CoroSLF *frame)
2145{
2146 struct coro *coro = (struct coro *)frame->data;
2147
2148 if (!coro->status)
2149 return 1;
2150
2151 frame->destroy = 0;
2152
2153 coro_push_av (aTHX_ coro->status, GIMME_V);
2154
2155 SvREFCNT_dec ((SV *)coro->hv);
2156
2157 return 0;
2158}
2159
2160static void
2161slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2162{
2163 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2164
2165 if (items > 1)
2166 croak ("join called with too many arguments");
2167
2168 if (coro->status)
2169 frame->prepare = prepare_nop;
2170 else
2171 {
2172 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2173 frame->prepare = prepare_schedule;
2174 }
2175
2176 frame->check = slf_check_join;
2177 frame->destroy = slf_destroy_join;
2178 frame->data = (void *)coro;
2179 SvREFCNT_inc (coro->hv);
2180}
2181
2182static void
2183coro_call_on_destroy (pTHX_ struct coro *coro)
2184{
2185 AV *od = coro->on_destroy;
2186
2187 if (!od)
2188 return;
2189
2190 coro->on_destroy = 0;
2191 sv_2mortal ((SV *)od);
2192
2193 while (AvFILLp (od) >= 0)
2194 {
2195 SV *cb = sv_2mortal (av_pop (od));
2196
2197 /* coro hv's (and only hv's at the moment) are supported as well */
2198 if (SvSTATEhv_p (aTHX_ cb))
2199 api_ready (aTHX_ cb);
2200 else
2201 {
2202 dSP; /* don't disturb outer sp */
2203 PUSHMARK (SP);
2204
2205 if (coro->status)
2206 {
2207 PUTBACK;
2208 coro_push_av (aTHX_ coro->status, G_ARRAY);
2209 SPAGAIN;
2210 }
2211
2212 PUTBACK;
2213 call_sv (cb, G_VOID | G_DISCARD);
2214 }
2215 }
2216}
2217
2218static void
2219coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2220{
2221 AV *av;
2222
2223 if (coro->status)
2224 {
2225 av = coro->status;
2226 av_clear (av);
2227 }
2228 else
2229 av = coro->status = newAV ();
2230
2231 /* items are actually not so common, so optimise for this case */
2232 if (items)
2233 {
2234 int i;
2235
2236 av_extend (av, items - 1);
2237
2238 for (i = 0; i < items; ++i)
2239 av_push (av, SvREFCNT_inc_NN (arg [i]));
2240 }
2241}
2242
2243static void
2244slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2245{
2246 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2247 api_ready (aTHX_ sv_manager);
2248
2249 frame->prepare = prepare_schedule;
2250 frame->check = slf_check_repeat;
2251
2252 /* as a minor optimisation, we could unwind all stacks here */
2253 /* but that puts extra pressure on pp_slf, and is not worth much */
2254 /*coro_unwind_stacks (aTHX);*/
2255}
2256
2257static void
2258slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2259{
2260 HV *coro_hv = (HV *)SvRV (coro_current);
2261
2262 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2263 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2264}
2265
2266static void
2267slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2268{
2269 HV *coro_hv;
2270 struct coro *coro;
2271
2272 if (items <= 0)
2273 croak ("Coro::cancel called without coro object,");
2274
2275 coro = SvSTATE (arg [0]);
2276 coro_hv = coro->hv;
2277
2278 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2279
2280 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2281 {
2282 /* coro currently busy cancelling something, so just notify it */
2283 coro->slf_frame.data = (void *)coro;
2284
2285 frame->prepare = prepare_nop;
2286 frame->check = slf_check_nop;
2287 }
2288 else if (coro_hv == (HV *)SvRV (coro_current))
2289 {
2290 /* cancelling the current coro is allowed, and equals terminate */
2291 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2292 }
2293 else
2294 {
2295 struct coro *self = SvSTATE_current;
2296
2297 if (!self)
2298 croak ("Coro::cancel called outside of thread content,");
2299
2300 /* otherwise we cancel directly, purely for speed reasons
2301 * unfortunately, this requires some magic trickery, as
2302 * somebody else could cancel us, so we have to fight the cancellation.
2303 * this is ugly, and hopefully fully worth the extra speed.
2304 * besides, I can't get the slow-but-safe version working...
2305 */
2306 slf_frame.data = 0;
2307 self->flags |= CF_NOCANCEL;
2308 coro_state_destroy (aTHX_ coro);
2309 self->flags &= ~CF_NOCANCEL;
2310
2311 if (slf_frame.data)
2312 {
2313 /* while we were busy we have been cancelled, so terminate */
2314 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2315 }
2316 else
2317 {
2318 frame->prepare = prepare_nop;
2319 frame->check = slf_check_nop;
2320 }
2321 }
2322}
2323
2324static int
2325slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2326{
2327 frame->prepare = 0;
2328 coro_unwind_stacks (aTHX);
2329
2330 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2331
2332 return 1;
2333}
2334
2335static int
2336safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2337{
2338 if (coro->cctx)
2339 croak ("coro inside C callback, unable to cancel at this time, caught");
2340
2341 if (coro->flags & CF_NEW)
2342 {
2343 coro_set_status (aTHX_ coro, arg, items);
2344 coro_state_destroy (aTHX_ coro);
2345 }
2346 else
2347 {
2348 if (!coro->slf_frame.prepare)
2349 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2350
2351 slf_destroy (aTHX_ coro);
2352
2353 coro_set_status (aTHX_ coro, arg, items);
2354 coro->slf_frame.prepare = prepare_nop;
2355 coro->slf_frame.check = slf_check_safe_cancel;
2356
2357 api_ready (aTHX_ (SV *)coro->hv);
2358 }
2359
2360 return 1;
1768} 2361}
1769 2362
1770/*****************************************************************************/ 2363/*****************************************************************************/
1771/* async pool handler */ 2364/* async pool handler */
1772 2365
… …
1803slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2396slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1804{ 2397{
1805 HV *hv = (HV *)SvRV (coro_current); 2398 HV *hv = (HV *)SvRV (coro_current);
1806 struct coro *coro = SvSTATE_hv ((SV *)hv); 2399 struct coro *coro = SvSTATE_hv ((SV *)hv);
1807 2400
1808 if (expect_true (coro->saved_deffh)) 2401 if (ecb_expect_true (coro->saved_deffh))
1809 { 2402 {
1810 /* subsequent iteration */ 2403 /* subsequent iteration */
1811 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2404 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1812 coro->saved_deffh = 0; 2405 coro->saved_deffh = 0;
1813 2406
1814 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2407 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1815 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2408 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1816 { 2409 {
1817 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2410 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1818 coro->invoke_av = newAV (); 2411 return;
1819
1820 frame->prepare = prepare_nop;
1821 } 2412 }
1822 else 2413 else
1823 { 2414 {
1824 av_clear (GvAV (PL_defgv)); 2415 av_clear (GvAV (PL_defgv));
1825 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2416 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
1850 2441
1851static void 2442static void
1852coro_rouse_callback (pTHX_ CV *cv) 2443coro_rouse_callback (pTHX_ CV *cv)
1853{ 2444{
1854 dXSARGS; 2445 dXSARGS;
1855 SV *data = (SV *)GENSUB_ARG; 2446 SV *data = (SV *)S_GENSUB_ARG;
1856 2447
1857 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2448 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1858 { 2449 {
1859 /* first call, set args */ 2450 /* first call, set args */
2451 SV *coro = SvRV (data);
1860 AV *av = newAV (); 2452 AV *av = newAV ();
1861 SV *coro = SvRV (data);
1862 2453
1863 SvRV_set (data, (SV *)av); 2454 SvRV_set (data, (SV *)av);
1864 api_ready (aTHX_ coro);
1865 SvREFCNT_dec (coro);
1866 2455
1867 /* better take a full copy of the arguments */ 2456 /* better take a full copy of the arguments */
1868 while (items--) 2457 while (items--)
1869 av_store (av, items, newSVsv (ST (items))); 2458 av_store (av, items, newSVsv (ST (items)));
2459
2460 api_ready (aTHX_ coro);
2461 SvREFCNT_dec (coro);
1870 } 2462 }
1871 2463
1872 XSRETURN_EMPTY; 2464 XSRETURN_EMPTY;
1873} 2465}
1874 2466
1875static int 2467static int
1876slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2468slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
1877{ 2469{
1878 SV *data = (SV *)frame->data; 2470 SV *data = (SV *)frame->data;
1879 2471
1880 if (CORO_THROW) 2472 if (CORO_THROW)
1881 return 0; 2473 return 0;
1882 2474
1883 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2475 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1884 return 1; 2476 return 1;
… …
1891 2483
1892 EXTEND (SP, AvFILLp (av) + 1); 2484 EXTEND (SP, AvFILLp (av) + 1);
1893 for (i = 0; i <= AvFILLp (av); ++i) 2485 for (i = 0; i <= AvFILLp (av); ++i)
1894 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2486 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1895 2487
1896 /* we have stolen the elements, so ste length to zero and free */ 2488 /* we have stolen the elements, so set length to zero and free */
1897 AvFILLp (av) = -1; 2489 AvFILLp (av) = -1;
1898 av_undef (av); 2490 av_undef (av);
1899 2491
1900 PUTBACK; 2492 PUTBACK;
1901 } 2493 }
… …
1920 cb = sv_2mortal (coro->rouse_cb); 2512 cb = sv_2mortal (coro->rouse_cb);
1921 coro->rouse_cb = 0; 2513 coro->rouse_cb = 0;
1922 } 2514 }
1923 2515
1924 if (!SvROK (cb) 2516 if (!SvROK (cb)
1925 || SvTYPE (SvRV (cb)) != SVt_PVCV 2517 || SvTYPE (SvRV (cb)) != SVt_PVCV
1926 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2518 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1927 croak ("Coro::rouse_wait called with illegal callback argument,"); 2519 croak ("Coro::rouse_wait called with illegal callback argument,");
1928 2520
1929 { 2521 {
1930 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2522 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1931 SV *data = (SV *)GENSUB_ARG; 2523 SV *data = (SV *)S_GENSUB_ARG;
1932 2524
1933 frame->data = (void *)data; 2525 frame->data = (void *)data;
1934 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2526 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1935 frame->check = slf_check_rouse_wait; 2527 frame->check = slf_check_rouse_wait;
1936 } 2528 }
… …
1940coro_new_rouse_cb (pTHX) 2532coro_new_rouse_cb (pTHX)
1941{ 2533{
1942 HV *hv = (HV *)SvRV (coro_current); 2534 HV *hv = (HV *)SvRV (coro_current);
1943 struct coro *coro = SvSTATE_hv (hv); 2535 struct coro *coro = SvSTATE_hv (hv);
1944 SV *data = newRV_inc ((SV *)hv); 2536 SV *data = newRV_inc ((SV *)hv);
1945 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2537 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
1946 2538
1947 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2539 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
1948 SvREFCNT_dec (data); /* magicext increases the refcount */ 2540 SvREFCNT_dec (data); /* magicext increases the refcount */
1949 2541
1950 SvREFCNT_dec (coro->rouse_cb); 2542 SvREFCNT_dec (coro->rouse_cb);
… …
2047static void 2639static void
2048slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2640slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2049{ 2641{
2050 frame->prepare = prepare_cede_notself; 2642 frame->prepare = prepare_cede_notself;
2051 frame->check = slf_check_nop; 2643 frame->check = slf_check_nop;
2644}
2645
2646/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2647static void
2648slf_destroy (pTHX_ struct coro *coro)
2649{
2650 struct CoroSLF frame = coro->slf_frame;
2651
2652 /*
2653 * The on_destroy below most likely is from an SLF call.
2654 * Since by definition the SLF call will not finish when we destroy
2655 * the coro, we will have to force-finish it here, otherwise
2656 * cleanup functions cannot call SLF functions.
2657 */
2658 coro->slf_frame.prepare = 0;
2659
2660 /* this callback is reserved for slf functions needing to do cleanup */
2661 if (frame.destroy && frame.prepare && !PL_dirty)
2662 frame.destroy (aTHX_ &frame);
2052} 2663}
2053 2664
2054/* 2665/*
2055 * these not obviously related functions are all rolled into one 2666 * these not obviously related functions are all rolled into one
2056 * function to increase chances that they all will call transfer with the same 2667 * function to increase chances that they all will call transfer with the same
… …
2063 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2674 I32 checkmark; /* mark SP to see how many elements check has pushed */
2064 2675
2065 /* set up the slf frame, unless it has already been set-up */ 2676 /* set up the slf frame, unless it has already been set-up */
2066 /* the latter happens when a new coro has been started */ 2677 /* the latter happens when a new coro has been started */
2067 /* or when a new cctx was attached to an existing coroutine */ 2678 /* or when a new cctx was attached to an existing coroutine */
2068 if (expect_true (!slf_frame.prepare)) 2679 if (ecb_expect_true (!slf_frame.prepare))
2069 { 2680 {
2070 /* first iteration */ 2681 /* first iteration */
2071 dSP; 2682 dSP;
2072 SV **arg = PL_stack_base + TOPMARK + 1; 2683 SV **arg = PL_stack_base + TOPMARK + 1;
2073 int items = SP - arg; /* args without function object */ 2684 int items = SP - arg; /* args without function object */
… …
2114 while (slf_frame.check (aTHX_ &slf_frame)); 2725 while (slf_frame.check (aTHX_ &slf_frame));
2115 2726
2116 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2727 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2117 2728
2118 /* exception handling */ 2729 /* exception handling */
2119 if (expect_false (CORO_THROW)) 2730 if (ecb_expect_false (CORO_THROW))
2120 { 2731 {
2121 SV *exception = sv_2mortal (CORO_THROW); 2732 SV *exception = sv_2mortal (CORO_THROW);
2122 2733
2123 CORO_THROW = 0; 2734 CORO_THROW = 0;
2124 sv_setsv (ERRSV, exception); 2735 sv_setsv (ERRSV, exception);
2125 croak (0); 2736 croak (0);
2126 } 2737 }
2127 2738
2128 /* return value handling - mostly like entersub */ 2739 /* return value handling - mostly like entersub */
2129 /* make sure we put something on the stack in scalar context */ 2740 /* make sure we put something on the stack in scalar context */
2130 if (GIMME_V == G_SCALAR) 2741 if (GIMME_V == G_SCALAR
2742 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2131 { 2743 {
2132 dSP; 2744 dSP;
2133 SV **bot = PL_stack_base + checkmark; 2745 SV **bot = PL_stack_base + checkmark;
2134 2746
2135 if (sp == bot) /* too few, push undef */ 2747 if (sp == bot) /* too few, push undef */
2136 bot [1] = &PL_sv_undef; 2748 bot [1] = &PL_sv_undef;
2137 else if (sp != bot + 1) /* too many, take last one */ 2749 else /* too many, take last one */
2138 bot [1] = *sp; 2750 bot [1] = *sp;
2139 2751
2140 SP = bot + 1; 2752 SP = bot + 1;
2141 2753
2142 PUTBACK; 2754 PUTBACK;
… …
2175 if (PL_op->op_flags & OPf_STACKED) 2787 if (PL_op->op_flags & OPf_STACKED)
2176 { 2788 {
2177 if (items > slf_arga) 2789 if (items > slf_arga)
2178 { 2790 {
2179 slf_arga = items; 2791 slf_arga = items;
2180 free (slf_argv); 2792 Safefree (slf_argv);
2181 slf_argv = malloc (slf_arga * sizeof (SV *)); 2793 New (0, slf_argv, slf_arga, SV *);
2182 } 2794 }
2183 2795
2184 slf_argc = items; 2796 slf_argc = items;
2185 2797
2186 for (i = 0; i < items; ++i) 2798 for (i = 0; i < items; ++i)
… …
2188 } 2800 }
2189 else 2801 else
2190 slf_argc = 0; 2802 slf_argc = 0;
2191 2803
2192 PL_op->op_ppaddr = pp_slf; 2804 PL_op->op_ppaddr = pp_slf;
2193 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2805 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2194 2806
2195 PL_op = (OP *)&slf_restore; 2807 PL_op = (OP *)&slf_restore;
2808}
2809
2810/*****************************************************************************/
2811/* dynamic wind */
2812
2813static void
2814on_enterleave_call (pTHX_ SV *cb)
2815{
2816 dSP;
2817
2818 PUSHSTACK;
2819
2820 PUSHMARK (SP);
2821 PUTBACK;
2822 call_sv (cb, G_VOID | G_DISCARD);
2823 SPAGAIN;
2824
2825 POPSTACK;
2826}
2827
2828static SV *
2829coro_avp_pop_and_free (pTHX_ AV **avp)
2830{
2831 AV *av = *avp;
2832 SV *res = av_pop (av);
2833
2834 if (AvFILLp (av) < 0)
2835 {
2836 *avp = 0;
2837 SvREFCNT_dec (av);
2838 }
2839
2840 return res;
2841}
2842
2843static void
2844coro_pop_on_enter (pTHX_ void *coro)
2845{
2846 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2847 SvREFCNT_dec (cb);
2848}
2849
2850static void
2851coro_pop_on_leave (pTHX_ void *coro)
2852{
2853 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2854 on_enterleave_call (aTHX_ sv_2mortal (cb));
2855}
2856
2857static void
2858enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2859{
2860 if (!hook)
2861 return;
2862
2863 if (!*avp)
2864 {
2865 *avp = newAV ();
2866 AvREAL_off (*avp);
2867 }
2868
2869 av_push (*avp, (SV *)hook);
2870 av_push (*avp, (SV *)arg);
2871}
2872
2873static void
2874enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2875{
2876 AV *av = *avp;
2877 int i;
2878
2879 if (!av)
2880 return;
2881
2882 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2883 if (AvARRAY (av)[i] == (SV *)hook)
2884 {
2885 if (execute)
2886 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2887
2888 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2889 av_pop (av);
2890 av_pop (av);
2891 break;
2892 }
2893
2894 if (AvFILLp (av) >= 0)
2895 {
2896 *avp = 0;
2897 SvREFCNT_dec_NN (av);
2898 }
2899}
2900
2901static void
2902api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2903{
2904 struct coro *coro = SvSTATE (coro_sv);
2905
2906 if (SvSTATE_current == coro)
2907 if (enter)
2908 enter (aTHX_ enter_arg);
2909
2910 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2911 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2912}
2913
2914static void
2915api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2916{
2917 struct coro *coro = SvSTATE (coro_sv);
2918
2919 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2920 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2921}
2922
2923static void
2924savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2925{
2926 struct coro *coro = SvSTATE_current;
2927
2928 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2929}
2930
2931static void
2932savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2933{
2934 struct coro *coro = SvSTATE_current;
2935
2936 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2937}
2938
2939static void
2940api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2941{
2942 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2943
2944 /* this ought to be much cheaper than malloc + a single destructor call */
2945 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2946 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2196} 2947}
2197 2948
2198/*****************************************************************************/ 2949/*****************************************************************************/
2199/* PerlIO::cede */ 2950/* PerlIO::cede */
2200 2951
… …
2202{ 2953{
2203 PerlIOBuf base; 2954 PerlIOBuf base;
2204 NV next, every; 2955 NV next, every;
2205} PerlIOCede; 2956} PerlIOCede;
2206 2957
2207static IV 2958static IV ecb_cold
2208PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2959PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2209{ 2960{
2210 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2961 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2211 2962
2212 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2963 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2213 self->next = nvtime () + self->every; 2964 self->next = nvtime () + self->every;
2214 2965
2215 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2966 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2216} 2967}
2217 2968
2218static SV * 2969static SV * ecb_cold
2219PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2970PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2220{ 2971{
2221 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2972 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2222 2973
2223 return newSVnv (self->every); 2974 return newSVnv (self->every);
… …
2274/* Coro::Semaphore & Coro::Signal */ 3025/* Coro::Semaphore & Coro::Signal */
2275 3026
2276static SV * 3027static SV *
2277coro_waitarray_new (pTHX_ int count) 3028coro_waitarray_new (pTHX_ int count)
2278{ 3029{
2279 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3030 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2280 AV *av = newAV (); 3031 AV *av = newAV ();
2281 SV **ary; 3032 SV **ary;
2282 3033
2283 /* unfortunately, building manually saves memory */ 3034 /* unfortunately, building manually saves memory */
2284 Newx (ary, 2, SV *); 3035 Newx (ary, 2, SV *);
2285 AvALLOC (av) = ary; 3036 AvALLOC (av) = ary;
3037#if PERL_VERSION_ATLEAST (5,10,0)
2286 /*AvARRAY (av) = ary;*/ 3038 AvARRAY (av) = ary;
3039#else
2287 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 3040 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
3041 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
3042 SvPVX ((SV *)av) = (char *)ary;
3043#endif
2288 AvMAX (av) = 1; 3044 AvMAX (av) = 1;
2289 AvFILLp (av) = 0; 3045 AvFILLp (av) = 0;
2290 ary [0] = newSViv (count); 3046 ary [0] = newSViv (count);
2291 3047
2292 return newRV_noinc ((SV *)av); 3048 return newRV_noinc ((SV *)av);
… …
2325 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3081 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2326 PUTBACK; 3082 PUTBACK;
2327 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3083 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2328 } 3084 }
2329 3085
2330 SvREFCNT_dec (cb); 3086 SvREFCNT_dec_NN (cb);
2331 } 3087 }
2332} 3088}
2333 3089
2334static void 3090static void
2335coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3091coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2336{ 3092{
2337 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3093 /* call $sem->adjust (0) to possibly wake up some other waiters */
2338 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3094 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2339} 3095}
2340 3096
2341static int 3097static int
2342slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3098slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2343{ 3099{
2344 AV *av = (AV *)frame->data; 3100 AV *av = (AV *)frame->data;
2345 SV *count_sv = AvARRAY (av)[0]; 3101 SV *count_sv = AvARRAY (av)[0];
3102 SV *coro_hv = SvRV (coro_current);
3103
3104 frame->destroy = 0;
2346 3105
2347 /* if we are about to throw, don't actually acquire the lock, just throw */ 3106 /* if we are about to throw, don't actually acquire the lock, just throw */
2348 if (CORO_THROW) 3107 if (ecb_expect_false (CORO_THROW))
3108 {
3109 /* we still might be responsible for the semaphore, so wake up others */
3110 coro_semaphore_adjust (aTHX_ av, 0);
3111
2349 return 0; 3112 return 0;
3113 }
2350 else if (SvIVX (count_sv) > 0) 3114 else if (SvIVX (count_sv) > 0)
2351 { 3115 {
2352 SvSTATE_current->on_destroy = 0;
2353
2354 if (acquire) 3116 if (acquire)
2355 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3117 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2356 else 3118 else
2357 coro_semaphore_adjust (aTHX_ av, 0); 3119 coro_semaphore_adjust (aTHX_ av, 0);
2358 3120
… …
2362 { 3124 {
2363 int i; 3125 int i;
2364 /* if we were woken up but can't down, we look through the whole */ 3126 /* if we were woken up but can't down, we look through the whole */
2365 /* waiters list and only add us if we aren't in there already */ 3127 /* waiters list and only add us if we aren't in there already */
2366 /* this avoids some degenerate memory usage cases */ 3128 /* this avoids some degenerate memory usage cases */
2367 3129 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2368 for (i = 1; i <= AvFILLp (av); ++i)
2369 if (AvARRAY (av)[i] == SvRV (coro_current)) 3130 if (AvARRAY (av)[i] == coro_hv)
2370 return 1; 3131 return 1;
2371 3132
2372 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3133 av_push (av, SvREFCNT_inc (coro_hv));
2373 return 1; 3134 return 1;
2374 } 3135 }
2375} 3136}
2376 3137
2377static int 3138static int
… …
2400 { 3161 {
2401 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3162 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2402 3163
2403 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3164 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2404 frame->prepare = prepare_schedule; 3165 frame->prepare = prepare_schedule;
2405
2406 /* to avoid race conditions when a woken-up coro gets terminated */ 3166 /* to avoid race conditions when a woken-up coro gets terminated */
2407 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3167 /* we arrange for a temporary on_destroy that calls adjust (0) */
2408 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3168 frame->destroy = coro_semaphore_destroy;
2409 } 3169 }
2410} 3170}
2411 3171
2412static void 3172static void
2413slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3173slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2421{ 3181{
2422 if (items >= 2) 3182 if (items >= 2)
2423 { 3183 {
2424 /* callback form */ 3184 /* callback form */
2425 AV *av = (AV *)SvRV (arg [0]); 3185 AV *av = (AV *)SvRV (arg [0]);
2426 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3186 SV *cb_cv = s_get_cv_croak (arg [1]);
2427 3187
2428 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3188 av_push (av, SvREFCNT_inc_NN (cb_cv));
2429 3189
2430 if (SvIVX (AvARRAY (av)[0]) > 0) 3190 if (SvIVX (AvARRAY (av)[0]) > 0)
2431 coro_semaphore_adjust (aTHX_ av, 0); 3191 coro_semaphore_adjust (aTHX_ av, 0);
2432 3192
2433 frame->prepare = prepare_nop; 3193 frame->prepare = prepare_nop;
… …
2457 AvARRAY (av)[0] = AvARRAY (av)[1]; 3217 AvARRAY (av)[0] = AvARRAY (av)[1];
2458 AvARRAY (av)[1] = cb; 3218 AvARRAY (av)[1] = cb;
2459 3219
2460 cb = av_shift (av); 3220 cb = av_shift (av);
2461 3221
3222 if (SvTYPE (cb) == SVt_PVCV)
3223 {
3224 dSP;
3225 PUSHMARK (SP);
3226 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3227 PUTBACK;
3228 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3229 }
3230 else
3231 {
2462 api_ready (aTHX_ cb); 3232 api_ready (aTHX_ cb);
2463 sv_setiv (cb, 0); /* signal waiter */ 3233 sv_setiv (cb, 0); /* signal waiter */
3234 }
3235
2464 SvREFCNT_dec (cb); 3236 SvREFCNT_dec_NN (cb);
2465 3237
2466 --count; 3238 --count;
2467 } 3239 }
2468} 3240}
2469 3241
… …
2477static void 3249static void
2478slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3250slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2479{ 3251{
2480 AV *av = (AV *)SvRV (arg [0]); 3252 AV *av = (AV *)SvRV (arg [0]);
2481 3253
3254 if (items >= 2)
3255 {
3256 SV *cb_cv = s_get_cv_croak (arg [1]);
3257 av_push (av, SvREFCNT_inc_NN (cb_cv));
3258
2482 if (SvIVX (AvARRAY (av)[0])) 3259 if (SvIVX (AvARRAY (av)[0]))
3260 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3261
3262 frame->prepare = prepare_nop;
3263 frame->check = slf_check_nop;
3264 }
3265 else if (SvIVX (AvARRAY (av)[0]))
2483 { 3266 {
2484 SvIVX (AvARRAY (av)[0]) = 0; 3267 SvIVX (AvARRAY (av)[0]) = 0;
2485 frame->prepare = prepare_nop; 3268 frame->prepare = prepare_nop;
2486 frame->check = slf_check_nop; 3269 frame->check = slf_check_nop;
2487 } 3270 }
2488 else 3271 else
2489 { 3272 {
2490 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3273 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2491 3274
2492 av_push (av, waiter); 3275 av_push (av, waiter);
2493 3276
2494 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3277 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2495 frame->prepare = prepare_schedule; 3278 frame->prepare = prepare_schedule;
… …
2513 3296
2514static void 3297static void
2515coro_aio_callback (pTHX_ CV *cv) 3298coro_aio_callback (pTHX_ CV *cv)
2516{ 3299{
2517 dXSARGS; 3300 dXSARGS;
2518 AV *state = (AV *)GENSUB_ARG; 3301 AV *state = (AV *)S_GENSUB_ARG;
2519 SV *coro = av_pop (state); 3302 SV *coro = av_pop (state);
2520 SV *data_sv = newSV (sizeof (struct io_state)); 3303 SV *data_sv = newSV (sizeof (struct io_state));
2521 3304
2522 av_extend (state, items - 1); 3305 av_extend (state, items - 1);
2523 3306
… …
2543 } 3326 }
2544 3327
2545 av_push (state, data_sv); 3328 av_push (state, data_sv);
2546 3329
2547 api_ready (aTHX_ coro); 3330 api_ready (aTHX_ coro);
2548 SvREFCNT_dec (coro); 3331 SvREFCNT_dec_NN (coro);
2549 SvREFCNT_dec ((AV *)state); 3332 SvREFCNT_dec_NN ((AV *)state);
2550} 3333}
2551 3334
2552static int 3335static int
2553slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3336slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2554{ 3337{
… …
2559 /* it quickly returns */ 3342 /* it quickly returns */
2560 if (CORO_THROW) 3343 if (CORO_THROW)
2561 return 0; 3344 return 0;
2562 3345
2563 /* one element that is an RV? repeat! */ 3346 /* one element that is an RV? repeat! */
2564 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3347 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2565 return 1; 3348 return 1;
2566 3349
2567 /* restore status */ 3350 /* restore status */
2568 { 3351 {
2569 SV *data_sv = av_pop (state); 3352 SV *data_sv = av_pop (state);
… …
2572 errno = data->errorno; 3355 errno = data->errorno;
2573 PL_laststype = data->laststype; 3356 PL_laststype = data->laststype;
2574 PL_laststatval = data->laststatval; 3357 PL_laststatval = data->laststatval;
2575 PL_statcache = data->statcache; 3358 PL_statcache = data->statcache;
2576 3359
2577 SvREFCNT_dec (data_sv); 3360 SvREFCNT_dec_NN (data_sv);
2578 } 3361 }
2579 3362
2580 /* push result values */ 3363 /* push result values */
2581 { 3364 {
2582 dSP; 3365 dSP;
… …
2608 dSP; 3391 dSP;
2609 3392
2610 static SV *prio_cv; 3393 static SV *prio_cv;
2611 static SV *prio_sv; 3394 static SV *prio_sv;
2612 3395
2613 if (expect_false (!prio_cv)) 3396 if (ecb_expect_false (!prio_cv))
2614 { 3397 {
2615 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3398 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2616 prio_sv = newSViv (0); 3399 prio_sv = newSViv (0);
2617 } 3400 }
2618 3401
… …
2637 3420
2638 for (i = 0; i < items; ++i) 3421 for (i = 0; i < items; ++i)
2639 PUSHs (arg [i]); 3422 PUSHs (arg [i]);
2640 3423
2641 /* now push the callback closure */ 3424 /* now push the callback closure */
2642 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3425 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2643 3426
2644 /* now call the AIO function - we assume our request is uncancelable */ 3427 /* now call the AIO function - we assume our request is uncancelable */
2645 PUTBACK; 3428 PUTBACK;
2646 call_sv ((SV *)req, G_VOID | G_DISCARD); 3429 call_sv ((SV *)req, G_VOID | G_DISCARD);
2647 } 3430 }
2648 3431
2649 /* now that the requets is going, we loop toll we have a result */ 3432 /* now that the request is going, we loop till we have a result */
2650 frame->data = (void *)state; 3433 frame->data = (void *)state;
2651 frame->prepare = prepare_schedule; 3434 frame->prepare = prepare_schedule;
2652 frame->check = slf_check_aio_req; 3435 frame->check = slf_check_aio_req;
2653} 3436}
2654 3437
… …
2662 XSRETURN_EMPTY; 3445 XSRETURN_EMPTY;
2663} 3446}
2664 3447
2665/*****************************************************************************/ 3448/*****************************************************************************/
2666 3449
3450#if CORO_CLONE
3451# include "clone.c"
3452#endif
3453
3454/*****************************************************************************/
3455
3456static SV *
3457coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3458{
3459 SV *coro_sv;
3460 struct coro *coro;
3461 MAGIC *mg;
3462 HV *hv;
3463 SV *cb;
3464 int i;
3465
3466 if (argc > 0)
3467 {
3468 cb = s_get_cv_croak (argv [0]);
3469
3470 if (!is_coro)
3471 {
3472 if (CvISXSUB (cb))
3473 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3474
3475 if (!CvROOT (cb))
3476 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3477 }
3478 }
3479
3480 Newz (0, coro, 1, struct coro);
3481 coro->args = newAV ();
3482 coro->flags = CF_NEW;
3483
3484 if (coro_first) coro_first->prev = coro;
3485 coro->next = coro_first;
3486 coro_first = coro;
3487
3488 coro->hv = hv = newHV ();
3489 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3490 mg->mg_flags |= MGf_DUP;
3491 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3492
3493 if (argc > 0)
3494 {
3495 av_extend (coro->args, argc + is_coro - 1);
3496
3497 if (is_coro)
3498 {
3499 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3500 cb = (SV *)cv_coro_run;
3501 }
3502
3503 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3504
3505 for (i = 1; i < argc; i++)
3506 av_push (coro->args, newSVsv (argv [i]));
3507 }
3508
3509 return coro_sv;
3510}
3511
3512#ifndef __cplusplus
3513ecb_cold XS(boot_Coro__State);
3514#endif
3515
3516#if CORO_JIT
3517
3518static void ecb_noinline ecb_cold
3519pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3520{
3521 dSP;
3522 AV *av = newAV ();
3523
3524 av_store (av, 3, newSVuv (d));
3525 av_store (av, 2, newSVuv (c));
3526 av_store (av, 1, newSVuv (b));
3527 av_store (av, 0, newSVuv (a));
3528
3529 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3530
3531 PUTBACK;
3532}
3533
3534static void ecb_noinline ecb_cold
3535jit_init (pTHX)
3536{
3537 dSP;
3538 SV *load, *save;
3539 char *map_base;
3540 char *load_ptr, *save_ptr;
3541 STRLEN load_len, save_len, map_len;
3542 int count;
3543
3544 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3545
3546 PUSHMARK (SP);
3547 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3548 #include "state.h"
3549 count = call_pv ("Coro::State::_jit", G_ARRAY);
3550 SPAGAIN;
3551
3552 save = POPs; save_ptr = SvPVbyte (save, save_len);
3553 load = POPs; load_ptr = SvPVbyte (load, load_len);
3554
3555 map_len = load_len + save_len + 16;
3556
3557 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3558
3559 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3560
3561 load_perl_slots = (load_save_perl_slots_type)map_base;
3562 memcpy (map_base, load_ptr, load_len);
3563
3564 map_base += (load_len + 15) & ~15;
3565
3566 save_perl_slots = (load_save_perl_slots_type)map_base;
3567 memcpy (map_base, save_ptr, save_len);
3568
3569 /* we are good citizens and try to make the page read-only, so the evil evil */
3570 /* hackers might have it a bit more difficult */
3571 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3572
3573 PUTBACK;
3574 eval_pv ("undef &Coro::State::_jit", 1);
3575}
3576
3577#endif
3578
2667MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3579MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2668 3580
2669PROTOTYPES: DISABLE 3581PROTOTYPES: DISABLE
2670 3582
2671BOOT: 3583BOOT:
2672{ 3584{
3585#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3586#include "state.h"
2673#ifdef USE_ITHREADS 3587#ifdef USE_ITHREADS
2674# if CORO_PTHREAD 3588# if CORO_PTHREAD
2675 coro_thx = PERL_GET_CONTEXT; 3589 coro_thx = PERL_GET_CONTEXT;
2676# endif 3590# endif
2677#endif 3591#endif
2678 BOOT_PAGESIZE; 3592 /* perl defines these to check for existance first, but why it doesn't */
3593 /* just create them one at init time is not clear to me, except for */
3594 /* programs trying to delete them, but... */
3595 /* anyway, we declare this as invalid and make sure they are initialised here */
3596 DEFSV;
3597 ERRSV;
3598
3599 cctx_current = cctx_new_empty ();
2679 3600
2680 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3601 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2681 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3602 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2682 3603
2683 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3604 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2684 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3605 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
2685 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3606 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
2686 3607
2687 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
2688 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3608 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
2689 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3609 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
2690 3610
2691 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3611 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
2692 3612
… …
2703 3623
2704 { 3624 {
2705 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3625 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2706 3626
2707 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3627 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2708 hv_store_ent (PL_custom_op_names, slf, 3628 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2709 newSVpv ("coro_slf", 0), 0);
2710 3629
2711 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3630 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2712 hv_store_ent (PL_custom_op_descs, slf, 3631 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2713 newSVpv ("coro schedule like function", 0), 0);
2714 } 3632 }
2715 3633
2716 coroapi.ver = CORO_API_VERSION; 3634 coroapi.ver = CORO_API_VERSION;
2717 coroapi.rev = CORO_API_REVISION; 3635 coroapi.rev = CORO_API_REVISION;
2718 3636
… …
2723 coroapi.prepare_nop = prepare_nop; 3641 coroapi.prepare_nop = prepare_nop;
2724 coroapi.prepare_schedule = prepare_schedule; 3642 coroapi.prepare_schedule = prepare_schedule;
2725 coroapi.prepare_cede = prepare_cede; 3643 coroapi.prepare_cede = prepare_cede;
2726 coroapi.prepare_cede_notself = prepare_cede_notself; 3644 coroapi.prepare_cede_notself = prepare_cede_notself;
2727 3645
2728 { 3646 time_init (aTHX);
2729 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2730 3647
2731 if (!svp) croak ("Time::HiRes is required");
2732 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2733
2734 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2735 }
2736
2737 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3648 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3649#if CORO_JIT
3650 PUTBACK;
3651 jit_init (aTHX);
3652 SPAGAIN;
3653#endif
2738} 3654}
2739 3655
2740SV * 3656SV *
2741new (char *klass, ...) 3657new (SV *klass, ...)
2742 ALIAS: 3658 ALIAS:
2743 Coro::new = 1 3659 Coro::new = 1
2744 CODE: 3660 CODE:
2745{ 3661 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2746 struct coro *coro; 3662 OUTPUT:
2747 MAGIC *mg;
2748 HV *hv;
2749 CV *cb;
2750 int i;
2751
2752 if (items > 1)
2753 {
2754 cb = coro_sv_2cv (aTHX_ ST (1));
2755
2756 if (!ix)
2757 {
2758 if (CvISXSUB (cb))
2759 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2760
2761 if (!CvROOT (cb))
2762 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2763 }
2764 }
2765
2766 Newz (0, coro, 1, struct coro);
2767 coro->args = newAV ();
2768 coro->flags = CF_NEW;
2769
2770 if (coro_first) coro_first->prev = coro;
2771 coro->next = coro_first;
2772 coro_first = coro;
2773
2774 coro->hv = hv = newHV ();
2775 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2776 mg->mg_flags |= MGf_DUP;
2777 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2778
2779 if (items > 1)
2780 {
2781 av_extend (coro->args, items - 1 + ix - 1);
2782
2783 if (ix)
2784 {
2785 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2786 cb = cv_coro_run;
2787 }
2788
2789 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2790
2791 for (i = 2; i < items; i++)
2792 av_push (coro->args, newSVsv (ST (i)));
2793 }
2794}
2795 OUTPUT:
2796 RETVAL 3663 RETVAL
2797 3664
2798void 3665void
2799transfer (...) 3666transfer (...)
2800 PROTOTYPE: $$ 3667 PROTOTYPE: $$
2801 CODE: 3668 CODE:
2802 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3669 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2803 3670
2804bool 3671SV *
2805_destroy (SV *coro_sv) 3672clone (Coro::State coro)
2806 CODE: 3673 CODE:
2807 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 3674{
3675#if CORO_CLONE
3676 struct coro *ncoro = coro_clone (aTHX_ coro);
3677 MAGIC *mg;
3678 /* TODO: too much duplication */
3679 ncoro->hv = newHV ();
3680 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3681 mg->mg_flags |= MGf_DUP;
3682 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3683#else
3684 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3685#endif
3686}
2808 OUTPUT: 3687 OUTPUT:
2809 RETVAL 3688 RETVAL
2810
2811void
2812_exit (int code)
2813 PROTOTYPE: $
2814 CODE:
2815 _exit (code);
2816 3689
2817int 3690int
2818cctx_stacksize (int new_stacksize = 0) 3691cctx_stacksize (int new_stacksize = 0)
2819 PROTOTYPE: ;$ 3692 PROTOTYPE: ;$
2820 CODE: 3693 CODE:
… …
2856void 3729void
2857list () 3730list ()
2858 PROTOTYPE: 3731 PROTOTYPE:
2859 PPCODE: 3732 PPCODE:
2860{ 3733{
2861 struct coro *coro; 3734 struct coro *coro;
2862 for (coro = coro_first; coro; coro = coro->next) 3735 for (coro = coro_first; coro; coro = coro->next)
2863 if (coro->hv) 3736 if (coro->hv)
2864 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3737 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
2865} 3738}
2866 3739
… …
2870 eval = 1 3743 eval = 1
2871 CODE: 3744 CODE:
2872{ 3745{
2873 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3746 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2874 { 3747 {
2875 struct coro temp; 3748 struct coro *current = SvSTATE_current;
3749 struct CoroSLF slf_save;
2876 3750
2877 if (!(coro->flags & CF_RUNNING)) 3751 if (current != coro)
2878 { 3752 {
2879 PUTBACK; 3753 PUTBACK;
2880 save_perl (aTHX_ &temp); 3754 save_perl (aTHX_ current);
2881 load_perl (aTHX_ coro); 3755 load_perl (aTHX_ coro);
3756 /* the coro is most likely in an active SLF call.
3757 * while not strictly required (the code we execute is
3758 * not allowed to call any SLF functions), it's cleaner
3759 * to reinitialise the slf_frame and restore it later.
3760 * This might one day allow us to actually do SLF calls
3761 * from code executed here.
3762 */
3763 slf_save = slf_frame;
3764 slf_frame.prepare = 0;
3765 SPAGAIN;
2882 } 3766 }
2883 3767
2884 {
2885 dSP;
2886 ENTER;
2887 SAVETMPS;
2888 PUTBACK;
2889 PUSHSTACK; 3768 PUSHSTACK;
3769
2890 PUSHMARK (SP); 3770 PUSHMARK (SP);
3771 PUTBACK;
2891 3772
2892 if (ix) 3773 if (ix)
2893 eval_sv (coderef, 0); 3774 eval_sv (coderef, 0);
2894 else 3775 else
2895 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3776 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2896 3777
2897 POPSTACK; 3778 POPSTACK;
2898 SPAGAIN; 3779 SPAGAIN;
2899 FREETMPS;
2900 LEAVE;
2901 PUTBACK;
2902 }
2903 3780
2904 if (!(coro->flags & CF_RUNNING)) 3781 if (current != coro)
2905 { 3782 {
3783 PUTBACK;
3784 slf_frame = slf_save;
2906 save_perl (aTHX_ coro); 3785 save_perl (aTHX_ coro);
2907 load_perl (aTHX_ &temp); 3786 load_perl (aTHX_ current);
2908 SPAGAIN; 3787 SPAGAIN;
2909 } 3788 }
2910 } 3789 }
2911} 3790}
2912 3791
… …
2915 PROTOTYPE: $ 3794 PROTOTYPE: $
2916 ALIAS: 3795 ALIAS:
2917 is_ready = CF_READY 3796 is_ready = CF_READY
2918 is_running = CF_RUNNING 3797 is_running = CF_RUNNING
2919 is_new = CF_NEW 3798 is_new = CF_NEW
2920 is_destroyed = CF_DESTROYED 3799 is_destroyed = CF_ZOMBIE
3800 is_zombie = CF_ZOMBIE
3801 is_suspended = CF_SUSPENDED
2921 CODE: 3802 CODE:
2922 RETVAL = boolSV (coro->flags & ix); 3803 RETVAL = boolSV (coro->flags & ix);
2923 OUTPUT: 3804 OUTPUT:
2924 RETVAL 3805 RETVAL
2925 3806
2926void 3807void
2927throw (Coro::State self, SV *throw = &PL_sv_undef) 3808throw (SV *self, SV *exception = &PL_sv_undef)
2928 PROTOTYPE: $;$ 3809 PROTOTYPE: $;$
2929 CODE: 3810 CODE:
2930{ 3811{
3812 struct coro *coro = SvSTATE (self);
2931 struct coro *current = SvSTATE_current; 3813 struct coro *current = SvSTATE_current;
2932 SV **throwp = self == current ? &CORO_THROW : &self->except; 3814 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
2933 SvREFCNT_dec (*throwp); 3815 SvREFCNT_dec (*exceptionp);
2934 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3816 SvGETMAGIC (exception);
3817 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3818
3819 api_ready (aTHX_ self);
2935} 3820}
2936 3821
2937void 3822void
2938api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3823api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2939 PROTOTYPE: $;$ 3824 PROTOTYPE: $;$
… …
2941 3826
2942SV * 3827SV *
2943has_cctx (Coro::State coro) 3828has_cctx (Coro::State coro)
2944 PROTOTYPE: $ 3829 PROTOTYPE: $
2945 CODE: 3830 CODE:
2946 RETVAL = boolSV (!!coro->cctx); 3831 /* maybe manage the running flag differently */
3832 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2947 OUTPUT: 3833 OUTPUT:
2948 RETVAL 3834 RETVAL
2949 3835
2950int 3836int
2951is_traced (Coro::State coro) 3837is_traced (Coro::State coro)
… …
2971 3857
2972void 3858void
2973force_cctx () 3859force_cctx ()
2974 PROTOTYPE: 3860 PROTOTYPE:
2975 CODE: 3861 CODE:
2976 SvSTATE_current->cctx->idle_sp = 0; 3862 cctx_current->idle_sp = 0;
2977 3863
2978void 3864void
2979swap_defsv (Coro::State self) 3865swap_defsv (Coro::State self)
2980 PROTOTYPE: $ 3866 PROTOTYPE: $
2981 ALIAS: 3867 ALIAS:
… …
2989 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3875 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2990 3876
2991 SV *tmp = *src; *src = *dst; *dst = tmp; 3877 SV *tmp = *src; *src = *dst; *dst = tmp;
2992 } 3878 }
2993 3879
3880void
3881cancel (Coro::State self)
3882 CODE:
3883 coro_state_destroy (aTHX_ self);
3884
3885SV *
3886enable_times (int enabled = enable_times)
3887 CODE:
3888{
3889 RETVAL = boolSV (enable_times);
3890
3891 if (enabled != enable_times)
3892 {
3893 enable_times = enabled;
3894
3895 coro_times_update ();
3896 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3897 }
3898}
3899 OUTPUT:
3900 RETVAL
3901
3902void
3903times (Coro::State self)
3904 PPCODE:
3905{
3906 struct coro *current = SvSTATE (coro_current);
3907
3908 if (ecb_expect_false (current == self))
3909 {
3910 coro_times_update ();
3911 coro_times_add (SvSTATE (coro_current));
3912 }
3913
3914 EXTEND (SP, 2);
3915 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3916 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3917
3918 if (ecb_expect_false (current == self))
3919 coro_times_sub (SvSTATE (coro_current));
3920}
3921
3922void
3923swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3924 CODE:
3925{
3926 struct coro *current = SvSTATE_current;
3927
3928 if (current == coro)
3929 SWAP_SVS (current);
3930
3931 if (!coro->swap_sv)
3932 coro->swap_sv = newAV ();
3933
3934 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3935 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3936
3937 if (current == coro)
3938 SWAP_SVS (current);
3939}
3940
2994 3941
2995MODULE = Coro::State PACKAGE = Coro 3942MODULE = Coro::State PACKAGE = Coro
2996 3943
2997BOOT: 3944BOOT:
2998{ 3945{
2999 int i; 3946 if (SVt_LAST > 32)
3947 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3000 3948
3001 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3002 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3949 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3003 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3950 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3004 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3951 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3005 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3006 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3952 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3953 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3954 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3955 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3956 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3007 3957
3008 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3958 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3009 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3959 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3010 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3960 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3011 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3961 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3012 3962
3013 coro_stash = gv_stashpv ("Coro", TRUE); 3963 coro_stash = gv_stashpv ("Coro", TRUE);
3014 3964
3015 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3965 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3016 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3966 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3017 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3967 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3018 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3968 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3019 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3969 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3020 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3970 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3021
3022 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3023 coro_ready[i] = newAV ();
3024 3971
3025 { 3972 {
3026 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3973 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3027 3974
3028 coroapi.schedule = api_schedule; 3975 coroapi.schedule = api_schedule;
… …
3032 coroapi.ready = api_ready; 3979 coroapi.ready = api_ready;
3033 coroapi.is_ready = api_is_ready; 3980 coroapi.is_ready = api_is_ready;
3034 coroapi.nready = coro_nready; 3981 coroapi.nready = coro_nready;
3035 coroapi.current = coro_current; 3982 coroapi.current = coro_current;
3036 3983
3984 coroapi.enterleave_hook = api_enterleave_hook;
3985 coroapi.enterleave_unhook = api_enterleave_unhook;
3986 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3987
3037 /*GCoroAPI = &coroapi;*/ 3988 /*GCoroAPI = &coroapi;*/
3038 sv_setiv (sv, (IV)&coroapi); 3989 sv_setiv (sv, (IV)&coroapi);
3039 SvREADONLY_on (sv); 3990 SvREADONLY_on (sv);
3040 } 3991 }
3041} 3992}
3042 3993
3994SV *
3995async (...)
3996 PROTOTYPE: &@
3997 CODE:
3998 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3999 api_ready (aTHX_ RETVAL);
4000 OUTPUT:
4001 RETVAL
4002
4003void
4004_destroy (Coro::State coro)
4005 CODE:
4006 /* used by the manager thread */
4007 coro_state_destroy (aTHX_ coro);
4008
4009void
4010on_destroy (Coro::State coro, SV *cb)
4011 CODE:
4012 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4013
4014void
4015join (...)
4016 CODE:
4017 CORO_EXECUTE_SLF_XS (slf_init_join);
4018
4019void
4020terminate (...)
4021 CODE:
4022 CORO_EXECUTE_SLF_XS (slf_init_terminate);
4023
4024void
4025cancel (...)
4026 CODE:
4027 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4028
4029int
4030safe_cancel (Coro::State self, ...)
4031 C_ARGS: aTHX_ self, &ST (1), items - 1
4032
3043void 4033void
3044schedule (...) 4034schedule (...)
3045 CODE: 4035 CODE:
3046 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4036 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3047 4037
… …
3067 4057
3068void 4058void
3069_set_current (SV *current) 4059_set_current (SV *current)
3070 PROTOTYPE: $ 4060 PROTOTYPE: $
3071 CODE: 4061 CODE:
3072 SvREFCNT_dec (SvRV (coro_current)); 4062 SvREFCNT_dec_NN (SvRV (coro_current));
3073 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4063 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3074 4064
3075void 4065void
3076_set_readyhook (SV *hook) 4066_set_readyhook (SV *hook)
3077 PROTOTYPE: $ 4067 PROTOTYPE: $
3078 CODE: 4068 CODE:
3079 SvREFCNT_dec (coro_readyhook); 4069 SvREFCNT_dec (coro_readyhook);
4070 SvGETMAGIC (hook);
4071 if (SvOK (hook))
4072 {
3080 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 4073 coro_readyhook = newSVsv (hook);
4074 CORO_READYHOOK = invoke_sv_ready_hook_helper;
4075 }
4076 else
4077 {
4078 coro_readyhook = 0;
4079 CORO_READYHOOK = 0;
4080 }
3081 4081
3082int 4082int
3083prio (Coro::State coro, int newprio = 0) 4083prio (Coro::State coro, int newprio = 0)
3084 PROTOTYPE: $;$ 4084 PROTOTYPE: $;$
3085 ALIAS: 4085 ALIAS:
… …
3091 if (items > 1) 4091 if (items > 1)
3092 { 4092 {
3093 if (ix) 4093 if (ix)
3094 newprio = coro->prio - newprio; 4094 newprio = coro->prio - newprio;
3095 4095
3096 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 4096 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3097 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 4097 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3098 4098
3099 coro->prio = newprio; 4099 coro->prio = newprio;
3100 } 4100 }
3101} 4101}
3102 OUTPUT: 4102 OUTPUT:
… …
3117 RETVAL = coro_nready; 4117 RETVAL = coro_nready;
3118 OUTPUT: 4118 OUTPUT:
3119 RETVAL 4119 RETVAL
3120 4120
3121void 4121void
4122suspend (Coro::State self)
4123 PROTOTYPE: $
4124 CODE:
4125 self->flags |= CF_SUSPENDED;
4126
4127void
4128resume (Coro::State self)
4129 PROTOTYPE: $
4130 CODE:
4131 self->flags &= ~CF_SUSPENDED;
4132
4133void
3122_pool_handler (...) 4134_pool_handler (...)
3123 CODE: 4135 CODE:
3124 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 4136 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3125 4137
3126void 4138void
… …
3137 for (i = 1; i < items; ++i) 4149 for (i = 1; i < items; ++i)
3138 av_push (av, SvREFCNT_inc_NN (ST (i))); 4150 av_push (av, SvREFCNT_inc_NN (ST (i)));
3139 4151
3140 if ((SV *)hv == &PL_sv_undef) 4152 if ((SV *)hv == &PL_sv_undef)
3141 { 4153 {
3142 PUSHMARK (SP); 4154 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3143 EXTEND (SP, 2);
3144 PUSHs (sv_Coro);
3145 PUSHs ((SV *)cv_pool_handler);
3146 PUTBACK;
3147 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3148 SPAGAIN;
3149
3150 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4155 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4156 SvREFCNT_dec_NN (sv);
3151 } 4157 }
3152 4158
3153 { 4159 {
3154 struct coro *coro = SvSTATE_hv (hv); 4160 struct coro *coro = SvSTATE_hv (hv);
3155 4161
… …
3162 api_ready (aTHX_ (SV *)hv); 4168 api_ready (aTHX_ (SV *)hv);
3163 4169
3164 if (GIMME_V != G_VOID) 4170 if (GIMME_V != G_VOID)
3165 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4171 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3166 else 4172 else
3167 SvREFCNT_dec (hv); 4173 SvREFCNT_dec_NN (hv);
3168} 4174}
3169 4175
3170SV * 4176SV *
3171rouse_cb () 4177rouse_cb ()
3172 PROTOTYPE: 4178 PROTOTYPE:
… …
3179rouse_wait (...) 4185rouse_wait (...)
3180 PROTOTYPE: ;$ 4186 PROTOTYPE: ;$
3181 PPCODE: 4187 PPCODE:
3182 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 4188 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3183 4189
4190void
4191on_enter (SV *block)
4192 ALIAS:
4193 on_leave = 1
4194 PROTOTYPE: &
4195 CODE:
4196{
4197 struct coro *coro = SvSTATE_current;
4198 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4199
4200 block = s_get_cv_croak (block);
4201
4202 if (!*avp)
4203 *avp = newAV ();
4204
4205 av_push (*avp, SvREFCNT_inc (block));
4206
4207 if (!ix)
4208 on_enterleave_call (aTHX_ block);
4209
4210 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4211 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
4212 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4213}
4214
3184 4215
3185MODULE = Coro::State PACKAGE = PerlIO::cede 4216MODULE = Coro::State PACKAGE = PerlIO::cede
3186 4217
3187BOOT: 4218BOOT:
3188 PerlIO_define_layer (aTHX_ &PerlIO_cede); 4219 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3191MODULE = Coro::State PACKAGE = Coro::Semaphore 4222MODULE = Coro::State PACKAGE = Coro::Semaphore
3192 4223
3193SV * 4224SV *
3194new (SV *klass, SV *count = 0) 4225new (SV *klass, SV *count = 0)
3195 CODE: 4226 CODE:
4227{
4228 int semcnt = 1;
4229
4230 if (count)
4231 {
4232 SvGETMAGIC (count);
4233
4234 if (SvOK (count))
4235 semcnt = SvIV (count);
4236 }
4237
3196 RETVAL = sv_bless ( 4238 RETVAL = sv_bless (
3197 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4239 coro_waitarray_new (aTHX_ semcnt),
3198 GvSTASH (CvGV (cv)) 4240 GvSTASH (CvGV (cv))
3199 ); 4241 );
4242}
3200 OUTPUT: 4243 OUTPUT:
3201 RETVAL 4244 RETVAL
3202 4245
3203# helper for Coro::Channel 4246# helper for Coro::Channel and others
3204SV * 4247SV *
3205_alloc (int count) 4248_alloc (int count)
3206 CODE: 4249 CODE:
3207 RETVAL = coro_waitarray_new (aTHX_ count); 4250 RETVAL = coro_waitarray_new (aTHX_ count);
3208 OUTPUT: 4251 OUTPUT:
… …
3250 XSRETURN_NO; 4293 XSRETURN_NO;
3251} 4294}
3252 4295
3253void 4296void
3254waiters (SV *self) 4297waiters (SV *self)
3255 PPCODE: 4298 PPCODE:
3256{ 4299{
3257 AV *av = (AV *)SvRV (self); 4300 AV *av = (AV *)SvRV (self);
3258 int wcount = AvFILLp (av) + 1 - 1; 4301 int wcount = AvFILLp (av) + 1 - 1;
3259 4302
3260 if (GIMME_V == G_SCALAR) 4303 if (GIMME_V == G_SCALAR)
… …
3266 for (i = 1; i <= wcount; ++i) 4309 for (i = 1; i <= wcount; ++i)
3267 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4310 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3268 } 4311 }
3269} 4312}
3270 4313
4314MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4315
4316void
4317_may_delete (SV *sem, int count, unsigned int extra_refs)
4318 PPCODE:
4319{
4320 AV *av = (AV *)SvRV (sem);
4321
4322 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4323 && AvFILLp (av) == 0 /* no waiters, just count */
4324 && SvIV (AvARRAY (av)[0]) == count)
4325 XSRETURN_YES;
4326
4327 XSRETURN_NO;
4328}
4329
3271MODULE = Coro::State PACKAGE = Coro::Signal 4330MODULE = Coro::State PACKAGE = Coro::Signal
3272 4331
3273SV * 4332SV *
3274new (SV *klass) 4333new (SV *klass)
3275 CODE: 4334 CODE:
… …
3287 4346
3288void 4347void
3289broadcast (SV *self) 4348broadcast (SV *self)
3290 CODE: 4349 CODE:
3291{ 4350{
3292 AV *av = (AV *)SvRV (self); 4351 AV *av = (AV *)SvRV (self);
3293 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4352 coro_signal_wake (aTHX_ av, AvFILLp (av));
3294} 4353}
3295 4354
3296void 4355void
3297send (SV *self) 4356send (SV *self)
… …
3305 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4364 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3306} 4365}
3307 4366
3308IV 4367IV
3309awaited (SV *self) 4368awaited (SV *self)
3310 CODE: 4369 CODE:
3311 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4370 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3312 OUTPUT: 4371 OUTPUT:
3313 RETVAL 4372 RETVAL
3314 4373
3315 4374
… …
3320 4379
3321void 4380void
3322_schedule (...) 4381_schedule (...)
3323 CODE: 4382 CODE:
3324{ 4383{
3325 static int incede; 4384 static int incede;
3326 4385
3327 api_cede_notself (aTHX); 4386 api_cede_notself (aTHX);
3328 4387
3329 ++incede; 4388 ++incede;
3330 while (coro_nready >= incede && api_cede (aTHX)) 4389 while (coro_nready >= incede && api_cede (aTHX))
… …
3346 4405
3347void 4406void
3348_register (char *target, char *proto, SV *req) 4407_register (char *target, char *proto, SV *req)
3349 CODE: 4408 CODE:
3350{ 4409{
3351 CV *req_cv = coro_sv_2cv (aTHX_ req); 4410 SV *req_cv = s_get_cv_croak (req);
3352 /* newXSproto doesn't return the CV on 5.8 */ 4411 /* newXSproto doesn't return the CV on 5.8 */
3353 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4412 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3354 sv_setpv ((SV *)slf_cv, proto); 4413 sv_setpv ((SV *)slf_cv, proto);
3355 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4414 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3356} 4415}
3357 4416
4417MODULE = Coro::State PACKAGE = Coro::Select
4418
4419void
4420patch_pp_sselect ()
4421 CODE:
4422 if (!coro_old_pp_sselect)
4423 {
4424 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4425 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4426 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4427 }
4428
4429void
4430unpatch_pp_sselect ()
4431 CODE:
4432 if (coro_old_pp_sselect)
4433 {
4434 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4435 coro_old_pp_sselect = 0;
4436 }
4437
4438MODULE = Coro::State PACKAGE = Coro::Util
4439
4440void
4441_exit (int code)
4442 CODE:
4443 _exit (code);
4444
4445NV
4446time ()
4447 CODE:
4448 RETVAL = nvtime (aTHX);
4449 OUTPUT:
4450 RETVAL
4451
4452NV
4453gettimeofday ()
4454 PPCODE:
4455{
4456 UV tv [2];
4457 u2time (aTHX_ tv);
4458 EXTEND (SP, 2);
4459 PUSHs (sv_2mortal (newSVuv (tv [0])));
4460 PUSHs (sv_2mortal (newSVuv (tv [1])));
4461}
4462

Diff Legend

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