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.360 by root, Mon Jun 29 06:14:23 2009 UTC vs.
Revision 1.458 by root, Fri Jun 17 04:59:27 2016 UTC

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

Diff Legend

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