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.338 by root, Sun Dec 7 15:33:21 2008 UTC vs.
Revision 1.463 by root, Wed Jun 22 20:37:27 2016 UTC

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

Diff Legend

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