ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.387 by root, Mon Feb 21 13:38:04 2011 UTC vs.
Revision 1.430 by root, Wed Dec 19 23:36:16 2012 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
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#if defined(_WIN32)
48# undef HAS_GETTIMEOFDAY
27# undef setjmp 49# undef setjmp
28# undef longjmp 50# undef longjmp
29# undef _exit 51# undef _exit
30# define setjmp _setjmp /* deep magic */ 52# define setjmp _setjmp /* deep magic */
31#else 53#else
32# include <inttypes.h> /* most portable stdint.h */ 54# include <inttypes.h> /* most portable stdint.h */
33#endif 55#endif
34 56
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 */ 57/* the maximum number of idle cctx that will be pooled */
63static int cctx_max_idle = 4; 58static int cctx_max_idle = 4;
64 59
65#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 60#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
66# undef CORO_STACKGUARD 61# define HAS_SCOPESTACK_NAME 1
67#endif
68
69#ifndef CORO_STACKGUARD
70# define CORO_STACKGUARD 0
71#endif 62#endif
72 63
73/* prefer perl internal functions over our own? */ 64/* prefer perl internal functions over our own? */
74#ifndef CORO_PREFER_PERL_FUNCTIONS 65#ifndef CORO_PREFER_PERL_FUNCTIONS
75# define CORO_PREFER_PERL_FUNCTIONS 0 66# define CORO_PREFER_PERL_FUNCTIONS 0
… …
85# define STACKLEVEL ((void *)&stacklevel) 76# define STACKLEVEL ((void *)&stacklevel)
86#endif 77#endif
87 78
88#define IN_DESTRUCT PL_dirty 79#define IN_DESTRUCT PL_dirty
89 80
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" 81#include "CoroAPI.h"
106#define GCoroAPI (&coroapi) /* very sneaky */ 82#define GCoroAPI (&coroapi) /* very sneaky */
107 83
108#ifdef USE_ITHREADS 84#ifdef USE_ITHREADS
109# if CORO_PTHREAD 85# if CORO_PTHREAD
… …
125static void (*u2time)(pTHX_ UV ret[2]); 101static void (*u2time)(pTHX_ UV ret[2]);
126 102
127/* we hijack an hopefully unused CV flag for our purposes */ 103/* we hijack an hopefully unused CV flag for our purposes */
128#define CVf_SLF 0x4000 104#define CVf_SLF 0x4000
129static OP *pp_slf (pTHX); 105static OP *pp_slf (pTHX);
106static void slf_destroy (pTHX_ struct coro *coro);
130 107
131static U32 cctx_gen; 108static U32 cctx_gen;
132static size_t cctx_stacksize = CORO_STACKSIZE; 109static size_t cctx_stacksize = CORO_STACKSIZE;
133static struct CoroAPI coroapi; 110static struct CoroAPI coroapi;
134static AV *main_mainstack; /* used to differentiate between $main and others */ 111static AV *main_mainstack; /* used to differentiate between $main and others */
… …
164static char times_valid; 141static char times_valid;
165 142
166static struct coro_cctx *cctx_first; 143static struct coro_cctx *cctx_first;
167static int cctx_count, cctx_idle; 144static int cctx_count, cctx_idle;
168 145
169enum { 146enum
147{
170 CC_MAPPED = 0x01, 148 CC_MAPPED = 0x01,
171 CC_NOREUSE = 0x02, /* throw this away after tracing */ 149 CC_NOREUSE = 0x02, /* throw this away after tracing */
172 CC_TRACE = 0x04, 150 CC_TRACE = 0x04,
173 CC_TRACE_SUB = 0x08, /* trace sub calls */ 151 CC_TRACE_SUB = 0x08, /* trace sub calls */
174 CC_TRACE_LINE = 0x10, /* trace each statement */ 152 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
179typedef struct coro_cctx 157typedef struct coro_cctx
180{ 158{
181 struct coro_cctx *next; 159 struct coro_cctx *next;
182 160
183 /* the stack */ 161 /* the stack */
184 void *sptr; 162 struct coro_stack stack;
185 size_t ssize;
186 163
187 /* cpu state */ 164 /* cpu state */
188 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 165 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
166#ifndef NDEBUG
189 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 167 JMPENV *idle_te; /* same as idle_sp, but for top_env */
168#endif
190 JMPENV *top_env; 169 JMPENV *top_env;
191 coro_context cctx; 170 coro_context cctx;
192 171
193 U32 gen; 172 U32 gen;
194#if CORO_USE_VALGRIND 173#if CORO_USE_VALGRIND
195 int valgrind_id; 174 int valgrind_id;
196#endif 175#endif
197 unsigned char flags; 176 unsigned char flags;
198} coro_cctx; 177} coro_cctx;
199 178
200coro_cctx *cctx_current; /* the currently running cctx */ 179static coro_cctx *cctx_current; /* the currently running cctx */
201 180
202/*****************************************************************************/ 181/*****************************************************************************/
203 182
183static MGVTBL coro_state_vtbl;
184
204enum { 185enum
186{
205 CF_RUNNING = 0x0001, /* coroutine is running */ 187 CF_RUNNING = 0x0001, /* coroutine is running */
206 CF_READY = 0x0002, /* coroutine is ready */ 188 CF_READY = 0x0002, /* coroutine is ready */
207 CF_NEW = 0x0004, /* has never been switched to */ 189 CF_NEW = 0x0004, /* has never been switched to */
208 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 190 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
209 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 191 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
192 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
210}; 193};
211 194
212/* the structure where most of the perl state is stored, overlaid on the cxstack */ 195/* the structure where most of the perl state is stored, overlaid on the cxstack */
213typedef struct 196typedef struct
214{ 197{
215 SV *defsv;
216 AV *defav;
217 SV *errsv;
218 SV *irsgv;
219 HV *hinthv;
220#define VAR(name,type) type name; 198 #define VARx(name,expr,type) type name;
221# include "state.h" 199 #include "state.h"
222#undef VAR
223} perl_slots; 200} perl_slots;
224 201
202/* 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)) 203#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
226 204
227/* this is a structure representing a perl-level coroutine */ 205/* this is a structure representing a perl-level coroutine */
228struct coro { 206struct coro
207{
229 /* the C coroutine allocated to this perl coroutine, if any */ 208 /* the C coroutine allocated to this perl coroutine, if any */
230 coro_cctx *cctx; 209 coro_cctx *cctx;
231 210
232 /* ready queue */ 211 /* ready queue */
233 struct coro *next_ready; 212 struct coro *next_ready;
… …
235 /* state data */ 214 /* state data */
236 struct CoroSLF slf_frame; /* saved slf frame */ 215 struct CoroSLF slf_frame; /* saved slf frame */
237 AV *mainstack; 216 AV *mainstack;
238 perl_slots *slot; /* basically the saved sp */ 217 perl_slots *slot; /* basically the saved sp */
239 218
240 CV *startcv; /* the CV to execute */ 219 CV *startcv; /* the CV to execute */
241 AV *args; /* data associated with this coroutine (initial args) */ 220 AV *args; /* data associated with this coroutine (initial args) */
242 int refcnt; /* coroutines are refcounted, yes */
243 int flags; /* CF_ flags */ 221 int flags; /* CF_ flags */
244 HV *hv; /* the perl hash associated with this coro, if any */ 222 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 223
247 /* statistics */ 224 /* statistics */
248 int usecount; /* number of transfers to this coro */ 225 int usecount; /* number of transfers to this coro */
249 226
250 /* coro process data */ 227 /* coro process data */
251 int prio; 228 int prio;
252 SV *except; /* exception to be thrown */ 229 SV *except; /* exception to be thrown */
253 SV *rouse_cb; 230 SV *rouse_cb; /* last rouse callback */
231 AV *on_destroy; /* callbacks or coros to notify on destroy */
232 AV *status; /* the exit status list */
254 233
255 /* async_pool */ 234 /* async_pool */
256 SV *saved_deffh; 235 SV *saved_deffh;
257 SV *invoke_cb; 236 SV *invoke_cb;
258 AV *invoke_av; 237 AV *invoke_av;
… …
274typedef struct coro *Coro__State; 253typedef struct coro *Coro__State;
275typedef struct coro *Coro__State_or_hashref; 254typedef struct coro *Coro__State_or_hashref;
276 255
277/* the following variables are effectively part of the perl context */ 256/* the following variables are effectively part of the perl context */
278/* and get copied between struct coro and these variables */ 257/* and get copied between struct coro and these variables */
279/* the mainr easonw e don't support windows process emulation */ 258/* the main reason we don't support windows process emulation */
280static struct CoroSLF slf_frame; /* the current slf frame */ 259static struct CoroSLF slf_frame; /* the current slf frame */
281 260
282/** Coro ********************************************************************/ 261/** Coro ********************************************************************/
283 262
284#define CORO_PRIO_MAX 3 263#define CORO_PRIO_MAX 3
… …
290 269
291/* for Coro.pm */ 270/* for Coro.pm */
292static SV *coro_current; 271static SV *coro_current;
293static SV *coro_readyhook; 272static SV *coro_readyhook;
294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 273static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
295static CV *cv_coro_run, *cv_coro_terminate; 274static CV *cv_coro_run;
296static struct coro *coro_first; 275static struct coro *coro_first;
297#define coro_nready coroapi.nready 276#define coro_nready coroapi.nready
277
278/** JIT *********************************************************************/
279
280#if CORO_JIT
281 /* APPLE doesn't have mmap though */
282 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
283 #ifndef CORO_JIT_TYPE
284 #if ECB_AMD64 && CORO_JIT_UNIXY
285 #define CORO_JIT_TYPE "amd64-unix"
286 #elif __i386 && CORO_JIT_UNIXY
287 #define CORO_JIT_TYPE "x86-unix"
288 #endif
289 #endif
290#endif
291
292#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
293 #undef CORO_JIT
294#endif
295
296#if CORO_JIT
297 typedef void (*load_save_perl_slots_type)(perl_slots *);
298 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
299#endif
298 300
299/** Coro::Select ************************************************************/ 301/** Coro::Select ************************************************************/
300 302
301static OP *(*coro_old_pp_sselect) (pTHX); 303static OP *(*coro_old_pp_sselect) (pTHX);
302static SV *coro_select_select; 304static SV *coro_select_select;
… …
318 320
319/** time stuff **************************************************************/ 321/** time stuff **************************************************************/
320 322
321#ifdef HAS_GETTIMEOFDAY 323#ifdef HAS_GETTIMEOFDAY
322 324
323static void 325ecb_inline void
324coro_u2time (pTHX_ UV ret[2]) 326coro_u2time (pTHX_ UV ret[2])
325{ 327{
326 struct timeval tv; 328 struct timeval tv;
327 gettimeofday (&tv, 0); 329 gettimeofday (&tv, 0);
328 330
329 ret [0] = tv.tv_sec; 331 ret [0] = tv.tv_sec;
330 ret [1] = tv.tv_usec; 332 ret [1] = tv.tv_usec;
331} 333}
332 334
333static double 335ecb_inline double
334coro_nvtime () 336coro_nvtime (void)
335{ 337{
336 struct timeval tv; 338 struct timeval tv;
337 gettimeofday (&tv, 0); 339 gettimeofday (&tv, 0);
338 340
339 return tv.tv_sec + tv.tv_usec * 1e-6; 341 return tv.tv_sec + tv.tv_usec * 1e-6;
340} 342}
341 343
342static void 344ecb_inline void
343time_init (void) 345time_init (pTHX)
344{ 346{
345 nvtime = coro_nvtime; 347 nvtime = coro_nvtime;
346 u2time = coro_u2time; 348 u2time = coro_u2time;
347} 349}
348 350
349#else 351#else
350 352
351static void 353ecb_inline void
352time_init (void) 354time_init (pTHX)
353{ 355{
354 SV **svp; 356 SV **svp;
355 357
356 require_pv ("Time::HiRes"); 358 require_pv ("Time/HiRes.pm");
357 359
358 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
359 361
360 if (!svp) croak ("Time::HiRes is required"); 362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
361 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
362 364
363 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 365 nvtime = INT2PTR (double (*)(), SvIV (*svp));
364 366
365 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0); 367 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
366 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp)); 368 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
… …
368 370
369#endif 371#endif
370 372
371/** lowlevel stuff **********************************************************/ 373/** lowlevel stuff **********************************************************/
372 374
373static SV * 375static SV * ecb_noinline
374coro_get_sv (pTHX_ const char *name, int create) 376coro_get_sv (pTHX_ const char *name, int create)
375{ 377{
376#if PERL_VERSION_ATLEAST (5,10,0) 378#if PERL_VERSION_ATLEAST (5,10,0)
377 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 379 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
378 get_sv (name, create); 380 get_sv (name, create);
379#endif 381#endif
380 return get_sv (name, create); 382 return get_sv (name, create);
381} 383}
382 384
383static AV * 385static AV * ecb_noinline
384coro_get_av (pTHX_ const char *name, int create) 386coro_get_av (pTHX_ const char *name, int create)
385{ 387{
386#if PERL_VERSION_ATLEAST (5,10,0) 388#if PERL_VERSION_ATLEAST (5,10,0)
387 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 389 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
388 get_av (name, create); 390 get_av (name, create);
389#endif 391#endif
390 return get_av (name, create); 392 return get_av (name, create);
391} 393}
392 394
393static HV * 395static HV * ecb_noinline
394coro_get_hv (pTHX_ const char *name, int create) 396coro_get_hv (pTHX_ const char *name, int create)
395{ 397{
396#if PERL_VERSION_ATLEAST (5,10,0) 398#if PERL_VERSION_ATLEAST (5,10,0)
397 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
398 get_hv (name, create); 400 get_hv (name, create);
399#endif 401#endif
400 return get_hv (name, create); 402 return get_hv (name, create);
401} 403}
402 404
403INLINE void 405ecb_inline void
404coro_times_update () 406coro_times_update (void)
405{ 407{
406#ifdef coro_clock_gettime 408#ifdef coro_clock_gettime
407 struct timespec ts; 409 struct timespec ts;
408 410
409 ts.tv_sec = ts.tv_nsec = 0; 411 ts.tv_sec = ts.tv_nsec = 0;
… …
421 time_real [0] = tv [0]; 423 time_real [0] = tv [0];
422 time_real [1] = tv [1] * 1000; 424 time_real [1] = tv [1] * 1000;
423#endif 425#endif
424} 426}
425 427
426INLINE void 428ecb_inline void
427coro_times_add (struct coro *c) 429coro_times_add (struct coro *c)
428{ 430{
429 c->t_real [1] += time_real [1]; 431 c->t_real [1] += time_real [1];
430 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
431 c->t_real [0] += time_real [0]; 433 c->t_real [0] += time_real [0];
… …
433 c->t_cpu [1] += time_cpu [1]; 435 c->t_cpu [1] += time_cpu [1];
434 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
435 c->t_cpu [0] += time_cpu [0]; 437 c->t_cpu [0] += time_cpu [0];
436} 438}
437 439
438INLINE void 440ecb_inline void
439coro_times_sub (struct coro *c) 441coro_times_sub (struct coro *c)
440{ 442{
441 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 443 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]; 444 c->t_real [1] -= time_real [1];
443 c->t_real [0] -= time_real [0]; 445 c->t_real [0] -= time_real [0];
… …
451/* magic glue */ 453/* magic glue */
452 454
453#define CORO_MAGIC_type_cv 26 455#define CORO_MAGIC_type_cv 26
454#define CORO_MAGIC_type_state PERL_MAGIC_ext 456#define CORO_MAGIC_type_state PERL_MAGIC_ext
455 457
456#define CORO_MAGIC_NN(sv, type) \ 458#define CORO_MAGIC_NN(sv, type) \
457 (expect_true (SvMAGIC (sv)->mg_type == type) \ 459 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
458 ? SvMAGIC (sv) \ 460 ? SvMAGIC (sv) \
459 : mg_find (sv, type)) 461 : mg_find (sv, type))
460 462
461#define CORO_MAGIC(sv, type) \ 463#define CORO_MAGIC(sv, type) \
462 (expect_true (SvMAGIC (sv)) \ 464 (ecb_expect_true (SvMAGIC (sv)) \
463 ? CORO_MAGIC_NN (sv, type) \ 465 ? CORO_MAGIC_NN (sv, type) \
464 : 0) 466 : 0)
465 467
466#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 468#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) 469#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
468 470
469INLINE struct coro * 471ecb_inline MAGIC *
472SvSTATEhv_p (pTHX_ SV *coro)
473{
474 MAGIC *mg;
475
476 if (ecb_expect_true (
477 SvTYPE (coro) == SVt_PVHV
478 && (mg = CORO_MAGIC_state (coro))
479 && mg->mg_virtual == &coro_state_vtbl
480 ))
481 return mg;
482
483 return 0;
484}
485
486ecb_inline struct coro *
470SvSTATE_ (pTHX_ SV *coro) 487SvSTATE_ (pTHX_ SV *coro)
471{ 488{
472 HV *stash;
473 MAGIC *mg; 489 MAGIC *mg;
474 490
475 if (SvROK (coro)) 491 if (SvROK (coro))
476 coro = SvRV (coro); 492 coro = SvRV (coro);
477 493
478 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 494 mg = SvSTATEhv_p (aTHX_ coro);
495 if (!mg)
479 croak ("Coro::State object required"); 496 croak ("Coro::State object required");
480 497
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; 498 return (struct coro *)mg->mg_ptr;
491} 499}
492 500
493#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 501#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
494 502
… …
497#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 505#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
498 506
499/*****************************************************************************/ 507/*****************************************************************************/
500/* padlist management and caching */ 508/* padlist management and caching */
501 509
502static AV * 510ecb_inline PADLIST *
503coro_derive_padlist (pTHX_ CV *cv) 511coro_derive_padlist (pTHX_ CV *cv)
504{ 512{
505 AV *padlist = CvPADLIST (cv); 513 PADLIST *padlist = CvPADLIST (cv);
506 AV *newpadlist, *newpad; 514 PADLIST *newpadlist;
515 PAD *newpad;
516 PADOFFSET const off = PadlistMAX (padlist) + 1;
507 517
508 newpadlist = newAV (); 518 newPADLIST(newpadlist);
519#if !PERL_VERSION_ATLEAST(5,15,3)
520 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
509 AvREAL_off (newpadlist); 521 AvREAL_off (newpadlist);
522#endif
510#if PERL_VERSION_ATLEAST (5,10,0) 523#if PERL_VERSION_ATLEAST (5,10,0)
511 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 524 Perl_pad_push (aTHX_ padlist, off);
512#else 525#else
513 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 526 Perl_pad_push (aTHX_ padlist, off, 1);
514#endif 527#endif
515 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 528 newpad = PadlistARRAY (padlist)[off];
516 --AvFILLp (padlist); 529 PadlistMAX (padlist) = off - 1;
517 530
518 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 531 /* Already extended to 2 elements by newPADLIST. */
519 av_store (newpadlist, 1, (SV *)newpad); 532 PadlistMAX (newpadlist) = 1;
533 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
534 PadlistARRAY (newpadlist)[1] = newpad;
520 535
521 return newpadlist; 536 return newpadlist;
522} 537}
523 538
524static void 539ecb_inline void
525free_padlist (pTHX_ AV *padlist) 540free_padlist (pTHX_ PADLIST *padlist)
526{ 541{
527 /* may be during global destruction */ 542 /* may be during global destruction */
528 if (!IN_DESTRUCT) 543 if (!IN_DESTRUCT)
529 { 544 {
530 I32 i = AvFILLp (padlist); 545 I32 i = PadlistMAX (padlist);
531 546
532 while (i > 0) /* special-case index 0 */ 547 while (i > 0) /* special-case index 0 */
533 { 548 {
534 /* we try to be extra-careful here */ 549 /* we try to be extra-careful here */
535 AV *av = (AV *)AvARRAY (padlist)[i--]; 550 PAD *pad = PadlistARRAY (padlist)[i--];
536 I32 j = AvFILLp (av); 551 I32 j = PadMAX (pad);
537 552
538 while (j >= 0) 553 while (j >= 0)
539 SvREFCNT_dec (AvARRAY (av)[j--]); 554 SvREFCNT_dec (PadARRAY (pad)[j--]);
540 555
541 AvFILLp (av) = -1; 556 PadMAX (pad) = -1;
542 SvREFCNT_dec (av); 557 SvREFCNT_dec (pad);
543 } 558 }
544 559
545 SvREFCNT_dec (AvARRAY (padlist)[0]); 560 SvREFCNT_dec (PadlistNAMES (padlist));
546 561
562#ifdef NEWPADAPI
563 Safefree (PadlistARRAY (padlist));
564 Safefree (padlist);
565#else
547 AvFILLp (padlist) = -1; 566 AvFILLp (padlist) = -1;
567 AvREAL_off (padlist);
548 SvREFCNT_dec ((SV*)padlist); 568 SvREFCNT_dec ((SV*)padlist);
569#endif
549 } 570 }
550} 571}
551 572
552static int 573static int
553coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 574coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
554{ 575{
555 AV *padlist; 576 PADLIST *padlist;
556 AV *av = (AV *)mg->mg_obj; 577 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
578 size_t len = *(size_t *)mg->mg_ptr;
557 579
558 /* perl manages to free our internal AV and _then_ call us */ 580 /* perl manages to free our internal AV and _then_ call us */
559 if (IN_DESTRUCT) 581 if (IN_DESTRUCT)
560 return 0; 582 return 0;
561 583
562 /* casting is fun. */ 584 while (len--)
563 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
564 free_padlist (aTHX_ padlist); 585 free_padlist (aTHX_ padlists[len]);
565
566 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
567 586
568 return 0; 587 return 0;
569} 588}
570 589
571static MGVTBL coro_cv_vtbl = { 590static MGVTBL coro_cv_vtbl = {
572 0, 0, 0, 0, 591 0, 0, 0, 0,
573 coro_cv_free 592 coro_cv_free
574}; 593};
575 594
576/* the next two functions merely cache the padlists */ 595/* the next two functions merely cache the padlists */
577static void 596ecb_inline void
578get_padlist (pTHX_ CV *cv) 597get_padlist (pTHX_ CV *cv)
579{ 598{
580 MAGIC *mg = CORO_MAGIC_cv (cv); 599 MAGIC *mg = CORO_MAGIC_cv (cv);
581 AV *av; 600 size_t *lenp;
582 601
583 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 602 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
584 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 603 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
585 else 604 else
586 { 605 {
587#if CORO_PREFER_PERL_FUNCTIONS 606#if CORO_PREFER_PERL_FUNCTIONS
588 /* this is probably cleaner? but also slower! */ 607 /* this is probably cleaner? but also slower! */
589 /* in practise, it seems to be less stable */ 608 /* in practise, it seems to be less stable */
… …
595 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 614 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
596#endif 615#endif
597 } 616 }
598} 617}
599 618
600static void 619ecb_inline void
601put_padlist (pTHX_ CV *cv) 620put_padlist (pTHX_ CV *cv)
602{ 621{
603 MAGIC *mg = CORO_MAGIC_cv (cv); 622 MAGIC *mg = CORO_MAGIC_cv (cv);
604 AV *av;
605 623
606 if (expect_false (!mg)) 624 if (ecb_expect_false (!mg))
625 {
607 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 626 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
627 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
628 mg->mg_len = 1; /* so mg_free frees mg_ptr */
629 }
630 else
631 Renew (mg->mg_ptr,
632 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
633 char);
608 634
609 av = (AV *)mg->mg_obj; 635 ((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} 636}
616 637
617/** load & save, init *******************************************************/ 638/** load & save, init *******************************************************/
618 639
640ecb_inline void
641swap_sv (SV *a, SV *b)
642{
643 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
644 SV tmp;
645
646 /* swap sv_any */
647 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
648
649 /* swap sv_flags */
650 SvFLAGS (&tmp) = SvFLAGS (a);
651 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
652 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
653
654#if PERL_VERSION_ATLEAST (5,10,0)
655 /* perl 5.10 and later complicates this _quite_ a bit, but it also
656 * is much faster, so no quarrels here. alternatively, we could
657 * sv_upgrade to avoid this.
658 */
659 {
660 /* swap sv_u */
661 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
662
663 /* if SvANY points to the head, we need to adjust the pointers,
664 * as the pointer for a still points to b, and maybe vice versa.
665 */
666 #define svany_in_head(type) \
667 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
668
669 if (svany_in_head (SvTYPE (a)))
670 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
671
672 if (svany_in_head (SvTYPE (b)))
673 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
674 }
675#endif
676}
677
619/* swap sv heads, at least logically */ 678/* swap sv heads, at least logically */
620static void 679static void
621swap_svs (pTHX_ Coro__State c) 680swap_svs (pTHX_ Coro__State c)
622{ 681{
623 int i; 682 int i;
624 683
625 for (i = 0; i <= AvFILLp (c->swap_sv); ) 684 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
626 { 685 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} 686}
665 687
666#define SWAP_SVS(coro) \ 688#define SWAP_SVS(coro) \
667 if (expect_false ((coro)->swap_sv)) \ 689 if (ecb_expect_false ((coro)->swap_sv)) \
668 swap_svs (aTHX_ (coro)) 690 swap_svs (aTHX_ (coro))
669 691
670static void 692static void
671on_enterleave_call (pTHX_ SV *cb); 693on_enterleave_call (pTHX_ SV *cb);
672 694
… …
676 perl_slots *slot = c->slot; 698 perl_slots *slot = c->slot;
677 c->slot = 0; 699 c->slot = 0;
678 700
679 PL_mainstack = c->mainstack; 701 PL_mainstack = c->mainstack;
680 702
681 GvSV (PL_defgv) = slot->defsv; 703#if CORO_JIT
682 GvAV (PL_defgv) = slot->defav; 704 load_perl_slots (slot);
683 GvSV (PL_errgv) = slot->errsv; 705#else
684 GvSV (irsgv) = slot->irsgv;
685 GvHV (PL_hintgv) = slot->hinthv;
686
687 #define VAR(name,type) PL_ ## name = slot->name; 706 #define VARx(name,expr,type) expr = slot->name;
688 # include "state.h" 707 #include "state.h"
689 #undef VAR 708#endif
690 709
691 { 710 {
692 dSP; 711 dSP;
693 712
694 CV *cv; 713 CV *cv;
695 714
696 /* now do the ugly restore mess */ 715 /* now do the ugly restore mess */
697 while (expect_true (cv = (CV *)POPs)) 716 while (ecb_expect_true (cv = (CV *)POPs))
698 { 717 {
699 put_padlist (aTHX_ cv); /* mark this padlist as available */ 718 put_padlist (aTHX_ cv); /* mark this padlist as available */
700 CvDEPTH (cv) = PTR2IV (POPs); 719 CvDEPTH (cv) = PTR2IV (POPs);
701 CvPADLIST (cv) = (AV *)POPs; 720 CvPADLIST (cv) = (PADLIST *)POPs;
702 } 721 }
703 722
704 PUTBACK; 723 PUTBACK;
705 } 724 }
706 725
707 slf_frame = c->slf_frame; 726 slf_frame = c->slf_frame;
708 CORO_THROW = c->except; 727 CORO_THROW = c->except;
709 728
710 if (expect_false (enable_times)) 729 if (ecb_expect_false (enable_times))
711 { 730 {
712 if (expect_false (!times_valid)) 731 if (ecb_expect_false (!times_valid))
713 coro_times_update (); 732 coro_times_update ();
714 733
715 coro_times_sub (c); 734 coro_times_sub (c);
716 } 735 }
717 736
718 if (expect_false (c->on_enter)) 737 if (ecb_expect_false (c->on_enter))
719 { 738 {
720 int i; 739 int i;
721 740
722 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 741 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
723 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 742 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
729static void 748static void
730save_perl (pTHX_ Coro__State c) 749save_perl (pTHX_ Coro__State c)
731{ 750{
732 SWAP_SVS (c); 751 SWAP_SVS (c);
733 752
734 if (expect_false (c->on_leave)) 753 if (ecb_expect_false (c->on_leave))
735 { 754 {
736 int i; 755 int i;
737 756
738 for (i = AvFILLp (c->on_leave); i >= 0; --i) 757 for (i = AvFILLp (c->on_leave); i >= 0; --i)
739 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 758 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
740 } 759 }
741 760
742 times_valid = 0; 761 times_valid = 0;
743 762
744 if (expect_false (enable_times)) 763 if (ecb_expect_false (enable_times))
745 { 764 {
746 coro_times_update (); times_valid = 1; 765 coro_times_update (); times_valid = 1;
747 coro_times_add (c); 766 coro_times_add (c);
748 } 767 }
749 768
… …
763 782
764 XPUSHs (Nullsv); 783 XPUSHs (Nullsv);
765 /* this loop was inspired by pp_caller */ 784 /* this loop was inspired by pp_caller */
766 for (;;) 785 for (;;)
767 { 786 {
768 while (expect_true (cxix >= 0)) 787 while (ecb_expect_true (cxix >= 0))
769 { 788 {
770 PERL_CONTEXT *cx = &ccstk[cxix--]; 789 PERL_CONTEXT *cx = &ccstk[cxix--];
771 790
772 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 791 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
773 { 792 {
774 CV *cv = cx->blk_sub.cv; 793 CV *cv = cx->blk_sub.cv;
775 794
776 if (expect_true (CvDEPTH (cv))) 795 if (ecb_expect_true (CvDEPTH (cv)))
777 { 796 {
778 EXTEND (SP, 3); 797 EXTEND (SP, 3);
779 PUSHs ((SV *)CvPADLIST (cv)); 798 PUSHs ((SV *)CvPADLIST (cv));
780 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 799 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
781 PUSHs ((SV *)cv); 800 PUSHs ((SV *)cv);
… …
784 get_padlist (aTHX_ cv); 803 get_padlist (aTHX_ cv);
785 } 804 }
786 } 805 }
787 } 806 }
788 807
789 if (expect_true (top_si->si_type == PERLSI_MAIN)) 808 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
790 break; 809 break;
791 810
792 top_si = top_si->si_prev; 811 top_si = top_si->si_prev;
793 ccstk = top_si->si_cxstack; 812 ccstk = top_si->si_cxstack;
794 cxix = top_si->si_cxix; 813 cxix = top_si->si_cxix;
… …
796 815
797 PUTBACK; 816 PUTBACK;
798 } 817 }
799 818
800 /* allocate some space on the context stack for our purposes */ 819 /* allocate some space on the context stack for our purposes */
801 /* we manually unroll here, as usually 2 slots is enough */ 820 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 { 821 {
806 unsigned int i; 822 unsigned int i;
823
807 for (i = 3; i < SLOT_COUNT; ++i) 824 for (i = 0; i < SLOT_COUNT; ++i)
808 CXINC; 825 CXINC;
809 } 826
810 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 827 cxstack_ix -= SLOT_COUNT; /* undo allocation */
828 }
811 829
812 c->mainstack = PL_mainstack; 830 c->mainstack = PL_mainstack;
813 831
814 { 832 {
815 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 833 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
816 834
817 slot->defav = GvAV (PL_defgv); 835#if CORO_JIT
818 slot->defsv = DEFSV; 836 save_perl_slots (slot);
819 slot->errsv = ERRSV; 837#else
820 slot->irsgv = GvSV (irsgv);
821 slot->hinthv = GvHV (PL_hintgv);
822
823 #define VAR(name,type) slot->name = PL_ ## name; 838 #define VARx(name,expr,type) slot->name = expr;
824 # include "state.h" 839 #include "state.h"
825 #undef VAR 840#endif
826 } 841 }
827} 842}
828 843
829/* 844/*
830 * allocate various perl stacks. This is almost an exact copy 845 * allocate various perl stacks. This is almost an exact copy
… …
836# define coro_init_stacks(thx) init_stacks () 851# define coro_init_stacks(thx) init_stacks ()
837#else 852#else
838static void 853static void
839coro_init_stacks (pTHX) 854coro_init_stacks (pTHX)
840{ 855{
841 PL_curstackinfo = new_stackinfo(32, 8); 856 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; 857 PL_curstackinfo->si_type = PERLSI_MAIN;
843 PL_curstack = PL_curstackinfo->si_stack; 858 PL_curstack = PL_curstackinfo->si_stack;
844 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 859 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
845 860
846 PL_stack_base = AvARRAY(PL_curstack); 861 PL_stack_base = AvARRAY(PL_curstack);
… …
861#endif 876#endif
862 877
863 New(54,PL_scopestack,8,I32); 878 New(54,PL_scopestack,8,I32);
864 PL_scopestack_ix = 0; 879 PL_scopestack_ix = 0;
865 PL_scopestack_max = 8; 880 PL_scopestack_max = 8;
881#if HAS_SCOPESTACK_NAME
882 New(54,PL_scopestack_name,8,const char*);
883#endif
866 884
867 New(54,PL_savestack,24,ANY); 885 New(54,PL_savestack,24,ANY);
868 PL_savestack_ix = 0; 886 PL_savestack_ix = 0;
869 PL_savestack_max = 24; 887 PL_savestack_max = 24;
870 888
… …
898 } 916 }
899 917
900 Safefree (PL_tmps_stack); 918 Safefree (PL_tmps_stack);
901 Safefree (PL_markstack); 919 Safefree (PL_markstack);
902 Safefree (PL_scopestack); 920 Safefree (PL_scopestack);
921#if HAS_SCOPESTACK_NAME
922 Safefree (PL_scopestack_name);
923#endif
903 Safefree (PL_savestack); 924 Safefree (PL_savestack);
904#if !PERL_VERSION_ATLEAST (5,10,0) 925#if !PERL_VERSION_ATLEAST (5,10,0)
905 Safefree (PL_retstack); 926 Safefree (PL_retstack);
906#endif 927#endif
907} 928}
… …
953#endif 974#endif
954 975
955/* 976/*
956 * This overrides the default magic get method of %SIG elements. 977 * 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 978 * 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 979 * and instead of trying to save and restore the hash elements (extremely slow),
959 * readback here. 980 * we just provide our own readback here.
960 */ 981 */
961static int 982static int ecb_cold
962coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 983coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
963{ 984{
964 const char *s = MgPV_nolen_const (mg); 985 const char *s = MgPV_nolen_const (mg);
965 986
966 if (*s == '_') 987 if (*s == '_')
967 { 988 {
968 SV **svp = 0; 989 SV **svp = 0;
969 990
970 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 991 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
971 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 992 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
972 993
973 if (svp) 994 if (svp)
974 { 995 {
975 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 996 SV *ssv;
997
998 if (!*svp)
999 ssv = &PL_sv_undef;
1000 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1001 ssv = sv_2mortal (newRV_inc (*svp));
1002 else
1003 ssv = *svp;
1004
1005 sv_setsv (sv, ssv);
976 return 0; 1006 return 0;
977 } 1007 }
978 } 1008 }
979 1009
980 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1010 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
981} 1011}
982 1012
983static int 1013static int ecb_cold
984coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1014coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
985{ 1015{
986 const char *s = MgPV_nolen_const (mg); 1016 const char *s = MgPV_nolen_const (mg);
987 1017
988 if (*s == '_') 1018 if (*s == '_')
… …
1002 } 1032 }
1003 1033
1004 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1034 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1005} 1035}
1006 1036
1007static int 1037static int ecb_cold
1008coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1038coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1009{ 1039{
1010 const char *s = MgPV_nolen_const (mg); 1040 const char *s = MgPV_nolen_const (mg);
1011 1041
1012 if (*s == '_') 1042 if (*s == '_')
… …
1047 return 1; 1077 return 1;
1048} 1078}
1049 1079
1050static UNOP init_perl_op; 1080static UNOP init_perl_op;
1051 1081
1052static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1082ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1053init_perl (pTHX_ struct coro *coro) 1083init_perl (pTHX_ struct coro *coro)
1054{ 1084{
1055 /* 1085 /*
1056 * emulate part of the perl startup here. 1086 * emulate part of the perl startup here.
1057 */ 1087 */
… …
1072 PL_parser = 0; 1102 PL_parser = 0;
1073#endif 1103#endif
1074 PL_hints = 0; 1104 PL_hints = 0;
1075 1105
1076 /* recreate the die/warn hooks */ 1106 /* recreate the die/warn hooks */
1077 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1107 PL_diehook = SvREFCNT_inc (rv_diehook);
1078 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1108 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1079 1109
1080 GvSV (PL_defgv) = newSV (0); 1110 GvSV (PL_defgv) = newSV (0);
1081 GvAV (PL_defgv) = coro->args; coro->args = 0; 1111 GvAV (PL_defgv) = coro->args; coro->args = 0;
1082 GvSV (PL_errgv) = newSV (0); 1112 GvSV (PL_errgv) = newSV (0);
1083 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1113 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1084 GvHV (PL_hintgv) = 0; 1114 GvHV (PL_hintgv) = 0;
… …
1104 /* this newly created coroutine might be run on an existing cctx which most 1134 /* 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. 1135 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1106 */ 1136 */
1107 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1137 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 */ 1138 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1139 slf_frame.destroy = 0;
1109 1140
1110 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1141 /* 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; 1142 init_perl_op.op_next = PL_op;
1112 init_perl_op.op_type = OP_ENTERSUB; 1143 init_perl_op.op_type = OP_ENTERSUB;
1113 init_perl_op.op_ppaddr = pp_slf; 1144 init_perl_op.op_ppaddr = pp_slf;
… …
1118 /* copy throw, in case it was set before init_perl */ 1149 /* copy throw, in case it was set before init_perl */
1119 CORO_THROW = coro->except; 1150 CORO_THROW = coro->except;
1120 1151
1121 SWAP_SVS (coro); 1152 SWAP_SVS (coro);
1122 1153
1123 if (expect_false (enable_times)) 1154 if (ecb_expect_false (enable_times))
1124 { 1155 {
1125 coro_times_update (); 1156 coro_times_update ();
1126 coro_times_sub (coro); 1157 coro_times_sub (coro);
1127 } 1158 }
1128} 1159}
… …
1152destroy_perl (pTHX_ struct coro *coro) 1183destroy_perl (pTHX_ struct coro *coro)
1153{ 1184{
1154 SV *svf [9]; 1185 SV *svf [9];
1155 1186
1156 { 1187 {
1188 SV *old_current = SvRV (coro_current);
1157 struct coro *current = SvSTATE_current; 1189 struct coro *current = SvSTATE (old_current);
1158 1190
1159 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1191 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1160 1192
1161 save_perl (aTHX_ current); 1193 save_perl (aTHX_ current);
1194
1195 /* this will cause transfer_check to croak on block*/
1196 SvRV_set (coro_current, (SV *)coro->hv);
1197
1162 load_perl (aTHX_ coro); 1198 load_perl (aTHX_ coro);
1163 1199
1164 coro_unwind_stacks (aTHX); 1200 coro_unwind_stacks (aTHX);
1165 coro_destruct_stacks (aTHX);
1166 1201
1167 /* restore swapped sv's */ 1202 /* restore swapped sv's */
1168 SWAP_SVS (coro); 1203 SWAP_SVS (coro);
1169 1204
1205 coro_destruct_stacks (aTHX);
1206
1170 // now save some sv's to be free'd later 1207 /* now save some sv's to be free'd later */
1171 svf [0] = GvSV (PL_defgv); 1208 svf [0] = GvSV (PL_defgv);
1172 svf [1] = (SV *)GvAV (PL_defgv); 1209 svf [1] = (SV *)GvAV (PL_defgv);
1173 svf [2] = GvSV (PL_errgv); 1210 svf [2] = GvSV (PL_errgv);
1174 svf [3] = (SV *)PL_defoutgv; 1211 svf [3] = (SV *)PL_defoutgv;
1175 svf [4] = PL_rs; 1212 svf [4] = PL_rs;
… …
1177 svf [6] = (SV *)GvHV (PL_hintgv); 1214 svf [6] = (SV *)GvHV (PL_hintgv);
1178 svf [7] = PL_diehook; 1215 svf [7] = PL_diehook;
1179 svf [8] = PL_warnhook; 1216 svf [8] = PL_warnhook;
1180 assert (9 == sizeof (svf) / sizeof (*svf)); 1217 assert (9 == sizeof (svf) / sizeof (*svf));
1181 1218
1219 SvRV_set (coro_current, old_current);
1220
1182 load_perl (aTHX_ current); 1221 load_perl (aTHX_ current);
1183 } 1222 }
1184 1223
1185 { 1224 {
1186 unsigned int i; 1225 unsigned int i;
… …
1193 SvREFCNT_dec (coro->invoke_cb); 1232 SvREFCNT_dec (coro->invoke_cb);
1194 SvREFCNT_dec (coro->invoke_av); 1233 SvREFCNT_dec (coro->invoke_av);
1195 } 1234 }
1196} 1235}
1197 1236
1198INLINE void 1237ecb_inline void
1199free_coro_mortal (pTHX) 1238free_coro_mortal (pTHX)
1200{ 1239{
1201 if (expect_true (coro_mortal)) 1240 if (ecb_expect_true (coro_mortal))
1202 { 1241 {
1203 SvREFCNT_dec (coro_mortal); 1242 SvREFCNT_dec ((SV *)coro_mortal);
1204 coro_mortal = 0; 1243 coro_mortal = 0;
1205 } 1244 }
1206} 1245}
1207 1246
1208static int 1247static int
… …
1341 1380
1342 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1381 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1343} 1382}
1344 1383
1345/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1384/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1346static void NOINLINE 1385static void ecb_noinline
1347cctx_prepare (pTHX) 1386cctx_prepare (pTHX)
1348{ 1387{
1349 PL_top_env = &PL_start_env; 1388 PL_top_env = &PL_start_env;
1350 1389
1351 if (cctx_current->flags & CC_TRACE) 1390 if (cctx_current->flags & CC_TRACE)
… …
1362 slf_frame.prepare = slf_prepare_set_stacklevel; 1401 slf_frame.prepare = slf_prepare_set_stacklevel;
1363 slf_frame.check = slf_check_set_stacklevel; 1402 slf_frame.check = slf_check_set_stacklevel;
1364} 1403}
1365 1404
1366/* the tail of transfer: execute stuff we can only do after a transfer */ 1405/* the tail of transfer: execute stuff we can only do after a transfer */
1367INLINE void 1406ecb_inline void
1368transfer_tail (pTHX) 1407transfer_tail (pTHX)
1369{ 1408{
1370 free_coro_mortal (aTHX); 1409 free_coro_mortal (aTHX);
1410}
1411
1412/* try to exit the same way perl's main function would do */
1413/* we do not bother resetting the environment or other things *7
1414/* that are not, uhm, essential */
1415/* this obviously also doesn't work when perl is embedded */
1416static void ecb_noinline ecb_cold
1417perlish_exit (pTHX)
1418{
1419 int exitstatus = perl_destruct (PL_curinterp);
1420 perl_free (PL_curinterp);
1421 exit (exitstatus);
1371} 1422}
1372 1423
1373/* 1424/*
1374 * this is a _very_ stripped down perl interpreter ;) 1425 * this is a _very_ stripped down perl interpreter ;)
1375 */ 1426 */
… …
1404 */ 1455 */
1405 1456
1406 /* 1457 /*
1407 * If perl-run returns we assume exit() was being called or the coro 1458 * 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) 1459 * 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 1460 * 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" 1461 * 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 */ 1462 */
1415 PL_top_env = main_top_env; 1463 perlish_exit (aTHX);
1416 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1417 } 1464 }
1418} 1465}
1419 1466
1420static coro_cctx * 1467static coro_cctx *
1421cctx_new () 1468cctx_new (void)
1422{ 1469{
1423 coro_cctx *cctx; 1470 coro_cctx *cctx;
1424 1471
1425 ++cctx_count; 1472 ++cctx_count;
1426 New (0, cctx, 1, coro_cctx); 1473 New (0, cctx, 1, coro_cctx);
… …
1432 return cctx; 1479 return cctx;
1433} 1480}
1434 1481
1435/* create a new cctx only suitable as source */ 1482/* create a new cctx only suitable as source */
1436static coro_cctx * 1483static coro_cctx *
1437cctx_new_empty () 1484cctx_new_empty (void)
1438{ 1485{
1439 coro_cctx *cctx = cctx_new (); 1486 coro_cctx *cctx = cctx_new ();
1440 1487
1441 cctx->sptr = 0; 1488 cctx->stack.sptr = 0;
1442 coro_create (&cctx->cctx, 0, 0, 0, 0); 1489 coro_create (&cctx->cctx, 0, 0, 0, 0);
1443 1490
1444 return cctx; 1491 return cctx;
1445} 1492}
1446 1493
1447/* create a new cctx suitable as destination/running a perl interpreter */ 1494/* create a new cctx suitable as destination/running a perl interpreter */
1448static coro_cctx * 1495static coro_cctx *
1449cctx_new_run () 1496cctx_new_run (void)
1450{ 1497{
1451 coro_cctx *cctx = cctx_new (); 1498 coro_cctx *cctx = cctx_new ();
1452 void *stack_start;
1453 size_t stack_size;
1454 1499
1455#if HAVE_MMAP 1500 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 } 1501 {
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."); 1502 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1478 _exit (EXIT_FAILURE); 1503 _exit (EXIT_FAILURE);
1479 }
1480
1481 stack_start = cctx->sptr;
1482 stack_size = cctx->ssize;
1483 } 1504 }
1484 1505
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); 1506 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1490 1507
1491 return cctx; 1508 return cctx;
1492} 1509}
1493 1510
1494static void 1511static void
1495cctx_destroy (coro_cctx *cctx) 1512cctx_destroy (coro_cctx *cctx)
1496{ 1513{
1497 if (!cctx) 1514 if (!cctx)
1498 return; 1515 return;
1499 1516
1500 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1517 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1501 1518
1502 --cctx_count; 1519 --cctx_count;
1503 coro_destroy (&cctx->cctx); 1520 coro_destroy (&cctx->cctx);
1504 1521
1505 /* coro_transfer creates new, empty cctx's */ 1522 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 1523
1520 Safefree (cctx); 1524 Safefree (cctx);
1521} 1525}
1522 1526
1523/* wether this cctx should be destructed */ 1527/* wether this cctx should be destructed */
1524#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1528#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1525 1529
1526static coro_cctx * 1530static coro_cctx *
1527cctx_get (pTHX) 1531cctx_get (pTHX)
1528{ 1532{
1529 while (expect_true (cctx_first)) 1533 while (ecb_expect_true (cctx_first))
1530 { 1534 {
1531 coro_cctx *cctx = cctx_first; 1535 coro_cctx *cctx = cctx_first;
1532 cctx_first = cctx->next; 1536 cctx_first = cctx->next;
1533 --cctx_idle; 1537 --cctx_idle;
1534 1538
1535 if (expect_true (!CCTX_EXPIRED (cctx))) 1539 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1536 return cctx; 1540 return cctx;
1537 1541
1538 cctx_destroy (cctx); 1542 cctx_destroy (cctx);
1539 } 1543 }
1540 1544
… …
1542} 1546}
1543 1547
1544static void 1548static void
1545cctx_put (coro_cctx *cctx) 1549cctx_put (coro_cctx *cctx)
1546{ 1550{
1547 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1551 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1548 1552
1549 /* free another cctx if overlimit */ 1553 /* free another cctx if overlimit */
1550 if (expect_false (cctx_idle >= cctx_max_idle)) 1554 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1551 { 1555 {
1552 coro_cctx *first = cctx_first; 1556 coro_cctx *first = cctx_first;
1553 cctx_first = first->next; 1557 cctx_first = first->next;
1554 --cctx_idle; 1558 --cctx_idle;
1555 1559
… …
1566static void 1570static void
1567transfer_check (pTHX_ struct coro *prev, struct coro *next) 1571transfer_check (pTHX_ struct coro *prev, struct coro *next)
1568{ 1572{
1569 /* TODO: throwing up here is considered harmful */ 1573 /* TODO: throwing up here is considered harmful */
1570 1574
1571 if (expect_true (prev != next)) 1575 if (ecb_expect_true (prev != next))
1572 { 1576 {
1573 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1577 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,"); 1578 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1575 1579
1576 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1580 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,"); 1581 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1578 1582
1579#if !PERL_VERSION_ATLEAST (5,10,0) 1583#if !PERL_VERSION_ATLEAST (5,10,0)
1580 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1584 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,"); 1585 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1582#endif 1586#endif
1583 } 1587 }
1584} 1588}
1585 1589
1586/* always use the TRANSFER macro */ 1590/* always use the TRANSFER macro */
1587static void NOINLINE /* noinline so we have a fixed stackframe */ 1591static void ecb_noinline /* noinline so we have a fixed stackframe */
1588transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1592transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1589{ 1593{
1590 dSTACKLEVEL; 1594 dSTACKLEVEL;
1591 1595
1592 /* sometimes transfer is only called to set idle_sp */ 1596 /* sometimes transfer is only called to set idle_sp */
1593 if (expect_false (!prev)) 1597 if (ecb_expect_false (!prev))
1594 { 1598 {
1595 cctx_current->idle_sp = STACKLEVEL; 1599 cctx_current->idle_sp = STACKLEVEL;
1596 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1600 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1597 } 1601 }
1598 else if (expect_true (prev != next)) 1602 else if (ecb_expect_true (prev != next))
1599 { 1603 {
1600 coro_cctx *cctx_prev; 1604 coro_cctx *cctx_prev;
1601 1605
1602 if (expect_false (prev->flags & CF_NEW)) 1606 if (ecb_expect_false (prev->flags & CF_NEW))
1603 { 1607 {
1604 /* create a new empty/source context */ 1608 /* create a new empty/source context */
1605 prev->flags &= ~CF_NEW; 1609 prev->flags &= ~CF_NEW;
1606 prev->flags |= CF_RUNNING; 1610 prev->flags |= CF_RUNNING;
1607 } 1611 }
… …
1610 next->flags |= CF_RUNNING; 1614 next->flags |= CF_RUNNING;
1611 1615
1612 /* first get rid of the old state */ 1616 /* first get rid of the old state */
1613 save_perl (aTHX_ prev); 1617 save_perl (aTHX_ prev);
1614 1618
1615 if (expect_false (next->flags & CF_NEW)) 1619 if (ecb_expect_false (next->flags & CF_NEW))
1616 { 1620 {
1617 /* need to start coroutine */ 1621 /* need to start coroutine */
1618 next->flags &= ~CF_NEW; 1622 next->flags &= ~CF_NEW;
1619 /* setup coroutine call */ 1623 /* setup coroutine call */
1620 init_perl (aTHX_ next); 1624 init_perl (aTHX_ next);
1621 } 1625 }
1622 else 1626 else
1623 load_perl (aTHX_ next); 1627 load_perl (aTHX_ next);
1624 1628
1625 /* possibly untie and reuse the cctx */ 1629 /* possibly untie and reuse the cctx */
1626 if (expect_true ( 1630 if (ecb_expect_true (
1627 cctx_current->idle_sp == STACKLEVEL 1631 cctx_current->idle_sp == STACKLEVEL
1628 && !(cctx_current->flags & CC_TRACE) 1632 && !(cctx_current->flags & CC_TRACE)
1629 && !force_cctx 1633 && !force_cctx
1630 )) 1634 ))
1631 { 1635 {
1632 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1636 /* 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)); 1637 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1634 1638
1635 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1639 /* 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 */ 1640 /* without this the next cctx_get might destroy the running cctx while still in use */
1637 if (expect_false (CCTX_EXPIRED (cctx_current))) 1641 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1638 if (expect_true (!next->cctx)) 1642 if (ecb_expect_true (!next->cctx))
1639 next->cctx = cctx_get (aTHX); 1643 next->cctx = cctx_get (aTHX);
1640 1644
1641 cctx_put (cctx_current); 1645 cctx_put (cctx_current);
1642 } 1646 }
1643 else 1647 else
1644 prev->cctx = cctx_current; 1648 prev->cctx = cctx_current;
1645 1649
1646 ++next->usecount; 1650 ++next->usecount;
1647 1651
1648 cctx_prev = cctx_current; 1652 cctx_prev = cctx_current;
1649 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1653 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1650 1654
1651 next->cctx = 0; 1655 next->cctx = 0;
1652 1656
1653 if (expect_false (cctx_prev != cctx_current)) 1657 if (ecb_expect_false (cctx_prev != cctx_current))
1654 { 1658 {
1655 cctx_prev->top_env = PL_top_env; 1659 cctx_prev->top_env = PL_top_env;
1656 PL_top_env = cctx_current->top_env; 1660 PL_top_env = cctx_current->top_env;
1657 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1661 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1658 } 1662 }
… …
1664#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1668#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) 1669#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1666 1670
1667/** high level stuff ********************************************************/ 1671/** high level stuff ********************************************************/
1668 1672
1673/* this function is actually Coro, not Coro::State, but we call it from here */
1674/* because it is convenient - but it hasn't been declared yet for that reason */
1669static int 1675static void
1676coro_call_on_destroy (pTHX_ struct coro *coro);
1677
1678static void
1670coro_state_destroy (pTHX_ struct coro *coro) 1679coro_state_destroy (pTHX_ struct coro *coro)
1671{ 1680{
1672 if (coro->flags & CF_DESTROYED) 1681 if (coro->flags & CF_ZOMBIE)
1673 return 0; 1682 return;
1674 1683
1675 if (coro->on_destroy && !PL_dirty)
1676 coro->on_destroy (aTHX_ coro); 1684 slf_destroy (aTHX_ coro);
1677 1685
1678 coro->flags |= CF_DESTROYED; 1686 coro->flags |= CF_ZOMBIE;
1679 1687
1680 if (coro->flags & CF_READY) 1688 if (coro->flags & CF_READY)
1681 { 1689 {
1682 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1690 /* reduce nready, as destroying a ready coro effectively unreadies it */
1683 /* alternative: look through all ready queues and remove the coro */ 1691 /* alternative: look through all ready queues and remove the coro */
1684 --coro_nready; 1692 --coro_nready;
1685 } 1693 }
1686 else 1694 else
1687 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1695 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1696
1697 if (coro->next) coro->next->prev = coro->prev;
1698 if (coro->prev) coro->prev->next = coro->next;
1699 if (coro == coro_first) coro_first = coro->next;
1688 1700
1689 if (coro->mainstack 1701 if (coro->mainstack
1690 && coro->mainstack != main_mainstack 1702 && coro->mainstack != main_mainstack
1691 && coro->slot 1703 && coro->slot
1692 && !PL_dirty) 1704 && !PL_dirty)
1693 destroy_perl (aTHX_ coro); 1705 destroy_perl (aTHX_ coro);
1694 1706
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); 1707 cctx_destroy (coro->cctx);
1700 SvREFCNT_dec (coro->startcv); 1708 SvREFCNT_dec (coro->startcv);
1701 SvREFCNT_dec (coro->args); 1709 SvREFCNT_dec (coro->args);
1702 SvREFCNT_dec (coro->swap_sv); 1710 SvREFCNT_dec (coro->swap_sv);
1703 SvREFCNT_dec (CORO_THROW); 1711 SvREFCNT_dec (CORO_THROW);
1704 1712
1705 return 1; 1713 coro_call_on_destroy (aTHX_ coro);
1714
1715 /* more destruction mayhem in coro_state_free */
1706} 1716}
1707 1717
1708static int 1718static int
1709coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1719coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1710{ 1720{
1711 struct coro *coro = (struct coro *)mg->mg_ptr; 1721 struct coro *coro = (struct coro *)mg->mg_ptr;
1712 mg->mg_ptr = 0; 1722 mg->mg_ptr = 0;
1713 1723
1714 coro->hv = 0;
1715
1716 if (--coro->refcnt < 0)
1717 {
1718 coro_state_destroy (aTHX_ coro); 1724 coro_state_destroy (aTHX_ coro);
1725 SvREFCNT_dec (coro->on_destroy);
1726 SvREFCNT_dec (coro->status);
1727
1719 Safefree (coro); 1728 Safefree (coro);
1720 }
1721 1729
1722 return 0; 1730 return 0;
1723} 1731}
1724 1732
1725static int 1733static int ecb_cold
1726coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1734coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1727{ 1735{
1728 struct coro *coro = (struct coro *)mg->mg_ptr; 1736 /* called when perl clones the current process the slow way (windows process emulation) */
1729 1737 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1730 ++coro->refcnt; 1738 mg->mg_ptr = 0;
1739 mg->mg_virtual = 0;
1731 1740
1732 return 0; 1741 return 0;
1733} 1742}
1734 1743
1735static MGVTBL coro_state_vtbl = { 1744static MGVTBL coro_state_vtbl = {
… …
1760 TRANSFER (ta, 1); 1769 TRANSFER (ta, 1);
1761} 1770}
1762 1771
1763/** Coro ********************************************************************/ 1772/** Coro ********************************************************************/
1764 1773
1765INLINE void 1774ecb_inline void
1766coro_enq (pTHX_ struct coro *coro) 1775coro_enq (pTHX_ struct coro *coro)
1767{ 1776{
1768 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1777 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1769 1778
1770 SvREFCNT_inc_NN (coro->hv); 1779 SvREFCNT_inc_NN (coro->hv);
… …
1772 coro->next_ready = 0; 1781 coro->next_ready = 0;
1773 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1782 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1774 ready [1] = coro; 1783 ready [1] = coro;
1775} 1784}
1776 1785
1777INLINE struct coro * 1786ecb_inline struct coro *
1778coro_deq (pTHX) 1787coro_deq (pTHX)
1779{ 1788{
1780 int prio; 1789 int prio;
1781 1790
1782 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1791 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1835{ 1844{
1836 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1845 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1837} 1846}
1838 1847
1839/* expects to own a reference to next->hv */ 1848/* expects to own a reference to next->hv */
1840INLINE void 1849ecb_inline void
1841prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1850prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1842{ 1851{
1843 SV *prev_sv = SvRV (coro_current); 1852 SV *prev_sv = SvRV (coro_current);
1844 1853
1845 ta->prev = SvSTATE_hv (prev_sv); 1854 ta->prev = SvSTATE_hv (prev_sv);
… …
1858{ 1867{
1859 for (;;) 1868 for (;;)
1860 { 1869 {
1861 struct coro *next = coro_deq (aTHX); 1870 struct coro *next = coro_deq (aTHX);
1862 1871
1863 if (expect_true (next)) 1872 if (ecb_expect_true (next))
1864 { 1873 {
1865 /* cannot transfer to destroyed coros, skip and look for next */ 1874 /* cannot transfer to destroyed coros, skip and look for next */
1866 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1875 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 */ 1876 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1868 else 1877 else
1869 { 1878 {
1870 next->flags &= ~CF_READY; 1879 next->flags &= ~CF_READY;
1871 --coro_nready; 1880 --coro_nready;
… …
1904 } 1913 }
1905 } 1914 }
1906 } 1915 }
1907} 1916}
1908 1917
1909INLINE void 1918ecb_inline void
1910prepare_cede (pTHX_ struct coro_transfer_args *ta) 1919prepare_cede (pTHX_ struct coro_transfer_args *ta)
1911{ 1920{
1912 api_ready (aTHX_ coro_current); 1921 api_ready (aTHX_ coro_current);
1913 prepare_schedule (aTHX_ ta); 1922 prepare_schedule (aTHX_ ta);
1914} 1923}
1915 1924
1916INLINE void 1925ecb_inline void
1917prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1926prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1918{ 1927{
1919 SV *prev = SvRV (coro_current); 1928 SV *prev = SvRV (coro_current);
1920 1929
1921 if (coro_nready) 1930 if (coro_nready)
… …
1951{ 1960{
1952 struct coro_transfer_args ta; 1961 struct coro_transfer_args ta;
1953 1962
1954 prepare_cede (aTHX_ &ta); 1963 prepare_cede (aTHX_ &ta);
1955 1964
1956 if (expect_true (ta.prev != ta.next)) 1965 if (ecb_expect_true (ta.prev != ta.next))
1957 { 1966 {
1958 TRANSFER (ta, 1); 1967 TRANSFER (ta, 1);
1959 return 1; 1968 return 1;
1960 } 1969 }
1961 else 1970 else
… …
2004 coro->slot->runops = RUNOPS_DEFAULT; 2013 coro->slot->runops = RUNOPS_DEFAULT;
2005 } 2014 }
2006} 2015}
2007 2016
2008static void 2017static void
2018coro_push_av (pTHX_ AV *av, I32 gimme_v)
2019{
2020 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2021 {
2022 dSP;
2023
2024 if (gimme_v == G_SCALAR)
2025 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2026 else
2027 {
2028 int i;
2029 EXTEND (SP, AvFILLp (av) + 1);
2030
2031 for (i = 0; i <= AvFILLp (av); ++i)
2032 PUSHs (AvARRAY (av)[i]);
2033 }
2034
2035 PUTBACK;
2036 }
2037}
2038
2039static void
2040coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2041{
2042 if (!coro->on_destroy)
2043 coro->on_destroy = newAV ();
2044
2045 av_push (coro->on_destroy, cb);
2046}
2047
2048static void
2049slf_destroy_join (pTHX_ struct CoroSLF *frame)
2050{
2051 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2052}
2053
2054static int
2055slf_check_join (pTHX_ struct CoroSLF *frame)
2056{
2057 struct coro *coro = (struct coro *)frame->data;
2058
2059 if (!coro->status)
2060 return 1;
2061
2062 frame->destroy = 0;
2063
2064 coro_push_av (aTHX_ coro->status, GIMME_V);
2065
2066 SvREFCNT_dec ((SV *)coro->hv);
2067
2068 return 0;
2069}
2070
2071static void
2072slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2073{
2074 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2075
2076 if (items > 1)
2077 croak ("join called with too many arguments");
2078
2079 if (coro->status)
2080 frame->prepare = prepare_nop;
2081 else
2082 {
2083 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2084 frame->prepare = prepare_schedule;
2085 }
2086
2087 frame->check = slf_check_join;
2088 frame->destroy = slf_destroy_join;
2089 frame->data = (void *)coro;
2090 SvREFCNT_inc (coro->hv);
2091}
2092
2093static void
2009coro_call_on_destroy (pTHX_ struct coro *coro) 2094coro_call_on_destroy (pTHX_ struct coro *coro)
2010{ 2095{
2011 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2096 AV *od = coro->on_destroy;
2012 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2013 2097
2014 if (on_destroyp) 2098 if (!od)
2015 { 2099 return;
2016 AV *on_destroy = (AV *)SvRV (*on_destroyp);
2017 2100
2018 while (AvFILLp (on_destroy) >= 0) 2101 while (AvFILLp (od) >= 0)
2102 {
2103 SV *cb = sv_2mortal (av_pop (od));
2104
2105 /* coro hv's (and only hv's at the moment) are supported as well */
2106 if (SvSTATEhv_p (aTHX_ cb))
2107 api_ready (aTHX_ cb);
2108 else
2019 { 2109 {
2020 dSP; /* don't disturb outer sp */ 2110 dSP; /* don't disturb outer sp */
2021 SV *cb = av_pop (on_destroy);
2022
2023 PUSHMARK (SP); 2111 PUSHMARK (SP);
2024 2112
2025 if (statusp) 2113 if (coro->status)
2026 { 2114 {
2027 int i; 2115 PUTBACK;
2028 AV *status = (AV *)SvRV (*statusp); 2116 coro_push_av (aTHX_ coro->status, G_ARRAY);
2029 EXTEND (SP, AvFILLp (status) + 1); 2117 SPAGAIN;
2030
2031 for (i = 0; i <= AvFILLp (status); ++i)
2032 PUSHs (AvARRAY (status)[i]);
2033 } 2118 }
2034 2119
2035 PUTBACK; 2120 PUTBACK;
2036 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2121 call_sv (cb, G_VOID | G_DISCARD);
2037 } 2122 }
2038 } 2123 }
2039} 2124}
2040 2125
2041static void 2126static void
2042slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2127coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2043{ 2128{
2044 int i; 2129 AV *av;
2045 HV *hv = (HV *)SvRV (coro_current); 2130
2046 AV *av = newAV (); 2131 if (coro->status)
2132 {
2133 av = coro->status;
2134 av_clear (av);
2135 }
2136 else
2137 av = coro->status = newAV ();
2047 2138
2048 /* items are actually not so common, so optimise for this case */ 2139 /* items are actually not so common, so optimise for this case */
2049 if (items) 2140 if (items)
2050 { 2141 {
2142 int i;
2143
2051 av_extend (av, items - 1); 2144 av_extend (av, items - 1);
2052 2145
2053 for (i = 0; i < items; ++i) 2146 for (i = 0; i < items; ++i)
2054 av_push (av, SvREFCNT_inc_NN (arg [i])); 2147 av_push (av, SvREFCNT_inc_NN (arg [i]));
2055 } 2148 }
2149}
2056 2150
2057 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2151static void
2058 2152slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2153{
2059 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2154 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2060 api_ready (aTHX_ sv_manager); 2155 api_ready (aTHX_ sv_manager);
2061 2156
2062 frame->prepare = prepare_schedule; 2157 frame->prepare = prepare_schedule;
2063 frame->check = slf_check_repeat; 2158 frame->check = slf_check_repeat;
2064 2159
2065 /* as a minor optimisation, we could unwind all stacks here */ 2160 /* as a minor optimisation, we could unwind all stacks here */
2066 /* but that puts extra pressure on pp_slf, and is not worth much */ 2161 /* but that puts extra pressure on pp_slf, and is not worth much */
2067 /*coro_unwind_stacks (aTHX);*/ 2162 /*coro_unwind_stacks (aTHX);*/
2163}
2164
2165static void
2166slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2167{
2168 HV *coro_hv = (HV *)SvRV (coro_current);
2169
2170 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2171 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2172}
2173
2174static void
2175slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2176{
2177 HV *coro_hv;
2178 struct coro *coro;
2179
2180 if (items <= 0)
2181 croak ("Coro::cancel called without coro object,");
2182
2183 coro = SvSTATE (arg [0]);
2184 coro_hv = coro->hv;
2185
2186 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2187
2188 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2189 {
2190 /* coro currently busy cancelling something, so just notify it */
2191 coro->slf_frame.data = (void *)coro;
2192
2193 frame->prepare = prepare_nop;
2194 frame->check = slf_check_nop;
2195 }
2196 else if (coro_hv == (HV *)SvRV (coro_current))
2197 {
2198 /* cancelling the current coro is allowed, and equals terminate */
2199 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2200 }
2201 else
2202 {
2203 struct coro *self = SvSTATE_current;
2204
2205 /* otherwise we cancel directly, purely for speed reasons
2206 * unfortunately, this requires some magic trickery, as
2207 * somebody else could cancel us, so we have to fight the cancellation.
2208 * this is ugly, and hopefully fully worth the extra speed.
2209 * besides, I can't get the slow-but-safe version working...
2210 */
2211 slf_frame.data = 0;
2212 self->flags |= CF_NOCANCEL;
2213 coro_state_destroy (aTHX_ coro);
2214 self->flags &= ~CF_NOCANCEL;
2215
2216 if (slf_frame.data)
2217 {
2218 /* while we were busy we have been cancelled, so terminate */
2219 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2220 }
2221 else
2222 {
2223 frame->prepare = prepare_nop;
2224 frame->check = slf_check_nop;
2225 }
2226 }
2227}
2228
2229static int
2230slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2231{
2232 frame->prepare = 0;
2233 coro_unwind_stacks (aTHX);
2234
2235 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2236
2237 return 1;
2238}
2239
2240static int
2241safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2242{
2243 if (coro->cctx)
2244 croak ("coro inside C callback, unable to cancel at this time, caught");
2245
2246 if (coro->flags & CF_NEW)
2247 {
2248 coro_set_status (aTHX_ coro, arg, items);
2249 coro_state_destroy (aTHX_ coro);
2250 }
2251 else
2252 {
2253 if (!coro->slf_frame.prepare)
2254 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2255
2256 slf_destroy (aTHX_ coro);
2257
2258 coro_set_status (aTHX_ coro, arg, items);
2259 coro->slf_frame.prepare = prepare_nop;
2260 coro->slf_frame.check = slf_check_safe_cancel;
2261
2262 api_ready (aTHX_ (SV *)coro->hv);
2263 }
2264
2265 return 1;
2068} 2266}
2069 2267
2070/*****************************************************************************/ 2268/*****************************************************************************/
2071/* async pool handler */ 2269/* async pool handler */
2072 2270
… …
2103slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2301slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2104{ 2302{
2105 HV *hv = (HV *)SvRV (coro_current); 2303 HV *hv = (HV *)SvRV (coro_current);
2106 struct coro *coro = SvSTATE_hv ((SV *)hv); 2304 struct coro *coro = SvSTATE_hv ((SV *)hv);
2107 2305
2108 if (expect_true (coro->saved_deffh)) 2306 if (ecb_expect_true (coro->saved_deffh))
2109 { 2307 {
2110 /* subsequent iteration */ 2308 /* subsequent iteration */
2111 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2309 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2112 coro->saved_deffh = 0; 2310 coro->saved_deffh = 0;
2113 2311
2114 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2312 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2115 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2313 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2116 { 2314 {
2117 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2315 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2118 coro->invoke_av = newAV (); 2316 return;
2119
2120 frame->prepare = prepare_nop;
2121 } 2317 }
2122 else 2318 else
2123 { 2319 {
2124 av_clear (GvAV (PL_defgv)); 2320 av_clear (GvAV (PL_defgv));
2125 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2321 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2175 2371
2176static int 2372static int
2177slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2373slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2178{ 2374{
2179 SV *data = (SV *)frame->data; 2375 SV *data = (SV *)frame->data;
2180 2376
2181 if (CORO_THROW) 2377 if (CORO_THROW)
2182 return 0; 2378 return 0;
2183 2379
2184 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2380 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2185 return 1; 2381 return 1;
… …
2221 cb = sv_2mortal (coro->rouse_cb); 2417 cb = sv_2mortal (coro->rouse_cb);
2222 coro->rouse_cb = 0; 2418 coro->rouse_cb = 0;
2223 } 2419 }
2224 2420
2225 if (!SvROK (cb) 2421 if (!SvROK (cb)
2226 || SvTYPE (SvRV (cb)) != SVt_PVCV 2422 || SvTYPE (SvRV (cb)) != SVt_PVCV
2227 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2423 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2228 croak ("Coro::rouse_wait called with illegal callback argument,"); 2424 croak ("Coro::rouse_wait called with illegal callback argument,");
2229 2425
2230 { 2426 {
2231 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2427 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2348static void 2544static void
2349slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2545slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2350{ 2546{
2351 frame->prepare = prepare_cede_notself; 2547 frame->prepare = prepare_cede_notself;
2352 frame->check = slf_check_nop; 2548 frame->check = slf_check_nop;
2549}
2550
2551/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2552static void
2553slf_destroy (pTHX_ struct coro *coro)
2554{
2555 /* this callback is reserved for slf functions needing to do cleanup */
2556 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2557 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2558
2559 /*
2560 * The on_destroy above most likely is from an SLF call.
2561 * Since by definition the SLF call will not finish when we destroy
2562 * the coro, we will have to force-finish it here, otherwise
2563 * cleanup functions cannot call SLF functions.
2564 */
2565 coro->slf_frame.prepare = 0;
2353} 2566}
2354 2567
2355/* 2568/*
2356 * these not obviously related functions are all rolled into one 2569 * these not obviously related functions are all rolled into one
2357 * function to increase chances that they all will call transfer with the same 2570 * 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 */ 2577 I32 checkmark; /* mark SP to see how many elements check has pushed */
2365 2578
2366 /* set up the slf frame, unless it has already been set-up */ 2579 /* set up the slf frame, unless it has already been set-up */
2367 /* the latter happens when a new coro has been started */ 2580 /* the latter happens when a new coro has been started */
2368 /* or when a new cctx was attached to an existing coroutine */ 2581 /* or when a new cctx was attached to an existing coroutine */
2369 if (expect_true (!slf_frame.prepare)) 2582 if (ecb_expect_true (!slf_frame.prepare))
2370 { 2583 {
2371 /* first iteration */ 2584 /* first iteration */
2372 dSP; 2585 dSP;
2373 SV **arg = PL_stack_base + TOPMARK + 1; 2586 SV **arg = PL_stack_base + TOPMARK + 1;
2374 int items = SP - arg; /* args without function object */ 2587 int items = SP - arg; /* args without function object */
… …
2415 while (slf_frame.check (aTHX_ &slf_frame)); 2628 while (slf_frame.check (aTHX_ &slf_frame));
2416 2629
2417 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2630 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2418 2631
2419 /* exception handling */ 2632 /* exception handling */
2420 if (expect_false (CORO_THROW)) 2633 if (ecb_expect_false (CORO_THROW))
2421 { 2634 {
2422 SV *exception = sv_2mortal (CORO_THROW); 2635 SV *exception = sv_2mortal (CORO_THROW);
2423 2636
2424 CORO_THROW = 0; 2637 CORO_THROW = 0;
2425 sv_setsv (ERRSV, exception); 2638 sv_setsv (ERRSV, exception);
2426 croak (0); 2639 croak (0);
2427 } 2640 }
2428 2641
2429 /* return value handling - mostly like entersub */ 2642 /* return value handling - mostly like entersub */
2430 /* make sure we put something on the stack in scalar context */ 2643 /* make sure we put something on the stack in scalar context */
2431 if (GIMME_V == G_SCALAR) 2644 if (GIMME_V == G_SCALAR
2645 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2432 { 2646 {
2433 dSP; 2647 dSP;
2434 SV **bot = PL_stack_base + checkmark; 2648 SV **bot = PL_stack_base + checkmark;
2435 2649
2436 if (sp == bot) /* too few, push undef */ 2650 if (sp == bot) /* too few, push undef */
2437 bot [1] = &PL_sv_undef; 2651 bot [1] = &PL_sv_undef;
2438 else if (sp != bot + 1) /* too many, take last one */ 2652 else /* too many, take last one */
2439 bot [1] = *sp; 2653 bot [1] = *sp;
2440 2654
2441 SP = bot + 1; 2655 SP = bot + 1;
2442 2656
2443 PUTBACK; 2657 PUTBACK;
… …
2550{ 2764{
2551 PerlIOBuf base; 2765 PerlIOBuf base;
2552 NV next, every; 2766 NV next, every;
2553} PerlIOCede; 2767} PerlIOCede;
2554 2768
2555static IV 2769static IV ecb_cold
2556PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2770PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2557{ 2771{
2558 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2772 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2559 2773
2560 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2774 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2561 self->next = nvtime () + self->every; 2775 self->next = nvtime () + self->every;
2562 2776
2563 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2777 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2564} 2778}
2565 2779
2566static SV * 2780static SV * ecb_cold
2567PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2781PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2568{ 2782{
2569 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2783 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2570 2784
2571 return newSVnv (self->every); 2785 return newSVnv (self->every);
… …
2683 SvREFCNT_dec (cb); 2897 SvREFCNT_dec (cb);
2684 } 2898 }
2685} 2899}
2686 2900
2687static void 2901static void
2688coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2902coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2689{ 2903{
2690 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2904 /* call $sem->adjust (0) to possibly wake up some other waiters */
2691 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2905 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2692} 2906}
2693 2907
2694static int 2908static int
2695slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2909slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2696{ 2910{
2697 AV *av = (AV *)frame->data; 2911 AV *av = (AV *)frame->data;
2698 SV *count_sv = AvARRAY (av)[0]; 2912 SV *count_sv = AvARRAY (av)[0];
2913 SV *coro_hv = SvRV (coro_current);
2699 2914
2700 /* if we are about to throw, don't actually acquire the lock, just throw */ 2915 /* if we are about to throw, don't actually acquire the lock, just throw */
2701 if (CORO_THROW) 2916 if (CORO_THROW)
2702 return 0; 2917 return 0;
2703 else if (SvIVX (count_sv) > 0) 2918 else if (SvIVX (count_sv) > 0)
2704 { 2919 {
2705 SvSTATE_current->on_destroy = 0; 2920 frame->destroy = 0;
2706 2921
2707 if (acquire) 2922 if (acquire)
2708 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2923 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2709 else 2924 else
2710 coro_semaphore_adjust (aTHX_ av, 0); 2925 coro_semaphore_adjust (aTHX_ av, 0);
… …
2715 { 2930 {
2716 int i; 2931 int i;
2717 /* if we were woken up but can't down, we look through the whole */ 2932 /* 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 */ 2933 /* waiters list and only add us if we aren't in there already */
2719 /* this avoids some degenerate memory usage cases */ 2934 /* this avoids some degenerate memory usage cases */
2720 2935 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)) 2936 if (AvARRAY (av)[i] == coro_hv)
2723 return 1; 2937 return 1;
2724 2938
2725 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2939 av_push (av, SvREFCNT_inc (coro_hv));
2726 return 1; 2940 return 1;
2727 } 2941 }
2728} 2942}
2729 2943
2730static int 2944static int
… …
2753 { 2967 {
2754 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2968 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2755 2969
2756 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2970 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2757 frame->prepare = prepare_schedule; 2971 frame->prepare = prepare_schedule;
2758
2759 /* to avoid race conditions when a woken-up coro gets terminated */ 2972 /* to avoid race conditions when a woken-up coro gets terminated */
2760 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2973 /* we arrange for a temporary on_destroy that calls adjust (0) */
2761 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2974 frame->destroy = coro_semaphore_destroy;
2762 } 2975 }
2763} 2976}
2764 2977
2765static void 2978static void
2766slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2979slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2984 dSP; 3197 dSP;
2985 3198
2986 static SV *prio_cv; 3199 static SV *prio_cv;
2987 static SV *prio_sv; 3200 static SV *prio_sv;
2988 3201
2989 if (expect_false (!prio_cv)) 3202 if (ecb_expect_false (!prio_cv))
2990 { 3203 {
2991 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3204 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2992 prio_sv = newSViv (0); 3205 prio_sv = newSViv (0);
2993 } 3206 }
2994 3207
… …
3100 } 3313 }
3101 3314
3102 return coro_sv; 3315 return coro_sv;
3103} 3316}
3104 3317
3318#ifndef __cplusplus
3319ecb_cold XS(boot_Coro__State);
3320#endif
3321
3322#if CORO_JIT
3323
3324static void ecb_noinline ecb_cold
3325pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3326{
3327 dSP;
3328 AV *av = newAV ();
3329
3330 av_store (av, 3, newSVuv (d));
3331 av_store (av, 2, newSVuv (c));
3332 av_store (av, 1, newSVuv (b));
3333 av_store (av, 0, newSVuv (a));
3334
3335 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3336
3337 PUTBACK;
3338}
3339
3340static void ecb_noinline ecb_cold
3341jit_init (pTHX)
3342{
3343 dSP;
3344 SV *load, *save;
3345 char *map_base;
3346 char *load_ptr, *save_ptr;
3347 STRLEN load_len, save_len, map_len;
3348 int count;
3349
3350 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3351
3352 PUSHMARK (SP);
3353 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3354 #include "state.h"
3355 count = call_pv ("Coro::State::_jit", G_ARRAY);
3356 SPAGAIN;
3357
3358 save = POPs; save_ptr = SvPVbyte (save, save_len);
3359 load = POPs; load_ptr = SvPVbyte (load, load_len);
3360
3361 map_len = load_len + save_len + 16;
3362
3363 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3364
3365 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3366
3367 load_perl_slots = (load_save_perl_slots_type)map_base;
3368 memcpy (map_base, load_ptr, load_len);
3369
3370 map_base += (load_len + 15) & ~15;
3371
3372 save_perl_slots = (load_save_perl_slots_type)map_base;
3373 memcpy (map_base, save_ptr, save_len);
3374
3375 /* we are good citizens and try to make the page read-only, so the evil evil */
3376 /* hackers might have it a bit more difficult */
3377 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3378
3379 PUTBACK;
3380 eval_pv ("undef &Coro::State::_jit", 1);
3381}
3382
3383#endif
3384
3105MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3385MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3106 3386
3107PROTOTYPES: DISABLE 3387PROTOTYPES: DISABLE
3108 3388
3109BOOT: 3389BOOT:
… …
3111#ifdef USE_ITHREADS 3391#ifdef USE_ITHREADS
3112# if CORO_PTHREAD 3392# if CORO_PTHREAD
3113 coro_thx = PERL_GET_CONTEXT; 3393 coro_thx = PERL_GET_CONTEXT;
3114# endif 3394# endif
3115#endif 3395#endif
3116 BOOT_PAGESIZE; 3396 /* perl defines these to check for existance first, but why it doesn't */
3397 /* just create them one at init time is not clear to me, except for */
3398 /* programs trying to delete them, but... */
3399 /* anyway, we declare this as invalid and make sure they are initialised here */
3400 DEFSV;
3401 ERRSV;
3117 3402
3118 cctx_current = cctx_new_empty (); 3403 cctx_current = cctx_new_empty ();
3119 3404
3120 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3405 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3121 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3406 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3161 coroapi.prepare_nop = prepare_nop; 3446 coroapi.prepare_nop = prepare_nop;
3162 coroapi.prepare_schedule = prepare_schedule; 3447 coroapi.prepare_schedule = prepare_schedule;
3163 coroapi.prepare_cede = prepare_cede; 3448 coroapi.prepare_cede = prepare_cede;
3164 coroapi.prepare_cede_notself = prepare_cede_notself; 3449 coroapi.prepare_cede_notself = prepare_cede_notself;
3165 3450
3166 time_init (); 3451 time_init (aTHX);
3167 3452
3168 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3453 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3454#if CORO_JIT
3455 PUTBACK;
3456 jit_init (aTHX);
3457 SPAGAIN;
3458#endif
3169} 3459}
3170 3460
3171SV * 3461SV *
3172new (SV *klass, ...) 3462new (SV *klass, ...)
3173 ALIAS: 3463 ALIAS:
… …
3180void 3470void
3181transfer (...) 3471transfer (...)
3182 PROTOTYPE: $$ 3472 PROTOTYPE: $$
3183 CODE: 3473 CODE:
3184 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3474 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 3475
3193void 3476void
3194_exit (int code) 3477_exit (int code)
3195 PROTOTYPE: $ 3478 PROTOTYPE: $
3196 CODE: 3479 CODE:
… …
3257void 3540void
3258list () 3541list ()
3259 PROTOTYPE: 3542 PROTOTYPE:
3260 PPCODE: 3543 PPCODE:
3261{ 3544{
3262 struct coro *coro; 3545 struct coro *coro;
3263 for (coro = coro_first; coro; coro = coro->next) 3546 for (coro = coro_first; coro; coro = coro->next)
3264 if (coro->hv) 3547 if (coro->hv)
3265 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3548 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3266} 3549}
3267 3550
… …
3272 CODE: 3555 CODE:
3273{ 3556{
3274 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3557 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3275 { 3558 {
3276 struct coro *current = SvSTATE_current; 3559 struct coro *current = SvSTATE_current;
3560 struct CoroSLF slf_save;
3277 3561
3278 if (current != coro) 3562 if (current != coro)
3279 { 3563 {
3280 PUTBACK; 3564 PUTBACK;
3281 save_perl (aTHX_ current); 3565 save_perl (aTHX_ current);
3282 load_perl (aTHX_ coro); 3566 load_perl (aTHX_ coro);
3567 /* the coro is most likely in an active SLF call.
3568 * while not strictly required (the code we execute is
3569 * not allowed to call any SLF functions), it's cleaner
3570 * to reinitialise the slf_frame and restore it later.
3571 * This might one day allow us to actually do SLF calls
3572 * from code executed here.
3573 */
3574 slf_save = slf_frame;
3575 slf_frame.prepare = 0;
3283 SPAGAIN; 3576 SPAGAIN;
3284 } 3577 }
3285 3578
3286 PUSHSTACK; 3579 PUSHSTACK;
3287 3580
… …
3297 SPAGAIN; 3590 SPAGAIN;
3298 3591
3299 if (current != coro) 3592 if (current != coro)
3300 { 3593 {
3301 PUTBACK; 3594 PUTBACK;
3595 slf_frame = slf_save;
3302 save_perl (aTHX_ coro); 3596 save_perl (aTHX_ coro);
3303 load_perl (aTHX_ current); 3597 load_perl (aTHX_ current);
3304 SPAGAIN; 3598 SPAGAIN;
3305 } 3599 }
3306 } 3600 }
… …
3311 PROTOTYPE: $ 3605 PROTOTYPE: $
3312 ALIAS: 3606 ALIAS:
3313 is_ready = CF_READY 3607 is_ready = CF_READY
3314 is_running = CF_RUNNING 3608 is_running = CF_RUNNING
3315 is_new = CF_NEW 3609 is_new = CF_NEW
3316 is_destroyed = CF_DESTROYED 3610 is_destroyed = CF_ZOMBIE
3611 is_zombie = CF_ZOMBIE
3317 is_suspended = CF_SUSPENDED 3612 is_suspended = CF_SUSPENDED
3318 CODE: 3613 CODE:
3319 RETVAL = boolSV (coro->flags & ix); 3614 RETVAL = boolSV (coro->flags & ix);
3320 OUTPUT: 3615 OUTPUT:
3321 RETVAL 3616 RETVAL
3322 3617
3323void 3618void
3324throw (Coro::State self, SV *exception = &PL_sv_undef) 3619throw (SV *self, SV *exception = &PL_sv_undef)
3325 PROTOTYPE: $;$ 3620 PROTOTYPE: $;$
3326 CODE: 3621 CODE:
3327{ 3622{
3623 struct coro *coro = SvSTATE (self);
3328 struct coro *current = SvSTATE_current; 3624 struct coro *current = SvSTATE_current;
3329 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3625 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3330 SvREFCNT_dec (*exceptionp); 3626 SvREFCNT_dec (*exceptionp);
3331 SvGETMAGIC (exception); 3627 SvGETMAGIC (exception);
3332 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3628 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3629
3630 api_ready (aTHX_ self);
3333} 3631}
3334 3632
3335void 3633void
3336api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3634api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3337 PROTOTYPE: $;$ 3635 PROTOTYPE: $;$
… …
3392 3690
3393void 3691void
3394cancel (Coro::State self) 3692cancel (Coro::State self)
3395 CODE: 3693 CODE:
3396 coro_state_destroy (aTHX_ self); 3694 coro_state_destroy (aTHX_ self);
3397 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3398
3399 3695
3400SV * 3696SV *
3401enable_times (int enabled = enable_times) 3697enable_times (int enabled = enable_times)
3402 CODE: 3698 CODE:
3403{ 3699{
… …
3416 3712
3417void 3713void
3418times (Coro::State self) 3714times (Coro::State self)
3419 PPCODE: 3715 PPCODE:
3420{ 3716{
3421 struct coro *current = SvSTATE (coro_current); 3717 struct coro *current = SvSTATE (coro_current);
3422 3718
3423 if (expect_false (current == self)) 3719 if (ecb_expect_false (current == self))
3424 { 3720 {
3425 coro_times_update (); 3721 coro_times_update ();
3426 coro_times_add (SvSTATE (coro_current)); 3722 coro_times_add (SvSTATE (coro_current));
3427 } 3723 }
3428 3724
3429 EXTEND (SP, 2); 3725 EXTEND (SP, 2);
3430 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3726 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))); 3727 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3432 3728
3433 if (expect_false (current == self)) 3729 if (ecb_expect_false (current == self))
3434 coro_times_sub (SvSTATE (coro_current)); 3730 coro_times_sub (SvSTATE (coro_current));
3435} 3731}
3436 3732
3437void 3733void
3438swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3734swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3459BOOT: 3755BOOT:
3460{ 3756{
3461 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3757 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3462 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3758 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3463 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3759 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); 3760 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); 3761 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3467 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3762 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3468 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3763 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3469 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3764 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3470 3765
3471 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3766 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); 3767 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); 3768 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 */ 3769 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3475 3770
3476 coro_stash = gv_stashpv ("Coro", TRUE); 3771 coro_stash = gv_stashpv ("Coro", TRUE);
3477 3772
3478 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3773 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3479 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3774 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3480 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3775 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3508 api_ready (aTHX_ RETVAL); 3803 api_ready (aTHX_ RETVAL);
3509 OUTPUT: 3804 OUTPUT:
3510 RETVAL 3805 RETVAL
3511 3806
3512void 3807void
3808_destroy (Coro::State coro)
3809 CODE:
3810 /* used by the manager thread */
3811 coro_state_destroy (aTHX_ coro);
3812
3813void
3814on_destroy (Coro::State coro, SV *cb)
3815 CODE:
3816 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3817
3818void
3819join (...)
3820 CODE:
3821 CORO_EXECUTE_SLF_XS (slf_init_join);
3822
3823void
3513terminate (...) 3824terminate (...)
3514 CODE: 3825 CODE:
3515 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3826 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3827
3828void
3829cancel (...)
3830 CODE:
3831 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3832
3833int
3834safe_cancel (Coro::State self, ...)
3835 C_ARGS: aTHX_ self, &ST (1), items - 1
3516 3836
3517void 3837void
3518schedule (...) 3838schedule (...)
3519 CODE: 3839 CODE:
3520 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3840 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3677 on_leave = 1 3997 on_leave = 1
3678 PROTOTYPE: & 3998 PROTOTYPE: &
3679 CODE: 3999 CODE:
3680{ 4000{
3681 struct coro *coro = SvSTATE_current; 4001 struct coro *coro = SvSTATE_current;
3682 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4002 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3683 4003
3684 block = s_get_cv_croak (block); 4004 block = s_get_cv_croak (block);
3685 4005
3686 if (!*avp) 4006 if (!*avp)
3687 *avp = newAV (); 4007 *avp = newAV ();
… …
3707 4027
3708SV * 4028SV *
3709new (SV *klass, SV *count = 0) 4029new (SV *klass, SV *count = 0)
3710 CODE: 4030 CODE:
3711{ 4031{
3712 int semcnt = 1; 4032 int semcnt = 1;
3713 4033
3714 if (count) 4034 if (count)
3715 { 4035 {
3716 SvGETMAGIC (count); 4036 SvGETMAGIC (count);
3717 4037
… …
3777 XSRETURN_NO; 4097 XSRETURN_NO;
3778} 4098}
3779 4099
3780void 4100void
3781waiters (SV *self) 4101waiters (SV *self)
3782 PPCODE: 4102 PPCODE:
3783{ 4103{
3784 AV *av = (AV *)SvRV (self); 4104 AV *av = (AV *)SvRV (self);
3785 int wcount = AvFILLp (av) + 1 - 1; 4105 int wcount = AvFILLp (av) + 1 - 1;
3786 4106
3787 if (GIMME_V == G_SCALAR) 4107 if (GIMME_V == G_SCALAR)
… …
3796} 4116}
3797 4117
3798MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4118MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3799 4119
3800void 4120void
3801_may_delete (SV *sem, int count, int extra_refs) 4121_may_delete (SV *sem, int count, unsigned int extra_refs)
3802 PPCODE: 4122 PPCODE:
3803{ 4123{
3804 AV *av = (AV *)SvRV (sem); 4124 AV *av = (AV *)SvRV (sem);
3805 4125
3806 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4126 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3807 && AvFILLp (av) == 0 /* no waiters, just count */ 4127 && AvFILLp (av) == 0 /* no waiters, just count */
3808 && SvIV (AvARRAY (av)[0]) == count) 4128 && SvIV (AvARRAY (av)[0]) == count)
3809 XSRETURN_YES; 4129 XSRETURN_YES;
… …
3830 4150
3831void 4151void
3832broadcast (SV *self) 4152broadcast (SV *self)
3833 CODE: 4153 CODE:
3834{ 4154{
3835 AV *av = (AV *)SvRV (self); 4155 AV *av = (AV *)SvRV (self);
3836 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4156 coro_signal_wake (aTHX_ av, AvFILLp (av));
3837} 4157}
3838 4158
3839void 4159void
3840send (SV *self) 4160send (SV *self)
… …
3848 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4168 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3849} 4169}
3850 4170
3851IV 4171IV
3852awaited (SV *self) 4172awaited (SV *self)
3853 CODE: 4173 CODE:
3854 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4174 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3855 OUTPUT: 4175 OUTPUT:
3856 RETVAL 4176 RETVAL
3857 4177
3858 4178
… …
3863 4183
3864void 4184void
3865_schedule (...) 4185_schedule (...)
3866 CODE: 4186 CODE:
3867{ 4187{
3868 static int incede; 4188 static int incede;
3869 4189
3870 api_cede_notself (aTHX); 4190 api_cede_notself (aTHX);
3871 4191
3872 ++incede; 4192 ++incede;
3873 while (coro_nready >= incede && api_cede (aTHX)) 4193 while (coro_nready >= incede && api_cede (aTHX))

Diff Legend

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