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.396 by root, Fri May 6 18:01:13 2011 UTC vs.
Revision 1.465 by root, Sat Jun 25 19:04:04 2016 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7 7
8#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 9#define PERL_EXT
… …
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17 17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
18#include <stdio.h> 23#include <stdio.h>
19#include <errno.h> 24#include <errno.h>
20#include <assert.h> 25#include <assert.h>
21 26
27#ifndef SvREFCNT_dec_NN
28 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
29#endif
30
31#ifndef SvREFCNT_inc_NN
32 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
33#endif
34
22#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0 36# define SVs_PADSTALE 0
37#endif
38
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
24#endif 66#endif
25 67
26#if defined(_WIN32) 68#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY 69# undef HAS_GETTIMEOFDAY
28# undef setjmp 70# undef setjmp
… …
31# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
32#else 74#else
33# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
34#endif 76#endif
35 77
36#ifdef HAVE_MMAP
37# include <unistd.h>
38# include <sys/mman.h>
39# ifndef MAP_ANONYMOUS
40# ifdef MAP_ANON
41# define MAP_ANONYMOUS MAP_ANON
42# else
43# undef HAVE_MMAP
44# endif
45# endif
46# include <limits.h>
47# ifndef PAGESIZE
48# define PAGESIZE pagesize
49# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
50static long pagesize;
51# else
52# define BOOT_PAGESIZE (void)0
53# endif
54#else
55# define PAGESIZE 0
56# define BOOT_PAGESIZE (void)0
57#endif
58
59#if CORO_USE_VALGRIND
60# include <valgrind/valgrind.h>
61#endif
62
63/* the maximum number of idle cctx that will be pooled */ 78/* the maximum number of idle cctx that will be pooled */
64static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
65 80
66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
67# undef CORO_STACKGUARD 82# define HAS_SCOPESTACK_NAME 1
68#endif
69
70#ifndef CORO_STACKGUARD
71# define CORO_STACKGUARD 0
72#endif 83#endif
73 84
74/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
75#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
76# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
86# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
87#endif 98#endif
88 99
89#define IN_DESTRUCT PL_dirty 100#define IN_DESTRUCT PL_dirty
90 101
91#if __GNUC__ >= 3
92# define attribute(x) __attribute__(x)
93# define expect(expr,value) __builtin_expect ((expr), (value))
94# define INLINE static inline
95#else
96# define attribute(x)
97# define expect(expr,value) (expr)
98# define INLINE static
99#endif
100
101#define expect_false(expr) expect ((expr) != 0, 0)
102#define expect_true(expr) expect ((expr) != 0, 1)
103
104#define NOINLINE attribute ((noinline))
105
106#include "CoroAPI.h" 102#include "CoroAPI.h"
107#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
108 104
109#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
110# if CORO_PTHREAD 106# if CORO_PTHREAD
… …
120# define CORO_CLOCK_MONOTONIC 1 116# define CORO_CLOCK_MONOTONIC 1
121# define CORO_CLOCK_THREAD_CPUTIME_ID 3 117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
122# endif 118# endif
123#endif 119#endif
124 120
121/* perl usually suppressed asserts. for debugging, we sometimes force it to be on */
122#if 0
123# undef NDEBUG
124# include <assert.h>
125#endif
126
125static double (*nvtime)(); /* so why doesn't it take void? */ 127static double (*nvtime)(); /* so why doesn't it take void? */
126static void (*u2time)(pTHX_ UV ret[2]); 128static void (*u2time)(pTHX_ UV ret[2]);
127 129
128/* we hijack an hopefully unused CV flag for our purposes */ 130/* we hijack an hopefully unused CV flag for our purposes */
129#define CVf_SLF 0x4000 131#define CVf_SLF 0x4000
130static OP *pp_slf (pTHX); 132static OP *pp_slf (pTHX);
133static void slf_destroy (pTHX_ struct coro *coro);
131 134
132static U32 cctx_gen; 135static U32 cctx_gen;
133static size_t cctx_stacksize = CORO_STACKSIZE; 136static size_t cctx_stacksize = CORO_STACKSIZE;
134static struct CoroAPI coroapi; 137static struct CoroAPI coroapi;
135static AV *main_mainstack; /* used to differentiate between $main and others */ 138static AV *main_mainstack; /* used to differentiate between $main and others */
… …
143 146
144static GV *irsgv; /* $/ */ 147static GV *irsgv; /* $/ */
145static GV *stdoutgv; /* *STDOUT */ 148static GV *stdoutgv; /* *STDOUT */
146static SV *rv_diehook; 149static SV *rv_diehook;
147static SV *rv_warnhook; 150static SV *rv_warnhook;
148static HV *hv_sig; /* %SIG */
149 151
150/* async_pool helper stuff */ 152/* async_pool helper stuff */
151static SV *sv_pool_rss; 153static SV *sv_pool_rss;
152static SV *sv_pool_size; 154static SV *sv_pool_size;
153static SV *sv_async_pool_idle; /* description string */ 155static SV *sv_async_pool_idle; /* description string */
… …
165static char times_valid; 167static char times_valid;
166 168
167static struct coro_cctx *cctx_first; 169static struct coro_cctx *cctx_first;
168static int cctx_count, cctx_idle; 170static int cctx_count, cctx_idle;
169 171
170enum { 172enum
173{
171 CC_MAPPED = 0x01, 174 CC_MAPPED = 0x01,
172 CC_NOREUSE = 0x02, /* throw this away after tracing */ 175 CC_NOREUSE = 0x02, /* throw this away after tracing */
173 CC_TRACE = 0x04, 176 CC_TRACE = 0x04,
174 CC_TRACE_SUB = 0x08, /* trace sub calls */ 177 CC_TRACE_SUB = 0x08, /* trace sub calls */
175 CC_TRACE_LINE = 0x10, /* trace each statement */ 178 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
180typedef struct coro_cctx 183typedef struct coro_cctx
181{ 184{
182 struct coro_cctx *next; 185 struct coro_cctx *next;
183 186
184 /* the stack */ 187 /* the stack */
185 void *sptr; 188 struct coro_stack stack;
186 size_t ssize;
187 189
188 /* cpu state */ 190 /* cpu state */
189 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 191 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
192#ifndef NDEBUG
190 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 193 JMPENV *idle_te; /* same as idle_sp, but for top_env */
194#endif
191 JMPENV *top_env; 195 JMPENV *top_env;
192 coro_context cctx; 196 coro_context cctx;
193 197
194 U32 gen; 198 U32 gen;
195#if CORO_USE_VALGRIND 199#if CORO_USE_VALGRIND
… …
200 204
201static coro_cctx *cctx_current; /* the currently running cctx */ 205static coro_cctx *cctx_current; /* the currently running cctx */
202 206
203/*****************************************************************************/ 207/*****************************************************************************/
204 208
209static MGVTBL coro_state_vtbl;
210
205enum { 211enum
212{
206 CF_RUNNING = 0x0001, /* coroutine is running */ 213 CF_RUNNING = 0x0001, /* coroutine is running */
207 CF_READY = 0x0002, /* coroutine is ready */ 214 CF_READY = 0x0002, /* coroutine is ready */
208 CF_NEW = 0x0004, /* has never been switched to */ 215 CF_NEW = 0x0004, /* has never been switched to */
209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 216 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 217 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
211 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */ 218 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
212}; 219};
213 220
214/* the structure where most of the perl state is stored, overlaid on the cxstack */ 221/* the structure where most of the perl state is stored, overlaid on the cxstack */
215typedef struct 222typedef struct
216{ 223{
217 SV *defsv;
218 AV *defav;
219 SV *errsv;
220 SV *irsgv;
221 HV *hinthv;
222#define VAR(name,type) type name; 224 #define VARx(name,expr,type) type name;
223# include "state.h" 225 #include "state.h"
224#undef VAR
225} perl_slots; 226} perl_slots;
226 227
228/* how many context stack entries do we need for perl_slots */
227#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 229#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
228 230
229/* this is a structure representing a perl-level coroutine */ 231/* this is a structure representing a perl-level coroutine */
230struct coro { 232struct coro
233{
231 /* the C coroutine allocated to this perl coroutine, if any */ 234 /* the C coroutine allocated to this perl coroutine, if any */
232 coro_cctx *cctx; 235 coro_cctx *cctx;
233 236
234 /* ready queue */ 237 /* ready queue */
235 struct coro *next_ready; 238 struct coro *next_ready;
… …
237 /* state data */ 240 /* state data */
238 struct CoroSLF slf_frame; /* saved slf frame */ 241 struct CoroSLF slf_frame; /* saved slf frame */
239 AV *mainstack; 242 AV *mainstack;
240 perl_slots *slot; /* basically the saved sp */ 243 perl_slots *slot; /* basically the saved sp */
241 244
242 CV *startcv; /* the CV to execute */ 245 CV *startcv; /* the CV to execute */
243 AV *args; /* data associated with this coroutine (initial args) */ 246 AV *args; /* data associated with this coroutine (initial args) */
244 int refcnt; /* coroutines are refcounted, yes */
245 int flags; /* CF_ flags */ 247 int flags; /* CF_ flags */
246 HV *hv; /* the perl hash associated with this coro, if any */ 248 HV *hv; /* the perl hash associated with this coro, if any */
247 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
248 249
249 /* statistics */ 250 /* statistics */
250 int usecount; /* number of transfers to this coro */ 251 int usecount; /* number of transfers to this coro */
251 252
252 /* coro process data */ 253 /* coro process data */
253 int prio; 254 int prio;
254 SV *except; /* exception to be thrown */ 255 SV *except; /* exception to be thrown */
255 SV *rouse_cb; 256 SV *rouse_cb; /* last rouse callback */
257 AV *on_destroy; /* callbacks or coros to notify on destroy */
258 AV *status; /* the exit status list */
256 259
257 /* async_pool */ 260 /* async_pool */
258 SV *saved_deffh; 261 SV *saved_deffh;
259 SV *invoke_cb; 262 SV *invoke_cb;
260 AV *invoke_av; 263 AV *invoke_av;
261 264
262 /* on_enter/on_leave */ 265 /* on_enter/on_leave */
263 AV *on_enter; 266 AV *on_enter; AV *on_enter_xs;
264 AV *on_leave; 267 AV *on_leave; AV *on_leave_xs;
265 268
266 /* swap_sv */ 269 /* swap_sv */
267 AV *swap_sv; 270 AV *swap_sv;
268 271
269 /* times */ 272 /* times */
… …
292 295
293/* for Coro.pm */ 296/* for Coro.pm */
294static SV *coro_current; 297static SV *coro_current;
295static SV *coro_readyhook; 298static SV *coro_readyhook;
296static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 299static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
297static CV *cv_coro_run, *cv_coro_terminate; 300static CV *cv_coro_run;
298static struct coro *coro_first; 301static struct coro *coro_first;
299#define coro_nready coroapi.nready 302#define coro_nready coroapi.nready
303
304/** JIT *********************************************************************/
305
306#if CORO_JIT
307 /* APPLE doesn't have mmap though */
308 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
309 #ifndef CORO_JIT_TYPE
310 #if ECB_AMD64 && CORO_JIT_UNIXY
311 #define CORO_JIT_TYPE "amd64-unix"
312 #elif __i386 && CORO_JIT_UNIXY
313 #define CORO_JIT_TYPE "x86-unix"
314 #endif
315 #endif
316#endif
317
318#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
319 #undef CORO_JIT
320#endif
321
322#if CORO_JIT
323 typedef void (*load_save_perl_slots_type)(perl_slots *);
324 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
325#endif
300 326
301/** Coro::Select ************************************************************/ 327/** Coro::Select ************************************************************/
302 328
303static OP *(*coro_old_pp_sselect) (pTHX); 329static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select; 330static SV *coro_select_select;
… …
320 346
321/** time stuff **************************************************************/ 347/** time stuff **************************************************************/
322 348
323#ifdef HAS_GETTIMEOFDAY 349#ifdef HAS_GETTIMEOFDAY
324 350
325static void 351ecb_inline void
326coro_u2time (pTHX_ UV ret[2]) 352coro_u2time (pTHX_ UV ret[2])
327{ 353{
328 struct timeval tv; 354 struct timeval tv;
329 gettimeofday (&tv, 0); 355 gettimeofday (&tv, 0);
330 356
331 ret [0] = tv.tv_sec; 357 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec; 358 ret [1] = tv.tv_usec;
333} 359}
334 360
335static double 361ecb_inline double
336coro_nvtime () 362coro_nvtime (void)
337{ 363{
338 struct timeval tv; 364 struct timeval tv;
339 gettimeofday (&tv, 0); 365 gettimeofday (&tv, 0);
340 366
341 return tv.tv_sec + tv.tv_usec * 1e-6; 367 return tv.tv_sec + tv.tv_usec * 1e-6;
342} 368}
343 369
344static void 370ecb_inline void
345time_init (pTHX) 371time_init (pTHX)
346{ 372{
347 nvtime = coro_nvtime; 373 nvtime = coro_nvtime;
348 u2time = coro_u2time; 374 u2time = coro_u2time;
349} 375}
350 376
351#else 377#else
352 378
353static void 379ecb_inline void
354time_init (pTHX) 380time_init (pTHX)
355{ 381{
356 SV **svp; 382 SV **svp;
357 383
358 require_pv ("Time/HiRes.pm"); 384 require_pv ("Time/HiRes.pm");
359 385
360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 386 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
361 387
362 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 388 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 389 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
364 390
… …
370 396
371#endif 397#endif
372 398
373/** lowlevel stuff **********************************************************/ 399/** lowlevel stuff **********************************************************/
374 400
375static SV * 401static SV * ecb_noinline
376coro_get_sv (pTHX_ const char *name, int create) 402coro_get_sv (pTHX_ const char *name, int create)
377{ 403{
378#if PERL_VERSION_ATLEAST (5,10,0) 404#if PERL_VERSION_ATLEAST (5,10,0)
379 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 405 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
380 get_sv (name, create); 406 get_sv (name, create);
381#endif 407#endif
382 return get_sv (name, create); 408 return get_sv (name, create);
383} 409}
384 410
385static AV * 411static AV * ecb_noinline
386coro_get_av (pTHX_ const char *name, int create) 412coro_get_av (pTHX_ const char *name, int create)
387{ 413{
388#if PERL_VERSION_ATLEAST (5,10,0) 414#if PERL_VERSION_ATLEAST (5,10,0)
389 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 415 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
390 get_av (name, create); 416 get_av (name, create);
391#endif 417#endif
392 return get_av (name, create); 418 return get_av (name, create);
393} 419}
394 420
395static HV * 421static HV * ecb_noinline
396coro_get_hv (pTHX_ const char *name, int create) 422coro_get_hv (pTHX_ const char *name, int create)
397{ 423{
398#if PERL_VERSION_ATLEAST (5,10,0) 424#if PERL_VERSION_ATLEAST (5,10,0)
399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 425 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
400 get_hv (name, create); 426 get_hv (name, create);
401#endif 427#endif
402 return get_hv (name, create); 428 return get_hv (name, create);
403} 429}
404 430
405INLINE void 431ecb_inline void
406coro_times_update () 432coro_times_update (void)
407{ 433{
408#ifdef coro_clock_gettime 434#ifdef coro_clock_gettime
409 struct timespec ts; 435 struct timespec ts;
410 436
411 ts.tv_sec = ts.tv_nsec = 0; 437 ts.tv_sec = ts.tv_nsec = 0;
… …
423 time_real [0] = tv [0]; 449 time_real [0] = tv [0];
424 time_real [1] = tv [1] * 1000; 450 time_real [1] = tv [1] * 1000;
425#endif 451#endif
426} 452}
427 453
428INLINE void 454ecb_inline void
429coro_times_add (struct coro *c) 455coro_times_add (struct coro *c)
430{ 456{
431 c->t_real [1] += time_real [1]; 457 c->t_real [1] += time_real [1];
432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 458 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
433 c->t_real [0] += time_real [0]; 459 c->t_real [0] += time_real [0];
… …
435 c->t_cpu [1] += time_cpu [1]; 461 c->t_cpu [1] += time_cpu [1];
436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 462 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
437 c->t_cpu [0] += time_cpu [0]; 463 c->t_cpu [0] += time_cpu [0];
438} 464}
439 465
440INLINE void 466ecb_inline void
441coro_times_sub (struct coro *c) 467coro_times_sub (struct coro *c)
442{ 468{
443 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 469 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
444 c->t_real [1] -= time_real [1]; 470 c->t_real [1] -= time_real [1];
445 c->t_real [0] -= time_real [0]; 471 c->t_real [0] -= time_real [0];
… …
453/* magic glue */ 479/* magic glue */
454 480
455#define CORO_MAGIC_type_cv 26 481#define CORO_MAGIC_type_cv 26
456#define CORO_MAGIC_type_state PERL_MAGIC_ext 482#define CORO_MAGIC_type_state PERL_MAGIC_ext
457 483
458#define CORO_MAGIC_NN(sv, type) \ 484#define CORO_MAGIC_NN(sv, type) \
459 (expect_true (SvMAGIC (sv)->mg_type == type) \ 485 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
460 ? SvMAGIC (sv) \ 486 ? SvMAGIC (sv) \
461 : mg_find (sv, type)) 487 : mg_find (sv, type))
462 488
463#define CORO_MAGIC(sv, type) \ 489#define CORO_MAGIC(sv, type) \
464 (expect_true (SvMAGIC (sv)) \ 490 (ecb_expect_true (SvMAGIC (sv)) \
465 ? CORO_MAGIC_NN (sv, type) \ 491 ? CORO_MAGIC_NN (sv, type) \
466 : 0) 492 : 0)
467 493
468#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 494#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
469#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 495#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
470 496
471INLINE struct coro * 497ecb_inline MAGIC *
472SvSTATE_ (pTHX_ SV *coro) 498SvSTATEhv_p (pTHX_ SV *coro)
473{ 499{
474 HV *stash;
475 MAGIC *mg; 500 MAGIC *mg;
476 501
502 if (ecb_expect_true (
503 SvTYPE (coro) == SVt_PVHV
504 && (mg = CORO_MAGIC_state (coro))
505 && mg->mg_virtual == &coro_state_vtbl
506 ))
507 return mg;
508
509 return 0;
510}
511
512ecb_inline struct coro *
513SvSTATE_ (pTHX_ SV *coro_sv)
514{
515 MAGIC *mg;
516
477 if (SvROK (coro)) 517 if (SvROK (coro_sv))
478 coro = SvRV (coro); 518 coro_sv = SvRV (coro_sv);
479 519
480 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 520 mg = SvSTATEhv_p (aTHX_ coro_sv);
521 if (!mg)
481 croak ("Coro::State object required"); 522 croak ("Coro::State object required");
482 523
483 stash = SvSTASH (coro);
484 if (expect_false (stash != coro_stash && stash != coro_state_stash))
485 {
486 /* very slow, but rare, check */
487 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
488 croak ("Coro::State object required");
489 }
490
491 mg = CORO_MAGIC_state (coro);
492 return (struct coro *)mg->mg_ptr; 524 return (struct coro *)mg->mg_ptr;
493} 525}
494 526
495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 527#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
496 528
… …
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 531#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500 532
501/*****************************************************************************/ 533/*****************************************************************************/
502/* padlist management and caching */ 534/* padlist management and caching */
503 535
504static AV * 536ecb_inline PADLIST *
505coro_derive_padlist (pTHX_ CV *cv) 537coro_derive_padlist (pTHX_ CV *cv)
506{ 538{
507 AV *padlist = CvPADLIST (cv); 539 PADLIST *padlist = CvPADLIST (cv);
508 AV *newpadlist, *newpad; 540 PADLIST *newpadlist;
541 PADNAMELIST *padnames;
542 PAD *newpad;
543 PADOFFSET off = PadlistMAX (padlist) + 1;
509 544
510 newpadlist = newAV (); 545#if NEWPADAPI
546
547 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
548 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
549 while (!PadlistARRAY (padlist)[off - 1])
550 --off;
551
552 Perl_pad_push (aTHX_ padlist, off);
553
554 newpad = PadlistARRAY (padlist)[off];
555 PadlistARRAY (padlist)[off] = 0;
556
557#else
558
559#if PERL_VERSION_ATLEAST (5,10,0)
560 Perl_pad_push (aTHX_ padlist, off);
561#else
562 Perl_pad_push (aTHX_ padlist, off, 1);
563#endif
564
565 newpad = PadlistARRAY (padlist)[off];
566 PadlistMAX (padlist) = off - 1;
567
568#endif
569
570 newPADLIST (newpadlist);
571#if !PERL_VERSION_ATLEAST(5,15,3)
572 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
511 AvREAL_off (newpadlist); 573 AvREAL_off (newpadlist);
512#if PERL_VERSION_ATLEAST (5,10,0)
513 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
514#else
515 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
516#endif 574#endif
517 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
518 --AvFILLp (padlist);
519 575
520 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 576 /* Already extended to 2 elements by newPADLIST. */
521 av_store (newpadlist, 1, (SV *)newpad); 577 PadlistMAX (newpadlist) = 1;
578
579 padnames = PadlistNAMES (padlist);
580 ++PadnamelistREFCNT (padnames);
581 PadlistNAMES (newpadlist) = padnames;
582
583 PadlistARRAY (newpadlist)[1] = newpad;
522 584
523 return newpadlist; 585 return newpadlist;
524} 586}
525 587
526static void 588ecb_inline void
527free_padlist (pTHX_ AV *padlist) 589free_padlist (pTHX_ PADLIST *padlist)
528{ 590{
529 /* may be during global destruction */ 591 /* may be during global destruction */
530 if (!IN_DESTRUCT) 592 if (!IN_DESTRUCT)
531 { 593 {
532 I32 i = AvFILLp (padlist); 594 I32 i = PadlistMAX (padlist);
533 595
534 while (i > 0) /* special-case index 0 */ 596 while (i > 0) /* special-case index 0 */
535 { 597 {
536 /* we try to be extra-careful here */ 598 /* we try to be extra-careful here */
537 AV *av = (AV *)AvARRAY (padlist)[i--]; 599 PAD *pad = PadlistARRAY (padlist)[i--];
538 I32 j = AvFILLp (av);
539 600
601 if (pad)
602 {
603 I32 j = PadMAX (pad);
604
540 while (j >= 0) 605 while (j >= 0)
541 SvREFCNT_dec (AvARRAY (av)[j--]); 606 SvREFCNT_dec (PadARRAY (pad)[j--]);
542 607
543 AvFILLp (av) = -1; 608 PadMAX (pad) = -1;
544 SvREFCNT_dec (av); 609 SvREFCNT_dec (pad);
610 }
545 } 611 }
546 612
547 SvREFCNT_dec (AvARRAY (padlist)[0]); 613 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
548 614
615#if NEWPADAPI
616 Safefree (PadlistARRAY (padlist));
617 Safefree (padlist);
618#else
549 AvFILLp (padlist) = -1; 619 AvFILLp (padlist) = -1;
620 AvREAL_off (padlist);
550 SvREFCNT_dec ((SV*)padlist); 621 SvREFCNT_dec ((SV*)padlist);
622#endif
551 } 623 }
552} 624}
553 625
554static int 626static int
555coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 627coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
556{ 628{
557 AV *padlist; 629 PADLIST *padlist;
558 AV *av = (AV *)mg->mg_obj; 630 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
631 size_t len = *(size_t *)mg->mg_ptr;
559 632
560 /* perl manages to free our internal AV and _then_ call us */ 633 /* perl manages to free our internal AV and _then_ call us */
561 if (IN_DESTRUCT) 634 if (IN_DESTRUCT)
562 return 0; 635 return 0;
563 636
564 /* casting is fun. */ 637 while (len--)
565 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
566 free_padlist (aTHX_ padlist); 638 free_padlist (aTHX_ padlists[len]);
567
568 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
569 639
570 return 0; 640 return 0;
571} 641}
572 642
573static MGVTBL coro_cv_vtbl = { 643static MGVTBL coro_cv_vtbl = {
574 0, 0, 0, 0, 644 0, 0, 0, 0,
575 coro_cv_free 645 coro_cv_free
576}; 646};
577 647
578/* the next two functions merely cache the padlists */ 648/* the next two functions merely cache the padlists */
579static void 649ecb_inline void
580get_padlist (pTHX_ CV *cv) 650get_padlist (pTHX_ CV *cv)
581{ 651{
582 MAGIC *mg = CORO_MAGIC_cv (cv); 652 MAGIC *mg = CORO_MAGIC_cv (cv);
583 AV *av; 653 size_t *lenp;
584 654
585 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 655 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 656 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
587 else 657 else
588 { 658 {
589#if CORO_PREFER_PERL_FUNCTIONS 659#if CORO_PREFER_PERL_FUNCTIONS
590 /* this is probably cleaner? but also slower! */ 660 /* this is probably cleaner? but also slower! */
591 /* in practise, it seems to be less stable */ 661 /* in practise, it seems to be less stable */
… …
597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 667 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
598#endif 668#endif
599 } 669 }
600} 670}
601 671
602static void 672ecb_inline void
603put_padlist (pTHX_ CV *cv) 673put_padlist (pTHX_ CV *cv)
604{ 674{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 675 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av;
607 676
608 if (expect_false (!mg)) 677 if (ecb_expect_false (!mg))
678 {
609 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 679 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
680 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
681 mg->mg_len = 1; /* so mg_free frees mg_ptr */
682 }
683 else
684 Renew (mg->mg_ptr,
685 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
686 char);
610 687
611 av = (AV *)mg->mg_obj; 688 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
612
613 if (expect_false (AvFILLp (av) >= AvMAX (av)))
614 av_extend (av, AvFILLp (av) + 1);
615
616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
617} 689}
618 690
619/** load & save, init *******************************************************/ 691/** load & save, init *******************************************************/
620 692
693ecb_inline void
694swap_sv (SV *a, SV *b)
695{
696 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
697 SV tmp;
698
699 /* swap sv_any */
700 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
701
702 /* swap sv_flags */
703 SvFLAGS (&tmp) = SvFLAGS (a);
704 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
705 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
706
707#if PERL_VERSION_ATLEAST (5,10,0)
708 /* perl 5.10 and later complicates this _quite_ a bit, but it also
709 * is much faster, so no quarrels here. alternatively, we could
710 * sv_upgrade to avoid this.
711 */
712 {
713 /* swap sv_u */
714 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
715
716 /* if SvANY points to the head, we need to adjust the pointers,
717 * as the pointer for a still points to b, and maybe vice versa.
718 */
719 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
720 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
721 svany_in_head_set |= 1 << SVt_NV;
722 #endif
723
724 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
725
726 if (svany_in_head (SvTYPE (a)))
727 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
728
729 if (svany_in_head (SvTYPE (b)))
730 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
731 }
732#endif
733}
734
621/* swap sv heads, at least logically */ 735/* swap sv heads, at least logically */
622static void 736static void
623swap_svs (pTHX_ Coro__State c) 737swap_svs_enter (pTHX_ Coro__State c)
624{ 738{
625 int i; 739 int i;
626 740
627 for (i = 0; i <= AvFILLp (c->swap_sv); ) 741 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
628 { 742 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
629 SV *a = AvARRAY (c->swap_sv)[i++];
630 SV *b = AvARRAY (c->swap_sv)[i++];
631
632 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
633 SV tmp;
634
635 /* swap sv_any */
636 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
637
638 /* swap sv_flags */
639 SvFLAGS (&tmp) = SvFLAGS (a);
640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
642
643#if PERL_VERSION_ATLEAST (5,10,0)
644 /* perl 5.10 complicates this _quite_ a bit, but it also is
645 * much faster, so no quarrels here. alternatively, we could
646 * sv_upgrade to avoid this.
647 */
648 {
649 /* swap sv_u */
650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
651
652 /* if SvANY points to the head, we need to adjust the pointers,
653 * as the pointer for a still points to b, and maybe vice versa.
654 */
655 #define svany_in_head(type) \
656 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
657
658 if (svany_in_head (SvTYPE (a)))
659 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
660
661 if (svany_in_head (SvTYPE (b)))
662 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
663 }
664#endif
665 }
666} 743}
667 744
745static void
746swap_svs_leave (pTHX_ Coro__State c)
747{
748 int i;
749
750 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
751 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
752}
753
668#define SWAP_SVS(coro) \ 754#define SWAP_SVS_ENTER(coro) \
669 if (expect_false ((coro)->swap_sv)) \ 755 if (ecb_expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro)) 756 swap_svs_enter (aTHX_ (coro))
757
758#define SWAP_SVS_LEAVE(coro) \
759 if (ecb_expect_false ((coro)->swap_sv)) \
760 swap_svs_leave (aTHX_ (coro))
671 761
672static void 762static void
673on_enterleave_call (pTHX_ SV *cb); 763on_enterleave_call (pTHX_ SV *cb);
674 764
675static void 765static void
… …
678 perl_slots *slot = c->slot; 768 perl_slots *slot = c->slot;
679 c->slot = 0; 769 c->slot = 0;
680 770
681 PL_mainstack = c->mainstack; 771 PL_mainstack = c->mainstack;
682 772
683 GvSV (PL_defgv) = slot->defsv; 773#if CORO_JIT
684 GvAV (PL_defgv) = slot->defav; 774 load_perl_slots (slot);
685 GvSV (PL_errgv) = slot->errsv; 775#else
686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
688
689 #define VAR(name,type) PL_ ## name = slot->name; 776 #define VARx(name,expr,type) expr = slot->name;
690 # include "state.h" 777 #include "state.h"
691 #undef VAR 778#endif
692 779
693 { 780 {
694 dSP; 781 dSP;
695 782
696 CV *cv; 783 CV *cv;
697 784
698 /* now do the ugly restore mess */ 785 /* now do the ugly restore mess */
699 while (expect_true (cv = (CV *)POPs)) 786 while (ecb_expect_true (cv = (CV *)POPs))
700 { 787 {
701 put_padlist (aTHX_ cv); /* mark this padlist as available */ 788 put_padlist (aTHX_ cv); /* mark this padlist as available */
702 CvDEPTH (cv) = PTR2IV (POPs); 789 CvDEPTH (cv) = PTR2IV (POPs);
703 CvPADLIST (cv) = (AV *)POPs; 790 CvPADLIST (cv) = (PADLIST *)POPs;
704 } 791 }
705 792
706 PUTBACK; 793 PUTBACK;
707 } 794 }
708 795
709 slf_frame = c->slf_frame; 796 slf_frame = c->slf_frame;
710 CORO_THROW = c->except; 797 CORO_THROW = c->except;
711 798
712 if (expect_false (enable_times)) 799 if (ecb_expect_false (enable_times))
713 { 800 {
714 if (expect_false (!times_valid)) 801 if (ecb_expect_false (!times_valid))
715 coro_times_update (); 802 coro_times_update ();
716 803
717 coro_times_sub (c); 804 coro_times_sub (c);
718 } 805 }
719 806
720 if (expect_false (c->on_enter)) 807 if (ecb_expect_false (c->on_enter))
721 { 808 {
722 int i; 809 int i;
723 810
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 811 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 812 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
726 } 813 }
727 814
815 if (ecb_expect_false (c->on_enter_xs))
816 {
817 int i;
818
819 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
820 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
821 }
822
728 SWAP_SVS (c); 823 SWAP_SVS_ENTER (c);
729} 824}
730 825
731static void 826static void
732save_perl (pTHX_ Coro__State c) 827save_perl (pTHX_ Coro__State c)
733{ 828{
734 SWAP_SVS (c); 829 SWAP_SVS_LEAVE (c);
735 830
831 if (ecb_expect_false (c->on_leave_xs))
832 {
833 int i;
834
835 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
836 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
837 }
838
736 if (expect_false (c->on_leave)) 839 if (ecb_expect_false (c->on_leave))
737 { 840 {
738 int i; 841 int i;
739 842
740 for (i = AvFILLp (c->on_leave); i >= 0; --i) 843 for (i = AvFILLp (c->on_leave); i >= 0; --i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 844 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 } 845 }
743 846
744 times_valid = 0; 847 times_valid = 0;
745 848
746 if (expect_false (enable_times)) 849 if (ecb_expect_false (enable_times))
747 { 850 {
748 coro_times_update (); times_valid = 1; 851 coro_times_update (); times_valid = 1;
749 coro_times_add (c); 852 coro_times_add (c);
750 } 853 }
751 854
… …
765 868
766 XPUSHs (Nullsv); 869 XPUSHs (Nullsv);
767 /* this loop was inspired by pp_caller */ 870 /* this loop was inspired by pp_caller */
768 for (;;) 871 for (;;)
769 { 872 {
770 while (expect_true (cxix >= 0)) 873 while (ecb_expect_true (cxix >= 0))
771 { 874 {
772 PERL_CONTEXT *cx = &ccstk[cxix--]; 875 PERL_CONTEXT *cx = &ccstk[cxix--];
773 876
774 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 877 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
775 { 878 {
776 CV *cv = cx->blk_sub.cv; 879 CV *cv = cx->blk_sub.cv;
777 880
778 if (expect_true (CvDEPTH (cv))) 881 if (ecb_expect_true (CvDEPTH (cv)))
779 { 882 {
780 EXTEND (SP, 3); 883 EXTEND (SP, 3);
781 PUSHs ((SV *)CvPADLIST (cv)); 884 PUSHs ((SV *)CvPADLIST (cv));
782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 885 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
783 PUSHs ((SV *)cv); 886 PUSHs ((SV *)cv);
… …
786 get_padlist (aTHX_ cv); 889 get_padlist (aTHX_ cv);
787 } 890 }
788 } 891 }
789 } 892 }
790 893
791 if (expect_true (top_si->si_type == PERLSI_MAIN)) 894 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
792 break; 895 break;
793 896
794 top_si = top_si->si_prev; 897 top_si = top_si->si_prev;
795 ccstk = top_si->si_cxstack; 898 ccstk = top_si->si_cxstack;
796 cxix = top_si->si_cxix; 899 cxix = top_si->si_cxix;
… …
798 901
799 PUTBACK; 902 PUTBACK;
800 } 903 }
801 904
802 /* allocate some space on the context stack for our purposes */ 905 /* allocate some space on the context stack for our purposes */
803 /* we manually unroll here, as usually 2 slots is enough */ 906 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
804 if (SLOT_COUNT >= 1) CXINC;
805 if (SLOT_COUNT >= 2) CXINC;
806 if (SLOT_COUNT >= 3) CXINC;
807 { 907 {
808 unsigned int i; 908 unsigned int i;
909
809 for (i = 3; i < SLOT_COUNT; ++i) 910 for (i = 0; i < SLOT_COUNT; ++i)
810 CXINC; 911 CXINC;
811 } 912
812 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 913 cxstack_ix -= SLOT_COUNT; /* undo allocation */
914 }
813 915
814 c->mainstack = PL_mainstack; 916 c->mainstack = PL_mainstack;
815 917
816 { 918 {
817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 919 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
818 920
819 slot->defav = GvAV (PL_defgv); 921#if CORO_JIT
820 slot->defsv = DEFSV; 922 save_perl_slots (slot);
821 slot->errsv = ERRSV; 923#else
822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
824
825 #define VAR(name,type) slot->name = PL_ ## name; 924 #define VARx(name,expr,type) slot->name = expr;
826 # include "state.h" 925 #include "state.h"
827 #undef VAR 926#endif
828 } 927 }
829} 928}
830 929
831/* 930/*
832 * allocate various perl stacks. This is almost an exact copy 931 * allocate various perl stacks. This is almost an exact copy
… …
838# define coro_init_stacks(thx) init_stacks () 937# define coro_init_stacks(thx) init_stacks ()
839#else 938#else
840static void 939static void
841coro_init_stacks (pTHX) 940coro_init_stacks (pTHX)
842{ 941{
843 PL_curstackinfo = new_stackinfo(32, 8); 942 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
844 PL_curstackinfo->si_type = PERLSI_MAIN; 943 PL_curstackinfo->si_type = PERLSI_MAIN;
845 PL_curstack = PL_curstackinfo->si_stack; 944 PL_curstack = PL_curstackinfo->si_stack;
846 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 945 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
847 946
848 PL_stack_base = AvARRAY(PL_curstack); 947 PL_stack_base = AvARRAY(PL_curstack);
… …
863#endif 962#endif
864 963
865 New(54,PL_scopestack,8,I32); 964 New(54,PL_scopestack,8,I32);
866 PL_scopestack_ix = 0; 965 PL_scopestack_ix = 0;
867 PL_scopestack_max = 8; 966 PL_scopestack_max = 8;
967#if HAS_SCOPESTACK_NAME
968 New(54,PL_scopestack_name,8,const char*);
969#endif
868 970
869 New(54,PL_savestack,24,ANY); 971 New(54,PL_savestack,24,ANY);
870 PL_savestack_ix = 0; 972 PL_savestack_ix = 0;
871 PL_savestack_max = 24; 973 PL_savestack_max = 24;
974#if PERL_VERSION_ATLEAST (5,24,0)
975 /* perl 5.24 moves SS_MAXPUSH optimisation from */
976 /* the header macros to PL_savestack_max */
977 PL_savestack_max -= SS_MAXPUSH;
978#endif
872 979
873#if !PERL_VERSION_ATLEAST (5,10,0) 980#if !PERL_VERSION_ATLEAST (5,10,0)
874 New(54,PL_retstack,4,OP*); 981 New(54,PL_retstack,4,OP*);
875 PL_retstack_ix = 0; 982 PL_retstack_ix = 0;
876 PL_retstack_max = 4; 983 PL_retstack_max = 4;
… …
900 } 1007 }
901 1008
902 Safefree (PL_tmps_stack); 1009 Safefree (PL_tmps_stack);
903 Safefree (PL_markstack); 1010 Safefree (PL_markstack);
904 Safefree (PL_scopestack); 1011 Safefree (PL_scopestack);
1012#if HAS_SCOPESTACK_NAME
1013 Safefree (PL_scopestack_name);
1014#endif
905 Safefree (PL_savestack); 1015 Safefree (PL_savestack);
906#if !PERL_VERSION_ATLEAST (5,10,0) 1016#if !PERL_VERSION_ATLEAST (5,10,0)
907 Safefree (PL_retstack); 1017 Safefree (PL_retstack);
908#endif 1018#endif
909} 1019}
… …
939 } 1049 }
940 1050
941 return rss; 1051 return rss;
942} 1052}
943 1053
944/** coroutine stack handling ************************************************/ 1054/** provide custom get/set/clear methods for %SIG elements ******************/
945
946static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
947static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
948static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
949 1055
950/* apparently < 5.8.8 */ 1056/* apparently < 5.8.8 */
951#ifndef MgPV_nolen_const 1057#ifndef MgPV_nolen_const
952#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1058#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
953 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1059 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
954 (const char*)(mg)->mg_ptr) 1060 (const char*)(mg)->mg_ptr)
955#endif 1061#endif
956 1062
1063/* this will be a patched copy of PL_vtbl_sigelem */
1064static MGVTBL coro_sigelem_vtbl;
1065
1066static int ecb_cold
1067coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1068{
1069 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1070 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1071 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1072 return 1;
1073}
1074
1075/* perl does not have a %SIG vtbl, we provide one so we can override */
1076/* the cwvtblagic for %SIG members */
1077static const MGVTBL coro_sig_vtbl = {
1078 0, 0, 0, 0, 0,
1079 coro_sig_copy
1080};
1081
957/* 1082/*
958 * This overrides the default magic get method of %SIG elements. 1083 * This overrides the default magic get method of %SIG elements.
959 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1084 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
960 * and instead of trying to save and restore the hash elements, we just provide 1085 * and instead of trying to save and restore the hash elements (extremely slow),
961 * readback here. 1086 * we just provide our own readback here.
962 */ 1087 */
963static int 1088static int ecb_cold
964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1089coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
965{ 1090{
966 const char *s = MgPV_nolen_const (mg); 1091 const char *s = MgPV_nolen_const (mg);
967 1092
968 if (*s == '_') 1093 if (*s == '_')
969 { 1094 {
970 SV **svp = 0; 1095 SV **svp = 0;
971 1096
972 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1097 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
973 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1098 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
974 1099
975 if (svp) 1100 if (svp)
976 { 1101 {
977 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1102 SV *ssv;
1103
1104 if (!*svp)
1105 ssv = &PL_sv_undef;
1106 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1107 ssv = sv_2mortal (newRV_inc (*svp));
1108 else
1109 ssv = *svp;
1110
1111 sv_setsv (sv, ssv);
978 return 0; 1112 return 0;
979 } 1113 }
980 } 1114 }
981 1115
982 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1116 return PL_vtbl_sigelem.svt_get ? PL_vtbl_sigelem.svt_get (aTHX_ sv, mg) : 0;
983} 1117}
984 1118
985static int 1119static int ecb_cold
986coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1120coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
987{ 1121{
988 const char *s = MgPV_nolen_const (mg); 1122 const char *s = MgPV_nolen_const (mg);
989 1123
990 if (*s == '_') 1124 if (*s == '_')
… …
1001 SvREFCNT_dec (old); 1135 SvREFCNT_dec (old);
1002 return 0; 1136 return 0;
1003 } 1137 }
1004 } 1138 }
1005 1139
1006 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1140 return PL_vtbl_sigelem.svt_clear ? PL_vtbl_sigelem.svt_clear (aTHX_ sv, mg) : 0;
1007} 1141}
1008 1142
1009static int 1143static int ecb_cold
1010coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1144coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1011{ 1145{
1012 const char *s = MgPV_nolen_const (mg); 1146 const char *s = MgPV_nolen_const (mg);
1013 1147
1014 if (*s == '_') 1148 if (*s == '_')
… …
1025 SvREFCNT_dec (old); 1159 SvREFCNT_dec (old);
1026 return 0; 1160 return 0;
1027 } 1161 }
1028 } 1162 }
1029 1163
1030 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0; 1164 return PL_vtbl_sigelem.svt_set ? PL_vtbl_sigelem.svt_set (aTHX_ sv, mg) : 0;
1031} 1165}
1032 1166
1033static void 1167static void
1034prepare_nop (pTHX_ struct coro_transfer_args *ta) 1168prepare_nop (pTHX_ struct coro_transfer_args *ta)
1035{ 1169{
… …
1047slf_check_repeat (pTHX_ struct CoroSLF *frame) 1181slf_check_repeat (pTHX_ struct CoroSLF *frame)
1048{ 1182{
1049 return 1; 1183 return 1;
1050} 1184}
1051 1185
1186/** coroutine stack handling ************************************************/
1187
1052static UNOP init_perl_op; 1188static UNOP init_perl_op;
1053 1189
1054static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1190ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1055init_perl (pTHX_ struct coro *coro) 1191init_perl (pTHX_ struct coro *coro)
1056{ 1192{
1057 /* 1193 /*
1058 * emulate part of the perl startup here. 1194 * emulate part of the perl startup here.
1059 */ 1195 */
… …
1074 PL_parser = 0; 1210 PL_parser = 0;
1075#endif 1211#endif
1076 PL_hints = 0; 1212 PL_hints = 0;
1077 1213
1078 /* recreate the die/warn hooks */ 1214 /* recreate the die/warn hooks */
1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1215 PL_diehook = SvREFCNT_inc (rv_diehook);
1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1216 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1081 1217
1082 GvSV (PL_defgv) = newSV (0); 1218 GvSV (PL_defgv) = newSV (0);
1083 GvAV (PL_defgv) = coro->args; coro->args = 0; 1219 GvAV (PL_defgv) = coro->args; coro->args = 0;
1084 GvSV (PL_errgv) = newSV (0); 1220 GvSV (PL_errgv) = newSV (0);
1085 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1221 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1086 GvHV (PL_hintgv) = 0; 1222 GvHV (PL_hintgv) = newHV ();
1223#if PERL_VERSION_ATLEAST (5,10,0)
1224 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1225#endif
1087 PL_rs = newSVsv (GvSV (irsgv)); 1226 PL_rs = newSVsv (GvSV (irsgv));
1088 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1227 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1089 1228
1090 { 1229 {
1091 dSP; 1230 dSP;
… …
1106 /* this newly created coroutine might be run on an existing cctx which most 1245 /* this newly created coroutine might be run on an existing cctx which most
1107 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1246 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1108 */ 1247 */
1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1248 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1110 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1249 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1250 slf_frame.destroy = 0;
1111 1251
1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1252 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1113 init_perl_op.op_next = PL_op; 1253 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1254 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1255 init_perl_op.op_ppaddr = pp_slf;
… …
1118 PL_op = (OP *)&init_perl_op; 1258 PL_op = (OP *)&init_perl_op;
1119 1259
1120 /* copy throw, in case it was set before init_perl */ 1260 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1261 CORO_THROW = coro->except;
1122 1262
1123 SWAP_SVS (coro); 1263 SWAP_SVS_ENTER (coro);
1124 1264
1125 if (expect_false (enable_times)) 1265 if (ecb_expect_false (enable_times))
1126 { 1266 {
1127 coro_times_update (); 1267 coro_times_update ();
1128 coro_times_sub (coro); 1268 coro_times_sub (coro);
1129 } 1269 }
1130} 1270}
… …
1154destroy_perl (pTHX_ struct coro *coro) 1294destroy_perl (pTHX_ struct coro *coro)
1155{ 1295{
1156 SV *svf [9]; 1296 SV *svf [9];
1157 1297
1158 { 1298 {
1299 SV *old_current = SvRV (coro_current);
1159 struct coro *current = SvSTATE_current; 1300 struct coro *current = SvSTATE (old_current);
1160 1301
1161 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1302 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1162 1303
1163 save_perl (aTHX_ current); 1304 save_perl (aTHX_ current);
1164 SvRV_set (coro_current, (SV *)coro->hv); /* this will cause acroak in transfer_check */ 1305
1306 /* this will cause transfer_check to croak on block*/
1307 SvRV_set (coro_current, (SV *)coro->hv);
1308
1165 load_perl (aTHX_ coro); 1309 load_perl (aTHX_ coro);
1166 1310
1311 /* restore swapped sv's */
1312 SWAP_SVS_LEAVE (coro);
1313
1167 coro_unwind_stacks (aTHX); 1314 coro_unwind_stacks (aTHX);
1315
1168 coro_destruct_stacks (aTHX); 1316 coro_destruct_stacks (aTHX);
1169 1317
1170 /* restore swapped sv's */
1171 SWAP_SVS (coro);
1172
1173 // now save some sv's to be free'd later 1318 /* now save some sv's to be free'd later */
1174 svf [0] = GvSV (PL_defgv); 1319 svf [0] = GvSV (PL_defgv);
1175 svf [1] = (SV *)GvAV (PL_defgv); 1320 svf [1] = (SV *)GvAV (PL_defgv);
1176 svf [2] = GvSV (PL_errgv); 1321 svf [2] = GvSV (PL_errgv);
1177 svf [3] = (SV *)PL_defoutgv; 1322 svf [3] = (SV *)PL_defoutgv;
1178 svf [4] = PL_rs; 1323 svf [4] = PL_rs;
… …
1180 svf [6] = (SV *)GvHV (PL_hintgv); 1325 svf [6] = (SV *)GvHV (PL_hintgv);
1181 svf [7] = PL_diehook; 1326 svf [7] = PL_diehook;
1182 svf [8] = PL_warnhook; 1327 svf [8] = PL_warnhook;
1183 assert (9 == sizeof (svf) / sizeof (*svf)); 1328 assert (9 == sizeof (svf) / sizeof (*svf));
1184 1329
1185 SvRV_set (coro_current, (SV *)current->hv); 1330 SvRV_set (coro_current, old_current);
1331
1186 load_perl (aTHX_ current); 1332 load_perl (aTHX_ current);
1187 } 1333 }
1188 1334
1189 { 1335 {
1190 unsigned int i; 1336 unsigned int i;
… …
1194 1340
1195 SvREFCNT_dec (coro->saved_deffh); 1341 SvREFCNT_dec (coro->saved_deffh);
1196 SvREFCNT_dec (coro->rouse_cb); 1342 SvREFCNT_dec (coro->rouse_cb);
1197 SvREFCNT_dec (coro->invoke_cb); 1343 SvREFCNT_dec (coro->invoke_cb);
1198 SvREFCNT_dec (coro->invoke_av); 1344 SvREFCNT_dec (coro->invoke_av);
1345 SvREFCNT_dec (coro->on_enter_xs);
1346 SvREFCNT_dec (coro->on_leave_xs);
1199 } 1347 }
1200} 1348}
1201 1349
1202INLINE void 1350ecb_inline void
1203free_coro_mortal (pTHX) 1351free_coro_mortal (pTHX)
1204{ 1352{
1205 if (expect_true (coro_mortal)) 1353 if (ecb_expect_true (coro_mortal))
1206 { 1354 {
1207 SvREFCNT_dec (coro_mortal); 1355 SvREFCNT_dec ((SV *)coro_mortal);
1208 coro_mortal = 0; 1356 coro_mortal = 0;
1209 } 1357 }
1210} 1358}
1211 1359
1212static int 1360static int
… …
1266 1414
1267 if (PL_curcop != &PL_compiling) 1415 if (PL_curcop != &PL_compiling)
1268 { 1416 {
1269 SV **cb; 1417 SV **cb;
1270 1418
1271 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1419 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1272 { 1420 {
1273 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1421 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1274 1422
1275 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1423 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1276 { 1424 {
… …
1345 1493
1346 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1494 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1347} 1495}
1348 1496
1349/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1497/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1350static void NOINLINE 1498static void ecb_noinline
1351cctx_prepare (pTHX) 1499cctx_prepare (pTHX)
1352{ 1500{
1353 PL_top_env = &PL_start_env; 1501 PL_top_env = &PL_start_env;
1354 1502
1355 if (cctx_current->flags & CC_TRACE) 1503 if (cctx_current->flags & CC_TRACE)
… …
1366 slf_frame.prepare = slf_prepare_set_stacklevel; 1514 slf_frame.prepare = slf_prepare_set_stacklevel;
1367 slf_frame.check = slf_check_set_stacklevel; 1515 slf_frame.check = slf_check_set_stacklevel;
1368} 1516}
1369 1517
1370/* the tail of transfer: execute stuff we can only do after a transfer */ 1518/* the tail of transfer: execute stuff we can only do after a transfer */
1371INLINE void 1519ecb_inline void
1372transfer_tail (pTHX) 1520transfer_tail (pTHX)
1373{ 1521{
1374 free_coro_mortal (aTHX); 1522 free_coro_mortal (aTHX);
1523}
1524
1525/* try to exit the same way perl's main function would do */
1526/* we do not bother resetting the environment or other things *7
1527/* that are not, uhm, essential */
1528/* this obviously also doesn't work when perl is embedded */
1529static void ecb_noinline ecb_cold
1530perlish_exit (pTHX)
1531{
1532 int exitstatus = perl_destruct (PL_curinterp);
1533 perl_free (PL_curinterp);
1534 exit (exitstatus);
1375} 1535}
1376 1536
1377/* 1537/*
1378 * this is a _very_ stripped down perl interpreter ;) 1538 * this is a _very_ stripped down perl interpreter ;)
1379 */ 1539 */
… …
1406 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1566 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1407 * runtime errors here, as this is just a random interpreter, not a thread. 1567 * runtime errors here, as this is just a random interpreter, not a thread.
1408 */ 1568 */
1409 1569
1410 /* 1570 /*
1571 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1572 * requires PL_scopestack_ix, so do it here if required.
1573 */
1574 if (!PL_scopestack_ix)
1575 ENTER;
1576
1577 /*
1411 * If perl-run returns we assume exit() was being called or the coro 1578 * If perl-run returns we assume exit() was being called or the coro
1412 * fell off the end, which seems to be the only valid (non-bug) 1579 * fell off the end, which seems to be the only valid (non-bug)
1413 * reason for perl_run to return. We try to exit by jumping to the 1580 * reason for perl_run to return. We try to mimic whatever perl is normally
1414 * bootstrap-time "top" top_env, as we cannot restore the "main" 1581 * doing in that case. YMMV.
1415 * coroutine as Coro has no such concept.
1416 * This actually isn't valid with the pthread backend, but OSes requiring
1417 * that backend are too broken to do it in a standards-compliant way.
1418 */ 1582 */
1419 PL_top_env = main_top_env; 1583 perlish_exit (aTHX);
1420 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1421 } 1584 }
1422} 1585}
1423 1586
1424static coro_cctx * 1587static coro_cctx *
1425cctx_new () 1588cctx_new (void)
1426{ 1589{
1427 coro_cctx *cctx; 1590 coro_cctx *cctx;
1428 1591
1429 ++cctx_count; 1592 ++cctx_count;
1430 New (0, cctx, 1, coro_cctx); 1593 New (0, cctx, 1, coro_cctx);
… …
1436 return cctx; 1599 return cctx;
1437} 1600}
1438 1601
1439/* create a new cctx only suitable as source */ 1602/* create a new cctx only suitable as source */
1440static coro_cctx * 1603static coro_cctx *
1441cctx_new_empty () 1604cctx_new_empty (void)
1442{ 1605{
1443 coro_cctx *cctx = cctx_new (); 1606 coro_cctx *cctx = cctx_new ();
1444 1607
1445 cctx->sptr = 0; 1608 cctx->stack.sptr = 0;
1446 coro_create (&cctx->cctx, 0, 0, 0, 0); 1609 coro_create (&cctx->cctx, 0, 0, 0, 0);
1447 1610
1448 return cctx; 1611 return cctx;
1449} 1612}
1450 1613
1451/* create a new cctx suitable as destination/running a perl interpreter */ 1614/* create a new cctx suitable as destination/running a perl interpreter */
1452static coro_cctx * 1615static coro_cctx *
1453cctx_new_run () 1616cctx_new_run (void)
1454{ 1617{
1455 coro_cctx *cctx = cctx_new (); 1618 coro_cctx *cctx = cctx_new ();
1456 void *stack_start;
1457 size_t stack_size;
1458 1619
1459#if HAVE_MMAP 1620 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1460 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1461 /* mmap supposedly does allocate-on-write for us */
1462 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1463
1464 if (cctx->sptr != (void *)-1)
1465 {
1466 #if CORO_STACKGUARD
1467 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1468 #endif
1469 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1470 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1471 cctx->flags |= CC_MAPPED;
1472 } 1621 {
1473 else
1474#endif
1475 {
1476 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1477 New (0, cctx->sptr, cctx_stacksize, long);
1478
1479 if (!cctx->sptr)
1480 {
1481 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1622 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1482 _exit (EXIT_FAILURE); 1623 _exit (EXIT_FAILURE);
1483 }
1484
1485 stack_start = cctx->sptr;
1486 stack_size = cctx->ssize;
1487 } 1624 }
1488 1625
1489 #if CORO_USE_VALGRIND
1490 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1491 #endif
1492
1493 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1626 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1494 1627
1495 return cctx; 1628 return cctx;
1496} 1629}
1497 1630
1498static void 1631static void
… …
1504 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1637 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1505 1638
1506 --cctx_count; 1639 --cctx_count;
1507 coro_destroy (&cctx->cctx); 1640 coro_destroy (&cctx->cctx);
1508 1641
1509 /* coro_transfer creates new, empty cctx's */ 1642 coro_stack_free (&cctx->stack);
1510 if (cctx->sptr)
1511 {
1512 #if CORO_USE_VALGRIND
1513 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1514 #endif
1515
1516#if HAVE_MMAP
1517 if (cctx->flags & CC_MAPPED)
1518 munmap (cctx->sptr, cctx->ssize);
1519 else
1520#endif
1521 Safefree (cctx->sptr);
1522 }
1523 1643
1524 Safefree (cctx); 1644 Safefree (cctx);
1525} 1645}
1526 1646
1527/* wether this cctx should be destructed */ 1647/* wether this cctx should be destructed */
1528#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1648#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1529 1649
1530static coro_cctx * 1650static coro_cctx *
1531cctx_get (pTHX) 1651cctx_get (pTHX)
1532{ 1652{
1533 while (expect_true (cctx_first)) 1653 while (ecb_expect_true (cctx_first))
1534 { 1654 {
1535 coro_cctx *cctx = cctx_first; 1655 coro_cctx *cctx = cctx_first;
1536 cctx_first = cctx->next; 1656 cctx_first = cctx->next;
1537 --cctx_idle; 1657 --cctx_idle;
1538 1658
1539 if (expect_true (!CCTX_EXPIRED (cctx))) 1659 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1540 return cctx; 1660 return cctx;
1541 1661
1542 cctx_destroy (cctx); 1662 cctx_destroy (cctx);
1543 } 1663 }
1544 1664
… …
1546} 1666}
1547 1667
1548static void 1668static void
1549cctx_put (coro_cctx *cctx) 1669cctx_put (coro_cctx *cctx)
1550{ 1670{
1551 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1671 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1552 1672
1553 /* free another cctx if overlimit */ 1673 /* free another cctx if overlimit */
1554 if (expect_false (cctx_idle >= cctx_max_idle)) 1674 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1555 { 1675 {
1556 coro_cctx *first = cctx_first; 1676 coro_cctx *first = cctx_first;
1557 cctx_first = first->next; 1677 cctx_first = first->next;
1558 --cctx_idle; 1678 --cctx_idle;
1559 1679
… …
1570static void 1690static void
1571transfer_check (pTHX_ struct coro *prev, struct coro *next) 1691transfer_check (pTHX_ struct coro *prev, struct coro *next)
1572{ 1692{
1573 /* TODO: throwing up here is considered harmful */ 1693 /* TODO: throwing up here is considered harmful */
1574 1694
1575 if (expect_true (prev != next)) 1695 if (ecb_expect_true (prev != next))
1576 { 1696 {
1577 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1697 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1578 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1698 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1579 1699
1580 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1700 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1581 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1701 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1582 1702
1583#if !PERL_VERSION_ATLEAST (5,10,0) 1703#if !PERL_VERSION_ATLEAST (5,10,0)
1584 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1704 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1585 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1705 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1586#endif 1706#endif
1587 } 1707 }
1588} 1708}
1589 1709
1590/* always use the TRANSFER macro */ 1710/* always use the TRANSFER macro */
1591static void NOINLINE /* noinline so we have a fixed stackframe */ 1711static void ecb_noinline /* noinline so we have a fixed stackframe */
1592transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1712transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1593{ 1713{
1594 dSTACKLEVEL; 1714 dSTACKLEVEL;
1595 1715
1596 /* sometimes transfer is only called to set idle_sp */ 1716 /* sometimes transfer is only called to set idle_sp */
1597 if (expect_false (!prev)) 1717 if (ecb_expect_false (!prev))
1598 { 1718 {
1599 cctx_current->idle_sp = STACKLEVEL; 1719 cctx_current->idle_sp = STACKLEVEL;
1600 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1720 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1601 } 1721 }
1602 else if (expect_true (prev != next)) 1722 else if (ecb_expect_true (prev != next))
1603 { 1723 {
1604 coro_cctx *cctx_prev; 1724 coro_cctx *cctx_prev;
1605 1725
1606 if (expect_false (prev->flags & CF_NEW)) 1726 if (ecb_expect_false (prev->flags & CF_NEW))
1607 { 1727 {
1608 /* create a new empty/source context */ 1728 /* create a new empty/source context */
1609 prev->flags &= ~CF_NEW; 1729 prev->flags &= ~CF_NEW;
1610 prev->flags |= CF_RUNNING; 1730 prev->flags |= CF_RUNNING;
1611 } 1731 }
… …
1614 next->flags |= CF_RUNNING; 1734 next->flags |= CF_RUNNING;
1615 1735
1616 /* first get rid of the old state */ 1736 /* first get rid of the old state */
1617 save_perl (aTHX_ prev); 1737 save_perl (aTHX_ prev);
1618 1738
1619 if (expect_false (next->flags & CF_NEW)) 1739 if (ecb_expect_false (next->flags & CF_NEW))
1620 { 1740 {
1621 /* need to start coroutine */ 1741 /* need to start coroutine */
1622 next->flags &= ~CF_NEW; 1742 next->flags &= ~CF_NEW;
1623 /* setup coroutine call */ 1743 /* setup coroutine call */
1624 init_perl (aTHX_ next); 1744 init_perl (aTHX_ next);
1625 } 1745 }
1626 else 1746 else
1627 load_perl (aTHX_ next); 1747 load_perl (aTHX_ next);
1628 1748
1629 /* possibly untie and reuse the cctx */ 1749 /* possibly untie and reuse the cctx */
1630 if (expect_true ( 1750 if (ecb_expect_true (
1631 cctx_current->idle_sp == STACKLEVEL 1751 cctx_current->idle_sp == STACKLEVEL
1632 && !(cctx_current->flags & CC_TRACE) 1752 && !(cctx_current->flags & CC_TRACE)
1633 && !force_cctx 1753 && !force_cctx
1634 )) 1754 ))
1635 { 1755 {
1636 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1756 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1637 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1757 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1638 1758
1639 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1759 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1640 /* without this the next cctx_get might destroy the running cctx while still in use */ 1760 /* without this the next cctx_get might destroy the running cctx while still in use */
1641 if (expect_false (CCTX_EXPIRED (cctx_current))) 1761 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1642 if (expect_true (!next->cctx)) 1762 if (ecb_expect_true (!next->cctx))
1643 next->cctx = cctx_get (aTHX); 1763 next->cctx = cctx_get (aTHX);
1644 1764
1645 cctx_put (cctx_current); 1765 cctx_put (cctx_current);
1646 } 1766 }
1647 else 1767 else
1648 prev->cctx = cctx_current; 1768 prev->cctx = cctx_current;
1649 1769
1650 ++next->usecount; 1770 ++next->usecount;
1651 1771
1652 cctx_prev = cctx_current; 1772 cctx_prev = cctx_current;
1653 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1773 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1654 1774
1655 next->cctx = 0; 1775 next->cctx = 0;
1656 1776
1657 if (expect_false (cctx_prev != cctx_current)) 1777 if (ecb_expect_false (cctx_prev != cctx_current))
1658 { 1778 {
1659 cctx_prev->top_env = PL_top_env; 1779 cctx_prev->top_env = PL_top_env;
1660 PL_top_env = cctx_current->top_env; 1780 PL_top_env = cctx_current->top_env;
1661 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1781 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1662 } 1782 }
… …
1668#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1788#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1669#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1789#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1670 1790
1671/** high level stuff ********************************************************/ 1791/** high level stuff ********************************************************/
1672 1792
1793/* this function is actually Coro, not Coro::State, but we call it from here */
1794/* because it is convenient - but it hasn't been declared yet for that reason */
1795static void
1796coro_call_on_destroy (pTHX_ struct coro *coro);
1797
1673static void 1798static void
1674coro_state_destroy (pTHX_ struct coro *coro) 1799coro_state_destroy (pTHX_ struct coro *coro)
1675{ 1800{
1676 if (coro->flags & CF_DESTROYED) 1801 if (coro->flags & CF_ZOMBIE)
1677 return; 1802 return;
1678 1803
1679 /* this callback is reserved for slf functions needing to do cleanup */
1680 if (coro->on_destroy && !PL_dirty)
1681 coro->on_destroy (aTHX_ coro); 1804 slf_destroy (aTHX_ coro);
1682 1805
1683 /*
1684 * The on_destroy above most likely is from an SLF call.
1685 * Since by definition the SLF call will not finish when we destroy
1686 * the coro, we will have to force-finish it here, otherwise
1687 * cleanup functions cannot call SLF functions.
1688 */
1689 coro->slf_frame.prepare = 0;
1690
1691 coro->flags |= CF_DESTROYED; 1806 coro->flags |= CF_ZOMBIE;
1692 1807
1693 if (coro->flags & CF_READY) 1808 if (coro->flags & CF_READY)
1694 { 1809 {
1695 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1810 /* reduce nready, as destroying a ready coro effectively unreadies it */
1696 /* alternative: look through all ready queues and remove the coro */ 1811 /* alternative: look through all ready queues and remove the coro */
1697 --coro_nready; 1812 --coro_nready;
1698 } 1813 }
1699 else 1814 else
1700 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1815 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1816
1817 if (coro->next) coro->next->prev = coro->prev;
1818 if (coro->prev) coro->prev->next = coro->next;
1819 if (coro == coro_first) coro_first = coro->next;
1701 1820
1702 if (coro->mainstack 1821 if (coro->mainstack
1703 && coro->mainstack != main_mainstack 1822 && coro->mainstack != main_mainstack
1704 && coro->slot 1823 && coro->slot
1705 && !PL_dirty) 1824 && !PL_dirty)
1706 destroy_perl (aTHX_ coro); 1825 destroy_perl (aTHX_ coro);
1707 1826
1708 if (coro->next) coro->next->prev = coro->prev;
1709 if (coro->prev) coro->prev->next = coro->next;
1710 if (coro == coro_first) coro_first = coro->next;
1711
1712 cctx_destroy (coro->cctx); 1827 cctx_destroy (coro->cctx);
1713 SvREFCNT_dec (coro->startcv); 1828 SvREFCNT_dec (coro->startcv);
1714 SvREFCNT_dec (coro->args); 1829 SvREFCNT_dec (coro->args);
1715 SvREFCNT_dec (coro->swap_sv); 1830 SvREFCNT_dec (coro->swap_sv);
1716 SvREFCNT_dec (CORO_THROW); 1831 SvREFCNT_dec (CORO_THROW);
1832
1833 coro_call_on_destroy (aTHX_ coro);
1834
1835 /* more destruction mayhem in coro_state_free */
1717} 1836}
1718 1837
1719static int 1838static int
1720coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1839coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1721{ 1840{
1722 struct coro *coro = (struct coro *)mg->mg_ptr; 1841 struct coro *coro = (struct coro *)mg->mg_ptr;
1723 mg->mg_ptr = 0; 1842 mg->mg_ptr = 0;
1724 1843
1725 coro->hv = 0;
1726
1727 if (--coro->refcnt < 0)
1728 {
1729 coro_state_destroy (aTHX_ coro); 1844 coro_state_destroy (aTHX_ coro);
1845 SvREFCNT_dec (coro->on_destroy);
1846 SvREFCNT_dec (coro->status);
1847
1730 Safefree (coro); 1848 Safefree (coro);
1731 }
1732 1849
1733 return 0; 1850 return 0;
1734} 1851}
1735 1852
1736static int 1853static int ecb_cold
1737coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1854coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1738{ 1855{
1739 struct coro *coro = (struct coro *)mg->mg_ptr; 1856 /* called when perl clones the current process the slow way (windows process emulation) */
1740 1857 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1741 ++coro->refcnt; 1858 mg->mg_ptr = 0;
1859 mg->mg_virtual = 0;
1742 1860
1743 return 0; 1861 return 0;
1744} 1862}
1745 1863
1746static MGVTBL coro_state_vtbl = { 1864static MGVTBL coro_state_vtbl = {
… …
1771 TRANSFER (ta, 1); 1889 TRANSFER (ta, 1);
1772} 1890}
1773 1891
1774/** Coro ********************************************************************/ 1892/** Coro ********************************************************************/
1775 1893
1776INLINE void 1894ecb_inline void
1777coro_enq (pTHX_ struct coro *coro) 1895coro_enq (pTHX_ struct coro *coro)
1778{ 1896{
1779 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1897 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1780 1898
1781 SvREFCNT_inc_NN (coro->hv); 1899 SvREFCNT_inc_NN (coro->hv);
… …
1783 coro->next_ready = 0; 1901 coro->next_ready = 0;
1784 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1902 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1785 ready [1] = coro; 1903 ready [1] = coro;
1786} 1904}
1787 1905
1788INLINE struct coro * 1906ecb_inline struct coro *
1789coro_deq (pTHX) 1907coro_deq (pTHX)
1790{ 1908{
1791 int prio; 1909 int prio;
1792 1910
1793 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1911 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1846{ 1964{
1847 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1965 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1848} 1966}
1849 1967
1850/* expects to own a reference to next->hv */ 1968/* expects to own a reference to next->hv */
1851INLINE void 1969ecb_inline void
1852prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1970prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1853{ 1971{
1854 SV *prev_sv = SvRV (coro_current); 1972 SV *prev_sv = SvRV (coro_current);
1855 1973
1856 ta->prev = SvSTATE_hv (prev_sv); 1974 ta->prev = SvSTATE_hv (prev_sv);
… …
1869{ 1987{
1870 for (;;) 1988 for (;;)
1871 { 1989 {
1872 struct coro *next = coro_deq (aTHX); 1990 struct coro *next = coro_deq (aTHX);
1873 1991
1874 if (expect_true (next)) 1992 if (ecb_expect_true (next))
1875 { 1993 {
1876 /* cannot transfer to destroyed coros, skip and look for next */ 1994 /* cannot transfer to destroyed coros, skip and look for next */
1877 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1995 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1878 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1996 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1879 else 1997 else
1880 { 1998 {
1881 next->flags &= ~CF_READY; 1999 next->flags &= ~CF_READY;
1882 --coro_nready; 2000 --coro_nready;
… …
1890 /* nothing to schedule: call the idle handler */ 2008 /* nothing to schedule: call the idle handler */
1891 if (SvROK (sv_idle) 2009 if (SvROK (sv_idle)
1892 && SvOBJECT (SvRV (sv_idle))) 2010 && SvOBJECT (SvRV (sv_idle)))
1893 { 2011 {
1894 if (SvRV (sv_idle) == SvRV (coro_current)) 2012 if (SvRV (sv_idle) == SvRV (coro_current))
2013 {
2014 require_pv ("Carp");
2015
2016 {
2017 dSP;
2018
2019 ENTER;
2020 SAVETMPS;
2021
2022 PUSHMARK (SP);
1895 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2023 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2024 PUTBACK;
2025 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2026
2027 FREETMPS;
2028 LEAVE;
2029 }
2030 }
1896 2031
1897 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2032 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1898 api_ready (aTHX_ SvRV (sv_idle)); 2033 api_ready (aTHX_ SvRV (sv_idle));
1899 --coro_nready; 2034 --coro_nready;
1900 } 2035 }
… …
1915 } 2050 }
1916 } 2051 }
1917 } 2052 }
1918} 2053}
1919 2054
1920INLINE void 2055ecb_inline void
1921prepare_cede (pTHX_ struct coro_transfer_args *ta) 2056prepare_cede (pTHX_ struct coro_transfer_args *ta)
1922{ 2057{
1923 api_ready (aTHX_ coro_current); 2058 api_ready (aTHX_ coro_current);
1924 prepare_schedule (aTHX_ ta); 2059 prepare_schedule (aTHX_ ta);
1925} 2060}
1926 2061
1927INLINE void 2062ecb_inline void
1928prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2063prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1929{ 2064{
1930 SV *prev = SvRV (coro_current); 2065 SV *prev = SvRV (coro_current);
1931 2066
1932 if (coro_nready) 2067 if (coro_nready)
… …
1962{ 2097{
1963 struct coro_transfer_args ta; 2098 struct coro_transfer_args ta;
1964 2099
1965 prepare_cede (aTHX_ &ta); 2100 prepare_cede (aTHX_ &ta);
1966 2101
1967 if (expect_true (ta.prev != ta.next)) 2102 if (ecb_expect_true (ta.prev != ta.next))
1968 { 2103 {
1969 TRANSFER (ta, 1); 2104 TRANSFER (ta, 1);
1970 return 1; 2105 return 1;
1971 } 2106 }
1972 else 2107 else
… …
2015 coro->slot->runops = RUNOPS_DEFAULT; 2150 coro->slot->runops = RUNOPS_DEFAULT;
2016 } 2151 }
2017} 2152}
2018 2153
2019static void 2154static void
2155coro_push_av (pTHX_ AV *av, I32 gimme_v)
2156{
2157 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2158 {
2159 dSP;
2160
2161 if (gimme_v == G_SCALAR)
2162 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2163 else
2164 {
2165 int i;
2166 EXTEND (SP, AvFILLp (av) + 1);
2167
2168 for (i = 0; i <= AvFILLp (av); ++i)
2169 PUSHs (AvARRAY (av)[i]);
2170 }
2171
2172 PUTBACK;
2173 }
2174}
2175
2176static void
2177coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2178{
2179 if (!coro->on_destroy)
2180 coro->on_destroy = newAV ();
2181
2182 av_push (coro->on_destroy, cb);
2183}
2184
2185static void
2186slf_destroy_join (pTHX_ struct CoroSLF *frame)
2187{
2188 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2189}
2190
2191static int
2192slf_check_join (pTHX_ struct CoroSLF *frame)
2193{
2194 struct coro *coro = (struct coro *)frame->data;
2195
2196 if (!coro->status)
2197 return 1;
2198
2199 frame->destroy = 0;
2200
2201 coro_push_av (aTHX_ coro->status, GIMME_V);
2202
2203 SvREFCNT_dec ((SV *)coro->hv);
2204
2205 return 0;
2206}
2207
2208static void
2209slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2210{
2211 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2212
2213 if (items > 1)
2214 croak ("join called with too many arguments");
2215
2216 if (coro->status)
2217 frame->prepare = prepare_nop;
2218 else
2219 {
2220 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2221 frame->prepare = prepare_schedule;
2222 }
2223
2224 frame->check = slf_check_join;
2225 frame->destroy = slf_destroy_join;
2226 frame->data = (void *)coro;
2227 SvREFCNT_inc (coro->hv);
2228}
2229
2230static void
2020coro_call_on_destroy (pTHX_ struct coro *coro) 2231coro_call_on_destroy (pTHX_ struct coro *coro)
2021{ 2232{
2022 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2233 AV *od = coro->on_destroy;
2023 2234
2024 if (on_destroyp) 2235 if (!od)
2025 { 2236 return;
2026 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2027 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2028 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2029 2237
2238 coro->on_destroy = 0;
2239 sv_2mortal ((SV *)od);
2240
2030 while (AvFILLp (on_destroy) >= 0) 2241 while (AvFILLp (od) >= 0)
2242 {
2243 SV *cb = sv_2mortal (av_pop (od));
2244
2245 /* coro hv's (and only hv's at the moment) are supported as well */
2246 if (SvSTATEhv_p (aTHX_ cb))
2247 api_ready (aTHX_ cb);
2248 else
2031 { 2249 {
2032 dSP; /* don't disturb outer sp */ 2250 dSP; /* don't disturb outer sp */
2033 SV *cb = av_pop (on_destroy);
2034
2035 PUSHMARK (SP); 2251 PUSHMARK (SP);
2036 2252
2037 if (statusp) 2253 if (coro->status)
2038 { 2254 {
2039 int i; 2255 PUTBACK;
2040 EXTEND (SP, AvFILLp (status) + 1); 2256 coro_push_av (aTHX_ coro->status, G_ARRAY);
2041 2257 SPAGAIN;
2042 for (i = 0; i <= AvFILLp (status); ++i)
2043 PUSHs (AvARRAY (status)[i]);
2044 } 2258 }
2045 2259
2046 PUTBACK; 2260 PUTBACK;
2047 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2261 call_sv (cb, G_VOID | G_DISCARD);
2048 } 2262 }
2049 } 2263 }
2050} 2264}
2051 2265
2052static void 2266static void
2053coro_set_status (HV *coro_hv, SV **arg, int items) 2267coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2054{ 2268{
2055 AV *av = newAV (); 2269 AV *av;
2270
2271 if (coro->status)
2272 {
2273 av = coro->status;
2274 av_clear (av);
2275 }
2276 else
2277 av = coro->status = newAV ();
2056 2278
2057 /* items are actually not so common, so optimise for this case */ 2279 /* items are actually not so common, so optimise for this case */
2058 if (items) 2280 if (items)
2059 { 2281 {
2060 int i; 2282 int i;
… …
2062 av_extend (av, items - 1); 2284 av_extend (av, items - 1);
2063 2285
2064 for (i = 0; i < items; ++i) 2286 for (i = 0; i < items; ++i)
2065 av_push (av, SvREFCNT_inc_NN (arg [i])); 2287 av_push (av, SvREFCNT_inc_NN (arg [i]));
2066 } 2288 }
2067
2068 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2069} 2289}
2070 2290
2071static void 2291static void
2072slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2292slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2073{ 2293{
… …
2085static void 2305static void
2086slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2306slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2087{ 2307{
2088 HV *coro_hv = (HV *)SvRV (coro_current); 2308 HV *coro_hv = (HV *)SvRV (coro_current);
2089 2309
2090 coro_set_status (coro_hv, arg, items); 2310 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2091 slf_init_terminate_cancel_common (frame, coro_hv); 2311 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2092} 2312}
2093 2313
2094static void 2314static void
2095slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2315slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2096{ 2316{
… …
2101 croak ("Coro::cancel called without coro object,"); 2321 croak ("Coro::cancel called without coro object,");
2102 2322
2103 coro = SvSTATE (arg [0]); 2323 coro = SvSTATE (arg [0]);
2104 coro_hv = coro->hv; 2324 coro_hv = coro->hv;
2105 2325
2106 coro_set_status (coro_hv, arg + 1, items - 1); 2326 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2107 2327
2108 if (expect_false (coro->flags & CF_NOCANCEL)) 2328 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2109 { 2329 {
2110 /* coro currently busy cancelling something, so just notify it */ 2330 /* coro currently busy cancelling something, so just notify it */
2111 coro->slf_frame.data = (void *)coro; 2331 coro->slf_frame.data = (void *)coro;
2112 2332
2113 frame->prepare = prepare_nop; 2333 frame->prepare = prepare_nop;
2114 frame->check = slf_check_nop; 2334 frame->check = slf_check_nop;
2115 } 2335 }
2116 else if (coro_hv == (HV *)SvRV (coro_current)) 2336 else if (coro_hv == (HV *)SvRV (coro_current))
2117 { 2337 {
2118 /* cancelling the current coro is allowed, and equals terminate */ 2338 /* cancelling the current coro is allowed, and equals terminate */
2119 slf_init_terminate_cancel_common (frame, coro_hv); 2339 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2120 } 2340 }
2121 else 2341 else
2122 { 2342 {
2123 struct coro *self = SvSTATE_current; 2343 struct coro *self = SvSTATE_current;
2344
2345 if (!self)
2346 croak ("Coro::cancel called outside of thread content,");
2124 2347
2125 /* otherwise we cancel directly, purely for speed reasons 2348 /* otherwise we cancel directly, purely for speed reasons
2126 * unfortunately, this requires some magic trickery, as 2349 * unfortunately, this requires some magic trickery, as
2127 * somebody else could cancel us, so we have to fight the cancellation. 2350 * somebody else could cancel us, so we have to fight the cancellation.
2128 * this is ugly, and hopefully fully worth the extra speed. 2351 * this is ugly, and hopefully fully worth the extra speed.
2129 * besides, I can't get the slow-but-safe version working... 2352 * besides, I can't get the slow-but-safe version working...
2130 */ 2353 */
2131 slf_frame.data = 0; 2354 slf_frame.data = 0;
2132 self->flags |= CF_NOCANCEL; 2355 self->flags |= CF_NOCANCEL;
2133
2134 coro_state_destroy (aTHX_ coro); 2356 coro_state_destroy (aTHX_ coro);
2135 coro_call_on_destroy (aTHX_ coro);
2136
2137 self->flags &= ~CF_NOCANCEL; 2357 self->flags &= ~CF_NOCANCEL;
2138 2358
2139 if (slf_frame.data) 2359 if (slf_frame.data)
2140 { 2360 {
2141 /* while we were busy we have been cancelled, so terminate */ 2361 /* while we were busy we have been cancelled, so terminate */
2142 slf_init_terminate_cancel_common (frame, self->hv); 2362 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2143 } 2363 }
2144 else 2364 else
2145 { 2365 {
2146 frame->prepare = prepare_nop; 2366 frame->prepare = prepare_nop;
2147 frame->check = slf_check_nop; 2367 frame->check = slf_check_nop;
2148 } 2368 }
2149 } 2369 }
2150} 2370}
2151 2371
2372static int
2373slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2374{
2375 frame->prepare = 0;
2376 coro_unwind_stacks (aTHX);
2377
2378 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2379
2380 return 1;
2381}
2382
2383static int
2384safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2385{
2386 if (coro->cctx)
2387 croak ("coro inside C callback, unable to cancel at this time, caught");
2388
2389 if (coro->flags & CF_NEW)
2390 {
2391 coro_set_status (aTHX_ coro, arg, items);
2392 coro_state_destroy (aTHX_ coro);
2393 }
2394 else
2395 {
2396 if (!coro->slf_frame.prepare)
2397 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2398
2399 slf_destroy (aTHX_ coro);
2400
2401 coro_set_status (aTHX_ coro, arg, items);
2402 coro->slf_frame.prepare = prepare_nop;
2403 coro->slf_frame.check = slf_check_safe_cancel;
2404
2405 api_ready (aTHX_ (SV *)coro->hv);
2406 }
2407
2408 return 1;
2409}
2410
2152/*****************************************************************************/ 2411/*****************************************************************************/
2153/* async pool handler */ 2412/* async pool handler */
2154 2413
2155static int 2414static int
2156slf_check_pool_handler (pTHX_ struct CoroSLF *frame) 2415slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
… …
2185slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2444slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2186{ 2445{
2187 HV *hv = (HV *)SvRV (coro_current); 2446 HV *hv = (HV *)SvRV (coro_current);
2188 struct coro *coro = SvSTATE_hv ((SV *)hv); 2447 struct coro *coro = SvSTATE_hv ((SV *)hv);
2189 2448
2190 if (expect_true (coro->saved_deffh)) 2449 if (ecb_expect_true (coro->saved_deffh))
2191 { 2450 {
2192 /* subsequent iteration */ 2451 /* subsequent iteration */
2193 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2452 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2194 coro->saved_deffh = 0; 2453 coro->saved_deffh = 0;
2195 2454
2196 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2455 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2197 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2456 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2198 { 2457 {
2199 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2458 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2200 coro->invoke_av = newAV (); 2459 return;
2201
2202 frame->prepare = prepare_nop;
2203 } 2460 }
2204 else 2461 else
2205 { 2462 {
2206 av_clear (GvAV (PL_defgv)); 2463 av_clear (GvAV (PL_defgv));
2207 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2464 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2208 2465
2466 if (ecb_expect_false (coro->swap_sv))
2467 {
2468 swap_svs_leave (coro);
2469 SvREFCNT_dec_NN (coro->swap_sv);
2470 coro->swap_sv = 0;
2471 }
2472
2209 coro->prio = 0; 2473 coro->prio = 0;
2210 2474
2211 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2475 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2212 api_trace (aTHX_ coro_current, 0); 2476 api_trace (aTHX_ coro_current, 0);
2213 2477
2214 frame->prepare = prepare_schedule; 2478 frame->prepare = prepare_schedule;
2215 av_push (av_async_pool, SvREFCNT_inc (hv)); 2479 av_push (av_async_pool, SvREFCNT_inc (hv));
2216 } 2480 }
… …
2257 2521
2258static int 2522static int
2259slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2523slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2260{ 2524{
2261 SV *data = (SV *)frame->data; 2525 SV *data = (SV *)frame->data;
2262 2526
2263 if (CORO_THROW) 2527 if (CORO_THROW)
2264 return 0; 2528 return 0;
2265 2529
2266 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2530 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2267 return 1; 2531 return 1;
… …
2303 cb = sv_2mortal (coro->rouse_cb); 2567 cb = sv_2mortal (coro->rouse_cb);
2304 coro->rouse_cb = 0; 2568 coro->rouse_cb = 0;
2305 } 2569 }
2306 2570
2307 if (!SvROK (cb) 2571 if (!SvROK (cb)
2308 || SvTYPE (SvRV (cb)) != SVt_PVCV 2572 || SvTYPE (SvRV (cb)) != SVt_PVCV
2309 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2573 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2310 croak ("Coro::rouse_wait called with illegal callback argument,"); 2574 croak ("Coro::rouse_wait called with illegal callback argument,");
2311 2575
2312 { 2576 {
2313 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2577 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2430static void 2694static void
2431slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2695slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2432{ 2696{
2433 frame->prepare = prepare_cede_notself; 2697 frame->prepare = prepare_cede_notself;
2434 frame->check = slf_check_nop; 2698 frame->check = slf_check_nop;
2699}
2700
2701/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2702static void
2703slf_destroy (pTHX_ struct coro *coro)
2704{
2705 struct CoroSLF frame = coro->slf_frame;
2706
2707 /*
2708 * The on_destroy below most likely is from an SLF call.
2709 * Since by definition the SLF call will not finish when we destroy
2710 * the coro, we will have to force-finish it here, otherwise
2711 * cleanup functions cannot call SLF functions.
2712 */
2713 coro->slf_frame.prepare = 0;
2714
2715 /* this callback is reserved for slf functions needing to do cleanup */
2716 if (frame.destroy && frame.prepare && !PL_dirty)
2717 frame.destroy (aTHX_ &frame);
2435} 2718}
2436 2719
2437/* 2720/*
2438 * these not obviously related functions are all rolled into one 2721 * these not obviously related functions are all rolled into one
2439 * function to increase chances that they all will call transfer with the same 2722 * function to increase chances that they all will call transfer with the same
… …
2446 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2729 I32 checkmark; /* mark SP to see how many elements check has pushed */
2447 2730
2448 /* set up the slf frame, unless it has already been set-up */ 2731 /* set up the slf frame, unless it has already been set-up */
2449 /* the latter happens when a new coro has been started */ 2732 /* the latter happens when a new coro has been started */
2450 /* or when a new cctx was attached to an existing coroutine */ 2733 /* or when a new cctx was attached to an existing coroutine */
2451 if (expect_true (!slf_frame.prepare)) 2734 if (ecb_expect_true (!slf_frame.prepare))
2452 { 2735 {
2453 /* first iteration */ 2736 /* first iteration */
2454 dSP; 2737 dSP;
2455 SV **arg = PL_stack_base + TOPMARK + 1; 2738 SV **arg = PL_stack_base + TOPMARK + 1;
2456 int items = SP - arg; /* args without function object */ 2739 int items = SP - arg; /* args without function object */
… …
2497 while (slf_frame.check (aTHX_ &slf_frame)); 2780 while (slf_frame.check (aTHX_ &slf_frame));
2498 2781
2499 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2782 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2500 2783
2501 /* exception handling */ 2784 /* exception handling */
2502 if (expect_false (CORO_THROW)) 2785 if (ecb_expect_false (CORO_THROW))
2503 { 2786 {
2504 SV *exception = sv_2mortal (CORO_THROW); 2787 SV *exception = sv_2mortal (CORO_THROW);
2505 2788
2506 CORO_THROW = 0; 2789 CORO_THROW = 0;
2507 sv_setsv (ERRSV, exception); 2790 sv_setsv (ERRSV, exception);
2508 croak (0); 2791 croak (0);
2509 } 2792 }
2510 2793
2511 /* return value handling - mostly like entersub */ 2794 /* return value handling - mostly like entersub */
2512 /* make sure we put something on the stack in scalar context */ 2795 /* make sure we put something on the stack in scalar context */
2513 if (GIMME_V == G_SCALAR) 2796 if (GIMME_V == G_SCALAR
2797 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2514 { 2798 {
2515 dSP; 2799 dSP;
2516 SV **bot = PL_stack_base + checkmark; 2800 SV **bot = PL_stack_base + checkmark;
2517 2801
2518 if (sp == bot) /* too few, push undef */ 2802 if (sp == bot) /* too few, push undef */
2519 bot [1] = &PL_sv_undef; 2803 bot [1] = &PL_sv_undef;
2520 else if (sp != bot + 1) /* too many, take last one */ 2804 else /* too many, take last one */
2521 bot [1] = *sp; 2805 bot [1] = *sp;
2522 2806
2523 SP = bot + 1; 2807 SP = bot + 1;
2524 2808
2525 PUTBACK; 2809 PUTBACK;
… …
2623{ 2907{
2624 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2908 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2625 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2909 on_enterleave_call (aTHX_ sv_2mortal (cb));
2626} 2910}
2627 2911
2912static void
2913enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2914{
2915 if (!hook)
2916 return;
2917
2918 if (!*avp)
2919 {
2920 *avp = newAV ();
2921 AvREAL_off (*avp);
2922 }
2923
2924 av_push (*avp, (SV *)hook);
2925 av_push (*avp, (SV *)arg);
2926}
2927
2928static void
2929enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2930{
2931 AV *av = *avp;
2932 int i;
2933
2934 if (!av)
2935 return;
2936
2937 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2938 if (AvARRAY (av)[i] == (SV *)hook)
2939 {
2940 if (execute)
2941 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2942
2943 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2944 av_pop (av);
2945 av_pop (av);
2946 break;
2947 }
2948
2949 if (AvFILLp (av) >= 0)
2950 {
2951 *avp = 0;
2952 SvREFCNT_dec_NN (av);
2953 }
2954}
2955
2956static void
2957api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2958{
2959 struct coro *coro = SvSTATE (coro_sv);
2960
2961 if (SvSTATE_current == coro)
2962 if (enter)
2963 enter (aTHX_ enter_arg);
2964
2965 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2966 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2967}
2968
2969static void
2970api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2971{
2972 struct coro *coro = SvSTATE (coro_sv);
2973
2974 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2975 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2976}
2977
2978static void
2979savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2980{
2981 struct coro *coro = SvSTATE_current;
2982
2983 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2984}
2985
2986static void
2987savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2988{
2989 struct coro *coro = SvSTATE_current;
2990
2991 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2992}
2993
2994static void
2995api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2996{
2997 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2998
2999 /* this ought to be much cheaper than malloc + a single destructor call */
3000 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
3001 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
3002}
3003
2628/*****************************************************************************/ 3004/*****************************************************************************/
2629/* PerlIO::cede */ 3005/* PerlIO::cede */
2630 3006
2631typedef struct 3007typedef struct
2632{ 3008{
2633 PerlIOBuf base; 3009 PerlIOBuf base;
2634 NV next, every; 3010 NV next, every;
2635} PerlIOCede; 3011} PerlIOCede;
2636 3012
2637static IV 3013static IV ecb_cold
2638PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 3014PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2639{ 3015{
2640 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3016 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2641 3017
2642 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 3018 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2643 self->next = nvtime () + self->every; 3019 self->next = nvtime () + self->every;
2644 3020
2645 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 3021 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2646} 3022}
2647 3023
2648static SV * 3024static SV * ecb_cold
2649PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3025PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2650{ 3026{
2651 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3027 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2652 3028
2653 return newSVnv (self->every); 3029 return newSVnv (self->every);
… …
2760 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3136 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2761 PUTBACK; 3137 PUTBACK;
2762 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3138 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2763 } 3139 }
2764 3140
2765 SvREFCNT_dec (cb); 3141 SvREFCNT_dec_NN (cb);
2766 } 3142 }
2767} 3143}
2768 3144
2769static void 3145static void
2770coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3146coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2771{ 3147{
2772 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3148 /* call $sem->adjust (0) to possibly wake up some other waiters */
2773 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3149 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2774} 3150}
2775 3151
2776static int 3152static int
2777slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3153slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2778{ 3154{
2779 AV *av = (AV *)frame->data; 3155 AV *av = (AV *)frame->data;
2780 SV *count_sv = AvARRAY (av)[0]; 3156 SV *count_sv = AvARRAY (av)[0];
3157 SV *coro_hv = SvRV (coro_current);
3158
3159 frame->destroy = 0;
2781 3160
2782 /* if we are about to throw, don't actually acquire the lock, just throw */ 3161 /* if we are about to throw, don't actually acquire the lock, just throw */
2783 if (CORO_THROW) 3162 if (ecb_expect_false (CORO_THROW))
3163 {
3164 /* we still might be responsible for the semaphore, so wake up others */
3165 coro_semaphore_adjust (aTHX_ av, 0);
3166
2784 return 0; 3167 return 0;
3168 }
2785 else if (SvIVX (count_sv) > 0) 3169 else if (SvIVX (count_sv) > 0)
2786 { 3170 {
2787 SvSTATE_current->on_destroy = 0;
2788
2789 if (acquire) 3171 if (acquire)
2790 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3172 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2791 else 3173 else
2792 coro_semaphore_adjust (aTHX_ av, 0); 3174 coro_semaphore_adjust (aTHX_ av, 0);
2793 3175
… …
2797 { 3179 {
2798 int i; 3180 int i;
2799 /* if we were woken up but can't down, we look through the whole */ 3181 /* if we were woken up but can't down, we look through the whole */
2800 /* waiters list and only add us if we aren't in there already */ 3182 /* waiters list and only add us if we aren't in there already */
2801 /* this avoids some degenerate memory usage cases */ 3183 /* this avoids some degenerate memory usage cases */
2802 3184 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2803 for (i = 1; i <= AvFILLp (av); ++i)
2804 if (AvARRAY (av)[i] == SvRV (coro_current)) 3185 if (AvARRAY (av)[i] == coro_hv)
2805 return 1; 3186 return 1;
2806 3187
2807 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3188 av_push (av, SvREFCNT_inc (coro_hv));
2808 return 1; 3189 return 1;
2809 } 3190 }
2810} 3191}
2811 3192
2812static int 3193static int
… …
2835 { 3216 {
2836 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3217 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2837 3218
2838 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3219 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2839 frame->prepare = prepare_schedule; 3220 frame->prepare = prepare_schedule;
2840
2841 /* to avoid race conditions when a woken-up coro gets terminated */ 3221 /* to avoid race conditions when a woken-up coro gets terminated */
2842 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3222 /* we arrange for a temporary on_destroy that calls adjust (0) */
2843 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3223 frame->destroy = coro_semaphore_destroy;
2844 } 3224 }
2845} 3225}
2846 3226
2847static void 3227static void
2848slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3228slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2906 { 3286 {
2907 api_ready (aTHX_ cb); 3287 api_ready (aTHX_ cb);
2908 sv_setiv (cb, 0); /* signal waiter */ 3288 sv_setiv (cb, 0); /* signal waiter */
2909 } 3289 }
2910 3290
2911 SvREFCNT_dec (cb); 3291 SvREFCNT_dec_NN (cb);
2912 3292
2913 --count; 3293 --count;
2914 } 3294 }
2915} 3295}
2916 3296
… …
3001 } 3381 }
3002 3382
3003 av_push (state, data_sv); 3383 av_push (state, data_sv);
3004 3384
3005 api_ready (aTHX_ coro); 3385 api_ready (aTHX_ coro);
3006 SvREFCNT_dec (coro); 3386 SvREFCNT_dec_NN (coro);
3007 SvREFCNT_dec ((AV *)state); 3387 SvREFCNT_dec_NN ((AV *)state);
3008} 3388}
3009 3389
3010static int 3390static int
3011slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3391slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3012{ 3392{
… …
3017 /* it quickly returns */ 3397 /* it quickly returns */
3018 if (CORO_THROW) 3398 if (CORO_THROW)
3019 return 0; 3399 return 0;
3020 3400
3021 /* one element that is an RV? repeat! */ 3401 /* one element that is an RV? repeat! */
3022 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3402 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3023 return 1; 3403 return 1;
3024 3404
3025 /* restore status */ 3405 /* restore status */
3026 { 3406 {
3027 SV *data_sv = av_pop (state); 3407 SV *data_sv = av_pop (state);
… …
3030 errno = data->errorno; 3410 errno = data->errorno;
3031 PL_laststype = data->laststype; 3411 PL_laststype = data->laststype;
3032 PL_laststatval = data->laststatval; 3412 PL_laststatval = data->laststatval;
3033 PL_statcache = data->statcache; 3413 PL_statcache = data->statcache;
3034 3414
3035 SvREFCNT_dec (data_sv); 3415 SvREFCNT_dec_NN (data_sv);
3036 } 3416 }
3037 3417
3038 /* push result values */ 3418 /* push result values */
3039 { 3419 {
3040 dSP; 3420 dSP;
… …
3066 dSP; 3446 dSP;
3067 3447
3068 static SV *prio_cv; 3448 static SV *prio_cv;
3069 static SV *prio_sv; 3449 static SV *prio_sv;
3070 3450
3071 if (expect_false (!prio_cv)) 3451 if (ecb_expect_false (!prio_cv))
3072 { 3452 {
3073 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3453 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3074 prio_sv = newSViv (0); 3454 prio_sv = newSViv (0);
3075 } 3455 }
3076 3456
… …
3182 } 3562 }
3183 3563
3184 return coro_sv; 3564 return coro_sv;
3185} 3565}
3186 3566
3567#ifndef __cplusplus
3568ecb_cold XS(boot_Coro__State);
3569#endif
3570
3571#if CORO_JIT
3572
3573static void ecb_noinline ecb_cold
3574pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3575{
3576 dSP;
3577 AV *av = newAV ();
3578
3579 av_store (av, 3, newSVuv (d));
3580 av_store (av, 2, newSVuv (c));
3581 av_store (av, 1, newSVuv (b));
3582 av_store (av, 0, newSVuv (a));
3583
3584 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3585
3586 PUTBACK;
3587}
3588
3589static void ecb_noinline ecb_cold
3590jit_init (pTHX)
3591{
3592 dSP;
3593 SV *load, *save;
3594 char *map_base;
3595 char *load_ptr, *save_ptr;
3596 STRLEN load_len, save_len, map_len;
3597 int count;
3598
3599 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3600
3601 PUSHMARK (SP);
3602 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3603 #include "state.h"
3604 count = call_pv ("Coro::State::_jit", G_ARRAY);
3605 SPAGAIN;
3606
3607 save = POPs; save_ptr = SvPVbyte (save, save_len);
3608 load = POPs; load_ptr = SvPVbyte (load, load_len);
3609
3610 map_len = load_len + save_len + 16;
3611
3612 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3613
3614 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3615
3616 load_perl_slots = (load_save_perl_slots_type)map_base;
3617 memcpy (map_base, load_ptr, load_len);
3618
3619 map_base += (load_len + 15) & ~15;
3620
3621 save_perl_slots = (load_save_perl_slots_type)map_base;
3622 memcpy (map_base, save_ptr, save_len);
3623
3624 /* we are good citizens and try to make the page read-only, so the evil evil */
3625 /* hackers might have it a bit more difficult */
3626 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3627
3628 PUTBACK;
3629 eval_pv ("undef &Coro::State::_jit", 1);
3630}
3631
3632#endif
3633
3187MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3634MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3188 3635
3189PROTOTYPES: DISABLE 3636PROTOTYPES: DISABLE
3190 3637
3191BOOT: 3638BOOT:
3192{ 3639{
3640#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3641#include "state.h"
3193#ifdef USE_ITHREADS 3642#ifdef USE_ITHREADS
3194# if CORO_PTHREAD 3643# if CORO_PTHREAD
3195 coro_thx = PERL_GET_CONTEXT; 3644 coro_thx = PERL_GET_CONTEXT;
3196# endif 3645# endif
3197#endif 3646#endif
3198 BOOT_PAGESIZE; 3647 /* perl defines these to check for existance first, but why it doesn't */
3648 /* just create them one at init time is not clear to me, except for */
3649 /* programs trying to delete them, but... */
3650 /* anyway, we declare this as invalid and make sure they are initialised here */
3651 DEFSV;
3652 ERRSV;
3199 3653
3200 cctx_current = cctx_new_empty (); 3654 cctx_current = cctx_new_empty ();
3201 3655
3202 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3656 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3203 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3657 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3204 3658
3205 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3659 {
3206 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3660 /*
3207 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3661 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3662 * by coro_sig_vtbl in hash values.
3663 */
3664 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3665
3666 /* this only works if perl doesn't have a vtbl for %SIG */
3667 assert (!mg->mg_virtual);
3668
3669 /*
3670 * The irony is that the perl API itself asserts that mg_virtual
3671 * must be non-const, yet perl5porters insisted on marking their
3672 * vtbls as read-only, just to thwart perl modules from patching
3673 * them.
3674 */
3675 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3676 mg->mg_flags |= MGf_COPY;
3677
3678 coro_sigelem_vtbl = PL_vtbl_sigelem;
3679 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3680 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3681 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3682 }
3208 3683
3209 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3210 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3684 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3211 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3685 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3212 3686
3213 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3687 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3214 3688
… …
3246 coroapi.prepare_cede_notself = prepare_cede_notself; 3720 coroapi.prepare_cede_notself = prepare_cede_notself;
3247 3721
3248 time_init (aTHX); 3722 time_init (aTHX);
3249 3723
3250 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3724 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3725#if CORO_JIT
3726 PUTBACK;
3727 jit_init (aTHX);
3728 SPAGAIN;
3729#endif
3251} 3730}
3252 3731
3253SV * 3732SV *
3254new (SV *klass, ...) 3733new (SV *klass, ...)
3255 ALIAS: 3734 ALIAS:
… …
3262void 3741void
3263transfer (...) 3742transfer (...)
3264 PROTOTYPE: $$ 3743 PROTOTYPE: $$
3265 CODE: 3744 CODE:
3266 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3745 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3267
3268void
3269_exit (int code)
3270 PROTOTYPE: $
3271 CODE:
3272 _exit (code);
3273 3746
3274SV * 3747SV *
3275clone (Coro::State coro) 3748clone (Coro::State coro)
3276 CODE: 3749 CODE:
3277{ 3750{
… …
3332void 3805void
3333list () 3806list ()
3334 PROTOTYPE: 3807 PROTOTYPE:
3335 PPCODE: 3808 PPCODE:
3336{ 3809{
3337 struct coro *coro; 3810 struct coro *coro;
3338 for (coro = coro_first; coro; coro = coro->next) 3811 for (coro = coro_first; coro; coro = coro->next)
3339 if (coro->hv) 3812 if (coro->hv)
3340 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3813 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3341} 3814}
3342 3815
… …
3397 PROTOTYPE: $ 3870 PROTOTYPE: $
3398 ALIAS: 3871 ALIAS:
3399 is_ready = CF_READY 3872 is_ready = CF_READY
3400 is_running = CF_RUNNING 3873 is_running = CF_RUNNING
3401 is_new = CF_NEW 3874 is_new = CF_NEW
3402 is_destroyed = CF_DESTROYED 3875 is_destroyed = CF_ZOMBIE
3876 is_zombie = CF_ZOMBIE
3403 is_suspended = CF_SUSPENDED 3877 is_suspended = CF_SUSPENDED
3404 CODE: 3878 CODE:
3405 RETVAL = boolSV (coro->flags & ix); 3879 RETVAL = boolSV (coro->flags & ix);
3406 OUTPUT: 3880 OUTPUT:
3407 RETVAL 3881 RETVAL
3408 3882
3409void 3883void
3410throw (Coro::State self, SV *exception = &PL_sv_undef) 3884throw (SV *self, SV *exception = &PL_sv_undef)
3411 PROTOTYPE: $;$ 3885 PROTOTYPE: $;$
3412 CODE: 3886 CODE:
3413{ 3887{
3888 struct coro *coro = SvSTATE (self);
3414 struct coro *current = SvSTATE_current; 3889 struct coro *current = SvSTATE_current;
3415 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3890 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3416 SvREFCNT_dec (*exceptionp); 3891 SvREFCNT_dec (*exceptionp);
3417 SvGETMAGIC (exception); 3892 SvGETMAGIC (exception);
3418 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3893 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3894
3895 api_ready (aTHX_ self);
3419} 3896}
3420 3897
3421void 3898void
3422api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3899api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3423 PROTOTYPE: $;$ 3900 PROTOTYPE: $;$
… …
3500 3977
3501void 3978void
3502times (Coro::State self) 3979times (Coro::State self)
3503 PPCODE: 3980 PPCODE:
3504{ 3981{
3505 struct coro *current = SvSTATE (coro_current); 3982 struct coro *current = SvSTATE (coro_current);
3506 3983
3507 if (expect_false (current == self)) 3984 if (ecb_expect_false (current == self))
3508 { 3985 {
3509 coro_times_update (); 3986 coro_times_update ();
3510 coro_times_add (SvSTATE (coro_current)); 3987 coro_times_add (SvSTATE (coro_current));
3511 } 3988 }
3512 3989
3513 EXTEND (SP, 2); 3990 EXTEND (SP, 2);
3514 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3991 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3515 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3992 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3516 3993
3517 if (expect_false (current == self)) 3994 if (ecb_expect_false (current == self))
3518 coro_times_sub (SvSTATE (coro_current)); 3995 coro_times_sub (SvSTATE (coro_current));
3519} 3996}
3520 3997
3521void 3998void
3522swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3999swap_sv (Coro::State coro, SV *sva, SV *svb)
3523 CODE: 4000 CODE:
3524{ 4001{
3525 struct coro *current = SvSTATE_current; 4002 struct coro *current = SvSTATE_current;
4003 AV *swap_sv;
4004 int i;
4005
4006 sva = SvRV (sva);
4007 svb = SvRV (svb);
3526 4008
3527 if (current == coro) 4009 if (current == coro)
3528 SWAP_SVS (current); 4010 SWAP_SVS_LEAVE (current);
3529 4011
3530 if (!coro->swap_sv) 4012 if (!coro->swap_sv)
3531 coro->swap_sv = newAV (); 4013 coro->swap_sv = newAV ();
3532 4014
4015 swap_sv = coro->swap_sv;
4016
4017 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4018 {
4019 SV *a = AvARRAY (swap_sv)[i ];
4020 SV *b = AvARRAY (swap_sv)[i + 1];
4021
4022 if (a == sva && b == svb)
4023 {
4024 SvREFCNT_dec_NN (a);
4025 SvREFCNT_dec_NN (b);
4026
4027 for (; i <= AvFILLp (swap_sv) - 2; i++)
4028 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4029
4030 AvFILLp (swap_sv) -= 2;
4031
4032 goto removed;
4033 }
4034 }
4035
3533 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4036 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3534 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4037 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4038
4039 removed:
3535 4040
3536 if (current == coro) 4041 if (current == coro)
3537 SWAP_SVS (current); 4042 SWAP_SVS_ENTER (current);
3538} 4043}
3539 4044
3540 4045
3541MODULE = Coro::State PACKAGE = Coro 4046MODULE = Coro::State PACKAGE = Coro
3542 4047
3543BOOT: 4048BOOT:
3544{ 4049{
4050 if (SVt_LAST > 32)
4051 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4052
3545 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4053 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3546 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4054 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3547 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4055 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3548 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3549 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4056 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3550 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4057 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3551 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4058 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3552 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4059 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3553 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4060 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3554 4061
3555 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4062 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3556 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4063 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3557 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4064 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3558 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 4065 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3559 4066
3560 coro_stash = gv_stashpv ("Coro", TRUE); 4067 coro_stash = gv_stashpv ("Coro", TRUE);
3561 4068
3562 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4069 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3563 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4070 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3564 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4071 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3576 coroapi.ready = api_ready; 4083 coroapi.ready = api_ready;
3577 coroapi.is_ready = api_is_ready; 4084 coroapi.is_ready = api_is_ready;
3578 coroapi.nready = coro_nready; 4085 coroapi.nready = coro_nready;
3579 coroapi.current = coro_current; 4086 coroapi.current = coro_current;
3580 4087
4088 coroapi.enterleave_hook = api_enterleave_hook;
4089 coroapi.enterleave_unhook = api_enterleave_unhook;
4090 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4091
3581 /*GCoroAPI = &coroapi;*/ 4092 /*GCoroAPI = &coroapi;*/
3582 sv_setiv (sv, (IV)&coroapi); 4093 sv_setiv (sv, (IV)&coroapi);
3583 SvREADONLY_on (sv); 4094 SvREADONLY_on (sv);
3584 } 4095 }
3585} 4096}
… …
3596void 4107void
3597_destroy (Coro::State coro) 4108_destroy (Coro::State coro)
3598 CODE: 4109 CODE:
3599 /* used by the manager thread */ 4110 /* used by the manager thread */
3600 coro_state_destroy (aTHX_ coro); 4111 coro_state_destroy (aTHX_ coro);
4112
4113void
4114on_destroy (Coro::State coro, SV *cb)
4115 CODE:
3601 coro_call_on_destroy (aTHX_ coro); 4116 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4117
4118void
4119join (...)
4120 CODE:
4121 CORO_EXECUTE_SLF_XS (slf_init_join);
3602 4122
3603void 4123void
3604terminate (...) 4124terminate (...)
3605 CODE: 4125 CODE:
3606 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4126 CORO_EXECUTE_SLF_XS (slf_init_terminate);
… …
3608void 4128void
3609cancel (...) 4129cancel (...)
3610 CODE: 4130 CODE:
3611 CORO_EXECUTE_SLF_XS (slf_init_cancel); 4131 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3612 4132
4133int
4134safe_cancel (Coro::State self, ...)
4135 C_ARGS: aTHX_ self, &ST (1), items - 1
4136
3613void 4137void
3614schedule (...) 4138schedule (...)
3615 CODE: 4139 CODE:
3616 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4140 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3617 4141
… …
3637 4161
3638void 4162void
3639_set_current (SV *current) 4163_set_current (SV *current)
3640 PROTOTYPE: $ 4164 PROTOTYPE: $
3641 CODE: 4165 CODE:
3642 SvREFCNT_dec (SvRV (coro_current)); 4166 SvREFCNT_dec_NN (SvRV (coro_current));
3643 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4167 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3644 4168
3645void 4169void
3646_set_readyhook (SV *hook) 4170_set_readyhook (SV *hook)
3647 PROTOTYPE: $ 4171 PROTOTYPE: $
… …
3731 4255
3732 if ((SV *)hv == &PL_sv_undef) 4256 if ((SV *)hv == &PL_sv_undef)
3733 { 4257 {
3734 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4258 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3735 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4259 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3736 SvREFCNT_dec (sv); 4260 SvREFCNT_dec_NN (sv);
3737 } 4261 }
3738 4262
3739 { 4263 {
3740 struct coro *coro = SvSTATE_hv (hv); 4264 struct coro *coro = SvSTATE_hv (hv);
3741 4265
… …
3748 api_ready (aTHX_ (SV *)hv); 4272 api_ready (aTHX_ (SV *)hv);
3749 4273
3750 if (GIMME_V != G_VOID) 4274 if (GIMME_V != G_VOID)
3751 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4275 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3752 else 4276 else
3753 SvREFCNT_dec (hv); 4277 SvREFCNT_dec_NN (hv);
3754} 4278}
3755 4279
3756SV * 4280SV *
3757rouse_cb () 4281rouse_cb ()
3758 PROTOTYPE: 4282 PROTOTYPE:
… …
3773 on_leave = 1 4297 on_leave = 1
3774 PROTOTYPE: & 4298 PROTOTYPE: &
3775 CODE: 4299 CODE:
3776{ 4300{
3777 struct coro *coro = SvSTATE_current; 4301 struct coro *coro = SvSTATE_current;
3778 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4302 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3779 4303
3780 block = s_get_cv_croak (block); 4304 block = s_get_cv_croak (block);
3781 4305
3782 if (!*avp) 4306 if (!*avp)
3783 *avp = newAV (); 4307 *avp = newAV ();
… …
3803 4327
3804SV * 4328SV *
3805new (SV *klass, SV *count = 0) 4329new (SV *klass, SV *count = 0)
3806 CODE: 4330 CODE:
3807{ 4331{
3808 int semcnt = 1; 4332 int semcnt = 1;
3809 4333
3810 if (count) 4334 if (count)
3811 { 4335 {
3812 SvGETMAGIC (count); 4336 SvGETMAGIC (count);
3813 4337
… …
3837 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4361 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3838 OUTPUT: 4362 OUTPUT:
3839 RETVAL 4363 RETVAL
3840 4364
3841void 4365void
3842up (SV *self, int adjust = 1) 4366up (SV *self)
3843 ALIAS:
3844 adjust = 1
3845 CODE: 4367 CODE:
4368 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4369
4370void
4371adjust (SV *self, int adjust)
4372 CODE:
3846 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4373 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3847 4374
3848void 4375void
3849down (...) 4376down (...)
3850 CODE: 4377 CODE:
3851 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4378 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3873 XSRETURN_NO; 4400 XSRETURN_NO;
3874} 4401}
3875 4402
3876void 4403void
3877waiters (SV *self) 4404waiters (SV *self)
3878 PPCODE: 4405 PPCODE:
3879{ 4406{
3880 AV *av = (AV *)SvRV (self); 4407 AV *av = (AV *)SvRV (self);
3881 int wcount = AvFILLp (av) + 1 - 1; 4408 int wcount = AvFILLp (av) + 1 - 1;
3882 4409
3883 if (GIMME_V == G_SCALAR) 4410 if (GIMME_V == G_SCALAR)
… …
3892} 4419}
3893 4420
3894MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4421MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3895 4422
3896void 4423void
3897_may_delete (SV *sem, int count, int extra_refs) 4424_may_delete (SV *sem, int count, unsigned int extra_refs)
3898 PPCODE: 4425 PPCODE:
3899{ 4426{
3900 AV *av = (AV *)SvRV (sem); 4427 AV *av = (AV *)SvRV (sem);
3901 4428
3902 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4429 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3903 && AvFILLp (av) == 0 /* no waiters, just count */ 4430 && AvFILLp (av) == 0 /* no waiters, just count */
3904 && SvIV (AvARRAY (av)[0]) == count) 4431 && SvIV (AvARRAY (av)[0]) == count)
3905 XSRETURN_YES; 4432 XSRETURN_YES;
… …
3926 4453
3927void 4454void
3928broadcast (SV *self) 4455broadcast (SV *self)
3929 CODE: 4456 CODE:
3930{ 4457{
3931 AV *av = (AV *)SvRV (self); 4458 AV *av = (AV *)SvRV (self);
3932 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4459 coro_signal_wake (aTHX_ av, AvFILLp (av));
3933} 4460}
3934 4461
3935void 4462void
3936send (SV *self) 4463send (SV *self)
… …
3944 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4471 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3945} 4472}
3946 4473
3947IV 4474IV
3948awaited (SV *self) 4475awaited (SV *self)
3949 CODE: 4476 CODE:
3950 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4477 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3951 OUTPUT: 4478 OUTPUT:
3952 RETVAL 4479 RETVAL
3953 4480
3954 4481
… …
3959 4486
3960void 4487void
3961_schedule (...) 4488_schedule (...)
3962 CODE: 4489 CODE:
3963{ 4490{
3964 static int incede; 4491 static int incede;
3965 4492
3966 api_cede_notself (aTHX); 4493 api_cede_notself (aTHX);
3967 4494
3968 ++incede; 4495 ++incede;
3969 while (coro_nready >= incede && api_cede (aTHX)) 4496 while (coro_nready >= incede && api_cede (aTHX))
… …
4013 { 4540 {
4014 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4541 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4015 coro_old_pp_sselect = 0; 4542 coro_old_pp_sselect = 0;
4016 } 4543 }
4017 4544
4545MODULE = Coro::State PACKAGE = Coro::Util
4546
4547void
4548_exit (int code)
4549 CODE:
4550 _exit (code);
4551
4552NV
4553time ()
4554 CODE:
4555 RETVAL = nvtime (aTHX);
4556 OUTPUT:
4557 RETVAL
4558
4559NV
4560gettimeofday ()
4561 PPCODE:
4562{
4563 UV tv [2];
4564 u2time (aTHX_ tv);
4565 EXTEND (SP, 2);
4566 PUSHs (sv_2mortal (newSVuv (tv [0])));
4567 PUSHs (sv_2mortal (newSVuv (tv [1])));
4568}
4569

Diff Legend

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