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.387 by root, Mon Feb 21 13:38:04 2011 UTC vs.
Revision 1.441 by root, Tue Mar 4 05:07:44 2014 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
22#ifndef SVs_PADSTALE 27#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0 28# define SVs_PADSTALE 0
24#endif 29#endif
25 30
26#ifdef WIN32 31#ifdef PadARRAY
32# define NEWPADAPI 1
33# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
34#else
35typedef AV PADNAMELIST;
36# if !PERL_VERSION_ATLEAST(5,8,0)
37typedef AV PADLIST;
38typedef AV PAD;
39# endif
40# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
41# define PadlistMAX(pl) AvFILLp (pl)
42# define PadlistNAMES(pl) (*PadlistARRAY (pl))
43# define PadARRAY AvARRAY
44# define PadMAX AvFILLp
45# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
46#endif
47
48/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
49/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
50#if PERL_VERSION_ATLEAST(5,19,0)
51# define SVt_BIND SVt_IV
52#endif
53
54#if defined(_WIN32)
55# undef HAS_GETTIMEOFDAY
27# undef setjmp 56# undef setjmp
28# undef longjmp 57# undef longjmp
29# undef _exit 58# undef _exit
30# define setjmp _setjmp /* deep magic */ 59# define setjmp _setjmp /* deep magic */
31#else 60#else
32# include <inttypes.h> /* most portable stdint.h */ 61# include <inttypes.h> /* most portable stdint.h */
33#endif 62#endif
34 63
35#ifdef HAVE_MMAP
36# include <unistd.h>
37# include <sys/mman.h>
38# ifndef MAP_ANONYMOUS
39# ifdef MAP_ANON
40# define MAP_ANONYMOUS MAP_ANON
41# else
42# undef HAVE_MMAP
43# endif
44# endif
45# include <limits.h>
46# ifndef PAGESIZE
47# define PAGESIZE pagesize
48# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
49static long pagesize;
50# else
51# define BOOT_PAGESIZE (void)0
52# endif
53#else
54# define PAGESIZE 0
55# define BOOT_PAGESIZE (void)0
56#endif
57
58#if CORO_USE_VALGRIND
59# include <valgrind/valgrind.h>
60#endif
61
62/* the maximum number of idle cctx that will be pooled */ 64/* the maximum number of idle cctx that will be pooled */
63static int cctx_max_idle = 4; 65static int cctx_max_idle = 4;
64 66
65#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 67#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
66# undef CORO_STACKGUARD 68# define HAS_SCOPESTACK_NAME 1
67#endif
68
69#ifndef CORO_STACKGUARD
70# define CORO_STACKGUARD 0
71#endif 69#endif
72 70
73/* prefer perl internal functions over our own? */ 71/* prefer perl internal functions over our own? */
74#ifndef CORO_PREFER_PERL_FUNCTIONS 72#ifndef CORO_PREFER_PERL_FUNCTIONS
75# define CORO_PREFER_PERL_FUNCTIONS 0 73# define CORO_PREFER_PERL_FUNCTIONS 0
… …
85# define STACKLEVEL ((void *)&stacklevel) 83# define STACKLEVEL ((void *)&stacklevel)
86#endif 84#endif
87 85
88#define IN_DESTRUCT PL_dirty 86#define IN_DESTRUCT PL_dirty
89 87
90#if __GNUC__ >= 3
91# define attribute(x) __attribute__(x)
92# define expect(expr,value) __builtin_expect ((expr), (value))
93# define INLINE static inline
94#else
95# define attribute(x)
96# define expect(expr,value) (expr)
97# define INLINE static
98#endif
99
100#define expect_false(expr) expect ((expr) != 0, 0)
101#define expect_true(expr) expect ((expr) != 0, 1)
102
103#define NOINLINE attribute ((noinline))
104
105#include "CoroAPI.h" 88#include "CoroAPI.h"
106#define GCoroAPI (&coroapi) /* very sneaky */ 89#define GCoroAPI (&coroapi) /* very sneaky */
107 90
108#ifdef USE_ITHREADS 91#ifdef USE_ITHREADS
109# if CORO_PTHREAD 92# if CORO_PTHREAD
… …
125static void (*u2time)(pTHX_ UV ret[2]); 108static void (*u2time)(pTHX_ UV ret[2]);
126 109
127/* we hijack an hopefully unused CV flag for our purposes */ 110/* we hijack an hopefully unused CV flag for our purposes */
128#define CVf_SLF 0x4000 111#define CVf_SLF 0x4000
129static OP *pp_slf (pTHX); 112static OP *pp_slf (pTHX);
113static void slf_destroy (pTHX_ struct coro *coro);
130 114
131static U32 cctx_gen; 115static U32 cctx_gen;
132static size_t cctx_stacksize = CORO_STACKSIZE; 116static size_t cctx_stacksize = CORO_STACKSIZE;
133static struct CoroAPI coroapi; 117static struct CoroAPI coroapi;
134static AV *main_mainstack; /* used to differentiate between $main and others */ 118static AV *main_mainstack; /* used to differentiate between $main and others */
… …
164static char times_valid; 148static char times_valid;
165 149
166static struct coro_cctx *cctx_first; 150static struct coro_cctx *cctx_first;
167static int cctx_count, cctx_idle; 151static int cctx_count, cctx_idle;
168 152
169enum { 153enum
154{
170 CC_MAPPED = 0x01, 155 CC_MAPPED = 0x01,
171 CC_NOREUSE = 0x02, /* throw this away after tracing */ 156 CC_NOREUSE = 0x02, /* throw this away after tracing */
172 CC_TRACE = 0x04, 157 CC_TRACE = 0x04,
173 CC_TRACE_SUB = 0x08, /* trace sub calls */ 158 CC_TRACE_SUB = 0x08, /* trace sub calls */
174 CC_TRACE_LINE = 0x10, /* trace each statement */ 159 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
179typedef struct coro_cctx 164typedef struct coro_cctx
180{ 165{
181 struct coro_cctx *next; 166 struct coro_cctx *next;
182 167
183 /* the stack */ 168 /* the stack */
184 void *sptr; 169 struct coro_stack stack;
185 size_t ssize;
186 170
187 /* cpu state */ 171 /* cpu state */
188 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 172 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
173#ifndef NDEBUG
189 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 174 JMPENV *idle_te; /* same as idle_sp, but for top_env */
175#endif
190 JMPENV *top_env; 176 JMPENV *top_env;
191 coro_context cctx; 177 coro_context cctx;
192 178
193 U32 gen; 179 U32 gen;
194#if CORO_USE_VALGRIND 180#if CORO_USE_VALGRIND
195 int valgrind_id; 181 int valgrind_id;
196#endif 182#endif
197 unsigned char flags; 183 unsigned char flags;
198} coro_cctx; 184} coro_cctx;
199 185
200coro_cctx *cctx_current; /* the currently running cctx */ 186static coro_cctx *cctx_current; /* the currently running cctx */
201 187
202/*****************************************************************************/ 188/*****************************************************************************/
203 189
190static MGVTBL coro_state_vtbl;
191
204enum { 192enum
193{
205 CF_RUNNING = 0x0001, /* coroutine is running */ 194 CF_RUNNING = 0x0001, /* coroutine is running */
206 CF_READY = 0x0002, /* coroutine is ready */ 195 CF_READY = 0x0002, /* coroutine is ready */
207 CF_NEW = 0x0004, /* has never been switched to */ 196 CF_NEW = 0x0004, /* has never been switched to */
208 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 197 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
209 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 198 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
199 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
210}; 200};
211 201
212/* the structure where most of the perl state is stored, overlaid on the cxstack */ 202/* the structure where most of the perl state is stored, overlaid on the cxstack */
213typedef struct 203typedef struct
214{ 204{
215 SV *defsv;
216 AV *defav;
217 SV *errsv;
218 SV *irsgv;
219 HV *hinthv;
220#define VAR(name,type) type name; 205 #define VARx(name,expr,type) type name;
221# include "state.h" 206 #include "state.h"
222#undef VAR
223} perl_slots; 207} perl_slots;
224 208
209/* how many context stack entries do we need for perl_slots */
225#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 210#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
226 211
227/* this is a structure representing a perl-level coroutine */ 212/* this is a structure representing a perl-level coroutine */
228struct coro { 213struct coro
214{
229 /* the C coroutine allocated to this perl coroutine, if any */ 215 /* the C coroutine allocated to this perl coroutine, if any */
230 coro_cctx *cctx; 216 coro_cctx *cctx;
231 217
232 /* ready queue */ 218 /* ready queue */
233 struct coro *next_ready; 219 struct coro *next_ready;
… …
235 /* state data */ 221 /* state data */
236 struct CoroSLF slf_frame; /* saved slf frame */ 222 struct CoroSLF slf_frame; /* saved slf frame */
237 AV *mainstack; 223 AV *mainstack;
238 perl_slots *slot; /* basically the saved sp */ 224 perl_slots *slot; /* basically the saved sp */
239 225
240 CV *startcv; /* the CV to execute */ 226 CV *startcv; /* the CV to execute */
241 AV *args; /* data associated with this coroutine (initial args) */ 227 AV *args; /* data associated with this coroutine (initial args) */
242 int refcnt; /* coroutines are refcounted, yes */
243 int flags; /* CF_ flags */ 228 int flags; /* CF_ flags */
244 HV *hv; /* the perl hash associated with this coro, if any */ 229 HV *hv; /* the perl hash associated with this coro, if any */
245 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
246 230
247 /* statistics */ 231 /* statistics */
248 int usecount; /* number of transfers to this coro */ 232 int usecount; /* number of transfers to this coro */
249 233
250 /* coro process data */ 234 /* coro process data */
251 int prio; 235 int prio;
252 SV *except; /* exception to be thrown */ 236 SV *except; /* exception to be thrown */
253 SV *rouse_cb; 237 SV *rouse_cb; /* last rouse callback */
238 AV *on_destroy; /* callbacks or coros to notify on destroy */
239 AV *status; /* the exit status list */
254 240
255 /* async_pool */ 241 /* async_pool */
256 SV *saved_deffh; 242 SV *saved_deffh;
257 SV *invoke_cb; 243 SV *invoke_cb;
258 AV *invoke_av; 244 AV *invoke_av;
… …
274typedef struct coro *Coro__State; 260typedef struct coro *Coro__State;
275typedef struct coro *Coro__State_or_hashref; 261typedef struct coro *Coro__State_or_hashref;
276 262
277/* the following variables are effectively part of the perl context */ 263/* the following variables are effectively part of the perl context */
278/* and get copied between struct coro and these variables */ 264/* and get copied between struct coro and these variables */
279/* the mainr easonw e don't support windows process emulation */ 265/* the main reason we don't support windows process emulation */
280static struct CoroSLF slf_frame; /* the current slf frame */ 266static struct CoroSLF slf_frame; /* the current slf frame */
281 267
282/** Coro ********************************************************************/ 268/** Coro ********************************************************************/
283 269
284#define CORO_PRIO_MAX 3 270#define CORO_PRIO_MAX 3
… …
290 276
291/* for Coro.pm */ 277/* for Coro.pm */
292static SV *coro_current; 278static SV *coro_current;
293static SV *coro_readyhook; 279static SV *coro_readyhook;
294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 280static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
295static CV *cv_coro_run, *cv_coro_terminate; 281static CV *cv_coro_run;
296static struct coro *coro_first; 282static struct coro *coro_first;
297#define coro_nready coroapi.nready 283#define coro_nready coroapi.nready
284
285/** JIT *********************************************************************/
286
287#if CORO_JIT
288 /* APPLE doesn't have mmap though */
289 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
290 #ifndef CORO_JIT_TYPE
291 #if ECB_AMD64 && CORO_JIT_UNIXY
292 #define CORO_JIT_TYPE "amd64-unix"
293 #elif __i386 && CORO_JIT_UNIXY
294 #define CORO_JIT_TYPE "x86-unix"
295 #endif
296 #endif
297#endif
298
299#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
300 #undef CORO_JIT
301#endif
302
303#if CORO_JIT
304 typedef void (*load_save_perl_slots_type)(perl_slots *);
305 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
306#endif
298 307
299/** Coro::Select ************************************************************/ 308/** Coro::Select ************************************************************/
300 309
301static OP *(*coro_old_pp_sselect) (pTHX); 310static OP *(*coro_old_pp_sselect) (pTHX);
302static SV *coro_select_select; 311static SV *coro_select_select;
… …
318 327
319/** time stuff **************************************************************/ 328/** time stuff **************************************************************/
320 329
321#ifdef HAS_GETTIMEOFDAY 330#ifdef HAS_GETTIMEOFDAY
322 331
323static void 332ecb_inline void
324coro_u2time (pTHX_ UV ret[2]) 333coro_u2time (pTHX_ UV ret[2])
325{ 334{
326 struct timeval tv; 335 struct timeval tv;
327 gettimeofday (&tv, 0); 336 gettimeofday (&tv, 0);
328 337
329 ret [0] = tv.tv_sec; 338 ret [0] = tv.tv_sec;
330 ret [1] = tv.tv_usec; 339 ret [1] = tv.tv_usec;
331} 340}
332 341
333static double 342ecb_inline double
334coro_nvtime () 343coro_nvtime (void)
335{ 344{
336 struct timeval tv; 345 struct timeval tv;
337 gettimeofday (&tv, 0); 346 gettimeofday (&tv, 0);
338 347
339 return tv.tv_sec + tv.tv_usec * 1e-6; 348 return tv.tv_sec + tv.tv_usec * 1e-6;
340} 349}
341 350
342static void 351ecb_inline void
343time_init (void) 352time_init (pTHX)
344{ 353{
345 nvtime = coro_nvtime; 354 nvtime = coro_nvtime;
346 u2time = coro_u2time; 355 u2time = coro_u2time;
347} 356}
348 357
349#else 358#else
350 359
351static void 360ecb_inline void
352time_init (void) 361time_init (pTHX)
353{ 362{
354 SV **svp; 363 SV **svp;
355 364
356 require_pv ("Time::HiRes"); 365 require_pv ("Time/HiRes.pm");
357 366
358 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 367 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
359 368
360 if (!svp) croak ("Time::HiRes is required"); 369 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
361 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 370 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
362 371
363 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 372 nvtime = INT2PTR (double (*)(), SvIV (*svp));
364 373
365 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0); 374 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
366 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp)); 375 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
… …
368 377
369#endif 378#endif
370 379
371/** lowlevel stuff **********************************************************/ 380/** lowlevel stuff **********************************************************/
372 381
373static SV * 382static SV * ecb_noinline
374coro_get_sv (pTHX_ const char *name, int create) 383coro_get_sv (pTHX_ const char *name, int create)
375{ 384{
376#if PERL_VERSION_ATLEAST (5,10,0) 385#if PERL_VERSION_ATLEAST (5,10,0)
377 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 386 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
378 get_sv (name, create); 387 get_sv (name, create);
379#endif 388#endif
380 return get_sv (name, create); 389 return get_sv (name, create);
381} 390}
382 391
383static AV * 392static AV * ecb_noinline
384coro_get_av (pTHX_ const char *name, int create) 393coro_get_av (pTHX_ const char *name, int create)
385{ 394{
386#if PERL_VERSION_ATLEAST (5,10,0) 395#if PERL_VERSION_ATLEAST (5,10,0)
387 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 396 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
388 get_av (name, create); 397 get_av (name, create);
389#endif 398#endif
390 return get_av (name, create); 399 return get_av (name, create);
391} 400}
392 401
393static HV * 402static HV * ecb_noinline
394coro_get_hv (pTHX_ const char *name, int create) 403coro_get_hv (pTHX_ const char *name, int create)
395{ 404{
396#if PERL_VERSION_ATLEAST (5,10,0) 405#if PERL_VERSION_ATLEAST (5,10,0)
397 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 406 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
398 get_hv (name, create); 407 get_hv (name, create);
399#endif 408#endif
400 return get_hv (name, create); 409 return get_hv (name, create);
401} 410}
402 411
403INLINE void 412ecb_inline void
404coro_times_update () 413coro_times_update (void)
405{ 414{
406#ifdef coro_clock_gettime 415#ifdef coro_clock_gettime
407 struct timespec ts; 416 struct timespec ts;
408 417
409 ts.tv_sec = ts.tv_nsec = 0; 418 ts.tv_sec = ts.tv_nsec = 0;
… …
421 time_real [0] = tv [0]; 430 time_real [0] = tv [0];
422 time_real [1] = tv [1] * 1000; 431 time_real [1] = tv [1] * 1000;
423#endif 432#endif
424} 433}
425 434
426INLINE void 435ecb_inline void
427coro_times_add (struct coro *c) 436coro_times_add (struct coro *c)
428{ 437{
429 c->t_real [1] += time_real [1]; 438 c->t_real [1] += time_real [1];
430 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 439 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
431 c->t_real [0] += time_real [0]; 440 c->t_real [0] += time_real [0];
… …
433 c->t_cpu [1] += time_cpu [1]; 442 c->t_cpu [1] += time_cpu [1];
434 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 443 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
435 c->t_cpu [0] += time_cpu [0]; 444 c->t_cpu [0] += time_cpu [0];
436} 445}
437 446
438INLINE void 447ecb_inline void
439coro_times_sub (struct coro *c) 448coro_times_sub (struct coro *c)
440{ 449{
441 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 450 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
442 c->t_real [1] -= time_real [1]; 451 c->t_real [1] -= time_real [1];
443 c->t_real [0] -= time_real [0]; 452 c->t_real [0] -= time_real [0];
… …
451/* magic glue */ 460/* magic glue */
452 461
453#define CORO_MAGIC_type_cv 26 462#define CORO_MAGIC_type_cv 26
454#define CORO_MAGIC_type_state PERL_MAGIC_ext 463#define CORO_MAGIC_type_state PERL_MAGIC_ext
455 464
456#define CORO_MAGIC_NN(sv, type) \ 465#define CORO_MAGIC_NN(sv, type) \
457 (expect_true (SvMAGIC (sv)->mg_type == type) \ 466 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
458 ? SvMAGIC (sv) \ 467 ? SvMAGIC (sv) \
459 : mg_find (sv, type)) 468 : mg_find (sv, type))
460 469
461#define CORO_MAGIC(sv, type) \ 470#define CORO_MAGIC(sv, type) \
462 (expect_true (SvMAGIC (sv)) \ 471 (ecb_expect_true (SvMAGIC (sv)) \
463 ? CORO_MAGIC_NN (sv, type) \ 472 ? CORO_MAGIC_NN (sv, type) \
464 : 0) 473 : 0)
465 474
466#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 475#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
467#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 476#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
468 477
469INLINE struct coro * 478ecb_inline MAGIC *
479SvSTATEhv_p (pTHX_ SV *coro)
480{
481 MAGIC *mg;
482
483 if (ecb_expect_true (
484 SvTYPE (coro) == SVt_PVHV
485 && (mg = CORO_MAGIC_state (coro))
486 && mg->mg_virtual == &coro_state_vtbl
487 ))
488 return mg;
489
490 return 0;
491}
492
493ecb_inline struct coro *
470SvSTATE_ (pTHX_ SV *coro) 494SvSTATE_ (pTHX_ SV *coro)
471{ 495{
472 HV *stash;
473 MAGIC *mg; 496 MAGIC *mg;
474 497
475 if (SvROK (coro)) 498 if (SvROK (coro))
476 coro = SvRV (coro); 499 coro = SvRV (coro);
477 500
478 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 501 mg = SvSTATEhv_p (aTHX_ coro);
502 if (!mg)
479 croak ("Coro::State object required"); 503 croak ("Coro::State object required");
480 504
481 stash = SvSTASH (coro);
482 if (expect_false (stash != coro_stash && stash != coro_state_stash))
483 {
484 /* very slow, but rare, check */
485 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
486 croak ("Coro::State object required");
487 }
488
489 mg = CORO_MAGIC_state (coro);
490 return (struct coro *)mg->mg_ptr; 505 return (struct coro *)mg->mg_ptr;
491} 506}
492 507
493#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 508#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
494 509
… …
497#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 512#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
498 513
499/*****************************************************************************/ 514/*****************************************************************************/
500/* padlist management and caching */ 515/* padlist management and caching */
501 516
502static AV * 517ecb_inline PADLIST *
503coro_derive_padlist (pTHX_ CV *cv) 518coro_derive_padlist (pTHX_ CV *cv)
504{ 519{
505 AV *padlist = CvPADLIST (cv); 520 PADLIST *padlist = CvPADLIST (cv);
506 AV *newpadlist, *newpad; 521 PADLIST *newpadlist;
522 PAD *newpad;
523 PADOFFSET off = PadlistMAX (padlist) + 1;
507 524
508 newpadlist = newAV (); 525#if NEWPADAPI
526
527 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
528 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
529 while (!PadlistARRAY (padlist)[off - 1])
530 --off;
531
532 Perl_pad_push (aTHX_ padlist, off);
533
534 newpad = PadlistARRAY (padlist)[off];
535 PadlistARRAY (padlist)[off] = 0;
536
537#else
538
539#if PERL_VERSION_ATLEAST (5,10,0)
540 Perl_pad_push (aTHX_ padlist, off);
541#else
542 Perl_pad_push (aTHX_ padlist, off, 1);
543#endif
544
545 newpad = PadlistARRAY (padlist)[off];
546 PadlistMAX (padlist) = off - 1;
547
548#endif
549
550 newPADLIST (newpadlist);
551#if !PERL_VERSION_ATLEAST(5,15,3)
552 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
509 AvREAL_off (newpadlist); 553 AvREAL_off (newpadlist);
510#if PERL_VERSION_ATLEAST (5,10,0)
511 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
512#else
513 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
514#endif 554#endif
515 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
516 --AvFILLp (padlist);
517 555
518 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 556 /* Already extended to 2 elements by newPADLIST. */
519 av_store (newpadlist, 1, (SV *)newpad); 557 PadlistMAX (newpadlist) = 1;
558 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
559 PadlistARRAY (newpadlist)[1] = newpad;
520 560
521 return newpadlist; 561 return newpadlist;
522} 562}
523 563
524static void 564ecb_inline void
525free_padlist (pTHX_ AV *padlist) 565free_padlist (pTHX_ PADLIST *padlist)
526{ 566{
527 /* may be during global destruction */ 567 /* may be during global destruction */
528 if (!IN_DESTRUCT) 568 if (!IN_DESTRUCT)
529 { 569 {
530 I32 i = AvFILLp (padlist); 570 I32 i = PadlistMAX (padlist);
531 571
532 while (i > 0) /* special-case index 0 */ 572 while (i > 0) /* special-case index 0 */
533 { 573 {
534 /* we try to be extra-careful here */ 574 /* we try to be extra-careful here */
535 AV *av = (AV *)AvARRAY (padlist)[i--]; 575 PAD *pad = PadlistARRAY (padlist)[i--];
536 I32 j = AvFILLp (av);
537 576
577 if (pad)
578 {
579 I32 j = PadMAX (pad);
580
538 while (j >= 0) 581 while (j >= 0)
539 SvREFCNT_dec (AvARRAY (av)[j--]); 582 SvREFCNT_dec (PadARRAY (pad)[j--]);
540 583
541 AvFILLp (av) = -1; 584 PadMAX (pad) = -1;
542 SvREFCNT_dec (av); 585 SvREFCNT_dec (pad);
586 }
543 } 587 }
544 588
545 SvREFCNT_dec (AvARRAY (padlist)[0]); 589 SvREFCNT_dec (PadlistNAMES (padlist));
546 590
591#if NEWPADAPI
592 Safefree (PadlistARRAY (padlist));
593 Safefree (padlist);
594#else
547 AvFILLp (padlist) = -1; 595 AvFILLp (padlist) = -1;
596 AvREAL_off (padlist);
548 SvREFCNT_dec ((SV*)padlist); 597 SvREFCNT_dec ((SV*)padlist);
598#endif
549 } 599 }
550} 600}
551 601
552static int 602static int
553coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 603coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
554{ 604{
555 AV *padlist; 605 PADLIST *padlist;
556 AV *av = (AV *)mg->mg_obj; 606 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
607 size_t len = *(size_t *)mg->mg_ptr;
557 608
558 /* perl manages to free our internal AV and _then_ call us */ 609 /* perl manages to free our internal AV and _then_ call us */
559 if (IN_DESTRUCT) 610 if (IN_DESTRUCT)
560 return 0; 611 return 0;
561 612
562 /* casting is fun. */ 613 while (len--)
563 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
564 free_padlist (aTHX_ padlist); 614 free_padlist (aTHX_ padlists[len]);
565
566 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
567 615
568 return 0; 616 return 0;
569} 617}
570 618
571static MGVTBL coro_cv_vtbl = { 619static MGVTBL coro_cv_vtbl = {
572 0, 0, 0, 0, 620 0, 0, 0, 0,
573 coro_cv_free 621 coro_cv_free
574}; 622};
575 623
576/* the next two functions merely cache the padlists */ 624/* the next two functions merely cache the padlists */
577static void 625ecb_inline void
578get_padlist (pTHX_ CV *cv) 626get_padlist (pTHX_ CV *cv)
579{ 627{
580 MAGIC *mg = CORO_MAGIC_cv (cv); 628 MAGIC *mg = CORO_MAGIC_cv (cv);
581 AV *av; 629 size_t *lenp;
582 630
583 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 631 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
584 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 632 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
585 else 633 else
586 { 634 {
587#if CORO_PREFER_PERL_FUNCTIONS 635#if CORO_PREFER_PERL_FUNCTIONS
588 /* this is probably cleaner? but also slower! */ 636 /* this is probably cleaner? but also slower! */
589 /* in practise, it seems to be less stable */ 637 /* in practise, it seems to be less stable */
… …
595 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 643 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
596#endif 644#endif
597 } 645 }
598} 646}
599 647
600static void 648ecb_inline void
601put_padlist (pTHX_ CV *cv) 649put_padlist (pTHX_ CV *cv)
602{ 650{
603 MAGIC *mg = CORO_MAGIC_cv (cv); 651 MAGIC *mg = CORO_MAGIC_cv (cv);
604 AV *av;
605 652
606 if (expect_false (!mg)) 653 if (ecb_expect_false (!mg))
654 {
607 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 655 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
656 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
657 mg->mg_len = 1; /* so mg_free frees mg_ptr */
658 }
659 else
660 Renew (mg->mg_ptr,
661 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
662 char);
608 663
609 av = (AV *)mg->mg_obj; 664 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
610
611 if (expect_false (AvFILLp (av) >= AvMAX (av)))
612 av_extend (av, AvFILLp (av) + 1);
613
614 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
615} 665}
616 666
617/** load & save, init *******************************************************/ 667/** load & save, init *******************************************************/
618 668
669ecb_inline void
670swap_sv (SV *a, SV *b)
671{
672 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
673 SV tmp;
674
675 /* swap sv_any */
676 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
677
678 /* swap sv_flags */
679 SvFLAGS (&tmp) = SvFLAGS (a);
680 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
681 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
682
683#if PERL_VERSION_ATLEAST (5,10,0)
684 /* perl 5.10 and later complicates this _quite_ a bit, but it also
685 * is much faster, so no quarrels here. alternatively, we could
686 * sv_upgrade to avoid this.
687 */
688 {
689 /* swap sv_u */
690 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
691
692 /* if SvANY points to the head, we need to adjust the pointers,
693 * as the pointer for a still points to b, and maybe vice versa.
694 */
695 #define svany_in_head(type) \
696 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
697
698 if (svany_in_head (SvTYPE (a)))
699 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
700
701 if (svany_in_head (SvTYPE (b)))
702 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
703 }
704#endif
705}
706
619/* swap sv heads, at least logically */ 707/* swap sv heads, at least logically */
620static void 708static void
621swap_svs (pTHX_ Coro__State c) 709swap_svs (pTHX_ Coro__State c)
622{ 710{
623 int i; 711 int i;
624 712
625 for (i = 0; i <= AvFILLp (c->swap_sv); ) 713 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
626 { 714 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
627 SV *a = AvARRAY (c->swap_sv)[i++];
628 SV *b = AvARRAY (c->swap_sv)[i++];
629
630 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
631 SV tmp;
632
633 /* swap sv_any */
634 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
635
636 /* swap sv_flags */
637 SvFLAGS (&tmp) = SvFLAGS (a);
638 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
639 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
640
641#if PERL_VERSION_ATLEAST (5,10,0)
642 /* perl 5.10 complicates this _quite_ a bit, but it also is
643 * much faster, so no quarrels here. alternatively, we could
644 * sv_upgrade to avoid this.
645 */
646 {
647 /* swap sv_u */
648 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
649
650 /* if SvANY points to the head, we need to adjust the pointers,
651 * as the pointer for a still points to b, and maybe vice versa.
652 */
653 #define svany_in_head(type) \
654 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
655
656 if (svany_in_head (SvTYPE (a)))
657 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
658
659 if (svany_in_head (SvTYPE (b)))
660 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
661 }
662#endif
663 }
664} 715}
665 716
666#define SWAP_SVS(coro) \ 717#define SWAP_SVS(coro) \
667 if (expect_false ((coro)->swap_sv)) \ 718 if (ecb_expect_false ((coro)->swap_sv)) \
668 swap_svs (aTHX_ (coro)) 719 swap_svs (aTHX_ (coro))
669 720
670static void 721static void
671on_enterleave_call (pTHX_ SV *cb); 722on_enterleave_call (pTHX_ SV *cb);
672 723
… …
676 perl_slots *slot = c->slot; 727 perl_slots *slot = c->slot;
677 c->slot = 0; 728 c->slot = 0;
678 729
679 PL_mainstack = c->mainstack; 730 PL_mainstack = c->mainstack;
680 731
681 GvSV (PL_defgv) = slot->defsv; 732#if CORO_JIT
682 GvAV (PL_defgv) = slot->defav; 733 load_perl_slots (slot);
683 GvSV (PL_errgv) = slot->errsv; 734#else
684 GvSV (irsgv) = slot->irsgv;
685 GvHV (PL_hintgv) = slot->hinthv;
686
687 #define VAR(name,type) PL_ ## name = slot->name; 735 #define VARx(name,expr,type) expr = slot->name;
688 # include "state.h" 736 #include "state.h"
689 #undef VAR 737#endif
690 738
691 { 739 {
692 dSP; 740 dSP;
693 741
694 CV *cv; 742 CV *cv;
695 743
696 /* now do the ugly restore mess */ 744 /* now do the ugly restore mess */
697 while (expect_true (cv = (CV *)POPs)) 745 while (ecb_expect_true (cv = (CV *)POPs))
698 { 746 {
699 put_padlist (aTHX_ cv); /* mark this padlist as available */ 747 put_padlist (aTHX_ cv); /* mark this padlist as available */
700 CvDEPTH (cv) = PTR2IV (POPs); 748 CvDEPTH (cv) = PTR2IV (POPs);
701 CvPADLIST (cv) = (AV *)POPs; 749 CvPADLIST (cv) = (PADLIST *)POPs;
702 } 750 }
703 751
704 PUTBACK; 752 PUTBACK;
705 } 753 }
706 754
707 slf_frame = c->slf_frame; 755 slf_frame = c->slf_frame;
708 CORO_THROW = c->except; 756 CORO_THROW = c->except;
709 757
710 if (expect_false (enable_times)) 758 if (ecb_expect_false (enable_times))
711 { 759 {
712 if (expect_false (!times_valid)) 760 if (ecb_expect_false (!times_valid))
713 coro_times_update (); 761 coro_times_update ();
714 762
715 coro_times_sub (c); 763 coro_times_sub (c);
716 } 764 }
717 765
718 if (expect_false (c->on_enter)) 766 if (ecb_expect_false (c->on_enter))
719 { 767 {
720 int i; 768 int i;
721 769
722 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 770 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
723 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 771 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
729static void 777static void
730save_perl (pTHX_ Coro__State c) 778save_perl (pTHX_ Coro__State c)
731{ 779{
732 SWAP_SVS (c); 780 SWAP_SVS (c);
733 781
734 if (expect_false (c->on_leave)) 782 if (ecb_expect_false (c->on_leave))
735 { 783 {
736 int i; 784 int i;
737 785
738 for (i = AvFILLp (c->on_leave); i >= 0; --i) 786 for (i = AvFILLp (c->on_leave); i >= 0; --i)
739 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 787 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
740 } 788 }
741 789
742 times_valid = 0; 790 times_valid = 0;
743 791
744 if (expect_false (enable_times)) 792 if (ecb_expect_false (enable_times))
745 { 793 {
746 coro_times_update (); times_valid = 1; 794 coro_times_update (); times_valid = 1;
747 coro_times_add (c); 795 coro_times_add (c);
748 } 796 }
749 797
… …
763 811
764 XPUSHs (Nullsv); 812 XPUSHs (Nullsv);
765 /* this loop was inspired by pp_caller */ 813 /* this loop was inspired by pp_caller */
766 for (;;) 814 for (;;)
767 { 815 {
768 while (expect_true (cxix >= 0)) 816 while (ecb_expect_true (cxix >= 0))
769 { 817 {
770 PERL_CONTEXT *cx = &ccstk[cxix--]; 818 PERL_CONTEXT *cx = &ccstk[cxix--];
771 819
772 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 820 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
773 { 821 {
774 CV *cv = cx->blk_sub.cv; 822 CV *cv = cx->blk_sub.cv;
775 823
776 if (expect_true (CvDEPTH (cv))) 824 if (ecb_expect_true (CvDEPTH (cv)))
777 { 825 {
778 EXTEND (SP, 3); 826 EXTEND (SP, 3);
779 PUSHs ((SV *)CvPADLIST (cv)); 827 PUSHs ((SV *)CvPADLIST (cv));
780 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 828 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
781 PUSHs ((SV *)cv); 829 PUSHs ((SV *)cv);
… …
784 get_padlist (aTHX_ cv); 832 get_padlist (aTHX_ cv);
785 } 833 }
786 } 834 }
787 } 835 }
788 836
789 if (expect_true (top_si->si_type == PERLSI_MAIN)) 837 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
790 break; 838 break;
791 839
792 top_si = top_si->si_prev; 840 top_si = top_si->si_prev;
793 ccstk = top_si->si_cxstack; 841 ccstk = top_si->si_cxstack;
794 cxix = top_si->si_cxix; 842 cxix = top_si->si_cxix;
… …
796 844
797 PUTBACK; 845 PUTBACK;
798 } 846 }
799 847
800 /* allocate some space on the context stack for our purposes */ 848 /* allocate some space on the context stack for our purposes */
801 /* we manually unroll here, as usually 2 slots is enough */ 849 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
802 if (SLOT_COUNT >= 1) CXINC;
803 if (SLOT_COUNT >= 2) CXINC;
804 if (SLOT_COUNT >= 3) CXINC;
805 { 850 {
806 unsigned int i; 851 unsigned int i;
852
807 for (i = 3; i < SLOT_COUNT; ++i) 853 for (i = 0; i < SLOT_COUNT; ++i)
808 CXINC; 854 CXINC;
809 } 855
810 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 856 cxstack_ix -= SLOT_COUNT; /* undo allocation */
857 }
811 858
812 c->mainstack = PL_mainstack; 859 c->mainstack = PL_mainstack;
813 860
814 { 861 {
815 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 862 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
816 863
817 slot->defav = GvAV (PL_defgv); 864#if CORO_JIT
818 slot->defsv = DEFSV; 865 save_perl_slots (slot);
819 slot->errsv = ERRSV; 866#else
820 slot->irsgv = GvSV (irsgv);
821 slot->hinthv = GvHV (PL_hintgv);
822
823 #define VAR(name,type) slot->name = PL_ ## name; 867 #define VARx(name,expr,type) slot->name = expr;
824 # include "state.h" 868 #include "state.h"
825 #undef VAR 869#endif
826 } 870 }
827} 871}
828 872
829/* 873/*
830 * allocate various perl stacks. This is almost an exact copy 874 * allocate various perl stacks. This is almost an exact copy
… …
836# define coro_init_stacks(thx) init_stacks () 880# define coro_init_stacks(thx) init_stacks ()
837#else 881#else
838static void 882static void
839coro_init_stacks (pTHX) 883coro_init_stacks (pTHX)
840{ 884{
841 PL_curstackinfo = new_stackinfo(32, 8); 885 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
842 PL_curstackinfo->si_type = PERLSI_MAIN; 886 PL_curstackinfo->si_type = PERLSI_MAIN;
843 PL_curstack = PL_curstackinfo->si_stack; 887 PL_curstack = PL_curstackinfo->si_stack;
844 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 888 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
845 889
846 PL_stack_base = AvARRAY(PL_curstack); 890 PL_stack_base = AvARRAY(PL_curstack);
… …
861#endif 905#endif
862 906
863 New(54,PL_scopestack,8,I32); 907 New(54,PL_scopestack,8,I32);
864 PL_scopestack_ix = 0; 908 PL_scopestack_ix = 0;
865 PL_scopestack_max = 8; 909 PL_scopestack_max = 8;
910#if HAS_SCOPESTACK_NAME
911 New(54,PL_scopestack_name,8,const char*);
912#endif
866 913
867 New(54,PL_savestack,24,ANY); 914 New(54,PL_savestack,24,ANY);
868 PL_savestack_ix = 0; 915 PL_savestack_ix = 0;
869 PL_savestack_max = 24; 916 PL_savestack_max = 24;
870 917
… …
898 } 945 }
899 946
900 Safefree (PL_tmps_stack); 947 Safefree (PL_tmps_stack);
901 Safefree (PL_markstack); 948 Safefree (PL_markstack);
902 Safefree (PL_scopestack); 949 Safefree (PL_scopestack);
950#if HAS_SCOPESTACK_NAME
951 Safefree (PL_scopestack_name);
952#endif
903 Safefree (PL_savestack); 953 Safefree (PL_savestack);
904#if !PERL_VERSION_ATLEAST (5,10,0) 954#if !PERL_VERSION_ATLEAST (5,10,0)
905 Safefree (PL_retstack); 955 Safefree (PL_retstack);
906#endif 956#endif
907} 957}
… …
953#endif 1003#endif
954 1004
955/* 1005/*
956 * This overrides the default magic get method of %SIG elements. 1006 * This overrides the default magic get method of %SIG elements.
957 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1007 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
958 * and instead of trying to save and restore the hash elements, we just provide 1008 * and instead of trying to save and restore the hash elements (extremely slow),
959 * readback here. 1009 * we just provide our own readback here.
960 */ 1010 */
961static int 1011static int ecb_cold
962coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1012coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
963{ 1013{
964 const char *s = MgPV_nolen_const (mg); 1014 const char *s = MgPV_nolen_const (mg);
965 1015
966 if (*s == '_') 1016 if (*s == '_')
967 { 1017 {
968 SV **svp = 0; 1018 SV **svp = 0;
969 1019
970 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1020 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
971 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1021 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
972 1022
973 if (svp) 1023 if (svp)
974 { 1024 {
975 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1025 SV *ssv;
1026
1027 if (!*svp)
1028 ssv = &PL_sv_undef;
1029 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1030 ssv = sv_2mortal (newRV_inc (*svp));
1031 else
1032 ssv = *svp;
1033
1034 sv_setsv (sv, ssv);
976 return 0; 1035 return 0;
977 } 1036 }
978 } 1037 }
979 1038
980 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1039 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
981} 1040}
982 1041
983static int 1042static int ecb_cold
984coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1043coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
985{ 1044{
986 const char *s = MgPV_nolen_const (mg); 1045 const char *s = MgPV_nolen_const (mg);
987 1046
988 if (*s == '_') 1047 if (*s == '_')
… …
1002 } 1061 }
1003 1062
1004 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1063 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1005} 1064}
1006 1065
1007static int 1066static int ecb_cold
1008coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1067coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1009{ 1068{
1010 const char *s = MgPV_nolen_const (mg); 1069 const char *s = MgPV_nolen_const (mg);
1011 1070
1012 if (*s == '_') 1071 if (*s == '_')
… …
1047 return 1; 1106 return 1;
1048} 1107}
1049 1108
1050static UNOP init_perl_op; 1109static UNOP init_perl_op;
1051 1110
1052static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1111ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1053init_perl (pTHX_ struct coro *coro) 1112init_perl (pTHX_ struct coro *coro)
1054{ 1113{
1055 /* 1114 /*
1056 * emulate part of the perl startup here. 1115 * emulate part of the perl startup here.
1057 */ 1116 */
… …
1072 PL_parser = 0; 1131 PL_parser = 0;
1073#endif 1132#endif
1074 PL_hints = 0; 1133 PL_hints = 0;
1075 1134
1076 /* recreate the die/warn hooks */ 1135 /* recreate the die/warn hooks */
1077 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1136 PL_diehook = SvREFCNT_inc (rv_diehook);
1078 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1137 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1079 1138
1080 GvSV (PL_defgv) = newSV (0); 1139 GvSV (PL_defgv) = newSV (0);
1081 GvAV (PL_defgv) = coro->args; coro->args = 0; 1140 GvAV (PL_defgv) = coro->args; coro->args = 0;
1082 GvSV (PL_errgv) = newSV (0); 1141 GvSV (PL_errgv) = newSV (0);
1083 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1142 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1084 GvHV (PL_hintgv) = 0; 1143 GvHV (PL_hintgv) = 0;
… …
1104 /* this newly created coroutine might be run on an existing cctx which most 1163 /* this newly created coroutine might be run on an existing cctx which most
1105 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1164 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1106 */ 1165 */
1107 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1166 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1108 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1167 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1168 slf_frame.destroy = 0;
1109 1169
1110 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1170 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1111 init_perl_op.op_next = PL_op; 1171 init_perl_op.op_next = PL_op;
1112 init_perl_op.op_type = OP_ENTERSUB; 1172 init_perl_op.op_type = OP_ENTERSUB;
1113 init_perl_op.op_ppaddr = pp_slf; 1173 init_perl_op.op_ppaddr = pp_slf;
… …
1118 /* copy throw, in case it was set before init_perl */ 1178 /* copy throw, in case it was set before init_perl */
1119 CORO_THROW = coro->except; 1179 CORO_THROW = coro->except;
1120 1180
1121 SWAP_SVS (coro); 1181 SWAP_SVS (coro);
1122 1182
1123 if (expect_false (enable_times)) 1183 if (ecb_expect_false (enable_times))
1124 { 1184 {
1125 coro_times_update (); 1185 coro_times_update ();
1126 coro_times_sub (coro); 1186 coro_times_sub (coro);
1127 } 1187 }
1128} 1188}
… …
1152destroy_perl (pTHX_ struct coro *coro) 1212destroy_perl (pTHX_ struct coro *coro)
1153{ 1213{
1154 SV *svf [9]; 1214 SV *svf [9];
1155 1215
1156 { 1216 {
1217 SV *old_current = SvRV (coro_current);
1157 struct coro *current = SvSTATE_current; 1218 struct coro *current = SvSTATE (old_current);
1158 1219
1159 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1220 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1160 1221
1161 save_perl (aTHX_ current); 1222 save_perl (aTHX_ current);
1223
1224 /* this will cause transfer_check to croak on block*/
1225 SvRV_set (coro_current, (SV *)coro->hv);
1226
1162 load_perl (aTHX_ coro); 1227 load_perl (aTHX_ coro);
1163 1228
1164 coro_unwind_stacks (aTHX); 1229 coro_unwind_stacks (aTHX);
1165 coro_destruct_stacks (aTHX);
1166 1230
1167 /* restore swapped sv's */ 1231 /* restore swapped sv's */
1168 SWAP_SVS (coro); 1232 SWAP_SVS (coro);
1169 1233
1234 coro_destruct_stacks (aTHX);
1235
1170 // now save some sv's to be free'd later 1236 /* now save some sv's to be free'd later */
1171 svf [0] = GvSV (PL_defgv); 1237 svf [0] = GvSV (PL_defgv);
1172 svf [1] = (SV *)GvAV (PL_defgv); 1238 svf [1] = (SV *)GvAV (PL_defgv);
1173 svf [2] = GvSV (PL_errgv); 1239 svf [2] = GvSV (PL_errgv);
1174 svf [3] = (SV *)PL_defoutgv; 1240 svf [3] = (SV *)PL_defoutgv;
1175 svf [4] = PL_rs; 1241 svf [4] = PL_rs;
… …
1177 svf [6] = (SV *)GvHV (PL_hintgv); 1243 svf [6] = (SV *)GvHV (PL_hintgv);
1178 svf [7] = PL_diehook; 1244 svf [7] = PL_diehook;
1179 svf [8] = PL_warnhook; 1245 svf [8] = PL_warnhook;
1180 assert (9 == sizeof (svf) / sizeof (*svf)); 1246 assert (9 == sizeof (svf) / sizeof (*svf));
1181 1247
1248 SvRV_set (coro_current, old_current);
1249
1182 load_perl (aTHX_ current); 1250 load_perl (aTHX_ current);
1183 } 1251 }
1184 1252
1185 { 1253 {
1186 unsigned int i; 1254 unsigned int i;
… …
1193 SvREFCNT_dec (coro->invoke_cb); 1261 SvREFCNT_dec (coro->invoke_cb);
1194 SvREFCNT_dec (coro->invoke_av); 1262 SvREFCNT_dec (coro->invoke_av);
1195 } 1263 }
1196} 1264}
1197 1265
1198INLINE void 1266ecb_inline void
1199free_coro_mortal (pTHX) 1267free_coro_mortal (pTHX)
1200{ 1268{
1201 if (expect_true (coro_mortal)) 1269 if (ecb_expect_true (coro_mortal))
1202 { 1270 {
1203 SvREFCNT_dec (coro_mortal); 1271 SvREFCNT_dec ((SV *)coro_mortal);
1204 coro_mortal = 0; 1272 coro_mortal = 0;
1205 } 1273 }
1206} 1274}
1207 1275
1208static int 1276static int
… …
1341 1409
1342 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1410 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1343} 1411}
1344 1412
1345/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1413/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1346static void NOINLINE 1414static void ecb_noinline
1347cctx_prepare (pTHX) 1415cctx_prepare (pTHX)
1348{ 1416{
1349 PL_top_env = &PL_start_env; 1417 PL_top_env = &PL_start_env;
1350 1418
1351 if (cctx_current->flags & CC_TRACE) 1419 if (cctx_current->flags & CC_TRACE)
… …
1362 slf_frame.prepare = slf_prepare_set_stacklevel; 1430 slf_frame.prepare = slf_prepare_set_stacklevel;
1363 slf_frame.check = slf_check_set_stacklevel; 1431 slf_frame.check = slf_check_set_stacklevel;
1364} 1432}
1365 1433
1366/* the tail of transfer: execute stuff we can only do after a transfer */ 1434/* the tail of transfer: execute stuff we can only do after a transfer */
1367INLINE void 1435ecb_inline void
1368transfer_tail (pTHX) 1436transfer_tail (pTHX)
1369{ 1437{
1370 free_coro_mortal (aTHX); 1438 free_coro_mortal (aTHX);
1439}
1440
1441/* try to exit the same way perl's main function would do */
1442/* we do not bother resetting the environment or other things *7
1443/* that are not, uhm, essential */
1444/* this obviously also doesn't work when perl is embedded */
1445static void ecb_noinline ecb_cold
1446perlish_exit (pTHX)
1447{
1448 int exitstatus = perl_destruct (PL_curinterp);
1449 perl_free (PL_curinterp);
1450 exit (exitstatus);
1371} 1451}
1372 1452
1373/* 1453/*
1374 * this is a _very_ stripped down perl interpreter ;) 1454 * this is a _very_ stripped down perl interpreter ;)
1375 */ 1455 */
… …
1404 */ 1484 */
1405 1485
1406 /* 1486 /*
1407 * If perl-run returns we assume exit() was being called or the coro 1487 * If perl-run returns we assume exit() was being called or the coro
1408 * fell off the end, which seems to be the only valid (non-bug) 1488 * fell off the end, which seems to be the only valid (non-bug)
1409 * reason for perl_run to return. We try to exit by jumping to the 1489 * reason for perl_run to return. We try to mimic whatever perl is normally
1410 * bootstrap-time "top" top_env, as we cannot restore the "main" 1490 * doing in that case. YMMV.
1411 * coroutine as Coro has no such concept.
1412 * This actually isn't valid with the pthread backend, but OSes requiring
1413 * that backend are too broken to do it in a standards-compliant way.
1414 */ 1491 */
1415 PL_top_env = main_top_env; 1492 perlish_exit (aTHX);
1416 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1417 } 1493 }
1418} 1494}
1419 1495
1420static coro_cctx * 1496static coro_cctx *
1421cctx_new () 1497cctx_new (void)
1422{ 1498{
1423 coro_cctx *cctx; 1499 coro_cctx *cctx;
1424 1500
1425 ++cctx_count; 1501 ++cctx_count;
1426 New (0, cctx, 1, coro_cctx); 1502 New (0, cctx, 1, coro_cctx);
… …
1432 return cctx; 1508 return cctx;
1433} 1509}
1434 1510
1435/* create a new cctx only suitable as source */ 1511/* create a new cctx only suitable as source */
1436static coro_cctx * 1512static coro_cctx *
1437cctx_new_empty () 1513cctx_new_empty (void)
1438{ 1514{
1439 coro_cctx *cctx = cctx_new (); 1515 coro_cctx *cctx = cctx_new ();
1440 1516
1441 cctx->sptr = 0; 1517 cctx->stack.sptr = 0;
1442 coro_create (&cctx->cctx, 0, 0, 0, 0); 1518 coro_create (&cctx->cctx, 0, 0, 0, 0);
1443 1519
1444 return cctx; 1520 return cctx;
1445} 1521}
1446 1522
1447/* create a new cctx suitable as destination/running a perl interpreter */ 1523/* create a new cctx suitable as destination/running a perl interpreter */
1448static coro_cctx * 1524static coro_cctx *
1449cctx_new_run () 1525cctx_new_run (void)
1450{ 1526{
1451 coro_cctx *cctx = cctx_new (); 1527 coro_cctx *cctx = cctx_new ();
1452 void *stack_start;
1453 size_t stack_size;
1454 1528
1455#if HAVE_MMAP 1529 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1456 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1457 /* mmap supposedly does allocate-on-write for us */
1458 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1459
1460 if (cctx->sptr != (void *)-1)
1461 {
1462 #if CORO_STACKGUARD
1463 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1464 #endif
1465 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1466 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1467 cctx->flags |= CC_MAPPED;
1468 } 1530 {
1469 else
1470#endif
1471 {
1472 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1473 New (0, cctx->sptr, cctx_stacksize, long);
1474
1475 if (!cctx->sptr)
1476 {
1477 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1531 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1478 _exit (EXIT_FAILURE); 1532 _exit (EXIT_FAILURE);
1479 }
1480
1481 stack_start = cctx->sptr;
1482 stack_size = cctx->ssize;
1483 } 1533 }
1484 1534
1485 #if CORO_USE_VALGRIND
1486 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1487 #endif
1488
1489 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1535 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1490 1536
1491 return cctx; 1537 return cctx;
1492} 1538}
1493 1539
1494static void 1540static void
1495cctx_destroy (coro_cctx *cctx) 1541cctx_destroy (coro_cctx *cctx)
1496{ 1542{
1497 if (!cctx) 1543 if (!cctx)
1498 return; 1544 return;
1499 1545
1500 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1546 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1501 1547
1502 --cctx_count; 1548 --cctx_count;
1503 coro_destroy (&cctx->cctx); 1549 coro_destroy (&cctx->cctx);
1504 1550
1505 /* coro_transfer creates new, empty cctx's */ 1551 coro_stack_free (&cctx->stack);
1506 if (cctx->sptr)
1507 {
1508 #if CORO_USE_VALGRIND
1509 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1510 #endif
1511
1512#if HAVE_MMAP
1513 if (cctx->flags & CC_MAPPED)
1514 munmap (cctx->sptr, cctx->ssize);
1515 else
1516#endif
1517 Safefree (cctx->sptr);
1518 }
1519 1552
1520 Safefree (cctx); 1553 Safefree (cctx);
1521} 1554}
1522 1555
1523/* wether this cctx should be destructed */ 1556/* wether this cctx should be destructed */
1524#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1557#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1525 1558
1526static coro_cctx * 1559static coro_cctx *
1527cctx_get (pTHX) 1560cctx_get (pTHX)
1528{ 1561{
1529 while (expect_true (cctx_first)) 1562 while (ecb_expect_true (cctx_first))
1530 { 1563 {
1531 coro_cctx *cctx = cctx_first; 1564 coro_cctx *cctx = cctx_first;
1532 cctx_first = cctx->next; 1565 cctx_first = cctx->next;
1533 --cctx_idle; 1566 --cctx_idle;
1534 1567
1535 if (expect_true (!CCTX_EXPIRED (cctx))) 1568 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1536 return cctx; 1569 return cctx;
1537 1570
1538 cctx_destroy (cctx); 1571 cctx_destroy (cctx);
1539 } 1572 }
1540 1573
… …
1542} 1575}
1543 1576
1544static void 1577static void
1545cctx_put (coro_cctx *cctx) 1578cctx_put (coro_cctx *cctx)
1546{ 1579{
1547 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1580 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1548 1581
1549 /* free another cctx if overlimit */ 1582 /* free another cctx if overlimit */
1550 if (expect_false (cctx_idle >= cctx_max_idle)) 1583 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1551 { 1584 {
1552 coro_cctx *first = cctx_first; 1585 coro_cctx *first = cctx_first;
1553 cctx_first = first->next; 1586 cctx_first = first->next;
1554 --cctx_idle; 1587 --cctx_idle;
1555 1588
… …
1566static void 1599static void
1567transfer_check (pTHX_ struct coro *prev, struct coro *next) 1600transfer_check (pTHX_ struct coro *prev, struct coro *next)
1568{ 1601{
1569 /* TODO: throwing up here is considered harmful */ 1602 /* TODO: throwing up here is considered harmful */
1570 1603
1571 if (expect_true (prev != next)) 1604 if (ecb_expect_true (prev != next))
1572 { 1605 {
1573 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1606 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1574 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1607 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1575 1608
1576 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1609 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1577 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1610 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1578 1611
1579#if !PERL_VERSION_ATLEAST (5,10,0) 1612#if !PERL_VERSION_ATLEAST (5,10,0)
1580 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1613 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1581 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1614 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1582#endif 1615#endif
1583 } 1616 }
1584} 1617}
1585 1618
1586/* always use the TRANSFER macro */ 1619/* always use the TRANSFER macro */
1587static void NOINLINE /* noinline so we have a fixed stackframe */ 1620static void ecb_noinline /* noinline so we have a fixed stackframe */
1588transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1621transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1589{ 1622{
1590 dSTACKLEVEL; 1623 dSTACKLEVEL;
1591 1624
1592 /* sometimes transfer is only called to set idle_sp */ 1625 /* sometimes transfer is only called to set idle_sp */
1593 if (expect_false (!prev)) 1626 if (ecb_expect_false (!prev))
1594 { 1627 {
1595 cctx_current->idle_sp = STACKLEVEL; 1628 cctx_current->idle_sp = STACKLEVEL;
1596 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1629 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1597 } 1630 }
1598 else if (expect_true (prev != next)) 1631 else if (ecb_expect_true (prev != next))
1599 { 1632 {
1600 coro_cctx *cctx_prev; 1633 coro_cctx *cctx_prev;
1601 1634
1602 if (expect_false (prev->flags & CF_NEW)) 1635 if (ecb_expect_false (prev->flags & CF_NEW))
1603 { 1636 {
1604 /* create a new empty/source context */ 1637 /* create a new empty/source context */
1605 prev->flags &= ~CF_NEW; 1638 prev->flags &= ~CF_NEW;
1606 prev->flags |= CF_RUNNING; 1639 prev->flags |= CF_RUNNING;
1607 } 1640 }
… …
1610 next->flags |= CF_RUNNING; 1643 next->flags |= CF_RUNNING;
1611 1644
1612 /* first get rid of the old state */ 1645 /* first get rid of the old state */
1613 save_perl (aTHX_ prev); 1646 save_perl (aTHX_ prev);
1614 1647
1615 if (expect_false (next->flags & CF_NEW)) 1648 if (ecb_expect_false (next->flags & CF_NEW))
1616 { 1649 {
1617 /* need to start coroutine */ 1650 /* need to start coroutine */
1618 next->flags &= ~CF_NEW; 1651 next->flags &= ~CF_NEW;
1619 /* setup coroutine call */ 1652 /* setup coroutine call */
1620 init_perl (aTHX_ next); 1653 init_perl (aTHX_ next);
1621 } 1654 }
1622 else 1655 else
1623 load_perl (aTHX_ next); 1656 load_perl (aTHX_ next);
1624 1657
1625 /* possibly untie and reuse the cctx */ 1658 /* possibly untie and reuse the cctx */
1626 if (expect_true ( 1659 if (ecb_expect_true (
1627 cctx_current->idle_sp == STACKLEVEL 1660 cctx_current->idle_sp == STACKLEVEL
1628 && !(cctx_current->flags & CC_TRACE) 1661 && !(cctx_current->flags & CC_TRACE)
1629 && !force_cctx 1662 && !force_cctx
1630 )) 1663 ))
1631 { 1664 {
1632 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1665 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1633 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1666 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1634 1667
1635 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1668 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1636 /* without this the next cctx_get might destroy the running cctx while still in use */ 1669 /* without this the next cctx_get might destroy the running cctx while still in use */
1637 if (expect_false (CCTX_EXPIRED (cctx_current))) 1670 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1638 if (expect_true (!next->cctx)) 1671 if (ecb_expect_true (!next->cctx))
1639 next->cctx = cctx_get (aTHX); 1672 next->cctx = cctx_get (aTHX);
1640 1673
1641 cctx_put (cctx_current); 1674 cctx_put (cctx_current);
1642 } 1675 }
1643 else 1676 else
1644 prev->cctx = cctx_current; 1677 prev->cctx = cctx_current;
1645 1678
1646 ++next->usecount; 1679 ++next->usecount;
1647 1680
1648 cctx_prev = cctx_current; 1681 cctx_prev = cctx_current;
1649 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1682 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1650 1683
1651 next->cctx = 0; 1684 next->cctx = 0;
1652 1685
1653 if (expect_false (cctx_prev != cctx_current)) 1686 if (ecb_expect_false (cctx_prev != cctx_current))
1654 { 1687 {
1655 cctx_prev->top_env = PL_top_env; 1688 cctx_prev->top_env = PL_top_env;
1656 PL_top_env = cctx_current->top_env; 1689 PL_top_env = cctx_current->top_env;
1657 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1690 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1658 } 1691 }
… …
1664#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1697#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1665#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1698#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1666 1699
1667/** high level stuff ********************************************************/ 1700/** high level stuff ********************************************************/
1668 1701
1702/* this function is actually Coro, not Coro::State, but we call it from here */
1703/* because it is convenient - but it hasn't been declared yet for that reason */
1669static int 1704static void
1705coro_call_on_destroy (pTHX_ struct coro *coro);
1706
1707static void
1670coro_state_destroy (pTHX_ struct coro *coro) 1708coro_state_destroy (pTHX_ struct coro *coro)
1671{ 1709{
1672 if (coro->flags & CF_DESTROYED) 1710 if (coro->flags & CF_ZOMBIE)
1673 return 0; 1711 return;
1674 1712
1675 if (coro->on_destroy && !PL_dirty)
1676 coro->on_destroy (aTHX_ coro); 1713 slf_destroy (aTHX_ coro);
1677 1714
1678 coro->flags |= CF_DESTROYED; 1715 coro->flags |= CF_ZOMBIE;
1679 1716
1680 if (coro->flags & CF_READY) 1717 if (coro->flags & CF_READY)
1681 { 1718 {
1682 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1719 /* reduce nready, as destroying a ready coro effectively unreadies it */
1683 /* alternative: look through all ready queues and remove the coro */ 1720 /* alternative: look through all ready queues and remove the coro */
1684 --coro_nready; 1721 --coro_nready;
1685 } 1722 }
1686 else 1723 else
1687 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1724 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1725
1726 if (coro->next) coro->next->prev = coro->prev;
1727 if (coro->prev) coro->prev->next = coro->next;
1728 if (coro == coro_first) coro_first = coro->next;
1688 1729
1689 if (coro->mainstack 1730 if (coro->mainstack
1690 && coro->mainstack != main_mainstack 1731 && coro->mainstack != main_mainstack
1691 && coro->slot 1732 && coro->slot
1692 && !PL_dirty) 1733 && !PL_dirty)
1693 destroy_perl (aTHX_ coro); 1734 destroy_perl (aTHX_ coro);
1694 1735
1695 if (coro->next) coro->next->prev = coro->prev;
1696 if (coro->prev) coro->prev->next = coro->next;
1697 if (coro == coro_first) coro_first = coro->next;
1698
1699 cctx_destroy (coro->cctx); 1736 cctx_destroy (coro->cctx);
1700 SvREFCNT_dec (coro->startcv); 1737 SvREFCNT_dec (coro->startcv);
1701 SvREFCNT_dec (coro->args); 1738 SvREFCNT_dec (coro->args);
1702 SvREFCNT_dec (coro->swap_sv); 1739 SvREFCNT_dec (coro->swap_sv);
1703 SvREFCNT_dec (CORO_THROW); 1740 SvREFCNT_dec (CORO_THROW);
1704 1741
1705 return 1; 1742 coro_call_on_destroy (aTHX_ coro);
1743
1744 /* more destruction mayhem in coro_state_free */
1706} 1745}
1707 1746
1708static int 1747static int
1709coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1748coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1710{ 1749{
1711 struct coro *coro = (struct coro *)mg->mg_ptr; 1750 struct coro *coro = (struct coro *)mg->mg_ptr;
1712 mg->mg_ptr = 0; 1751 mg->mg_ptr = 0;
1713 1752
1714 coro->hv = 0;
1715
1716 if (--coro->refcnt < 0)
1717 {
1718 coro_state_destroy (aTHX_ coro); 1753 coro_state_destroy (aTHX_ coro);
1754 SvREFCNT_dec (coro->on_destroy);
1755 SvREFCNT_dec (coro->status);
1756
1719 Safefree (coro); 1757 Safefree (coro);
1720 }
1721 1758
1722 return 0; 1759 return 0;
1723} 1760}
1724 1761
1725static int 1762static int ecb_cold
1726coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1763coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1727{ 1764{
1728 struct coro *coro = (struct coro *)mg->mg_ptr; 1765 /* called when perl clones the current process the slow way (windows process emulation) */
1729 1766 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1730 ++coro->refcnt; 1767 mg->mg_ptr = 0;
1768 mg->mg_virtual = 0;
1731 1769
1732 return 0; 1770 return 0;
1733} 1771}
1734 1772
1735static MGVTBL coro_state_vtbl = { 1773static MGVTBL coro_state_vtbl = {
… …
1760 TRANSFER (ta, 1); 1798 TRANSFER (ta, 1);
1761} 1799}
1762 1800
1763/** Coro ********************************************************************/ 1801/** Coro ********************************************************************/
1764 1802
1765INLINE void 1803ecb_inline void
1766coro_enq (pTHX_ struct coro *coro) 1804coro_enq (pTHX_ struct coro *coro)
1767{ 1805{
1768 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1806 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1769 1807
1770 SvREFCNT_inc_NN (coro->hv); 1808 SvREFCNT_inc_NN (coro->hv);
… …
1772 coro->next_ready = 0; 1810 coro->next_ready = 0;
1773 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1811 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1774 ready [1] = coro; 1812 ready [1] = coro;
1775} 1813}
1776 1814
1777INLINE struct coro * 1815ecb_inline struct coro *
1778coro_deq (pTHX) 1816coro_deq (pTHX)
1779{ 1817{
1780 int prio; 1818 int prio;
1781 1819
1782 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1820 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1835{ 1873{
1836 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1874 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1837} 1875}
1838 1876
1839/* expects to own a reference to next->hv */ 1877/* expects to own a reference to next->hv */
1840INLINE void 1878ecb_inline void
1841prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1879prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1842{ 1880{
1843 SV *prev_sv = SvRV (coro_current); 1881 SV *prev_sv = SvRV (coro_current);
1844 1882
1845 ta->prev = SvSTATE_hv (prev_sv); 1883 ta->prev = SvSTATE_hv (prev_sv);
… …
1858{ 1896{
1859 for (;;) 1897 for (;;)
1860 { 1898 {
1861 struct coro *next = coro_deq (aTHX); 1899 struct coro *next = coro_deq (aTHX);
1862 1900
1863 if (expect_true (next)) 1901 if (ecb_expect_true (next))
1864 { 1902 {
1865 /* cannot transfer to destroyed coros, skip and look for next */ 1903 /* cannot transfer to destroyed coros, skip and look for next */
1866 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1904 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1867 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1905 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1868 else 1906 else
1869 { 1907 {
1870 next->flags &= ~CF_READY; 1908 next->flags &= ~CF_READY;
1871 --coro_nready; 1909 --coro_nready;
… …
1879 /* nothing to schedule: call the idle handler */ 1917 /* nothing to schedule: call the idle handler */
1880 if (SvROK (sv_idle) 1918 if (SvROK (sv_idle)
1881 && SvOBJECT (SvRV (sv_idle))) 1919 && SvOBJECT (SvRV (sv_idle)))
1882 { 1920 {
1883 if (SvRV (sv_idle) == SvRV (coro_current)) 1921 if (SvRV (sv_idle) == SvRV (coro_current))
1922 {
1923 require_pv ("Carp");
1924
1925 {
1926 dSP;
1927
1928 ENTER;
1929 SAVETMPS;
1930
1931 PUSHMARK (SP);
1884 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1932 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1933 PUTBACK;
1934 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1935
1936 FREETMPS;
1937 LEAVE;
1938 }
1939 }
1885 1940
1886 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1941 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1887 api_ready (aTHX_ SvRV (sv_idle)); 1942 api_ready (aTHX_ SvRV (sv_idle));
1888 --coro_nready; 1943 --coro_nready;
1889 } 1944 }
… …
1904 } 1959 }
1905 } 1960 }
1906 } 1961 }
1907} 1962}
1908 1963
1909INLINE void 1964ecb_inline void
1910prepare_cede (pTHX_ struct coro_transfer_args *ta) 1965prepare_cede (pTHX_ struct coro_transfer_args *ta)
1911{ 1966{
1912 api_ready (aTHX_ coro_current); 1967 api_ready (aTHX_ coro_current);
1913 prepare_schedule (aTHX_ ta); 1968 prepare_schedule (aTHX_ ta);
1914} 1969}
1915 1970
1916INLINE void 1971ecb_inline void
1917prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1972prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1918{ 1973{
1919 SV *prev = SvRV (coro_current); 1974 SV *prev = SvRV (coro_current);
1920 1975
1921 if (coro_nready) 1976 if (coro_nready)
… …
1951{ 2006{
1952 struct coro_transfer_args ta; 2007 struct coro_transfer_args ta;
1953 2008
1954 prepare_cede (aTHX_ &ta); 2009 prepare_cede (aTHX_ &ta);
1955 2010
1956 if (expect_true (ta.prev != ta.next)) 2011 if (ecb_expect_true (ta.prev != ta.next))
1957 { 2012 {
1958 TRANSFER (ta, 1); 2013 TRANSFER (ta, 1);
1959 return 1; 2014 return 1;
1960 } 2015 }
1961 else 2016 else
… …
2004 coro->slot->runops = RUNOPS_DEFAULT; 2059 coro->slot->runops = RUNOPS_DEFAULT;
2005 } 2060 }
2006} 2061}
2007 2062
2008static void 2063static void
2064coro_push_av (pTHX_ AV *av, I32 gimme_v)
2065{
2066 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2067 {
2068 dSP;
2069
2070 if (gimme_v == G_SCALAR)
2071 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2072 else
2073 {
2074 int i;
2075 EXTEND (SP, AvFILLp (av) + 1);
2076
2077 for (i = 0; i <= AvFILLp (av); ++i)
2078 PUSHs (AvARRAY (av)[i]);
2079 }
2080
2081 PUTBACK;
2082 }
2083}
2084
2085static void
2086coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2087{
2088 if (!coro->on_destroy)
2089 coro->on_destroy = newAV ();
2090
2091 av_push (coro->on_destroy, cb);
2092}
2093
2094static void
2095slf_destroy_join (pTHX_ struct CoroSLF *frame)
2096{
2097 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2098}
2099
2100static int
2101slf_check_join (pTHX_ struct CoroSLF *frame)
2102{
2103 struct coro *coro = (struct coro *)frame->data;
2104
2105 if (!coro->status)
2106 return 1;
2107
2108 frame->destroy = 0;
2109
2110 coro_push_av (aTHX_ coro->status, GIMME_V);
2111
2112 SvREFCNT_dec ((SV *)coro->hv);
2113
2114 return 0;
2115}
2116
2117static void
2118slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2119{
2120 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2121
2122 if (items > 1)
2123 croak ("join called with too many arguments");
2124
2125 if (coro->status)
2126 frame->prepare = prepare_nop;
2127 else
2128 {
2129 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2130 frame->prepare = prepare_schedule;
2131 }
2132
2133 frame->check = slf_check_join;
2134 frame->destroy = slf_destroy_join;
2135 frame->data = (void *)coro;
2136 SvREFCNT_inc (coro->hv);
2137}
2138
2139static void
2009coro_call_on_destroy (pTHX_ struct coro *coro) 2140coro_call_on_destroy (pTHX_ struct coro *coro)
2010{ 2141{
2011 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2142 AV *od = coro->on_destroy;
2012 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2013 2143
2014 if (on_destroyp) 2144 if (!od)
2015 { 2145 return;
2016 AV *on_destroy = (AV *)SvRV (*on_destroyp);
2017 2146
2147 coro->on_destroy = 0;
2148 sv_2mortal ((SV *)od);
2149
2018 while (AvFILLp (on_destroy) >= 0) 2150 while (AvFILLp (od) >= 0)
2151 {
2152 SV *cb = sv_2mortal (av_pop (od));
2153
2154 /* coro hv's (and only hv's at the moment) are supported as well */
2155 if (SvSTATEhv_p (aTHX_ cb))
2156 api_ready (aTHX_ cb);
2157 else
2019 { 2158 {
2020 dSP; /* don't disturb outer sp */ 2159 dSP; /* don't disturb outer sp */
2021 SV *cb = av_pop (on_destroy);
2022
2023 PUSHMARK (SP); 2160 PUSHMARK (SP);
2024 2161
2025 if (statusp) 2162 if (coro->status)
2026 { 2163 {
2027 int i; 2164 PUTBACK;
2028 AV *status = (AV *)SvRV (*statusp); 2165 coro_push_av (aTHX_ coro->status, G_ARRAY);
2029 EXTEND (SP, AvFILLp (status) + 1); 2166 SPAGAIN;
2030
2031 for (i = 0; i <= AvFILLp (status); ++i)
2032 PUSHs (AvARRAY (status)[i]);
2033 } 2167 }
2034 2168
2035 PUTBACK; 2169 PUTBACK;
2036 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2170 call_sv (cb, G_VOID | G_DISCARD);
2037 } 2171 }
2038 } 2172 }
2039} 2173}
2040 2174
2041static void 2175static void
2042slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2176coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2043{ 2177{
2044 int i; 2178 AV *av;
2045 HV *hv = (HV *)SvRV (coro_current); 2179
2046 AV *av = newAV (); 2180 if (coro->status)
2181 {
2182 av = coro->status;
2183 av_clear (av);
2184 }
2185 else
2186 av = coro->status = newAV ();
2047 2187
2048 /* items are actually not so common, so optimise for this case */ 2188 /* items are actually not so common, so optimise for this case */
2049 if (items) 2189 if (items)
2050 { 2190 {
2191 int i;
2192
2051 av_extend (av, items - 1); 2193 av_extend (av, items - 1);
2052 2194
2053 for (i = 0; i < items; ++i) 2195 for (i = 0; i < items; ++i)
2054 av_push (av, SvREFCNT_inc_NN (arg [i])); 2196 av_push (av, SvREFCNT_inc_NN (arg [i]));
2055 } 2197 }
2198}
2056 2199
2057 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2200static void
2058 2201slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2202{
2059 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2203 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2060 api_ready (aTHX_ sv_manager); 2204 api_ready (aTHX_ sv_manager);
2061 2205
2062 frame->prepare = prepare_schedule; 2206 frame->prepare = prepare_schedule;
2063 frame->check = slf_check_repeat; 2207 frame->check = slf_check_repeat;
2064 2208
2065 /* as a minor optimisation, we could unwind all stacks here */ 2209 /* as a minor optimisation, we could unwind all stacks here */
2066 /* but that puts extra pressure on pp_slf, and is not worth much */ 2210 /* but that puts extra pressure on pp_slf, and is not worth much */
2067 /*coro_unwind_stacks (aTHX);*/ 2211 /*coro_unwind_stacks (aTHX);*/
2212}
2213
2214static void
2215slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2216{
2217 HV *coro_hv = (HV *)SvRV (coro_current);
2218
2219 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2220 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2221}
2222
2223static void
2224slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2225{
2226 HV *coro_hv;
2227 struct coro *coro;
2228
2229 if (items <= 0)
2230 croak ("Coro::cancel called without coro object,");
2231
2232 coro = SvSTATE (arg [0]);
2233 coro_hv = coro->hv;
2234
2235 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2236
2237 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2238 {
2239 /* coro currently busy cancelling something, so just notify it */
2240 coro->slf_frame.data = (void *)coro;
2241
2242 frame->prepare = prepare_nop;
2243 frame->check = slf_check_nop;
2244 }
2245 else if (coro_hv == (HV *)SvRV (coro_current))
2246 {
2247 /* cancelling the current coro is allowed, and equals terminate */
2248 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2249 }
2250 else
2251 {
2252 struct coro *self = SvSTATE_current;
2253
2254 /* otherwise we cancel directly, purely for speed reasons
2255 * unfortunately, this requires some magic trickery, as
2256 * somebody else could cancel us, so we have to fight the cancellation.
2257 * this is ugly, and hopefully fully worth the extra speed.
2258 * besides, I can't get the slow-but-safe version working...
2259 */
2260 slf_frame.data = 0;
2261 self->flags |= CF_NOCANCEL;
2262 coro_state_destroy (aTHX_ coro);
2263 self->flags &= ~CF_NOCANCEL;
2264
2265 if (slf_frame.data)
2266 {
2267 /* while we were busy we have been cancelled, so terminate */
2268 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2269 }
2270 else
2271 {
2272 frame->prepare = prepare_nop;
2273 frame->check = slf_check_nop;
2274 }
2275 }
2276}
2277
2278static int
2279slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2280{
2281 frame->prepare = 0;
2282 coro_unwind_stacks (aTHX);
2283
2284 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2285
2286 return 1;
2287}
2288
2289static int
2290safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2291{
2292 if (coro->cctx)
2293 croak ("coro inside C callback, unable to cancel at this time, caught");
2294
2295 if (coro->flags & CF_NEW)
2296 {
2297 coro_set_status (aTHX_ coro, arg, items);
2298 coro_state_destroy (aTHX_ coro);
2299 }
2300 else
2301 {
2302 if (!coro->slf_frame.prepare)
2303 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2304
2305 slf_destroy (aTHX_ coro);
2306
2307 coro_set_status (aTHX_ coro, arg, items);
2308 coro->slf_frame.prepare = prepare_nop;
2309 coro->slf_frame.check = slf_check_safe_cancel;
2310
2311 api_ready (aTHX_ (SV *)coro->hv);
2312 }
2313
2314 return 1;
2068} 2315}
2069 2316
2070/*****************************************************************************/ 2317/*****************************************************************************/
2071/* async pool handler */ 2318/* async pool handler */
2072 2319
… …
2103slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2350slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2104{ 2351{
2105 HV *hv = (HV *)SvRV (coro_current); 2352 HV *hv = (HV *)SvRV (coro_current);
2106 struct coro *coro = SvSTATE_hv ((SV *)hv); 2353 struct coro *coro = SvSTATE_hv ((SV *)hv);
2107 2354
2108 if (expect_true (coro->saved_deffh)) 2355 if (ecb_expect_true (coro->saved_deffh))
2109 { 2356 {
2110 /* subsequent iteration */ 2357 /* subsequent iteration */
2111 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2358 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2112 coro->saved_deffh = 0; 2359 coro->saved_deffh = 0;
2113 2360
2114 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2361 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2115 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2362 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2116 { 2363 {
2117 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2364 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2118 coro->invoke_av = newAV (); 2365 return;
2119
2120 frame->prepare = prepare_nop;
2121 } 2366 }
2122 else 2367 else
2123 { 2368 {
2124 av_clear (GvAV (PL_defgv)); 2369 av_clear (GvAV (PL_defgv));
2125 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2370 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2175 2420
2176static int 2421static int
2177slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2422slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2178{ 2423{
2179 SV *data = (SV *)frame->data; 2424 SV *data = (SV *)frame->data;
2180 2425
2181 if (CORO_THROW) 2426 if (CORO_THROW)
2182 return 0; 2427 return 0;
2183 2428
2184 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2429 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2185 return 1; 2430 return 1;
… …
2221 cb = sv_2mortal (coro->rouse_cb); 2466 cb = sv_2mortal (coro->rouse_cb);
2222 coro->rouse_cb = 0; 2467 coro->rouse_cb = 0;
2223 } 2468 }
2224 2469
2225 if (!SvROK (cb) 2470 if (!SvROK (cb)
2226 || SvTYPE (SvRV (cb)) != SVt_PVCV 2471 || SvTYPE (SvRV (cb)) != SVt_PVCV
2227 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2472 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2228 croak ("Coro::rouse_wait called with illegal callback argument,"); 2473 croak ("Coro::rouse_wait called with illegal callback argument,");
2229 2474
2230 { 2475 {
2231 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2476 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2348static void 2593static void
2349slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2594slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2350{ 2595{
2351 frame->prepare = prepare_cede_notself; 2596 frame->prepare = prepare_cede_notself;
2352 frame->check = slf_check_nop; 2597 frame->check = slf_check_nop;
2598}
2599
2600/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2601static void
2602slf_destroy (pTHX_ struct coro *coro)
2603{
2604 struct CoroSLF frame = coro->slf_frame;
2605
2606 /*
2607 * The on_destroy below most likely is from an SLF call.
2608 * Since by definition the SLF call will not finish when we destroy
2609 * the coro, we will have to force-finish it here, otherwise
2610 * cleanup functions cannot call SLF functions.
2611 */
2612 coro->slf_frame.prepare = 0;
2613 coro->slf_frame.destroy = 0;
2614
2615 /* this callback is reserved for slf functions needing to do cleanup */
2616 if (frame.destroy && frame.prepare && !PL_dirty)
2617 frame.destroy (aTHX_ &frame);
2353} 2618}
2354 2619
2355/* 2620/*
2356 * these not obviously related functions are all rolled into one 2621 * these not obviously related functions are all rolled into one
2357 * function to increase chances that they all will call transfer with the same 2622 * function to increase chances that they all will call transfer with the same
… …
2364 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2629 I32 checkmark; /* mark SP to see how many elements check has pushed */
2365 2630
2366 /* set up the slf frame, unless it has already been set-up */ 2631 /* set up the slf frame, unless it has already been set-up */
2367 /* the latter happens when a new coro has been started */ 2632 /* the latter happens when a new coro has been started */
2368 /* or when a new cctx was attached to an existing coroutine */ 2633 /* or when a new cctx was attached to an existing coroutine */
2369 if (expect_true (!slf_frame.prepare)) 2634 if (ecb_expect_true (!slf_frame.prepare))
2370 { 2635 {
2371 /* first iteration */ 2636 /* first iteration */
2372 dSP; 2637 dSP;
2373 SV **arg = PL_stack_base + TOPMARK + 1; 2638 SV **arg = PL_stack_base + TOPMARK + 1;
2374 int items = SP - arg; /* args without function object */ 2639 int items = SP - arg; /* args without function object */
… …
2415 while (slf_frame.check (aTHX_ &slf_frame)); 2680 while (slf_frame.check (aTHX_ &slf_frame));
2416 2681
2417 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2682 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2418 2683
2419 /* exception handling */ 2684 /* exception handling */
2420 if (expect_false (CORO_THROW)) 2685 if (ecb_expect_false (CORO_THROW))
2421 { 2686 {
2422 SV *exception = sv_2mortal (CORO_THROW); 2687 SV *exception = sv_2mortal (CORO_THROW);
2423 2688
2424 CORO_THROW = 0; 2689 CORO_THROW = 0;
2425 sv_setsv (ERRSV, exception); 2690 sv_setsv (ERRSV, exception);
2426 croak (0); 2691 croak (0);
2427 } 2692 }
2428 2693
2429 /* return value handling - mostly like entersub */ 2694 /* return value handling - mostly like entersub */
2430 /* make sure we put something on the stack in scalar context */ 2695 /* make sure we put something on the stack in scalar context */
2431 if (GIMME_V == G_SCALAR) 2696 if (GIMME_V == G_SCALAR
2697 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2432 { 2698 {
2433 dSP; 2699 dSP;
2434 SV **bot = PL_stack_base + checkmark; 2700 SV **bot = PL_stack_base + checkmark;
2435 2701
2436 if (sp == bot) /* too few, push undef */ 2702 if (sp == bot) /* too few, push undef */
2437 bot [1] = &PL_sv_undef; 2703 bot [1] = &PL_sv_undef;
2438 else if (sp != bot + 1) /* too many, take last one */ 2704 else /* too many, take last one */
2439 bot [1] = *sp; 2705 bot [1] = *sp;
2440 2706
2441 SP = bot + 1; 2707 SP = bot + 1;
2442 2708
2443 PUTBACK; 2709 PUTBACK;
… …
2550{ 2816{
2551 PerlIOBuf base; 2817 PerlIOBuf base;
2552 NV next, every; 2818 NV next, every;
2553} PerlIOCede; 2819} PerlIOCede;
2554 2820
2555static IV 2821static IV ecb_cold
2556PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2822PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2557{ 2823{
2558 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2824 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2559 2825
2560 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2826 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2561 self->next = nvtime () + self->every; 2827 self->next = nvtime () + self->every;
2562 2828
2563 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2829 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2564} 2830}
2565 2831
2566static SV * 2832static SV * ecb_cold
2567PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2833PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2568{ 2834{
2569 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2835 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2570 2836
2571 return newSVnv (self->every); 2837 return newSVnv (self->every);
… …
2683 SvREFCNT_dec (cb); 2949 SvREFCNT_dec (cb);
2684 } 2950 }
2685} 2951}
2686 2952
2687static void 2953static void
2688coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2954coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2689{ 2955{
2690 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2956 /* call $sem->adjust (0) to possibly wake up some other waiters */
2691 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2957 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2692} 2958}
2693 2959
2694static int 2960static int
2695slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2961slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2696{ 2962{
2697 AV *av = (AV *)frame->data; 2963 AV *av = (AV *)frame->data;
2698 SV *count_sv = AvARRAY (av)[0]; 2964 SV *count_sv = AvARRAY (av)[0];
2965 SV *coro_hv = SvRV (coro_current);
2699 2966
2700 /* if we are about to throw, don't actually acquire the lock, just throw */ 2967 /* if we are about to throw, don't actually acquire the lock, just throw */
2701 if (CORO_THROW) 2968 if (CORO_THROW)
2702 return 0; 2969 return 0;
2703 else if (SvIVX (count_sv) > 0) 2970 else if (SvIVX (count_sv) > 0)
2704 { 2971 {
2705 SvSTATE_current->on_destroy = 0; 2972 frame->destroy = 0;
2706 2973
2707 if (acquire) 2974 if (acquire)
2708 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2975 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2709 else 2976 else
2710 coro_semaphore_adjust (aTHX_ av, 0); 2977 coro_semaphore_adjust (aTHX_ av, 0);
… …
2715 { 2982 {
2716 int i; 2983 int i;
2717 /* if we were woken up but can't down, we look through the whole */ 2984 /* if we were woken up but can't down, we look through the whole */
2718 /* waiters list and only add us if we aren't in there already */ 2985 /* waiters list and only add us if we aren't in there already */
2719 /* this avoids some degenerate memory usage cases */ 2986 /* this avoids some degenerate memory usage cases */
2720 2987 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2721 for (i = 1; i <= AvFILLp (av); ++i)
2722 if (AvARRAY (av)[i] == SvRV (coro_current)) 2988 if (AvARRAY (av)[i] == coro_hv)
2723 return 1; 2989 return 1;
2724 2990
2725 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2991 av_push (av, SvREFCNT_inc (coro_hv));
2726 return 1; 2992 return 1;
2727 } 2993 }
2728} 2994}
2729 2995
2730static int 2996static int
… …
2753 { 3019 {
2754 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3020 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2755 3021
2756 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3022 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2757 frame->prepare = prepare_schedule; 3023 frame->prepare = prepare_schedule;
2758
2759 /* to avoid race conditions when a woken-up coro gets terminated */ 3024 /* to avoid race conditions when a woken-up coro gets terminated */
2760 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3025 /* we arrange for a temporary on_destroy that calls adjust (0) */
2761 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3026 frame->destroy = coro_semaphore_destroy;
2762 } 3027 }
2763} 3028}
2764 3029
2765static void 3030static void
2766slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3031slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2935 /* it quickly returns */ 3200 /* it quickly returns */
2936 if (CORO_THROW) 3201 if (CORO_THROW)
2937 return 0; 3202 return 0;
2938 3203
2939 /* one element that is an RV? repeat! */ 3204 /* one element that is an RV? repeat! */
2940 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3205 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2941 return 1; 3206 return 1;
2942 3207
2943 /* restore status */ 3208 /* restore status */
2944 { 3209 {
2945 SV *data_sv = av_pop (state); 3210 SV *data_sv = av_pop (state);
… …
2984 dSP; 3249 dSP;
2985 3250
2986 static SV *prio_cv; 3251 static SV *prio_cv;
2987 static SV *prio_sv; 3252 static SV *prio_sv;
2988 3253
2989 if (expect_false (!prio_cv)) 3254 if (ecb_expect_false (!prio_cv))
2990 { 3255 {
2991 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3256 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2992 prio_sv = newSViv (0); 3257 prio_sv = newSViv (0);
2993 } 3258 }
2994 3259
… …
3100 } 3365 }
3101 3366
3102 return coro_sv; 3367 return coro_sv;
3103} 3368}
3104 3369
3370#ifndef __cplusplus
3371ecb_cold XS(boot_Coro__State);
3372#endif
3373
3374#if CORO_JIT
3375
3376static void ecb_noinline ecb_cold
3377pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3378{
3379 dSP;
3380 AV *av = newAV ();
3381
3382 av_store (av, 3, newSVuv (d));
3383 av_store (av, 2, newSVuv (c));
3384 av_store (av, 1, newSVuv (b));
3385 av_store (av, 0, newSVuv (a));
3386
3387 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3388
3389 PUTBACK;
3390}
3391
3392static void ecb_noinline ecb_cold
3393jit_init (pTHX)
3394{
3395 dSP;
3396 SV *load, *save;
3397 char *map_base;
3398 char *load_ptr, *save_ptr;
3399 STRLEN load_len, save_len, map_len;
3400 int count;
3401
3402 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3403
3404 PUSHMARK (SP);
3405 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3406 #include "state.h"
3407 count = call_pv ("Coro::State::_jit", G_ARRAY);
3408 SPAGAIN;
3409
3410 save = POPs; save_ptr = SvPVbyte (save, save_len);
3411 load = POPs; load_ptr = SvPVbyte (load, load_len);
3412
3413 map_len = load_len + save_len + 16;
3414
3415 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3416
3417 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3418
3419 load_perl_slots = (load_save_perl_slots_type)map_base;
3420 memcpy (map_base, load_ptr, load_len);
3421
3422 map_base += (load_len + 15) & ~15;
3423
3424 save_perl_slots = (load_save_perl_slots_type)map_base;
3425 memcpy (map_base, save_ptr, save_len);
3426
3427 /* we are good citizens and try to make the page read-only, so the evil evil */
3428 /* hackers might have it a bit more difficult */
3429 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3430
3431 PUTBACK;
3432 eval_pv ("undef &Coro::State::_jit", 1);
3433}
3434
3435#endif
3436
3105MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3437MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3106 3438
3107PROTOTYPES: DISABLE 3439PROTOTYPES: DISABLE
3108 3440
3109BOOT: 3441BOOT:
… …
3111#ifdef USE_ITHREADS 3443#ifdef USE_ITHREADS
3112# if CORO_PTHREAD 3444# if CORO_PTHREAD
3113 coro_thx = PERL_GET_CONTEXT; 3445 coro_thx = PERL_GET_CONTEXT;
3114# endif 3446# endif
3115#endif 3447#endif
3116 BOOT_PAGESIZE; 3448 /* perl defines these to check for existance first, but why it doesn't */
3449 /* just create them one at init time is not clear to me, except for */
3450 /* programs trying to delete them, but... */
3451 /* anyway, we declare this as invalid and make sure they are initialised here */
3452 DEFSV;
3453 ERRSV;
3117 3454
3118 cctx_current = cctx_new_empty (); 3455 cctx_current = cctx_new_empty ();
3119 3456
3120 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3457 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3121 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3458 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3161 coroapi.prepare_nop = prepare_nop; 3498 coroapi.prepare_nop = prepare_nop;
3162 coroapi.prepare_schedule = prepare_schedule; 3499 coroapi.prepare_schedule = prepare_schedule;
3163 coroapi.prepare_cede = prepare_cede; 3500 coroapi.prepare_cede = prepare_cede;
3164 coroapi.prepare_cede_notself = prepare_cede_notself; 3501 coroapi.prepare_cede_notself = prepare_cede_notself;
3165 3502
3166 time_init (); 3503 time_init (aTHX);
3167 3504
3168 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3505 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3506#if CORO_JIT
3507 PUTBACK;
3508 jit_init (aTHX);
3509 SPAGAIN;
3510#endif
3169} 3511}
3170 3512
3171SV * 3513SV *
3172new (SV *klass, ...) 3514new (SV *klass, ...)
3173 ALIAS: 3515 ALIAS:
… …
3180void 3522void
3181transfer (...) 3523transfer (...)
3182 PROTOTYPE: $$ 3524 PROTOTYPE: $$
3183 CODE: 3525 CODE:
3184 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3526 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3185
3186bool
3187_destroy (SV *coro_sv)
3188 CODE:
3189 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3190 OUTPUT:
3191 RETVAL
3192
3193void
3194_exit (int code)
3195 PROTOTYPE: $
3196 CODE:
3197 _exit (code);
3198 3527
3199SV * 3528SV *
3200clone (Coro::State coro) 3529clone (Coro::State coro)
3201 CODE: 3530 CODE:
3202{ 3531{
… …
3257void 3586void
3258list () 3587list ()
3259 PROTOTYPE: 3588 PROTOTYPE:
3260 PPCODE: 3589 PPCODE:
3261{ 3590{
3262 struct coro *coro; 3591 struct coro *coro;
3263 for (coro = coro_first; coro; coro = coro->next) 3592 for (coro = coro_first; coro; coro = coro->next)
3264 if (coro->hv) 3593 if (coro->hv)
3265 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3594 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3266} 3595}
3267 3596
… …
3272 CODE: 3601 CODE:
3273{ 3602{
3274 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3603 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3275 { 3604 {
3276 struct coro *current = SvSTATE_current; 3605 struct coro *current = SvSTATE_current;
3606 struct CoroSLF slf_save;
3277 3607
3278 if (current != coro) 3608 if (current != coro)
3279 { 3609 {
3280 PUTBACK; 3610 PUTBACK;
3281 save_perl (aTHX_ current); 3611 save_perl (aTHX_ current);
3282 load_perl (aTHX_ coro); 3612 load_perl (aTHX_ coro);
3613 /* the coro is most likely in an active SLF call.
3614 * while not strictly required (the code we execute is
3615 * not allowed to call any SLF functions), it's cleaner
3616 * to reinitialise the slf_frame and restore it later.
3617 * This might one day allow us to actually do SLF calls
3618 * from code executed here.
3619 */
3620 slf_save = slf_frame;
3621 slf_frame.prepare = 0;
3283 SPAGAIN; 3622 SPAGAIN;
3284 } 3623 }
3285 3624
3286 PUSHSTACK; 3625 PUSHSTACK;
3287 3626
… …
3297 SPAGAIN; 3636 SPAGAIN;
3298 3637
3299 if (current != coro) 3638 if (current != coro)
3300 { 3639 {
3301 PUTBACK; 3640 PUTBACK;
3641 slf_frame = slf_save;
3302 save_perl (aTHX_ coro); 3642 save_perl (aTHX_ coro);
3303 load_perl (aTHX_ current); 3643 load_perl (aTHX_ current);
3304 SPAGAIN; 3644 SPAGAIN;
3305 } 3645 }
3306 } 3646 }
… …
3311 PROTOTYPE: $ 3651 PROTOTYPE: $
3312 ALIAS: 3652 ALIAS:
3313 is_ready = CF_READY 3653 is_ready = CF_READY
3314 is_running = CF_RUNNING 3654 is_running = CF_RUNNING
3315 is_new = CF_NEW 3655 is_new = CF_NEW
3316 is_destroyed = CF_DESTROYED 3656 is_destroyed = CF_ZOMBIE
3657 is_zombie = CF_ZOMBIE
3317 is_suspended = CF_SUSPENDED 3658 is_suspended = CF_SUSPENDED
3318 CODE: 3659 CODE:
3319 RETVAL = boolSV (coro->flags & ix); 3660 RETVAL = boolSV (coro->flags & ix);
3320 OUTPUT: 3661 OUTPUT:
3321 RETVAL 3662 RETVAL
3322 3663
3323void 3664void
3324throw (Coro::State self, SV *exception = &PL_sv_undef) 3665throw (SV *self, SV *exception = &PL_sv_undef)
3325 PROTOTYPE: $;$ 3666 PROTOTYPE: $;$
3326 CODE: 3667 CODE:
3327{ 3668{
3669 struct coro *coro = SvSTATE (self);
3328 struct coro *current = SvSTATE_current; 3670 struct coro *current = SvSTATE_current;
3329 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3671 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3330 SvREFCNT_dec (*exceptionp); 3672 SvREFCNT_dec (*exceptionp);
3331 SvGETMAGIC (exception); 3673 SvGETMAGIC (exception);
3332 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3674 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3675
3676 api_ready (aTHX_ self);
3333} 3677}
3334 3678
3335void 3679void
3336api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3680api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3337 PROTOTYPE: $;$ 3681 PROTOTYPE: $;$
… …
3392 3736
3393void 3737void
3394cancel (Coro::State self) 3738cancel (Coro::State self)
3395 CODE: 3739 CODE:
3396 coro_state_destroy (aTHX_ self); 3740 coro_state_destroy (aTHX_ self);
3397 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3398
3399 3741
3400SV * 3742SV *
3401enable_times (int enabled = enable_times) 3743enable_times (int enabled = enable_times)
3402 CODE: 3744 CODE:
3403{ 3745{
… …
3416 3758
3417void 3759void
3418times (Coro::State self) 3760times (Coro::State self)
3419 PPCODE: 3761 PPCODE:
3420{ 3762{
3421 struct coro *current = SvSTATE (coro_current); 3763 struct coro *current = SvSTATE (coro_current);
3422 3764
3423 if (expect_false (current == self)) 3765 if (ecb_expect_false (current == self))
3424 { 3766 {
3425 coro_times_update (); 3767 coro_times_update ();
3426 coro_times_add (SvSTATE (coro_current)); 3768 coro_times_add (SvSTATE (coro_current));
3427 } 3769 }
3428 3770
3429 EXTEND (SP, 2); 3771 EXTEND (SP, 2);
3430 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3772 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3431 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3773 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3432 3774
3433 if (expect_false (current == self)) 3775 if (ecb_expect_false (current == self))
3434 coro_times_sub (SvSTATE (coro_current)); 3776 coro_times_sub (SvSTATE (coro_current));
3435} 3777}
3436 3778
3437void 3779void
3438swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3780swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3459BOOT: 3801BOOT:
3460{ 3802{
3461 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3803 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3462 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3804 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3463 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3805 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3464 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3465 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3806 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3466 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3807 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3467 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3808 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3468 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3809 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3469 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3810 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3470 3811
3471 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3812 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3472 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3813 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3473 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3814 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3474 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3815 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3475 3816
3476 coro_stash = gv_stashpv ("Coro", TRUE); 3817 coro_stash = gv_stashpv ("Coro", TRUE);
3477 3818
3478 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3819 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3479 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3820 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3480 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3821 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3508 api_ready (aTHX_ RETVAL); 3849 api_ready (aTHX_ RETVAL);
3509 OUTPUT: 3850 OUTPUT:
3510 RETVAL 3851 RETVAL
3511 3852
3512void 3853void
3854_destroy (Coro::State coro)
3855 CODE:
3856 /* used by the manager thread */
3857 coro_state_destroy (aTHX_ coro);
3858
3859void
3860on_destroy (Coro::State coro, SV *cb)
3861 CODE:
3862 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3863
3864void
3865join (...)
3866 CODE:
3867 CORO_EXECUTE_SLF_XS (slf_init_join);
3868
3869void
3513terminate (...) 3870terminate (...)
3514 CODE: 3871 CODE:
3515 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3872 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3873
3874void
3875cancel (...)
3876 CODE:
3877 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3878
3879int
3880safe_cancel (Coro::State self, ...)
3881 C_ARGS: aTHX_ self, &ST (1), items - 1
3516 3882
3517void 3883void
3518schedule (...) 3884schedule (...)
3519 CODE: 3885 CODE:
3520 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3886 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3677 on_leave = 1 4043 on_leave = 1
3678 PROTOTYPE: & 4044 PROTOTYPE: &
3679 CODE: 4045 CODE:
3680{ 4046{
3681 struct coro *coro = SvSTATE_current; 4047 struct coro *coro = SvSTATE_current;
3682 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4048 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3683 4049
3684 block = s_get_cv_croak (block); 4050 block = s_get_cv_croak (block);
3685 4051
3686 if (!*avp) 4052 if (!*avp)
3687 *avp = newAV (); 4053 *avp = newAV ();
… …
3707 4073
3708SV * 4074SV *
3709new (SV *klass, SV *count = 0) 4075new (SV *klass, SV *count = 0)
3710 CODE: 4076 CODE:
3711{ 4077{
3712 int semcnt = 1; 4078 int semcnt = 1;
3713 4079
3714 if (count) 4080 if (count)
3715 { 4081 {
3716 SvGETMAGIC (count); 4082 SvGETMAGIC (count);
3717 4083
… …
3777 XSRETURN_NO; 4143 XSRETURN_NO;
3778} 4144}
3779 4145
3780void 4146void
3781waiters (SV *self) 4147waiters (SV *self)
3782 PPCODE: 4148 PPCODE:
3783{ 4149{
3784 AV *av = (AV *)SvRV (self); 4150 AV *av = (AV *)SvRV (self);
3785 int wcount = AvFILLp (av) + 1 - 1; 4151 int wcount = AvFILLp (av) + 1 - 1;
3786 4152
3787 if (GIMME_V == G_SCALAR) 4153 if (GIMME_V == G_SCALAR)
… …
3796} 4162}
3797 4163
3798MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4164MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3799 4165
3800void 4166void
3801_may_delete (SV *sem, int count, int extra_refs) 4167_may_delete (SV *sem, int count, unsigned int extra_refs)
3802 PPCODE: 4168 PPCODE:
3803{ 4169{
3804 AV *av = (AV *)SvRV (sem); 4170 AV *av = (AV *)SvRV (sem);
3805 4171
3806 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4172 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3807 && AvFILLp (av) == 0 /* no waiters, just count */ 4173 && AvFILLp (av) == 0 /* no waiters, just count */
3808 && SvIV (AvARRAY (av)[0]) == count) 4174 && SvIV (AvARRAY (av)[0]) == count)
3809 XSRETURN_YES; 4175 XSRETURN_YES;
… …
3830 4196
3831void 4197void
3832broadcast (SV *self) 4198broadcast (SV *self)
3833 CODE: 4199 CODE:
3834{ 4200{
3835 AV *av = (AV *)SvRV (self); 4201 AV *av = (AV *)SvRV (self);
3836 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4202 coro_signal_wake (aTHX_ av, AvFILLp (av));
3837} 4203}
3838 4204
3839void 4205void
3840send (SV *self) 4206send (SV *self)
… …
3848 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4214 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3849} 4215}
3850 4216
3851IV 4217IV
3852awaited (SV *self) 4218awaited (SV *self)
3853 CODE: 4219 CODE:
3854 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4220 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3855 OUTPUT: 4221 OUTPUT:
3856 RETVAL 4222 RETVAL
3857 4223
3858 4224
… …
3863 4229
3864void 4230void
3865_schedule (...) 4231_schedule (...)
3866 CODE: 4232 CODE:
3867{ 4233{
3868 static int incede; 4234 static int incede;
3869 4235
3870 api_cede_notself (aTHX); 4236 api_cede_notself (aTHX);
3871 4237
3872 ++incede; 4238 ++incede;
3873 while (coro_nready >= incede && api_cede (aTHX)) 4239 while (coro_nready >= incede && api_cede (aTHX))
… …
3917 { 4283 {
3918 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4284 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3919 coro_old_pp_sselect = 0; 4285 coro_old_pp_sselect = 0;
3920 } 4286 }
3921 4287
4288MODULE = Coro::State PACKAGE = Coro::Util
4289
4290void
4291_exit (int code)
4292 CODE:
4293 _exit (code);
4294
4295NV
4296time ()
4297 CODE:
4298 RETVAL = nvtime (aTHX);
4299 OUTPUT:
4300 RETVAL
4301
4302NV
4303gettimeofday ()
4304 PPCODE:
4305{
4306 UV tv [2];
4307 u2time (aTHX_ tv);
4308 EXTEND (SP, 2);
4309 PUSHs (sv_2mortal (newSVuv (tv [0])));
4310 PUSHs (sv_2mortal (newSVuv (tv [1])));
4311}
4312

Diff Legend

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