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.316 by root, Thu Nov 20 06:01:40 2008 UTC vs.
Revision 1.449 by root, Sun Jun 21 17:02:49 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 SVs_PADSTALE
28# define SVs_PADSTALE 0
29#endif
30
31#ifdef PadARRAY
32# define NEWPADAPI 1
33# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
34#else
35typedef AV PADNAMELIST;
36# if !PERL_VERSION_ATLEAST(5,8,0)
37typedef AV PADLIST;
38typedef AV PAD;
39# endif
40# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
41# define PadlistMAX(pl) AvFILLp (pl)
42# define PadlistNAMES(pl) (*PadlistARRAY (pl))
43# define PadARRAY AvARRAY
44# define PadMAX AvFILLp
45# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
46#endif
47#ifndef PadnamelistREFCNT
48# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
49#endif
50#ifndef PadnamelistREFCNT_dec
51# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
52#endif
53
54/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
55/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
56#if PERL_VERSION_ATLEAST(5,19,0)
57# define SVt_BIND SVt_IV
58#endif
59
60#if defined(_WIN32)
61# undef HAS_GETTIMEOFDAY
18# undef setjmp 62# undef setjmp
19# undef longjmp 63# undef longjmp
20# undef _exit 64# undef _exit
21# define setjmp _setjmp /* deep magic */ 65# define setjmp _setjmp /* deep magic */
22#else 66#else
23# include <inttypes.h> /* most portable stdint.h */ 67# include <inttypes.h> /* most portable stdint.h */
24#endif 68#endif
25 69
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 */ 70/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 71static int cctx_max_idle = 4;
55 72
56#define PERL_VERSION_ATLEAST(a,b,c) \ 73#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57 (PERL_REVISION > (a) \ 74# 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 75#endif
119 76
120/* prefer perl internal functions over our own? */ 77/* prefer perl internal functions over our own? */
121#ifndef CORO_PREFER_PERL_FUNCTIONS 78#ifndef CORO_PREFER_PERL_FUNCTIONS
122# define CORO_PREFER_PERL_FUNCTIONS 0 79# define CORO_PREFER_PERL_FUNCTIONS 0
… …
130#else 87#else
131# define dSTACKLEVEL volatile void *stacklevel 88# define dSTACKLEVEL volatile void *stacklevel
132# define STACKLEVEL ((void *)&stacklevel) 89# define STACKLEVEL ((void *)&stacklevel)
133#endif 90#endif
134 91
135#define IN_DESTRUCT (PL_main_cv == Nullcv) 92#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 93
152#include "CoroAPI.h" 94#include "CoroAPI.h"
153#define GCoroAPI (&coroapi) /* very sneaky */ 95#define GCoroAPI (&coroapi) /* very sneaky */
154 96
155#ifdef USE_ITHREADS 97#ifdef USE_ITHREADS
156# if CORO_PTHREAD 98# if CORO_PTHREAD
157static void *coro_thx; 99static void *coro_thx;
158# endif 100# endif
159#endif 101#endif
160 102
103#ifdef __linux
104# include <time.h> /* for timespec */
105# include <syscall.h> /* for SYS_* */
106# ifdef SYS_clock_gettime
107# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
108# define CORO_CLOCK_MONOTONIC 1
109# define CORO_CLOCK_THREAD_CPUTIME_ID 3
110# endif
111#endif
112
161static double (*nvtime)(); /* so why doesn't it take void? */ 113static double (*nvtime)(); /* so why doesn't it take void? */
114static void (*u2time)(pTHX_ UV ret[2]);
162 115
163/* we hijack an hopefully unused CV flag for our purposes */ 116/* we hijack an hopefully unused CV flag for our purposes */
164#define CVf_SLF 0x4000 117#define CVf_SLF 0x4000
165static OP *pp_slf (pTHX); 118static OP *pp_slf (pTHX);
119static void slf_destroy (pTHX_ struct coro *coro);
166 120
167static U32 cctx_gen; 121static U32 cctx_gen;
168static size_t cctx_stacksize = CORO_STACKSIZE; 122static size_t cctx_stacksize = CORO_STACKSIZE;
169static struct CoroAPI coroapi; 123static struct CoroAPI coroapi;
170static AV *main_mainstack; /* used to differentiate between $main and others */ 124static AV *main_mainstack; /* used to differentiate between $main and others */
171static JMPENV *main_top_env; 125static JMPENV *main_top_env;
172static HV *coro_state_stash, *coro_stash; 126static HV *coro_state_stash, *coro_stash;
173static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 127static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
174 128
129static AV *av_destroy; /* destruction queue */
130static SV *sv_manager; /* the manager coro */
131static SV *sv_idle; /* $Coro::idle */
132
175static GV *irsgv; /* $/ */ 133static GV *irsgv; /* $/ */
176static GV *stdoutgv; /* *STDOUT */ 134static GV *stdoutgv; /* *STDOUT */
177static SV *rv_diehook; 135static SV *rv_diehook;
178static SV *rv_warnhook; 136static SV *rv_warnhook;
179static HV *hv_sig; /* %SIG */ 137static HV *hv_sig; /* %SIG */
180 138
181/* async_pool helper stuff */ 139/* async_pool helper stuff */
182static SV *sv_pool_rss; 140static SV *sv_pool_rss;
183static SV *sv_pool_size; 141static SV *sv_pool_size;
184static SV *sv_async_pool_idle; 142static SV *sv_async_pool_idle; /* description string */
185static AV *av_async_pool; 143static AV *av_async_pool; /* idle pool */
186static SV *sv_Coro; 144static SV *sv_Coro; /* class string */
187static CV *cv_pool_handler; 145static CV *cv_pool_handler;
188static CV *cv_coro_state_new;
189 146
190/* Coro::AnyEvent */ 147/* Coro::AnyEvent */
191static SV *sv_activity; 148static SV *sv_activity;
192 149
150/* enable processtime/realtime profiling */
151static char enable_times;
152typedef U32 coro_ts[2];
153static coro_ts time_real, time_cpu;
154static char times_valid;
155
193static struct coro_cctx *cctx_first; 156static struct coro_cctx *cctx_first;
194static int cctx_count, cctx_idle; 157static int cctx_count, cctx_idle;
195 158
196enum { 159enum
160{
197 CC_MAPPED = 0x01, 161 CC_MAPPED = 0x01,
198 CC_NOREUSE = 0x02, /* throw this away after tracing */ 162 CC_NOREUSE = 0x02, /* throw this away after tracing */
199 CC_TRACE = 0x04, 163 CC_TRACE = 0x04,
200 CC_TRACE_SUB = 0x08, /* trace sub calls */ 164 CC_TRACE_SUB = 0x08, /* trace sub calls */
201 CC_TRACE_LINE = 0x10, /* trace each statement */ 165 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
206typedef struct coro_cctx 170typedef struct coro_cctx
207{ 171{
208 struct coro_cctx *next; 172 struct coro_cctx *next;
209 173
210 /* the stack */ 174 /* the stack */
211 void *sptr; 175 struct coro_stack stack;
212 size_t ssize;
213 176
214 /* cpu state */ 177 /* cpu state */
215 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 178 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
179#ifndef NDEBUG
216 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 180 JMPENV *idle_te; /* same as idle_sp, but for top_env */
181#endif
217 JMPENV *top_env; 182 JMPENV *top_env;
218 coro_context cctx; 183 coro_context cctx;
219 184
220 U32 gen; 185 U32 gen;
221#if CORO_USE_VALGRIND 186#if CORO_USE_VALGRIND
222 int valgrind_id; 187 int valgrind_id;
223#endif 188#endif
224 unsigned char flags; 189 unsigned char flags;
225} coro_cctx; 190} coro_cctx;
226 191
192static coro_cctx *cctx_current; /* the currently running cctx */
193
194/*****************************************************************************/
195
196static MGVTBL coro_state_vtbl;
197
227enum { 198enum
199{
228 CF_RUNNING = 0x0001, /* coroutine is running */ 200 CF_RUNNING = 0x0001, /* coroutine is running */
229 CF_READY = 0x0002, /* coroutine is ready */ 201 CF_READY = 0x0002, /* coroutine is ready */
230 CF_NEW = 0x0004, /* has never been switched to */ 202 CF_NEW = 0x0004, /* has never been switched to */
231 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 203 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
204 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
205 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
232}; 206};
233 207
234/* the structure where most of the perl state is stored, overlaid on the cxstack */ 208/* the structure where most of the perl state is stored, overlaid on the cxstack */
235typedef struct 209typedef struct
236{ 210{
237 SV *defsv;
238 AV *defav;
239 SV *errsv;
240 SV *irsgv;
241#define VAR(name,type) type name; 211 #define VARx(name,expr,type) type name;
242# include "state.h" 212 #include "state.h"
243#undef VAR
244} perl_slots; 213} perl_slots;
245 214
215/* 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)) 216#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
247 217
248/* this is a structure representing a perl-level coroutine */ 218/* this is a structure representing a perl-level coroutine */
249struct coro { 219struct coro
220{
250 /* the C coroutine allocated to this perl coroutine, if any */ 221 /* the C coroutine allocated to this perl coroutine, if any */
251 coro_cctx *cctx; 222 coro_cctx *cctx;
223
224 /* ready queue */
225 struct coro *next_ready;
252 226
253 /* state data */ 227 /* state data */
254 struct CoroSLF slf_frame; /* saved slf frame */ 228 struct CoroSLF slf_frame; /* saved slf frame */
255 AV *mainstack; 229 AV *mainstack;
256 perl_slots *slot; /* basically the saved sp */ 230 perl_slots *slot; /* basically the saved sp */
257 231
258 CV *startcv; /* the CV to execute */ 232 CV *startcv; /* the CV to execute */
259 AV *args; /* data associated with this coroutine (initial args) */ 233 AV *args; /* data associated with this coroutine (initial args) */
260 int refcnt; /* coroutines are refcounted, yes */
261 int flags; /* CF_ flags */ 234 int flags; /* CF_ flags */
262 HV *hv; /* the perl hash associated with this coro, if any */ 235 HV *hv; /* the perl hash associated with this coro, if any */
263 void (*on_destroy)(pTHX_ struct coro *coro);
264 236
265 /* statistics */ 237 /* statistics */
266 int usecount; /* number of transfers to this coro */ 238 int usecount; /* number of transfers to this coro */
267 239
268 /* coro process data */ 240 /* coro process data */
269 int prio; 241 int prio;
270 SV *except; /* exception to be thrown */ 242 SV *except; /* exception to be thrown */
271 SV *rouse_cb; 243 SV *rouse_cb; /* last rouse callback */
244 AV *on_destroy; /* callbacks or coros to notify on destroy */
245 AV *status; /* the exit status list */
272 246
273 /* async_pool */ 247 /* async_pool */
274 SV *saved_deffh; 248 SV *saved_deffh;
275 SV *invoke_cb; 249 SV *invoke_cb;
276 AV *invoke_av; 250 AV *invoke_av;
277 251
252 /* on_enter/on_leave */
253 AV *on_enter;
254 AV *on_leave;
255
256 /* swap_sv */
257 AV *swap_sv;
258
259 /* times */
260 coro_ts t_cpu, t_real;
261
278 /* linked list */ 262 /* linked list */
279 struct coro *next, *prev; 263 struct coro *next, *prev;
280}; 264};
281 265
282typedef struct coro *Coro__State; 266typedef struct coro *Coro__State;
283typedef struct coro *Coro__State_or_hashref; 267typedef struct coro *Coro__State_or_hashref;
284 268
285/* the following variables are effectively part of the perl context */ 269/* the following variables are effectively part of the perl context */
286/* and get copied between struct coro and these variables */ 270/* and get copied between struct coro and these variables */
287/* the mainr easonw e don't support windows process emulation */ 271/* the main reason we don't support windows process emulation */
288static struct CoroSLF slf_frame; /* the current slf frame */ 272static struct CoroSLF slf_frame; /* the current slf frame */
289 273
290/** Coro ********************************************************************/ 274/** Coro ********************************************************************/
291 275
292#define PRIO_MAX 3 276#define CORO_PRIO_MAX 3
293#define PRIO_HIGH 1 277#define CORO_PRIO_HIGH 1
294#define PRIO_NORMAL 0 278#define CORO_PRIO_NORMAL 0
295#define PRIO_LOW -1 279#define CORO_PRIO_LOW -1
296#define PRIO_IDLE -3 280#define CORO_PRIO_IDLE -3
297#define PRIO_MIN -4 281#define CORO_PRIO_MIN -4
298 282
299/* for Coro.pm */ 283/* for Coro.pm */
300static SV *coro_current; 284static SV *coro_current;
301static SV *coro_readyhook; 285static SV *coro_readyhook;
302static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 286static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
303static CV *cv_coro_run, *cv_coro_terminate; 287static CV *cv_coro_run;
304static struct coro *coro_first; 288static struct coro *coro_first;
305#define coro_nready coroapi.nready 289#define coro_nready coroapi.nready
306 290
291/** JIT *********************************************************************/
292
293#if CORO_JIT
294 /* APPLE doesn't have mmap though */
295 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
296 #ifndef CORO_JIT_TYPE
297 #if ECB_AMD64 && CORO_JIT_UNIXY
298 #define CORO_JIT_TYPE "amd64-unix"
299 #elif __i386 && CORO_JIT_UNIXY
300 #define CORO_JIT_TYPE "x86-unix"
301 #endif
302 #endif
303#endif
304
305#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
306 #undef CORO_JIT
307#endif
308
309#if CORO_JIT
310 typedef void (*load_save_perl_slots_type)(perl_slots *);
311 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
312#endif
313
314/** Coro::Select ************************************************************/
315
316static OP *(*coro_old_pp_sselect) (pTHX);
317static SV *coro_select_select;
318
319/* horrible hack, but if it works... */
320static OP *
321coro_pp_sselect (pTHX)
322{
323 dSP;
324 PUSHMARK (SP - 4); /* fake argument list */
325 XPUSHs (coro_select_select);
326 PUTBACK;
327
328 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
329 PL_op->op_flags |= OPf_STACKED;
330 PL_op->op_private = 0;
331 return PL_ppaddr [OP_ENTERSUB](aTHX);
332}
333
334/** time stuff **************************************************************/
335
336#ifdef HAS_GETTIMEOFDAY
337
338ecb_inline void
339coro_u2time (pTHX_ UV ret[2])
340{
341 struct timeval tv;
342 gettimeofday (&tv, 0);
343
344 ret [0] = tv.tv_sec;
345 ret [1] = tv.tv_usec;
346}
347
348ecb_inline double
349coro_nvtime (void)
350{
351 struct timeval tv;
352 gettimeofday (&tv, 0);
353
354 return tv.tv_sec + tv.tv_usec * 1e-6;
355}
356
357ecb_inline void
358time_init (pTHX)
359{
360 nvtime = coro_nvtime;
361 u2time = coro_u2time;
362}
363
364#else
365
366ecb_inline void
367time_init (pTHX)
368{
369 SV **svp;
370
371 require_pv ("Time/HiRes.pm");
372
373 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
374
375 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
376 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
377
378 nvtime = INT2PTR (double (*)(), SvIV (*svp));
379
380 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
381 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
382}
383
384#endif
385
307/** lowlevel stuff **********************************************************/ 386/** lowlevel stuff **********************************************************/
308 387
309static SV * 388static SV * ecb_noinline
310coro_get_sv (pTHX_ const char *name, int create) 389coro_get_sv (pTHX_ const char *name, int create)
311{ 390{
312#if PERL_VERSION_ATLEAST (5,10,0) 391#if PERL_VERSION_ATLEAST (5,10,0)
313 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 392 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
314 get_sv (name, create); 393 get_sv (name, create);
315#endif 394#endif
316 return get_sv (name, create); 395 return get_sv (name, create);
317} 396}
318 397
319static AV * 398static AV * ecb_noinline
320coro_get_av (pTHX_ const char *name, int create) 399coro_get_av (pTHX_ const char *name, int create)
321{ 400{
322#if PERL_VERSION_ATLEAST (5,10,0) 401#if PERL_VERSION_ATLEAST (5,10,0)
323 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 402 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
324 get_av (name, create); 403 get_av (name, create);
325#endif 404#endif
326 return get_av (name, create); 405 return get_av (name, create);
327} 406}
328 407
329static HV * 408static HV * ecb_noinline
330coro_get_hv (pTHX_ const char *name, int create) 409coro_get_hv (pTHX_ const char *name, int create)
331{ 410{
332#if PERL_VERSION_ATLEAST (5,10,0) 411#if PERL_VERSION_ATLEAST (5,10,0)
333 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 412 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
334 get_hv (name, create); 413 get_hv (name, create);
335#endif 414#endif
336 return get_hv (name, create); 415 return get_hv (name, create);
337} 416}
338 417
339/* may croak */ 418ecb_inline void
340INLINE CV * 419coro_times_update (void)
341coro_sv_2cv (pTHX_ SV *sv)
342{ 420{
343 HV *st; 421#ifdef coro_clock_gettime
344 GV *gvp; 422 struct timespec ts;
345 return sv_2cv (sv, &st, &gvp, 0);
346}
347 423
348static AV * 424 ts.tv_sec = ts.tv_nsec = 0;
425 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
426 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
427
428 ts.tv_sec = ts.tv_nsec = 0;
429 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
430 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
431#else
432 dTHX;
433 UV tv[2];
434
435 u2time (aTHX_ tv);
436 time_real [0] = tv [0];
437 time_real [1] = tv [1] * 1000;
438#endif
439}
440
441ecb_inline void
442coro_times_add (struct coro *c)
443{
444 c->t_real [1] += time_real [1];
445 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
446 c->t_real [0] += time_real [0];
447
448 c->t_cpu [1] += time_cpu [1];
449 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
450 c->t_cpu [0] += time_cpu [0];
451}
452
453ecb_inline void
454coro_times_sub (struct coro *c)
455{
456 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
457 c->t_real [1] -= time_real [1];
458 c->t_real [0] -= time_real [0];
459
460 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
461 c->t_cpu [1] -= time_cpu [1];
462 c->t_cpu [0] -= time_cpu [0];
463}
464
465/*****************************************************************************/
466/* magic glue */
467
468#define CORO_MAGIC_type_cv 26
469#define CORO_MAGIC_type_state PERL_MAGIC_ext
470
471#define CORO_MAGIC_NN(sv, type) \
472 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
473 ? SvMAGIC (sv) \
474 : mg_find (sv, type))
475
476#define CORO_MAGIC(sv, type) \
477 (ecb_expect_true (SvMAGIC (sv)) \
478 ? CORO_MAGIC_NN (sv, type) \
479 : 0)
480
481#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
482#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
483
484ecb_inline MAGIC *
485SvSTATEhv_p (pTHX_ SV *coro)
486{
487 MAGIC *mg;
488
489 if (ecb_expect_true (
490 SvTYPE (coro) == SVt_PVHV
491 && (mg = CORO_MAGIC_state (coro))
492 && mg->mg_virtual == &coro_state_vtbl
493 ))
494 return mg;
495
496 return 0;
497}
498
499ecb_inline struct coro *
500SvSTATE_ (pTHX_ SV *coro)
501{
502 MAGIC *mg;
503
504 if (SvROK (coro))
505 coro = SvRV (coro);
506
507 mg = SvSTATEhv_p (aTHX_ coro);
508 if (!mg)
509 croak ("Coro::State object required");
510
511 return (struct coro *)mg->mg_ptr;
512}
513
514#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
515
516/* faster than SvSTATE, but expects a coroutine hv */
517#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
518#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
519
520/*****************************************************************************/
521/* padlist management and caching */
522
523ecb_inline PADLIST *
349coro_clone_padlist (pTHX_ CV *cv) 524coro_derive_padlist (pTHX_ CV *cv)
350{ 525{
351 AV *padlist = CvPADLIST (cv); 526 PADLIST *padlist = CvPADLIST (cv);
352 AV *newpadlist, *newpad; 527 PADLIST *newpadlist;
528 PADNAMELIST *padnames;
529 PAD *newpad;
530 PADOFFSET off = PadlistMAX (padlist) + 1;
353 531
354 newpadlist = newAV (); 532#if NEWPADAPI
533
534 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
535 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
536 while (!PadlistARRAY (padlist)[off - 1])
537 --off;
538
539 Perl_pad_push (aTHX_ padlist, off);
540
541 newpad = PadlistARRAY (padlist)[off];
542 PadlistARRAY (padlist)[off] = 0;
543
544#else
545
546#if PERL_VERSION_ATLEAST (5,10,0)
547 Perl_pad_push (aTHX_ padlist, off);
548#else
549 Perl_pad_push (aTHX_ padlist, off, 1);
550#endif
551
552 newpad = PadlistARRAY (padlist)[off];
553 PadlistMAX (padlist) = off - 1;
554
555#endif
556
557 newPADLIST (newpadlist);
558#if !PERL_VERSION_ATLEAST(5,15,3)
559 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
355 AvREAL_off (newpadlist); 560 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 561#endif
361 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
362 --AvFILLp (padlist);
363 562
364 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 563 /* Already extended to 2 elements by newPADLIST. */
365 av_store (newpadlist, 1, (SV *)newpad); 564 PadlistMAX (newpadlist) = 1;
565
566 padnames = PadlistNAMES (padlist);
567 ++PadnamelistREFCNT (padnames);
568 PadlistNAMES (newpadlist) = padnames;
569
570 PadlistARRAY (newpadlist)[1] = newpad;
366 571
367 return newpadlist; 572 return newpadlist;
368} 573}
369 574
370static void 575ecb_inline void
371free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
372{ 577{
373 /* may be during global destruction */ 578 /* may be during global destruction */
374 if (SvREFCNT (padlist)) 579 if (!IN_DESTRUCT)
375 { 580 {
376 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
377 while (i >= 0) 582
583 while (i > 0) /* special-case index 0 */
378 { 584 {
379 SV **svp = av_fetch (padlist, i--, FALSE); 585 /* we try to be extra-careful here */
586 PAD *pad = PadlistARRAY (padlist)[i--];
587
380 if (svp) 588 if (pad)
381 { 589 {
382 SV *sv; 590 I32 j = PadMAX (pad);
383 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 591
592 while (j >= 0)
384 SvREFCNT_dec (sv); 593 SvREFCNT_dec (PadARRAY (pad)[j--]);
385 594
595 PadMAX (pad) = -1;
386 SvREFCNT_dec (*svp); 596 SvREFCNT_dec (pad);
387 } 597 }
388 } 598 }
389 599
600 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
601
602#if NEWPADAPI
603 Safefree (PadlistARRAY (padlist));
604 Safefree (padlist);
605#else
606 AvFILLp (padlist) = -1;
607 AvREAL_off (padlist);
390 SvREFCNT_dec ((SV*)padlist); 608 SvREFCNT_dec ((SV*)padlist);
609#endif
391 } 610 }
392} 611}
393 612
394static int 613static int
395coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 614coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
396{ 615{
397 AV *padlist; 616 PADLIST *padlist;
398 AV *av = (AV *)mg->mg_obj; 617 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
618 size_t len = *(size_t *)mg->mg_ptr;
399 619
400 /* casting is fun. */ 620 /* perl manages to free our internal AV and _then_ call us */
401 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 621 if (IN_DESTRUCT)
622 return 0;
623
624 while (len--)
402 free_padlist (aTHX_ padlist); 625 free_padlist (aTHX_ padlists[len]);
403
404 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
405 626
406 return 0; 627 return 0;
407} 628}
408
409#define CORO_MAGIC_type_cv 26
410#define CORO_MAGIC_type_state PERL_MAGIC_ext
411 629
412static MGVTBL coro_cv_vtbl = { 630static MGVTBL coro_cv_vtbl = {
413 0, 0, 0, 0, 631 0, 0, 0, 0,
414 coro_cv_free 632 coro_cv_free
415}; 633};
416 634
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 */ 635/* the next two functions merely cache the padlists */
461static void 636ecb_inline void
462get_padlist (pTHX_ CV *cv) 637get_padlist (pTHX_ CV *cv)
463{ 638{
464 MAGIC *mg = CORO_MAGIC_cv (cv); 639 MAGIC *mg = CORO_MAGIC_cv (cv);
465 AV *av; 640 size_t *lenp;
466 641
467 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 642 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
468 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 643 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
469 else 644 else
470 { 645 {
471#if CORO_PREFER_PERL_FUNCTIONS 646#if CORO_PREFER_PERL_FUNCTIONS
472 /* this is probably cleaner? but also slower! */ 647 /* this is probably cleaner? but also slower! */
473 /* in practise, it seems to be less stable */ 648 /* in practise, it seems to be less stable */
474 CV *cp = Perl_cv_clone (aTHX_ cv); 649 CV *cp = Perl_cv_clone (aTHX_ cv);
475 CvPADLIST (cv) = CvPADLIST (cp); 650 CvPADLIST (cv) = CvPADLIST (cp);
476 CvPADLIST (cp) = 0; 651 CvPADLIST (cp) = 0;
477 SvREFCNT_dec (cp); 652 SvREFCNT_dec (cp);
478#else 653#else
479 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 654 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
480#endif 655#endif
481 } 656 }
482} 657}
483 658
484static void 659ecb_inline void
485put_padlist (pTHX_ CV *cv) 660put_padlist (pTHX_ CV *cv)
486{ 661{
487 MAGIC *mg = CORO_MAGIC_cv (cv); 662 MAGIC *mg = CORO_MAGIC_cv (cv);
488 AV *av;
489 663
490 if (expect_false (!mg)) 664 if (ecb_expect_false (!mg))
665 {
491 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 666 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
667 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
668 mg->mg_len = 1; /* so mg_free frees mg_ptr */
669 }
670 else
671 Renew (mg->mg_ptr,
672 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
673 char);
492 674
493 av = (AV *)mg->mg_obj; 675 ((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} 676}
500 677
501/** load & save, init *******************************************************/ 678/** load & save, init *******************************************************/
679
680ecb_inline void
681swap_sv (SV *a, SV *b)
682{
683 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
684 SV tmp;
685
686 /* swap sv_any */
687 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
688
689 /* swap sv_flags */
690 SvFLAGS (&tmp) = SvFLAGS (a);
691 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
692 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
693
694#if PERL_VERSION_ATLEAST (5,10,0)
695 /* perl 5.10 and later complicates this _quite_ a bit, but it also
696 * is much faster, so no quarrels here. alternatively, we could
697 * sv_upgrade to avoid this.
698 */
699 {
700 /* swap sv_u */
701 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
702
703 /* if SvANY points to the head, we need to adjust the pointers,
704 * as the pointer for a still points to b, and maybe vice versa.
705 */
706 #define svany_in_head(type) \
707 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
708
709 if (svany_in_head (SvTYPE (a)))
710 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
711
712 if (svany_in_head (SvTYPE (b)))
713 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
714 }
715#endif
716}
717
718/* swap sv heads, at least logically */
719static void
720swap_svs (pTHX_ Coro__State c)
721{
722 int i;
723
724 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
725 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
726}
727
728#define SWAP_SVS(coro) \
729 if (ecb_expect_false ((coro)->swap_sv)) \
730 swap_svs (aTHX_ (coro))
731
732static void
733on_enterleave_call (pTHX_ SV *cb);
502 734
503static void 735static void
504load_perl (pTHX_ Coro__State c) 736load_perl (pTHX_ Coro__State c)
505{ 737{
506 perl_slots *slot = c->slot; 738 perl_slots *slot = c->slot;
507 c->slot = 0; 739 c->slot = 0;
508 740
509 PL_mainstack = c->mainstack; 741 PL_mainstack = c->mainstack;
510 742
511 GvSV (PL_defgv) = slot->defsv; 743#if CORO_JIT
512 GvAV (PL_defgv) = slot->defav; 744 load_perl_slots (slot);
513 GvSV (PL_errgv) = slot->errsv; 745#else
514 GvSV (irsgv) = slot->irsgv;
515
516 #define VAR(name,type) PL_ ## name = slot->name; 746 #define VARx(name,expr,type) expr = slot->name;
517 # include "state.h" 747 #include "state.h"
518 #undef VAR 748#endif
519 749
520 { 750 {
521 dSP; 751 dSP;
522 752
523 CV *cv; 753 CV *cv;
524 754
525 /* now do the ugly restore mess */ 755 /* now do the ugly restore mess */
526 while (expect_true (cv = (CV *)POPs)) 756 while (ecb_expect_true (cv = (CV *)POPs))
527 { 757 {
528 put_padlist (aTHX_ cv); /* mark this padlist as available */ 758 put_padlist (aTHX_ cv); /* mark this padlist as available */
529 CvDEPTH (cv) = PTR2IV (POPs); 759 CvDEPTH (cv) = PTR2IV (POPs);
530 CvPADLIST (cv) = (AV *)POPs; 760 CvPADLIST (cv) = (PADLIST *)POPs;
531 } 761 }
532 762
533 PUTBACK; 763 PUTBACK;
534 } 764 }
535 765
536 slf_frame = c->slf_frame; 766 slf_frame = c->slf_frame;
537 CORO_THROW = c->except; 767 CORO_THROW = c->except;
768
769 if (ecb_expect_false (enable_times))
770 {
771 if (ecb_expect_false (!times_valid))
772 coro_times_update ();
773
774 coro_times_sub (c);
775 }
776
777 if (ecb_expect_false (c->on_enter))
778 {
779 int i;
780
781 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
782 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
783 }
784
785 SWAP_SVS (c);
538} 786}
539 787
540static void 788static void
541save_perl (pTHX_ Coro__State c) 789save_perl (pTHX_ Coro__State c)
542{ 790{
791 SWAP_SVS (c);
792
793 if (ecb_expect_false (c->on_leave))
794 {
795 int i;
796
797 for (i = AvFILLp (c->on_leave); i >= 0; --i)
798 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
799 }
800
801 times_valid = 0;
802
803 if (ecb_expect_false (enable_times))
804 {
805 coro_times_update (); times_valid = 1;
806 coro_times_add (c);
807 }
808
543 c->except = CORO_THROW; 809 c->except = CORO_THROW;
544 c->slf_frame = slf_frame; 810 c->slf_frame = slf_frame;
545 811
546 { 812 {
547 dSP; 813 dSP;
… …
556 822
557 XPUSHs (Nullsv); 823 XPUSHs (Nullsv);
558 /* this loop was inspired by pp_caller */ 824 /* this loop was inspired by pp_caller */
559 for (;;) 825 for (;;)
560 { 826 {
561 while (expect_true (cxix >= 0)) 827 while (ecb_expect_true (cxix >= 0))
562 { 828 {
563 PERL_CONTEXT *cx = &ccstk[cxix--]; 829 PERL_CONTEXT *cx = &ccstk[cxix--];
564 830
565 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 831 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
566 { 832 {
567 CV *cv = cx->blk_sub.cv; 833 CV *cv = cx->blk_sub.cv;
568 834
569 if (expect_true (CvDEPTH (cv))) 835 if (ecb_expect_true (CvDEPTH (cv)))
570 { 836 {
571 EXTEND (SP, 3); 837 EXTEND (SP, 3);
572 PUSHs ((SV *)CvPADLIST (cv)); 838 PUSHs ((SV *)CvPADLIST (cv));
573 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 839 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
574 PUSHs ((SV *)cv); 840 PUSHs ((SV *)cv);
… …
577 get_padlist (aTHX_ cv); 843 get_padlist (aTHX_ cv);
578 } 844 }
579 } 845 }
580 } 846 }
581 847
582 if (expect_true (top_si->si_type == PERLSI_MAIN)) 848 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
583 break; 849 break;
584 850
585 top_si = top_si->si_prev; 851 top_si = top_si->si_prev;
586 ccstk = top_si->si_cxstack; 852 ccstk = top_si->si_cxstack;
587 cxix = top_si->si_cxix; 853 cxix = top_si->si_cxix;
… …
589 855
590 PUTBACK; 856 PUTBACK;
591 } 857 }
592 858
593 /* allocate some space on the context stack for our purposes */ 859 /* allocate some space on the context stack for our purposes */
594 /* we manually unroll here, as usually 2 slots is enough */ 860 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 { 861 {
599 int i; 862 unsigned int i;
863
600 for (i = 3; i < SLOT_COUNT; ++i) 864 for (i = 0; i < SLOT_COUNT; ++i)
601 CXINC; 865 CXINC;
602 } 866
603 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 867 cxstack_ix -= SLOT_COUNT; /* undo allocation */
868 }
604 869
605 c->mainstack = PL_mainstack; 870 c->mainstack = PL_mainstack;
606 871
607 { 872 {
608 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 873 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
609 874
610 slot->defav = GvAV (PL_defgv); 875#if CORO_JIT
611 slot->defsv = DEFSV; 876 save_perl_slots (slot);
612 slot->errsv = ERRSV; 877#else
613 slot->irsgv = GvSV (irsgv);
614
615 #define VAR(name,type) slot->name = PL_ ## name; 878 #define VARx(name,expr,type) slot->name = expr;
616 # include "state.h" 879 #include "state.h"
617 #undef VAR 880#endif
618 } 881 }
619} 882}
620 883
621/* 884/*
622 * allocate various perl stacks. This is almost an exact copy 885 * allocate various perl stacks. This is almost an exact copy
… …
628# define coro_init_stacks(thx) init_stacks () 891# define coro_init_stacks(thx) init_stacks ()
629#else 892#else
630static void 893static void
631coro_init_stacks (pTHX) 894coro_init_stacks (pTHX)
632{ 895{
633 PL_curstackinfo = new_stackinfo(32, 8); 896 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; 897 PL_curstackinfo->si_type = PERLSI_MAIN;
635 PL_curstack = PL_curstackinfo->si_stack; 898 PL_curstack = PL_curstackinfo->si_stack;
636 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 899 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
637 900
638 PL_stack_base = AvARRAY(PL_curstack); 901 PL_stack_base = AvARRAY(PL_curstack);
… …
653#endif 916#endif
654 917
655 New(54,PL_scopestack,8,I32); 918 New(54,PL_scopestack,8,I32);
656 PL_scopestack_ix = 0; 919 PL_scopestack_ix = 0;
657 PL_scopestack_max = 8; 920 PL_scopestack_max = 8;
921#if HAS_SCOPESTACK_NAME
922 New(54,PL_scopestack_name,8,const char*);
923#endif
658 924
659 New(54,PL_savestack,24,ANY); 925 New(54,PL_savestack,24,ANY);
660 PL_savestack_ix = 0; 926 PL_savestack_ix = 0;
661 PL_savestack_max = 24; 927 PL_savestack_max = 24;
662 928
… …
690 } 956 }
691 957
692 Safefree (PL_tmps_stack); 958 Safefree (PL_tmps_stack);
693 Safefree (PL_markstack); 959 Safefree (PL_markstack);
694 Safefree (PL_scopestack); 960 Safefree (PL_scopestack);
961#if HAS_SCOPESTACK_NAME
962 Safefree (PL_scopestack_name);
963#endif
695 Safefree (PL_savestack); 964 Safefree (PL_savestack);
696#if !PERL_VERSION_ATLEAST (5,10,0) 965#if !PERL_VERSION_ATLEAST (5,10,0)
697 Safefree (PL_retstack); 966 Safefree (PL_retstack);
698#endif 967#endif
699} 968}
… …
745#endif 1014#endif
746 1015
747/* 1016/*
748 * This overrides the default magic get method of %SIG elements. 1017 * 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 1018 * 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 1019 * and instead of trying to save and restore the hash elements (extremely slow),
751 * readback here. 1020 * 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 */ 1021 */
756static int 1022static int ecb_cold
757coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1023coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
758{ 1024{
759 const char *s = MgPV_nolen_const (mg); 1025 const char *s = MgPV_nolen_const (mg);
760 1026
761 if (*s == '_') 1027 if (*s == '_')
762 { 1028 {
763 SV **svp = 0; 1029 SV **svp = 0;
764 1030
765 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1031 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
766 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1032 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
767 1033
768 if (svp) 1034 if (svp)
769 { 1035 {
770 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1036 SV *ssv;
1037
1038 if (!*svp)
1039 ssv = &PL_sv_undef;
1040 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1041 ssv = sv_2mortal (newRV_inc (*svp));
1042 else
1043 ssv = *svp;
1044
1045 sv_setsv (sv, ssv);
771 return 0; 1046 return 0;
772 } 1047 }
773 } 1048 }
774 1049
775 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1050 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
776} 1051}
777 1052
778static int 1053static int ecb_cold
779coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1054coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
780{ 1055{
781 const char *s = MgPV_nolen_const (mg); 1056 const char *s = MgPV_nolen_const (mg);
782 1057
783 if (*s == '_') 1058 if (*s == '_')
… …
797 } 1072 }
798 1073
799 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1074 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
800} 1075}
801 1076
802static int 1077static int ecb_cold
803coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1078coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
804{ 1079{
805 const char *s = MgPV_nolen_const (mg); 1080 const char *s = MgPV_nolen_const (mg);
806 1081
807 if (*s == '_') 1082 if (*s == '_')
… …
812 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1087 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
813 1088
814 if (svp) 1089 if (svp)
815 { 1090 {
816 SV *old = *svp; 1091 SV *old = *svp;
817 *svp = newSVsv (sv); 1092 *svp = SvOK (sv) ? newSVsv (sv) : 0;
818 SvREFCNT_dec (old); 1093 SvREFCNT_dec (old);
819 return 0; 1094 return 0;
820 } 1095 }
821 } 1096 }
822 1097
… …
834slf_check_nop (pTHX_ struct CoroSLF *frame) 1109slf_check_nop (pTHX_ struct CoroSLF *frame)
835{ 1110{
836 return 0; 1111 return 0;
837} 1112}
838 1113
839static UNOP coro_setup_op; 1114static int
1115slf_check_repeat (pTHX_ struct CoroSLF *frame)
1116{
1117 return 1;
1118}
840 1119
841static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1120static UNOP init_perl_op;
1121
1122ecb_noinline static void /* noinline to keep it out of the transfer fast path */
842coro_setup (pTHX_ struct coro *coro) 1123init_perl (pTHX_ struct coro *coro)
843{ 1124{
844 /* 1125 /*
845 * emulate part of the perl startup here. 1126 * emulate part of the perl startup here.
846 */ 1127 */
847 coro_init_stacks (aTHX); 1128 coro_init_stacks (aTHX);
848 1129
849 PL_runops = RUNOPS_DEFAULT; 1130 PL_runops = RUNOPS_DEFAULT;
850 PL_curcop = &PL_compiling; 1131 PL_curcop = &PL_compiling;
851 PL_in_eval = EVAL_NULL; 1132 PL_in_eval = EVAL_NULL;
852 PL_comppad = 0; 1133 PL_comppad = 0;
1134 PL_comppad_name = 0;
1135 PL_comppad_name_fill = 0;
1136 PL_comppad_name_floor = 0;
853 PL_curpm = 0; 1137 PL_curpm = 0;
854 PL_curpad = 0; 1138 PL_curpad = 0;
855 PL_localizing = 0; 1139 PL_localizing = 0;
856 PL_dirty = 0;
857 PL_restartop = 0; 1140 PL_restartop = 0;
858#if PERL_VERSION_ATLEAST (5,10,0) 1141#if PERL_VERSION_ATLEAST (5,10,0)
859 PL_parser = 0; 1142 PL_parser = 0;
860#endif 1143#endif
1144 PL_hints = 0;
861 1145
862 /* recreate the die/warn hooks */ 1146 /* recreate the die/warn hooks */
863 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1147 PL_diehook = SvREFCNT_inc (rv_diehook);
864 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1148 PL_warnhook = SvREFCNT_inc (rv_warnhook);
865 1149
866 GvSV (PL_defgv) = newSV (0); 1150 GvSV (PL_defgv) = newSV (0);
867 GvAV (PL_defgv) = coro->args; coro->args = 0; 1151 GvAV (PL_defgv) = coro->args; coro->args = 0;
868 GvSV (PL_errgv) = newSV (0); 1152 GvSV (PL_errgv) = newSV (0);
869 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1153 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1154 GvHV (PL_hintgv) = newHV ();
1155#if PERL_VERSION_ATLEAST (5,10,0)
1156 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1157#endif
870 PL_rs = newSVsv (GvSV (irsgv)); 1158 PL_rs = newSVsv (GvSV (irsgv));
871 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1159 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
872 1160
873 { 1161 {
874 dSP; 1162 dSP;
… …
889 /* this newly created coroutine might be run on an existing cctx which most 1177 /* 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. 1178 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
891 */ 1179 */
892 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1180 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 */ 1181 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1182 slf_frame.destroy = 0;
894 1183
895 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1184 /* 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; 1185 init_perl_op.op_next = PL_op;
897 coro_setup_op.op_type = OP_CUSTOM; 1186 init_perl_op.op_type = OP_ENTERSUB;
898 coro_setup_op.op_ppaddr = pp_slf; 1187 init_perl_op.op_ppaddr = pp_slf;
899 /* no flags etc. required, as an init function won't be called */ 1188 /* no flags etc. required, as an init function won't be called */
900 1189
901 PL_op = (OP *)&coro_setup_op; 1190 PL_op = (OP *)&init_perl_op;
902 1191
903 /* copy throw, in case it was set before coro_setup */ 1192 /* copy throw, in case it was set before init_perl */
904 CORO_THROW = coro->except; 1193 CORO_THROW = coro->except;
905}
906 1194
1195 SWAP_SVS (coro);
1196
1197 if (ecb_expect_false (enable_times))
1198 {
1199 coro_times_update ();
1200 coro_times_sub (coro);
1201 }
1202}
1203
907static void 1204static void
908coro_destruct (pTHX_ struct coro *coro) 1205coro_unwind_stacks (pTHX)
909{ 1206{
910 if (!IN_DESTRUCT) 1207 if (!IN_DESTRUCT)
911 { 1208 {
912 /* restore all saved variables and stuff */ 1209 /* restore all saved variables and stuff */
913 LEAVE_SCOPE (0); 1210 LEAVE_SCOPE (0);
… …
921 POPSTACK_TO (PL_mainstack); 1218 POPSTACK_TO (PL_mainstack);
922 1219
923 /* unwind main stack */ 1220 /* unwind main stack */
924 dounwind (-1); 1221 dounwind (-1);
925 } 1222 }
1223}
926 1224
927 SvREFCNT_dec (GvSV (PL_defgv)); 1225static void
928 SvREFCNT_dec (GvAV (PL_defgv)); 1226destroy_perl (pTHX_ struct coro *coro)
929 SvREFCNT_dec (GvSV (PL_errgv)); 1227{
930 SvREFCNT_dec (PL_defoutgv); 1228 SV *svf [9];
931 SvREFCNT_dec (PL_rs);
932 SvREFCNT_dec (GvSV (irsgv));
933 1229
934 SvREFCNT_dec (PL_diehook);
935 SvREFCNT_dec (PL_warnhook);
936 1230 {
1231 SV *old_current = SvRV (coro_current);
1232 struct coro *current = SvSTATE (old_current);
1233
1234 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1235
1236 save_perl (aTHX_ current);
1237
1238 /* this will cause transfer_check to croak on block*/
1239 SvRV_set (coro_current, (SV *)coro->hv);
1240
1241 load_perl (aTHX_ coro);
1242
1243 coro_unwind_stacks (aTHX);
1244
1245 /* restore swapped sv's */
1246 SWAP_SVS (coro);
1247
1248 coro_destruct_stacks (aTHX);
1249
1250 /* now save some sv's to be free'd later */
1251 svf [0] = GvSV (PL_defgv);
1252 svf [1] = (SV *)GvAV (PL_defgv);
1253 svf [2] = GvSV (PL_errgv);
1254 svf [3] = (SV *)PL_defoutgv;
1255 svf [4] = PL_rs;
1256 svf [5] = GvSV (irsgv);
1257 svf [6] = (SV *)GvHV (PL_hintgv);
1258 svf [7] = PL_diehook;
1259 svf [8] = PL_warnhook;
1260 assert (9 == sizeof (svf) / sizeof (*svf));
1261
1262 SvRV_set (coro_current, old_current);
1263
1264 load_perl (aTHX_ current);
1265 }
1266
1267 {
1268 unsigned int i;
1269
1270 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1271 SvREFCNT_dec (svf [i]);
1272
937 SvREFCNT_dec (coro->saved_deffh); 1273 SvREFCNT_dec (coro->saved_deffh);
938 SvREFCNT_dec (coro->rouse_cb); 1274 SvREFCNT_dec (coro->rouse_cb);
939 SvREFCNT_dec (coro->invoke_cb); 1275 SvREFCNT_dec (coro->invoke_cb);
940 SvREFCNT_dec (coro->invoke_av); 1276 SvREFCNT_dec (coro->invoke_av);
941 1277 }
942 coro_destruct_stacks (aTHX);
943} 1278}
944 1279
945INLINE void 1280ecb_inline void
946free_coro_mortal (pTHX) 1281free_coro_mortal (pTHX)
947{ 1282{
948 if (expect_true (coro_mortal)) 1283 if (ecb_expect_true (coro_mortal))
949 { 1284 {
950 SvREFCNT_dec (coro_mortal); 1285 SvREFCNT_dec ((SV *)coro_mortal);
951 coro_mortal = 0; 1286 coro_mortal = 0;
952 } 1287 }
953} 1288}
954 1289
955static int 1290static int
956runops_trace (pTHX) 1291runops_trace (pTHX)
957{ 1292{
958 COP *oldcop = 0; 1293 COP *oldcop = 0;
959 int oldcxix = -2; 1294 int oldcxix = -2;
960 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
961 coro_cctx *cctx = coro->cctx;
962 1295
963 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1296 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
964 { 1297 {
965 PERL_ASYNC_CHECK (); 1298 PERL_ASYNC_CHECK ();
966 1299
967 if (cctx->flags & CC_TRACE_ALL) 1300 if (cctx_current->flags & CC_TRACE_ALL)
968 { 1301 {
969 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1302 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
970 { 1303 {
971 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1304 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
972 SV **bot, **top; 1305 SV **bot, **top;
973 AV *av = newAV (); /* return values */ 1306 AV *av = newAV (); /* return values */
974 SV **cb; 1307 SV **cb;
… …
1011 1344
1012 if (PL_curcop != &PL_compiling) 1345 if (PL_curcop != &PL_compiling)
1013 { 1346 {
1014 SV **cb; 1347 SV **cb;
1015 1348
1016 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1349 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1017 { 1350 {
1018 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1351 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1019 1352
1020 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1353 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1021 { 1354 {
1022 runops_proc_t old_runops = PL_runops;
1023 dSP; 1355 dSP;
1024 GV *gv = CvGV (cx->blk_sub.cv); 1356 GV *gv = CvGV (cx->blk_sub.cv);
1025 SV *fullname = sv_2mortal (newSV (0)); 1357 SV *fullname = sv_2mortal (newSV (0));
1026 1358
1027 if (isGV (gv)) 1359 if (isGV (gv))
… …
1045 } 1377 }
1046 1378
1047 oldcxix = cxstack_ix; 1379 oldcxix = cxstack_ix;
1048 } 1380 }
1049 1381
1050 if (cctx->flags & CC_TRACE_LINE) 1382 if (cctx_current->flags & CC_TRACE_LINE)
1051 { 1383 {
1052 dSP; 1384 dSP;
1053 1385
1054 PL_runops = RUNOPS_DEFAULT; 1386 PL_runops = RUNOPS_DEFAULT;
1055 ENTER; 1387 ENTER;
… …
1074 1406
1075 TAINT_NOT; 1407 TAINT_NOT;
1076 return 0; 1408 return 0;
1077} 1409}
1078 1410
1079static struct coro_cctx *cctx_ssl_cctx;
1080static struct CoroSLF cctx_ssl_frame; 1411static struct CoroSLF cctx_ssl_frame;
1081 1412
1082static void 1413static void
1083slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1414slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1084{ 1415{
1085 ta->prev = (struct coro *)cctx_ssl_cctx;
1086 ta->next = 0; 1416 ta->prev = 0;
1087} 1417}
1088 1418
1089static int 1419static int
1090slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1420slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1091{ 1421{
… …
1093 1423
1094 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1424 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1095} 1425}
1096 1426
1097/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1427/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1098static void NOINLINE 1428static void ecb_noinline
1099cctx_prepare (pTHX_ coro_cctx *cctx) 1429cctx_prepare (pTHX)
1100{ 1430{
1101 PL_top_env = &PL_start_env; 1431 PL_top_env = &PL_start_env;
1102 1432
1103 if (cctx->flags & CC_TRACE) 1433 if (cctx_current->flags & CC_TRACE)
1104 PL_runops = runops_trace; 1434 PL_runops = runops_trace;
1105 1435
1106 /* we already must be executing an SLF op, there is no other valid way 1436 /* we already must be executing an SLF op, there is no other valid way
1107 * that can lead to creation of a new cctx */ 1437 * that can lead to creation of a new cctx */
1108 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1438 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1109 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1439 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1110 1440
1111 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1441 /* 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; 1442 cctx_ssl_frame = slf_frame;
1114 1443
1115 slf_frame.prepare = slf_prepare_set_stacklevel; 1444 slf_frame.prepare = slf_prepare_set_stacklevel;
1116 slf_frame.check = slf_check_set_stacklevel; 1445 slf_frame.check = slf_check_set_stacklevel;
1117} 1446}
1118 1447
1119/* the tail of transfer: execute stuff we can only do after a transfer */ 1448/* the tail of transfer: execute stuff we can only do after a transfer */
1120INLINE void 1449ecb_inline void
1121transfer_tail (pTHX) 1450transfer_tail (pTHX)
1122{ 1451{
1123 free_coro_mortal (aTHX); 1452 free_coro_mortal (aTHX);
1453}
1454
1455/* try to exit the same way perl's main function would do */
1456/* we do not bother resetting the environment or other things *7
1457/* that are not, uhm, essential */
1458/* this obviously also doesn't work when perl is embedded */
1459static void ecb_noinline ecb_cold
1460perlish_exit (pTHX)
1461{
1462 int exitstatus = perl_destruct (PL_curinterp);
1463 perl_free (PL_curinterp);
1464 exit (exitstatus);
1124} 1465}
1125 1466
1126/* 1467/*
1127 * this is a _very_ stripped down perl interpreter ;) 1468 * this is a _very_ stripped down perl interpreter ;)
1128 */ 1469 */
… …
1140 /* normally we would need to skip the entersub here */ 1481 /* normally we would need to skip the entersub here */
1141 /* not doing so will re-execute it, which is exactly what we want */ 1482 /* not doing so will re-execute it, which is exactly what we want */
1142 /* PL_nop = PL_nop->op_next */ 1483 /* PL_nop = PL_nop->op_next */
1143 1484
1144 /* inject a fake subroutine call to cctx_init */ 1485 /* inject a fake subroutine call to cctx_init */
1145 cctx_prepare (aTHX_ (coro_cctx *)arg); 1486 cctx_prepare (aTHX);
1146 1487
1147 /* cctx_run is the alternative tail of transfer() */ 1488 /* cctx_run is the alternative tail of transfer() */
1148 transfer_tail (aTHX); 1489 transfer_tail (aTHX);
1149 1490
1150 /* somebody or something will hit me for both perl_run and PL_restartop */ 1491 /* somebody or something will hit me for both perl_run and PL_restartop */
1151 PL_restartop = PL_op; 1492 PL_restartop = PL_op;
1152 perl_run (PL_curinterp); 1493 perl_run (PL_curinterp);
1153 /* 1494 /*
1154 * Unfortunately, there is no way to get at the return values of the 1495 * Unfortunately, there is no way to get at the return values of the
1155 * coro body here, as perl_run destroys these 1496 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1497 * runtime errors here, as this is just a random interpreter, not a thread.
1156 */ 1498 */
1157 1499
1158 /* 1500 /*
1159 * If perl-run returns we assume exit() was being called or the coro 1501 * 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) 1502 * 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 1503 * 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" 1504 * doing in that case. YMMV.
1163 * coroutine as Coro has no such concept
1164 */ 1505 */
1165 PL_top_env = main_top_env; 1506 perlish_exit (aTHX);
1166 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1167 } 1507 }
1168} 1508}
1169 1509
1170static coro_cctx * 1510static coro_cctx *
1171cctx_new () 1511cctx_new (void)
1172{ 1512{
1173 coro_cctx *cctx; 1513 coro_cctx *cctx;
1174 1514
1175 ++cctx_count; 1515 ++cctx_count;
1176 New (0, cctx, 1, coro_cctx); 1516 New (0, cctx, 1, coro_cctx);
… …
1182 return cctx; 1522 return cctx;
1183} 1523}
1184 1524
1185/* create a new cctx only suitable as source */ 1525/* create a new cctx only suitable as source */
1186static coro_cctx * 1526static coro_cctx *
1187cctx_new_empty () 1527cctx_new_empty (void)
1188{ 1528{
1189 coro_cctx *cctx = cctx_new (); 1529 coro_cctx *cctx = cctx_new ();
1190 1530
1191 cctx->sptr = 0; 1531 cctx->stack.sptr = 0;
1192 coro_create (&cctx->cctx, 0, 0, 0, 0); 1532 coro_create (&cctx->cctx, 0, 0, 0, 0);
1193 1533
1194 return cctx; 1534 return cctx;
1195} 1535}
1196 1536
1197/* create a new cctx suitable as destination/running a perl interpreter */ 1537/* create a new cctx suitable as destination/running a perl interpreter */
1198static coro_cctx * 1538static coro_cctx *
1199cctx_new_run () 1539cctx_new_run (void)
1200{ 1540{
1201 coro_cctx *cctx = cctx_new (); 1541 coro_cctx *cctx = cctx_new ();
1202 void *stack_start;
1203 size_t stack_size;
1204 1542
1205#if HAVE_MMAP 1543 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 } 1544 {
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."); 1545 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1228 _exit (EXIT_FAILURE); 1546 _exit (EXIT_FAILURE);
1229 }
1230
1231 stack_start = cctx->sptr;
1232 stack_size = cctx->ssize;
1233 } 1547 }
1234 1548
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); 1549 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1240 1550
1241 return cctx; 1551 return cctx;
1242} 1552}
1243 1553
1244static void 1554static void
1245cctx_destroy (coro_cctx *cctx) 1555cctx_destroy (coro_cctx *cctx)
1246{ 1556{
1247 if (!cctx) 1557 if (!cctx)
1248 return; 1558 return;
1249 1559
1560 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1561
1250 --cctx_count; 1562 --cctx_count;
1251 coro_destroy (&cctx->cctx); 1563 coro_destroy (&cctx->cctx);
1252 1564
1253 /* coro_transfer creates new, empty cctx's */ 1565 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 1566
1268 Safefree (cctx); 1567 Safefree (cctx);
1269} 1568}
1270 1569
1271/* wether this cctx should be destructed */ 1570/* wether this cctx should be destructed */
1272#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1571#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1273 1572
1274static coro_cctx * 1573static coro_cctx *
1275cctx_get (pTHX) 1574cctx_get (pTHX)
1276{ 1575{
1277 while (expect_true (cctx_first)) 1576 while (ecb_expect_true (cctx_first))
1278 { 1577 {
1279 coro_cctx *cctx = cctx_first; 1578 coro_cctx *cctx = cctx_first;
1280 cctx_first = cctx->next; 1579 cctx_first = cctx->next;
1281 --cctx_idle; 1580 --cctx_idle;
1282 1581
1283 if (expect_true (!CCTX_EXPIRED (cctx))) 1582 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1284 return cctx; 1583 return cctx;
1285 1584
1286 cctx_destroy (cctx); 1585 cctx_destroy (cctx);
1287 } 1586 }
1288 1587
… …
1290} 1589}
1291 1590
1292static void 1591static void
1293cctx_put (coro_cctx *cctx) 1592cctx_put (coro_cctx *cctx)
1294{ 1593{
1295 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1594 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1296 1595
1297 /* free another cctx if overlimit */ 1596 /* free another cctx if overlimit */
1298 if (expect_false (cctx_idle >= cctx_max_idle)) 1597 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1299 { 1598 {
1300 coro_cctx *first = cctx_first; 1599 coro_cctx *first = cctx_first;
1301 cctx_first = first->next; 1600 cctx_first = first->next;
1302 --cctx_idle; 1601 --cctx_idle;
1303 1602
… …
1314static void 1613static void
1315transfer_check (pTHX_ struct coro *prev, struct coro *next) 1614transfer_check (pTHX_ struct coro *prev, struct coro *next)
1316{ 1615{
1317 /* TODO: throwing up here is considered harmful */ 1616 /* TODO: throwing up here is considered harmful */
1318 1617
1319 if (expect_true (prev != next)) 1618 if (ecb_expect_true (prev != next))
1320 { 1619 {
1321 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1620 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,"); 1621 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1323 1622
1324 if (expect_false (next->flags & CF_RUNNING)) 1623 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,"); 1624 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1329 1625
1330#if !PERL_VERSION_ATLEAST (5,10,0) 1626#if !PERL_VERSION_ATLEAST (5,10,0)
1331 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1627 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,"); 1628 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1333#endif 1629#endif
1334 } 1630 }
1335} 1631}
1336 1632
1337/* always use the TRANSFER macro */ 1633/* always use the TRANSFER macro */
1338static void NOINLINE /* noinline so we have a fixed stackframe */ 1634static void ecb_noinline /* noinline so we have a fixed stackframe */
1339transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1635transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1340{ 1636{
1341 dSTACKLEVEL; 1637 dSTACKLEVEL;
1342 1638
1343 /* sometimes transfer is only called to set idle_sp */ 1639 /* sometimes transfer is only called to set idle_sp */
1344 if (expect_false (!next)) 1640 if (ecb_expect_false (!prev))
1345 { 1641 {
1346 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1642 cctx_current->idle_sp = STACKLEVEL;
1347 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1643 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1348 } 1644 }
1349 else if (expect_true (prev != next)) 1645 else if (ecb_expect_true (prev != next))
1350 { 1646 {
1351 coro_cctx *prev__cctx; 1647 coro_cctx *cctx_prev;
1352 1648
1353 if (expect_false (prev->flags & CF_NEW)) 1649 if (ecb_expect_false (prev->flags & CF_NEW))
1354 { 1650 {
1355 /* create a new empty/source context */ 1651 /* create a new empty/source context */
1356 prev->cctx = cctx_new_empty ();
1357 prev->flags &= ~CF_NEW; 1652 prev->flags &= ~CF_NEW;
1358 prev->flags |= CF_RUNNING; 1653 prev->flags |= CF_RUNNING;
1359 } 1654 }
1360 1655
1361 prev->flags &= ~CF_RUNNING; 1656 prev->flags &= ~CF_RUNNING;
1362 next->flags |= CF_RUNNING; 1657 next->flags |= CF_RUNNING;
1363 1658
1364 /* first get rid of the old state */ 1659 /* first get rid of the old state */
1365 save_perl (aTHX_ prev); 1660 save_perl (aTHX_ prev);
1366 1661
1367 if (expect_false (next->flags & CF_NEW)) 1662 if (ecb_expect_false (next->flags & CF_NEW))
1368 { 1663 {
1369 /* need to start coroutine */ 1664 /* need to start coroutine */
1370 next->flags &= ~CF_NEW; 1665 next->flags &= ~CF_NEW;
1371 /* setup coroutine call */ 1666 /* setup coroutine call */
1372 coro_setup (aTHX_ next); 1667 init_perl (aTHX_ next);
1373 } 1668 }
1374 else 1669 else
1375 load_perl (aTHX_ next); 1670 load_perl (aTHX_ next);
1376 1671
1377 prev__cctx = prev->cctx;
1378
1379 /* possibly untie and reuse the cctx */ 1672 /* possibly untie and reuse the cctx */
1380 if (expect_true ( 1673 if (ecb_expect_true (
1381 prev__cctx->idle_sp == STACKLEVEL 1674 cctx_current->idle_sp == STACKLEVEL
1382 && !(prev__cctx->flags & CC_TRACE) 1675 && !(cctx_current->flags & CC_TRACE)
1383 && !force_cctx 1676 && !force_cctx
1384 )) 1677 ))
1385 { 1678 {
1386 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1679 /* 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)); 1680 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1388 1681
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 */ 1682 /* 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 */ 1683 /* without this the next cctx_get might destroy the running cctx while still in use */
1393 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1684 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1394 if (!next->cctx) 1685 if (ecb_expect_true (!next->cctx))
1395 next->cctx = cctx_get (aTHX); 1686 next->cctx = cctx_get (aTHX);
1396 1687
1397 cctx_put (prev__cctx); 1688 cctx_put (cctx_current);
1398 } 1689 }
1690 else
1691 prev->cctx = cctx_current;
1399 1692
1400 ++next->usecount; 1693 ++next->usecount;
1401 1694
1402 if (expect_true (!next->cctx)) 1695 cctx_prev = cctx_current;
1403 next->cctx = cctx_get (aTHX); 1696 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1404 1697
1405 if (expect_false (prev__cctx != next->cctx)) 1698 next->cctx = 0;
1699
1700 if (ecb_expect_false (cctx_prev != cctx_current))
1406 { 1701 {
1407 prev__cctx->top_env = PL_top_env; 1702 cctx_prev->top_env = PL_top_env;
1408 PL_top_env = next->cctx->top_env; 1703 PL_top_env = cctx_current->top_env;
1409 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1704 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1410 } 1705 }
1411 1706
1412 transfer_tail (aTHX); 1707 transfer_tail (aTHX);
1413 } 1708 }
1414} 1709}
… …
1416#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1711#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) 1712#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1418 1713
1419/** high level stuff ********************************************************/ 1714/** high level stuff ********************************************************/
1420 1715
1716/* this function is actually Coro, not Coro::State, but we call it from here */
1717/* because it is convenient - but it hasn't been declared yet for that reason */
1421static int 1718static void
1719coro_call_on_destroy (pTHX_ struct coro *coro);
1720
1721static void
1422coro_state_destroy (pTHX_ struct coro *coro) 1722coro_state_destroy (pTHX_ struct coro *coro)
1423{ 1723{
1424 if (coro->flags & CF_DESTROYED) 1724 if (coro->flags & CF_ZOMBIE)
1425 return 0; 1725 return;
1426 1726
1427 if (coro->on_destroy)
1428 coro->on_destroy (aTHX_ coro); 1727 slf_destroy (aTHX_ coro);
1429 1728
1430 coro->flags |= CF_DESTROYED; 1729 coro->flags |= CF_ZOMBIE;
1431 1730
1432 if (coro->flags & CF_READY) 1731 if (coro->flags & CF_READY)
1433 { 1732 {
1434 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1733 /* reduce nready, as destroying a ready coro effectively unreadies it */
1435 /* alternative: look through all ready queues and remove the coro */ 1734 /* alternative: look through all ready queues and remove the coro */
1436 --coro_nready; 1735 --coro_nready;
1437 } 1736 }
1438 else 1737 else
1439 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1738 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1440 1739
1441 if (coro->mainstack && coro->mainstack != main_mainstack) 1740 if (coro->next) coro->next->prev = coro->prev;
1442 { 1741 if (coro->prev) coro->prev->next = coro->next;
1443 struct coro temp; 1742 if (coro == coro_first) coro_first = coro->next;
1444 1743
1445 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1744 if (coro->mainstack
1446 1745 && coro->mainstack != main_mainstack
1447 save_perl (aTHX_ &temp); 1746 && coro->slot
1747 && !PL_dirty)
1448 load_perl (aTHX_ coro); 1748 destroy_perl (aTHX_ coro);
1449
1450 coro_destruct (aTHX_ coro);
1451
1452 load_perl (aTHX_ &temp);
1453
1454 coro->slot = 0;
1455 }
1456 1749
1457 cctx_destroy (coro->cctx); 1750 cctx_destroy (coro->cctx);
1458 SvREFCNT_dec (coro->startcv); 1751 SvREFCNT_dec (coro->startcv);
1459 SvREFCNT_dec (coro->args); 1752 SvREFCNT_dec (coro->args);
1753 SvREFCNT_dec (coro->swap_sv);
1460 SvREFCNT_dec (CORO_THROW); 1754 SvREFCNT_dec (CORO_THROW);
1461 1755
1462 if (coro->next) coro->next->prev = coro->prev; 1756 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 1757
1466 return 1; 1758 /* more destruction mayhem in coro_state_free */
1467} 1759}
1468 1760
1469static int 1761static int
1470coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1762coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1471{ 1763{
1472 struct coro *coro = (struct coro *)mg->mg_ptr; 1764 struct coro *coro = (struct coro *)mg->mg_ptr;
1473 mg->mg_ptr = 0; 1765 mg->mg_ptr = 0;
1474 1766
1475 coro->hv = 0;
1476
1477 if (--coro->refcnt < 0)
1478 {
1479 coro_state_destroy (aTHX_ coro); 1767 coro_state_destroy (aTHX_ coro);
1768 SvREFCNT_dec (coro->on_destroy);
1769 SvREFCNT_dec (coro->status);
1770
1480 Safefree (coro); 1771 Safefree (coro);
1481 }
1482 1772
1483 return 0; 1773 return 0;
1484} 1774}
1485 1775
1486static int 1776static int ecb_cold
1487coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1777coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1488{ 1778{
1489 struct coro *coro = (struct coro *)mg->mg_ptr; 1779 /* called when perl clones the current process the slow way (windows process emulation) */
1490 1780 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1491 ++coro->refcnt; 1781 mg->mg_ptr = 0;
1782 mg->mg_virtual = 0;
1492 1783
1493 return 0; 1784 return 0;
1494} 1785}
1495 1786
1496static MGVTBL coro_state_vtbl = { 1787static MGVTBL coro_state_vtbl = {
… …
1519 1810
1520 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1811 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1521 TRANSFER (ta, 1); 1812 TRANSFER (ta, 1);
1522} 1813}
1523 1814
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 ********************************************************************/ 1815/** Coro ********************************************************************/
1548 1816
1549INLINE void 1817ecb_inline void
1550coro_enq (pTHX_ struct coro *coro) 1818coro_enq (pTHX_ struct coro *coro)
1551{ 1819{
1552 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1820 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1553}
1554 1821
1555INLINE SV * 1822 SvREFCNT_inc_NN (coro->hv);
1823
1824 coro->next_ready = 0;
1825 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1826 ready [1] = coro;
1827}
1828
1829ecb_inline struct coro *
1556coro_deq (pTHX) 1830coro_deq (pTHX)
1557{ 1831{
1558 int prio; 1832 int prio;
1559 1833
1560 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1834 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1561 if (AvFILLp (coro_ready [prio]) >= 0) 1835 {
1562 return av_shift (coro_ready [prio]); 1836 struct coro **ready = coro_ready [prio];
1837
1838 if (ready [0])
1839 {
1840 struct coro *coro = ready [0];
1841 ready [0] = coro->next_ready;
1842 return coro;
1843 }
1844 }
1563 1845
1564 return 0; 1846 return 0;
1847}
1848
1849static void
1850invoke_sv_ready_hook_helper (void)
1851{
1852 dTHX;
1853 dSP;
1854
1855 ENTER;
1856 SAVETMPS;
1857
1858 PUSHMARK (SP);
1859 PUTBACK;
1860 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1861
1862 FREETMPS;
1863 LEAVE;
1565} 1864}
1566 1865
1567static int 1866static int
1568api_ready (pTHX_ SV *coro_sv) 1867api_ready (pTHX_ SV *coro_sv)
1569{ 1868{
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); 1869 struct coro *coro = SvSTATE (coro_sv);
1578 1870
1579 if (coro->flags & CF_READY) 1871 if (coro->flags & CF_READY)
1580 return 0; 1872 return 0;
1581 1873
1582 coro->flags |= CF_READY; 1874 coro->flags |= CF_READY;
1583 1875
1584 sv_hook = coro_nready ? 0 : coro_readyhook;
1585 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1586
1587 coro_enq (aTHX_ coro); 1876 coro_enq (aTHX_ coro);
1588 ++coro_nready;
1589 1877
1590 if (sv_hook) 1878 if (!coro_nready++)
1591 { 1879 if (coroapi.readyhook)
1592 dSP; 1880 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 1881
1608 return 1; 1882 return 1;
1609} 1883}
1610 1884
1611static int 1885static int
… …
1613{ 1887{
1614 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1888 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1615} 1889}
1616 1890
1617/* expects to own a reference to next->hv */ 1891/* expects to own a reference to next->hv */
1618INLINE void 1892ecb_inline void
1619prepare_cede_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1893prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1620{ 1894{
1621 SV *prev_sv = SvRV (coro_current); 1895 SV *prev_sv = SvRV (coro_current);
1622 1896
1623 ta->prev = SvSTATE_hv (prev_sv); 1897 ta->prev = SvSTATE_hv (prev_sv);
1624 ta->next = next; 1898 ta->next = next;
1625 1899
1626 TRANSFER_CHECK (*ta); 1900 TRANSFER_CHECK (*ta);
1627 1901
1628 SvRV_set (coro_current, next->hv); 1902 SvRV_set (coro_current, (SV *)next->hv);
1629 1903
1630 free_coro_mortal (aTHX); 1904 free_coro_mortal (aTHX);
1631 coro_mortal = prev_sv; 1905 coro_mortal = prev_sv;
1632} 1906}
1633 1907
1634static void 1908static void
1635prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1909prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1636{ 1910{
1637 for (;;) 1911 for (;;)
1638 { 1912 {
1639 SV *next_sv = coro_deq (aTHX); 1913 struct coro *next = coro_deq (aTHX);
1640 1914
1641 if (expect_false (!next_sv)) 1915 if (ecb_expect_true (next))
1642 { 1916 {
1643 /* nothing to schedule: call the idle handler */
1644 dSP;
1645
1646 ENTER;
1647 SAVETMPS;
1648
1649 PUSHMARK (SP);
1650 PUTBACK;
1651 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1652
1653 FREETMPS;
1654 LEAVE;
1655 }
1656 else
1657 {
1658 struct coro *next = SvSTATE_hv (next_sv);
1659
1660 /* cannot transfer to destroyed coros, skip and look for next */ 1917 /* cannot transfer to destroyed coros, skip and look for next */
1661 if (expect_false (next->flags & CF_DESTROYED)) 1918 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1662 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1919 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1663 else 1920 else
1664 { 1921 {
1665 next->flags &= ~CF_READY; 1922 next->flags &= ~CF_READY;
1666 --coro_nready; 1923 --coro_nready;
1667 1924
1668 return prepare_cede_to (aTHX_ ta, next); 1925 prepare_schedule_to (aTHX_ ta, next);
1926 break;
1669 } 1927 }
1670 } 1928 }
1671 } 1929 else
1672} 1930 {
1931 /* nothing to schedule: call the idle handler */
1932 if (SvROK (sv_idle)
1933 && SvOBJECT (SvRV (sv_idle)))
1934 {
1935 if (SvRV (sv_idle) == SvRV (coro_current))
1936 {
1937 require_pv ("Carp");
1673 1938
1674INLINE void 1939 {
1940 dSP;
1941
1942 ENTER;
1943 SAVETMPS;
1944
1945 PUSHMARK (SP);
1946 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1947 PUTBACK;
1948 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1949
1950 FREETMPS;
1951 LEAVE;
1952 }
1953 }
1954
1955 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1956 api_ready (aTHX_ SvRV (sv_idle));
1957 --coro_nready;
1958 }
1959 else
1960 {
1961 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1962 dSP;
1963
1964 ENTER;
1965 SAVETMPS;
1966
1967 PUSHMARK (SP);
1968 PUTBACK;
1969 call_sv (sv_idle, G_VOID | G_DISCARD);
1970
1971 FREETMPS;
1972 LEAVE;
1973 }
1974 }
1975 }
1976}
1977
1978ecb_inline void
1675prepare_cede (pTHX_ struct coro_transfer_args *ta) 1979prepare_cede (pTHX_ struct coro_transfer_args *ta)
1676{ 1980{
1677 api_ready (aTHX_ coro_current); 1981 api_ready (aTHX_ coro_current);
1678 prepare_schedule (aTHX_ ta); 1982 prepare_schedule (aTHX_ ta);
1679} 1983}
1680 1984
1681INLINE void 1985ecb_inline void
1682prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1986prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1683{ 1987{
1684 SV *prev = SvRV (coro_current); 1988 SV *prev = SvRV (coro_current);
1685 1989
1686 if (coro_nready) 1990 if (coro_nready)
… …
1699 2003
1700 prepare_schedule (aTHX_ &ta); 2004 prepare_schedule (aTHX_ &ta);
1701 TRANSFER (ta, 1); 2005 TRANSFER (ta, 1);
1702} 2006}
1703 2007
2008static void
2009api_schedule_to (pTHX_ SV *coro_sv)
2010{
2011 struct coro_transfer_args ta;
2012 struct coro *next = SvSTATE (coro_sv);
2013
2014 SvREFCNT_inc_NN (coro_sv);
2015 prepare_schedule_to (aTHX_ &ta, next);
2016}
2017
1704static int 2018static int
1705api_cede (pTHX) 2019api_cede (pTHX)
1706{ 2020{
1707 struct coro_transfer_args ta; 2021 struct coro_transfer_args ta;
1708 2022
1709 prepare_cede (aTHX_ &ta); 2023 prepare_cede (aTHX_ &ta);
1710 2024
1711 if (expect_true (ta.prev != ta.next)) 2025 if (ecb_expect_true (ta.prev != ta.next))
1712 { 2026 {
1713 TRANSFER (ta, 1); 2027 TRANSFER (ta, 1);
1714 return 1; 2028 return 1;
1715 } 2029 }
1716 else 2030 else
… …
1735static void 2049static void
1736api_trace (pTHX_ SV *coro_sv, int flags) 2050api_trace (pTHX_ SV *coro_sv, int flags)
1737{ 2051{
1738 struct coro *coro = SvSTATE (coro_sv); 2052 struct coro *coro = SvSTATE (coro_sv);
1739 2053
2054 if (coro->flags & CF_RUNNING)
2055 croak ("cannot enable tracing on a running coroutine, caught");
2056
1740 if (flags & CC_TRACE) 2057 if (flags & CC_TRACE)
1741 { 2058 {
1742 if (!coro->cctx) 2059 if (!coro->cctx)
1743 coro->cctx = cctx_new_run (); 2060 coro->cctx = cctx_new_run ();
1744 else if (!(coro->cctx->flags & CC_TRACE)) 2061 else if (!(coro->cctx->flags & CC_TRACE))
1745 croak ("cannot enable tracing on coroutine with custom stack,"); 2062 croak ("cannot enable tracing on coroutine with custom stack, caught");
1746 2063
1747 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 2064 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1748 } 2065 }
1749 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 2066 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1750 { 2067 {
… …
1753 if (coro->flags & CF_RUNNING) 2070 if (coro->flags & CF_RUNNING)
1754 PL_runops = RUNOPS_DEFAULT; 2071 PL_runops = RUNOPS_DEFAULT;
1755 else 2072 else
1756 coro->slot->runops = RUNOPS_DEFAULT; 2073 coro->slot->runops = RUNOPS_DEFAULT;
1757 } 2074 }
2075}
2076
2077static void
2078coro_push_av (pTHX_ AV *av, I32 gimme_v)
2079{
2080 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2081 {
2082 dSP;
2083
2084 if (gimme_v == G_SCALAR)
2085 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2086 else
2087 {
2088 int i;
2089 EXTEND (SP, AvFILLp (av) + 1);
2090
2091 for (i = 0; i <= AvFILLp (av); ++i)
2092 PUSHs (AvARRAY (av)[i]);
2093 }
2094
2095 PUTBACK;
2096 }
2097}
2098
2099static void
2100coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2101{
2102 if (!coro->on_destroy)
2103 coro->on_destroy = newAV ();
2104
2105 av_push (coro->on_destroy, cb);
2106}
2107
2108static void
2109slf_destroy_join (pTHX_ struct CoroSLF *frame)
2110{
2111 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2112}
2113
2114static int
2115slf_check_join (pTHX_ struct CoroSLF *frame)
2116{
2117 struct coro *coro = (struct coro *)frame->data;
2118
2119 if (!coro->status)
2120 return 1;
2121
2122 frame->destroy = 0;
2123
2124 coro_push_av (aTHX_ coro->status, GIMME_V);
2125
2126 SvREFCNT_dec ((SV *)coro->hv);
2127
2128 return 0;
2129}
2130
2131static void
2132slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2133{
2134 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2135
2136 if (items > 1)
2137 croak ("join called with too many arguments");
2138
2139 if (coro->status)
2140 frame->prepare = prepare_nop;
2141 else
2142 {
2143 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2144 frame->prepare = prepare_schedule;
2145 }
2146
2147 frame->check = slf_check_join;
2148 frame->destroy = slf_destroy_join;
2149 frame->data = (void *)coro;
2150 SvREFCNT_inc (coro->hv);
2151}
2152
2153static void
2154coro_call_on_destroy (pTHX_ struct coro *coro)
2155{
2156 AV *od = coro->on_destroy;
2157
2158 if (!od)
2159 return;
2160
2161 coro->on_destroy = 0;
2162 sv_2mortal ((SV *)od);
2163
2164 while (AvFILLp (od) >= 0)
2165 {
2166 SV *cb = sv_2mortal (av_pop (od));
2167
2168 /* coro hv's (and only hv's at the moment) are supported as well */
2169 if (SvSTATEhv_p (aTHX_ cb))
2170 api_ready (aTHX_ cb);
2171 else
2172 {
2173 dSP; /* don't disturb outer sp */
2174 PUSHMARK (SP);
2175
2176 if (coro->status)
2177 {
2178 PUTBACK;
2179 coro_push_av (aTHX_ coro->status, G_ARRAY);
2180 SPAGAIN;
2181 }
2182
2183 PUTBACK;
2184 call_sv (cb, G_VOID | G_DISCARD);
2185 }
2186 }
2187}
2188
2189static void
2190coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2191{
2192 AV *av;
2193
2194 if (coro->status)
2195 {
2196 av = coro->status;
2197 av_clear (av);
2198 }
2199 else
2200 av = coro->status = newAV ();
2201
2202 /* items are actually not so common, so optimise for this case */
2203 if (items)
2204 {
2205 int i;
2206
2207 av_extend (av, items - 1);
2208
2209 for (i = 0; i < items; ++i)
2210 av_push (av, SvREFCNT_inc_NN (arg [i]));
2211 }
2212}
2213
2214static void
2215slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2216{
2217 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2218 api_ready (aTHX_ sv_manager);
2219
2220 frame->prepare = prepare_schedule;
2221 frame->check = slf_check_repeat;
2222
2223 /* as a minor optimisation, we could unwind all stacks here */
2224 /* but that puts extra pressure on pp_slf, and is not worth much */
2225 /*coro_unwind_stacks (aTHX);*/
2226}
2227
2228static void
2229slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2230{
2231 HV *coro_hv = (HV *)SvRV (coro_current);
2232
2233 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2234 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2235}
2236
2237static void
2238slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2239{
2240 HV *coro_hv;
2241 struct coro *coro;
2242
2243 if (items <= 0)
2244 croak ("Coro::cancel called without coro object,");
2245
2246 coro = SvSTATE (arg [0]);
2247 coro_hv = coro->hv;
2248
2249 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2250
2251 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2252 {
2253 /* coro currently busy cancelling something, so just notify it */
2254 coro->slf_frame.data = (void *)coro;
2255
2256 frame->prepare = prepare_nop;
2257 frame->check = slf_check_nop;
2258 }
2259 else if (coro_hv == (HV *)SvRV (coro_current))
2260 {
2261 /* cancelling the current coro is allowed, and equals terminate */
2262 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2263 }
2264 else
2265 {
2266 struct coro *self = SvSTATE_current;
2267
2268 if (!self)
2269 croak ("Coro::cancel called outside of thread content,");
2270
2271 /* otherwise we cancel directly, purely for speed reasons
2272 * unfortunately, this requires some magic trickery, as
2273 * somebody else could cancel us, so we have to fight the cancellation.
2274 * this is ugly, and hopefully fully worth the extra speed.
2275 * besides, I can't get the slow-but-safe version working...
2276 */
2277 slf_frame.data = 0;
2278 self->flags |= CF_NOCANCEL;
2279 coro_state_destroy (aTHX_ coro);
2280 self->flags &= ~CF_NOCANCEL;
2281
2282 if (slf_frame.data)
2283 {
2284 /* while we were busy we have been cancelled, so terminate */
2285 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2286 }
2287 else
2288 {
2289 frame->prepare = prepare_nop;
2290 frame->check = slf_check_nop;
2291 }
2292 }
2293}
2294
2295static int
2296slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2297{
2298 frame->prepare = 0;
2299 coro_unwind_stacks (aTHX);
2300
2301 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2302
2303 return 1;
2304}
2305
2306static int
2307safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2308{
2309 if (coro->cctx)
2310 croak ("coro inside C callback, unable to cancel at this time, caught");
2311
2312 if (coro->flags & CF_NEW)
2313 {
2314 coro_set_status (aTHX_ coro, arg, items);
2315 coro_state_destroy (aTHX_ coro);
2316 }
2317 else
2318 {
2319 if (!coro->slf_frame.prepare)
2320 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2321
2322 slf_destroy (aTHX_ coro);
2323
2324 coro_set_status (aTHX_ coro, arg, items);
2325 coro->slf_frame.prepare = prepare_nop;
2326 coro->slf_frame.check = slf_check_safe_cancel;
2327
2328 api_ready (aTHX_ (SV *)coro->hv);
2329 }
2330
2331 return 1;
1758} 2332}
1759 2333
1760/*****************************************************************************/ 2334/*****************************************************************************/
1761/* async pool handler */ 2335/* async pool handler */
1762 2336
… …
1793slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2367slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1794{ 2368{
1795 HV *hv = (HV *)SvRV (coro_current); 2369 HV *hv = (HV *)SvRV (coro_current);
1796 struct coro *coro = SvSTATE_hv ((SV *)hv); 2370 struct coro *coro = SvSTATE_hv ((SV *)hv);
1797 2371
1798 if (expect_true (coro->saved_deffh)) 2372 if (ecb_expect_true (coro->saved_deffh))
1799 { 2373 {
1800 /* subsequent iteration */ 2374 /* subsequent iteration */
1801 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2375 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1802 coro->saved_deffh = 0; 2376 coro->saved_deffh = 0;
1803 2377
1804 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2378 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1805 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2379 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1806 { 2380 {
1807 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2381 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1808 coro->invoke_av = newAV (); 2382 return;
1809
1810 frame->prepare = prepare_nop;
1811 } 2383 }
1812 else 2384 else
1813 { 2385 {
1814 av_clear (GvAV (PL_defgv)); 2386 av_clear (GvAV (PL_defgv));
1815 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2387 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
1840 2412
1841static void 2413static void
1842coro_rouse_callback (pTHX_ CV *cv) 2414coro_rouse_callback (pTHX_ CV *cv)
1843{ 2415{
1844 dXSARGS; 2416 dXSARGS;
1845 SV *data = (SV *)GENSUB_ARG; 2417 SV *data = (SV *)S_GENSUB_ARG;
1846 2418
1847 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2419 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1848 { 2420 {
1849 /* first call, set args */ 2421 /* first call, set args */
2422 SV *coro = SvRV (data);
1850 AV *av = newAV (); 2423 AV *av = newAV ();
1851 SV *coro = SvRV (data);
1852 2424
1853 SvRV_set (data, (SV *)av); 2425 SvRV_set (data, (SV *)av);
1854 api_ready (aTHX_ coro);
1855 SvREFCNT_dec (coro);
1856 2426
1857 /* better take a full copy of the arguments */ 2427 /* better take a full copy of the arguments */
1858 while (items--) 2428 while (items--)
1859 av_store (av, items, newSVsv (ST (items))); 2429 av_store (av, items, newSVsv (ST (items)));
2430
2431 api_ready (aTHX_ coro);
2432 SvREFCNT_dec (coro);
1860 } 2433 }
1861 2434
1862 XSRETURN_EMPTY; 2435 XSRETURN_EMPTY;
1863} 2436}
1864 2437
1865static int 2438static int
1866slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2439slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
1867{ 2440{
1868 SV *data = (SV *)frame->data; 2441 SV *data = (SV *)frame->data;
1869 2442
1870 if (CORO_THROW) 2443 if (CORO_THROW)
1871 return 0; 2444 return 0;
1872 2445
1873 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2446 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1874 return 1; 2447 return 1;
… …
1881 2454
1882 EXTEND (SP, AvFILLp (av) + 1); 2455 EXTEND (SP, AvFILLp (av) + 1);
1883 for (i = 0; i <= AvFILLp (av); ++i) 2456 for (i = 0; i <= AvFILLp (av); ++i)
1884 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2457 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1885 2458
1886 /* we have stolen the elements, so ste length to zero and free */ 2459 /* we have stolen the elements, so set length to zero and free */
1887 AvFILLp (av) = -1; 2460 AvFILLp (av) = -1;
1888 av_undef (av); 2461 av_undef (av);
1889 2462
1890 PUTBACK; 2463 PUTBACK;
1891 } 2464 }
… …
1910 cb = sv_2mortal (coro->rouse_cb); 2483 cb = sv_2mortal (coro->rouse_cb);
1911 coro->rouse_cb = 0; 2484 coro->rouse_cb = 0;
1912 } 2485 }
1913 2486
1914 if (!SvROK (cb) 2487 if (!SvROK (cb)
1915 || SvTYPE (SvRV (cb)) != SVt_PVCV 2488 || SvTYPE (SvRV (cb)) != SVt_PVCV
1916 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2489 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1917 croak ("Coro::rouse_wait called with illegal callback argument,"); 2490 croak ("Coro::rouse_wait called with illegal callback argument,");
1918 2491
1919 { 2492 {
1920 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2493 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1921 SV *data = (SV *)GENSUB_ARG; 2494 SV *data = (SV *)S_GENSUB_ARG;
1922 2495
1923 frame->data = (void *)data; 2496 frame->data = (void *)data;
1924 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2497 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1925 frame->check = slf_check_rouse_wait; 2498 frame->check = slf_check_rouse_wait;
1926 } 2499 }
… …
1930coro_new_rouse_cb (pTHX) 2503coro_new_rouse_cb (pTHX)
1931{ 2504{
1932 HV *hv = (HV *)SvRV (coro_current); 2505 HV *hv = (HV *)SvRV (coro_current);
1933 struct coro *coro = SvSTATE_hv (hv); 2506 struct coro *coro = SvSTATE_hv (hv);
1934 SV *data = newRV_inc ((SV *)hv); 2507 SV *data = newRV_inc ((SV *)hv);
1935 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2508 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
1936 2509
1937 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2510 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
1938 SvREFCNT_dec (data); /* magicext increases the refcount */ 2511 SvREFCNT_dec (data); /* magicext increases the refcount */
1939 2512
1940 SvREFCNT_dec (coro->rouse_cb); 2513 SvREFCNT_dec (coro->rouse_cb);
… …
1998 frame->prepare = prepare_schedule; 2571 frame->prepare = prepare_schedule;
1999 frame->check = slf_check_nop; 2572 frame->check = slf_check_nop;
2000} 2573}
2001 2574
2002static void 2575static void
2576slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2577{
2578 struct coro *next = (struct coro *)slf_frame.data;
2579
2580 SvREFCNT_inc_NN (next->hv);
2581 prepare_schedule_to (aTHX_ ta, next);
2582}
2583
2584static void
2585slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2586{
2587 if (!items)
2588 croak ("Coro::schedule_to expects a coroutine argument, caught");
2589
2590 frame->data = (void *)SvSTATE (arg [0]);
2591 frame->prepare = slf_prepare_schedule_to;
2592 frame->check = slf_check_nop;
2593}
2594
2595static void
2596slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2597{
2598 api_ready (aTHX_ SvRV (coro_current));
2599
2600 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
2601}
2602
2603static void
2003slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2604slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2004{ 2605{
2005 frame->prepare = prepare_cede; 2606 frame->prepare = prepare_cede;
2006 frame->check = slf_check_nop; 2607 frame->check = slf_check_nop;
2007} 2608}
… …
2009static void 2610static void
2010slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2611slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2011{ 2612{
2012 frame->prepare = prepare_cede_notself; 2613 frame->prepare = prepare_cede_notself;
2013 frame->check = slf_check_nop; 2614 frame->check = slf_check_nop;
2615}
2616
2617/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2618static void
2619slf_destroy (pTHX_ struct coro *coro)
2620{
2621 struct CoroSLF frame = coro->slf_frame;
2622
2623 /*
2624 * The on_destroy below most likely is from an SLF call.
2625 * Since by definition the SLF call will not finish when we destroy
2626 * the coro, we will have to force-finish it here, otherwise
2627 * cleanup functions cannot call SLF functions.
2628 */
2629 coro->slf_frame.prepare = 0;
2630
2631 /* this callback is reserved for slf functions needing to do cleanup */
2632 if (frame.destroy && frame.prepare && !PL_dirty)
2633 frame.destroy (aTHX_ &frame);
2014} 2634}
2015 2635
2016/* 2636/*
2017 * these not obviously related functions are all rolled into one 2637 * these not obviously related functions are all rolled into one
2018 * function to increase chances that they all will call transfer with the same 2638 * function to increase chances that they all will call transfer with the same
… …
2025 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2645 I32 checkmark; /* mark SP to see how many elements check has pushed */
2026 2646
2027 /* set up the slf frame, unless it has already been set-up */ 2647 /* set up the slf frame, unless it has already been set-up */
2028 /* the latter happens when a new coro has been started */ 2648 /* the latter happens when a new coro has been started */
2029 /* or when a new cctx was attached to an existing coroutine */ 2649 /* or when a new cctx was attached to an existing coroutine */
2030 if (expect_true (!slf_frame.prepare)) 2650 if (ecb_expect_true (!slf_frame.prepare))
2031 { 2651 {
2032 /* first iteration */ 2652 /* first iteration */
2033 dSP; 2653 dSP;
2034 SV **arg = PL_stack_base + TOPMARK + 1; 2654 SV **arg = PL_stack_base + TOPMARK + 1;
2035 int items = SP - arg; /* args without function object */ 2655 int items = SP - arg; /* args without function object */
… …
2076 while (slf_frame.check (aTHX_ &slf_frame)); 2696 while (slf_frame.check (aTHX_ &slf_frame));
2077 2697
2078 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2698 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2079 2699
2080 /* exception handling */ 2700 /* exception handling */
2081 if (expect_false (CORO_THROW)) 2701 if (ecb_expect_false (CORO_THROW))
2082 { 2702 {
2083 SV *exception = sv_2mortal (CORO_THROW); 2703 SV *exception = sv_2mortal (CORO_THROW);
2084 2704
2085 CORO_THROW = 0; 2705 CORO_THROW = 0;
2086 sv_setsv (ERRSV, exception); 2706 sv_setsv (ERRSV, exception);
2087 croak (0); 2707 croak (0);
2088 } 2708 }
2089 2709
2090 /* return value handling - mostly like entersub */ 2710 /* return value handling - mostly like entersub */
2091 /* make sure we put something on the stack in scalar context */ 2711 /* make sure we put something on the stack in scalar context */
2092 if (GIMME_V == G_SCALAR) 2712 if (GIMME_V == G_SCALAR
2713 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2093 { 2714 {
2094 dSP; 2715 dSP;
2095 SV **bot = PL_stack_base + checkmark; 2716 SV **bot = PL_stack_base + checkmark;
2096 2717
2097 if (sp == bot) /* too few, push undef */ 2718 if (sp == bot) /* too few, push undef */
2098 bot [1] = &PL_sv_undef; 2719 bot [1] = &PL_sv_undef;
2099 else if (sp != bot + 1) /* too many, take last one */ 2720 else /* too many, take last one */
2100 bot [1] = *sp; 2721 bot [1] = *sp;
2101 2722
2102 SP = bot + 1; 2723 SP = bot + 1;
2103 2724
2104 PUTBACK; 2725 PUTBACK;
… …
2137 if (PL_op->op_flags & OPf_STACKED) 2758 if (PL_op->op_flags & OPf_STACKED)
2138 { 2759 {
2139 if (items > slf_arga) 2760 if (items > slf_arga)
2140 { 2761 {
2141 slf_arga = items; 2762 slf_arga = items;
2142 free (slf_argv); 2763 Safefree (slf_argv);
2143 slf_argv = malloc (slf_arga * sizeof (SV *)); 2764 New (0, slf_argv, slf_arga, SV *);
2144 } 2765 }
2145 2766
2146 slf_argc = items; 2767 slf_argc = items;
2147 2768
2148 for (i = 0; i < items; ++i) 2769 for (i = 0; i < items; ++i)
… …
2150 } 2771 }
2151 else 2772 else
2152 slf_argc = 0; 2773 slf_argc = 0;
2153 2774
2154 PL_op->op_ppaddr = pp_slf; 2775 PL_op->op_ppaddr = pp_slf;
2155 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2776 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2156 2777
2157 PL_op = (OP *)&slf_restore; 2778 PL_op = (OP *)&slf_restore;
2779}
2780
2781/*****************************************************************************/
2782/* dynamic wind */
2783
2784static void
2785on_enterleave_call (pTHX_ SV *cb)
2786{
2787 dSP;
2788
2789 PUSHSTACK;
2790
2791 PUSHMARK (SP);
2792 PUTBACK;
2793 call_sv (cb, G_VOID | G_DISCARD);
2794 SPAGAIN;
2795
2796 POPSTACK;
2797}
2798
2799static SV *
2800coro_avp_pop_and_free (pTHX_ AV **avp)
2801{
2802 AV *av = *avp;
2803 SV *res = av_pop (av);
2804
2805 if (AvFILLp (av) < 0)
2806 {
2807 *avp = 0;
2808 SvREFCNT_dec (av);
2809 }
2810
2811 return res;
2812}
2813
2814static void
2815coro_pop_on_enter (pTHX_ void *coro)
2816{
2817 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2818 SvREFCNT_dec (cb);
2819}
2820
2821static void
2822coro_pop_on_leave (pTHX_ void *coro)
2823{
2824 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2825 on_enterleave_call (aTHX_ sv_2mortal (cb));
2158} 2826}
2159 2827
2160/*****************************************************************************/ 2828/*****************************************************************************/
2161/* PerlIO::cede */ 2829/* PerlIO::cede */
2162 2830
… …
2164{ 2832{
2165 PerlIOBuf base; 2833 PerlIOBuf base;
2166 NV next, every; 2834 NV next, every;
2167} PerlIOCede; 2835} PerlIOCede;
2168 2836
2169static IV 2837static IV ecb_cold
2170PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2838PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2171{ 2839{
2172 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2840 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2173 2841
2174 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2842 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2175 self->next = nvtime () + self->every; 2843 self->next = nvtime () + self->every;
2176 2844
2177 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2845 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2178} 2846}
2179 2847
2180static SV * 2848static SV * ecb_cold
2181PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2849PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2182{ 2850{
2183 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2851 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2184 2852
2185 return newSVnv (self->every); 2853 return newSVnv (self->every);
… …
2236/* Coro::Semaphore & Coro::Signal */ 2904/* Coro::Semaphore & Coro::Signal */
2237 2905
2238static SV * 2906static SV *
2239coro_waitarray_new (pTHX_ int count) 2907coro_waitarray_new (pTHX_ int count)
2240{ 2908{
2241 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2909 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2242 AV *av = newAV (); 2910 AV *av = newAV ();
2243 SV **ary; 2911 SV **ary;
2244 2912
2245 /* unfortunately, building manually saves memory */ 2913 /* unfortunately, building manually saves memory */
2246 Newx (ary, 2, SV *); 2914 Newx (ary, 2, SV *);
2247 AvALLOC (av) = ary; 2915 AvALLOC (av) = ary;
2916#if PERL_VERSION_ATLEAST (5,10,0)
2248 /*AvARRAY (av) = ary;*/ 2917 AvARRAY (av) = ary;
2918#else
2249 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2919 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2920 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2921 SvPVX ((SV *)av) = (char *)ary;
2922#endif
2250 AvMAX (av) = 1; 2923 AvMAX (av) = 1;
2251 AvFILLp (av) = 0; 2924 AvFILLp (av) = 0;
2252 ary [0] = newSViv (count); 2925 ary [0] = newSViv (count);
2253 2926
2254 return newRV_noinc ((SV *)av); 2927 return newRV_noinc ((SV *)av);
… …
2292 SvREFCNT_dec (cb); 2965 SvREFCNT_dec (cb);
2293 } 2966 }
2294} 2967}
2295 2968
2296static void 2969static void
2297coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2970coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2298{ 2971{
2299 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2972 /* call $sem->adjust (0) to possibly wake up some other waiters */
2300 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2973 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2301} 2974}
2302 2975
2303static int 2976static int
2304slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2977slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2305{ 2978{
2306 AV *av = (AV *)frame->data; 2979 AV *av = (AV *)frame->data;
2307 SV *count_sv = AvARRAY (av)[0]; 2980 SV *count_sv = AvARRAY (av)[0];
2981 SV *coro_hv = SvRV (coro_current);
2982
2983 frame->destroy = 0;
2308 2984
2309 /* if we are about to throw, don't actually acquire the lock, just throw */ 2985 /* if we are about to throw, don't actually acquire the lock, just throw */
2310 if (CORO_THROW) 2986 if (ecb_expect_false (CORO_THROW))
2987 {
2988 /* we still might be responsible for the semaphore, so wake up others */
2989 coro_semaphore_adjust (aTHX_ av, 0);
2990
2311 return 0; 2991 return 0;
2992 }
2312 else if (SvIVX (count_sv) > 0) 2993 else if (SvIVX (count_sv) > 0)
2313 { 2994 {
2314 SvSTATE_current->on_destroy = 0;
2315
2316 if (acquire) 2995 if (acquire)
2317 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2996 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2318 else 2997 else
2319 coro_semaphore_adjust (aTHX_ av, 0); 2998 coro_semaphore_adjust (aTHX_ av, 0);
2320 2999
… …
2324 { 3003 {
2325 int i; 3004 int i;
2326 /* if we were woken up but can't down, we look through the whole */ 3005 /* if we were woken up but can't down, we look through the whole */
2327 /* waiters list and only add us if we aren't in there already */ 3006 /* waiters list and only add us if we aren't in there already */
2328 /* this avoids some degenerate memory usage cases */ 3007 /* this avoids some degenerate memory usage cases */
2329 3008 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2330 for (i = 1; i <= AvFILLp (av); ++i)
2331 if (AvARRAY (av)[i] == SvRV (coro_current)) 3009 if (AvARRAY (av)[i] == coro_hv)
2332 return 1; 3010 return 1;
2333 3011
2334 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3012 av_push (av, SvREFCNT_inc (coro_hv));
2335 return 1; 3013 return 1;
2336 } 3014 }
2337} 3015}
2338 3016
2339static int 3017static int
… …
2362 { 3040 {
2363 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3041 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2364 3042
2365 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3043 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2366 frame->prepare = prepare_schedule; 3044 frame->prepare = prepare_schedule;
2367
2368 /* to avoid race conditions when a woken-up coro gets terminated */ 3045 /* to avoid race conditions when a woken-up coro gets terminated */
2369 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3046 /* we arrange for a temporary on_destroy that calls adjust (0) */
2370 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3047 frame->destroy = coro_semaphore_destroy;
2371 } 3048 }
2372} 3049}
2373 3050
2374static void 3051static void
2375slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3052slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2383{ 3060{
2384 if (items >= 2) 3061 if (items >= 2)
2385 { 3062 {
2386 /* callback form */ 3063 /* callback form */
2387 AV *av = (AV *)SvRV (arg [0]); 3064 AV *av = (AV *)SvRV (arg [0]);
2388 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3065 SV *cb_cv = s_get_cv_croak (arg [1]);
2389 3066
2390 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3067 av_push (av, SvREFCNT_inc_NN (cb_cv));
2391 3068
2392 if (SvIVX (AvARRAY (av)[0]) > 0) 3069 if (SvIVX (AvARRAY (av)[0]) > 0)
2393 coro_semaphore_adjust (aTHX_ av, 0); 3070 coro_semaphore_adjust (aTHX_ av, 0);
2394 3071
2395 frame->prepare = prepare_nop; 3072 frame->prepare = prepare_nop;
… …
2419 AvARRAY (av)[0] = AvARRAY (av)[1]; 3096 AvARRAY (av)[0] = AvARRAY (av)[1];
2420 AvARRAY (av)[1] = cb; 3097 AvARRAY (av)[1] = cb;
2421 3098
2422 cb = av_shift (av); 3099 cb = av_shift (av);
2423 3100
3101 if (SvTYPE (cb) == SVt_PVCV)
3102 {
3103 dSP;
3104 PUSHMARK (SP);
3105 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3106 PUTBACK;
3107 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3108 }
3109 else
3110 {
2424 api_ready (aTHX_ cb); 3111 api_ready (aTHX_ cb);
2425 sv_setiv (cb, 0); /* signal waiter */ 3112 sv_setiv (cb, 0); /* signal waiter */
3113 }
3114
2426 SvREFCNT_dec (cb); 3115 SvREFCNT_dec (cb);
2427 3116
2428 --count; 3117 --count;
2429 } 3118 }
2430} 3119}
… …
2439static void 3128static void
2440slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3129slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2441{ 3130{
2442 AV *av = (AV *)SvRV (arg [0]); 3131 AV *av = (AV *)SvRV (arg [0]);
2443 3132
3133 if (items >= 2)
3134 {
3135 SV *cb_cv = s_get_cv_croak (arg [1]);
3136 av_push (av, SvREFCNT_inc_NN (cb_cv));
3137
2444 if (SvIVX (AvARRAY (av)[0])) 3138 if (SvIVX (AvARRAY (av)[0]))
3139 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3140
3141 frame->prepare = prepare_nop;
3142 frame->check = slf_check_nop;
3143 }
3144 else if (SvIVX (AvARRAY (av)[0]))
2445 { 3145 {
2446 SvIVX (AvARRAY (av)[0]) = 0; 3146 SvIVX (AvARRAY (av)[0]) = 0;
2447 frame->prepare = prepare_nop; 3147 frame->prepare = prepare_nop;
2448 frame->check = slf_check_nop; 3148 frame->check = slf_check_nop;
2449 } 3149 }
2450 else 3150 else
2451 { 3151 {
2452 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3152 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2453 3153
2454 av_push (av, waiter); 3154 av_push (av, waiter);
2455 3155
2456 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3156 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2457 frame->prepare = prepare_schedule; 3157 frame->prepare = prepare_schedule;
… …
2475 3175
2476static void 3176static void
2477coro_aio_callback (pTHX_ CV *cv) 3177coro_aio_callback (pTHX_ CV *cv)
2478{ 3178{
2479 dXSARGS; 3179 dXSARGS;
2480 AV *state = (AV *)GENSUB_ARG; 3180 AV *state = (AV *)S_GENSUB_ARG;
2481 SV *coro = av_pop (state); 3181 SV *coro = av_pop (state);
2482 SV *data_sv = newSV (sizeof (struct io_state)); 3182 SV *data_sv = newSV (sizeof (struct io_state));
2483 3183
2484 av_extend (state, items - 1); 3184 av_extend (state, items - 1);
2485 3185
… …
2521 /* it quickly returns */ 3221 /* it quickly returns */
2522 if (CORO_THROW) 3222 if (CORO_THROW)
2523 return 0; 3223 return 0;
2524 3224
2525 /* one element that is an RV? repeat! */ 3225 /* one element that is an RV? repeat! */
2526 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3226 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2527 return 1; 3227 return 1;
2528 3228
2529 /* restore status */ 3229 /* restore status */
2530 { 3230 {
2531 SV *data_sv = av_pop (state); 3231 SV *data_sv = av_pop (state);
… …
2570 dSP; 3270 dSP;
2571 3271
2572 static SV *prio_cv; 3272 static SV *prio_cv;
2573 static SV *prio_sv; 3273 static SV *prio_sv;
2574 3274
2575 if (expect_false (!prio_cv)) 3275 if (ecb_expect_false (!prio_cv))
2576 { 3276 {
2577 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3277 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2578 prio_sv = newSViv (0); 3278 prio_sv = newSViv (0);
2579 } 3279 }
2580 3280
… …
2599 3299
2600 for (i = 0; i < items; ++i) 3300 for (i = 0; i < items; ++i)
2601 PUSHs (arg [i]); 3301 PUSHs (arg [i]);
2602 3302
2603 /* now push the callback closure */ 3303 /* now push the callback closure */
2604 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3304 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2605 3305
2606 /* now call the AIO function - we assume our request is uncancelable */ 3306 /* now call the AIO function - we assume our request is uncancelable */
2607 PUTBACK; 3307 PUTBACK;
2608 call_sv ((SV *)req, G_VOID | G_DISCARD); 3308 call_sv ((SV *)req, G_VOID | G_DISCARD);
2609 } 3309 }
2610 3310
2611 /* now that the requets is going, we loop toll we have a result */ 3311 /* now that the request is going, we loop till we have a result */
2612 frame->data = (void *)state; 3312 frame->data = (void *)state;
2613 frame->prepare = prepare_schedule; 3313 frame->prepare = prepare_schedule;
2614 frame->check = slf_check_aio_req; 3314 frame->check = slf_check_aio_req;
2615} 3315}
2616 3316
… …
2624 XSRETURN_EMPTY; 3324 XSRETURN_EMPTY;
2625} 3325}
2626 3326
2627/*****************************************************************************/ 3327/*****************************************************************************/
2628 3328
3329#if CORO_CLONE
3330# include "clone.c"
3331#endif
3332
3333/*****************************************************************************/
3334
3335static SV *
3336coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3337{
3338 SV *coro_sv;
3339 struct coro *coro;
3340 MAGIC *mg;
3341 HV *hv;
3342 SV *cb;
3343 int i;
3344
3345 if (argc > 0)
3346 {
3347 cb = s_get_cv_croak (argv [0]);
3348
3349 if (!is_coro)
3350 {
3351 if (CvISXSUB (cb))
3352 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3353
3354 if (!CvROOT (cb))
3355 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3356 }
3357 }
3358
3359 Newz (0, coro, 1, struct coro);
3360 coro->args = newAV ();
3361 coro->flags = CF_NEW;
3362
3363 if (coro_first) coro_first->prev = coro;
3364 coro->next = coro_first;
3365 coro_first = coro;
3366
3367 coro->hv = hv = newHV ();
3368 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3369 mg->mg_flags |= MGf_DUP;
3370 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3371
3372 if (argc > 0)
3373 {
3374 av_extend (coro->args, argc + is_coro - 1);
3375
3376 if (is_coro)
3377 {
3378 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3379 cb = (SV *)cv_coro_run;
3380 }
3381
3382 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3383
3384 for (i = 1; i < argc; i++)
3385 av_push (coro->args, newSVsv (argv [i]));
3386 }
3387
3388 return coro_sv;
3389}
3390
3391#ifndef __cplusplus
3392ecb_cold XS(boot_Coro__State);
3393#endif
3394
3395#if CORO_JIT
3396
3397static void ecb_noinline ecb_cold
3398pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3399{
3400 dSP;
3401 AV *av = newAV ();
3402
3403 av_store (av, 3, newSVuv (d));
3404 av_store (av, 2, newSVuv (c));
3405 av_store (av, 1, newSVuv (b));
3406 av_store (av, 0, newSVuv (a));
3407
3408 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3409
3410 PUTBACK;
3411}
3412
3413static void ecb_noinline ecb_cold
3414jit_init (pTHX)
3415{
3416 dSP;
3417 SV *load, *save;
3418 char *map_base;
3419 char *load_ptr, *save_ptr;
3420 STRLEN load_len, save_len, map_len;
3421 int count;
3422
3423 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3424
3425 PUSHMARK (SP);
3426 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3427 #include "state.h"
3428 count = call_pv ("Coro::State::_jit", G_ARRAY);
3429 SPAGAIN;
3430
3431 save = POPs; save_ptr = SvPVbyte (save, save_len);
3432 load = POPs; load_ptr = SvPVbyte (load, load_len);
3433
3434 map_len = load_len + save_len + 16;
3435
3436 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3437
3438 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3439
3440 load_perl_slots = (load_save_perl_slots_type)map_base;
3441 memcpy (map_base, load_ptr, load_len);
3442
3443 map_base += (load_len + 15) & ~15;
3444
3445 save_perl_slots = (load_save_perl_slots_type)map_base;
3446 memcpy (map_base, save_ptr, save_len);
3447
3448 /* we are good citizens and try to make the page read-only, so the evil evil */
3449 /* hackers might have it a bit more difficult */
3450 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3451
3452 PUTBACK;
3453 eval_pv ("undef &Coro::State::_jit", 1);
3454}
3455
3456#endif
3457
2629MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3458MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2630 3459
2631PROTOTYPES: DISABLE 3460PROTOTYPES: DISABLE
2632 3461
2633BOOT: 3462BOOT:
2634{ 3463{
3464#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3465#include "state.h"
2635#ifdef USE_ITHREADS 3466#ifdef USE_ITHREADS
2636# if CORO_PTHREAD 3467# if CORO_PTHREAD
2637 coro_thx = PERL_GET_CONTEXT; 3468 coro_thx = PERL_GET_CONTEXT;
2638# endif 3469# endif
2639#endif 3470#endif
2640 BOOT_PAGESIZE; 3471 /* perl defines these to check for existance first, but why it doesn't */
3472 /* just create them one at init time is not clear to me, except for */
3473 /* programs trying to delete them, but... */
3474 /* anyway, we declare this as invalid and make sure they are initialised here */
3475 DEFSV;
3476 ERRSV;
3477
3478 cctx_current = cctx_new_empty ();
2641 3479
2642 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3480 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2643 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3481 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2644 3482
2645 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3483 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
… …
2665 3503
2666 { 3504 {
2667 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3505 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2668 3506
2669 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3507 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2670 hv_store_ent (PL_custom_op_names, slf, 3508 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2671 newSVpv ("coro_slf", 0), 0);
2672 3509
2673 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3510 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2674 hv_store_ent (PL_custom_op_descs, slf, 3511 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2675 newSVpv ("coro schedule like function", 0), 0);
2676 } 3512 }
2677 3513
2678 coroapi.ver = CORO_API_VERSION; 3514 coroapi.ver = CORO_API_VERSION;
2679 coroapi.rev = CORO_API_REVISION; 3515 coroapi.rev = CORO_API_REVISION;
2680 3516
… …
2685 coroapi.prepare_nop = prepare_nop; 3521 coroapi.prepare_nop = prepare_nop;
2686 coroapi.prepare_schedule = prepare_schedule; 3522 coroapi.prepare_schedule = prepare_schedule;
2687 coroapi.prepare_cede = prepare_cede; 3523 coroapi.prepare_cede = prepare_cede;
2688 coroapi.prepare_cede_notself = prepare_cede_notself; 3524 coroapi.prepare_cede_notself = prepare_cede_notself;
2689 3525
2690 { 3526 time_init (aTHX);
2691 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2692 3527
2693 if (!svp) croak ("Time::HiRes is required");
2694 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2695
2696 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2697 }
2698
2699 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3528 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3529#if CORO_JIT
3530 PUTBACK;
3531 jit_init (aTHX);
3532 SPAGAIN;
3533#endif
2700} 3534}
2701 3535
2702SV * 3536SV *
2703new (char *klass, ...) 3537new (SV *klass, ...)
2704 ALIAS: 3538 ALIAS:
2705 Coro::new = 1 3539 Coro::new = 1
2706 CODE: 3540 CODE:
2707{ 3541 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2708 struct coro *coro; 3542 OUTPUT:
2709 MAGIC *mg;
2710 HV *hv;
2711 CV *cb;
2712 int i;
2713
2714 if (items > 1)
2715 {
2716 cb = coro_sv_2cv (aTHX_ ST (1));
2717
2718 if (!ix)
2719 {
2720 if (CvISXSUB (cb))
2721 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2722
2723 if (!CvROOT (cb))
2724 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2725 }
2726 }
2727
2728 Newz (0, coro, 1, struct coro);
2729 coro->args = newAV ();
2730 coro->flags = CF_NEW;
2731
2732 if (coro_first) coro_first->prev = coro;
2733 coro->next = coro_first;
2734 coro_first = coro;
2735
2736 coro->hv = hv = newHV ();
2737 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2738 mg->mg_flags |= MGf_DUP;
2739 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2740
2741 if (items > 1)
2742 {
2743 av_extend (coro->args, items - 1 + ix - 1);
2744
2745 if (ix)
2746 {
2747 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2748 cb = cv_coro_run;
2749 }
2750
2751 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2752
2753 for (i = 2; i < items; i++)
2754 av_push (coro->args, newSVsv (ST (i)));
2755 }
2756}
2757 OUTPUT:
2758 RETVAL 3543 RETVAL
2759 3544
2760void 3545void
2761transfer (...) 3546transfer (...)
2762 PROTOTYPE: $$ 3547 PROTOTYPE: $$
2763 CODE: 3548 CODE:
2764 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3549 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2765 3550
2766bool 3551SV *
2767_destroy (SV *coro_sv) 3552clone (Coro::State coro)
2768 CODE: 3553 CODE:
2769 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 3554{
3555#if CORO_CLONE
3556 struct coro *ncoro = coro_clone (aTHX_ coro);
3557 MAGIC *mg;
3558 /* TODO: too much duplication */
3559 ncoro->hv = newHV ();
3560 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3561 mg->mg_flags |= MGf_DUP;
3562 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3563#else
3564 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3565#endif
3566}
2770 OUTPUT: 3567 OUTPUT:
2771 RETVAL 3568 RETVAL
2772
2773void
2774_exit (int code)
2775 PROTOTYPE: $
2776 CODE:
2777 _exit (code);
2778 3569
2779int 3570int
2780cctx_stacksize (int new_stacksize = 0) 3571cctx_stacksize (int new_stacksize = 0)
2781 PROTOTYPE: ;$ 3572 PROTOTYPE: ;$
2782 CODE: 3573 CODE:
… …
2818void 3609void
2819list () 3610list ()
2820 PROTOTYPE: 3611 PROTOTYPE:
2821 PPCODE: 3612 PPCODE:
2822{ 3613{
2823 struct coro *coro; 3614 struct coro *coro;
2824 for (coro = coro_first; coro; coro = coro->next) 3615 for (coro = coro_first; coro; coro = coro->next)
2825 if (coro->hv) 3616 if (coro->hv)
2826 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3617 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
2827} 3618}
2828 3619
… …
2832 eval = 1 3623 eval = 1
2833 CODE: 3624 CODE:
2834{ 3625{
2835 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3626 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2836 { 3627 {
2837 struct coro temp; 3628 struct coro *current = SvSTATE_current;
3629 struct CoroSLF slf_save;
2838 3630
2839 if (!(coro->flags & CF_RUNNING)) 3631 if (current != coro)
2840 { 3632 {
2841 PUTBACK; 3633 PUTBACK;
2842 save_perl (aTHX_ &temp); 3634 save_perl (aTHX_ current);
2843 load_perl (aTHX_ coro); 3635 load_perl (aTHX_ coro);
3636 /* the coro is most likely in an active SLF call.
3637 * while not strictly required (the code we execute is
3638 * not allowed to call any SLF functions), it's cleaner
3639 * to reinitialise the slf_frame and restore it later.
3640 * This might one day allow us to actually do SLF calls
3641 * from code executed here.
3642 */
3643 slf_save = slf_frame;
3644 slf_frame.prepare = 0;
3645 SPAGAIN;
2844 } 3646 }
2845 3647
2846 {
2847 dSP;
2848 ENTER;
2849 SAVETMPS;
2850 PUTBACK;
2851 PUSHSTACK; 3648 PUSHSTACK;
3649
2852 PUSHMARK (SP); 3650 PUSHMARK (SP);
3651 PUTBACK;
2853 3652
2854 if (ix) 3653 if (ix)
2855 eval_sv (coderef, 0); 3654 eval_sv (coderef, 0);
2856 else 3655 else
2857 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3656 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2858 3657
2859 POPSTACK; 3658 POPSTACK;
2860 SPAGAIN; 3659 SPAGAIN;
2861 FREETMPS;
2862 LEAVE;
2863 PUTBACK;
2864 }
2865 3660
2866 if (!(coro->flags & CF_RUNNING)) 3661 if (current != coro)
2867 { 3662 {
3663 PUTBACK;
3664 slf_frame = slf_save;
2868 save_perl (aTHX_ coro); 3665 save_perl (aTHX_ coro);
2869 load_perl (aTHX_ &temp); 3666 load_perl (aTHX_ current);
2870 SPAGAIN; 3667 SPAGAIN;
2871 } 3668 }
2872 } 3669 }
2873} 3670}
2874 3671
… …
2877 PROTOTYPE: $ 3674 PROTOTYPE: $
2878 ALIAS: 3675 ALIAS:
2879 is_ready = CF_READY 3676 is_ready = CF_READY
2880 is_running = CF_RUNNING 3677 is_running = CF_RUNNING
2881 is_new = CF_NEW 3678 is_new = CF_NEW
2882 is_destroyed = CF_DESTROYED 3679 is_destroyed = CF_ZOMBIE
3680 is_zombie = CF_ZOMBIE
3681 is_suspended = CF_SUSPENDED
2883 CODE: 3682 CODE:
2884 RETVAL = boolSV (coro->flags & ix); 3683 RETVAL = boolSV (coro->flags & ix);
2885 OUTPUT: 3684 OUTPUT:
2886 RETVAL 3685 RETVAL
2887 3686
2888void 3687void
2889throw (Coro::State self, SV *throw = &PL_sv_undef) 3688throw (SV *self, SV *exception = &PL_sv_undef)
2890 PROTOTYPE: $;$ 3689 PROTOTYPE: $;$
2891 CODE: 3690 CODE:
2892{ 3691{
3692 struct coro *coro = SvSTATE (self);
2893 struct coro *current = SvSTATE_current; 3693 struct coro *current = SvSTATE_current;
2894 SV **throwp = self == current ? &CORO_THROW : &self->except; 3694 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
2895 SvREFCNT_dec (*throwp); 3695 SvREFCNT_dec (*exceptionp);
2896 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3696 SvGETMAGIC (exception);
3697 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3698
3699 api_ready (aTHX_ self);
2897} 3700}
2898 3701
2899void 3702void
2900api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3703api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2901 PROTOTYPE: $;$ 3704 PROTOTYPE: $;$
… …
2903 3706
2904SV * 3707SV *
2905has_cctx (Coro::State coro) 3708has_cctx (Coro::State coro)
2906 PROTOTYPE: $ 3709 PROTOTYPE: $
2907 CODE: 3710 CODE:
2908 RETVAL = boolSV (!!coro->cctx); 3711 /* maybe manage the running flag differently */
3712 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2909 OUTPUT: 3713 OUTPUT:
2910 RETVAL 3714 RETVAL
2911 3715
2912int 3716int
2913is_traced (Coro::State coro) 3717is_traced (Coro::State coro)
… …
2933 3737
2934void 3738void
2935force_cctx () 3739force_cctx ()
2936 PROTOTYPE: 3740 PROTOTYPE:
2937 CODE: 3741 CODE:
2938 SvSTATE_current->cctx->idle_sp = 0; 3742 cctx_current->idle_sp = 0;
2939 3743
2940void 3744void
2941swap_defsv (Coro::State self) 3745swap_defsv (Coro::State self)
2942 PROTOTYPE: $ 3746 PROTOTYPE: $
2943 ALIAS: 3747 ALIAS:
… …
2951 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3755 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2952 3756
2953 SV *tmp = *src; *src = *dst; *dst = tmp; 3757 SV *tmp = *src; *src = *dst; *dst = tmp;
2954 } 3758 }
2955 3759
3760void
3761cancel (Coro::State self)
3762 CODE:
3763 coro_state_destroy (aTHX_ self);
3764
3765SV *
3766enable_times (int enabled = enable_times)
3767 CODE:
3768{
3769 RETVAL = boolSV (enable_times);
3770
3771 if (enabled != enable_times)
3772 {
3773 enable_times = enabled;
3774
3775 coro_times_update ();
3776 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3777 }
3778}
3779 OUTPUT:
3780 RETVAL
3781
3782void
3783times (Coro::State self)
3784 PPCODE:
3785{
3786 struct coro *current = SvSTATE (coro_current);
3787
3788 if (ecb_expect_false (current == self))
3789 {
3790 coro_times_update ();
3791 coro_times_add (SvSTATE (coro_current));
3792 }
3793
3794 EXTEND (SP, 2);
3795 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3796 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3797
3798 if (ecb_expect_false (current == self))
3799 coro_times_sub (SvSTATE (coro_current));
3800}
3801
3802void
3803swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3804 CODE:
3805{
3806 struct coro *current = SvSTATE_current;
3807
3808 if (current == coro)
3809 SWAP_SVS (current);
3810
3811 if (!coro->swap_sv)
3812 coro->swap_sv = newAV ();
3813
3814 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3815 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3816
3817 if (current == coro)
3818 SWAP_SVS (current);
3819}
3820
2956 3821
2957MODULE = Coro::State PACKAGE = Coro 3822MODULE = Coro::State PACKAGE = Coro
2958 3823
2959BOOT: 3824BOOT:
2960{ 3825{
2961 int i;
2962
2963 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2964 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3826 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2965 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3827 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2966 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3828 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
2967 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2968 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3829 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3830 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3831 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3832 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3833 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
2969 3834
2970 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3835 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
2971 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3836 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
2972 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3837 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
2973 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3838 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
2974 3839
2975 coro_stash = gv_stashpv ("Coro", TRUE); 3840 coro_stash = gv_stashpv ("Coro", TRUE);
2976 3841
2977 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3842 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2978 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3843 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2979 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3844 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2980 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3845 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2981 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3846 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2982 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3847 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2983
2984 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2985 coro_ready[i] = newAV ();
2986 3848
2987 { 3849 {
2988 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3850 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2989 3851
2990 coroapi.schedule = api_schedule; 3852 coroapi.schedule = api_schedule;
3853 coroapi.schedule_to = api_schedule_to;
2991 coroapi.cede = api_cede; 3854 coroapi.cede = api_cede;
2992 coroapi.cede_notself = api_cede_notself; 3855 coroapi.cede_notself = api_cede_notself;
2993 coroapi.ready = api_ready; 3856 coroapi.ready = api_ready;
2994 coroapi.is_ready = api_is_ready; 3857 coroapi.is_ready = api_is_ready;
2995 coroapi.nready = coro_nready; 3858 coroapi.nready = coro_nready;
… …
2999 sv_setiv (sv, (IV)&coroapi); 3862 sv_setiv (sv, (IV)&coroapi);
3000 SvREADONLY_on (sv); 3863 SvREADONLY_on (sv);
3001 } 3864 }
3002} 3865}
3003 3866
3867SV *
3868async (...)
3869 PROTOTYPE: &@
3870 CODE:
3871 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3872 api_ready (aTHX_ RETVAL);
3873 OUTPUT:
3874 RETVAL
3875
3876void
3877_destroy (Coro::State coro)
3878 CODE:
3879 /* used by the manager thread */
3880 coro_state_destroy (aTHX_ coro);
3881
3882void
3883on_destroy (Coro::State coro, SV *cb)
3884 CODE:
3885 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3886
3887void
3888join (...)
3889 CODE:
3890 CORO_EXECUTE_SLF_XS (slf_init_join);
3891
3892void
3893terminate (...)
3894 CODE:
3895 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3896
3897void
3898cancel (...)
3899 CODE:
3900 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3901
3902int
3903safe_cancel (Coro::State self, ...)
3904 C_ARGS: aTHX_ self, &ST (1), items - 1
3905
3004void 3906void
3005schedule (...) 3907schedule (...)
3006 CODE: 3908 CODE:
3007 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3909 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3910
3911void
3912schedule_to (...)
3913 CODE:
3914 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3915
3916void
3917cede_to (...)
3918 CODE:
3919 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
3008 3920
3009void 3921void
3010cede (...) 3922cede (...)
3011 CODE: 3923 CODE:
3012 CORO_EXECUTE_SLF_XS (slf_init_cede); 3924 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
3026void 3938void
3027_set_readyhook (SV *hook) 3939_set_readyhook (SV *hook)
3028 PROTOTYPE: $ 3940 PROTOTYPE: $
3029 CODE: 3941 CODE:
3030 SvREFCNT_dec (coro_readyhook); 3942 SvREFCNT_dec (coro_readyhook);
3943 SvGETMAGIC (hook);
3944 if (SvOK (hook))
3945 {
3031 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3946 coro_readyhook = newSVsv (hook);
3947 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3948 }
3949 else
3950 {
3951 coro_readyhook = 0;
3952 CORO_READYHOOK = 0;
3953 }
3032 3954
3033int 3955int
3034prio (Coro::State coro, int newprio = 0) 3956prio (Coro::State coro, int newprio = 0)
3035 PROTOTYPE: $;$ 3957 PROTOTYPE: $;$
3036 ALIAS: 3958 ALIAS:
… …
3042 if (items > 1) 3964 if (items > 1)
3043 { 3965 {
3044 if (ix) 3966 if (ix)
3045 newprio = coro->prio - newprio; 3967 newprio = coro->prio - newprio;
3046 3968
3047 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3969 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3048 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3970 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3049 3971
3050 coro->prio = newprio; 3972 coro->prio = newprio;
3051 } 3973 }
3052} 3974}
3053 OUTPUT: 3975 OUTPUT:
… …
3068 RETVAL = coro_nready; 3990 RETVAL = coro_nready;
3069 OUTPUT: 3991 OUTPUT:
3070 RETVAL 3992 RETVAL
3071 3993
3072void 3994void
3995suspend (Coro::State self)
3996 PROTOTYPE: $
3997 CODE:
3998 self->flags |= CF_SUSPENDED;
3999
4000void
4001resume (Coro::State self)
4002 PROTOTYPE: $
4003 CODE:
4004 self->flags &= ~CF_SUSPENDED;
4005
4006void
3073_pool_handler (...) 4007_pool_handler (...)
3074 CODE: 4008 CODE:
3075 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 4009 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3076 4010
3077void 4011void
… …
3088 for (i = 1; i < items; ++i) 4022 for (i = 1; i < items; ++i)
3089 av_push (av, SvREFCNT_inc_NN (ST (i))); 4023 av_push (av, SvREFCNT_inc_NN (ST (i)));
3090 4024
3091 if ((SV *)hv == &PL_sv_undef) 4025 if ((SV *)hv == &PL_sv_undef)
3092 { 4026 {
3093 PUSHMARK (SP); 4027 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3094 EXTEND (SP, 2);
3095 PUSHs (sv_Coro);
3096 PUSHs ((SV *)cv_pool_handler);
3097 PUTBACK;
3098 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3099 SPAGAIN;
3100
3101 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4028 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4029 SvREFCNT_dec (sv);
3102 } 4030 }
3103 4031
3104 { 4032 {
3105 struct coro *coro = SvSTATE_hv (hv); 4033 struct coro *coro = SvSTATE_hv (hv);
3106 4034
… …
3130rouse_wait (...) 4058rouse_wait (...)
3131 PROTOTYPE: ;$ 4059 PROTOTYPE: ;$
3132 PPCODE: 4060 PPCODE:
3133 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 4061 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3134 4062
4063void
4064on_enter (SV *block)
4065 ALIAS:
4066 on_leave = 1
4067 PROTOTYPE: &
4068 CODE:
4069{
4070 struct coro *coro = SvSTATE_current;
4071 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4072
4073 block = s_get_cv_croak (block);
4074
4075 if (!*avp)
4076 *avp = newAV ();
4077
4078 av_push (*avp, SvREFCNT_inc (block));
4079
4080 if (!ix)
4081 on_enterleave_call (aTHX_ block);
4082
4083 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4084 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
4085 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
4086}
4087
3135 4088
3136MODULE = Coro::State PACKAGE = PerlIO::cede 4089MODULE = Coro::State PACKAGE = PerlIO::cede
3137 4090
3138BOOT: 4091BOOT:
3139 PerlIO_define_layer (aTHX_ &PerlIO_cede); 4092 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3142MODULE = Coro::State PACKAGE = Coro::Semaphore 4095MODULE = Coro::State PACKAGE = Coro::Semaphore
3143 4096
3144SV * 4097SV *
3145new (SV *klass, SV *count = 0) 4098new (SV *klass, SV *count = 0)
3146 CODE: 4099 CODE:
4100{
4101 int semcnt = 1;
4102
4103 if (count)
4104 {
4105 SvGETMAGIC (count);
4106
4107 if (SvOK (count))
4108 semcnt = SvIV (count);
4109 }
4110
3147 RETVAL = sv_bless ( 4111 RETVAL = sv_bless (
3148 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 4112 coro_waitarray_new (aTHX_ semcnt),
3149 GvSTASH (CvGV (cv)) 4113 GvSTASH (CvGV (cv))
3150 ); 4114 );
4115}
3151 OUTPUT: 4116 OUTPUT:
3152 RETVAL 4117 RETVAL
3153 4118
3154# helper for Coro::Channel 4119# helper for Coro::Channel and others
3155SV * 4120SV *
3156_alloc (int count) 4121_alloc (int count)
3157 CODE: 4122 CODE:
3158 RETVAL = coro_waitarray_new (aTHX_ count); 4123 RETVAL = coro_waitarray_new (aTHX_ count);
3159 OUTPUT: 4124 OUTPUT:
… …
3201 XSRETURN_NO; 4166 XSRETURN_NO;
3202} 4167}
3203 4168
3204void 4169void
3205waiters (SV *self) 4170waiters (SV *self)
3206 PPCODE: 4171 PPCODE:
3207{ 4172{
3208 AV *av = (AV *)SvRV (self); 4173 AV *av = (AV *)SvRV (self);
3209 int wcount = AvFILLp (av) + 1 - 1; 4174 int wcount = AvFILLp (av) + 1 - 1;
3210 4175
3211 if (GIMME_V == G_SCALAR) 4176 if (GIMME_V == G_SCALAR)
… …
3217 for (i = 1; i <= wcount; ++i) 4182 for (i = 1; i <= wcount; ++i)
3218 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4183 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3219 } 4184 }
3220} 4185}
3221 4186
4187MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4188
4189void
4190_may_delete (SV *sem, int count, unsigned int extra_refs)
4191 PPCODE:
4192{
4193 AV *av = (AV *)SvRV (sem);
4194
4195 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4196 && AvFILLp (av) == 0 /* no waiters, just count */
4197 && SvIV (AvARRAY (av)[0]) == count)
4198 XSRETURN_YES;
4199
4200 XSRETURN_NO;
4201}
4202
3222MODULE = Coro::State PACKAGE = Coro::Signal 4203MODULE = Coro::State PACKAGE = Coro::Signal
3223 4204
3224SV * 4205SV *
3225new (SV *klass) 4206new (SV *klass)
3226 CODE: 4207 CODE:
… …
3238 4219
3239void 4220void
3240broadcast (SV *self) 4221broadcast (SV *self)
3241 CODE: 4222 CODE:
3242{ 4223{
3243 AV *av = (AV *)SvRV (self); 4224 AV *av = (AV *)SvRV (self);
3244 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4225 coro_signal_wake (aTHX_ av, AvFILLp (av));
3245} 4226}
3246 4227
3247void 4228void
3248send (SV *self) 4229send (SV *self)
… …
3256 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4237 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3257} 4238}
3258 4239
3259IV 4240IV
3260awaited (SV *self) 4241awaited (SV *self)
3261 CODE: 4242 CODE:
3262 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4243 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3263 OUTPUT: 4244 OUTPUT:
3264 RETVAL 4245 RETVAL
3265 4246
3266 4247
… …
3271 4252
3272void 4253void
3273_schedule (...) 4254_schedule (...)
3274 CODE: 4255 CODE:
3275{ 4256{
3276 static int incede; 4257 static int incede;
3277 4258
3278 api_cede_notself (aTHX); 4259 api_cede_notself (aTHX);
3279 4260
3280 ++incede; 4261 ++incede;
3281 while (coro_nready >= incede && api_cede (aTHX)) 4262 while (coro_nready >= incede && api_cede (aTHX))
… …
3297 4278
3298void 4279void
3299_register (char *target, char *proto, SV *req) 4280_register (char *target, char *proto, SV *req)
3300 CODE: 4281 CODE:
3301{ 4282{
3302 CV *req_cv = coro_sv_2cv (aTHX_ req); 4283 SV *req_cv = s_get_cv_croak (req);
3303 /* newXSproto doesn't return the CV on 5.8 */ 4284 /* newXSproto doesn't return the CV on 5.8 */
3304 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4285 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3305 sv_setpv ((SV *)slf_cv, proto); 4286 sv_setpv ((SV *)slf_cv, proto);
3306 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4287 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3307} 4288}
3308 4289
4290MODULE = Coro::State PACKAGE = Coro::Select
4291
4292void
4293patch_pp_sselect ()
4294 CODE:
4295 if (!coro_old_pp_sselect)
4296 {
4297 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4298 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4299 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4300 }
4301
4302void
4303unpatch_pp_sselect ()
4304 CODE:
4305 if (coro_old_pp_sselect)
4306 {
4307 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4308 coro_old_pp_sselect = 0;
4309 }
4310
4311MODULE = Coro::State PACKAGE = Coro::Util
4312
4313void
4314_exit (int code)
4315 CODE:
4316 _exit (code);
4317
4318NV
4319time ()
4320 CODE:
4321 RETVAL = nvtime (aTHX);
4322 OUTPUT:
4323 RETVAL
4324
4325NV
4326gettimeofday ()
4327 PPCODE:
4328{
4329 UV tv [2];
4330 u2time (aTHX_ tv);
4331 EXTEND (SP, 2);
4332 PUSHs (sv_2mortal (newSVuv (tv [0])));
4333 PUSHs (sv_2mortal (newSVuv (tv [1])));
4334}
4335

Diff Legend

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