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.371 by root, Sat Aug 22 22:36:23 2009 UTC vs.
Revision 1.480 by root, Fri Jun 25 01:13:21 2021 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"
… …
8#include "XSUB.h" 33#include "XSUB.h"
9#include "perliol.h" 34#include "perliol.h"
10 35
11#include "schmorp.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#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 101#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57# undef CORO_STACKGUARD 102# define HAS_SCOPESTACK_NAME 1
58#endif
59
60#ifndef CORO_STACKGUARD
61# define CORO_STACKGUARD 0
62#endif 103#endif
63 104
64/* prefer perl internal functions over our own? */ 105/* prefer perl internal functions over our own? */
65#ifndef CORO_PREFER_PERL_FUNCTIONS 106#ifndef CORO_PREFER_PERL_FUNCTIONS
66# define CORO_PREFER_PERL_FUNCTIONS 0 107# define CORO_PREFER_PERL_FUNCTIONS 0
… …
76# define STACKLEVEL ((void *)&stacklevel) 117# define STACKLEVEL ((void *)&stacklevel)
77#endif 118#endif
78 119
79#define IN_DESTRUCT PL_dirty 120#define IN_DESTRUCT PL_dirty
80 121
81#if __GNUC__ >= 3
82# define attribute(x) __attribute__(x)
83# define expect(expr,value) __builtin_expect ((expr), (value))
84# define INLINE static inline
85#else
86# define attribute(x)
87# define expect(expr,value) (expr)
88# define INLINE static
89#endif
90
91#define expect_false(expr) expect ((expr) != 0, 0)
92#define expect_true(expr) expect ((expr) != 0, 1)
93
94#define NOINLINE attribute ((noinline))
95
96#include "CoroAPI.h" 122#include "CoroAPI.h"
97#define GCoroAPI (&coroapi) /* very sneaky */ 123#define GCoroAPI (&coroapi) /* very sneaky */
98 124
99#ifdef USE_ITHREADS 125#ifdef USE_ITHREADS
100# if CORO_PTHREAD 126# if CORO_PTHREAD
… …
110# define CORO_CLOCK_MONOTONIC 1 136# define CORO_CLOCK_MONOTONIC 1
111# define CORO_CLOCK_THREAD_CPUTIME_ID 3 137# define CORO_CLOCK_THREAD_CPUTIME_ID 3
112# endif 138# endif
113#endif 139#endif
114 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
115static double (*nvtime)(); /* so why doesn't it take void? */ 159static double (*nvtime)(); /* so why doesn't it take void? */
116static void (*u2time)(pTHX_ UV ret[2]); 160static void (*u2time)(pTHX_ UV ret[2]);
117 161
118/* we hijack an hopefully unused CV flag for our purposes */ 162/* we hijack an hopefully unused CV flag for our purposes */
119#define CVf_SLF 0x4000 163#define CVf_SLF 0x4000
120static OP *pp_slf (pTHX); 164static OP *pp_slf (pTHX);
165static void slf_destroy (pTHX_ struct coro *coro);
121 166
122static U32 cctx_gen; 167static U32 cctx_gen;
123static size_t cctx_stacksize = CORO_STACKSIZE; 168static size_t cctx_stacksize = CORO_STACKSIZE;
124static struct CoroAPI coroapi; 169static struct CoroAPI coroapi;
125static AV *main_mainstack; /* used to differentiate between $main and others */ 170static AV *main_mainstack; /* used to differentiate between $main and others */
… …
133 178
134static GV *irsgv; /* $/ */ 179static GV *irsgv; /* $/ */
135static GV *stdoutgv; /* *STDOUT */ 180static GV *stdoutgv; /* *STDOUT */
136static SV *rv_diehook; 181static SV *rv_diehook;
137static SV *rv_warnhook; 182static SV *rv_warnhook;
138static HV *hv_sig; /* %SIG */
139 183
140/* async_pool helper stuff */ 184/* async_pool helper stuff */
141static SV *sv_pool_rss; 185static SV *sv_pool_rss;
142static SV *sv_pool_size; 186static SV *sv_pool_size;
143static SV *sv_async_pool_idle; /* description string */ 187static SV *sv_async_pool_idle; /* description string */
… …
155static char times_valid; 199static char times_valid;
156 200
157static struct coro_cctx *cctx_first; 201static struct coro_cctx *cctx_first;
158static int cctx_count, cctx_idle; 202static int cctx_count, cctx_idle;
159 203
160enum { 204enum
205{
161 CC_MAPPED = 0x01, 206 CC_MAPPED = 0x01,
162 CC_NOREUSE = 0x02, /* throw this away after tracing */ 207 CC_NOREUSE = 0x02, /* throw this away after tracing */
163 CC_TRACE = 0x04, 208 CC_TRACE = 0x04,
164 CC_TRACE_SUB = 0x08, /* trace sub calls */ 209 CC_TRACE_SUB = 0x08, /* trace sub calls */
165 CC_TRACE_LINE = 0x10, /* trace each statement */ 210 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
170typedef struct coro_cctx 215typedef struct coro_cctx
171{ 216{
172 struct coro_cctx *next; 217 struct coro_cctx *next;
173 218
174 /* the stack */ 219 /* the stack */
175 void *sptr; 220 struct coro_stack stack;
176 size_t ssize;
177 221
178 /* cpu state */ 222 /* cpu state */
179 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
180 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
181 JMPENV *top_env; 227 JMPENV *top_env;
182 coro_context cctx; 228 coro_context cctx;
183 229
184 U32 gen; 230 U32 gen;
185#if CORO_USE_VALGRIND 231#if CORO_USE_VALGRIND
186 int valgrind_id; 232 int valgrind_id;
187#endif 233#endif
188 unsigned char flags; 234 unsigned char flags;
189} coro_cctx; 235} coro_cctx;
190 236
191coro_cctx *cctx_current; /* the currently running cctx */ 237static coro_cctx *cctx_current; /* the currently running cctx */
192 238
193/*****************************************************************************/ 239/*****************************************************************************/
194 240
241static MGVTBL coro_state_vtbl;
242
195enum { 243enum
244{
196 CF_RUNNING = 0x0001, /* coroutine is running */ 245 CF_RUNNING = 0x0001, /* coroutine is running */
197 CF_READY = 0x0002, /* coroutine is ready */ 246 CF_READY = 0x0002, /* coroutine is ready */
198 CF_NEW = 0x0004, /* has never been switched to */ 247 CF_NEW = 0x0004, /* has never been switched to */
199 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 248 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
200 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 249 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
250 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
201}; 251};
202 252
203/* 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 */
204typedef struct 254typedef struct
205{ 255{
206 SV *defsv;
207 AV *defav;
208 SV *errsv;
209 SV *irsgv;
210 HV *hinthv;
211#define VAR(name,type) type name; 256 #define VARx(name,expr,type) type name;
212# include "state.h" 257 #include "state.h"
213#undef VAR
214} perl_slots; 258} perl_slots;
215 259
260/* how many context stack entries do we need for perl_slots */
216#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))
217 262
218/* this is a structure representing a perl-level coroutine */ 263/* this is a structure representing a perl-level coroutine */
219struct coro { 264struct coro
265{
220 /* the C coroutine allocated to this perl coroutine, if any */ 266 /* the C coroutine allocated to this perl coroutine, if any */
221 coro_cctx *cctx; 267 coro_cctx *cctx;
222 268
223 /* ready queue */ 269 /* ready queue */
224 struct coro *next_ready; 270 struct coro *next_ready;
… …
226 /* state data */ 272 /* state data */
227 struct CoroSLF slf_frame; /* saved slf frame */ 273 struct CoroSLF slf_frame; /* saved slf frame */
228 AV *mainstack; 274 AV *mainstack;
229 perl_slots *slot; /* basically the saved sp */ 275 perl_slots *slot; /* basically the saved sp */
230 276
231 CV *startcv; /* the CV to execute */ 277 CV *startcv; /* the CV to execute */
232 AV *args; /* data associated with this coroutine (initial args) */ 278 AV *args; /* data associated with this coroutine (initial args) */
233 int refcnt; /* coroutines are refcounted, yes */
234 int flags; /* CF_ flags */ 279 int flags; /* CF_ flags */
235 HV *hv; /* the perl hash associated with this coro, if any */ 280 HV *hv; /* the perl hash associated with this coro, if any */
236 void (*on_destroy)(pTHX_ struct coro *coro);
237 281
238 /* statistics */ 282 /* statistics */
239 int usecount; /* number of transfers to this coro */ 283 int usecount; /* number of transfers to this coro */
240 284
241 /* coro process data */ 285 /* coro process data */
242 int prio; 286 int prio;
243 SV *except; /* exception to be thrown */ 287 SV *except; /* exception to be thrown */
244 SV *rouse_cb; 288 SV *rouse_cb; /* most recently created rouse callback */
289 AV *on_destroy; /* callbacks or coros to notify on destroy */
290 AV *status; /* the exit status list */
245 291
246 /* async_pool */ 292 /* async_pool */
247 SV *saved_deffh; 293 SV *saved_deffh;
248 SV *invoke_cb; 294 SV *invoke_cb;
249 AV *invoke_av; 295 AV *invoke_av;
250 296
251 /* on_enter/on_leave */ 297 /* on_enter/on_leave */
252 AV *on_enter; 298 AV *on_enter; AV *on_enter_xs;
253 AV *on_leave; 299 AV *on_leave; AV *on_leave_xs;
300
301 /* swap_sv */
302 AV *swap_sv;
254 303
255 /* times */ 304 /* times */
256 coro_ts t_cpu, t_real; 305 coro_ts t_cpu, t_real;
257 306
258 /* linked list */ 307 /* linked list */
… …
262typedef struct coro *Coro__State; 311typedef struct coro *Coro__State;
263typedef struct coro *Coro__State_or_hashref; 312typedef struct coro *Coro__State_or_hashref;
264 313
265/* the following variables are effectively part of the perl context */ 314/* the following variables are effectively part of the perl context */
266/* and get copied between struct coro and these variables */ 315/* and get copied between struct coro and these variables */
267/* the mainr easonw e don't support windows process emulation */ 316/* the main reason we don't support windows process emulation */
268static struct CoroSLF slf_frame; /* the current slf frame */ 317static struct CoroSLF slf_frame; /* the current slf frame */
269 318
270/** Coro ********************************************************************/ 319/** Coro ********************************************************************/
271 320
272#define CORO_PRIO_MAX 3 321#define CORO_PRIO_MAX 3
… …
278 327
279/* for Coro.pm */ 328/* for Coro.pm */
280static SV *coro_current; 329static SV *coro_current;
281static SV *coro_readyhook; 330static SV *coro_readyhook;
282static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 331static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
283static CV *cv_coro_run, *cv_coro_terminate; 332static CV *cv_coro_run;
284static struct coro *coro_first; 333static struct coro *coro_first;
285#define coro_nready coroapi.nready 334#define coro_nready coroapi.nready
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
286 358
287/** Coro::Select ************************************************************/ 359/** Coro::Select ************************************************************/
288 360
289static OP *(*coro_old_pp_sselect) (pTHX); 361static OP *(*coro_old_pp_sselect) (pTHX);
290static SV *coro_select_select; 362static SV *coro_select_select;
… …
302 PL_op->op_flags |= OPf_STACKED; 374 PL_op->op_flags |= OPf_STACKED;
303 PL_op->op_private = 0; 375 PL_op->op_private = 0;
304 return PL_ppaddr [OP_ENTERSUB](aTHX); 376 return PL_ppaddr [OP_ENTERSUB](aTHX);
305} 377}
306 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
307/** lowlevel stuff **********************************************************/ 431/** lowlevel stuff **********************************************************/
308 432
309static SV * 433static SV * ecb_noinline
310coro_get_sv (pTHX_ const char *name, int create) 434coro_get_sv (pTHX_ const char *name, int create)
311{ 435{
312#if PERL_VERSION_ATLEAST (5,10,0) 436#if PERL_VERSION_ATLEAST (5,10,0)
313 /* 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 */
314 get_sv (name, create); 438 get_sv (name, create);
315#endif 439#endif
316 return get_sv (name, create); 440 return get_sv (name, create);
317} 441}
318 442
319static AV * 443static AV * ecb_noinline
320coro_get_av (pTHX_ const char *name, int create) 444coro_get_av (pTHX_ const char *name, int create)
321{ 445{
322#if PERL_VERSION_ATLEAST (5,10,0) 446#if PERL_VERSION_ATLEAST (5,10,0)
323 /* 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 */
324 get_av (name, create); 448 get_av (name, create);
325#endif 449#endif
326 return get_av (name, create); 450 return get_av (name, create);
327} 451}
328 452
329static HV * 453static HV * ecb_noinline
330coro_get_hv (pTHX_ const char *name, int create) 454coro_get_hv (pTHX_ const char *name, int create)
331{ 455{
332#if PERL_VERSION_ATLEAST (5,10,0) 456#if PERL_VERSION_ATLEAST (5,10,0)
333 /* 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 */
334 get_hv (name, create); 458 get_hv (name, create);
335#endif 459#endif
336 return get_hv (name, create); 460 return get_hv (name, create);
337} 461}
338 462
339INLINE void 463ecb_inline void
340coro_times_update () 464coro_times_update (void)
341{ 465{
342#ifdef coro_clock_gettime 466#ifdef coro_clock_gettime
343 struct timespec ts; 467 struct timespec ts;
344 468
345 ts.tv_sec = ts.tv_nsec = 0; 469 ts.tv_sec = ts.tv_nsec = 0;
… …
357 time_real [0] = tv [0]; 481 time_real [0] = tv [0];
358 time_real [1] = tv [1] * 1000; 482 time_real [1] = tv [1] * 1000;
359#endif 483#endif
360} 484}
361 485
362INLINE void 486ecb_inline void
363coro_times_add (struct coro *c) 487coro_times_add (struct coro *c)
364{ 488{
365 c->t_real [1] += time_real [1]; 489 c->t_real [1] += time_real [1];
366 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 490 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
367 c->t_real [0] += time_real [0]; 491 c->t_real [0] += time_real [0];
… …
369 c->t_cpu [1] += time_cpu [1]; 493 c->t_cpu [1] += time_cpu [1];
370 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 494 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
371 c->t_cpu [0] += time_cpu [0]; 495 c->t_cpu [0] += time_cpu [0];
372} 496}
373 497
374INLINE void 498ecb_inline void
375coro_times_sub (struct coro *c) 499coro_times_sub (struct coro *c)
376{ 500{
377 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 501 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
378 c->t_real [1] -= time_real [1]; 502 c->t_real [1] -= time_real [1];
379 c->t_real [0] -= time_real [0]; 503 c->t_real [0] -= time_real [0];
… …
387/* magic glue */ 511/* magic glue */
388 512
389#define CORO_MAGIC_type_cv 26 513#define CORO_MAGIC_type_cv 26
390#define CORO_MAGIC_type_state PERL_MAGIC_ext 514#define CORO_MAGIC_type_state PERL_MAGIC_ext
391 515
392#define CORO_MAGIC_NN(sv, type) \ 516#define CORO_MAGIC_NN(sv, type) \
393 (expect_true (SvMAGIC (sv)->mg_type == type) \ 517 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
394 ? SvMAGIC (sv) \ 518 ? SvMAGIC (sv) \
395 : mg_find (sv, type)) 519 : mg_find (sv, type))
396 520
397#define CORO_MAGIC(sv, type) \ 521#define CORO_MAGIC(sv, type) \
398 (expect_true (SvMAGIC (sv)) \ 522 (ecb_expect_true (SvMAGIC (sv)) \
399 ? CORO_MAGIC_NN (sv, type) \ 523 ? CORO_MAGIC_NN (sv, type) \
400 : 0) 524 : 0)
401 525
402#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)
403#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)
404 528
405INLINE struct coro * 529ecb_inline MAGIC *
406SvSTATE_ (pTHX_ SV *coro) 530SvSTATEhv_p (pTHX_ SV *coro)
407{ 531{
408 HV *stash;
409 MAGIC *mg; 532 MAGIC *mg;
410 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
411 if (SvROK (coro)) 549 if (SvROK (coro_sv))
412 coro = SvRV (coro); 550 coro_sv = SvRV (coro_sv);
413 551
414 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 552 mg = SvSTATEhv_p (aTHX_ coro_sv);
553 if (!mg)
415 croak ("Coro::State object required"); 554 croak ("Coro::State object required");
416 555
417 stash = SvSTASH (coro);
418 if (expect_false (stash != coro_stash && stash != coro_state_stash))
419 {
420 /* very slow, but rare, check */
421 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
422 croak ("Coro::State object required");
423 }
424
425 mg = CORO_MAGIC_state (coro);
426 return (struct coro *)mg->mg_ptr; 556 return (struct coro *)mg->mg_ptr;
427} 557}
428 558
429#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 559#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
430 560
… …
433#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 563#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
434 564
435/*****************************************************************************/ 565/*****************************************************************************/
436/* padlist management and caching */ 566/* padlist management and caching */
437 567
438static AV * 568ecb_inline PADLIST *
439coro_derive_padlist (pTHX_ CV *cv) 569coro_derive_padlist (pTHX_ CV *cv)
440{ 570{
441 AV *padlist = CvPADLIST (cv); 571 PADLIST *padlist = CvPADLIST (cv);
442 AV *newpadlist, *newpad; 572 PADLIST *newpadlist;
573 PADNAMELIST *padnames;
574 PAD *newpad;
575 PADOFFSET off = PadlistMAX (padlist) + 1;
443 576
444 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. */
445 AvREAL_off (newpadlist); 605 AvREAL_off (newpadlist);
446#if PERL_VERSION_ATLEAST (5,10,0)
447 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
448#else
449 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
450#endif 606#endif
451 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
452 --AvFILLp (padlist);
453 607
454 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 608 /* Already extended to 2 elements by newPADLIST. */
455 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;
456 616
457 return newpadlist; 617 return newpadlist;
458} 618}
459 619
460static void 620ecb_inline void
461free_padlist (pTHX_ AV *padlist) 621free_padlist (pTHX_ PADLIST *padlist)
462{ 622{
463 /* may be during global destruction */ 623 /* may be during global destruction */
464 if (!IN_DESTRUCT) 624 if (!IN_DESTRUCT)
465 { 625 {
466 I32 i = AvFILLp (padlist); 626 I32 i = PadlistMAX (padlist);
467 627
468 while (i > 0) /* special-case index 0 */ 628 while (i > 0) /* special-case index 0 */
469 { 629 {
470 /* we try to be extra-careful here */ 630 /* we try to be extra-careful here */
471 AV *av = (AV *)AvARRAY (padlist)[i--]; 631 PAD *pad = PadlistARRAY (padlist)[i--];
472 I32 j = AvFILLp (av);
473 632
633 if (pad)
634 {
635 I32 j = PadMAX (pad);
636
474 while (j >= 0) 637 while (j >= 0)
475 SvREFCNT_dec (AvARRAY (av)[j--]); 638 SvREFCNT_dec (PadARRAY (pad)[j--]);
476 639
477 AvFILLp (av) = -1; 640 PadMAX (pad) = -1;
478 SvREFCNT_dec (av); 641 SvREFCNT_dec (pad);
642 }
479 } 643 }
480 644
481 SvREFCNT_dec (AvARRAY (padlist)[0]); 645 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
482 646
647#if NEWPADAPI
648 Safefree (PadlistARRAY (padlist));
649 Safefree (padlist);
650#else
483 AvFILLp (padlist) = -1; 651 AvFILLp (padlist) = -1;
652 AvREAL_off (padlist);
484 SvREFCNT_dec ((SV*)padlist); 653 SvREFCNT_dec ((SV*)padlist);
654#endif
485 } 655 }
486} 656}
487 657
488static int 658static int
489coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 659coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
490{ 660{
491 AV *padlist; 661 PADLIST *padlist;
492 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;
493 664
494 /* perl manages to free our internal AV and _then_ call us */ 665 /* perl manages to free our internal AV and _then_ call us */
495 if (IN_DESTRUCT) 666 if (IN_DESTRUCT)
496 return 0; 667 return 0;
497 668
498 /* casting is fun. */ 669 while (len--)
499 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
500 free_padlist (aTHX_ padlist); 670 free_padlist (aTHX_ padlists[len]);
501
502 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
503 671
504 return 0; 672 return 0;
505} 673}
506 674
507static MGVTBL coro_cv_vtbl = { 675static MGVTBL coro_cv_vtbl = {
508 0, 0, 0, 0, 676 0, 0, 0, 0,
509 coro_cv_free 677 coro_cv_free
510}; 678};
511 679
512/* the next two functions merely cache the padlists */ 680/* the next two functions merely cache the padlists */
513static void 681ecb_inline void
514get_padlist (pTHX_ CV *cv) 682get_padlist (pTHX_ CV *cv)
515{ 683{
516 MAGIC *mg = CORO_MAGIC_cv (cv); 684 MAGIC *mg = CORO_MAGIC_cv (cv);
517 AV *av; 685 size_t *lenp;
518 686
519 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 687 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
520 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 688 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
521 else 689 else
522 { 690 {
523#if CORO_PREFER_PERL_FUNCTIONS 691#if CORO_PREFER_PERL_FUNCTIONS
524 /* this is probably cleaner? but also slower! */ 692 /* this is probably cleaner? but also slower! */
525 /* in practise, it seems to be less stable */ 693 /* in practise, it seems to be less stable */
… …
531 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 699 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
532#endif 700#endif
533 } 701 }
534} 702}
535 703
536static void 704ecb_inline void
537put_padlist (pTHX_ CV *cv) 705put_padlist (pTHX_ CV *cv)
538{ 706{
539 MAGIC *mg = CORO_MAGIC_cv (cv); 707 MAGIC *mg = CORO_MAGIC_cv (cv);
540 AV *av;
541 708
542 if (expect_false (!mg)) 709 if (ecb_expect_false (!mg))
710 {
543 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);
544 719
545 av = (AV *)mg->mg_obj; 720 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
546
547 if (expect_false (AvFILLp (av) >= AvMAX (av)))
548 av_extend (av, AvFILLp (av) + 1);
549
550 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
551} 721}
552 722
553/** 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))
554 793
555static void 794static void
556on_enterleave_call (pTHX_ SV *cb); 795on_enterleave_call (pTHX_ SV *cb);
557 796
558static void 797static void
… …
561 perl_slots *slot = c->slot; 800 perl_slots *slot = c->slot;
562 c->slot = 0; 801 c->slot = 0;
563 802
564 PL_mainstack = c->mainstack; 803 PL_mainstack = c->mainstack;
565 804
566 GvSV (PL_defgv) = slot->defsv; 805#if CORO_JIT
567 GvAV (PL_defgv) = slot->defav; 806 load_perl_slots (slot);
568 GvSV (PL_errgv) = slot->errsv; 807#else
569 GvSV (irsgv) = slot->irsgv;
570 GvHV (PL_hintgv) = slot->hinthv;
571
572 #define VAR(name,type) PL_ ## name = slot->name; 808 #define VARx(name,expr,type) expr = slot->name;
573 # include "state.h" 809 #include "state.h"
574 #undef VAR 810#endif
575 811
576 { 812 {
577 dSP; 813 dSP;
578 814
579 CV *cv; 815 CV *cv;
580 816
581 /* now do the ugly restore mess */ 817 /* now do the ugly restore mess */
582 while (expect_true (cv = (CV *)POPs)) 818 while (ecb_expect_true (cv = (CV *)POPs))
583 { 819 {
584 put_padlist (aTHX_ cv); /* mark this padlist as available */ 820 put_padlist (aTHX_ cv); /* mark this padlist as available */
585 CvDEPTH (cv) = PTR2IV (POPs); 821 CvDEPTH (cv) = PTR2IV (POPs);
586 CvPADLIST (cv) = (AV *)POPs; 822 CvPADLIST (cv) = (PADLIST *)POPs;
587 } 823 }
588 824
589 PUTBACK; 825 PUTBACK;
590 } 826 }
591 827
592 slf_frame = c->slf_frame; 828 slf_frame = c->slf_frame;
593 CORO_THROW = c->except; 829 CORO_THROW = c->except;
594 830
595 if (expect_false (enable_times)) 831 if (ecb_expect_false (enable_times))
596 { 832 {
597 if (expect_false (!times_valid)) 833 if (ecb_expect_false (!times_valid))
598 coro_times_update (); 834 coro_times_update ();
599 835
600 coro_times_sub (c); 836 coro_times_sub (c);
601 } 837 }
602 838
603 if (expect_false (c->on_enter)) 839 if (ecb_expect_false (c->on_enter))
604 { 840 {
605 int i; 841 int i;
606 842
607 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 843 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
608 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 844 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
609 } 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);
610} 856}
611 857
612static void 858static void
613save_perl (pTHX_ Coro__State c) 859save_perl (pTHX_ Coro__State c)
614{ 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
615 if (expect_false (c->on_leave)) 871 if (ecb_expect_false (c->on_leave))
616 { 872 {
617 int i; 873 int i;
618 874
619 for (i = AvFILLp (c->on_leave); i >= 0; --i) 875 for (i = AvFILLp (c->on_leave); i >= 0; --i)
620 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 876 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
621 } 877 }
622 878
623 times_valid = 0; 879 times_valid = 0;
624 880
625 if (expect_false (enable_times)) 881 if (ecb_expect_false (enable_times))
626 { 882 {
627 coro_times_update (); times_valid = 1; 883 coro_times_update (); times_valid = 1;
628 coro_times_add (c); 884 coro_times_add (c);
629 } 885 }
630 886
… …
644 900
645 XPUSHs (Nullsv); 901 XPUSHs (Nullsv);
646 /* this loop was inspired by pp_caller */ 902 /* this loop was inspired by pp_caller */
647 for (;;) 903 for (;;)
648 { 904 {
649 while (expect_true (cxix >= 0)) 905 while (ecb_expect_true (cxix >= 0))
650 { 906 {
651 PERL_CONTEXT *cx = &ccstk[cxix--]; 907 PERL_CONTEXT *cx = &ccstk[cxix--];
652 908
653 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 909 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
654 { 910 {
655 CV *cv = cx->blk_sub.cv; 911 CV *cv = cx->blk_sub.cv;
656 912
657 if (expect_true (CvDEPTH (cv))) 913 if (ecb_expect_true (CvDEPTH (cv)))
658 { 914 {
659 EXTEND (SP, 3); 915 EXTEND (SP, 3);
660 PUSHs ((SV *)CvPADLIST (cv)); 916 PUSHs ((SV *)CvPADLIST (cv));
661 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 917 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
662 PUSHs ((SV *)cv); 918 PUSHs ((SV *)cv);
… …
665 get_padlist (aTHX_ cv); 921 get_padlist (aTHX_ cv);
666 } 922 }
667 } 923 }
668 } 924 }
669 925
670 if (expect_true (top_si->si_type == PERLSI_MAIN)) 926 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
671 break; 927 break;
672 928
673 top_si = top_si->si_prev; 929 top_si = top_si->si_prev;
674 ccstk = top_si->si_cxstack; 930 ccstk = top_si->si_cxstack;
675 cxix = top_si->si_cxix; 931 cxix = top_si->si_cxix;
… …
677 933
678 PUTBACK; 934 PUTBACK;
679 } 935 }
680 936
681 /* allocate some space on the context stack for our purposes */ 937 /* allocate some space on the context stack for our purposes */
682 /* we manually unroll here, as usually 2 slots is enough */ 938 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
683 if (SLOT_COUNT >= 1) CXINC;
684 if (SLOT_COUNT >= 2) CXINC;
685 if (SLOT_COUNT >= 3) CXINC;
686 { 939 {
687 unsigned int i; 940 unsigned int i;
941
688 for (i = 3; i < SLOT_COUNT; ++i) 942 for (i = 0; i < SLOT_COUNT; ++i)
689 CXINC; 943 CXINC;
690 } 944
691 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 945 cxstack_ix -= SLOT_COUNT; /* undo allocation */
946 }
692 947
693 c->mainstack = PL_mainstack; 948 c->mainstack = PL_mainstack;
694 949
695 { 950 {
696 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 951 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
697 952
698 slot->defav = GvAV (PL_defgv); 953#if CORO_JIT
699 slot->defsv = DEFSV; 954 save_perl_slots (slot);
700 slot->errsv = ERRSV; 955#else
701 slot->irsgv = GvSV (irsgv);
702 slot->hinthv = GvHV (PL_hintgv);
703
704 #define VAR(name,type) slot->name = PL_ ## name; 956 #define VARx(name,expr,type) slot->name = expr;
705 # include "state.h" 957 #include "state.h"
706 #undef VAR 958#endif
707 } 959 }
708} 960}
709 961
710/* 962/*
711 * allocate various perl stacks. This is almost an exact copy 963 * allocate various perl stacks. This is almost an exact copy
… …
717# define coro_init_stacks(thx) init_stacks () 969# define coro_init_stacks(thx) init_stacks ()
718#else 970#else
719static void 971static void
720coro_init_stacks (pTHX) 972coro_init_stacks (pTHX)
721{ 973{
722 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() */
723 PL_curstackinfo->si_type = PERLSI_MAIN; 975 PL_curstackinfo->si_type = PERLSI_MAIN;
724 PL_curstack = PL_curstackinfo->si_stack; 976 PL_curstack = PL_curstackinfo->si_stack;
725 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 977 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
726 978
727 PL_stack_base = AvARRAY(PL_curstack); 979 PL_stack_base = AvARRAY(PL_curstack);
… …
742#endif 994#endif
743 995
744 New(54,PL_scopestack,8,I32); 996 New(54,PL_scopestack,8,I32);
745 PL_scopestack_ix = 0; 997 PL_scopestack_ix = 0;
746 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
747 1002
748 New(54,PL_savestack,24,ANY); 1003 New(54,PL_savestack,24,ANY);
749 PL_savestack_ix = 0; 1004 PL_savestack_ix = 0;
750 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
751 1011
752#if !PERL_VERSION_ATLEAST (5,10,0) 1012#if !PERL_VERSION_ATLEAST (5,10,0)
753 New(54,PL_retstack,4,OP*); 1013 New(54,PL_retstack,4,OP*);
754 PL_retstack_ix = 0; 1014 PL_retstack_ix = 0;
755 PL_retstack_max = 4; 1015 PL_retstack_max = 4;
… …
779 } 1039 }
780 1040
781 Safefree (PL_tmps_stack); 1041 Safefree (PL_tmps_stack);
782 Safefree (PL_markstack); 1042 Safefree (PL_markstack);
783 Safefree (PL_scopestack); 1043 Safefree (PL_scopestack);
1044#if HAS_SCOPESTACK_NAME
1045 Safefree (PL_scopestack_name);
1046#endif
784 Safefree (PL_savestack); 1047 Safefree (PL_savestack);
785#if !PERL_VERSION_ATLEAST (5,10,0) 1048#if !PERL_VERSION_ATLEAST (5,10,0)
786 Safefree (PL_retstack); 1049 Safefree (PL_retstack);
787#endif 1050#endif
788} 1051}
… …
818 } 1081 }
819 1082
820 return rss; 1083 return rss;
821} 1084}
822 1085
823/** coroutine stack handling ************************************************/ 1086/** provide custom get/set/clear methods for %SIG elements ******************/
824
825static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
826static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
827static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
828 1087
829/* apparently < 5.8.8 */ 1088/* apparently < 5.8.8 */
830#ifndef MgPV_nolen_const 1089#ifndef MgPV_nolen_const
831#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1090#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
832 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1091 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
833 (const char*)(mg)->mg_ptr) 1092 (const char*)(mg)->mg_ptr)
834#endif 1093#endif
835 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
836/* 1123/*
837 * This overrides the default magic get method of %SIG elements. 1124 * This overrides the default magic get method of %SIG elements.
838 * 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
839 * 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),
840 * readback here. 1127 * we just provide our own readback here.
841 */ 1128 */
842static int 1129static int ecb_cold
843coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
844{ 1131{
845 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;
846 1135
847 if (*s == '_') 1136 SV *ssv;
848 {
849 SV **svp = 0;
850 1137
851 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
852 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
853
854 if (svp) 1138 if (!*svp)
855 { 1139 ssv = &PL_sv_undef;
856 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1140 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
857 return 0; 1141 ssv = sv_2mortal (newRV_inc (*svp));
858 } 1142 else
859 } 1143 ssv = *svp;
860 1144
861 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1145 sv_setsv (sv, ssv);
1146 return 0;
862} 1147}
863 1148
864static int 1149static int ecb_cold
865coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1150coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
866{ 1151{
867 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;
868 1155
869 if (*s == '_')
870 {
871 SV **svp = 0;
872
873 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
874 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
875
876 if (svp)
877 {
878 SV *old = *svp; 1156 SV *old = *svp;
879 *svp = 0; 1157 *svp = 0;
880 SvREFCNT_dec (old); 1158 SvREFCNT_dec (old);
881 return 0; 1159 return 0;
882 }
883 }
884
885 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
886} 1160}
887 1161
888static int 1162static int ecb_cold
889coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1163coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
890{ 1164{
891 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;
892 1168
893 if (*s == '_')
894 {
895 SV **svp = 0;
896
897 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
898 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
899
900 if (svp)
901 {
902 SV *old = *svp; 1169 SV *old = *svp;
903 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1170 *svp = SvOK (sv) ? newSVsv (sv) : 0;
904 SvREFCNT_dec (old); 1171 SvREFCNT_dec (old);
905 return 0; 1172 return 0;
906 }
907 }
908
909 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
910} 1173}
911 1174
912static void 1175static void
913prepare_nop (pTHX_ struct coro_transfer_args *ta) 1176prepare_nop (pTHX_ struct coro_transfer_args *ta)
914{ 1177{
… …
926slf_check_repeat (pTHX_ struct CoroSLF *frame) 1189slf_check_repeat (pTHX_ struct CoroSLF *frame)
927{ 1190{
928 return 1; 1191 return 1;
929} 1192}
930 1193
931static UNOP coro_setup_op; 1194/** coroutine stack handling ************************************************/
932 1195
933static 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 */
934coro_setup (pTHX_ struct coro *coro) 1199init_perl (pTHX_ struct coro *coro)
935{ 1200{
936 /* 1201 /*
937 * emulate part of the perl startup here. 1202 * emulate part of the perl startup here.
938 */ 1203 */
939 coro_init_stacks (aTHX); 1204 coro_init_stacks (aTHX);
… …
946 PL_comppad_name_fill = 0; 1211 PL_comppad_name_fill = 0;
947 PL_comppad_name_floor = 0; 1212 PL_comppad_name_floor = 0;
948 PL_curpm = 0; 1213 PL_curpm = 0;
949 PL_curpad = 0; 1214 PL_curpad = 0;
950 PL_localizing = 0; 1215 PL_localizing = 0;
951 PL_dirty = 0;
952 PL_restartop = 0; 1216 PL_restartop = 0;
953#if PERL_VERSION_ATLEAST (5,10,0) 1217#if PERL_VERSION_ATLEAST (5,10,0)
954 PL_parser = 0; 1218 PL_parser = 0;
955#endif 1219#endif
956 PL_hints = 0; 1220 PL_hints = 0;
957 1221
958 /* recreate the die/warn hooks */ 1222 /* recreate the die/warn hooks */
959 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1223 PL_diehook = SvREFCNT_inc (rv_diehook);
960 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1224 PL_warnhook = SvREFCNT_inc (rv_warnhook);
961 1225
962 GvSV (PL_defgv) = newSV (0); 1226 GvSV (PL_defgv) = newSV (0);
963 GvAV (PL_defgv) = coro->args; coro->args = 0; 1227 GvAV (PL_defgv) = coro->args; coro->args = 0;
964 GvSV (PL_errgv) = newSV (0); 1228 GvSV (PL_errgv) = newSV (0);
965 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);
966 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
967 PL_rs = newSVsv (GvSV (irsgv)); 1234 PL_rs = newSVsv (GvSV (irsgv));
968 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1235 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
969 1236
970 { 1237 {
971 dSP; 1238 dSP;
… …
975 myop.op_next = Nullop; 1242 myop.op_next = Nullop;
976 myop.op_type = OP_ENTERSUB; 1243 myop.op_type = OP_ENTERSUB;
977 myop.op_flags = OPf_WANT_VOID; 1244 myop.op_flags = OPf_WANT_VOID;
978 1245
979 PUSHMARK (SP); 1246 PUSHMARK (SP);
980 PUSHs ((SV *)coro->startcv); 1247 XPUSHs ((SV *)coro->startcv);
981 PUTBACK; 1248 PUTBACK;
982 PL_op = (OP *)&myop; 1249 PL_op = (OP *)&myop;
983 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1250 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
984 } 1251 }
985 1252
986 /* 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
987 * 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.
988 */ 1255 */
989 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 */
990 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;
991 1259
992 /* 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 */
993 coro_setup_op.op_next = PL_op; 1261 init_perl_op.op_next = PL_op;
994 coro_setup_op.op_type = OP_ENTERSUB; 1262 init_perl_op.op_type = OP_ENTERSUB;
995 coro_setup_op.op_ppaddr = pp_slf; 1263 init_perl_op.op_ppaddr = pp_slf;
996 /* 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 */
997 1265
998 PL_op = (OP *)&coro_setup_op; 1266 PL_op = (OP *)&init_perl_op;
999 1267
1000 /* copy throw, in case it was set before coro_setup */ 1268 /* copy throw, in case it was set before init_perl */
1001 CORO_THROW = coro->except; 1269 CORO_THROW = coro->except;
1002 1270
1271 SWAP_SVS_ENTER (coro);
1272
1003 if (expect_false (enable_times)) 1273 if (ecb_expect_false (enable_times))
1004 { 1274 {
1005 coro_times_update (); 1275 coro_times_update ();
1006 coro_times_sub (coro); 1276 coro_times_sub (coro);
1007 } 1277 }
1008} 1278}
… …
1027 dounwind (-1); 1297 dounwind (-1);
1028 } 1298 }
1029} 1299}
1030 1300
1031static void 1301static void
1032coro_destruct_perl (pTHX_ struct coro *coro) 1302destroy_perl (pTHX_ struct coro *coro)
1033{ 1303{
1034 SV *svf [9]; 1304 SV *svf [9];
1035 1305
1036 { 1306 {
1307 SV *old_current = SvRV (coro_current);
1037 struct coro *current = SvSTATE_current; 1308 struct coro *current = SvSTATE (old_current);
1038 1309
1039 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1310 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1040 1311
1041 save_perl (aTHX_ current); 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
1042 load_perl (aTHX_ coro); 1317 load_perl (aTHX_ coro);
1043 1318
1319 /* restore swapped sv's */
1320 SWAP_SVS_LEAVE (coro);
1321
1044 coro_unwind_stacks (aTHX); 1322 coro_unwind_stacks (aTHX);
1323
1045 coro_destruct_stacks (aTHX); 1324 coro_destruct_stacks (aTHX);
1046 1325
1047 // now save some sv's to be free'd later 1326 /* now save some sv's to be free'd later */
1048 svf [0] = GvSV (PL_defgv); 1327 svf [0] = GvSV (PL_defgv);
1049 svf [1] = (SV *)GvAV (PL_defgv); 1328 svf [1] = (SV *)GvAV (PL_defgv);
1050 svf [2] = GvSV (PL_errgv); 1329 svf [2] = GvSV (PL_errgv);
1051 svf [3] = (SV *)PL_defoutgv; 1330 svf [3] = (SV *)PL_defoutgv;
1052 svf [4] = PL_rs; 1331 svf [4] = PL_rs;
… …
1054 svf [6] = (SV *)GvHV (PL_hintgv); 1333 svf [6] = (SV *)GvHV (PL_hintgv);
1055 svf [7] = PL_diehook; 1334 svf [7] = PL_diehook;
1056 svf [8] = PL_warnhook; 1335 svf [8] = PL_warnhook;
1057 assert (9 == sizeof (svf) / sizeof (*svf)); 1336 assert (9 == sizeof (svf) / sizeof (*svf));
1058 1337
1338 SvRV_set (coro_current, old_current);
1339
1059 load_perl (aTHX_ current); 1340 load_perl (aTHX_ current);
1060 } 1341 }
1061 1342
1062 { 1343 {
1063 unsigned int i; 1344 unsigned int i;
… …
1067 1348
1068 SvREFCNT_dec (coro->saved_deffh); 1349 SvREFCNT_dec (coro->saved_deffh);
1069 SvREFCNT_dec (coro->rouse_cb); 1350 SvREFCNT_dec (coro->rouse_cb);
1070 SvREFCNT_dec (coro->invoke_cb); 1351 SvREFCNT_dec (coro->invoke_cb);
1071 SvREFCNT_dec (coro->invoke_av); 1352 SvREFCNT_dec (coro->invoke_av);
1353 SvREFCNT_dec (coro->on_enter_xs);
1354 SvREFCNT_dec (coro->on_leave_xs);
1072 } 1355 }
1073} 1356}
1074 1357
1075INLINE void 1358ecb_inline void
1076free_coro_mortal (pTHX) 1359free_coro_mortal (pTHX)
1077{ 1360{
1078 if (expect_true (coro_mortal)) 1361 if (ecb_expect_true (coro_mortal))
1079 { 1362 {
1080 SvREFCNT_dec (coro_mortal); 1363 SvREFCNT_dec ((SV *)coro_mortal);
1081 coro_mortal = 0; 1364 coro_mortal = 0;
1082 } 1365 }
1083} 1366}
1084 1367
1085static int 1368static int
… …
1117 av_push (av, SvREFCNT_inc_NN (*bot++)); 1400 av_push (av, SvREFCNT_inc_NN (*bot++));
1118 1401
1119 PL_runops = RUNOPS_DEFAULT; 1402 PL_runops = RUNOPS_DEFAULT;
1120 ENTER; 1403 ENTER;
1121 SAVETMPS; 1404 SAVETMPS;
1405 PUSHMARK (SP);
1122 EXTEND (SP, 3); 1406 EXTEND (SP, 3);
1123 PUSHMARK (SP);
1124 PUSHs (&PL_sv_no); 1407 PUSHs (&PL_sv_no);
1125 PUSHs (fullname); 1408 PUSHs (fullname);
1126 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1409 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1127 PUTBACK; 1410 PUTBACK;
1128 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);
… …
1139 1422
1140 if (PL_curcop != &PL_compiling) 1423 if (PL_curcop != &PL_compiling)
1141 { 1424 {
1142 SV **cb; 1425 SV **cb;
1143 1426
1144 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1427 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1145 { 1428 {
1146 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1429 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1147 1430
1148 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1431 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1149 { 1432 {
… …
1155 gv_efullname3 (fullname, gv, 0); 1438 gv_efullname3 (fullname, gv, 0);
1156 1439
1157 PL_runops = RUNOPS_DEFAULT; 1440 PL_runops = RUNOPS_DEFAULT;
1158 ENTER; 1441 ENTER;
1159 SAVETMPS; 1442 SAVETMPS;
1443 PUSHMARK (SP);
1160 EXTEND (SP, 3); 1444 EXTEND (SP, 3);
1161 PUSHMARK (SP);
1162 PUSHs (&PL_sv_yes); 1445 PUSHs (&PL_sv_yes);
1163 PUSHs (fullname); 1446 PUSHs (fullname);
1164 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);
1165 PUTBACK; 1448 PUTBACK;
1166 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);
1167 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);
1168 SPAGAIN; 1451 SPAGAIN;
1169 FREETMPS; 1452 FREETMPS;
… …
1179 dSP; 1462 dSP;
1180 1463
1181 PL_runops = RUNOPS_DEFAULT; 1464 PL_runops = RUNOPS_DEFAULT;
1182 ENTER; 1465 ENTER;
1183 SAVETMPS; 1466 SAVETMPS;
1184 EXTEND (SP, 3);
1185 PL_runops = RUNOPS_DEFAULT;
1186 PUSHMARK (SP); 1467 PUSHMARK (SP);
1468 EXTEND (SP, 2);
1187 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1469 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1188 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1470 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1189 PUTBACK; 1471 PUTBACK;
1190 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);
1191 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);
… …
1218 1500
1219 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 */
1220} 1502}
1221 1503
1222/* 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 */
1223static void NOINLINE 1505static void ecb_noinline
1224cctx_prepare (pTHX) 1506cctx_prepare (pTHX)
1225{ 1507{
1226 PL_top_env = &PL_start_env; 1508 PL_top_env = &PL_start_env;
1227 1509
1228 if (cctx_current->flags & CC_TRACE) 1510 if (cctx_current->flags & CC_TRACE)
… …
1239 slf_frame.prepare = slf_prepare_set_stacklevel; 1521 slf_frame.prepare = slf_prepare_set_stacklevel;
1240 slf_frame.check = slf_check_set_stacklevel; 1522 slf_frame.check = slf_check_set_stacklevel;
1241} 1523}
1242 1524
1243/* 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 */
1244INLINE void 1526ecb_inline void
1245transfer_tail (pTHX) 1527transfer_tail (pTHX)
1246{ 1528{
1247 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);
1248} 1542}
1249 1543
1250/* 1544/*
1251 * this is a _very_ stripped down perl interpreter ;) 1545 * this is a _very_ stripped down perl interpreter ;)
1252 */ 1546 */
… …
1279 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1573 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1280 * runtime errors here, as this is just a random interpreter, not a thread. 1574 * runtime errors here, as this is just a random interpreter, not a thread.
1281 */ 1575 */
1282 1576
1283 /* 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;
1583
1584 /*
1284 * 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
1285 * 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)
1286 * 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
1287 * bootstrap-time "top" top_env, as we cannot restore the "main" 1588 * doing in that case. YMMV.
1288 * coroutine as Coro has no such concept.
1289 * This actually isn't valid with the pthread backend, but OSes requiring
1290 * that backend are too broken to do it in a standards-compliant way.
1291 */ 1589 */
1292 PL_top_env = main_top_env; 1590 perlish_exit (aTHX);
1293 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1294 } 1591 }
1295} 1592}
1296 1593
1297static coro_cctx * 1594static coro_cctx *
1298cctx_new () 1595cctx_new (void)
1299{ 1596{
1300 coro_cctx *cctx; 1597 coro_cctx *cctx;
1301 1598
1302 ++cctx_count; 1599 ++cctx_count;
1303 New (0, cctx, 1, coro_cctx); 1600 New (0, cctx, 1, coro_cctx);
… …
1309 return cctx; 1606 return cctx;
1310} 1607}
1311 1608
1312/* create a new cctx only suitable as source */ 1609/* create a new cctx only suitable as source */
1313static coro_cctx * 1610static coro_cctx *
1314cctx_new_empty () 1611cctx_new_empty (void)
1315{ 1612{
1316 coro_cctx *cctx = cctx_new (); 1613 coro_cctx *cctx = cctx_new ();
1317 1614
1318 cctx->sptr = 0; 1615 cctx->stack.sptr = 0;
1319 coro_create (&cctx->cctx, 0, 0, 0, 0); 1616 coro_create (&cctx->cctx, 0, 0, 0, 0);
1320 1617
1321 return cctx; 1618 return cctx;
1322} 1619}
1323 1620
1324/* create a new cctx suitable as destination/running a perl interpreter */ 1621/* create a new cctx suitable as destination/running a perl interpreter */
1325static coro_cctx * 1622static coro_cctx *
1326cctx_new_run () 1623cctx_new_run (void)
1327{ 1624{
1328 coro_cctx *cctx = cctx_new (); 1625 coro_cctx *cctx = cctx_new ();
1329 void *stack_start;
1330 size_t stack_size;
1331 1626
1332#if HAVE_MMAP 1627 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1333 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1334 /* mmap supposedly does allocate-on-write for us */
1335 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1336
1337 if (cctx->sptr != (void *)-1)
1338 {
1339 #if CORO_STACKGUARD
1340 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1341 #endif
1342 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1343 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1344 cctx->flags |= CC_MAPPED;
1345 } 1628 {
1346 else
1347#endif
1348 {
1349 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1350 New (0, cctx->sptr, cctx_stacksize, long);
1351
1352 if (!cctx->sptr)
1353 {
1354 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1629 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1355 _exit (EXIT_FAILURE); 1630 _exit (EXIT_FAILURE);
1356 }
1357
1358 stack_start = cctx->sptr;
1359 stack_size = cctx->ssize;
1360 } 1631 }
1361 1632
1362 #if CORO_USE_VALGRIND
1363 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1364 #endif
1365
1366 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);
1367 1634
1368 return cctx; 1635 return cctx;
1369} 1636}
1370 1637
1371static void 1638static void
1372cctx_destroy (coro_cctx *cctx) 1639cctx_destroy (coro_cctx *cctx)
1373{ 1640{
1374 if (!cctx) 1641 if (!cctx)
1375 return; 1642 return;
1376 1643
1377 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1644 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1378 1645
1379 --cctx_count; 1646 --cctx_count;
1380 coro_destroy (&cctx->cctx); 1647 coro_destroy (&cctx->cctx);
1381 1648
1382 /* coro_transfer creates new, empty cctx's */ 1649 coro_stack_free (&cctx->stack);
1383 if (cctx->sptr)
1384 {
1385 #if CORO_USE_VALGRIND
1386 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1387 #endif
1388
1389#if HAVE_MMAP
1390 if (cctx->flags & CC_MAPPED)
1391 munmap (cctx->sptr, cctx->ssize);
1392 else
1393#endif
1394 Safefree (cctx->sptr);
1395 }
1396 1650
1397 Safefree (cctx); 1651 Safefree (cctx);
1398} 1652}
1399 1653
1400/* wether this cctx should be destructed */ 1654/* wether this cctx should be destructed */
1401#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))
1402 1656
1403static coro_cctx * 1657static coro_cctx *
1404cctx_get (pTHX) 1658cctx_get (pTHX)
1405{ 1659{
1406 while (expect_true (cctx_first)) 1660 while (ecb_expect_true (cctx_first))
1407 { 1661 {
1408 coro_cctx *cctx = cctx_first; 1662 coro_cctx *cctx = cctx_first;
1409 cctx_first = cctx->next; 1663 cctx_first = cctx->next;
1410 --cctx_idle; 1664 --cctx_idle;
1411 1665
1412 if (expect_true (!CCTX_EXPIRED (cctx))) 1666 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1413 return cctx; 1667 return cctx;
1414 1668
1415 cctx_destroy (cctx); 1669 cctx_destroy (cctx);
1416 } 1670 }
1417 1671
… …
1419} 1673}
1420 1674
1421static void 1675static void
1422cctx_put (coro_cctx *cctx) 1676cctx_put (coro_cctx *cctx)
1423{ 1677{
1424 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));
1425 1679
1426 /* free another cctx if overlimit */ 1680 /* free another cctx if overlimit */
1427 if (expect_false (cctx_idle >= cctx_max_idle)) 1681 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1428 { 1682 {
1429 coro_cctx *first = cctx_first; 1683 coro_cctx *first = cctx_first;
1430 cctx_first = first->next; 1684 cctx_first = first->next;
1431 --cctx_idle; 1685 --cctx_idle;
1432 1686
… …
1443static void 1697static void
1444transfer_check (pTHX_ struct coro *prev, struct coro *next) 1698transfer_check (pTHX_ struct coro *prev, struct coro *next)
1445{ 1699{
1446 /* TODO: throwing up here is considered harmful */ 1700 /* TODO: throwing up here is considered harmful */
1447 1701
1448 if (expect_true (prev != next)) 1702 if (ecb_expect_true (prev != next))
1449 { 1703 {
1450 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1704 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1451 croak ("Coro::State::transfer called with a blocked 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,");
1452 1706
1453 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1707 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1454 croak ("Coro::State::transfer called with running, destroyed or suspended 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,");
1455 1709
1456#if !PERL_VERSION_ATLEAST (5,10,0) 1710#if !PERL_VERSION_ATLEAST (5,10,0)
1457 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1711 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1458 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,");
1459#endif 1713#endif
1460 } 1714 }
1461} 1715}
1462 1716
1463/* always use the TRANSFER macro */ 1717/* always use the TRANSFER macro */
1464static void NOINLINE /* noinline so we have a fixed stackframe */ 1718static void ecb_noinline /* noinline so we have a fixed stackframe */
1465transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1719transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1466{ 1720{
1467 dSTACKLEVEL; 1721 dSTACKLEVEL;
1468 1722
1469 /* sometimes transfer is only called to set idle_sp */ 1723 /* sometimes transfer is only called to set idle_sp */
1470 if (expect_false (!prev)) 1724 if (ecb_expect_false (!prev))
1471 { 1725 {
1472 cctx_current->idle_sp = STACKLEVEL; 1726 cctx_current->idle_sp = STACKLEVEL;
1473 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 */
1474 } 1728 }
1475 else if (expect_true (prev != next)) 1729 else if (ecb_expect_true (prev != next))
1476 { 1730 {
1477 coro_cctx *cctx_prev; 1731 coro_cctx *cctx_prev;
1478 1732
1479 if (expect_false (prev->flags & CF_NEW)) 1733 if (ecb_expect_false (prev->flags & CF_NEW))
1480 { 1734 {
1481 /* create a new empty/source context */ 1735 /* create a new empty/source context */
1482 prev->flags &= ~CF_NEW; 1736 prev->flags &= ~CF_NEW;
1483 prev->flags |= CF_RUNNING; 1737 prev->flags |= CF_RUNNING;
1484 } 1738 }
… …
1487 next->flags |= CF_RUNNING; 1741 next->flags |= CF_RUNNING;
1488 1742
1489 /* first get rid of the old state */ 1743 /* first get rid of the old state */
1490 save_perl (aTHX_ prev); 1744 save_perl (aTHX_ prev);
1491 1745
1492 if (expect_false (next->flags & CF_NEW)) 1746 if (ecb_expect_false (next->flags & CF_NEW))
1493 { 1747 {
1494 /* need to start coroutine */ 1748 /* need to start coroutine */
1495 next->flags &= ~CF_NEW; 1749 next->flags &= ~CF_NEW;
1496 /* setup coroutine call */ 1750 /* setup coroutine call */
1497 coro_setup (aTHX_ next); 1751 init_perl (aTHX_ next);
1498 } 1752 }
1499 else 1753 else
1500 load_perl (aTHX_ next); 1754 load_perl (aTHX_ next);
1501 1755
1502 /* possibly untie and reuse the cctx */ 1756 /* possibly untie and reuse the cctx */
1503 if (expect_true ( 1757 if (ecb_expect_true (
1504 cctx_current->idle_sp == STACKLEVEL 1758 cctx_current->idle_sp == STACKLEVEL
1505 && !(cctx_current->flags & CC_TRACE) 1759 && !(cctx_current->flags & CC_TRACE)
1506 && !force_cctx 1760 && !force_cctx
1507 )) 1761 ))
1508 { 1762 {
1509 /* 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 */
1510 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));
1511 1765
1512 /* 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. */
1513 /* 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 */
1514 if (expect_false (CCTX_EXPIRED (cctx_current))) 1768 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1515 if (expect_true (!next->cctx)) 1769 if (ecb_expect_true (!next->cctx))
1516 next->cctx = cctx_get (aTHX); 1770 next->cctx = cctx_get (aTHX);
1517 1771
1518 cctx_put (cctx_current); 1772 cctx_put (cctx_current);
1519 } 1773 }
1520 else 1774 else
1521 prev->cctx = cctx_current; 1775 prev->cctx = cctx_current;
1522 1776
1523 ++next->usecount; 1777 ++next->usecount;
1524 1778
1525 cctx_prev = cctx_current; 1779 cctx_prev = cctx_current;
1526 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1780 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1527 1781
1528 next->cctx = 0; 1782 next->cctx = 0;
1529 1783
1530 if (expect_false (cctx_prev != cctx_current)) 1784 if (ecb_expect_false (cctx_prev != cctx_current))
1531 { 1785 {
1532 cctx_prev->top_env = PL_top_env; 1786 cctx_prev->top_env = PL_top_env;
1533 PL_top_env = cctx_current->top_env; 1787 PL_top_env = cctx_current->top_env;
1534 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1788 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1535 } 1789 }
… …
1541#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))
1542#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1796#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1543 1797
1544/** high level stuff ********************************************************/ 1798/** high level stuff ********************************************************/
1545 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 */
1546static int 1802static void
1803coro_call_on_destroy (pTHX_ struct coro *coro);
1804
1805static void
1547coro_state_destroy (pTHX_ struct coro *coro) 1806coro_state_destroy (pTHX_ struct coro *coro)
1548{ 1807{
1549 if (coro->flags & CF_DESTROYED) 1808 if (coro->flags & CF_ZOMBIE)
1550 return 0; 1809 return;
1551 1810
1552 if (coro->on_destroy && !PL_dirty)
1553 coro->on_destroy (aTHX_ coro); 1811 slf_destroy (aTHX_ coro);
1554 1812
1555 coro->flags |= CF_DESTROYED; 1813 coro->flags |= CF_ZOMBIE;
1556 1814
1557 if (coro->flags & CF_READY) 1815 if (coro->flags & CF_READY)
1558 { 1816 {
1559 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1817 /* reduce nready, as destroying a ready coro effectively unreadies it */
1560 /* alternative: look through all ready queues and remove the coro */ 1818 /* alternative: look through all ready queues and remove the coro */
1561 --coro_nready; 1819 --coro_nready;
1562 } 1820 }
1563 else 1821 else
1564 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;
1565 1827
1566 if (coro->mainstack 1828 if (coro->mainstack
1567 && coro->mainstack != main_mainstack 1829 && coro->mainstack != main_mainstack
1568 && coro->slot 1830 && coro->slot
1569 && !PL_dirty) 1831 && !PL_dirty)
1570 coro_destruct_perl (aTHX_ coro); 1832 destroy_perl (aTHX_ coro);
1571 1833
1572 cctx_destroy (coro->cctx); 1834 cctx_destroy (coro->cctx);
1573 SvREFCNT_dec (coro->startcv); 1835 SvREFCNT_dec (coro->startcv);
1574 SvREFCNT_dec (coro->args); 1836 SvREFCNT_dec (coro->args);
1837 SvREFCNT_dec (coro->swap_sv);
1575 SvREFCNT_dec (CORO_THROW); 1838 SvREFCNT_dec (CORO_THROW);
1576 1839
1577 if (coro->next) coro->next->prev = coro->prev; 1840 coro_call_on_destroy (aTHX_ coro);
1578 if (coro->prev) coro->prev->next = coro->next;
1579 if (coro == coro_first) coro_first = coro->next;
1580 1841
1581 return 1; 1842 /* more destruction mayhem in coro_state_free */
1582} 1843}
1583 1844
1584static int 1845static int
1585coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1846coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1586{ 1847{
1587 struct coro *coro = (struct coro *)mg->mg_ptr; 1848 struct coro *coro = (struct coro *)mg->mg_ptr;
1849
1850 coro_state_destroy (aTHX_ coro);
1588 mg->mg_ptr = 0; 1851 mg->mg_ptr = 0;
1589 1852
1590 coro->hv = 0; 1853 SvREFCNT_dec (coro->on_destroy);
1854 SvREFCNT_dec (coro->status);
1591 1855
1592 if (--coro->refcnt < 0)
1593 {
1594 coro_state_destroy (aTHX_ coro);
1595 Safefree (coro); 1856 Safefree (coro);
1596 }
1597 1857
1598 return 0; 1858 return 0;
1599} 1859}
1600 1860
1601static int 1861static int ecb_cold
1602coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1862coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1603{ 1863{
1604 struct coro *coro = (struct coro *)mg->mg_ptr; 1864 /* called when perl clones the current process the slow way (windows process emulation) */
1605 1865 /* we simply nuke the pointers in the copy, causing perl to croak */
1606 ++coro->refcnt; 1866 mg->mg_ptr = 0;
1867 mg->mg_virtual = 0;
1607 1868
1608 return 0; 1869 return 0;
1609} 1870}
1610 1871
1611static MGVTBL coro_state_vtbl = { 1872static MGVTBL coro_state_vtbl = {
… …
1636 TRANSFER (ta, 1); 1897 TRANSFER (ta, 1);
1637} 1898}
1638 1899
1639/** Coro ********************************************************************/ 1900/** Coro ********************************************************************/
1640 1901
1641INLINE void 1902ecb_inline void
1642coro_enq (pTHX_ struct coro *coro) 1903coro_enq (pTHX_ struct coro *coro)
1643{ 1904{
1644 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1905 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1645 1906
1646 SvREFCNT_inc_NN (coro->hv); 1907 SvREFCNT_inc_NN (coro->hv);
… …
1648 coro->next_ready = 0; 1909 coro->next_ready = 0;
1649 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1910 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1650 ready [1] = coro; 1911 ready [1] = coro;
1651} 1912}
1652 1913
1653INLINE struct coro * 1914ecb_inline struct coro *
1654coro_deq (pTHX) 1915coro_deq (pTHX)
1655{ 1916{
1656 int prio; 1917 int prio;
1657 1918
1658 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1919 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1711{ 1972{
1712 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1973 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1713} 1974}
1714 1975
1715/* expects to own a reference to next->hv */ 1976/* expects to own a reference to next->hv */
1716INLINE void 1977ecb_inline void
1717prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1978prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1718{ 1979{
1719 SV *prev_sv = SvRV (coro_current); 1980 SV *prev_sv = SvRV (coro_current);
1720 1981
1721 ta->prev = SvSTATE_hv (prev_sv); 1982 ta->prev = SvSTATE_hv (prev_sv);
… …
1734{ 1995{
1735 for (;;) 1996 for (;;)
1736 { 1997 {
1737 struct coro *next = coro_deq (aTHX); 1998 struct coro *next = coro_deq (aTHX);
1738 1999
1739 if (expect_true (next)) 2000 if (ecb_expect_true (next))
1740 { 2001 {
1741 /* cannot transfer to destroyed coros, skip and look for next */ 2002 /* cannot transfer to destroyed coros, skip and look for next */
1742 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 2003 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1743 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 2004 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1744 else 2005 else
1745 { 2006 {
1746 next->flags &= ~CF_READY; 2007 next->flags &= ~CF_READY;
1747 --coro_nready; 2008 --coro_nready;
… …
1754 { 2015 {
1755 /* nothing to schedule: call the idle handler */ 2016 /* nothing to schedule: call the idle handler */
1756 if (SvROK (sv_idle) 2017 if (SvROK (sv_idle)
1757 && SvOBJECT (SvRV (sv_idle))) 2018 && SvOBJECT (SvRV (sv_idle)))
1758 { 2019 {
2020 if (SvRV (sv_idle) == SvRV (coro_current))
2021 {
2022 require_pv ("Carp");
2023
2024 {
2025 dSP;
2026
2027 ENTER;
2028 SAVETMPS;
2029
2030 PUSHMARK (SP);
2031 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2032 PUTBACK;
2033 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2034
2035 FREETMPS;
2036 LEAVE;
2037 }
2038 }
2039
1759 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2040 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1760 api_ready (aTHX_ SvRV (sv_idle)); 2041 api_ready (aTHX_ SvRV (sv_idle));
1761 --coro_nready; 2042 --coro_nready;
1762 } 2043 }
1763 else 2044 else
1764 { 2045 {
2046 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1765 dSP; 2047 dSP;
1766 2048
1767 ENTER; 2049 ENTER;
1768 SAVETMPS; 2050 SAVETMPS;
1769 2051
… …
1776 } 2058 }
1777 } 2059 }
1778 } 2060 }
1779} 2061}
1780 2062
1781INLINE void 2063ecb_inline void
1782prepare_cede (pTHX_ struct coro_transfer_args *ta) 2064prepare_cede (pTHX_ struct coro_transfer_args *ta)
1783{ 2065{
1784 api_ready (aTHX_ coro_current); 2066 api_ready (aTHX_ coro_current);
1785 prepare_schedule (aTHX_ ta); 2067 prepare_schedule (aTHX_ ta);
1786} 2068}
1787 2069
1788INLINE void 2070ecb_inline void
1789prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2071prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1790{ 2072{
1791 SV *prev = SvRV (coro_current); 2073 SV *prev = SvRV (coro_current);
1792 2074
1793 if (coro_nready) 2075 if (coro_nready)
… …
1823{ 2105{
1824 struct coro_transfer_args ta; 2106 struct coro_transfer_args ta;
1825 2107
1826 prepare_cede (aTHX_ &ta); 2108 prepare_cede (aTHX_ &ta);
1827 2109
1828 if (expect_true (ta.prev != ta.next)) 2110 if (ecb_expect_true (ta.prev != ta.next))
1829 { 2111 {
1830 TRANSFER (ta, 1); 2112 TRANSFER (ta, 1);
1831 return 1; 2113 return 1;
1832 } 2114 }
1833 else 2115 else
… …
1876 coro->slot->runops = RUNOPS_DEFAULT; 2158 coro->slot->runops = RUNOPS_DEFAULT;
1877 } 2159 }
1878} 2160}
1879 2161
1880static void 2162static void
2163coro_push_av (pTHX_ AV *av, I32 gimme_v)
2164{
2165 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2166 {
2167 dSP;
2168
2169 if (gimme_v == G_SCALAR)
2170 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2171 else
2172 {
2173 int i;
2174 EXTEND (SP, AvFILLp (av) + 1);
2175
2176 for (i = 0; i <= AvFILLp (av); ++i)
2177 PUSHs (AvARRAY (av)[i]);
2178 }
2179
2180 PUTBACK;
2181 }
2182}
2183
2184static void
2185coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2186{
2187 if (!coro->on_destroy)
2188 coro->on_destroy = newAV ();
2189
2190 av_push (coro->on_destroy, cb);
2191}
2192
2193static void
2194slf_destroy_join (pTHX_ struct CoroSLF *frame)
2195{
2196 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2197}
2198
2199static int
2200slf_check_join (pTHX_ struct CoroSLF *frame)
2201{
2202 struct coro *coro = (struct coro *)frame->data;
2203
2204 if (!coro->status)
2205 return 1;
2206
2207 frame->destroy = 0;
2208
2209 coro_push_av (aTHX_ coro->status, GIMME_V);
2210
2211 SvREFCNT_dec ((SV *)coro->hv);
2212
2213 return 0;
2214}
2215
2216static void
2217slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2218{
2219 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2220
2221 if (items > 1)
2222 croak ("join called with too many arguments");
2223
2224 if (coro->status)
2225 frame->prepare = prepare_nop;
2226 else
2227 {
2228 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2229 frame->prepare = prepare_schedule;
2230 }
2231
2232 frame->check = slf_check_join;
2233 frame->destroy = slf_destroy_join;
2234 frame->data = (void *)coro;
2235 SvREFCNT_inc (coro->hv);
2236}
2237
2238static void
1881coro_call_on_destroy (pTHX_ struct coro *coro) 2239coro_call_on_destroy (pTHX_ struct coro *coro)
1882{ 2240{
1883 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2241 AV *od = coro->on_destroy;
1884 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1885 2242
1886 if (on_destroyp) 2243 if (!od)
1887 { 2244 return;
1888 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1889 2245
2246 coro->on_destroy = 0;
2247 sv_2mortal ((SV *)od);
2248
1890 while (AvFILLp (on_destroy) >= 0) 2249 while (AvFILLp (od) >= 0)
2250 {
2251 SV *cb = sv_2mortal (av_pop (od));
2252
2253 /* coro hv's (and only hv's at the moment) are supported as well */
2254 if (SvSTATEhv_p (aTHX_ cb))
2255 api_ready (aTHX_ cb);
2256 else
1891 { 2257 {
1892 dSP; /* don't disturb outer sp */ 2258 dSP; /* don't disturb outer sp */
1893 SV *cb = av_pop (on_destroy);
1894
1895 PUSHMARK (SP); 2259 PUSHMARK (SP);
1896 2260
1897 if (statusp) 2261 if (coro->status)
1898 { 2262 {
1899 int i; 2263 PUTBACK;
1900 AV *status = (AV *)SvRV (*statusp); 2264 coro_push_av (aTHX_ coro->status, G_ARRAY);
1901 EXTEND (SP, AvFILLp (status) + 1); 2265 SPAGAIN;
1902
1903 for (i = 0; i <= AvFILLp (status); ++i)
1904 PUSHs (AvARRAY (status)[i]);
1905 } 2266 }
1906 2267
1907 PUTBACK; 2268 PUTBACK;
1908 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2269 call_sv (cb, G_VOID | G_DISCARD);
1909 } 2270 }
1910 } 2271 }
1911} 2272}
1912 2273
1913static void 2274static void
1914slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2275coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1915{ 2276{
1916 int i; 2277 AV *av;
1917 HV *hv = (HV *)SvRV (coro_current); 2278
1918 AV *av = newAV (); 2279 if (coro->status)
2280 {
2281 av = coro->status;
2282 av_clear (av);
2283 }
2284 else
2285 av = coro->status = newAV ();
1919 2286
1920 /* items are actually not so common, so optimise for this case */ 2287 /* items are actually not so common, so optimise for this case */
1921 if (items) 2288 if (items)
1922 { 2289 {
2290 int i;
2291
1923 av_extend (av, items - 1); 2292 av_extend (av, items - 1);
1924 2293
1925 for (i = 0; i < items; ++i) 2294 for (i = 0; i < items; ++i)
1926 av_push (av, SvREFCNT_inc_NN (arg [i])); 2295 av_push (av, SvREFCNT_inc_NN (arg [i]));
1927 } 2296 }
2297}
1928 2298
1929 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2299static void
1930 2300slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2301{
1931 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2302 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1932 api_ready (aTHX_ sv_manager); 2303 api_ready (aTHX_ sv_manager);
1933 2304
1934 frame->prepare = prepare_schedule; 2305 frame->prepare = prepare_schedule;
1935 frame->check = slf_check_repeat; 2306 frame->check = slf_check_repeat;
1936 2307
1937 /* as a minor optimisation, we could unwind all stacks here */ 2308 /* as a minor optimisation, we could unwind all stacks here */
1938 /* but that puts extra pressure on pp_slf, and is not worth much */ 2309 /* but that puts extra pressure on pp_slf, and is not worth much */
1939 /*coro_unwind_stacks (aTHX);*/ 2310 /*coro_unwind_stacks (aTHX);*/
2311}
2312
2313static void
2314slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2315{
2316 HV *coro_hv = (HV *)SvRV (coro_current);
2317
2318 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2319 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2320}
2321
2322static void
2323slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2324{
2325 HV *coro_hv;
2326 struct coro *coro;
2327
2328 if (items <= 0)
2329 croak ("Coro::cancel called without coro object,");
2330
2331 coro = SvSTATE (arg [0]);
2332 coro_hv = coro->hv;
2333
2334 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2335
2336 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2337 {
2338 /* coro currently busy cancelling something, so just notify it */
2339 coro->slf_frame.data = (void *)coro;
2340
2341 frame->prepare = prepare_nop;
2342 frame->check = slf_check_nop;
2343 }
2344 else if (coro_hv == (HV *)SvRV (coro_current))
2345 {
2346 /* cancelling the current coro is allowed, and equals terminate */
2347 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2348 }
2349 else
2350 {
2351 struct coro *self = SvSTATE_current;
2352
2353 if (!self)
2354 croak ("Coro::cancel called outside of thread content,");
2355
2356 /* otherwise we cancel directly, purely for speed reasons
2357 * unfortunately, this requires some magic trickery, as
2358 * somebody else could cancel us, so we have to fight the cancellation.
2359 * this is ugly, and hopefully fully worth the extra speed.
2360 * besides, I can't get the slow-but-safe version working...
2361 */
2362 slf_frame.data = 0;
2363 self->flags |= CF_NOCANCEL;
2364 coro_state_destroy (aTHX_ coro);
2365 self->flags &= ~CF_NOCANCEL;
2366
2367 if (slf_frame.data)
2368 {
2369 /* while we were busy we have been cancelled, so terminate */
2370 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2371 }
2372 else
2373 {
2374 frame->prepare = prepare_nop;
2375 frame->check = slf_check_nop;
2376 }
2377 }
2378}
2379
2380static int
2381slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2382{
2383 frame->prepare = 0;
2384 coro_unwind_stacks (aTHX);
2385
2386 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2387
2388 return 1;
2389}
2390
2391static int
2392safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2393{
2394 if (coro->cctx)
2395 croak ("coro inside C callback, unable to cancel at this time, caught");
2396
2397 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2398 {
2399 coro_set_status (aTHX_ coro, arg, items);
2400 coro_state_destroy (aTHX_ coro);
2401 }
2402 else
2403 {
2404 if (!coro->slf_frame.prepare)
2405 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2406
2407 slf_destroy (aTHX_ coro);
2408
2409 coro_set_status (aTHX_ coro, arg, items);
2410 coro->slf_frame.prepare = prepare_nop;
2411 coro->slf_frame.check = slf_check_safe_cancel;
2412
2413 api_ready (aTHX_ (SV *)coro->hv);
2414 }
2415
2416 return 1;
1940} 2417}
1941 2418
1942/*****************************************************************************/ 2419/*****************************************************************************/
1943/* async pool handler */ 2420/* async pool handler */
1944 2421
… …
1975slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2452slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1976{ 2453{
1977 HV *hv = (HV *)SvRV (coro_current); 2454 HV *hv = (HV *)SvRV (coro_current);
1978 struct coro *coro = SvSTATE_hv ((SV *)hv); 2455 struct coro *coro = SvSTATE_hv ((SV *)hv);
1979 2456
1980 if (expect_true (coro->saved_deffh)) 2457 if (ecb_expect_true (coro->saved_deffh))
1981 { 2458 {
1982 /* subsequent iteration */ 2459 /* subsequent iteration */
1983 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2460 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1984 coro->saved_deffh = 0; 2461 coro->saved_deffh = 0;
1985 2462
1986 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2463 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1987 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2464 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1988 { 2465 {
1989 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2466 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1990 coro->invoke_av = newAV (); 2467 return;
1991
1992 frame->prepare = prepare_nop;
1993 } 2468 }
1994 else 2469 else
1995 { 2470 {
1996 av_clear (GvAV (PL_defgv)); 2471 av_clear (GvAV (PL_defgv));
1997 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2472 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1998 2473
2474 if (ecb_expect_false (coro->swap_sv))
2475 {
2476 SWAP_SVS_LEAVE (coro);
2477 SvREFCNT_dec_NN (coro->swap_sv);
2478 coro->swap_sv = 0;
2479 }
2480
1999 coro->prio = 0; 2481 coro->prio = 0;
2000 2482
2001 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2483 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2002 api_trace (aTHX_ coro_current, 0); 2484 api_trace (aTHX_ coro_current, 0);
2003 2485
2004 frame->prepare = prepare_schedule; 2486 frame->prepare = prepare_schedule;
2005 av_push (av_async_pool, SvREFCNT_inc (hv)); 2487 av_push (av_async_pool, SvREFCNT_inc_NN (hv));
2006 } 2488 }
2007 } 2489 }
2008 else 2490 else
2009 { 2491 {
2010 /* first iteration, simply fall through */ 2492 /* first iteration, simply fall through */
… …
2023static void 2505static void
2024coro_rouse_callback (pTHX_ CV *cv) 2506coro_rouse_callback (pTHX_ CV *cv)
2025{ 2507{
2026 dXSARGS; 2508 dXSARGS;
2027 SV *data = (SV *)S_GENSUB_ARG; 2509 SV *data = (SV *)S_GENSUB_ARG;
2510 SV *coro = SvRV (data);
2028 2511
2512 /* data starts being either undef or a coro, and is replaced by the results when done */
2029 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2513 if (SvTYPE (coro) != SVt_PVAV)
2030 { 2514 {
2031 /* first call, set args */ 2515 /* first call, set args */
2032 SV *coro = SvRV (data);
2033 AV *av = newAV ();
2034 2516
2035 SvRV_set (data, (SV *)av); 2517 assert (&ST (0) < &ST (1)); /* ensure the stack is in the order we expect it to be */
2518 SvRV_set (data, (SV *)av_make (items, &ST (0))); /* av_make copies the SVs */
2036 2519
2037 /* better take a full copy of the arguments */ 2520 if (coro != &PL_sv_undef)
2038 while (items--) 2521 {
2039 av_store (av, items, newSVsv (ST (items)));
2040
2041 api_ready (aTHX_ coro); 2522 api_ready (aTHX_ coro);
2042 SvREFCNT_dec (coro); 2523 SvREFCNT_dec_NN (coro);
2524 }
2043 } 2525 }
2044 2526
2045 XSRETURN_EMPTY; 2527 XSRETURN_EMPTY;
2046} 2528}
2047 2529
2048static int 2530static int
2049slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2531slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2050{ 2532{
2051 SV *data = (SV *)frame->data; 2533 SV *data = (SV *)frame->data;
2052 2534
2053 if (CORO_THROW) 2535 if (CORO_THROW)
2054 return 0; 2536 return 0;
2055 2537
2056 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2538 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2057 return 1; 2539 return 1;
… …
2064 2546
2065 EXTEND (SP, AvFILLp (av) + 1); 2547 EXTEND (SP, AvFILLp (av) + 1);
2066 for (i = 0; i <= AvFILLp (av); ++i) 2548 for (i = 0; i <= AvFILLp (av); ++i)
2067 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2549 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2068 2550
2069 /* we have stolen the elements, so set length to zero and free */ 2551 /* we have stolen the elements, make it unreal and free */
2070 AvFILLp (av) = -1; 2552 AvREAL_off (av);
2071 av_undef (av); 2553 av_undef (av);
2072 2554
2073 PUTBACK; 2555 PUTBACK;
2074 } 2556 }
2075 2557
… …
2093 cb = sv_2mortal (coro->rouse_cb); 2575 cb = sv_2mortal (coro->rouse_cb);
2094 coro->rouse_cb = 0; 2576 coro->rouse_cb = 0;
2095 } 2577 }
2096 2578
2097 if (!SvROK (cb) 2579 if (!SvROK (cb)
2098 || SvTYPE (SvRV (cb)) != SVt_PVCV 2580 || SvTYPE (SvRV (cb)) != SVt_PVCV
2099 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2581 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2100 croak ("Coro::rouse_wait called with illegal callback argument,"); 2582 croak ("Coro::rouse_wait called with illegal callback argument,");
2101 2583
2102 { 2584 {
2103 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2585 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2104 SV *data = (SV *)S_GENSUB_ARG; 2586 SV *data = (SV *)S_GENSUB_ARG;
2587 int data_ready = SvTYPE (SvRV (data)) == SVt_PVAV;
2588
2589 /* if there is no data, we need to store the current coro in the reference so we can be woken up */
2590 if (!data_ready)
2591 if (SvRV (data) != &PL_sv_undef)
2592 croak ("Coro::rouse_wait was called on a calback that is already being waited for - only one thread can wait for a rouse callback, caught");
2593 else
2594 SvRV_set (data, SvREFCNT_inc_NN (SvRV (coro_current)));
2105 2595
2106 frame->data = (void *)data; 2596 frame->data = (void *)data;
2107 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2597 frame->prepare = data_ready ? prepare_nop : prepare_schedule;
2108 frame->check = slf_check_rouse_wait; 2598 frame->check = slf_check_rouse_wait;
2109 } 2599 }
2110} 2600}
2111 2601
2112static SV * 2602static SV *
2113coro_new_rouse_cb (pTHX) 2603coro_new_rouse_cb (pTHX)
2114{ 2604{
2115 HV *hv = (HV *)SvRV (coro_current); 2605 HV *hv = (HV *)SvRV (coro_current);
2116 struct coro *coro = SvSTATE_hv (hv); 2606 struct coro *coro = SvSTATE_hv (hv);
2117 SV *data = newRV_inc ((SV *)hv); 2607 SV *data = newRV_noinc (&PL_sv_undef);
2118 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data); 2608 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2119 2609
2120 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2610 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2121 SvREFCNT_dec (data); /* magicext increases the refcount */ 2611 SvREFCNT_dec_NN (data); /* magicext increases the refcount */
2122 2612
2123 SvREFCNT_dec (coro->rouse_cb); 2613 SvREFCNT_dec (coro->rouse_cb);
2124 coro->rouse_cb = SvREFCNT_inc_NN (cb); 2614 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2125 2615
2126 return cb; 2616 return cb;
… …
2220static void 2710static void
2221slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2711slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2222{ 2712{
2223 frame->prepare = prepare_cede_notself; 2713 frame->prepare = prepare_cede_notself;
2224 frame->check = slf_check_nop; 2714 frame->check = slf_check_nop;
2715}
2716
2717/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2718static void
2719slf_destroy (pTHX_ struct coro *coro)
2720{
2721 struct CoroSLF frame = coro->slf_frame;
2722
2723 /*
2724 * The on_destroy below most likely is from an SLF call.
2725 * Since by definition the SLF call will not finish when we destroy
2726 * the coro, we will have to force-finish it here, otherwise
2727 * cleanup functions cannot call SLF functions.
2728 */
2729 coro->slf_frame.prepare = 0;
2730
2731 /* this callback is reserved for slf functions needing to do cleanup */
2732 if (frame.destroy && frame.prepare && !PL_dirty)
2733 frame.destroy (aTHX_ &frame);
2225} 2734}
2226 2735
2227/* 2736/*
2228 * these not obviously related functions are all rolled into one 2737 * these not obviously related functions are all rolled into one
2229 * function to increase chances that they all will call transfer with the same 2738 * function to increase chances that they all will call transfer with the same
… …
2236 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2745 I32 checkmark; /* mark SP to see how many elements check has pushed */
2237 2746
2238 /* set up the slf frame, unless it has already been set-up */ 2747 /* set up the slf frame, unless it has already been set-up */
2239 /* the latter happens when a new coro has been started */ 2748 /* the latter happens when a new coro has been started */
2240 /* or when a new cctx was attached to an existing coroutine */ 2749 /* or when a new cctx was attached to an existing coroutine */
2241 if (expect_true (!slf_frame.prepare)) 2750 if (ecb_expect_true (!slf_frame.prepare))
2242 { 2751 {
2243 /* first iteration */ 2752 /* first iteration */
2244 dSP; 2753 dSP;
2245 SV **arg = PL_stack_base + TOPMARK + 1; 2754 SV **arg = PL_stack_base + TOPMARK + 1;
2246 int items = SP - arg; /* args without function object */ 2755 int items = SP - arg; /* args without function object */
… …
2287 while (slf_frame.check (aTHX_ &slf_frame)); 2796 while (slf_frame.check (aTHX_ &slf_frame));
2288 2797
2289 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2798 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2290 2799
2291 /* exception handling */ 2800 /* exception handling */
2292 if (expect_false (CORO_THROW)) 2801 if (ecb_expect_false (CORO_THROW))
2293 { 2802 {
2294 SV *exception = sv_2mortal (CORO_THROW); 2803 SV *exception = sv_2mortal (CORO_THROW);
2295 2804
2296 CORO_THROW = 0; 2805 CORO_THROW = 0;
2297 sv_setsv (ERRSV, exception); 2806 sv_setsv (ERRSV, exception);
2298 croak (0); 2807 croak (0);
2299 } 2808 }
2300 2809
2301 /* return value handling - mostly like entersub */ 2810 /* return value handling - mostly like entersub */
2302 /* make sure we put something on the stack in scalar context */ 2811 /* make sure we put something on the stack in scalar context */
2303 if (GIMME_V == G_SCALAR) 2812 if (GIMME_V == G_SCALAR
2813 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2304 { 2814 {
2305 dSP; 2815 dSP;
2306 SV **bot = PL_stack_base + checkmark; 2816 SV **bot = PL_stack_base + checkmark;
2307 2817
2308 if (sp == bot) /* too few, push undef */ 2818 if (sp == bot) /* too few, push undef */
2309 bot [1] = &PL_sv_undef; 2819 bot [1] = &PL_sv_undef;
2310 else if (sp != bot + 1) /* too many, take last one */ 2820 else /* too many, take last one */
2311 bot [1] = *sp; 2821 bot [1] = *sp;
2312 2822
2313 SP = bot + 1; 2823 SP = bot + 1;
2314 2824
2315 PUTBACK; 2825 PUTBACK;
… …
2348 if (PL_op->op_flags & OPf_STACKED) 2858 if (PL_op->op_flags & OPf_STACKED)
2349 { 2859 {
2350 if (items > slf_arga) 2860 if (items > slf_arga)
2351 { 2861 {
2352 slf_arga = items; 2862 slf_arga = items;
2353 free (slf_argv); 2863 Safefree (slf_argv);
2354 slf_argv = malloc (slf_arga * sizeof (SV *)); 2864 New (0, slf_argv, slf_arga, SV *);
2355 } 2865 }
2356 2866
2357 slf_argc = items; 2867 slf_argc = items;
2358 2868
2359 for (i = 0; i < items; ++i) 2869 for (i = 0; i < items; ++i)
… …
2413{ 2923{
2414 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2924 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2415 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2925 on_enterleave_call (aTHX_ sv_2mortal (cb));
2416} 2926}
2417 2927
2928static void
2929enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2930{
2931 if (!hook)
2932 return;
2933
2934 if (!*avp)
2935 {
2936 *avp = newAV ();
2937 AvREAL_off (*avp);
2938 }
2939
2940 av_push (*avp, (SV *)hook);
2941 av_push (*avp, (SV *)arg);
2942}
2943
2944static void
2945enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2946{
2947 AV *av = *avp;
2948 int i;
2949
2950 if (!av)
2951 return;
2952
2953 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2954 if (AvARRAY (av)[i] == (SV *)hook)
2955 {
2956 if (execute)
2957 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2958
2959 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2960 av_pop (av);
2961 av_pop (av);
2962 break;
2963 }
2964
2965 if (AvFILLp (av) >= 0)
2966 {
2967 *avp = 0;
2968 SvREFCNT_dec_NN (av);
2969 }
2970}
2971
2972static void
2973api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2974{
2975 struct coro *coro = SvSTATE (coro_sv);
2976
2977 if (SvSTATE_current == coro)
2978 if (enter)
2979 enter (aTHX_ enter_arg);
2980
2981 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2982 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2983}
2984
2985static void
2986api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2987{
2988 struct coro *coro = SvSTATE (coro_sv);
2989
2990 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2991 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2992}
2993
2994static void
2995savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2996{
2997 struct coro *coro = SvSTATE_current;
2998
2999 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
3000}
3001
3002static void
3003savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
3004{
3005 struct coro *coro = SvSTATE_current;
3006
3007 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
3008}
3009
3010static void
3011api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
3012{
3013 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
3014
3015 /* this ought to be much cheaper than malloc + a single destructor call */
3016 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
3017 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
3018}
3019
2418/*****************************************************************************/ 3020/*****************************************************************************/
2419/* PerlIO::cede */ 3021/* PerlIO::cede */
2420 3022
2421typedef struct 3023typedef struct
2422{ 3024{
2423 PerlIOBuf base; 3025 PerlIOBuf base;
2424 NV next, every; 3026 NV next, every;
2425} PerlIOCede; 3027} PerlIOCede;
2426 3028
2427static IV 3029static IV ecb_cold
2428PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 3030PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2429{ 3031{
2430 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3032 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2431 3033
2432 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 3034 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2433 self->next = nvtime () + self->every; 3035 self->next = nvtime () + self->every;
2434 3036
2435 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 3037 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2436} 3038}
2437 3039
2438static SV * 3040static SV * ecb_cold
2439PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3041PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2440{ 3042{
2441 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3043 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2442 3044
2443 return newSVnv (self->every); 3045 return newSVnv (self->every);
… …
2550 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3152 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2551 PUTBACK; 3153 PUTBACK;
2552 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3154 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2553 } 3155 }
2554 3156
2555 SvREFCNT_dec (cb); 3157 SvREFCNT_dec_NN (cb);
2556 } 3158 }
2557} 3159}
2558 3160
2559static void 3161static void
2560coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3162coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2561{ 3163{
2562 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3164 /* call $sem->adjust (0) to possibly wake up some other waiters */
2563 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3165 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2564} 3166}
2565 3167
2566static int 3168static int
2567slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3169slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2568{ 3170{
2569 AV *av = (AV *)frame->data; 3171 AV *av = (AV *)frame->data;
2570 SV *count_sv = AvARRAY (av)[0]; 3172 SV *count_sv = AvARRAY (av)[0];
3173 SV *coro_hv = SvRV (coro_current);
3174
3175 frame->destroy = 0;
2571 3176
2572 /* if we are about to throw, don't actually acquire the lock, just throw */ 3177 /* if we are about to throw, don't actually acquire the lock, just throw */
2573 if (CORO_THROW) 3178 if (ecb_expect_false (CORO_THROW))
3179 {
3180 /* we still might be responsible for the semaphore, so wake up others */
3181 coro_semaphore_adjust (aTHX_ av, 0);
3182
2574 return 0; 3183 return 0;
3184 }
2575 else if (SvIVX (count_sv) > 0) 3185 else if (SvIVX (count_sv) > 0)
2576 { 3186 {
2577 SvSTATE_current->on_destroy = 0;
2578
2579 if (acquire) 3187 if (acquire)
2580 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3188 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2581 else 3189 else
2582 coro_semaphore_adjust (aTHX_ av, 0); 3190 coro_semaphore_adjust (aTHX_ av, 0);
2583 3191
… …
2587 { 3195 {
2588 int i; 3196 int i;
2589 /* if we were woken up but can't down, we look through the whole */ 3197 /* if we were woken up but can't down, we look through the whole */
2590 /* waiters list and only add us if we aren't in there already */ 3198 /* waiters list and only add us if we aren't in there already */
2591 /* this avoids some degenerate memory usage cases */ 3199 /* this avoids some degenerate memory usage cases */
2592 3200 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2593 for (i = 1; i <= AvFILLp (av); ++i)
2594 if (AvARRAY (av)[i] == SvRV (coro_current)) 3201 if (AvARRAY (av)[i] == coro_hv)
2595 return 1; 3202 return 1;
2596 3203
2597 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3204 av_push (av, SvREFCNT_inc (coro_hv));
2598 return 1; 3205 return 1;
2599 } 3206 }
2600} 3207}
2601 3208
2602static int 3209static int
… …
2625 { 3232 {
2626 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3233 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2627 3234
2628 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3235 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2629 frame->prepare = prepare_schedule; 3236 frame->prepare = prepare_schedule;
2630
2631 /* to avoid race conditions when a woken-up coro gets terminated */ 3237 /* to avoid race conditions when a woken-up coro gets terminated */
2632 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3238 /* we arrange for a temporary on_destroy that calls adjust (0) */
2633 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3239 frame->destroy = coro_semaphore_destroy;
2634 } 3240 }
2635} 3241}
2636 3242
2637static void 3243static void
2638slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3244slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2696 { 3302 {
2697 api_ready (aTHX_ cb); 3303 api_ready (aTHX_ cb);
2698 sv_setiv (cb, 0); /* signal waiter */ 3304 sv_setiv (cb, 0); /* signal waiter */
2699 } 3305 }
2700 3306
2701 SvREFCNT_dec (cb); 3307 SvREFCNT_dec_NN (cb);
2702 3308
2703 --count; 3309 --count;
2704 } 3310 }
2705} 3311}
2706 3312
… …
2720 { 3326 {
2721 SV *cb_cv = s_get_cv_croak (arg [1]); 3327 SV *cb_cv = s_get_cv_croak (arg [1]);
2722 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3328 av_push (av, SvREFCNT_inc_NN (cb_cv));
2723 3329
2724 if (SvIVX (AvARRAY (av)[0])) 3330 if (SvIVX (AvARRAY (av)[0]))
2725 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3331 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2726 3332
2727 frame->prepare = prepare_nop; 3333 frame->prepare = prepare_nop;
2728 frame->check = slf_check_nop; 3334 frame->check = slf_check_nop;
2729 } 3335 }
2730 else if (SvIVX (AvARRAY (av)[0])) 3336 else if (SvIVX (AvARRAY (av)[0]))
… …
2791 } 3397 }
2792 3398
2793 av_push (state, data_sv); 3399 av_push (state, data_sv);
2794 3400
2795 api_ready (aTHX_ coro); 3401 api_ready (aTHX_ coro);
2796 SvREFCNT_dec (coro); 3402 SvREFCNT_dec_NN (coro);
2797 SvREFCNT_dec ((AV *)state); 3403 SvREFCNT_dec_NN ((AV *)state);
2798} 3404}
2799 3405
2800static int 3406static int
2801slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3407slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2802{ 3408{
… …
2807 /* it quickly returns */ 3413 /* it quickly returns */
2808 if (CORO_THROW) 3414 if (CORO_THROW)
2809 return 0; 3415 return 0;
2810 3416
2811 /* one element that is an RV? repeat! */ 3417 /* one element that is an RV? repeat! */
2812 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3418 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2813 return 1; 3419 return 1;
2814 3420
2815 /* restore status */ 3421 /* restore status */
2816 { 3422 {
2817 SV *data_sv = av_pop (state); 3423 SV *data_sv = av_pop (state);
… …
2820 errno = data->errorno; 3426 errno = data->errorno;
2821 PL_laststype = data->laststype; 3427 PL_laststype = data->laststype;
2822 PL_laststatval = data->laststatval; 3428 PL_laststatval = data->laststatval;
2823 PL_statcache = data->statcache; 3429 PL_statcache = data->statcache;
2824 3430
2825 SvREFCNT_dec (data_sv); 3431 SvREFCNT_dec_NN (data_sv);
2826 } 3432 }
2827 3433
2828 /* push result values */ 3434 /* push result values */
2829 { 3435 {
2830 dSP; 3436 dSP;
… …
2856 dSP; 3462 dSP;
2857 3463
2858 static SV *prio_cv; 3464 static SV *prio_cv;
2859 static SV *prio_sv; 3465 static SV *prio_sv;
2860 3466
2861 if (expect_false (!prio_cv)) 3467 if (ecb_expect_false (!prio_cv))
2862 { 3468 {
2863 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3469 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2864 prio_sv = newSViv (0); 3470 prio_sv = newSViv (0);
2865 } 3471 }
2866 3472
… …
2892 /* now call the AIO function - we assume our request is uncancelable */ 3498 /* now call the AIO function - we assume our request is uncancelable */
2893 PUTBACK; 3499 PUTBACK;
2894 call_sv ((SV *)req, G_VOID | G_DISCARD); 3500 call_sv ((SV *)req, G_VOID | G_DISCARD);
2895 } 3501 }
2896 3502
2897 /* now that the requets is going, we loop toll we have a result */ 3503 /* now that the request is going, we loop till we have a result */
2898 frame->data = (void *)state; 3504 frame->data = (void *)state;
2899 frame->prepare = prepare_schedule; 3505 frame->prepare = prepare_schedule;
2900 frame->check = slf_check_aio_req; 3506 frame->check = slf_check_aio_req;
2901} 3507}
2902 3508
… …
2972 } 3578 }
2973 3579
2974 return coro_sv; 3580 return coro_sv;
2975} 3581}
2976 3582
3583#ifndef __cplusplus
3584ecb_cold XS(boot_Coro__State);
3585#endif
3586
3587#if CORO_JIT
3588
3589static void ecb_noinline ecb_cold
3590pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3591{
3592 dSP;
3593 AV *av = newAV ();
3594
3595 av_store (av, 3, newSVuv (d));
3596 av_store (av, 2, newSVuv (c));
3597 av_store (av, 1, newSVuv (b));
3598 av_store (av, 0, newSVuv (a));
3599
3600 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3601
3602 PUTBACK;
3603}
3604
3605static void ecb_noinline ecb_cold
3606jit_init (pTHX)
3607{
3608 dSP;
3609 SV *load, *save;
3610 char *map_base;
3611 char *load_ptr, *save_ptr;
3612 STRLEN load_len, save_len, map_len;
3613 int count;
3614
3615 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3616
3617 PUSHMARK (SP);
3618 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3619 #include "state.h"
3620 count = call_pv ("Coro::State::_jit", G_ARRAY);
3621 SPAGAIN;
3622
3623 save = POPs; save_ptr = SvPVbyte (save, save_len);
3624 load = POPs; load_ptr = SvPVbyte (load, load_len);
3625
3626 map_len = load_len + save_len + 16;
3627
3628 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3629
3630 if (map_base == (char *)MAP_FAILED)
3631 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3632
3633 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3634
3635 load_perl_slots = (load_save_perl_slots_type)map_base;
3636 memcpy (map_base, load_ptr, load_len);
3637
3638 map_base += (load_len + 15) & ~15;
3639
3640 save_perl_slots = (load_save_perl_slots_type)map_base;
3641 memcpy (map_base, save_ptr, save_len);
3642
3643 /* we are good citizens and try to make the page read-only, so the evil evil */
3644 /* hackers might have it a bit more difficult */
3645 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3646
3647 PUTBACK;
3648 eval_pv ("undef &Coro::State::_jit", 1);
3649}
3650
3651#endif
3652
2977MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3653MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2978 3654
2979PROTOTYPES: DISABLE 3655PROTOTYPES: DISABLE
2980 3656
2981BOOT: 3657BOOT:
2982{ 3658{
3659#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3660#include "state.h"
2983#ifdef USE_ITHREADS 3661#ifdef USE_ITHREADS
2984# if CORO_PTHREAD 3662# if CORO_PTHREAD
2985 coro_thx = PERL_GET_CONTEXT; 3663 coro_thx = PERL_GET_CONTEXT;
2986# endif 3664# endif
2987#endif 3665#endif
2988 BOOT_PAGESIZE; 3666 /* perl defines these to check for existance first, but why it doesn't */
3667 /* just create them one at init time is not clear to me, except for */
3668 /* programs trying to delete them, but... */
3669 /* anyway, we declare this as invalid and make sure they are initialised here */
3670 DEFSV;
3671 ERRSV;
2989 3672
2990 cctx_current = cctx_new_empty (); 3673 cctx_current = cctx_new_empty ();
2991 3674
2992 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3675 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2993 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3676 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2994 3677
2995 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3678 {
2996 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3679 /*
2997 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3680 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3681 * by coro_sig_vtbl in hash values.
3682 */
3683 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3684
3685 /* this only works if perl doesn't have a vtbl for %SIG */
3686 assert (!mg->mg_virtual);
3687
3688 /*
3689 * The irony is that the perl API itself asserts that mg_virtual
3690 * must be non-const, yet perl5porters insisted on marking their
3691 * vtbls as read-only, just to thwart perl modules from patching
3692 * them.
3693 */
3694 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3695 mg->mg_flags |= MGf_COPY;
3696
3697 coro_sigelem_vtbl = PL_vtbl_sigelem;
3698 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3699 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3700 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3701 }
2998 3702
2999 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3000 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3703 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3001 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3704 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3002 3705
3003 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3706 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3707
3708 newCONSTSUB (coro_state_stash, "BACKEND", newSVpv (CORO_BACKEND, 0)); /* undocumented */
3004 3709
3005 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 3710 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
3006 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 3711 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
3007 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 3712 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
3008 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 3713 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
… …
3033 coroapi.prepare_nop = prepare_nop; 3738 coroapi.prepare_nop = prepare_nop;
3034 coroapi.prepare_schedule = prepare_schedule; 3739 coroapi.prepare_schedule = prepare_schedule;
3035 coroapi.prepare_cede = prepare_cede; 3740 coroapi.prepare_cede = prepare_cede;
3036 coroapi.prepare_cede_notself = prepare_cede_notself; 3741 coroapi.prepare_cede_notself = prepare_cede_notself;
3037 3742
3038 { 3743 time_init (aTHX);
3039 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3040
3041 if (!svp) croak ("Time::HiRes is required");
3042 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3043
3044 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3045
3046 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3047 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3048 }
3049 3744
3050 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3745 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3746#if CORO_JIT
3747 PUTBACK;
3748 jit_init (aTHX);
3749 SPAGAIN;
3750#endif
3051} 3751}
3052 3752
3053SV * 3753SV *
3054new (SV *klass, ...) 3754new (SV *klass, ...)
3055 ALIAS: 3755 ALIAS:
… …
3062void 3762void
3063transfer (...) 3763transfer (...)
3064 PROTOTYPE: $$ 3764 PROTOTYPE: $$
3065 CODE: 3765 CODE:
3066 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3766 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3067
3068bool
3069_destroy (SV *coro_sv)
3070 CODE:
3071 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3072 OUTPUT:
3073 RETVAL
3074
3075void
3076_exit (int code)
3077 PROTOTYPE: $
3078 CODE:
3079 _exit (code);
3080 3767
3081SV * 3768SV *
3082clone (Coro::State coro) 3769clone (Coro::State coro)
3083 CODE: 3770 CODE:
3084{ 3771{
… …
3139void 3826void
3140list () 3827list ()
3141 PROTOTYPE: 3828 PROTOTYPE:
3142 PPCODE: 3829 PPCODE:
3143{ 3830{
3144 struct coro *coro; 3831 struct coro *coro;
3145 for (coro = coro_first; coro; coro = coro->next) 3832 for (coro = coro_first; coro; coro = coro->next)
3146 if (coro->hv) 3833 if (coro->hv)
3147 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3834 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3148} 3835}
3149 3836
… …
3151call (Coro::State coro, SV *coderef) 3838call (Coro::State coro, SV *coderef)
3152 ALIAS: 3839 ALIAS:
3153 eval = 1 3840 eval = 1
3154 CODE: 3841 CODE:
3155{ 3842{
3843 struct coro *current = SvSTATE_current;
3844
3156 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3845 if ((coro == current) || (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)))
3157 { 3846 {
3158 struct coro *current = SvSTATE_current; 3847 struct CoroSLF slf_save;
3159 3848
3160 if (current != coro) 3849 if (current != coro)
3161 { 3850 {
3162 PUTBACK; 3851 PUTBACK;
3163 save_perl (aTHX_ current); 3852 save_perl (aTHX_ current);
3164 load_perl (aTHX_ coro); 3853 load_perl (aTHX_ coro);
3854 /* the coro is most likely in an active SLF call.
3855 * while not strictly required (the code we execute is
3856 * not allowed to call any SLF functions), it's cleaner
3857 * to reinitialise the slf_frame and restore it later.
3858 * This might one day allow us to actually do SLF calls
3859 * from code executed here.
3860 */
3861 slf_save = slf_frame;
3862 slf_frame.prepare = 0;
3165 SPAGAIN; 3863 SPAGAIN;
3166 } 3864 }
3167 3865
3168 PUSHSTACK; 3866 PUSHSTACK;
3169 3867
… …
3179 SPAGAIN; 3877 SPAGAIN;
3180 3878
3181 if (current != coro) 3879 if (current != coro)
3182 { 3880 {
3183 PUTBACK; 3881 PUTBACK;
3882 slf_frame = slf_save;
3184 save_perl (aTHX_ coro); 3883 save_perl (aTHX_ coro);
3185 load_perl (aTHX_ current); 3884 load_perl (aTHX_ current);
3186 SPAGAIN; 3885 SPAGAIN;
3187 } 3886 }
3188 } 3887 }
… …
3193 PROTOTYPE: $ 3892 PROTOTYPE: $
3194 ALIAS: 3893 ALIAS:
3195 is_ready = CF_READY 3894 is_ready = CF_READY
3196 is_running = CF_RUNNING 3895 is_running = CF_RUNNING
3197 is_new = CF_NEW 3896 is_new = CF_NEW
3198 is_destroyed = CF_DESTROYED 3897 is_destroyed = CF_ZOMBIE
3898 is_zombie = CF_ZOMBIE
3199 is_suspended = CF_SUSPENDED 3899 is_suspended = CF_SUSPENDED
3200 CODE: 3900 CODE:
3201 RETVAL = boolSV (coro->flags & ix); 3901 RETVAL = boolSV (coro->flags & ix);
3202 OUTPUT: 3902 OUTPUT:
3203 RETVAL 3903 RETVAL
3204 3904
3205void 3905void
3206throw (Coro::State self, SV *throw = &PL_sv_undef) 3906throw (SV *self, SV *exception = &PL_sv_undef)
3207 PROTOTYPE: $;$ 3907 PROTOTYPE: $;$
3208 CODE: 3908 CODE:
3209{ 3909{
3910 struct coro *coro = SvSTATE (self);
3210 struct coro *current = SvSTATE_current; 3911 struct coro *current = SvSTATE_current;
3211 SV **throwp = self == current ? &CORO_THROW : &self->except; 3912 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3212 SvREFCNT_dec (*throwp); 3913 SvREFCNT_dec (*exceptionp);
3213 SvGETMAGIC (throw); 3914 SvGETMAGIC (exception);
3214 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3915 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3916
3917 api_ready (aTHX_ self);
3215} 3918}
3216 3919
3217void 3920void
3218api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3921api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3219 PROTOTYPE: $;$ 3922 PROTOTYPE: $;$
… …
3274 3977
3275void 3978void
3276cancel (Coro::State self) 3979cancel (Coro::State self)
3277 CODE: 3980 CODE:
3278 coro_state_destroy (aTHX_ self); 3981 coro_state_destroy (aTHX_ self);
3279 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3280
3281 3982
3282SV * 3983SV *
3283enable_times (int enabled = enable_times) 3984enable_times (int enabled = enable_times)
3284 CODE: 3985 CODE:
3285{ 3986{
… …
3298 3999
3299void 4000void
3300times (Coro::State self) 4001times (Coro::State self)
3301 PPCODE: 4002 PPCODE:
3302{ 4003{
3303 struct coro *current = SvSTATE (coro_current); 4004 struct coro *current = SvSTATE (coro_current);
3304 4005
3305 if (expect_false (current == self)) 4006 if (ecb_expect_false (current == self))
3306 { 4007 {
3307 coro_times_update (); 4008 coro_times_update ();
3308 coro_times_add (SvSTATE (coro_current)); 4009 coro_times_add (SvSTATE (coro_current));
3309 } 4010 }
3310 4011
3311 EXTEND (SP, 2); 4012 EXTEND (SP, 2);
3312 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 4013 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3313 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 4014 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3314 4015
3315 if (expect_false (current == self)) 4016 if (ecb_expect_false (current == self))
3316 coro_times_sub (SvSTATE (coro_current)); 4017 coro_times_sub (SvSTATE (coro_current));
3317} 4018}
3318 4019
4020void
4021swap_sv (Coro::State coro, SV *sva, SV *svb)
4022 CODE:
4023{
4024 struct coro *current = SvSTATE_current;
4025 AV *swap_sv;
4026 int i;
4027
4028 sva = SvRV (sva);
4029 svb = SvRV (svb);
4030
4031 if (current == coro)
4032 SWAP_SVS_LEAVE (current);
4033
4034 if (!coro->swap_sv)
4035 coro->swap_sv = newAV ();
4036
4037 swap_sv = coro->swap_sv;
4038
4039 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4040 {
4041 SV *a = AvARRAY (swap_sv)[i ];
4042 SV *b = AvARRAY (swap_sv)[i + 1];
4043
4044 if (a == sva && b == svb)
4045 {
4046 SvREFCNT_dec_NN (a);
4047 SvREFCNT_dec_NN (b);
4048
4049 for (; i <= AvFILLp (swap_sv) - 2; i++)
4050 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4051
4052 AvFILLp (swap_sv) -= 2;
4053
4054 goto removed;
4055 }
4056 }
4057
4058 av_push (swap_sv, SvREFCNT_inc_NN (sva));
4059 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4060
4061 removed:
4062
4063 if (current == coro)
4064 SWAP_SVS_ENTER (current);
4065}
4066
4067
3319MODULE = Coro::State PACKAGE = Coro 4068MODULE = Coro::State PACKAGE = Coro
3320 4069
3321BOOT: 4070BOOT:
3322{ 4071{
4072 if (SVt_LAST > 32)
4073 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4074
3323 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4075 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3324 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4076 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3325 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4077 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3326 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3327 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4078 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3328 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4079 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3329 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4080 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3330 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4081 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3331 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4082 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3332 4083
3333 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4084 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3334 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4085 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3335 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4086 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3336 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 4087 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3337 4088
3338 coro_stash = gv_stashpv ("Coro", TRUE); 4089 coro_stash = gv_stashpv ("Coro", TRUE);
3339 4090
3340 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4091 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3341 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4092 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3342 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4093 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3354 coroapi.ready = api_ready; 4105 coroapi.ready = api_ready;
3355 coroapi.is_ready = api_is_ready; 4106 coroapi.is_ready = api_is_ready;
3356 coroapi.nready = coro_nready; 4107 coroapi.nready = coro_nready;
3357 coroapi.current = coro_current; 4108 coroapi.current = coro_current;
3358 4109
4110 coroapi.enterleave_hook = api_enterleave_hook;
4111 coroapi.enterleave_unhook = api_enterleave_unhook;
4112 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4113
3359 /*GCoroAPI = &coroapi;*/ 4114 /*GCoroAPI = &coroapi;*/
3360 sv_setiv (sv, (IV)&coroapi); 4115 sv_setiv (sv, PTR2IV (&coroapi));
3361 SvREADONLY_on (sv); 4116 SvREADONLY_on (sv);
3362 } 4117 }
3363} 4118}
3364 4119
3365SV * 4120SV *
… …
3370 api_ready (aTHX_ RETVAL); 4125 api_ready (aTHX_ RETVAL);
3371 OUTPUT: 4126 OUTPUT:
3372 RETVAL 4127 RETVAL
3373 4128
3374void 4129void
4130_destroy (Coro::State coro)
4131 CODE:
4132 /* used by the manager thread */
4133 coro_state_destroy (aTHX_ coro);
4134
4135void
4136on_destroy (Coro::State coro, SV *cb)
4137 CODE:
4138 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4139
4140void
4141join (...)
4142 CODE:
4143 CORO_EXECUTE_SLF_XS (slf_init_join);
4144
4145void
3375terminate (...) 4146terminate (...)
3376 CODE: 4147 CODE:
3377 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4148 CORO_EXECUTE_SLF_XS (slf_init_terminate);
4149
4150void
4151cancel (...)
4152 CODE:
4153 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4154
4155int
4156safe_cancel (Coro::State self, ...)
4157 C_ARGS: aTHX_ self, &ST (1), items - 1
3378 4158
3379void 4159void
3380schedule (...) 4160schedule (...)
3381 CODE: 4161 CODE:
3382 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4162 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3403 4183
3404void 4184void
3405_set_current (SV *current) 4185_set_current (SV *current)
3406 PROTOTYPE: $ 4186 PROTOTYPE: $
3407 CODE: 4187 CODE:
3408 SvREFCNT_dec (SvRV (coro_current)); 4188 SvREFCNT_dec_NN (SvRV (coro_current));
3409 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4189 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3410 4190
3411void 4191void
3412_set_readyhook (SV *hook) 4192_set_readyhook (SV *hook)
3413 PROTOTYPE: $ 4193 PROTOTYPE: $
… …
3497 4277
3498 if ((SV *)hv == &PL_sv_undef) 4278 if ((SV *)hv == &PL_sv_undef)
3499 { 4279 {
3500 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4280 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3501 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4281 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3502 SvREFCNT_dec (sv); 4282 SvREFCNT_dec_NN (sv);
3503 } 4283 }
3504 4284
3505 { 4285 {
3506 struct coro *coro = SvSTATE_hv (hv); 4286 struct coro *coro = SvSTATE_hv (hv);
3507 4287
… …
3514 api_ready (aTHX_ (SV *)hv); 4294 api_ready (aTHX_ (SV *)hv);
3515 4295
3516 if (GIMME_V != G_VOID) 4296 if (GIMME_V != G_VOID)
3517 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4297 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3518 else 4298 else
3519 SvREFCNT_dec (hv); 4299 SvREFCNT_dec_NN (hv);
3520} 4300}
3521 4301
3522SV * 4302SV *
3523rouse_cb () 4303rouse_cb ()
3524 PROTOTYPE: 4304 PROTOTYPE:
… …
3539 on_leave = 1 4319 on_leave = 1
3540 PROTOTYPE: & 4320 PROTOTYPE: &
3541 CODE: 4321 CODE:
3542{ 4322{
3543 struct coro *coro = SvSTATE_current; 4323 struct coro *coro = SvSTATE_current;
3544 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4324 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3545 4325
3546 block = s_get_cv_croak (block); 4326 block = s_get_cv_croak (block);
3547 4327
3548 if (!*avp) 4328 if (!*avp)
3549 *avp = newAV (); 4329 *avp = newAV ();
… …
3569 4349
3570SV * 4350SV *
3571new (SV *klass, SV *count = 0) 4351new (SV *klass, SV *count = 0)
3572 CODE: 4352 CODE:
3573{ 4353{
3574 int semcnt = 1; 4354 int semcnt = 1;
3575 4355
3576 if (count) 4356 if (count)
3577 { 4357 {
3578 SvGETMAGIC (count); 4358 SvGETMAGIC (count);
3579 4359
… …
3603 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4383 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3604 OUTPUT: 4384 OUTPUT:
3605 RETVAL 4385 RETVAL
3606 4386
3607void 4387void
3608up (SV *self, int adjust = 1) 4388up (SV *self)
3609 ALIAS:
3610 adjust = 1
3611 CODE: 4389 CODE:
4390 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4391
4392void
4393adjust (SV *self, int adjust)
4394 CODE:
3612 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4395 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3613 4396
3614void 4397void
3615down (...) 4398down (...)
3616 CODE: 4399 CODE:
3617 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4400 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3639 XSRETURN_NO; 4422 XSRETURN_NO;
3640} 4423}
3641 4424
3642void 4425void
3643waiters (SV *self) 4426waiters (SV *self)
3644 PPCODE: 4427 PPCODE:
3645{ 4428{
3646 AV *av = (AV *)SvRV (self); 4429 AV *av = (AV *)SvRV (self);
3647 int wcount = AvFILLp (av) + 1 - 1; 4430 int wcount = AvFILLp (av) + 1 - 1;
3648 4431
3649 if (GIMME_V == G_SCALAR) 4432 if (GIMME_V == G_SCALAR)
… …
3658} 4441}
3659 4442
3660MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4443MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3661 4444
3662void 4445void
3663_may_delete (SV *sem, int count, int extra_refs) 4446_may_delete (SV *sem, int count, unsigned int extra_refs)
3664 PPCODE: 4447 PPCODE:
3665{ 4448{
3666 AV *av = (AV *)SvRV (sem); 4449 AV *av = (AV *)SvRV (sem);
3667 4450
3668 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4451 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3669 && AvFILLp (av) == 0 /* no waiters, just count */ 4452 && AvFILLp (av) == 0 /* no waiters, just count */
3670 && SvIV (AvARRAY (av)[0]) == count) 4453 && SvIV (AvARRAY (av)[0]) == count)
3671 XSRETURN_YES; 4454 XSRETURN_YES;
… …
3692 4475
3693void 4476void
3694broadcast (SV *self) 4477broadcast (SV *self)
3695 CODE: 4478 CODE:
3696{ 4479{
3697 AV *av = (AV *)SvRV (self); 4480 AV *av = (AV *)SvRV (self);
3698 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4481 coro_signal_wake (aTHX_ av, AvFILLp (av));
3699} 4482}
3700 4483
3701void 4484void
3702send (SV *self) 4485send (SV *self)
… …
3710 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4493 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3711} 4494}
3712 4495
3713IV 4496IV
3714awaited (SV *self) 4497awaited (SV *self)
3715 CODE: 4498 CODE:
3716 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4499 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3717 OUTPUT: 4500 OUTPUT:
3718 RETVAL 4501 RETVAL
3719 4502
3720 4503
… …
3725 4508
3726void 4509void
3727_schedule (...) 4510_schedule (...)
3728 CODE: 4511 CODE:
3729{ 4512{
3730 static int incede; 4513 static int incede;
3731 4514
3732 api_cede_notself (aTHX); 4515 api_cede_notself (aTHX);
3733 4516
3734 ++incede; 4517 ++incede;
3735 while (coro_nready >= incede && api_cede (aTHX)) 4518 while (coro_nready >= incede && api_cede (aTHX))
… …
3779 { 4562 {
3780 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4563 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3781 coro_old_pp_sselect = 0; 4564 coro_old_pp_sselect = 0;
3782 } 4565 }
3783 4566
4567MODULE = Coro::State PACKAGE = Coro::Util
3784 4568
4569void
4570_exit (int code)
4571 CODE:
4572 _exit (code);
4573
4574NV
4575time ()
4576 CODE:
4577 RETVAL = nvtime (aTHX);
4578 OUTPUT:
4579 RETVAL
4580
4581NV
4582gettimeofday ()
4583 PPCODE:
4584{
4585 UV tv [2];
4586 u2time (aTHX_ tv);
4587 EXTEND (SP, 2);
4588 PUSHs (sv_2mortal (newSVuv (tv [0])));
4589 PUSHs (sv_2mortal (newSVuv (tv [1])));
4590}
4591

Diff Legend

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