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.375 by root, Fri Oct 2 19:58:02 2009 UTC vs.
Revision 1.452 by root, Tue Jun 30 12:42:45 2015 UTC

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

Diff Legend

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