ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

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

Diff Legend

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