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.381 by root, Sat Oct 23 09:28:50 2010 UTC vs.
Revision 1.454 by root, Tue Jul 7 00:38:03 2015 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7 7
8#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 9#define PERL_EXT
… …
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17 17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
18#include <stdio.h> 23#include <stdio.h>
19#include <errno.h> 24#include <errno.h>
20#include <assert.h> 25#include <assert.h>
21 26
27#ifndef SvREFCNT_dec_NN
28 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
29#endif
30
31#ifndef SvREFCNT_inc_NN
32 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
33#endif
34
22#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0 36# define SVs_PADSTALE 0
24#endif 37#endif
25 38
26#ifdef WIN32 39#ifdef PadARRAY
40# define NEWPADAPI 1
41# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
42#else
43typedef AV PADNAMELIST;
44# if !PERL_VERSION_ATLEAST(5,8,0)
45typedef AV PADLIST;
46typedef AV PAD;
47# endif
48# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
49# define PadlistMAX(pl) AvFILLp (pl)
50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
51# define PadARRAY AvARRAY
52# define PadMAX AvFILLp
53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
54#endif
55#ifndef PadnamelistREFCNT
56# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
57#endif
58#ifndef PadnamelistREFCNT_dec
59# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
60#endif
61
62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
64#if PERL_VERSION_ATLEAST(5,19,0)
65# define SVt_BIND SVt_IV
66#endif
67
68#if defined(_WIN32)
69# undef HAS_GETTIMEOFDAY
27# undef setjmp 70# undef setjmp
28# undef longjmp 71# undef longjmp
29# undef _exit 72# undef _exit
30# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
31#else 74#else
32# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
33#endif 76#endif
34 77
35#ifdef HAVE_MMAP
36# include <unistd.h>
37# include <sys/mman.h>
38# ifndef MAP_ANONYMOUS
39# ifdef MAP_ANON
40# define MAP_ANONYMOUS MAP_ANON
41# else
42# undef HAVE_MMAP
43# endif
44# endif
45# include <limits.h>
46# ifndef PAGESIZE
47# define PAGESIZE pagesize
48# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
49static long pagesize;
50# else
51# define BOOT_PAGESIZE (void)0
52# endif
53#else
54# define PAGESIZE 0
55# define BOOT_PAGESIZE (void)0
56#endif
57
58#if CORO_USE_VALGRIND
59# include <valgrind/valgrind.h>
60#endif
61
62/* the maximum number of idle cctx that will be pooled */ 78/* the maximum number of idle cctx that will be pooled */
63static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
64 80
65#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
66# undef CORO_STACKGUARD 82# define HAS_SCOPESTACK_NAME 1
67#endif
68
69#ifndef CORO_STACKGUARD
70# define CORO_STACKGUARD 0
71#endif 83#endif
72 84
73/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
74#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
75# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
85# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
86#endif 98#endif
87 99
88#define IN_DESTRUCT PL_dirty 100#define IN_DESTRUCT PL_dirty
89 101
90#if __GNUC__ >= 3
91# define attribute(x) __attribute__(x)
92# define expect(expr,value) __builtin_expect ((expr), (value))
93# define INLINE static inline
94#else
95# define attribute(x)
96# define expect(expr,value) (expr)
97# define INLINE static
98#endif
99
100#define expect_false(expr) expect ((expr) != 0, 0)
101#define expect_true(expr) expect ((expr) != 0, 1)
102
103#define NOINLINE attribute ((noinline))
104
105#include "CoroAPI.h" 102#include "CoroAPI.h"
106#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
107 104
108#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
109# if CORO_PTHREAD 106# if CORO_PTHREAD
… …
125static void (*u2time)(pTHX_ UV ret[2]); 122static void (*u2time)(pTHX_ UV ret[2]);
126 123
127/* we hijack an hopefully unused CV flag for our purposes */ 124/* we hijack an hopefully unused CV flag for our purposes */
128#define CVf_SLF 0x4000 125#define CVf_SLF 0x4000
129static OP *pp_slf (pTHX); 126static OP *pp_slf (pTHX);
127static void slf_destroy (pTHX_ struct coro *coro);
130 128
131static U32 cctx_gen; 129static U32 cctx_gen;
132static size_t cctx_stacksize = CORO_STACKSIZE; 130static size_t cctx_stacksize = CORO_STACKSIZE;
133static struct CoroAPI coroapi; 131static struct CoroAPI coroapi;
134static AV *main_mainstack; /* used to differentiate between $main and others */ 132static AV *main_mainstack; /* used to differentiate between $main and others */
… …
164static char times_valid; 162static char times_valid;
165 163
166static struct coro_cctx *cctx_first; 164static struct coro_cctx *cctx_first;
167static int cctx_count, cctx_idle; 165static int cctx_count, cctx_idle;
168 166
169enum { 167enum
168{
170 CC_MAPPED = 0x01, 169 CC_MAPPED = 0x01,
171 CC_NOREUSE = 0x02, /* throw this away after tracing */ 170 CC_NOREUSE = 0x02, /* throw this away after tracing */
172 CC_TRACE = 0x04, 171 CC_TRACE = 0x04,
173 CC_TRACE_SUB = 0x08, /* trace sub calls */ 172 CC_TRACE_SUB = 0x08, /* trace sub calls */
174 CC_TRACE_LINE = 0x10, /* trace each statement */ 173 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
179typedef struct coro_cctx 178typedef struct coro_cctx
180{ 179{
181 struct coro_cctx *next; 180 struct coro_cctx *next;
182 181
183 /* the stack */ 182 /* the stack */
184 void *sptr; 183 struct coro_stack stack;
185 size_t ssize;
186 184
187 /* cpu state */ 185 /* cpu state */
188 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 186 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
187#ifndef NDEBUG
189 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 188 JMPENV *idle_te; /* same as idle_sp, but for top_env */
189#endif
190 JMPENV *top_env; 190 JMPENV *top_env;
191 coro_context cctx; 191 coro_context cctx;
192 192
193 U32 gen; 193 U32 gen;
194#if CORO_USE_VALGRIND 194#if CORO_USE_VALGRIND
195 int valgrind_id; 195 int valgrind_id;
196#endif 196#endif
197 unsigned char flags; 197 unsigned char flags;
198} coro_cctx; 198} coro_cctx;
199 199
200coro_cctx *cctx_current; /* the currently running cctx */ 200static coro_cctx *cctx_current; /* the currently running cctx */
201 201
202/*****************************************************************************/ 202/*****************************************************************************/
203 203
204static MGVTBL coro_state_vtbl;
205
204enum { 206enum
207{
205 CF_RUNNING = 0x0001, /* coroutine is running */ 208 CF_RUNNING = 0x0001, /* coroutine is running */
206 CF_READY = 0x0002, /* coroutine is ready */ 209 CF_READY = 0x0002, /* coroutine is ready */
207 CF_NEW = 0x0004, /* has never been switched to */ 210 CF_NEW = 0x0004, /* has never been switched to */
208 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 211 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
209 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 212 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
213 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
210}; 214};
211 215
212/* the structure where most of the perl state is stored, overlaid on the cxstack */ 216/* the structure where most of the perl state is stored, overlaid on the cxstack */
213typedef struct 217typedef struct
214{ 218{
215 SV *defsv;
216 AV *defav;
217 SV *errsv;
218 SV *irsgv;
219 HV *hinthv;
220#define VAR(name,type) type name; 219 #define VARx(name,expr,type) type name;
221# include "state.h" 220 #include "state.h"
222#undef VAR
223} perl_slots; 221} perl_slots;
224 222
223/* how many context stack entries do we need for perl_slots */
225#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 224#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
226 225
227/* this is a structure representing a perl-level coroutine */ 226/* this is a structure representing a perl-level coroutine */
228struct coro { 227struct coro
228{
229 /* the C coroutine allocated to this perl coroutine, if any */ 229 /* the C coroutine allocated to this perl coroutine, if any */
230 coro_cctx *cctx; 230 coro_cctx *cctx;
231 231
232 /* ready queue */ 232 /* ready queue */
233 struct coro *next_ready; 233 struct coro *next_ready;
… …
235 /* state data */ 235 /* state data */
236 struct CoroSLF slf_frame; /* saved slf frame */ 236 struct CoroSLF slf_frame; /* saved slf frame */
237 AV *mainstack; 237 AV *mainstack;
238 perl_slots *slot; /* basically the saved sp */ 238 perl_slots *slot; /* basically the saved sp */
239 239
240 CV *startcv; /* the CV to execute */ 240 CV *startcv; /* the CV to execute */
241 AV *args; /* data associated with this coroutine (initial args) */ 241 AV *args; /* data associated with this coroutine (initial args) */
242 int refcnt; /* coroutines are refcounted, yes */
243 int flags; /* CF_ flags */ 242 int flags; /* CF_ flags */
244 HV *hv; /* the perl hash associated with this coro, if any */ 243 HV *hv; /* the perl hash associated with this coro, if any */
245 void (*on_destroy)(pTHX_ struct coro *coro);
246 244
247 /* statistics */ 245 /* statistics */
248 int usecount; /* number of transfers to this coro */ 246 int usecount; /* number of transfers to this coro */
249 247
250 /* coro process data */ 248 /* coro process data */
251 int prio; 249 int prio;
252 SV *except; /* exception to be thrown */ 250 SV *except; /* exception to be thrown */
253 SV *rouse_cb; 251 SV *rouse_cb; /* last rouse callback */
252 AV *on_destroy; /* callbacks or coros to notify on destroy */
253 AV *status; /* the exit status list */
254 254
255 /* async_pool */ 255 /* async_pool */
256 SV *saved_deffh; 256 SV *saved_deffh;
257 SV *invoke_cb; 257 SV *invoke_cb;
258 AV *invoke_av; 258 AV *invoke_av;
259 259
260 /* on_enter/on_leave */ 260 /* on_enter/on_leave */
261 AV *on_enter; 261 AV *on_enter; AV *on_enter_xs;
262 AV *on_leave; 262 AV *on_leave; AV *on_leave_xs;
263 263
264 /* swap_sv */ 264 /* swap_sv */
265 AV *swap_sv; 265 AV *swap_sv;
266 266
267 /* times */ 267 /* times */
… …
274typedef struct coro *Coro__State; 274typedef struct coro *Coro__State;
275typedef struct coro *Coro__State_or_hashref; 275typedef struct coro *Coro__State_or_hashref;
276 276
277/* the following variables are effectively part of the perl context */ 277/* the following variables are effectively part of the perl context */
278/* and get copied between struct coro and these variables */ 278/* and get copied between struct coro and these variables */
279/* the mainr easonw e don't support windows process emulation */ 279/* the main reason we don't support windows process emulation */
280static struct CoroSLF slf_frame; /* the current slf frame */ 280static struct CoroSLF slf_frame; /* the current slf frame */
281 281
282/** Coro ********************************************************************/ 282/** Coro ********************************************************************/
283 283
284#define CORO_PRIO_MAX 3 284#define CORO_PRIO_MAX 3
… …
290 290
291/* for Coro.pm */ 291/* for Coro.pm */
292static SV *coro_current; 292static SV *coro_current;
293static SV *coro_readyhook; 293static SV *coro_readyhook;
294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
295static CV *cv_coro_run, *cv_coro_terminate; 295static CV *cv_coro_run;
296static struct coro *coro_first; 296static struct coro *coro_first;
297#define coro_nready coroapi.nready 297#define coro_nready coroapi.nready
298
299/** JIT *********************************************************************/
300
301#if CORO_JIT
302 /* APPLE doesn't have mmap though */
303 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
304 #ifndef CORO_JIT_TYPE
305 #if ECB_AMD64 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "amd64-unix"
307 #elif __i386 && CORO_JIT_UNIXY
308 #define CORO_JIT_TYPE "x86-unix"
309 #endif
310 #endif
311#endif
312
313#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
314 #undef CORO_JIT
315#endif
316
317#if CORO_JIT
318 typedef void (*load_save_perl_slots_type)(perl_slots *);
319 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
320#endif
298 321
299/** Coro::Select ************************************************************/ 322/** Coro::Select ************************************************************/
300 323
301static OP *(*coro_old_pp_sselect) (pTHX); 324static OP *(*coro_old_pp_sselect) (pTHX);
302static SV *coro_select_select; 325static SV *coro_select_select;
… …
314 PL_op->op_flags |= OPf_STACKED; 337 PL_op->op_flags |= OPf_STACKED;
315 PL_op->op_private = 0; 338 PL_op->op_private = 0;
316 return PL_ppaddr [OP_ENTERSUB](aTHX); 339 return PL_ppaddr [OP_ENTERSUB](aTHX);
317} 340}
318 341
342/** time stuff **************************************************************/
343
344#ifdef HAS_GETTIMEOFDAY
345
346ecb_inline void
347coro_u2time (pTHX_ UV ret[2])
348{
349 struct timeval tv;
350 gettimeofday (&tv, 0);
351
352 ret [0] = tv.tv_sec;
353 ret [1] = tv.tv_usec;
354}
355
356ecb_inline double
357coro_nvtime (void)
358{
359 struct timeval tv;
360 gettimeofday (&tv, 0);
361
362 return tv.tv_sec + tv.tv_usec * 1e-6;
363}
364
365ecb_inline void
366time_init (pTHX)
367{
368 nvtime = coro_nvtime;
369 u2time = coro_u2time;
370}
371
372#else
373
374ecb_inline void
375time_init (pTHX)
376{
377 SV **svp;
378
379 require_pv ("Time/HiRes.pm");
380
381 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
382
383 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
384 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
385
386 nvtime = INT2PTR (double (*)(), SvIV (*svp));
387
388 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
389 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
390}
391
392#endif
393
319/** lowlevel stuff **********************************************************/ 394/** lowlevel stuff **********************************************************/
320 395
321static SV * 396static SV * ecb_noinline
322coro_get_sv (pTHX_ const char *name, int create) 397coro_get_sv (pTHX_ const char *name, int create)
323{ 398{
324#if PERL_VERSION_ATLEAST (5,10,0) 399#if PERL_VERSION_ATLEAST (5,10,0)
325 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 400 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
326 get_sv (name, create); 401 get_sv (name, create);
327#endif 402#endif
328 return get_sv (name, create); 403 return get_sv (name, create);
329} 404}
330 405
331static AV * 406static AV * ecb_noinline
332coro_get_av (pTHX_ const char *name, int create) 407coro_get_av (pTHX_ const char *name, int create)
333{ 408{
334#if PERL_VERSION_ATLEAST (5,10,0) 409#if PERL_VERSION_ATLEAST (5,10,0)
335 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 410 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
336 get_av (name, create); 411 get_av (name, create);
337#endif 412#endif
338 return get_av (name, create); 413 return get_av (name, create);
339} 414}
340 415
341static HV * 416static HV * ecb_noinline
342coro_get_hv (pTHX_ const char *name, int create) 417coro_get_hv (pTHX_ const char *name, int create)
343{ 418{
344#if PERL_VERSION_ATLEAST (5,10,0) 419#if PERL_VERSION_ATLEAST (5,10,0)
345 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 420 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
346 get_hv (name, create); 421 get_hv (name, create);
347#endif 422#endif
348 return get_hv (name, create); 423 return get_hv (name, create);
349} 424}
350 425
351INLINE void 426ecb_inline void
352coro_times_update () 427coro_times_update (void)
353{ 428{
354#ifdef coro_clock_gettime 429#ifdef coro_clock_gettime
355 struct timespec ts; 430 struct timespec ts;
356 431
357 ts.tv_sec = ts.tv_nsec = 0; 432 ts.tv_sec = ts.tv_nsec = 0;
… …
369 time_real [0] = tv [0]; 444 time_real [0] = tv [0];
370 time_real [1] = tv [1] * 1000; 445 time_real [1] = tv [1] * 1000;
371#endif 446#endif
372} 447}
373 448
374INLINE void 449ecb_inline void
375coro_times_add (struct coro *c) 450coro_times_add (struct coro *c)
376{ 451{
377 c->t_real [1] += time_real [1]; 452 c->t_real [1] += time_real [1];
378 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 453 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
379 c->t_real [0] += time_real [0]; 454 c->t_real [0] += time_real [0];
… …
381 c->t_cpu [1] += time_cpu [1]; 456 c->t_cpu [1] += time_cpu [1];
382 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 457 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
383 c->t_cpu [0] += time_cpu [0]; 458 c->t_cpu [0] += time_cpu [0];
384} 459}
385 460
386INLINE void 461ecb_inline void
387coro_times_sub (struct coro *c) 462coro_times_sub (struct coro *c)
388{ 463{
389 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 464 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
390 c->t_real [1] -= time_real [1]; 465 c->t_real [1] -= time_real [1];
391 c->t_real [0] -= time_real [0]; 466 c->t_real [0] -= time_real [0];
… …
399/* magic glue */ 474/* magic glue */
400 475
401#define CORO_MAGIC_type_cv 26 476#define CORO_MAGIC_type_cv 26
402#define CORO_MAGIC_type_state PERL_MAGIC_ext 477#define CORO_MAGIC_type_state PERL_MAGIC_ext
403 478
404#define CORO_MAGIC_NN(sv, type) \ 479#define CORO_MAGIC_NN(sv, type) \
405 (expect_true (SvMAGIC (sv)->mg_type == type) \ 480 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
406 ? SvMAGIC (sv) \ 481 ? SvMAGIC (sv) \
407 : mg_find (sv, type)) 482 : mg_find (sv, type))
408 483
409#define CORO_MAGIC(sv, type) \ 484#define CORO_MAGIC(sv, type) \
410 (expect_true (SvMAGIC (sv)) \ 485 (ecb_expect_true (SvMAGIC (sv)) \
411 ? CORO_MAGIC_NN (sv, type) \ 486 ? CORO_MAGIC_NN (sv, type) \
412 : 0) 487 : 0)
413 488
414#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 489#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
415#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 490#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
416 491
417INLINE struct coro * 492ecb_inline MAGIC *
418SvSTATE_ (pTHX_ SV *coro) 493SvSTATEhv_p (pTHX_ SV *coro)
419{ 494{
420 HV *stash;
421 MAGIC *mg; 495 MAGIC *mg;
422 496
497 if (ecb_expect_true (
498 SvTYPE (coro) == SVt_PVHV
499 && (mg = CORO_MAGIC_state (coro))
500 && mg->mg_virtual == &coro_state_vtbl
501 ))
502 return mg;
503
504 return 0;
505}
506
507ecb_inline struct coro *
508SvSTATE_ (pTHX_ SV *coro_sv)
509{
510 MAGIC *mg;
511
423 if (SvROK (coro)) 512 if (SvROK (coro_sv))
424 coro = SvRV (coro); 513 coro_sv = SvRV (coro_sv);
425 514
426 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 515 mg = SvSTATEhv_p (aTHX_ coro_sv);
516 if (!mg)
427 croak ("Coro::State object required"); 517 croak ("Coro::State object required");
428 518
429 stash = SvSTASH (coro);
430 if (expect_false (stash != coro_stash && stash != coro_state_stash))
431 {
432 /* very slow, but rare, check */
433 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
434 croak ("Coro::State object required");
435 }
436
437 mg = CORO_MAGIC_state (coro);
438 return (struct coro *)mg->mg_ptr; 519 return (struct coro *)mg->mg_ptr;
439} 520}
440 521
441#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 522#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
442 523
… …
445#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 526#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
446 527
447/*****************************************************************************/ 528/*****************************************************************************/
448/* padlist management and caching */ 529/* padlist management and caching */
449 530
450static AV * 531ecb_inline PADLIST *
451coro_derive_padlist (pTHX_ CV *cv) 532coro_derive_padlist (pTHX_ CV *cv)
452{ 533{
453 AV *padlist = CvPADLIST (cv); 534 PADLIST *padlist = CvPADLIST (cv);
454 AV *newpadlist, *newpad; 535 PADLIST *newpadlist;
536 PADNAMELIST *padnames;
537 PAD *newpad;
538 PADOFFSET off = PadlistMAX (padlist) + 1;
455 539
456 newpadlist = newAV (); 540#if NEWPADAPI
541
542 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
543 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
544 while (!PadlistARRAY (padlist)[off - 1])
545 --off;
546
547 Perl_pad_push (aTHX_ padlist, off);
548
549 newpad = PadlistARRAY (padlist)[off];
550 PadlistARRAY (padlist)[off] = 0;
551
552#else
553
554#if PERL_VERSION_ATLEAST (5,10,0)
555 Perl_pad_push (aTHX_ padlist, off);
556#else
557 Perl_pad_push (aTHX_ padlist, off, 1);
558#endif
559
560 newpad = PadlistARRAY (padlist)[off];
561 PadlistMAX (padlist) = off - 1;
562
563#endif
564
565 newPADLIST (newpadlist);
566#if !PERL_VERSION_ATLEAST(5,15,3)
567 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
457 AvREAL_off (newpadlist); 568 AvREAL_off (newpadlist);
458#if PERL_VERSION_ATLEAST (5,10,0)
459 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
460#else
461 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
462#endif 569#endif
463 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
464 --AvFILLp (padlist);
465 570
466 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 571 /* Already extended to 2 elements by newPADLIST. */
467 av_store (newpadlist, 1, (SV *)newpad); 572 PadlistMAX (newpadlist) = 1;
573
574 padnames = PadlistNAMES (padlist);
575 ++PadnamelistREFCNT (padnames);
576 PadlistNAMES (newpadlist) = padnames;
577
578 PadlistARRAY (newpadlist)[1] = newpad;
468 579
469 return newpadlist; 580 return newpadlist;
470} 581}
471 582
472static void 583ecb_inline void
473free_padlist (pTHX_ AV *padlist) 584free_padlist (pTHX_ PADLIST *padlist)
474{ 585{
475 /* may be during global destruction */ 586 /* may be during global destruction */
476 if (!IN_DESTRUCT) 587 if (!IN_DESTRUCT)
477 { 588 {
478 I32 i = AvFILLp (padlist); 589 I32 i = PadlistMAX (padlist);
479 590
480 while (i > 0) /* special-case index 0 */ 591 while (i > 0) /* special-case index 0 */
481 { 592 {
482 /* we try to be extra-careful here */ 593 /* we try to be extra-careful here */
483 AV *av = (AV *)AvARRAY (padlist)[i--]; 594 PAD *pad = PadlistARRAY (padlist)[i--];
484 I32 j = AvFILLp (av);
485 595
596 if (pad)
597 {
598 I32 j = PadMAX (pad);
599
486 while (j >= 0) 600 while (j >= 0)
487 SvREFCNT_dec (AvARRAY (av)[j--]); 601 SvREFCNT_dec (PadARRAY (pad)[j--]);
488 602
489 AvFILLp (av) = -1; 603 PadMAX (pad) = -1;
490 SvREFCNT_dec (av); 604 SvREFCNT_dec (pad);
605 }
491 } 606 }
492 607
493 SvREFCNT_dec (AvARRAY (padlist)[0]); 608 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
494 609
610#if NEWPADAPI
611 Safefree (PadlistARRAY (padlist));
612 Safefree (padlist);
613#else
495 AvFILLp (padlist) = -1; 614 AvFILLp (padlist) = -1;
615 AvREAL_off (padlist);
496 SvREFCNT_dec ((SV*)padlist); 616 SvREFCNT_dec ((SV*)padlist);
617#endif
497 } 618 }
498} 619}
499 620
500static int 621static int
501coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 622coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
502{ 623{
503 AV *padlist; 624 PADLIST *padlist;
504 AV *av = (AV *)mg->mg_obj; 625 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
626 size_t len = *(size_t *)mg->mg_ptr;
505 627
506 /* perl manages to free our internal AV and _then_ call us */ 628 /* perl manages to free our internal AV and _then_ call us */
507 if (IN_DESTRUCT) 629 if (IN_DESTRUCT)
508 return 0; 630 return 0;
509 631
510 /* casting is fun. */ 632 while (len--)
511 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
512 free_padlist (aTHX_ padlist); 633 free_padlist (aTHX_ padlists[len]);
513
514 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
515 634
516 return 0; 635 return 0;
517} 636}
518 637
519static MGVTBL coro_cv_vtbl = { 638static MGVTBL coro_cv_vtbl = {
520 0, 0, 0, 0, 639 0, 0, 0, 0,
521 coro_cv_free 640 coro_cv_free
522}; 641};
523 642
524/* the next two functions merely cache the padlists */ 643/* the next two functions merely cache the padlists */
525static void 644ecb_inline void
526get_padlist (pTHX_ CV *cv) 645get_padlist (pTHX_ CV *cv)
527{ 646{
528 MAGIC *mg = CORO_MAGIC_cv (cv); 647 MAGIC *mg = CORO_MAGIC_cv (cv);
529 AV *av; 648 size_t *lenp;
530 649
531 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 650 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
532 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 651 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
533 else 652 else
534 { 653 {
535#if CORO_PREFER_PERL_FUNCTIONS 654#if CORO_PREFER_PERL_FUNCTIONS
536 /* this is probably cleaner? but also slower! */ 655 /* this is probably cleaner? but also slower! */
537 /* in practise, it seems to be less stable */ 656 /* in practise, it seems to be less stable */
… …
543 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 662 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
544#endif 663#endif
545 } 664 }
546} 665}
547 666
548static void 667ecb_inline void
549put_padlist (pTHX_ CV *cv) 668put_padlist (pTHX_ CV *cv)
550{ 669{
551 MAGIC *mg = CORO_MAGIC_cv (cv); 670 MAGIC *mg = CORO_MAGIC_cv (cv);
552 AV *av;
553 671
554 if (expect_false (!mg)) 672 if (ecb_expect_false (!mg))
673 {
555 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 674 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
675 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
676 mg->mg_len = 1; /* so mg_free frees mg_ptr */
677 }
678 else
679 Renew (mg->mg_ptr,
680 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
681 char);
556 682
557 av = (AV *)mg->mg_obj; 683 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
558
559 if (expect_false (AvFILLp (av) >= AvMAX (av)))
560 av_extend (av, AvFILLp (av) + 1);
561
562 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
563} 684}
564 685
565/** load & save, init *******************************************************/ 686/** load & save, init *******************************************************/
566 687
688ecb_inline void
689swap_sv (SV *a, SV *b)
690{
691 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
692 SV tmp;
693
694 /* swap sv_any */
695 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
696
697 /* swap sv_flags */
698 SvFLAGS (&tmp) = SvFLAGS (a);
699 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
700 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
701
702#if PERL_VERSION_ATLEAST (5,10,0)
703 /* perl 5.10 and later complicates this _quite_ a bit, but it also
704 * is much faster, so no quarrels here. alternatively, we could
705 * sv_upgrade to avoid this.
706 */
707 {
708 /* swap sv_u */
709 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
710
711 /* if SvANY points to the head, we need to adjust the pointers,
712 * as the pointer for a still points to b, and maybe vice versa.
713 */
714 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
715 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
716 svany_in_head_set |= 1 << SVt_NV;
717 #endif
718
719 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
720
721 if (svany_in_head (SvTYPE (a)))
722 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
723
724 if (svany_in_head (SvTYPE (b)))
725 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
726 }
727#endif
728}
729
567/* swap sv heads, at least logically */ 730/* swap sv heads, at least logically */
568static void 731static void
569swap_svs (pTHX_ Coro__State c) 732swap_svs (pTHX_ Coro__State c)
570{ 733{
571 int i; 734 int i;
572 735
573 for (i = 0; i <= AvFILLp (c->swap_sv); ) 736 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
574 { 737 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
575 SV *a = AvARRAY (c->swap_sv)[i++];
576 SV *b = AvARRAY (c->swap_sv)[i++];
577
578 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
579 SV tmp;
580
581 /* swap sv_any */
582 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
583
584 /* swap sv_flags */
585 SvFLAGS (&tmp) = SvFLAGS (a);
586 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
587 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
588
589#if PERL_VERSION_ATLEAST (5,10,0)
590 /* perl 5.10 complicates this _quite_ a bit, but it also is
591 * is much faster, so no quarrels here. alternatively, we could
592 * sv_upgrade to avoid this.
593 */
594 {
595 /* swap sv_u */
596 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
597
598 /* if SvANY points to the head, we need to adjust the pointers,
599 * as the pointer for a still points to b, and maybe vice versa.
600 */
601 #define svany_in_head(type) \
602 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
603
604 if (svany_in_head (SvTYPE (a)))
605 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
606
607 if (svany_in_head (SvTYPE (b)))
608 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
609 }
610#endif
611 }
612} 738}
613 739
614#define SWAP_SVS(coro) \ 740#define SWAP_SVS(coro) \
615 if (expect_false ((coro)->swap_sv)) \ 741 if (ecb_expect_false ((coro)->swap_sv)) \
616 swap_svs (aTHX_ (coro)) 742 swap_svs (aTHX_ (coro))
617 743
618static void 744static void
619on_enterleave_call (pTHX_ SV *cb); 745on_enterleave_call (pTHX_ SV *cb);
620 746
… …
624 perl_slots *slot = c->slot; 750 perl_slots *slot = c->slot;
625 c->slot = 0; 751 c->slot = 0;
626 752
627 PL_mainstack = c->mainstack; 753 PL_mainstack = c->mainstack;
628 754
629 GvSV (PL_defgv) = slot->defsv; 755#if CORO_JIT
630 GvAV (PL_defgv) = slot->defav; 756 load_perl_slots (slot);
631 GvSV (PL_errgv) = slot->errsv; 757#else
632 GvSV (irsgv) = slot->irsgv;
633 GvHV (PL_hintgv) = slot->hinthv;
634
635 #define VAR(name,type) PL_ ## name = slot->name; 758 #define VARx(name,expr,type) expr = slot->name;
636 # include "state.h" 759 #include "state.h"
637 #undef VAR 760#endif
638 761
639 { 762 {
640 dSP; 763 dSP;
641 764
642 CV *cv; 765 CV *cv;
643 766
644 /* now do the ugly restore mess */ 767 /* now do the ugly restore mess */
645 while (expect_true (cv = (CV *)POPs)) 768 while (ecb_expect_true (cv = (CV *)POPs))
646 { 769 {
647 put_padlist (aTHX_ cv); /* mark this padlist as available */ 770 put_padlist (aTHX_ cv); /* mark this padlist as available */
648 CvDEPTH (cv) = PTR2IV (POPs); 771 CvDEPTH (cv) = PTR2IV (POPs);
649 CvPADLIST (cv) = (AV *)POPs; 772 CvPADLIST (cv) = (PADLIST *)POPs;
650 } 773 }
651 774
652 PUTBACK; 775 PUTBACK;
653 } 776 }
654 777
655 slf_frame = c->slf_frame; 778 slf_frame = c->slf_frame;
656 CORO_THROW = c->except; 779 CORO_THROW = c->except;
657 780
658 if (expect_false (enable_times)) 781 if (ecb_expect_false (enable_times))
659 { 782 {
660 if (expect_false (!times_valid)) 783 if (ecb_expect_false (!times_valid))
661 coro_times_update (); 784 coro_times_update ();
662 785
663 coro_times_sub (c); 786 coro_times_sub (c);
664 } 787 }
665 788
666 if (expect_false (c->on_enter)) 789 if (ecb_expect_false (c->on_enter))
667 { 790 {
668 int i; 791 int i;
669 792
670 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 793 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
671 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 794 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
672 } 795 }
673 796
797 if (ecb_expect_false (c->on_enter_xs))
798 {
799 int i;
800
801 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
802 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
803 }
804
674 SWAP_SVS (c); 805 SWAP_SVS (c);
675} 806}
676 807
677static void 808static void
678save_perl (pTHX_ Coro__State c) 809save_perl (pTHX_ Coro__State c)
679{ 810{
680 SWAP_SVS (c); 811 SWAP_SVS (c);
681 812
813 if (ecb_expect_false (c->on_leave_xs))
814 {
815 int i;
816
817 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
818 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
819 }
820
682 if (expect_false (c->on_leave)) 821 if (ecb_expect_false (c->on_leave))
683 { 822 {
684 int i; 823 int i;
685 824
686 for (i = AvFILLp (c->on_leave); i >= 0; --i) 825 for (i = AvFILLp (c->on_leave); i >= 0; --i)
687 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 826 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
688 } 827 }
689 828
690 times_valid = 0; 829 times_valid = 0;
691 830
692 if (expect_false (enable_times)) 831 if (ecb_expect_false (enable_times))
693 { 832 {
694 coro_times_update (); times_valid = 1; 833 coro_times_update (); times_valid = 1;
695 coro_times_add (c); 834 coro_times_add (c);
696 } 835 }
697 836
… …
711 850
712 XPUSHs (Nullsv); 851 XPUSHs (Nullsv);
713 /* this loop was inspired by pp_caller */ 852 /* this loop was inspired by pp_caller */
714 for (;;) 853 for (;;)
715 { 854 {
716 while (expect_true (cxix >= 0)) 855 while (ecb_expect_true (cxix >= 0))
717 { 856 {
718 PERL_CONTEXT *cx = &ccstk[cxix--]; 857 PERL_CONTEXT *cx = &ccstk[cxix--];
719 858
720 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 859 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
721 { 860 {
722 CV *cv = cx->blk_sub.cv; 861 CV *cv = cx->blk_sub.cv;
723 862
724 if (expect_true (CvDEPTH (cv))) 863 if (ecb_expect_true (CvDEPTH (cv)))
725 { 864 {
726 EXTEND (SP, 3); 865 EXTEND (SP, 3);
727 PUSHs ((SV *)CvPADLIST (cv)); 866 PUSHs ((SV *)CvPADLIST (cv));
728 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 867 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
729 PUSHs ((SV *)cv); 868 PUSHs ((SV *)cv);
… …
732 get_padlist (aTHX_ cv); 871 get_padlist (aTHX_ cv);
733 } 872 }
734 } 873 }
735 } 874 }
736 875
737 if (expect_true (top_si->si_type == PERLSI_MAIN)) 876 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
738 break; 877 break;
739 878
740 top_si = top_si->si_prev; 879 top_si = top_si->si_prev;
741 ccstk = top_si->si_cxstack; 880 ccstk = top_si->si_cxstack;
742 cxix = top_si->si_cxix; 881 cxix = top_si->si_cxix;
… …
744 883
745 PUTBACK; 884 PUTBACK;
746 } 885 }
747 886
748 /* allocate some space on the context stack for our purposes */ 887 /* allocate some space on the context stack for our purposes */
749 /* we manually unroll here, as usually 2 slots is enough */ 888 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
750 if (SLOT_COUNT >= 1) CXINC;
751 if (SLOT_COUNT >= 2) CXINC;
752 if (SLOT_COUNT >= 3) CXINC;
753 { 889 {
754 unsigned int i; 890 unsigned int i;
891
755 for (i = 3; i < SLOT_COUNT; ++i) 892 for (i = 0; i < SLOT_COUNT; ++i)
756 CXINC; 893 CXINC;
757 } 894
758 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 895 cxstack_ix -= SLOT_COUNT; /* undo allocation */
896 }
759 897
760 c->mainstack = PL_mainstack; 898 c->mainstack = PL_mainstack;
761 899
762 { 900 {
763 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 901 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
764 902
765 slot->defav = GvAV (PL_defgv); 903#if CORO_JIT
766 slot->defsv = DEFSV; 904 save_perl_slots (slot);
767 slot->errsv = ERRSV; 905#else
768 slot->irsgv = GvSV (irsgv);
769 slot->hinthv = GvHV (PL_hintgv);
770
771 #define VAR(name,type) slot->name = PL_ ## name; 906 #define VARx(name,expr,type) slot->name = expr;
772 # include "state.h" 907 #include "state.h"
773 #undef VAR 908#endif
774 } 909 }
775} 910}
776 911
777/* 912/*
778 * allocate various perl stacks. This is almost an exact copy 913 * allocate various perl stacks. This is almost an exact copy
… …
784# define coro_init_stacks(thx) init_stacks () 919# define coro_init_stacks(thx) init_stacks ()
785#else 920#else
786static void 921static void
787coro_init_stacks (pTHX) 922coro_init_stacks (pTHX)
788{ 923{
789 PL_curstackinfo = new_stackinfo(32, 8); 924 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
790 PL_curstackinfo->si_type = PERLSI_MAIN; 925 PL_curstackinfo->si_type = PERLSI_MAIN;
791 PL_curstack = PL_curstackinfo->si_stack; 926 PL_curstack = PL_curstackinfo->si_stack;
792 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 927 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
793 928
794 PL_stack_base = AvARRAY(PL_curstack); 929 PL_stack_base = AvARRAY(PL_curstack);
… …
809#endif 944#endif
810 945
811 New(54,PL_scopestack,8,I32); 946 New(54,PL_scopestack,8,I32);
812 PL_scopestack_ix = 0; 947 PL_scopestack_ix = 0;
813 PL_scopestack_max = 8; 948 PL_scopestack_max = 8;
949#if HAS_SCOPESTACK_NAME
950 New(54,PL_scopestack_name,8,const char*);
951#endif
814 952
815 New(54,PL_savestack,24,ANY); 953 New(54,PL_savestack,24,ANY);
816 PL_savestack_ix = 0; 954 PL_savestack_ix = 0;
817 PL_savestack_max = 24; 955 PL_savestack_max = 24;
818 956
… …
846 } 984 }
847 985
848 Safefree (PL_tmps_stack); 986 Safefree (PL_tmps_stack);
849 Safefree (PL_markstack); 987 Safefree (PL_markstack);
850 Safefree (PL_scopestack); 988 Safefree (PL_scopestack);
989#if HAS_SCOPESTACK_NAME
990 Safefree (PL_scopestack_name);
991#endif
851 Safefree (PL_savestack); 992 Safefree (PL_savestack);
852#if !PERL_VERSION_ATLEAST (5,10,0) 993#if !PERL_VERSION_ATLEAST (5,10,0)
853 Safefree (PL_retstack); 994 Safefree (PL_retstack);
854#endif 995#endif
855} 996}
… …
901#endif 1042#endif
902 1043
903/* 1044/*
904 * This overrides the default magic get method of %SIG elements. 1045 * This overrides the default magic get method of %SIG elements.
905 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1046 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
906 * and instead of trying to save and restore the hash elements, we just provide 1047 * and instead of trying to save and restore the hash elements (extremely slow),
907 * readback here. 1048 * we just provide our own readback here.
908 */ 1049 */
909static int 1050static int ecb_cold
910coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1051coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
911{ 1052{
912 const char *s = MgPV_nolen_const (mg); 1053 const char *s = MgPV_nolen_const (mg);
913 1054
914 if (*s == '_') 1055 if (*s == '_')
915 { 1056 {
916 SV **svp = 0; 1057 SV **svp = 0;
917 1058
918 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1059 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
919 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1060 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
920 1061
921 if (svp) 1062 if (svp)
922 { 1063 {
923 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1064 SV *ssv;
1065
1066 if (!*svp)
1067 ssv = &PL_sv_undef;
1068 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1069 ssv = sv_2mortal (newRV_inc (*svp));
1070 else
1071 ssv = *svp;
1072
1073 sv_setsv (sv, ssv);
924 return 0; 1074 return 0;
925 } 1075 }
926 } 1076 }
927 1077
928 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1078 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
929} 1079}
930 1080
931static int 1081static int ecb_cold
932coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1082coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
933{ 1083{
934 const char *s = MgPV_nolen_const (mg); 1084 const char *s = MgPV_nolen_const (mg);
935 1085
936 if (*s == '_') 1086 if (*s == '_')
… …
950 } 1100 }
951 1101
952 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1102 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
953} 1103}
954 1104
955static int 1105static int ecb_cold
956coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1106coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
957{ 1107{
958 const char *s = MgPV_nolen_const (mg); 1108 const char *s = MgPV_nolen_const (mg);
959 1109
960 if (*s == '_') 1110 if (*s == '_')
… …
995 return 1; 1145 return 1;
996} 1146}
997 1147
998static UNOP init_perl_op; 1148static UNOP init_perl_op;
999 1149
1000static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1150ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1001init_perl (pTHX_ struct coro *coro) 1151init_perl (pTHX_ struct coro *coro)
1002{ 1152{
1003 /* 1153 /*
1004 * emulate part of the perl startup here. 1154 * emulate part of the perl startup here.
1005 */ 1155 */
… …
1013 PL_comppad_name_fill = 0; 1163 PL_comppad_name_fill = 0;
1014 PL_comppad_name_floor = 0; 1164 PL_comppad_name_floor = 0;
1015 PL_curpm = 0; 1165 PL_curpm = 0;
1016 PL_curpad = 0; 1166 PL_curpad = 0;
1017 PL_localizing = 0; 1167 PL_localizing = 0;
1018 PL_dirty = 0;
1019 PL_restartop = 0; 1168 PL_restartop = 0;
1020#if PERL_VERSION_ATLEAST (5,10,0) 1169#if PERL_VERSION_ATLEAST (5,10,0)
1021 PL_parser = 0; 1170 PL_parser = 0;
1022#endif 1171#endif
1023 PL_hints = 0; 1172 PL_hints = 0;
1024 1173
1025 /* recreate the die/warn hooks */ 1174 /* recreate the die/warn hooks */
1026 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1175 PL_diehook = SvREFCNT_inc (rv_diehook);
1027 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1176 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1028 1177
1029 GvSV (PL_defgv) = newSV (0); 1178 GvSV (PL_defgv) = newSV (0);
1030 GvAV (PL_defgv) = coro->args; coro->args = 0; 1179 GvAV (PL_defgv) = coro->args; coro->args = 0;
1031 GvSV (PL_errgv) = newSV (0); 1180 GvSV (PL_errgv) = newSV (0);
1032 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1181 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1033 GvHV (PL_hintgv) = 0; 1182 GvHV (PL_hintgv) = newHV ();
1183#if PERL_VERSION_ATLEAST (5,10,0)
1184 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1185#endif
1034 PL_rs = newSVsv (GvSV (irsgv)); 1186 PL_rs = newSVsv (GvSV (irsgv));
1035 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1187 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1036 1188
1037 { 1189 {
1038 dSP; 1190 dSP;
… …
1053 /* this newly created coroutine might be run on an existing cctx which most 1205 /* this newly created coroutine might be run on an existing cctx which most
1054 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1206 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1055 */ 1207 */
1056 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1208 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1057 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1209 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1210 slf_frame.destroy = 0;
1058 1211
1059 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1212 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1060 init_perl_op.op_next = PL_op; 1213 init_perl_op.op_next = PL_op;
1061 init_perl_op.op_type = OP_ENTERSUB; 1214 init_perl_op.op_type = OP_ENTERSUB;
1062 init_perl_op.op_ppaddr = pp_slf; 1215 init_perl_op.op_ppaddr = pp_slf;
… …
1067 /* copy throw, in case it was set before init_perl */ 1220 /* copy throw, in case it was set before init_perl */
1068 CORO_THROW = coro->except; 1221 CORO_THROW = coro->except;
1069 1222
1070 SWAP_SVS (coro); 1223 SWAP_SVS (coro);
1071 1224
1072 if (expect_false (enable_times)) 1225 if (ecb_expect_false (enable_times))
1073 { 1226 {
1074 coro_times_update (); 1227 coro_times_update ();
1075 coro_times_sub (coro); 1228 coro_times_sub (coro);
1076 } 1229 }
1077} 1230}
… …
1101destroy_perl (pTHX_ struct coro *coro) 1254destroy_perl (pTHX_ struct coro *coro)
1102{ 1255{
1103 SV *svf [9]; 1256 SV *svf [9];
1104 1257
1105 { 1258 {
1259 SV *old_current = SvRV (coro_current);
1106 struct coro *current = SvSTATE_current; 1260 struct coro *current = SvSTATE (old_current);
1107 1261
1108 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1262 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1109 1263
1110 save_perl (aTHX_ current); 1264 save_perl (aTHX_ current);
1265
1266 /* this will cause transfer_check to croak on block*/
1267 SvRV_set (coro_current, (SV *)coro->hv);
1268
1111 load_perl (aTHX_ coro); 1269 load_perl (aTHX_ coro);
1112 1270
1113 coro_unwind_stacks (aTHX); 1271 coro_unwind_stacks (aTHX);
1114 coro_destruct_stacks (aTHX);
1115 1272
1116 /* restore swapped sv's */ 1273 /* restore swapped sv's */
1117 SWAP_SVS (coro); 1274 SWAP_SVS (coro);
1118 1275
1276 coro_destruct_stacks (aTHX);
1277
1119 // now save some sv's to be free'd later 1278 /* now save some sv's to be free'd later */
1120 svf [0] = GvSV (PL_defgv); 1279 svf [0] = GvSV (PL_defgv);
1121 svf [1] = (SV *)GvAV (PL_defgv); 1280 svf [1] = (SV *)GvAV (PL_defgv);
1122 svf [2] = GvSV (PL_errgv); 1281 svf [2] = GvSV (PL_errgv);
1123 svf [3] = (SV *)PL_defoutgv; 1282 svf [3] = (SV *)PL_defoutgv;
1124 svf [4] = PL_rs; 1283 svf [4] = PL_rs;
… …
1126 svf [6] = (SV *)GvHV (PL_hintgv); 1285 svf [6] = (SV *)GvHV (PL_hintgv);
1127 svf [7] = PL_diehook; 1286 svf [7] = PL_diehook;
1128 svf [8] = PL_warnhook; 1287 svf [8] = PL_warnhook;
1129 assert (9 == sizeof (svf) / sizeof (*svf)); 1288 assert (9 == sizeof (svf) / sizeof (*svf));
1130 1289
1290 SvRV_set (coro_current, old_current);
1291
1131 load_perl (aTHX_ current); 1292 load_perl (aTHX_ current);
1132 } 1293 }
1133 1294
1134 { 1295 {
1135 unsigned int i; 1296 unsigned int i;
… …
1139 1300
1140 SvREFCNT_dec (coro->saved_deffh); 1301 SvREFCNT_dec (coro->saved_deffh);
1141 SvREFCNT_dec (coro->rouse_cb); 1302 SvREFCNT_dec (coro->rouse_cb);
1142 SvREFCNT_dec (coro->invoke_cb); 1303 SvREFCNT_dec (coro->invoke_cb);
1143 SvREFCNT_dec (coro->invoke_av); 1304 SvREFCNT_dec (coro->invoke_av);
1305 SvREFCNT_dec (coro->on_enter_xs);
1306 SvREFCNT_dec (coro->on_leave_xs);
1144 } 1307 }
1145} 1308}
1146 1309
1147INLINE void 1310ecb_inline void
1148free_coro_mortal (pTHX) 1311free_coro_mortal (pTHX)
1149{ 1312{
1150 if (expect_true (coro_mortal)) 1313 if (ecb_expect_true (coro_mortal))
1151 { 1314 {
1152 SvREFCNT_dec (coro_mortal); 1315 SvREFCNT_dec ((SV *)coro_mortal);
1153 coro_mortal = 0; 1316 coro_mortal = 0;
1154 } 1317 }
1155} 1318}
1156 1319
1157static int 1320static int
… …
1211 1374
1212 if (PL_curcop != &PL_compiling) 1375 if (PL_curcop != &PL_compiling)
1213 { 1376 {
1214 SV **cb; 1377 SV **cb;
1215 1378
1216 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1379 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1217 { 1380 {
1218 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1381 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1219 1382
1220 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1383 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1221 { 1384 {
… …
1290 1453
1291 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1454 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1292} 1455}
1293 1456
1294/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1457/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1295static void NOINLINE 1458static void ecb_noinline
1296cctx_prepare (pTHX) 1459cctx_prepare (pTHX)
1297{ 1460{
1298 PL_top_env = &PL_start_env; 1461 PL_top_env = &PL_start_env;
1299 1462
1300 if (cctx_current->flags & CC_TRACE) 1463 if (cctx_current->flags & CC_TRACE)
… …
1311 slf_frame.prepare = slf_prepare_set_stacklevel; 1474 slf_frame.prepare = slf_prepare_set_stacklevel;
1312 slf_frame.check = slf_check_set_stacklevel; 1475 slf_frame.check = slf_check_set_stacklevel;
1313} 1476}
1314 1477
1315/* the tail of transfer: execute stuff we can only do after a transfer */ 1478/* the tail of transfer: execute stuff we can only do after a transfer */
1316INLINE void 1479ecb_inline void
1317transfer_tail (pTHX) 1480transfer_tail (pTHX)
1318{ 1481{
1319 free_coro_mortal (aTHX); 1482 free_coro_mortal (aTHX);
1483}
1484
1485/* try to exit the same way perl's main function would do */
1486/* we do not bother resetting the environment or other things *7
1487/* that are not, uhm, essential */
1488/* this obviously also doesn't work when perl is embedded */
1489static void ecb_noinline ecb_cold
1490perlish_exit (pTHX)
1491{
1492 int exitstatus = perl_destruct (PL_curinterp);
1493 perl_free (PL_curinterp);
1494 exit (exitstatus);
1320} 1495}
1321 1496
1322/* 1497/*
1323 * this is a _very_ stripped down perl interpreter ;) 1498 * this is a _very_ stripped down perl interpreter ;)
1324 */ 1499 */
… …
1353 */ 1528 */
1354 1529
1355 /* 1530 /*
1356 * If perl-run returns we assume exit() was being called or the coro 1531 * If perl-run returns we assume exit() was being called or the coro
1357 * fell off the end, which seems to be the only valid (non-bug) 1532 * fell off the end, which seems to be the only valid (non-bug)
1358 * reason for perl_run to return. We try to exit by jumping to the 1533 * reason for perl_run to return. We try to mimic whatever perl is normally
1359 * bootstrap-time "top" top_env, as we cannot restore the "main" 1534 * doing in that case. YMMV.
1360 * coroutine as Coro has no such concept.
1361 * This actually isn't valid with the pthread backend, but OSes requiring
1362 * that backend are too broken to do it in a standards-compliant way.
1363 */ 1535 */
1364 PL_top_env = main_top_env; 1536 perlish_exit (aTHX);
1365 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1366 } 1537 }
1367} 1538}
1368 1539
1369static coro_cctx * 1540static coro_cctx *
1370cctx_new () 1541cctx_new (void)
1371{ 1542{
1372 coro_cctx *cctx; 1543 coro_cctx *cctx;
1373 1544
1374 ++cctx_count; 1545 ++cctx_count;
1375 New (0, cctx, 1, coro_cctx); 1546 New (0, cctx, 1, coro_cctx);
… …
1381 return cctx; 1552 return cctx;
1382} 1553}
1383 1554
1384/* create a new cctx only suitable as source */ 1555/* create a new cctx only suitable as source */
1385static coro_cctx * 1556static coro_cctx *
1386cctx_new_empty () 1557cctx_new_empty (void)
1387{ 1558{
1388 coro_cctx *cctx = cctx_new (); 1559 coro_cctx *cctx = cctx_new ();
1389 1560
1390 cctx->sptr = 0; 1561 cctx->stack.sptr = 0;
1391 coro_create (&cctx->cctx, 0, 0, 0, 0); 1562 coro_create (&cctx->cctx, 0, 0, 0, 0);
1392 1563
1393 return cctx; 1564 return cctx;
1394} 1565}
1395 1566
1396/* create a new cctx suitable as destination/running a perl interpreter */ 1567/* create a new cctx suitable as destination/running a perl interpreter */
1397static coro_cctx * 1568static coro_cctx *
1398cctx_new_run () 1569cctx_new_run (void)
1399{ 1570{
1400 coro_cctx *cctx = cctx_new (); 1571 coro_cctx *cctx = cctx_new ();
1401 void *stack_start;
1402 size_t stack_size;
1403 1572
1404#if HAVE_MMAP 1573 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1405 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1406 /* mmap supposedly does allocate-on-write for us */
1407 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1408
1409 if (cctx->sptr != (void *)-1)
1410 {
1411 #if CORO_STACKGUARD
1412 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1413 #endif
1414 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1415 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1416 cctx->flags |= CC_MAPPED;
1417 } 1574 {
1418 else
1419#endif
1420 {
1421 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1422 New (0, cctx->sptr, cctx_stacksize, long);
1423
1424 if (!cctx->sptr)
1425 {
1426 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1575 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1427 _exit (EXIT_FAILURE); 1576 _exit (EXIT_FAILURE);
1428 }
1429
1430 stack_start = cctx->sptr;
1431 stack_size = cctx->ssize;
1432 } 1577 }
1433 1578
1434 #if CORO_USE_VALGRIND
1435 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1436 #endif
1437
1438 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1579 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1439 1580
1440 return cctx; 1581 return cctx;
1441} 1582}
1442 1583
1443static void 1584static void
1444cctx_destroy (coro_cctx *cctx) 1585cctx_destroy (coro_cctx *cctx)
1445{ 1586{
1446 if (!cctx) 1587 if (!cctx)
1447 return; 1588 return;
1448 1589
1449 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1590 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1450 1591
1451 --cctx_count; 1592 --cctx_count;
1452 coro_destroy (&cctx->cctx); 1593 coro_destroy (&cctx->cctx);
1453 1594
1454 /* coro_transfer creates new, empty cctx's */ 1595 coro_stack_free (&cctx->stack);
1455 if (cctx->sptr)
1456 {
1457 #if CORO_USE_VALGRIND
1458 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1459 #endif
1460
1461#if HAVE_MMAP
1462 if (cctx->flags & CC_MAPPED)
1463 munmap (cctx->sptr, cctx->ssize);
1464 else
1465#endif
1466 Safefree (cctx->sptr);
1467 }
1468 1596
1469 Safefree (cctx); 1597 Safefree (cctx);
1470} 1598}
1471 1599
1472/* wether this cctx should be destructed */ 1600/* wether this cctx should be destructed */
1473#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1601#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1474 1602
1475static coro_cctx * 1603static coro_cctx *
1476cctx_get (pTHX) 1604cctx_get (pTHX)
1477{ 1605{
1478 while (expect_true (cctx_first)) 1606 while (ecb_expect_true (cctx_first))
1479 { 1607 {
1480 coro_cctx *cctx = cctx_first; 1608 coro_cctx *cctx = cctx_first;
1481 cctx_first = cctx->next; 1609 cctx_first = cctx->next;
1482 --cctx_idle; 1610 --cctx_idle;
1483 1611
1484 if (expect_true (!CCTX_EXPIRED (cctx))) 1612 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1485 return cctx; 1613 return cctx;
1486 1614
1487 cctx_destroy (cctx); 1615 cctx_destroy (cctx);
1488 } 1616 }
1489 1617
… …
1491} 1619}
1492 1620
1493static void 1621static void
1494cctx_put (coro_cctx *cctx) 1622cctx_put (coro_cctx *cctx)
1495{ 1623{
1496 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1624 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1497 1625
1498 /* free another cctx if overlimit */ 1626 /* free another cctx if overlimit */
1499 if (expect_false (cctx_idle >= cctx_max_idle)) 1627 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1500 { 1628 {
1501 coro_cctx *first = cctx_first; 1629 coro_cctx *first = cctx_first;
1502 cctx_first = first->next; 1630 cctx_first = first->next;
1503 --cctx_idle; 1631 --cctx_idle;
1504 1632
… …
1515static void 1643static void
1516transfer_check (pTHX_ struct coro *prev, struct coro *next) 1644transfer_check (pTHX_ struct coro *prev, struct coro *next)
1517{ 1645{
1518 /* TODO: throwing up here is considered harmful */ 1646 /* TODO: throwing up here is considered harmful */
1519 1647
1520 if (expect_true (prev != next)) 1648 if (ecb_expect_true (prev != next))
1521 { 1649 {
1522 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1650 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1523 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1651 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1524 1652
1525 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1653 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1526 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1654 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1527 1655
1528#if !PERL_VERSION_ATLEAST (5,10,0) 1656#if !PERL_VERSION_ATLEAST (5,10,0)
1529 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1657 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1530 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1658 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1531#endif 1659#endif
1532 } 1660 }
1533} 1661}
1534 1662
1535/* always use the TRANSFER macro */ 1663/* always use the TRANSFER macro */
1536static void NOINLINE /* noinline so we have a fixed stackframe */ 1664static void ecb_noinline /* noinline so we have a fixed stackframe */
1537transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1665transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1538{ 1666{
1539 dSTACKLEVEL; 1667 dSTACKLEVEL;
1540 1668
1541 /* sometimes transfer is only called to set idle_sp */ 1669 /* sometimes transfer is only called to set idle_sp */
1542 if (expect_false (!prev)) 1670 if (ecb_expect_false (!prev))
1543 { 1671 {
1544 cctx_current->idle_sp = STACKLEVEL; 1672 cctx_current->idle_sp = STACKLEVEL;
1545 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1673 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1546 } 1674 }
1547 else if (expect_true (prev != next)) 1675 else if (ecb_expect_true (prev != next))
1548 { 1676 {
1549 coro_cctx *cctx_prev; 1677 coro_cctx *cctx_prev;
1550 1678
1551 if (expect_false (prev->flags & CF_NEW)) 1679 if (ecb_expect_false (prev->flags & CF_NEW))
1552 { 1680 {
1553 /* create a new empty/source context */ 1681 /* create a new empty/source context */
1554 prev->flags &= ~CF_NEW; 1682 prev->flags &= ~CF_NEW;
1555 prev->flags |= CF_RUNNING; 1683 prev->flags |= CF_RUNNING;
1556 } 1684 }
… …
1559 next->flags |= CF_RUNNING; 1687 next->flags |= CF_RUNNING;
1560 1688
1561 /* first get rid of the old state */ 1689 /* first get rid of the old state */
1562 save_perl (aTHX_ prev); 1690 save_perl (aTHX_ prev);
1563 1691
1564 if (expect_false (next->flags & CF_NEW)) 1692 if (ecb_expect_false (next->flags & CF_NEW))
1565 { 1693 {
1566 /* need to start coroutine */ 1694 /* need to start coroutine */
1567 next->flags &= ~CF_NEW; 1695 next->flags &= ~CF_NEW;
1568 /* setup coroutine call */ 1696 /* setup coroutine call */
1569 init_perl (aTHX_ next); 1697 init_perl (aTHX_ next);
1570 } 1698 }
1571 else 1699 else
1572 load_perl (aTHX_ next); 1700 load_perl (aTHX_ next);
1573 1701
1574 /* possibly untie and reuse the cctx */ 1702 /* possibly untie and reuse the cctx */
1575 if (expect_true ( 1703 if (ecb_expect_true (
1576 cctx_current->idle_sp == STACKLEVEL 1704 cctx_current->idle_sp == STACKLEVEL
1577 && !(cctx_current->flags & CC_TRACE) 1705 && !(cctx_current->flags & CC_TRACE)
1578 && !force_cctx 1706 && !force_cctx
1579 )) 1707 ))
1580 { 1708 {
1581 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1709 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1582 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1710 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1583 1711
1584 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1712 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1585 /* without this the next cctx_get might destroy the running cctx while still in use */ 1713 /* without this the next cctx_get might destroy the running cctx while still in use */
1586 if (expect_false (CCTX_EXPIRED (cctx_current))) 1714 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1587 if (expect_true (!next->cctx)) 1715 if (ecb_expect_true (!next->cctx))
1588 next->cctx = cctx_get (aTHX); 1716 next->cctx = cctx_get (aTHX);
1589 1717
1590 cctx_put (cctx_current); 1718 cctx_put (cctx_current);
1591 } 1719 }
1592 else 1720 else
1593 prev->cctx = cctx_current; 1721 prev->cctx = cctx_current;
1594 1722
1595 ++next->usecount; 1723 ++next->usecount;
1596 1724
1597 cctx_prev = cctx_current; 1725 cctx_prev = cctx_current;
1598 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1726 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1599 1727
1600 next->cctx = 0; 1728 next->cctx = 0;
1601 1729
1602 if (expect_false (cctx_prev != cctx_current)) 1730 if (ecb_expect_false (cctx_prev != cctx_current))
1603 { 1731 {
1604 cctx_prev->top_env = PL_top_env; 1732 cctx_prev->top_env = PL_top_env;
1605 PL_top_env = cctx_current->top_env; 1733 PL_top_env = cctx_current->top_env;
1606 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1734 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1607 } 1735 }
… …
1613#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1741#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1614#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1742#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1615 1743
1616/** high level stuff ********************************************************/ 1744/** high level stuff ********************************************************/
1617 1745
1746/* this function is actually Coro, not Coro::State, but we call it from here */
1747/* because it is convenient - but it hasn't been declared yet for that reason */
1618static int 1748static void
1749coro_call_on_destroy (pTHX_ struct coro *coro);
1750
1751static void
1619coro_state_destroy (pTHX_ struct coro *coro) 1752coro_state_destroy (pTHX_ struct coro *coro)
1620{ 1753{
1621 if (coro->flags & CF_DESTROYED) 1754 if (coro->flags & CF_ZOMBIE)
1622 return 0; 1755 return;
1623 1756
1624 if (coro->on_destroy && !PL_dirty)
1625 coro->on_destroy (aTHX_ coro); 1757 slf_destroy (aTHX_ coro);
1626 1758
1627 coro->flags |= CF_DESTROYED; 1759 coro->flags |= CF_ZOMBIE;
1628 1760
1629 if (coro->flags & CF_READY) 1761 if (coro->flags & CF_READY)
1630 { 1762 {
1631 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1763 /* reduce nready, as destroying a ready coro effectively unreadies it */
1632 /* alternative: look through all ready queues and remove the coro */ 1764 /* alternative: look through all ready queues and remove the coro */
1633 --coro_nready; 1765 --coro_nready;
1634 } 1766 }
1635 else 1767 else
1636 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1768 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1769
1770 if (coro->next) coro->next->prev = coro->prev;
1771 if (coro->prev) coro->prev->next = coro->next;
1772 if (coro == coro_first) coro_first = coro->next;
1637 1773
1638 if (coro->mainstack 1774 if (coro->mainstack
1639 && coro->mainstack != main_mainstack 1775 && coro->mainstack != main_mainstack
1640 && coro->slot 1776 && coro->slot
1641 && !PL_dirty) 1777 && !PL_dirty)
1642 destroy_perl (aTHX_ coro); 1778 destroy_perl (aTHX_ coro);
1643 1779
1644 if (coro->next) coro->next->prev = coro->prev;
1645 if (coro->prev) coro->prev->next = coro->next;
1646 if (coro == coro_first) coro_first = coro->next;
1647
1648 cctx_destroy (coro->cctx); 1780 cctx_destroy (coro->cctx);
1649 SvREFCNT_dec (coro->startcv); 1781 SvREFCNT_dec (coro->startcv);
1650 SvREFCNT_dec (coro->args); 1782 SvREFCNT_dec (coro->args);
1651 SvREFCNT_dec (coro->swap_sv); 1783 SvREFCNT_dec (coro->swap_sv);
1652 SvREFCNT_dec (CORO_THROW); 1784 SvREFCNT_dec (CORO_THROW);
1653 1785
1654 return 1; 1786 coro_call_on_destroy (aTHX_ coro);
1787
1788 /* more destruction mayhem in coro_state_free */
1655} 1789}
1656 1790
1657static int 1791static int
1658coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1792coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1659{ 1793{
1660 struct coro *coro = (struct coro *)mg->mg_ptr; 1794 struct coro *coro = (struct coro *)mg->mg_ptr;
1661 mg->mg_ptr = 0; 1795 mg->mg_ptr = 0;
1662 1796
1663 coro->hv = 0;
1664
1665 if (--coro->refcnt < 0)
1666 {
1667 coro_state_destroy (aTHX_ coro); 1797 coro_state_destroy (aTHX_ coro);
1798 SvREFCNT_dec (coro->on_destroy);
1799 SvREFCNT_dec (coro->status);
1800
1668 Safefree (coro); 1801 Safefree (coro);
1669 }
1670 1802
1671 return 0; 1803 return 0;
1672} 1804}
1673 1805
1674static int 1806static int ecb_cold
1675coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1807coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1676{ 1808{
1677 struct coro *coro = (struct coro *)mg->mg_ptr; 1809 /* called when perl clones the current process the slow way (windows process emulation) */
1678 1810 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1679 ++coro->refcnt; 1811 mg->mg_ptr = 0;
1812 mg->mg_virtual = 0;
1680 1813
1681 return 0; 1814 return 0;
1682} 1815}
1683 1816
1684static MGVTBL coro_state_vtbl = { 1817static MGVTBL coro_state_vtbl = {
… …
1709 TRANSFER (ta, 1); 1842 TRANSFER (ta, 1);
1710} 1843}
1711 1844
1712/** Coro ********************************************************************/ 1845/** Coro ********************************************************************/
1713 1846
1714INLINE void 1847ecb_inline void
1715coro_enq (pTHX_ struct coro *coro) 1848coro_enq (pTHX_ struct coro *coro)
1716{ 1849{
1717 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1850 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1718 1851
1719 SvREFCNT_inc_NN (coro->hv); 1852 SvREFCNT_inc_NN (coro->hv);
… …
1721 coro->next_ready = 0; 1854 coro->next_ready = 0;
1722 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1855 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1723 ready [1] = coro; 1856 ready [1] = coro;
1724} 1857}
1725 1858
1726INLINE struct coro * 1859ecb_inline struct coro *
1727coro_deq (pTHX) 1860coro_deq (pTHX)
1728{ 1861{
1729 int prio; 1862 int prio;
1730 1863
1731 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1864 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1784{ 1917{
1785 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1918 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1786} 1919}
1787 1920
1788/* expects to own a reference to next->hv */ 1921/* expects to own a reference to next->hv */
1789INLINE void 1922ecb_inline void
1790prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1923prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1791{ 1924{
1792 SV *prev_sv = SvRV (coro_current); 1925 SV *prev_sv = SvRV (coro_current);
1793 1926
1794 ta->prev = SvSTATE_hv (prev_sv); 1927 ta->prev = SvSTATE_hv (prev_sv);
… …
1807{ 1940{
1808 for (;;) 1941 for (;;)
1809 { 1942 {
1810 struct coro *next = coro_deq (aTHX); 1943 struct coro *next = coro_deq (aTHX);
1811 1944
1812 if (expect_true (next)) 1945 if (ecb_expect_true (next))
1813 { 1946 {
1814 /* cannot transfer to destroyed coros, skip and look for next */ 1947 /* cannot transfer to destroyed coros, skip and look for next */
1815 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1948 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1816 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1949 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1817 else 1950 else
1818 { 1951 {
1819 next->flags &= ~CF_READY; 1952 next->flags &= ~CF_READY;
1820 --coro_nready; 1953 --coro_nready;
… …
1828 /* nothing to schedule: call the idle handler */ 1961 /* nothing to schedule: call the idle handler */
1829 if (SvROK (sv_idle) 1962 if (SvROK (sv_idle)
1830 && SvOBJECT (SvRV (sv_idle))) 1963 && SvOBJECT (SvRV (sv_idle)))
1831 { 1964 {
1832 if (SvRV (sv_idle) == SvRV (coro_current)) 1965 if (SvRV (sv_idle) == SvRV (coro_current))
1966 {
1967 require_pv ("Carp");
1968
1969 {
1970 dSP;
1971
1972 ENTER;
1973 SAVETMPS;
1974
1975 PUSHMARK (SP);
1833 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1976 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1977 PUTBACK;
1978 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1979
1980 FREETMPS;
1981 LEAVE;
1982 }
1983 }
1834 1984
1835 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1985 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1836 api_ready (aTHX_ SvRV (sv_idle)); 1986 api_ready (aTHX_ SvRV (sv_idle));
1837 --coro_nready; 1987 --coro_nready;
1838 } 1988 }
… …
1853 } 2003 }
1854 } 2004 }
1855 } 2005 }
1856} 2006}
1857 2007
1858INLINE void 2008ecb_inline void
1859prepare_cede (pTHX_ struct coro_transfer_args *ta) 2009prepare_cede (pTHX_ struct coro_transfer_args *ta)
1860{ 2010{
1861 api_ready (aTHX_ coro_current); 2011 api_ready (aTHX_ coro_current);
1862 prepare_schedule (aTHX_ ta); 2012 prepare_schedule (aTHX_ ta);
1863} 2013}
1864 2014
1865INLINE void 2015ecb_inline void
1866prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2016prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1867{ 2017{
1868 SV *prev = SvRV (coro_current); 2018 SV *prev = SvRV (coro_current);
1869 2019
1870 if (coro_nready) 2020 if (coro_nready)
… …
1900{ 2050{
1901 struct coro_transfer_args ta; 2051 struct coro_transfer_args ta;
1902 2052
1903 prepare_cede (aTHX_ &ta); 2053 prepare_cede (aTHX_ &ta);
1904 2054
1905 if (expect_true (ta.prev != ta.next)) 2055 if (ecb_expect_true (ta.prev != ta.next))
1906 { 2056 {
1907 TRANSFER (ta, 1); 2057 TRANSFER (ta, 1);
1908 return 1; 2058 return 1;
1909 } 2059 }
1910 else 2060 else
… …
1953 coro->slot->runops = RUNOPS_DEFAULT; 2103 coro->slot->runops = RUNOPS_DEFAULT;
1954 } 2104 }
1955} 2105}
1956 2106
1957static void 2107static void
2108coro_push_av (pTHX_ AV *av, I32 gimme_v)
2109{
2110 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2111 {
2112 dSP;
2113
2114 if (gimme_v == G_SCALAR)
2115 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2116 else
2117 {
2118 int i;
2119 EXTEND (SP, AvFILLp (av) + 1);
2120
2121 for (i = 0; i <= AvFILLp (av); ++i)
2122 PUSHs (AvARRAY (av)[i]);
2123 }
2124
2125 PUTBACK;
2126 }
2127}
2128
2129static void
2130coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2131{
2132 if (!coro->on_destroy)
2133 coro->on_destroy = newAV ();
2134
2135 av_push (coro->on_destroy, cb);
2136}
2137
2138static void
2139slf_destroy_join (pTHX_ struct CoroSLF *frame)
2140{
2141 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2142}
2143
2144static int
2145slf_check_join (pTHX_ struct CoroSLF *frame)
2146{
2147 struct coro *coro = (struct coro *)frame->data;
2148
2149 if (!coro->status)
2150 return 1;
2151
2152 frame->destroy = 0;
2153
2154 coro_push_av (aTHX_ coro->status, GIMME_V);
2155
2156 SvREFCNT_dec ((SV *)coro->hv);
2157
2158 return 0;
2159}
2160
2161static void
2162slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2163{
2164 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2165
2166 if (items > 1)
2167 croak ("join called with too many arguments");
2168
2169 if (coro->status)
2170 frame->prepare = prepare_nop;
2171 else
2172 {
2173 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2174 frame->prepare = prepare_schedule;
2175 }
2176
2177 frame->check = slf_check_join;
2178 frame->destroy = slf_destroy_join;
2179 frame->data = (void *)coro;
2180 SvREFCNT_inc (coro->hv);
2181}
2182
2183static void
1958coro_call_on_destroy (pTHX_ struct coro *coro) 2184coro_call_on_destroy (pTHX_ struct coro *coro)
1959{ 2185{
1960 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2186 AV *od = coro->on_destroy;
1961 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1962 2187
1963 if (on_destroyp) 2188 if (!od)
1964 { 2189 return;
1965 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1966 2190
2191 coro->on_destroy = 0;
2192 sv_2mortal ((SV *)od);
2193
1967 while (AvFILLp (on_destroy) >= 0) 2194 while (AvFILLp (od) >= 0)
2195 {
2196 SV *cb = sv_2mortal (av_pop (od));
2197
2198 /* coro hv's (and only hv's at the moment) are supported as well */
2199 if (SvSTATEhv_p (aTHX_ cb))
2200 api_ready (aTHX_ cb);
2201 else
1968 { 2202 {
1969 dSP; /* don't disturb outer sp */ 2203 dSP; /* don't disturb outer sp */
1970 SV *cb = av_pop (on_destroy);
1971
1972 PUSHMARK (SP); 2204 PUSHMARK (SP);
1973 2205
1974 if (statusp) 2206 if (coro->status)
1975 { 2207 {
1976 int i; 2208 PUTBACK;
1977 AV *status = (AV *)SvRV (*statusp); 2209 coro_push_av (aTHX_ coro->status, G_ARRAY);
1978 EXTEND (SP, AvFILLp (status) + 1); 2210 SPAGAIN;
1979
1980 for (i = 0; i <= AvFILLp (status); ++i)
1981 PUSHs (AvARRAY (status)[i]);
1982 } 2211 }
1983 2212
1984 PUTBACK; 2213 PUTBACK;
1985 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2214 call_sv (cb, G_VOID | G_DISCARD);
1986 } 2215 }
1987 } 2216 }
1988} 2217}
1989 2218
1990static void 2219static void
1991slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2220coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1992{ 2221{
1993 int i; 2222 AV *av;
1994 HV *hv = (HV *)SvRV (coro_current); 2223
1995 AV *av = newAV (); 2224 if (coro->status)
2225 {
2226 av = coro->status;
2227 av_clear (av);
2228 }
2229 else
2230 av = coro->status = newAV ();
1996 2231
1997 /* items are actually not so common, so optimise for this case */ 2232 /* items are actually not so common, so optimise for this case */
1998 if (items) 2233 if (items)
1999 { 2234 {
2235 int i;
2236
2000 av_extend (av, items - 1); 2237 av_extend (av, items - 1);
2001 2238
2002 for (i = 0; i < items; ++i) 2239 for (i = 0; i < items; ++i)
2003 av_push (av, SvREFCNT_inc_NN (arg [i])); 2240 av_push (av, SvREFCNT_inc_NN (arg [i]));
2004 } 2241 }
2242}
2005 2243
2006 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2244static void
2007 2245slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2246{
2008 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2247 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2009 api_ready (aTHX_ sv_manager); 2248 api_ready (aTHX_ sv_manager);
2010 2249
2011 frame->prepare = prepare_schedule; 2250 frame->prepare = prepare_schedule;
2012 frame->check = slf_check_repeat; 2251 frame->check = slf_check_repeat;
2013 2252
2014 /* as a minor optimisation, we could unwind all stacks here */ 2253 /* as a minor optimisation, we could unwind all stacks here */
2015 /* but that puts extra pressure on pp_slf, and is not worth much */ 2254 /* but that puts extra pressure on pp_slf, and is not worth much */
2016 /*coro_unwind_stacks (aTHX);*/ 2255 /*coro_unwind_stacks (aTHX);*/
2256}
2257
2258static void
2259slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2260{
2261 HV *coro_hv = (HV *)SvRV (coro_current);
2262
2263 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2264 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2265}
2266
2267static void
2268slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2269{
2270 HV *coro_hv;
2271 struct coro *coro;
2272
2273 if (items <= 0)
2274 croak ("Coro::cancel called without coro object,");
2275
2276 coro = SvSTATE (arg [0]);
2277 coro_hv = coro->hv;
2278
2279 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2280
2281 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2282 {
2283 /* coro currently busy cancelling something, so just notify it */
2284 coro->slf_frame.data = (void *)coro;
2285
2286 frame->prepare = prepare_nop;
2287 frame->check = slf_check_nop;
2288 }
2289 else if (coro_hv == (HV *)SvRV (coro_current))
2290 {
2291 /* cancelling the current coro is allowed, and equals terminate */
2292 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2293 }
2294 else
2295 {
2296 struct coro *self = SvSTATE_current;
2297
2298 if (!self)
2299 croak ("Coro::cancel called outside of thread content,");
2300
2301 /* otherwise we cancel directly, purely for speed reasons
2302 * unfortunately, this requires some magic trickery, as
2303 * somebody else could cancel us, so we have to fight the cancellation.
2304 * this is ugly, and hopefully fully worth the extra speed.
2305 * besides, I can't get the slow-but-safe version working...
2306 */
2307 slf_frame.data = 0;
2308 self->flags |= CF_NOCANCEL;
2309 coro_state_destroy (aTHX_ coro);
2310 self->flags &= ~CF_NOCANCEL;
2311
2312 if (slf_frame.data)
2313 {
2314 /* while we were busy we have been cancelled, so terminate */
2315 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2316 }
2317 else
2318 {
2319 frame->prepare = prepare_nop;
2320 frame->check = slf_check_nop;
2321 }
2322 }
2323}
2324
2325static int
2326slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2327{
2328 frame->prepare = 0;
2329 coro_unwind_stacks (aTHX);
2330
2331 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2332
2333 return 1;
2334}
2335
2336static int
2337safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2338{
2339 if (coro->cctx)
2340 croak ("coro inside C callback, unable to cancel at this time, caught");
2341
2342 if (coro->flags & CF_NEW)
2343 {
2344 coro_set_status (aTHX_ coro, arg, items);
2345 coro_state_destroy (aTHX_ coro);
2346 }
2347 else
2348 {
2349 if (!coro->slf_frame.prepare)
2350 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2351
2352 slf_destroy (aTHX_ coro);
2353
2354 coro_set_status (aTHX_ coro, arg, items);
2355 coro->slf_frame.prepare = prepare_nop;
2356 coro->slf_frame.check = slf_check_safe_cancel;
2357
2358 api_ready (aTHX_ (SV *)coro->hv);
2359 }
2360
2361 return 1;
2017} 2362}
2018 2363
2019/*****************************************************************************/ 2364/*****************************************************************************/
2020/* async pool handler */ 2365/* async pool handler */
2021 2366
… …
2052slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2397slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2053{ 2398{
2054 HV *hv = (HV *)SvRV (coro_current); 2399 HV *hv = (HV *)SvRV (coro_current);
2055 struct coro *coro = SvSTATE_hv ((SV *)hv); 2400 struct coro *coro = SvSTATE_hv ((SV *)hv);
2056 2401
2057 if (expect_true (coro->saved_deffh)) 2402 if (ecb_expect_true (coro->saved_deffh))
2058 { 2403 {
2059 /* subsequent iteration */ 2404 /* subsequent iteration */
2060 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2405 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2061 coro->saved_deffh = 0; 2406 coro->saved_deffh = 0;
2062 2407
2063 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2408 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2064 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2409 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2065 { 2410 {
2066 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2411 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2067 coro->invoke_av = newAV (); 2412 return;
2068
2069 frame->prepare = prepare_nop;
2070 } 2413 }
2071 else 2414 else
2072 { 2415 {
2073 av_clear (GvAV (PL_defgv)); 2416 av_clear (GvAV (PL_defgv));
2074 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2417 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2124 2467
2125static int 2468static int
2126slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2469slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2127{ 2470{
2128 SV *data = (SV *)frame->data; 2471 SV *data = (SV *)frame->data;
2129 2472
2130 if (CORO_THROW) 2473 if (CORO_THROW)
2131 return 0; 2474 return 0;
2132 2475
2133 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2476 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2134 return 1; 2477 return 1;
… …
2170 cb = sv_2mortal (coro->rouse_cb); 2513 cb = sv_2mortal (coro->rouse_cb);
2171 coro->rouse_cb = 0; 2514 coro->rouse_cb = 0;
2172 } 2515 }
2173 2516
2174 if (!SvROK (cb) 2517 if (!SvROK (cb)
2175 || SvTYPE (SvRV (cb)) != SVt_PVCV 2518 || SvTYPE (SvRV (cb)) != SVt_PVCV
2176 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2519 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2177 croak ("Coro::rouse_wait called with illegal callback argument,"); 2520 croak ("Coro::rouse_wait called with illegal callback argument,");
2178 2521
2179 { 2522 {
2180 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2523 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2297static void 2640static void
2298slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2641slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2299{ 2642{
2300 frame->prepare = prepare_cede_notself; 2643 frame->prepare = prepare_cede_notself;
2301 frame->check = slf_check_nop; 2644 frame->check = slf_check_nop;
2645}
2646
2647/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2648static void
2649slf_destroy (pTHX_ struct coro *coro)
2650{
2651 struct CoroSLF frame = coro->slf_frame;
2652
2653 /*
2654 * The on_destroy below most likely is from an SLF call.
2655 * Since by definition the SLF call will not finish when we destroy
2656 * the coro, we will have to force-finish it here, otherwise
2657 * cleanup functions cannot call SLF functions.
2658 */
2659 coro->slf_frame.prepare = 0;
2660
2661 /* this callback is reserved for slf functions needing to do cleanup */
2662 if (frame.destroy && frame.prepare && !PL_dirty)
2663 frame.destroy (aTHX_ &frame);
2302} 2664}
2303 2665
2304/* 2666/*
2305 * these not obviously related functions are all rolled into one 2667 * these not obviously related functions are all rolled into one
2306 * function to increase chances that they all will call transfer with the same 2668 * function to increase chances that they all will call transfer with the same
… …
2313 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2675 I32 checkmark; /* mark SP to see how many elements check has pushed */
2314 2676
2315 /* set up the slf frame, unless it has already been set-up */ 2677 /* set up the slf frame, unless it has already been set-up */
2316 /* the latter happens when a new coro has been started */ 2678 /* the latter happens when a new coro has been started */
2317 /* or when a new cctx was attached to an existing coroutine */ 2679 /* or when a new cctx was attached to an existing coroutine */
2318 if (expect_true (!slf_frame.prepare)) 2680 if (ecb_expect_true (!slf_frame.prepare))
2319 { 2681 {
2320 /* first iteration */ 2682 /* first iteration */
2321 dSP; 2683 dSP;
2322 SV **arg = PL_stack_base + TOPMARK + 1; 2684 SV **arg = PL_stack_base + TOPMARK + 1;
2323 int items = SP - arg; /* args without function object */ 2685 int items = SP - arg; /* args without function object */
… …
2364 while (slf_frame.check (aTHX_ &slf_frame)); 2726 while (slf_frame.check (aTHX_ &slf_frame));
2365 2727
2366 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2728 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2367 2729
2368 /* exception handling */ 2730 /* exception handling */
2369 if (expect_false (CORO_THROW)) 2731 if (ecb_expect_false (CORO_THROW))
2370 { 2732 {
2371 SV *exception = sv_2mortal (CORO_THROW); 2733 SV *exception = sv_2mortal (CORO_THROW);
2372 2734
2373 CORO_THROW = 0; 2735 CORO_THROW = 0;
2374 sv_setsv (ERRSV, exception); 2736 sv_setsv (ERRSV, exception);
2375 croak (0); 2737 croak (0);
2376 } 2738 }
2377 2739
2378 /* return value handling - mostly like entersub */ 2740 /* return value handling - mostly like entersub */
2379 /* make sure we put something on the stack in scalar context */ 2741 /* make sure we put something on the stack in scalar context */
2380 if (GIMME_V == G_SCALAR) 2742 if (GIMME_V == G_SCALAR
2743 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2381 { 2744 {
2382 dSP; 2745 dSP;
2383 SV **bot = PL_stack_base + checkmark; 2746 SV **bot = PL_stack_base + checkmark;
2384 2747
2385 if (sp == bot) /* too few, push undef */ 2748 if (sp == bot) /* too few, push undef */
2386 bot [1] = &PL_sv_undef; 2749 bot [1] = &PL_sv_undef;
2387 else if (sp != bot + 1) /* too many, take last one */ 2750 else /* too many, take last one */
2388 bot [1] = *sp; 2751 bot [1] = *sp;
2389 2752
2390 SP = bot + 1; 2753 SP = bot + 1;
2391 2754
2392 PUTBACK; 2755 PUTBACK;
… …
2490{ 2853{
2491 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2854 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2492 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2855 on_enterleave_call (aTHX_ sv_2mortal (cb));
2493} 2856}
2494 2857
2858static void
2859enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2860{
2861 if (!hook)
2862 return;
2863
2864 if (!*avp)
2865 {
2866 *avp = newAV ();
2867 AvREAL_off (*avp);
2868 }
2869
2870 av_push (*avp, (SV *)hook);
2871 av_push (*avp, (SV *)arg);
2872}
2873
2874static void
2875enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2876{
2877 AV *av = *avp;
2878 int i;
2879
2880 if (!av)
2881 return;
2882
2883 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2884 if (AvARRAY (av)[i] == (SV *)hook)
2885 {
2886 if (execute)
2887 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2888
2889 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2890 av_pop (av);
2891 av_pop (av);
2892 break;
2893 }
2894
2895 if (AvFILLp (av) >= 0)
2896 {
2897 *avp = 0;
2898 SvREFCNT_dec_NN (av);
2899 }
2900}
2901
2902static void
2903api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2904{
2905 struct coro *coro = SvSTATE (coro_sv);
2906
2907 if (SvSTATE_current == coro)
2908 if (enter)
2909 enter (aTHX_ enter_arg);
2910
2911 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2912 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2913}
2914
2915static void
2916api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2917{
2918 struct coro *coro = SvSTATE (coro_sv);
2919
2920 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2921 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2922}
2923
2924static void
2925savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2926{
2927 struct coro *coro = SvSTATE_current;
2928
2929 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2930}
2931
2932static void
2933savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2934{
2935 struct coro *coro = SvSTATE_current;
2936
2937 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2938}
2939
2940static void
2941api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2942{
2943 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2944
2945 /* this ought to be much cheaper than malloc + a single destructor call */
2946 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2947 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2948}
2949
2495/*****************************************************************************/ 2950/*****************************************************************************/
2496/* PerlIO::cede */ 2951/* PerlIO::cede */
2497 2952
2498typedef struct 2953typedef struct
2499{ 2954{
2500 PerlIOBuf base; 2955 PerlIOBuf base;
2501 NV next, every; 2956 NV next, every;
2502} PerlIOCede; 2957} PerlIOCede;
2503 2958
2504static IV 2959static IV ecb_cold
2505PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2960PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2506{ 2961{
2507 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2962 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2508 2963
2509 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2964 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2510 self->next = nvtime () + self->every; 2965 self->next = nvtime () + self->every;
2511 2966
2512 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2967 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2513} 2968}
2514 2969
2515static SV * 2970static SV * ecb_cold
2516PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2971PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2517{ 2972{
2518 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2973 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2519 2974
2520 return newSVnv (self->every); 2975 return newSVnv (self->every);
… …
2627 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3082 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2628 PUTBACK; 3083 PUTBACK;
2629 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3084 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2630 } 3085 }
2631 3086
2632 SvREFCNT_dec (cb); 3087 SvREFCNT_dec_NN (cb);
2633 } 3088 }
2634} 3089}
2635 3090
2636static void 3091static void
2637coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3092coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2638{ 3093{
2639 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3094 /* call $sem->adjust (0) to possibly wake up some other waiters */
2640 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3095 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2641} 3096}
2642 3097
2643static int 3098static int
2644slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3099slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2645{ 3100{
2646 AV *av = (AV *)frame->data; 3101 AV *av = (AV *)frame->data;
2647 SV *count_sv = AvARRAY (av)[0]; 3102 SV *count_sv = AvARRAY (av)[0];
3103 SV *coro_hv = SvRV (coro_current);
3104
3105 frame->destroy = 0;
2648 3106
2649 /* if we are about to throw, don't actually acquire the lock, just throw */ 3107 /* if we are about to throw, don't actually acquire the lock, just throw */
2650 if (CORO_THROW) 3108 if (ecb_expect_false (CORO_THROW))
3109 {
3110 /* we still might be responsible for the semaphore, so wake up others */
3111 coro_semaphore_adjust (aTHX_ av, 0);
3112
2651 return 0; 3113 return 0;
3114 }
2652 else if (SvIVX (count_sv) > 0) 3115 else if (SvIVX (count_sv) > 0)
2653 { 3116 {
2654 SvSTATE_current->on_destroy = 0;
2655
2656 if (acquire) 3117 if (acquire)
2657 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3118 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2658 else 3119 else
2659 coro_semaphore_adjust (aTHX_ av, 0); 3120 coro_semaphore_adjust (aTHX_ av, 0);
2660 3121
… …
2664 { 3125 {
2665 int i; 3126 int i;
2666 /* if we were woken up but can't down, we look through the whole */ 3127 /* if we were woken up but can't down, we look through the whole */
2667 /* waiters list and only add us if we aren't in there already */ 3128 /* waiters list and only add us if we aren't in there already */
2668 /* this avoids some degenerate memory usage cases */ 3129 /* this avoids some degenerate memory usage cases */
2669 3130 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2670 for (i = 1; i <= AvFILLp (av); ++i)
2671 if (AvARRAY (av)[i] == SvRV (coro_current)) 3131 if (AvARRAY (av)[i] == coro_hv)
2672 return 1; 3132 return 1;
2673 3133
2674 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3134 av_push (av, SvREFCNT_inc (coro_hv));
2675 return 1; 3135 return 1;
2676 } 3136 }
2677} 3137}
2678 3138
2679static int 3139static int
… …
2702 { 3162 {
2703 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3163 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2704 3164
2705 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3165 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2706 frame->prepare = prepare_schedule; 3166 frame->prepare = prepare_schedule;
2707
2708 /* to avoid race conditions when a woken-up coro gets terminated */ 3167 /* to avoid race conditions when a woken-up coro gets terminated */
2709 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3168 /* we arrange for a temporary on_destroy that calls adjust (0) */
2710 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3169 frame->destroy = coro_semaphore_destroy;
2711 } 3170 }
2712} 3171}
2713 3172
2714static void 3173static void
2715slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3174slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2773 { 3232 {
2774 api_ready (aTHX_ cb); 3233 api_ready (aTHX_ cb);
2775 sv_setiv (cb, 0); /* signal waiter */ 3234 sv_setiv (cb, 0); /* signal waiter */
2776 } 3235 }
2777 3236
2778 SvREFCNT_dec (cb); 3237 SvREFCNT_dec_NN (cb);
2779 3238
2780 --count; 3239 --count;
2781 } 3240 }
2782} 3241}
2783 3242
… …
2868 } 3327 }
2869 3328
2870 av_push (state, data_sv); 3329 av_push (state, data_sv);
2871 3330
2872 api_ready (aTHX_ coro); 3331 api_ready (aTHX_ coro);
2873 SvREFCNT_dec (coro); 3332 SvREFCNT_dec_NN (coro);
2874 SvREFCNT_dec ((AV *)state); 3333 SvREFCNT_dec_NN ((AV *)state);
2875} 3334}
2876 3335
2877static int 3336static int
2878slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3337slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2879{ 3338{
… …
2884 /* it quickly returns */ 3343 /* it quickly returns */
2885 if (CORO_THROW) 3344 if (CORO_THROW)
2886 return 0; 3345 return 0;
2887 3346
2888 /* one element that is an RV? repeat! */ 3347 /* one element that is an RV? repeat! */
2889 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3348 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2890 return 1; 3349 return 1;
2891 3350
2892 /* restore status */ 3351 /* restore status */
2893 { 3352 {
2894 SV *data_sv = av_pop (state); 3353 SV *data_sv = av_pop (state);
… …
2897 errno = data->errorno; 3356 errno = data->errorno;
2898 PL_laststype = data->laststype; 3357 PL_laststype = data->laststype;
2899 PL_laststatval = data->laststatval; 3358 PL_laststatval = data->laststatval;
2900 PL_statcache = data->statcache; 3359 PL_statcache = data->statcache;
2901 3360
2902 SvREFCNT_dec (data_sv); 3361 SvREFCNT_dec_NN (data_sv);
2903 } 3362 }
2904 3363
2905 /* push result values */ 3364 /* push result values */
2906 { 3365 {
2907 dSP; 3366 dSP;
… …
2933 dSP; 3392 dSP;
2934 3393
2935 static SV *prio_cv; 3394 static SV *prio_cv;
2936 static SV *prio_sv; 3395 static SV *prio_sv;
2937 3396
2938 if (expect_false (!prio_cv)) 3397 if (ecb_expect_false (!prio_cv))
2939 { 3398 {
2940 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3399 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2941 prio_sv = newSViv (0); 3400 prio_sv = newSViv (0);
2942 } 3401 }
2943 3402
… …
3049 } 3508 }
3050 3509
3051 return coro_sv; 3510 return coro_sv;
3052} 3511}
3053 3512
3513#ifndef __cplusplus
3514ecb_cold XS(boot_Coro__State);
3515#endif
3516
3517#if CORO_JIT
3518
3519static void ecb_noinline ecb_cold
3520pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3521{
3522 dSP;
3523 AV *av = newAV ();
3524
3525 av_store (av, 3, newSVuv (d));
3526 av_store (av, 2, newSVuv (c));
3527 av_store (av, 1, newSVuv (b));
3528 av_store (av, 0, newSVuv (a));
3529
3530 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3531
3532 PUTBACK;
3533}
3534
3535static void ecb_noinline ecb_cold
3536jit_init (pTHX)
3537{
3538 dSP;
3539 SV *load, *save;
3540 char *map_base;
3541 char *load_ptr, *save_ptr;
3542 STRLEN load_len, save_len, map_len;
3543 int count;
3544
3545 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3546
3547 PUSHMARK (SP);
3548 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3549 #include "state.h"
3550 count = call_pv ("Coro::State::_jit", G_ARRAY);
3551 SPAGAIN;
3552
3553 save = POPs; save_ptr = SvPVbyte (save, save_len);
3554 load = POPs; load_ptr = SvPVbyte (load, load_len);
3555
3556 map_len = load_len + save_len + 16;
3557
3558 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3559
3560 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3561
3562 load_perl_slots = (load_save_perl_slots_type)map_base;
3563 memcpy (map_base, load_ptr, load_len);
3564
3565 map_base += (load_len + 15) & ~15;
3566
3567 save_perl_slots = (load_save_perl_slots_type)map_base;
3568 memcpy (map_base, save_ptr, save_len);
3569
3570 /* we are good citizens and try to make the page read-only, so the evil evil */
3571 /* hackers might have it a bit more difficult */
3572 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3573
3574 PUTBACK;
3575 eval_pv ("undef &Coro::State::_jit", 1);
3576}
3577
3578#endif
3579
3054MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3580MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3055 3581
3056PROTOTYPES: DISABLE 3582PROTOTYPES: DISABLE
3057 3583
3058BOOT: 3584BOOT:
3059{ 3585{
3586#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3587#include "state.h"
3060#ifdef USE_ITHREADS 3588#ifdef USE_ITHREADS
3061# if CORO_PTHREAD 3589# if CORO_PTHREAD
3062 coro_thx = PERL_GET_CONTEXT; 3590 coro_thx = PERL_GET_CONTEXT;
3063# endif 3591# endif
3064#endif 3592#endif
3065 BOOT_PAGESIZE; 3593 /* perl defines these to check for existance first, but why it doesn't */
3594 /* just create them one at init time is not clear to me, except for */
3595 /* programs trying to delete them, but... */
3596 /* anyway, we declare this as invalid and make sure they are initialised here */
3597 DEFSV;
3598 ERRSV;
3066 3599
3067 cctx_current = cctx_new_empty (); 3600 cctx_current = cctx_new_empty ();
3068 3601
3069 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3602 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3070 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3603 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3110 coroapi.prepare_nop = prepare_nop; 3643 coroapi.prepare_nop = prepare_nop;
3111 coroapi.prepare_schedule = prepare_schedule; 3644 coroapi.prepare_schedule = prepare_schedule;
3112 coroapi.prepare_cede = prepare_cede; 3645 coroapi.prepare_cede = prepare_cede;
3113 coroapi.prepare_cede_notself = prepare_cede_notself; 3646 coroapi.prepare_cede_notself = prepare_cede_notself;
3114 3647
3115 { 3648 time_init (aTHX);
3116 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3117
3118 if (!svp) croak ("Time::HiRes is required");
3119 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3120
3121 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3122
3123 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3124 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3125 }
3126 3649
3127 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3650 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3651#if CORO_JIT
3652 PUTBACK;
3653 jit_init (aTHX);
3654 SPAGAIN;
3655#endif
3128} 3656}
3129 3657
3130SV * 3658SV *
3131new (SV *klass, ...) 3659new (SV *klass, ...)
3132 ALIAS: 3660 ALIAS:
… …
3139void 3667void
3140transfer (...) 3668transfer (...)
3141 PROTOTYPE: $$ 3669 PROTOTYPE: $$
3142 CODE: 3670 CODE:
3143 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3671 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3144
3145bool
3146_destroy (SV *coro_sv)
3147 CODE:
3148 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3149 OUTPUT:
3150 RETVAL
3151
3152void
3153_exit (int code)
3154 PROTOTYPE: $
3155 CODE:
3156 _exit (code);
3157 3672
3158SV * 3673SV *
3159clone (Coro::State coro) 3674clone (Coro::State coro)
3160 CODE: 3675 CODE:
3161{ 3676{
… …
3216void 3731void
3217list () 3732list ()
3218 PROTOTYPE: 3733 PROTOTYPE:
3219 PPCODE: 3734 PPCODE:
3220{ 3735{
3221 struct coro *coro; 3736 struct coro *coro;
3222 for (coro = coro_first; coro; coro = coro->next) 3737 for (coro = coro_first; coro; coro = coro->next)
3223 if (coro->hv) 3738 if (coro->hv)
3224 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3739 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3225} 3740}
3226 3741
… …
3231 CODE: 3746 CODE:
3232{ 3747{
3233 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3748 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3234 { 3749 {
3235 struct coro *current = SvSTATE_current; 3750 struct coro *current = SvSTATE_current;
3751 struct CoroSLF slf_save;
3236 3752
3237 if (current != coro) 3753 if (current != coro)
3238 { 3754 {
3239 PUTBACK; 3755 PUTBACK;
3240 save_perl (aTHX_ current); 3756 save_perl (aTHX_ current);
3241 load_perl (aTHX_ coro); 3757 load_perl (aTHX_ coro);
3758 /* the coro is most likely in an active SLF call.
3759 * while not strictly required (the code we execute is
3760 * not allowed to call any SLF functions), it's cleaner
3761 * to reinitialise the slf_frame and restore it later.
3762 * This might one day allow us to actually do SLF calls
3763 * from code executed here.
3764 */
3765 slf_save = slf_frame;
3766 slf_frame.prepare = 0;
3242 SPAGAIN; 3767 SPAGAIN;
3243 } 3768 }
3244 3769
3245 PUSHSTACK; 3770 PUSHSTACK;
3246 3771
… …
3256 SPAGAIN; 3781 SPAGAIN;
3257 3782
3258 if (current != coro) 3783 if (current != coro)
3259 { 3784 {
3260 PUTBACK; 3785 PUTBACK;
3786 slf_frame = slf_save;
3261 save_perl (aTHX_ coro); 3787 save_perl (aTHX_ coro);
3262 load_perl (aTHX_ current); 3788 load_perl (aTHX_ current);
3263 SPAGAIN; 3789 SPAGAIN;
3264 } 3790 }
3265 } 3791 }
… …
3270 PROTOTYPE: $ 3796 PROTOTYPE: $
3271 ALIAS: 3797 ALIAS:
3272 is_ready = CF_READY 3798 is_ready = CF_READY
3273 is_running = CF_RUNNING 3799 is_running = CF_RUNNING
3274 is_new = CF_NEW 3800 is_new = CF_NEW
3275 is_destroyed = CF_DESTROYED 3801 is_destroyed = CF_ZOMBIE
3802 is_zombie = CF_ZOMBIE
3276 is_suspended = CF_SUSPENDED 3803 is_suspended = CF_SUSPENDED
3277 CODE: 3804 CODE:
3278 RETVAL = boolSV (coro->flags & ix); 3805 RETVAL = boolSV (coro->flags & ix);
3279 OUTPUT: 3806 OUTPUT:
3280 RETVAL 3807 RETVAL
3281 3808
3282void 3809void
3283throw (Coro::State self, SV *exception = &PL_sv_undef) 3810throw (SV *self, SV *exception = &PL_sv_undef)
3284 PROTOTYPE: $;$ 3811 PROTOTYPE: $;$
3285 CODE: 3812 CODE:
3286{ 3813{
3814 struct coro *coro = SvSTATE (self);
3287 struct coro *current = SvSTATE_current; 3815 struct coro *current = SvSTATE_current;
3288 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3816 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3289 SvREFCNT_dec (*exceptionp); 3817 SvREFCNT_dec (*exceptionp);
3290 SvGETMAGIC (exception); 3818 SvGETMAGIC (exception);
3291 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3819 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3820
3821 api_ready (aTHX_ self);
3292} 3822}
3293 3823
3294void 3824void
3295api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3825api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3296 PROTOTYPE: $;$ 3826 PROTOTYPE: $;$
… …
3351 3881
3352void 3882void
3353cancel (Coro::State self) 3883cancel (Coro::State self)
3354 CODE: 3884 CODE:
3355 coro_state_destroy (aTHX_ self); 3885 coro_state_destroy (aTHX_ self);
3356 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3357
3358 3886
3359SV * 3887SV *
3360enable_times (int enabled = enable_times) 3888enable_times (int enabled = enable_times)
3361 CODE: 3889 CODE:
3362{ 3890{
… …
3375 3903
3376void 3904void
3377times (Coro::State self) 3905times (Coro::State self)
3378 PPCODE: 3906 PPCODE:
3379{ 3907{
3380 struct coro *current = SvSTATE (coro_current); 3908 struct coro *current = SvSTATE (coro_current);
3381 3909
3382 if (expect_false (current == self)) 3910 if (ecb_expect_false (current == self))
3383 { 3911 {
3384 coro_times_update (); 3912 coro_times_update ();
3385 coro_times_add (SvSTATE (coro_current)); 3913 coro_times_add (SvSTATE (coro_current));
3386 } 3914 }
3387 3915
3388 EXTEND (SP, 2); 3916 EXTEND (SP, 2);
3389 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3917 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3390 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3918 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3391 3919
3392 if (expect_false (current == self)) 3920 if (ecb_expect_false (current == self))
3393 coro_times_sub (SvSTATE (coro_current)); 3921 coro_times_sub (SvSTATE (coro_current));
3394} 3922}
3395 3923
3396void 3924void
3397swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3925swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3415 3943
3416MODULE = Coro::State PACKAGE = Coro 3944MODULE = Coro::State PACKAGE = Coro
3417 3945
3418BOOT: 3946BOOT:
3419{ 3947{
3948 if (SVt_LAST > 32)
3949 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3950
3420 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3951 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3421 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3952 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3422 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3953 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3423 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3424 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3954 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3425 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3955 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3426 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3956 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3427 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3957 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3428 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3958 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3429 3959
3430 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3960 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3431 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3961 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3432 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3962 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3433 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3963 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3434 3964
3435 coro_stash = gv_stashpv ("Coro", TRUE); 3965 coro_stash = gv_stashpv ("Coro", TRUE);
3436 3966
3437 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3967 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3438 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3968 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3439 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3969 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3451 coroapi.ready = api_ready; 3981 coroapi.ready = api_ready;
3452 coroapi.is_ready = api_is_ready; 3982 coroapi.is_ready = api_is_ready;
3453 coroapi.nready = coro_nready; 3983 coroapi.nready = coro_nready;
3454 coroapi.current = coro_current; 3984 coroapi.current = coro_current;
3455 3985
3986 coroapi.enterleave_hook = api_enterleave_hook;
3987 coroapi.enterleave_unhook = api_enterleave_unhook;
3988 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3989
3456 /*GCoroAPI = &coroapi;*/ 3990 /*GCoroAPI = &coroapi;*/
3457 sv_setiv (sv, (IV)&coroapi); 3991 sv_setiv (sv, (IV)&coroapi);
3458 SvREADONLY_on (sv); 3992 SvREADONLY_on (sv);
3459 } 3993 }
3460} 3994}
… …
3467 api_ready (aTHX_ RETVAL); 4001 api_ready (aTHX_ RETVAL);
3468 OUTPUT: 4002 OUTPUT:
3469 RETVAL 4003 RETVAL
3470 4004
3471void 4005void
4006_destroy (Coro::State coro)
4007 CODE:
4008 /* used by the manager thread */
4009 coro_state_destroy (aTHX_ coro);
4010
4011void
4012on_destroy (Coro::State coro, SV *cb)
4013 CODE:
4014 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4015
4016void
4017join (...)
4018 CODE:
4019 CORO_EXECUTE_SLF_XS (slf_init_join);
4020
4021void
3472terminate (...) 4022terminate (...)
3473 CODE: 4023 CODE:
3474 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4024 CORO_EXECUTE_SLF_XS (slf_init_terminate);
4025
4026void
4027cancel (...)
4028 CODE:
4029 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4030
4031int
4032safe_cancel (Coro::State self, ...)
4033 C_ARGS: aTHX_ self, &ST (1), items - 1
3475 4034
3476void 4035void
3477schedule (...) 4036schedule (...)
3478 CODE: 4037 CODE:
3479 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4038 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3500 4059
3501void 4060void
3502_set_current (SV *current) 4061_set_current (SV *current)
3503 PROTOTYPE: $ 4062 PROTOTYPE: $
3504 CODE: 4063 CODE:
3505 SvREFCNT_dec (SvRV (coro_current)); 4064 SvREFCNT_dec_NN (SvRV (coro_current));
3506 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4065 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3507 4066
3508void 4067void
3509_set_readyhook (SV *hook) 4068_set_readyhook (SV *hook)
3510 PROTOTYPE: $ 4069 PROTOTYPE: $
… …
3594 4153
3595 if ((SV *)hv == &PL_sv_undef) 4154 if ((SV *)hv == &PL_sv_undef)
3596 { 4155 {
3597 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4156 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3598 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4157 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3599 SvREFCNT_dec (sv); 4158 SvREFCNT_dec_NN (sv);
3600 } 4159 }
3601 4160
3602 { 4161 {
3603 struct coro *coro = SvSTATE_hv (hv); 4162 struct coro *coro = SvSTATE_hv (hv);
3604 4163
… …
3611 api_ready (aTHX_ (SV *)hv); 4170 api_ready (aTHX_ (SV *)hv);
3612 4171
3613 if (GIMME_V != G_VOID) 4172 if (GIMME_V != G_VOID)
3614 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4173 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3615 else 4174 else
3616 SvREFCNT_dec (hv); 4175 SvREFCNT_dec_NN (hv);
3617} 4176}
3618 4177
3619SV * 4178SV *
3620rouse_cb () 4179rouse_cb ()
3621 PROTOTYPE: 4180 PROTOTYPE:
… …
3636 on_leave = 1 4195 on_leave = 1
3637 PROTOTYPE: & 4196 PROTOTYPE: &
3638 CODE: 4197 CODE:
3639{ 4198{
3640 struct coro *coro = SvSTATE_current; 4199 struct coro *coro = SvSTATE_current;
3641 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4200 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3642 4201
3643 block = s_get_cv_croak (block); 4202 block = s_get_cv_croak (block);
3644 4203
3645 if (!*avp) 4204 if (!*avp)
3646 *avp = newAV (); 4205 *avp = newAV ();
… …
3666 4225
3667SV * 4226SV *
3668new (SV *klass, SV *count = 0) 4227new (SV *klass, SV *count = 0)
3669 CODE: 4228 CODE:
3670{ 4229{
3671 int semcnt = 1; 4230 int semcnt = 1;
3672 4231
3673 if (count) 4232 if (count)
3674 { 4233 {
3675 SvGETMAGIC (count); 4234 SvGETMAGIC (count);
3676 4235
… …
3736 XSRETURN_NO; 4295 XSRETURN_NO;
3737} 4296}
3738 4297
3739void 4298void
3740waiters (SV *self) 4299waiters (SV *self)
3741 PPCODE: 4300 PPCODE:
3742{ 4301{
3743 AV *av = (AV *)SvRV (self); 4302 AV *av = (AV *)SvRV (self);
3744 int wcount = AvFILLp (av) + 1 - 1; 4303 int wcount = AvFILLp (av) + 1 - 1;
3745 4304
3746 if (GIMME_V == G_SCALAR) 4305 if (GIMME_V == G_SCALAR)
… …
3755} 4314}
3756 4315
3757MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4316MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3758 4317
3759void 4318void
3760_may_delete (SV *sem, int count, int extra_refs) 4319_may_delete (SV *sem, int count, unsigned int extra_refs)
3761 PPCODE: 4320 PPCODE:
3762{ 4321{
3763 AV *av = (AV *)SvRV (sem); 4322 AV *av = (AV *)SvRV (sem);
3764 4323
3765 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4324 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3766 && AvFILLp (av) == 0 /* no waiters, just count */ 4325 && AvFILLp (av) == 0 /* no waiters, just count */
3767 && SvIV (AvARRAY (av)[0]) == count) 4326 && SvIV (AvARRAY (av)[0]) == count)
3768 XSRETURN_YES; 4327 XSRETURN_YES;
… …
3789 4348
3790void 4349void
3791broadcast (SV *self) 4350broadcast (SV *self)
3792 CODE: 4351 CODE:
3793{ 4352{
3794 AV *av = (AV *)SvRV (self); 4353 AV *av = (AV *)SvRV (self);
3795 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4354 coro_signal_wake (aTHX_ av, AvFILLp (av));
3796} 4355}
3797 4356
3798void 4357void
3799send (SV *self) 4358send (SV *self)
… …
3807 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4366 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3808} 4367}
3809 4368
3810IV 4369IV
3811awaited (SV *self) 4370awaited (SV *self)
3812 CODE: 4371 CODE:
3813 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4372 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3814 OUTPUT: 4373 OUTPUT:
3815 RETVAL 4374 RETVAL
3816 4375
3817 4376
… …
3822 4381
3823void 4382void
3824_schedule (...) 4383_schedule (...)
3825 CODE: 4384 CODE:
3826{ 4385{
3827 static int incede; 4386 static int incede;
3828 4387
3829 api_cede_notself (aTHX); 4388 api_cede_notself (aTHX);
3830 4389
3831 ++incede; 4390 ++incede;
3832 while (coro_nready >= incede && api_cede (aTHX)) 4391 while (coro_nready >= incede && api_cede (aTHX))
… …
3876 { 4435 {
3877 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4436 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3878 coro_old_pp_sselect = 0; 4437 coro_old_pp_sselect = 0;
3879 } 4438 }
3880 4439
4440MODULE = Coro::State PACKAGE = Coro::Util
3881 4441
4442void
4443_exit (int code)
4444 CODE:
4445 _exit (code);
4446
4447NV
4448time ()
4449 CODE:
4450 RETVAL = nvtime (aTHX);
4451 OUTPUT:
4452 RETVAL
4453
4454NV
4455gettimeofday ()
4456 PPCODE:
4457{
4458 UV tv [2];
4459 u2time (aTHX_ tv);
4460 EXTEND (SP, 2);
4461 PUSHs (sv_2mortal (newSVuv (tv [0])));
4462 PUSHs (sv_2mortal (newSVuv (tv [1])));
4463}
4464

Diff Legend

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