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

Diff Legend

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