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

Diff Legend

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