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

Diff Legend

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