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.395 by root, Fri May 6 07:22:14 2011 UTC vs.
Revision 1.437 by root, Tue Nov 5 15:13:42 2013 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7 7
8#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 9#define PERL_EXT
… …
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17 17
18#define ECB_NO_THREADS 1
19#include "ecb.h"
20
21#include <stddef.h>
18#include <stdio.h> 22#include <stdio.h>
19#include <errno.h> 23#include <errno.h>
20#include <assert.h> 24#include <assert.h>
21 25
22#ifndef SVs_PADSTALE 26#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0 27# define SVs_PADSTALE 0
28#endif
29
30#ifdef PadARRAY
31# define NEWPADAPI 1
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else
34typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST;
37typedef AV PAD;
38# endif
39# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
40# define PadlistMAX(pl) AvFILLp (pl)
41# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY
43# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif
46
47/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
48/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
49#if PERL_VERSION_ATLEAST(5,19,0)
50# define SVt_BIND SVt_IV
24#endif 51#endif
25 52
26#if defined(_WIN32) 53#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY 54# undef HAS_GETTIMEOFDAY
28# undef setjmp 55# undef setjmp
… …
31# define setjmp _setjmp /* deep magic */ 58# define setjmp _setjmp /* deep magic */
32#else 59#else
33# include <inttypes.h> /* most portable stdint.h */ 60# include <inttypes.h> /* most portable stdint.h */
34#endif 61#endif
35 62
36#ifdef HAVE_MMAP
37# include <unistd.h>
38# include <sys/mman.h>
39# ifndef MAP_ANONYMOUS
40# ifdef MAP_ANON
41# define MAP_ANONYMOUS MAP_ANON
42# else
43# undef HAVE_MMAP
44# endif
45# endif
46# include <limits.h>
47# ifndef PAGESIZE
48# define PAGESIZE pagesize
49# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
50static long pagesize;
51# else
52# define BOOT_PAGESIZE (void)0
53# endif
54#else
55# define PAGESIZE 0
56# define BOOT_PAGESIZE (void)0
57#endif
58
59#if CORO_USE_VALGRIND
60# include <valgrind/valgrind.h>
61#endif
62
63/* the maximum number of idle cctx that will be pooled */ 63/* the maximum number of idle cctx that will be pooled */
64static int cctx_max_idle = 4; 64static int cctx_max_idle = 4;
65 65
66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 66#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
67# undef CORO_STACKGUARD 67# define HAS_SCOPESTACK_NAME 1
68#endif
69
70#ifndef CORO_STACKGUARD
71# define CORO_STACKGUARD 0
72#endif 68#endif
73 69
74/* prefer perl internal functions over our own? */ 70/* prefer perl internal functions over our own? */
75#ifndef CORO_PREFER_PERL_FUNCTIONS 71#ifndef CORO_PREFER_PERL_FUNCTIONS
76# define CORO_PREFER_PERL_FUNCTIONS 0 72# define CORO_PREFER_PERL_FUNCTIONS 0
… …
86# define STACKLEVEL ((void *)&stacklevel) 82# define STACKLEVEL ((void *)&stacklevel)
87#endif 83#endif
88 84
89#define IN_DESTRUCT PL_dirty 85#define IN_DESTRUCT PL_dirty
90 86
91#if __GNUC__ >= 3
92# define attribute(x) __attribute__(x)
93# define expect(expr,value) __builtin_expect ((expr), (value))
94# define INLINE static inline
95#else
96# define attribute(x)
97# define expect(expr,value) (expr)
98# define INLINE static
99#endif
100
101#define expect_false(expr) expect ((expr) != 0, 0)
102#define expect_true(expr) expect ((expr) != 0, 1)
103
104#define NOINLINE attribute ((noinline))
105
106#include "CoroAPI.h" 87#include "CoroAPI.h"
107#define GCoroAPI (&coroapi) /* very sneaky */ 88#define GCoroAPI (&coroapi) /* very sneaky */
108 89
109#ifdef USE_ITHREADS 90#ifdef USE_ITHREADS
110# if CORO_PTHREAD 91# if CORO_PTHREAD
… …
126static void (*u2time)(pTHX_ UV ret[2]); 107static void (*u2time)(pTHX_ UV ret[2]);
127 108
128/* we hijack an hopefully unused CV flag for our purposes */ 109/* we hijack an hopefully unused CV flag for our purposes */
129#define CVf_SLF 0x4000 110#define CVf_SLF 0x4000
130static OP *pp_slf (pTHX); 111static OP *pp_slf (pTHX);
112static void slf_destroy (pTHX_ struct coro *coro);
131 113
132static U32 cctx_gen; 114static U32 cctx_gen;
133static size_t cctx_stacksize = CORO_STACKSIZE; 115static size_t cctx_stacksize = CORO_STACKSIZE;
134static struct CoroAPI coroapi; 116static struct CoroAPI coroapi;
135static AV *main_mainstack; /* used to differentiate between $main and others */ 117static AV *main_mainstack; /* used to differentiate between $main and others */
… …
165static char times_valid; 147static char times_valid;
166 148
167static struct coro_cctx *cctx_first; 149static struct coro_cctx *cctx_first;
168static int cctx_count, cctx_idle; 150static int cctx_count, cctx_idle;
169 151
170enum { 152enum
153{
171 CC_MAPPED = 0x01, 154 CC_MAPPED = 0x01,
172 CC_NOREUSE = 0x02, /* throw this away after tracing */ 155 CC_NOREUSE = 0x02, /* throw this away after tracing */
173 CC_TRACE = 0x04, 156 CC_TRACE = 0x04,
174 CC_TRACE_SUB = 0x08, /* trace sub calls */ 157 CC_TRACE_SUB = 0x08, /* trace sub calls */
175 CC_TRACE_LINE = 0x10, /* trace each statement */ 158 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
180typedef struct coro_cctx 163typedef struct coro_cctx
181{ 164{
182 struct coro_cctx *next; 165 struct coro_cctx *next;
183 166
184 /* the stack */ 167 /* the stack */
185 void *sptr; 168 struct coro_stack stack;
186 size_t ssize;
187 169
188 /* cpu state */ 170 /* cpu state */
189 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 171 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
172#ifndef NDEBUG
190 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 173 JMPENV *idle_te; /* same as idle_sp, but for top_env */
174#endif
191 JMPENV *top_env; 175 JMPENV *top_env;
192 coro_context cctx; 176 coro_context cctx;
193 177
194 U32 gen; 178 U32 gen;
195#if CORO_USE_VALGRIND 179#if CORO_USE_VALGRIND
… …
200 184
201static coro_cctx *cctx_current; /* the currently running cctx */ 185static coro_cctx *cctx_current; /* the currently running cctx */
202 186
203/*****************************************************************************/ 187/*****************************************************************************/
204 188
189static MGVTBL coro_state_vtbl;
190
205enum { 191enum
192{
206 CF_RUNNING = 0x0001, /* coroutine is running */ 193 CF_RUNNING = 0x0001, /* coroutine is running */
207 CF_READY = 0x0002, /* coroutine is ready */ 194 CF_READY = 0x0002, /* coroutine is ready */
208 CF_NEW = 0x0004, /* has never been switched to */ 195 CF_NEW = 0x0004, /* has never been switched to */
209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 196 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 197 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
211 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */ 198 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
212}; 199};
213 200
214/* the structure where most of the perl state is stored, overlaid on the cxstack */ 201/* the structure where most of the perl state is stored, overlaid on the cxstack */
215typedef struct 202typedef struct
216{ 203{
217 SV *defsv;
218 AV *defav;
219 SV *errsv;
220 SV *irsgv;
221 HV *hinthv;
222#define VAR(name,type) type name; 204 #define VARx(name,expr,type) type name;
223# include "state.h" 205 #include "state.h"
224#undef VAR
225} perl_slots; 206} perl_slots;
226 207
208/* how many context stack entries do we need for perl_slots */
227#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 209#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
228 210
229/* this is a structure representing a perl-level coroutine */ 211/* this is a structure representing a perl-level coroutine */
230struct coro { 212struct coro
213{
231 /* the C coroutine allocated to this perl coroutine, if any */ 214 /* the C coroutine allocated to this perl coroutine, if any */
232 coro_cctx *cctx; 215 coro_cctx *cctx;
233 216
234 /* ready queue */ 217 /* ready queue */
235 struct coro *next_ready; 218 struct coro *next_ready;
… …
237 /* state data */ 220 /* state data */
238 struct CoroSLF slf_frame; /* saved slf frame */ 221 struct CoroSLF slf_frame; /* saved slf frame */
239 AV *mainstack; 222 AV *mainstack;
240 perl_slots *slot; /* basically the saved sp */ 223 perl_slots *slot; /* basically the saved sp */
241 224
242 CV *startcv; /* the CV to execute */ 225 CV *startcv; /* the CV to execute */
243 AV *args; /* data associated with this coroutine (initial args) */ 226 AV *args; /* data associated with this coroutine (initial args) */
244 int refcnt; /* coroutines are refcounted, yes */
245 int flags; /* CF_ flags */ 227 int flags; /* CF_ flags */
246 HV *hv; /* the perl hash associated with this coro, if any */ 228 HV *hv; /* the perl hash associated with this coro, if any */
247 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
248 229
249 /* statistics */ 230 /* statistics */
250 int usecount; /* number of transfers to this coro */ 231 int usecount; /* number of transfers to this coro */
251 232
252 /* coro process data */ 233 /* coro process data */
253 int prio; 234 int prio;
254 SV *except; /* exception to be thrown */ 235 SV *except; /* exception to be thrown */
255 SV *rouse_cb; 236 SV *rouse_cb; /* last rouse callback */
237 AV *on_destroy; /* callbacks or coros to notify on destroy */
238 AV *status; /* the exit status list */
256 239
257 /* async_pool */ 240 /* async_pool */
258 SV *saved_deffh; 241 SV *saved_deffh;
259 SV *invoke_cb; 242 SV *invoke_cb;
260 AV *invoke_av; 243 AV *invoke_av;
… …
292 275
293/* for Coro.pm */ 276/* for Coro.pm */
294static SV *coro_current; 277static SV *coro_current;
295static SV *coro_readyhook; 278static SV *coro_readyhook;
296static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 279static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
297static CV *cv_coro_run, *cv_coro_terminate; 280static CV *cv_coro_run;
298static struct coro *coro_first; 281static struct coro *coro_first;
299#define coro_nready coroapi.nready 282#define coro_nready coroapi.nready
283
284/** JIT *********************************************************************/
285
286#if CORO_JIT
287 /* APPLE doesn't have mmap though */
288 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
289 #ifndef CORO_JIT_TYPE
290 #if ECB_AMD64 && CORO_JIT_UNIXY
291 #define CORO_JIT_TYPE "amd64-unix"
292 #elif __i386 && CORO_JIT_UNIXY
293 #define CORO_JIT_TYPE "x86-unix"
294 #endif
295 #endif
296#endif
297
298#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
299 #undef CORO_JIT
300#endif
301
302#if CORO_JIT
303 typedef void (*load_save_perl_slots_type)(perl_slots *);
304 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
305#endif
300 306
301/** Coro::Select ************************************************************/ 307/** Coro::Select ************************************************************/
302 308
303static OP *(*coro_old_pp_sselect) (pTHX); 309static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select; 310static SV *coro_select_select;
… …
320 326
321/** time stuff **************************************************************/ 327/** time stuff **************************************************************/
322 328
323#ifdef HAS_GETTIMEOFDAY 329#ifdef HAS_GETTIMEOFDAY
324 330
325static void 331ecb_inline void
326coro_u2time (pTHX_ UV ret[2]) 332coro_u2time (pTHX_ UV ret[2])
327{ 333{
328 struct timeval tv; 334 struct timeval tv;
329 gettimeofday (&tv, 0); 335 gettimeofday (&tv, 0);
330 336
331 ret [0] = tv.tv_sec; 337 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec; 338 ret [1] = tv.tv_usec;
333} 339}
334 340
335static double 341ecb_inline double
336coro_nvtime () 342coro_nvtime (void)
337{ 343{
338 struct timeval tv; 344 struct timeval tv;
339 gettimeofday (&tv, 0); 345 gettimeofday (&tv, 0);
340 346
341 return tv.tv_sec + tv.tv_usec * 1e-6; 347 return tv.tv_sec + tv.tv_usec * 1e-6;
342} 348}
343 349
344static void 350ecb_inline void
345time_init (pTHX) 351time_init (pTHX)
346{ 352{
347 nvtime = coro_nvtime; 353 nvtime = coro_nvtime;
348 u2time = coro_u2time; 354 u2time = coro_u2time;
349} 355}
350 356
351#else 357#else
352 358
353static void 359ecb_inline void
354time_init (pTHX) 360time_init (pTHX)
355{ 361{
356 SV **svp; 362 SV **svp;
357 363
358 require_pv ("Time/HiRes.pm"); 364 require_pv ("Time/HiRes.pm");
359 365
360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 366 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
361 367
362 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 368 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 369 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
364 370
… …
370 376
371#endif 377#endif
372 378
373/** lowlevel stuff **********************************************************/ 379/** lowlevel stuff **********************************************************/
374 380
375static SV * 381static SV * ecb_noinline
376coro_get_sv (pTHX_ const char *name, int create) 382coro_get_sv (pTHX_ const char *name, int create)
377{ 383{
378#if PERL_VERSION_ATLEAST (5,10,0) 384#if PERL_VERSION_ATLEAST (5,10,0)
379 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 385 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
380 get_sv (name, create); 386 get_sv (name, create);
381#endif 387#endif
382 return get_sv (name, create); 388 return get_sv (name, create);
383} 389}
384 390
385static AV * 391static AV * ecb_noinline
386coro_get_av (pTHX_ const char *name, int create) 392coro_get_av (pTHX_ const char *name, int create)
387{ 393{
388#if PERL_VERSION_ATLEAST (5,10,0) 394#if PERL_VERSION_ATLEAST (5,10,0)
389 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 395 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
390 get_av (name, create); 396 get_av (name, create);
391#endif 397#endif
392 return get_av (name, create); 398 return get_av (name, create);
393} 399}
394 400
395static HV * 401static HV * ecb_noinline
396coro_get_hv (pTHX_ const char *name, int create) 402coro_get_hv (pTHX_ const char *name, int create)
397{ 403{
398#if PERL_VERSION_ATLEAST (5,10,0) 404#if PERL_VERSION_ATLEAST (5,10,0)
399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 405 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
400 get_hv (name, create); 406 get_hv (name, create);
401#endif 407#endif
402 return get_hv (name, create); 408 return get_hv (name, create);
403} 409}
404 410
405INLINE void 411ecb_inline void
406coro_times_update () 412coro_times_update (void)
407{ 413{
408#ifdef coro_clock_gettime 414#ifdef coro_clock_gettime
409 struct timespec ts; 415 struct timespec ts;
410 416
411 ts.tv_sec = ts.tv_nsec = 0; 417 ts.tv_sec = ts.tv_nsec = 0;
… …
423 time_real [0] = tv [0]; 429 time_real [0] = tv [0];
424 time_real [1] = tv [1] * 1000; 430 time_real [1] = tv [1] * 1000;
425#endif 431#endif
426} 432}
427 433
428INLINE void 434ecb_inline void
429coro_times_add (struct coro *c) 435coro_times_add (struct coro *c)
430{ 436{
431 c->t_real [1] += time_real [1]; 437 c->t_real [1] += time_real [1];
432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 438 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
433 c->t_real [0] += time_real [0]; 439 c->t_real [0] += time_real [0];
… …
435 c->t_cpu [1] += time_cpu [1]; 441 c->t_cpu [1] += time_cpu [1];
436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 442 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
437 c->t_cpu [0] += time_cpu [0]; 443 c->t_cpu [0] += time_cpu [0];
438} 444}
439 445
440INLINE void 446ecb_inline void
441coro_times_sub (struct coro *c) 447coro_times_sub (struct coro *c)
442{ 448{
443 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 449 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
444 c->t_real [1] -= time_real [1]; 450 c->t_real [1] -= time_real [1];
445 c->t_real [0] -= time_real [0]; 451 c->t_real [0] -= time_real [0];
… …
453/* magic glue */ 459/* magic glue */
454 460
455#define CORO_MAGIC_type_cv 26 461#define CORO_MAGIC_type_cv 26
456#define CORO_MAGIC_type_state PERL_MAGIC_ext 462#define CORO_MAGIC_type_state PERL_MAGIC_ext
457 463
458#define CORO_MAGIC_NN(sv, type) \ 464#define CORO_MAGIC_NN(sv, type) \
459 (expect_true (SvMAGIC (sv)->mg_type == type) \ 465 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
460 ? SvMAGIC (sv) \ 466 ? SvMAGIC (sv) \
461 : mg_find (sv, type)) 467 : mg_find (sv, type))
462 468
463#define CORO_MAGIC(sv, type) \ 469#define CORO_MAGIC(sv, type) \
464 (expect_true (SvMAGIC (sv)) \ 470 (ecb_expect_true (SvMAGIC (sv)) \
465 ? CORO_MAGIC_NN (sv, type) \ 471 ? CORO_MAGIC_NN (sv, type) \
466 : 0) 472 : 0)
467 473
468#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 474#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
469#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 475#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
470 476
471INLINE struct coro * 477ecb_inline MAGIC *
478SvSTATEhv_p (pTHX_ SV *coro)
479{
480 MAGIC *mg;
481
482 if (ecb_expect_true (
483 SvTYPE (coro) == SVt_PVHV
484 && (mg = CORO_MAGIC_state (coro))
485 && mg->mg_virtual == &coro_state_vtbl
486 ))
487 return mg;
488
489 return 0;
490}
491
492ecb_inline struct coro *
472SvSTATE_ (pTHX_ SV *coro) 493SvSTATE_ (pTHX_ SV *coro)
473{ 494{
474 HV *stash;
475 MAGIC *mg; 495 MAGIC *mg;
476 496
477 if (SvROK (coro)) 497 if (SvROK (coro))
478 coro = SvRV (coro); 498 coro = SvRV (coro);
479 499
480 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 500 mg = SvSTATEhv_p (aTHX_ coro);
501 if (!mg)
481 croak ("Coro::State object required"); 502 croak ("Coro::State object required");
482 503
483 stash = SvSTASH (coro);
484 if (expect_false (stash != coro_stash && stash != coro_state_stash))
485 {
486 /* very slow, but rare, check */
487 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
488 croak ("Coro::State object required");
489 }
490
491 mg = CORO_MAGIC_state (coro);
492 return (struct coro *)mg->mg_ptr; 504 return (struct coro *)mg->mg_ptr;
493} 505}
494 506
495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 507#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
496 508
… …
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 511#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500 512
501/*****************************************************************************/ 513/*****************************************************************************/
502/* padlist management and caching */ 514/* padlist management and caching */
503 515
504static AV * 516ecb_inline PADLIST *
505coro_derive_padlist (pTHX_ CV *cv) 517coro_derive_padlist (pTHX_ CV *cv)
506{ 518{
507 AV *padlist = CvPADLIST (cv); 519 PADLIST *padlist = CvPADLIST (cv);
508 AV *newpadlist, *newpad; 520 PADLIST *newpadlist;
521 PAD *newpad;
522 PADOFFSET off = PadlistMAX (padlist) + 1;
509 523
510 newpadlist = newAV (); 524#if NEWPADAPI
525
526 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
527 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
528 while (!PadlistARRAY (padlist)[off - 1])
529 --off;
530
531 Perl_pad_push (aTHX_ padlist, off);
532
533 newpad = PadlistARRAY (padlist)[off];
534 PadlistARRAY (padlist)[off] = 0;
535
536#else
537
538#if PERL_VERSION_ATLEAST (5,10,0)
539 Perl_pad_push (aTHX_ padlist, off);
540#else
541 Perl_pad_push (aTHX_ padlist, off, 1);
542#endif
543
544 newpad = PadlistARRAY (padlist)[off];
545 PadlistMAX (padlist) = off - 1;
546
547#endif
548
549 newPADLIST (newpadlist);
550#if !PERL_VERSION_ATLEAST(5,15,3)
551 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
511 AvREAL_off (newpadlist); 552 AvREAL_off (newpadlist);
512#if PERL_VERSION_ATLEAST (5,10,0)
513 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
514#else
515 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
516#endif 553#endif
517 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
518 --AvFILLp (padlist);
519 554
520 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 555 /* Already extended to 2 elements by newPADLIST. */
521 av_store (newpadlist, 1, (SV *)newpad); 556 PadlistMAX (newpadlist) = 1;
557 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
558 PadlistARRAY (newpadlist)[1] = newpad;
522 559
523 return newpadlist; 560 return newpadlist;
524} 561}
525 562
526static void 563ecb_inline void
527free_padlist (pTHX_ AV *padlist) 564free_padlist (pTHX_ PADLIST *padlist)
528{ 565{
529 /* may be during global destruction */ 566 /* may be during global destruction */
530 if (!IN_DESTRUCT) 567 if (!IN_DESTRUCT)
531 { 568 {
532 I32 i = AvFILLp (padlist); 569 I32 i = PadlistMAX (padlist);
533 570
534 while (i > 0) /* special-case index 0 */ 571 while (i > 0) /* special-case index 0 */
535 { 572 {
536 /* we try to be extra-careful here */ 573 /* we try to be extra-careful here */
537 AV *av = (AV *)AvARRAY (padlist)[i--]; 574 PAD *pad = PadlistARRAY (padlist)[i--];
538 I32 j = AvFILLp (av); 575 I32 j = PadMAX (pad);
539 576
540 while (j >= 0) 577 while (j >= 0)
541 SvREFCNT_dec (AvARRAY (av)[j--]); 578 SvREFCNT_dec (PadARRAY (pad)[j--]);
542 579
543 AvFILLp (av) = -1; 580 PadMAX (pad) = -1;
544 SvREFCNT_dec (av); 581 SvREFCNT_dec (pad);
545 } 582 }
546 583
547 SvREFCNT_dec (AvARRAY (padlist)[0]); 584 SvREFCNT_dec (PadlistNAMES (padlist));
548 585
586#if NEWPADAPI
587 Safefree (PadlistARRAY (padlist));
588 Safefree (padlist);
589#else
549 AvFILLp (padlist) = -1; 590 AvFILLp (padlist) = -1;
591 AvREAL_off (padlist);
550 SvREFCNT_dec ((SV*)padlist); 592 SvREFCNT_dec ((SV*)padlist);
593#endif
551 } 594 }
552} 595}
553 596
554static int 597static int
555coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 598coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
556{ 599{
557 AV *padlist; 600 PADLIST *padlist;
558 AV *av = (AV *)mg->mg_obj; 601 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
602 size_t len = *(size_t *)mg->mg_ptr;
559 603
560 /* perl manages to free our internal AV and _then_ call us */ 604 /* perl manages to free our internal AV and _then_ call us */
561 if (IN_DESTRUCT) 605 if (IN_DESTRUCT)
562 return 0; 606 return 0;
563 607
564 /* casting is fun. */ 608 while (len--)
565 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
566 free_padlist (aTHX_ padlist); 609 free_padlist (aTHX_ padlists[len]);
567
568 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
569 610
570 return 0; 611 return 0;
571} 612}
572 613
573static MGVTBL coro_cv_vtbl = { 614static MGVTBL coro_cv_vtbl = {
574 0, 0, 0, 0, 615 0, 0, 0, 0,
575 coro_cv_free 616 coro_cv_free
576}; 617};
577 618
578/* the next two functions merely cache the padlists */ 619/* the next two functions merely cache the padlists */
579static void 620ecb_inline void
580get_padlist (pTHX_ CV *cv) 621get_padlist (pTHX_ CV *cv)
581{ 622{
582 MAGIC *mg = CORO_MAGIC_cv (cv); 623 MAGIC *mg = CORO_MAGIC_cv (cv);
583 AV *av; 624 size_t *lenp;
584 625
585 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 626 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 627 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
587 else 628 else
588 { 629 {
589#if CORO_PREFER_PERL_FUNCTIONS 630#if CORO_PREFER_PERL_FUNCTIONS
590 /* this is probably cleaner? but also slower! */ 631 /* this is probably cleaner? but also slower! */
591 /* in practise, it seems to be less stable */ 632 /* in practise, it seems to be less stable */
… …
597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 638 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
598#endif 639#endif
599 } 640 }
600} 641}
601 642
602static void 643ecb_inline void
603put_padlist (pTHX_ CV *cv) 644put_padlist (pTHX_ CV *cv)
604{ 645{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av;
607 647
608 if (expect_false (!mg)) 648 if (ecb_expect_false (!mg))
649 {
609 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 650 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
651 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
652 mg->mg_len = 1; /* so mg_free frees mg_ptr */
653 }
654 else
655 Renew (mg->mg_ptr,
656 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
657 char);
610 658
611 av = (AV *)mg->mg_obj; 659 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
612
613 if (expect_false (AvFILLp (av) >= AvMAX (av)))
614 av_extend (av, AvFILLp (av) + 1);
615
616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
617} 660}
618 661
619/** load & save, init *******************************************************/ 662/** load & save, init *******************************************************/
620 663
664ecb_inline void
665swap_sv (SV *a, SV *b)
666{
667 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
668 SV tmp;
669
670 /* swap sv_any */
671 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
672
673 /* swap sv_flags */
674 SvFLAGS (&tmp) = SvFLAGS (a);
675 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
676 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
677
678#if PERL_VERSION_ATLEAST (5,10,0)
679 /* perl 5.10 and later complicates this _quite_ a bit, but it also
680 * is much faster, so no quarrels here. alternatively, we could
681 * sv_upgrade to avoid this.
682 */
683 {
684 /* swap sv_u */
685 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
686
687 /* if SvANY points to the head, we need to adjust the pointers,
688 * as the pointer for a still points to b, and maybe vice versa.
689 */
690 #define svany_in_head(type) \
691 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
692
693 if (svany_in_head (SvTYPE (a)))
694 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
695
696 if (svany_in_head (SvTYPE (b)))
697 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
698 }
699#endif
700}
701
621/* swap sv heads, at least logically */ 702/* swap sv heads, at least logically */
622static void 703static void
623swap_svs (pTHX_ Coro__State c) 704swap_svs (pTHX_ Coro__State c)
624{ 705{
625 int i; 706 int i;
626 707
627 for (i = 0; i <= AvFILLp (c->swap_sv); ) 708 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
628 { 709 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
629 SV *a = AvARRAY (c->swap_sv)[i++];
630 SV *b = AvARRAY (c->swap_sv)[i++];
631
632 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
633 SV tmp;
634
635 /* swap sv_any */
636 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
637
638 /* swap sv_flags */
639 SvFLAGS (&tmp) = SvFLAGS (a);
640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
642
643#if PERL_VERSION_ATLEAST (5,10,0)
644 /* perl 5.10 complicates this _quite_ a bit, but it also is
645 * much faster, so no quarrels here. alternatively, we could
646 * sv_upgrade to avoid this.
647 */
648 {
649 /* swap sv_u */
650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
651
652 /* if SvANY points to the head, we need to adjust the pointers,
653 * as the pointer for a still points to b, and maybe vice versa.
654 */
655 #define svany_in_head(type) \
656 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
657
658 if (svany_in_head (SvTYPE (a)))
659 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
660
661 if (svany_in_head (SvTYPE (b)))
662 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
663 }
664#endif
665 }
666} 710}
667 711
668#define SWAP_SVS(coro) \ 712#define SWAP_SVS(coro) \
669 if (expect_false ((coro)->swap_sv)) \ 713 if (ecb_expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro)) 714 swap_svs (aTHX_ (coro))
671 715
672static void 716static void
673on_enterleave_call (pTHX_ SV *cb); 717on_enterleave_call (pTHX_ SV *cb);
674 718
… …
678 perl_slots *slot = c->slot; 722 perl_slots *slot = c->slot;
679 c->slot = 0; 723 c->slot = 0;
680 724
681 PL_mainstack = c->mainstack; 725 PL_mainstack = c->mainstack;
682 726
683 GvSV (PL_defgv) = slot->defsv; 727#if CORO_JIT
684 GvAV (PL_defgv) = slot->defav; 728 load_perl_slots (slot);
685 GvSV (PL_errgv) = slot->errsv; 729#else
686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
688
689 #define VAR(name,type) PL_ ## name = slot->name; 730 #define VARx(name,expr,type) expr = slot->name;
690 # include "state.h" 731 #include "state.h"
691 #undef VAR 732#endif
692 733
693 { 734 {
694 dSP; 735 dSP;
695 736
696 CV *cv; 737 CV *cv;
697 738
698 /* now do the ugly restore mess */ 739 /* now do the ugly restore mess */
699 while (expect_true (cv = (CV *)POPs)) 740 while (ecb_expect_true (cv = (CV *)POPs))
700 { 741 {
701 put_padlist (aTHX_ cv); /* mark this padlist as available */ 742 put_padlist (aTHX_ cv); /* mark this padlist as available */
702 CvDEPTH (cv) = PTR2IV (POPs); 743 CvDEPTH (cv) = PTR2IV (POPs);
703 CvPADLIST (cv) = (AV *)POPs; 744 CvPADLIST (cv) = (PADLIST *)POPs;
704 } 745 }
705 746
706 PUTBACK; 747 PUTBACK;
707 } 748 }
708 749
709 slf_frame = c->slf_frame; 750 slf_frame = c->slf_frame;
710 CORO_THROW = c->except; 751 CORO_THROW = c->except;
711 752
712 if (expect_false (enable_times)) 753 if (ecb_expect_false (enable_times))
713 { 754 {
714 if (expect_false (!times_valid)) 755 if (ecb_expect_false (!times_valid))
715 coro_times_update (); 756 coro_times_update ();
716 757
717 coro_times_sub (c); 758 coro_times_sub (c);
718 } 759 }
719 760
720 if (expect_false (c->on_enter)) 761 if (ecb_expect_false (c->on_enter))
721 { 762 {
722 int i; 763 int i;
723 764
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 765 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 766 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
731static void 772static void
732save_perl (pTHX_ Coro__State c) 773save_perl (pTHX_ Coro__State c)
733{ 774{
734 SWAP_SVS (c); 775 SWAP_SVS (c);
735 776
736 if (expect_false (c->on_leave)) 777 if (ecb_expect_false (c->on_leave))
737 { 778 {
738 int i; 779 int i;
739 780
740 for (i = AvFILLp (c->on_leave); i >= 0; --i) 781 for (i = AvFILLp (c->on_leave); i >= 0; --i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 782 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 } 783 }
743 784
744 times_valid = 0; 785 times_valid = 0;
745 786
746 if (expect_false (enable_times)) 787 if (ecb_expect_false (enable_times))
747 { 788 {
748 coro_times_update (); times_valid = 1; 789 coro_times_update (); times_valid = 1;
749 coro_times_add (c); 790 coro_times_add (c);
750 } 791 }
751 792
… …
765 806
766 XPUSHs (Nullsv); 807 XPUSHs (Nullsv);
767 /* this loop was inspired by pp_caller */ 808 /* this loop was inspired by pp_caller */
768 for (;;) 809 for (;;)
769 { 810 {
770 while (expect_true (cxix >= 0)) 811 while (ecb_expect_true (cxix >= 0))
771 { 812 {
772 PERL_CONTEXT *cx = &ccstk[cxix--]; 813 PERL_CONTEXT *cx = &ccstk[cxix--];
773 814
774 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 815 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
775 { 816 {
776 CV *cv = cx->blk_sub.cv; 817 CV *cv = cx->blk_sub.cv;
777 818
778 if (expect_true (CvDEPTH (cv))) 819 if (ecb_expect_true (CvDEPTH (cv)))
779 { 820 {
780 EXTEND (SP, 3); 821 EXTEND (SP, 3);
781 PUSHs ((SV *)CvPADLIST (cv)); 822 PUSHs ((SV *)CvPADLIST (cv));
782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 823 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
783 PUSHs ((SV *)cv); 824 PUSHs ((SV *)cv);
… …
786 get_padlist (aTHX_ cv); 827 get_padlist (aTHX_ cv);
787 } 828 }
788 } 829 }
789 } 830 }
790 831
791 if (expect_true (top_si->si_type == PERLSI_MAIN)) 832 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
792 break; 833 break;
793 834
794 top_si = top_si->si_prev; 835 top_si = top_si->si_prev;
795 ccstk = top_si->si_cxstack; 836 ccstk = top_si->si_cxstack;
796 cxix = top_si->si_cxix; 837 cxix = top_si->si_cxix;
… …
798 839
799 PUTBACK; 840 PUTBACK;
800 } 841 }
801 842
802 /* allocate some space on the context stack for our purposes */ 843 /* allocate some space on the context stack for our purposes */
803 /* we manually unroll here, as usually 2 slots is enough */ 844 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
804 if (SLOT_COUNT >= 1) CXINC;
805 if (SLOT_COUNT >= 2) CXINC;
806 if (SLOT_COUNT >= 3) CXINC;
807 { 845 {
808 unsigned int i; 846 unsigned int i;
847
809 for (i = 3; i < SLOT_COUNT; ++i) 848 for (i = 0; i < SLOT_COUNT; ++i)
810 CXINC; 849 CXINC;
811 } 850
812 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 851 cxstack_ix -= SLOT_COUNT; /* undo allocation */
852 }
813 853
814 c->mainstack = PL_mainstack; 854 c->mainstack = PL_mainstack;
815 855
816 { 856 {
817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 857 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
818 858
819 slot->defav = GvAV (PL_defgv); 859#if CORO_JIT
820 slot->defsv = DEFSV; 860 save_perl_slots (slot);
821 slot->errsv = ERRSV; 861#else
822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
824
825 #define VAR(name,type) slot->name = PL_ ## name; 862 #define VARx(name,expr,type) slot->name = expr;
826 # include "state.h" 863 #include "state.h"
827 #undef VAR 864#endif
828 } 865 }
829} 866}
830 867
831/* 868/*
832 * allocate various perl stacks. This is almost an exact copy 869 * allocate various perl stacks. This is almost an exact copy
… …
838# define coro_init_stacks(thx) init_stacks () 875# define coro_init_stacks(thx) init_stacks ()
839#else 876#else
840static void 877static void
841coro_init_stacks (pTHX) 878coro_init_stacks (pTHX)
842{ 879{
843 PL_curstackinfo = new_stackinfo(32, 8); 880 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
844 PL_curstackinfo->si_type = PERLSI_MAIN; 881 PL_curstackinfo->si_type = PERLSI_MAIN;
845 PL_curstack = PL_curstackinfo->si_stack; 882 PL_curstack = PL_curstackinfo->si_stack;
846 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 883 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
847 884
848 PL_stack_base = AvARRAY(PL_curstack); 885 PL_stack_base = AvARRAY(PL_curstack);
… …
863#endif 900#endif
864 901
865 New(54,PL_scopestack,8,I32); 902 New(54,PL_scopestack,8,I32);
866 PL_scopestack_ix = 0; 903 PL_scopestack_ix = 0;
867 PL_scopestack_max = 8; 904 PL_scopestack_max = 8;
905#if HAS_SCOPESTACK_NAME
906 New(54,PL_scopestack_name,8,const char*);
907#endif
868 908
869 New(54,PL_savestack,24,ANY); 909 New(54,PL_savestack,24,ANY);
870 PL_savestack_ix = 0; 910 PL_savestack_ix = 0;
871 PL_savestack_max = 24; 911 PL_savestack_max = 24;
872 912
… …
900 } 940 }
901 941
902 Safefree (PL_tmps_stack); 942 Safefree (PL_tmps_stack);
903 Safefree (PL_markstack); 943 Safefree (PL_markstack);
904 Safefree (PL_scopestack); 944 Safefree (PL_scopestack);
945#if HAS_SCOPESTACK_NAME
946 Safefree (PL_scopestack_name);
947#endif
905 Safefree (PL_savestack); 948 Safefree (PL_savestack);
906#if !PERL_VERSION_ATLEAST (5,10,0) 949#if !PERL_VERSION_ATLEAST (5,10,0)
907 Safefree (PL_retstack); 950 Safefree (PL_retstack);
908#endif 951#endif
909} 952}
… …
955#endif 998#endif
956 999
957/* 1000/*
958 * This overrides the default magic get method of %SIG elements. 1001 * This overrides the default magic get method of %SIG elements.
959 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1002 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
960 * and instead of trying to save and restore the hash elements, we just provide 1003 * and instead of trying to save and restore the hash elements (extremely slow),
961 * readback here. 1004 * we just provide our own readback here.
962 */ 1005 */
963static int 1006static int ecb_cold
964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1007coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
965{ 1008{
966 const char *s = MgPV_nolen_const (mg); 1009 const char *s = MgPV_nolen_const (mg);
967 1010
968 if (*s == '_') 1011 if (*s == '_')
969 { 1012 {
970 SV **svp = 0; 1013 SV **svp = 0;
971 1014
972 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1015 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
973 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1016 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
974 1017
975 if (svp) 1018 if (svp)
976 { 1019 {
977 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1020 SV *ssv;
1021
1022 if (!*svp)
1023 ssv = &PL_sv_undef;
1024 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1025 ssv = sv_2mortal (newRV_inc (*svp));
1026 else
1027 ssv = *svp;
1028
1029 sv_setsv (sv, ssv);
978 return 0; 1030 return 0;
979 } 1031 }
980 } 1032 }
981 1033
982 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1034 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
983} 1035}
984 1036
985static int 1037static int ecb_cold
986coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1038coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
987{ 1039{
988 const char *s = MgPV_nolen_const (mg); 1040 const char *s = MgPV_nolen_const (mg);
989 1041
990 if (*s == '_') 1042 if (*s == '_')
… …
1004 } 1056 }
1005 1057
1006 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1058 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1007} 1059}
1008 1060
1009static int 1061static int ecb_cold
1010coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1062coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1011{ 1063{
1012 const char *s = MgPV_nolen_const (mg); 1064 const char *s = MgPV_nolen_const (mg);
1013 1065
1014 if (*s == '_') 1066 if (*s == '_')
… …
1049 return 1; 1101 return 1;
1050} 1102}
1051 1103
1052static UNOP init_perl_op; 1104static UNOP init_perl_op;
1053 1105
1054static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1106ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1055init_perl (pTHX_ struct coro *coro) 1107init_perl (pTHX_ struct coro *coro)
1056{ 1108{
1057 /* 1109 /*
1058 * emulate part of the perl startup here. 1110 * emulate part of the perl startup here.
1059 */ 1111 */
… …
1074 PL_parser = 0; 1126 PL_parser = 0;
1075#endif 1127#endif
1076 PL_hints = 0; 1128 PL_hints = 0;
1077 1129
1078 /* recreate the die/warn hooks */ 1130 /* recreate the die/warn hooks */
1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1131 PL_diehook = SvREFCNT_inc (rv_diehook);
1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1132 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1081 1133
1082 GvSV (PL_defgv) = newSV (0); 1134 GvSV (PL_defgv) = newSV (0);
1083 GvAV (PL_defgv) = coro->args; coro->args = 0; 1135 GvAV (PL_defgv) = coro->args; coro->args = 0;
1084 GvSV (PL_errgv) = newSV (0); 1136 GvSV (PL_errgv) = newSV (0);
1085 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1137 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1086 GvHV (PL_hintgv) = 0; 1138 GvHV (PL_hintgv) = 0;
… …
1106 /* this newly created coroutine might be run on an existing cctx which most 1158 /* this newly created coroutine might be run on an existing cctx which most
1107 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1159 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1108 */ 1160 */
1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1161 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1110 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1162 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1163 slf_frame.destroy = 0;
1111 1164
1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1165 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1113 init_perl_op.op_next = PL_op; 1166 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1167 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1168 init_perl_op.op_ppaddr = pp_slf;
… …
1120 /* copy throw, in case it was set before init_perl */ 1173 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1174 CORO_THROW = coro->except;
1122 1175
1123 SWAP_SVS (coro); 1176 SWAP_SVS (coro);
1124 1177
1125 if (expect_false (enable_times)) 1178 if (ecb_expect_false (enable_times))
1126 { 1179 {
1127 coro_times_update (); 1180 coro_times_update ();
1128 coro_times_sub (coro); 1181 coro_times_sub (coro);
1129 } 1182 }
1130} 1183}
… …
1154destroy_perl (pTHX_ struct coro *coro) 1207destroy_perl (pTHX_ struct coro *coro)
1155{ 1208{
1156 SV *svf [9]; 1209 SV *svf [9];
1157 1210
1158 { 1211 {
1212 SV *old_current = SvRV (coro_current);
1159 struct coro *current = SvSTATE_current; 1213 struct coro *current = SvSTATE (old_current);
1160 1214
1161 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1215 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1162 1216
1163 save_perl (aTHX_ current); 1217 save_perl (aTHX_ current);
1218
1219 /* this will cause transfer_check to croak on block*/
1164 /*SvRV_set (coro_current, (SV *)coro->hv);*/ 1220 SvRV_set (coro_current, (SV *)coro->hv);
1221
1165 load_perl (aTHX_ coro); 1222 load_perl (aTHX_ coro);
1166 1223
1167 coro_unwind_stacks (aTHX); 1224 coro_unwind_stacks (aTHX);
1168 coro_destruct_stacks (aTHX);
1169 1225
1170 /* restore swapped sv's */ 1226 /* restore swapped sv's */
1171 SWAP_SVS (coro); 1227 SWAP_SVS (coro);
1172 1228
1229 coro_destruct_stacks (aTHX);
1230
1173 // now save some sv's to be free'd later 1231 /* now save some sv's to be free'd later */
1174 svf [0] = GvSV (PL_defgv); 1232 svf [0] = GvSV (PL_defgv);
1175 svf [1] = (SV *)GvAV (PL_defgv); 1233 svf [1] = (SV *)GvAV (PL_defgv);
1176 svf [2] = GvSV (PL_errgv); 1234 svf [2] = GvSV (PL_errgv);
1177 svf [3] = (SV *)PL_defoutgv; 1235 svf [3] = (SV *)PL_defoutgv;
1178 svf [4] = PL_rs; 1236 svf [4] = PL_rs;
… …
1180 svf [6] = (SV *)GvHV (PL_hintgv); 1238 svf [6] = (SV *)GvHV (PL_hintgv);
1181 svf [7] = PL_diehook; 1239 svf [7] = PL_diehook;
1182 svf [8] = PL_warnhook; 1240 svf [8] = PL_warnhook;
1183 assert (9 == sizeof (svf) / sizeof (*svf)); 1241 assert (9 == sizeof (svf) / sizeof (*svf));
1184 1242
1185 /*SvRV_set (coro_current, (SV *)current->hv);*/ 1243 SvRV_set (coro_current, old_current);
1244
1186 load_perl (aTHX_ current); 1245 load_perl (aTHX_ current);
1187 } 1246 }
1188 1247
1189 { 1248 {
1190 unsigned int i; 1249 unsigned int i;
… …
1197 SvREFCNT_dec (coro->invoke_cb); 1256 SvREFCNT_dec (coro->invoke_cb);
1198 SvREFCNT_dec (coro->invoke_av); 1257 SvREFCNT_dec (coro->invoke_av);
1199 } 1258 }
1200} 1259}
1201 1260
1202INLINE void 1261ecb_inline void
1203free_coro_mortal (pTHX) 1262free_coro_mortal (pTHX)
1204{ 1263{
1205 if (expect_true (coro_mortal)) 1264 if (ecb_expect_true (coro_mortal))
1206 { 1265 {
1207 SvREFCNT_dec (coro_mortal); 1266 SvREFCNT_dec ((SV *)coro_mortal);
1208 coro_mortal = 0; 1267 coro_mortal = 0;
1209 } 1268 }
1210} 1269}
1211 1270
1212static int 1271static int
… …
1345 1404
1346 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1405 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1347} 1406}
1348 1407
1349/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1408/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1350static void NOINLINE 1409static void ecb_noinline
1351cctx_prepare (pTHX) 1410cctx_prepare (pTHX)
1352{ 1411{
1353 PL_top_env = &PL_start_env; 1412 PL_top_env = &PL_start_env;
1354 1413
1355 if (cctx_current->flags & CC_TRACE) 1414 if (cctx_current->flags & CC_TRACE)
… …
1366 slf_frame.prepare = slf_prepare_set_stacklevel; 1425 slf_frame.prepare = slf_prepare_set_stacklevel;
1367 slf_frame.check = slf_check_set_stacklevel; 1426 slf_frame.check = slf_check_set_stacklevel;
1368} 1427}
1369 1428
1370/* the tail of transfer: execute stuff we can only do after a transfer */ 1429/* the tail of transfer: execute stuff we can only do after a transfer */
1371INLINE void 1430ecb_inline void
1372transfer_tail (pTHX) 1431transfer_tail (pTHX)
1373{ 1432{
1374 free_coro_mortal (aTHX); 1433 free_coro_mortal (aTHX);
1434}
1435
1436/* try to exit the same way perl's main function would do */
1437/* we do not bother resetting the environment or other things *7
1438/* that are not, uhm, essential */
1439/* this obviously also doesn't work when perl is embedded */
1440static void ecb_noinline ecb_cold
1441perlish_exit (pTHX)
1442{
1443 int exitstatus = perl_destruct (PL_curinterp);
1444 perl_free (PL_curinterp);
1445 exit (exitstatus);
1375} 1446}
1376 1447
1377/* 1448/*
1378 * this is a _very_ stripped down perl interpreter ;) 1449 * this is a _very_ stripped down perl interpreter ;)
1379 */ 1450 */
… …
1408 */ 1479 */
1409 1480
1410 /* 1481 /*
1411 * If perl-run returns we assume exit() was being called or the coro 1482 * If perl-run returns we assume exit() was being called or the coro
1412 * fell off the end, which seems to be the only valid (non-bug) 1483 * fell off the end, which seems to be the only valid (non-bug)
1413 * reason for perl_run to return. We try to exit by jumping to the 1484 * reason for perl_run to return. We try to mimic whatever perl is normally
1414 * bootstrap-time "top" top_env, as we cannot restore the "main" 1485 * doing in that case. YMMV.
1415 * coroutine as Coro has no such concept.
1416 * This actually isn't valid with the pthread backend, but OSes requiring
1417 * that backend are too broken to do it in a standards-compliant way.
1418 */ 1486 */
1419 PL_top_env = main_top_env; 1487 perlish_exit (aTHX);
1420 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1421 } 1488 }
1422} 1489}
1423 1490
1424static coro_cctx * 1491static coro_cctx *
1425cctx_new () 1492cctx_new (void)
1426{ 1493{
1427 coro_cctx *cctx; 1494 coro_cctx *cctx;
1428 1495
1429 ++cctx_count; 1496 ++cctx_count;
1430 New (0, cctx, 1, coro_cctx); 1497 New (0, cctx, 1, coro_cctx);
… …
1436 return cctx; 1503 return cctx;
1437} 1504}
1438 1505
1439/* create a new cctx only suitable as source */ 1506/* create a new cctx only suitable as source */
1440static coro_cctx * 1507static coro_cctx *
1441cctx_new_empty () 1508cctx_new_empty (void)
1442{ 1509{
1443 coro_cctx *cctx = cctx_new (); 1510 coro_cctx *cctx = cctx_new ();
1444 1511
1445 cctx->sptr = 0; 1512 cctx->stack.sptr = 0;
1446 coro_create (&cctx->cctx, 0, 0, 0, 0); 1513 coro_create (&cctx->cctx, 0, 0, 0, 0);
1447 1514
1448 return cctx; 1515 return cctx;
1449} 1516}
1450 1517
1451/* create a new cctx suitable as destination/running a perl interpreter */ 1518/* create a new cctx suitable as destination/running a perl interpreter */
1452static coro_cctx * 1519static coro_cctx *
1453cctx_new_run () 1520cctx_new_run (void)
1454{ 1521{
1455 coro_cctx *cctx = cctx_new (); 1522 coro_cctx *cctx = cctx_new ();
1456 void *stack_start;
1457 size_t stack_size;
1458 1523
1459#if HAVE_MMAP 1524 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1460 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1461 /* mmap supposedly does allocate-on-write for us */
1462 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1463
1464 if (cctx->sptr != (void *)-1)
1465 {
1466 #if CORO_STACKGUARD
1467 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1468 #endif
1469 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1470 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1471 cctx->flags |= CC_MAPPED;
1472 } 1525 {
1473 else
1474#endif
1475 {
1476 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1477 New (0, cctx->sptr, cctx_stacksize, long);
1478
1479 if (!cctx->sptr)
1480 {
1481 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1526 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1482 _exit (EXIT_FAILURE); 1527 _exit (EXIT_FAILURE);
1483 }
1484
1485 stack_start = cctx->sptr;
1486 stack_size = cctx->ssize;
1487 } 1528 }
1488 1529
1489 #if CORO_USE_VALGRIND
1490 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1491 #endif
1492
1493 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1530 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1494 1531
1495 return cctx; 1532 return cctx;
1496} 1533}
1497 1534
1498static void 1535static void
… …
1504 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1541 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1505 1542
1506 --cctx_count; 1543 --cctx_count;
1507 coro_destroy (&cctx->cctx); 1544 coro_destroy (&cctx->cctx);
1508 1545
1509 /* coro_transfer creates new, empty cctx's */ 1546 coro_stack_free (&cctx->stack);
1510 if (cctx->sptr)
1511 {
1512 #if CORO_USE_VALGRIND
1513 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1514 #endif
1515
1516#if HAVE_MMAP
1517 if (cctx->flags & CC_MAPPED)
1518 munmap (cctx->sptr, cctx->ssize);
1519 else
1520#endif
1521 Safefree (cctx->sptr);
1522 }
1523 1547
1524 Safefree (cctx); 1548 Safefree (cctx);
1525} 1549}
1526 1550
1527/* wether this cctx should be destructed */ 1551/* wether this cctx should be destructed */
1528#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1552#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1529 1553
1530static coro_cctx * 1554static coro_cctx *
1531cctx_get (pTHX) 1555cctx_get (pTHX)
1532{ 1556{
1533 while (expect_true (cctx_first)) 1557 while (ecb_expect_true (cctx_first))
1534 { 1558 {
1535 coro_cctx *cctx = cctx_first; 1559 coro_cctx *cctx = cctx_first;
1536 cctx_first = cctx->next; 1560 cctx_first = cctx->next;
1537 --cctx_idle; 1561 --cctx_idle;
1538 1562
1539 if (expect_true (!CCTX_EXPIRED (cctx))) 1563 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1540 return cctx; 1564 return cctx;
1541 1565
1542 cctx_destroy (cctx); 1566 cctx_destroy (cctx);
1543 } 1567 }
1544 1568
… …
1546} 1570}
1547 1571
1548static void 1572static void
1549cctx_put (coro_cctx *cctx) 1573cctx_put (coro_cctx *cctx)
1550{ 1574{
1551 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1575 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1552 1576
1553 /* free another cctx if overlimit */ 1577 /* free another cctx if overlimit */
1554 if (expect_false (cctx_idle >= cctx_max_idle)) 1578 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1555 { 1579 {
1556 coro_cctx *first = cctx_first; 1580 coro_cctx *first = cctx_first;
1557 cctx_first = first->next; 1581 cctx_first = first->next;
1558 --cctx_idle; 1582 --cctx_idle;
1559 1583
… …
1570static void 1594static void
1571transfer_check (pTHX_ struct coro *prev, struct coro *next) 1595transfer_check (pTHX_ struct coro *prev, struct coro *next)
1572{ 1596{
1573 /* TODO: throwing up here is considered harmful */ 1597 /* TODO: throwing up here is considered harmful */
1574 1598
1575 if (expect_true (prev != next)) 1599 if (ecb_expect_true (prev != next))
1576 { 1600 {
1577 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1601 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1578 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1602 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1579 1603
1580 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1604 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1581 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1605 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1582 1606
1583#if !PERL_VERSION_ATLEAST (5,10,0) 1607#if !PERL_VERSION_ATLEAST (5,10,0)
1584 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1608 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1585 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1609 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1586#endif 1610#endif
1587 } 1611 }
1588} 1612}
1589 1613
1590/* always use the TRANSFER macro */ 1614/* always use the TRANSFER macro */
1591static void NOINLINE /* noinline so we have a fixed stackframe */ 1615static void ecb_noinline /* noinline so we have a fixed stackframe */
1592transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1616transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1593{ 1617{
1594 dSTACKLEVEL; 1618 dSTACKLEVEL;
1595 1619
1596 /* sometimes transfer is only called to set idle_sp */ 1620 /* sometimes transfer is only called to set idle_sp */
1597 if (expect_false (!prev)) 1621 if (ecb_expect_false (!prev))
1598 { 1622 {
1599 cctx_current->idle_sp = STACKLEVEL; 1623 cctx_current->idle_sp = STACKLEVEL;
1600 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1624 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1601 } 1625 }
1602 else if (expect_true (prev != next)) 1626 else if (ecb_expect_true (prev != next))
1603 { 1627 {
1604 coro_cctx *cctx_prev; 1628 coro_cctx *cctx_prev;
1605 1629
1606 if (expect_false (prev->flags & CF_NEW)) 1630 if (ecb_expect_false (prev->flags & CF_NEW))
1607 { 1631 {
1608 /* create a new empty/source context */ 1632 /* create a new empty/source context */
1609 prev->flags &= ~CF_NEW; 1633 prev->flags &= ~CF_NEW;
1610 prev->flags |= CF_RUNNING; 1634 prev->flags |= CF_RUNNING;
1611 } 1635 }
… …
1614 next->flags |= CF_RUNNING; 1638 next->flags |= CF_RUNNING;
1615 1639
1616 /* first get rid of the old state */ 1640 /* first get rid of the old state */
1617 save_perl (aTHX_ prev); 1641 save_perl (aTHX_ prev);
1618 1642
1619 if (expect_false (next->flags & CF_NEW)) 1643 if (ecb_expect_false (next->flags & CF_NEW))
1620 { 1644 {
1621 /* need to start coroutine */ 1645 /* need to start coroutine */
1622 next->flags &= ~CF_NEW; 1646 next->flags &= ~CF_NEW;
1623 /* setup coroutine call */ 1647 /* setup coroutine call */
1624 init_perl (aTHX_ next); 1648 init_perl (aTHX_ next);
1625 } 1649 }
1626 else 1650 else
1627 load_perl (aTHX_ next); 1651 load_perl (aTHX_ next);
1628 1652
1629 /* possibly untie and reuse the cctx */ 1653 /* possibly untie and reuse the cctx */
1630 if (expect_true ( 1654 if (ecb_expect_true (
1631 cctx_current->idle_sp == STACKLEVEL 1655 cctx_current->idle_sp == STACKLEVEL
1632 && !(cctx_current->flags & CC_TRACE) 1656 && !(cctx_current->flags & CC_TRACE)
1633 && !force_cctx 1657 && !force_cctx
1634 )) 1658 ))
1635 { 1659 {
1636 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1660 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1637 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1661 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1638 1662
1639 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1663 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1640 /* without this the next cctx_get might destroy the running cctx while still in use */ 1664 /* without this the next cctx_get might destroy the running cctx while still in use */
1641 if (expect_false (CCTX_EXPIRED (cctx_current))) 1665 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1642 if (expect_true (!next->cctx)) 1666 if (ecb_expect_true (!next->cctx))
1643 next->cctx = cctx_get (aTHX); 1667 next->cctx = cctx_get (aTHX);
1644 1668
1645 cctx_put (cctx_current); 1669 cctx_put (cctx_current);
1646 } 1670 }
1647 else 1671 else
1648 prev->cctx = cctx_current; 1672 prev->cctx = cctx_current;
1649 1673
1650 ++next->usecount; 1674 ++next->usecount;
1651 1675
1652 cctx_prev = cctx_current; 1676 cctx_prev = cctx_current;
1653 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1677 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1654 1678
1655 next->cctx = 0; 1679 next->cctx = 0;
1656 1680
1657 if (expect_false (cctx_prev != cctx_current)) 1681 if (ecb_expect_false (cctx_prev != cctx_current))
1658 { 1682 {
1659 cctx_prev->top_env = PL_top_env; 1683 cctx_prev->top_env = PL_top_env;
1660 PL_top_env = cctx_current->top_env; 1684 PL_top_env = cctx_current->top_env;
1661 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1685 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1662 } 1686 }
… …
1668#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1692#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1669#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1693#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1670 1694
1671/** high level stuff ********************************************************/ 1695/** high level stuff ********************************************************/
1672 1696
1697/* this function is actually Coro, not Coro::State, but we call it from here */
1698/* because it is convenient - but it hasn't been declared yet for that reason */
1699static void
1700coro_call_on_destroy (pTHX_ struct coro *coro);
1701
1673static void 1702static void
1674coro_state_destroy (pTHX_ struct coro *coro) 1703coro_state_destroy (pTHX_ struct coro *coro)
1675{ 1704{
1676 if (coro->flags & CF_DESTROYED) 1705 if (coro->flags & CF_ZOMBIE)
1677 return; 1706 return;
1678 1707
1679 /* this callback is reserved for slf functions needing to do cleanup */
1680 if (coro->on_destroy && !PL_dirty)
1681 coro->on_destroy (aTHX_ coro); 1708 slf_destroy (aTHX_ coro);
1682 1709
1683 /*
1684 * The on_destroy above most likely is from an SLF call.
1685 * Since by definition the SLF call will not finish when we destroy
1686 * the coro, we will have to force-finish it here, otherwise
1687 * cleanup functions cannot call SLF functions.
1688 */
1689 coro->slf_frame.prepare = 0;
1690
1691 coro->flags |= CF_DESTROYED; 1710 coro->flags |= CF_ZOMBIE;
1692 1711
1693 if (coro->flags & CF_READY) 1712 if (coro->flags & CF_READY)
1694 { 1713 {
1695 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1714 /* reduce nready, as destroying a ready coro effectively unreadies it */
1696 /* alternative: look through all ready queues and remove the coro */ 1715 /* alternative: look through all ready queues and remove the coro */
1697 --coro_nready; 1716 --coro_nready;
1698 } 1717 }
1699 else 1718 else
1700 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1719 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1720
1721 if (coro->next) coro->next->prev = coro->prev;
1722 if (coro->prev) coro->prev->next = coro->next;
1723 if (coro == coro_first) coro_first = coro->next;
1701 1724
1702 if (coro->mainstack 1725 if (coro->mainstack
1703 && coro->mainstack != main_mainstack 1726 && coro->mainstack != main_mainstack
1704 && coro->slot 1727 && coro->slot
1705 && !PL_dirty) 1728 && !PL_dirty)
1706 destroy_perl (aTHX_ coro); 1729 destroy_perl (aTHX_ coro);
1707 1730
1708 if (coro->next) coro->next->prev = coro->prev;
1709 if (coro->prev) coro->prev->next = coro->next;
1710 if (coro == coro_first) coro_first = coro->next;
1711
1712 cctx_destroy (coro->cctx); 1731 cctx_destroy (coro->cctx);
1713 SvREFCNT_dec (coro->startcv); 1732 SvREFCNT_dec (coro->startcv);
1714 SvREFCNT_dec (coro->args); 1733 SvREFCNT_dec (coro->args);
1715 SvREFCNT_dec (coro->swap_sv); 1734 SvREFCNT_dec (coro->swap_sv);
1716 SvREFCNT_dec (CORO_THROW); 1735 SvREFCNT_dec (CORO_THROW);
1736
1737 coro_call_on_destroy (aTHX_ coro);
1738
1739 /* more destruction mayhem in coro_state_free */
1717} 1740}
1718 1741
1719static int 1742static int
1720coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1743coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1721{ 1744{
1722 struct coro *coro = (struct coro *)mg->mg_ptr; 1745 struct coro *coro = (struct coro *)mg->mg_ptr;
1723 mg->mg_ptr = 0; 1746 mg->mg_ptr = 0;
1724 1747
1725 coro->hv = 0;
1726
1727 if (--coro->refcnt < 0)
1728 {
1729 coro_state_destroy (aTHX_ coro); 1748 coro_state_destroy (aTHX_ coro);
1749 SvREFCNT_dec (coro->on_destroy);
1750 SvREFCNT_dec (coro->status);
1751
1730 Safefree (coro); 1752 Safefree (coro);
1731 }
1732 1753
1733 return 0; 1754 return 0;
1734} 1755}
1735 1756
1736static int 1757static int ecb_cold
1737coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1758coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1738{ 1759{
1739 struct coro *coro = (struct coro *)mg->mg_ptr; 1760 /* called when perl clones the current process the slow way (windows process emulation) */
1740 1761 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1741 ++coro->refcnt; 1762 mg->mg_ptr = 0;
1763 mg->mg_virtual = 0;
1742 1764
1743 return 0; 1765 return 0;
1744} 1766}
1745 1767
1746static MGVTBL coro_state_vtbl = { 1768static MGVTBL coro_state_vtbl = {
… …
1771 TRANSFER (ta, 1); 1793 TRANSFER (ta, 1);
1772} 1794}
1773 1795
1774/** Coro ********************************************************************/ 1796/** Coro ********************************************************************/
1775 1797
1776INLINE void 1798ecb_inline void
1777coro_enq (pTHX_ struct coro *coro) 1799coro_enq (pTHX_ struct coro *coro)
1778{ 1800{
1779 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1801 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1780 1802
1781 SvREFCNT_inc_NN (coro->hv); 1803 SvREFCNT_inc_NN (coro->hv);
… …
1783 coro->next_ready = 0; 1805 coro->next_ready = 0;
1784 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1806 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1785 ready [1] = coro; 1807 ready [1] = coro;
1786} 1808}
1787 1809
1788INLINE struct coro * 1810ecb_inline struct coro *
1789coro_deq (pTHX) 1811coro_deq (pTHX)
1790{ 1812{
1791 int prio; 1813 int prio;
1792 1814
1793 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1815 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1846{ 1868{
1847 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1869 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1848} 1870}
1849 1871
1850/* expects to own a reference to next->hv */ 1872/* expects to own a reference to next->hv */
1851INLINE void 1873ecb_inline void
1852prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1874prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1853{ 1875{
1854 SV *prev_sv = SvRV (coro_current); 1876 SV *prev_sv = SvRV (coro_current);
1855 1877
1856 ta->prev = SvSTATE_hv (prev_sv); 1878 ta->prev = SvSTATE_hv (prev_sv);
… …
1869{ 1891{
1870 for (;;) 1892 for (;;)
1871 { 1893 {
1872 struct coro *next = coro_deq (aTHX); 1894 struct coro *next = coro_deq (aTHX);
1873 1895
1874 if (expect_true (next)) 1896 if (ecb_expect_true (next))
1875 { 1897 {
1876 /* cannot transfer to destroyed coros, skip and look for next */ 1898 /* cannot transfer to destroyed coros, skip and look for next */
1877 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1899 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1878 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1900 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1879 else 1901 else
1880 { 1902 {
1881 next->flags &= ~CF_READY; 1903 next->flags &= ~CF_READY;
1882 --coro_nready; 1904 --coro_nready;
… …
1915 } 1937 }
1916 } 1938 }
1917 } 1939 }
1918} 1940}
1919 1941
1920INLINE void 1942ecb_inline void
1921prepare_cede (pTHX_ struct coro_transfer_args *ta) 1943prepare_cede (pTHX_ struct coro_transfer_args *ta)
1922{ 1944{
1923 api_ready (aTHX_ coro_current); 1945 api_ready (aTHX_ coro_current);
1924 prepare_schedule (aTHX_ ta); 1946 prepare_schedule (aTHX_ ta);
1925} 1947}
1926 1948
1927INLINE void 1949ecb_inline void
1928prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1950prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1929{ 1951{
1930 SV *prev = SvRV (coro_current); 1952 SV *prev = SvRV (coro_current);
1931 1953
1932 if (coro_nready) 1954 if (coro_nready)
… …
1962{ 1984{
1963 struct coro_transfer_args ta; 1985 struct coro_transfer_args ta;
1964 1986
1965 prepare_cede (aTHX_ &ta); 1987 prepare_cede (aTHX_ &ta);
1966 1988
1967 if (expect_true (ta.prev != ta.next)) 1989 if (ecb_expect_true (ta.prev != ta.next))
1968 { 1990 {
1969 TRANSFER (ta, 1); 1991 TRANSFER (ta, 1);
1970 return 1; 1992 return 1;
1971 } 1993 }
1972 else 1994 else
… …
2015 coro->slot->runops = RUNOPS_DEFAULT; 2037 coro->slot->runops = RUNOPS_DEFAULT;
2016 } 2038 }
2017} 2039}
2018 2040
2019static void 2041static void
2042coro_push_av (pTHX_ AV *av, I32 gimme_v)
2043{
2044 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2045 {
2046 dSP;
2047
2048 if (gimme_v == G_SCALAR)
2049 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2050 else
2051 {
2052 int i;
2053 EXTEND (SP, AvFILLp (av) + 1);
2054
2055 for (i = 0; i <= AvFILLp (av); ++i)
2056 PUSHs (AvARRAY (av)[i]);
2057 }
2058
2059 PUTBACK;
2060 }
2061}
2062
2063static void
2064coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2065{
2066 if (!coro->on_destroy)
2067 coro->on_destroy = newAV ();
2068
2069 av_push (coro->on_destroy, cb);
2070}
2071
2072static void
2073slf_destroy_join (pTHX_ struct CoroSLF *frame)
2074{
2075 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2076}
2077
2078static int
2079slf_check_join (pTHX_ struct CoroSLF *frame)
2080{
2081 struct coro *coro = (struct coro *)frame->data;
2082
2083 if (!coro->status)
2084 return 1;
2085
2086 frame->destroy = 0;
2087
2088 coro_push_av (aTHX_ coro->status, GIMME_V);
2089
2090 SvREFCNT_dec ((SV *)coro->hv);
2091
2092 return 0;
2093}
2094
2095static void
2096slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2097{
2098 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2099
2100 if (items > 1)
2101 croak ("join called with too many arguments");
2102
2103 if (coro->status)
2104 frame->prepare = prepare_nop;
2105 else
2106 {
2107 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2108 frame->prepare = prepare_schedule;
2109 }
2110
2111 frame->check = slf_check_join;
2112 frame->destroy = slf_destroy_join;
2113 frame->data = (void *)coro;
2114 SvREFCNT_inc (coro->hv);
2115}
2116
2117static void
2020coro_call_on_destroy (pTHX_ struct coro *coro) 2118coro_call_on_destroy (pTHX_ struct coro *coro)
2021{ 2119{
2022 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2120 AV *od = coro->on_destroy;
2023 2121
2024 if (on_destroyp) 2122 if (!od)
2025 { 2123 return;
2026 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2027 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2028 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2029 2124
2125 coro->on_destroy = 0;
2126 sv_2mortal ((SV *)od);
2127
2030 while (AvFILLp (on_destroy) >= 0) 2128 while (AvFILLp (od) >= 0)
2129 {
2130 SV *cb = sv_2mortal (av_pop (od));
2131
2132 /* coro hv's (and only hv's at the moment) are supported as well */
2133 if (SvSTATEhv_p (aTHX_ cb))
2134 api_ready (aTHX_ cb);
2135 else
2031 { 2136 {
2032 dSP; /* don't disturb outer sp */ 2137 dSP; /* don't disturb outer sp */
2033 SV *cb = av_pop (on_destroy);
2034
2035 PUSHMARK (SP); 2138 PUSHMARK (SP);
2036 2139
2037 if (statusp) 2140 if (coro->status)
2038 { 2141 {
2039 int i; 2142 PUTBACK;
2040 EXTEND (SP, AvFILLp (status) + 1); 2143 coro_push_av (aTHX_ coro->status, G_ARRAY);
2041 2144 SPAGAIN;
2042 for (i = 0; i <= AvFILLp (status); ++i)
2043 PUSHs (AvARRAY (status)[i]);
2044 } 2145 }
2045 2146
2046 PUTBACK; 2147 PUTBACK;
2047 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2148 call_sv (cb, G_VOID | G_DISCARD);
2048 } 2149 }
2049 } 2150 }
2050} 2151}
2051 2152
2052static void 2153static void
2053coro_set_status (HV *coro_hv, SV **arg, int items) 2154coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2054{ 2155{
2055 AV *av = newAV (); 2156 AV *av;
2157
2158 if (coro->status)
2159 {
2160 av = coro->status;
2161 av_clear (av);
2162 }
2163 else
2164 av = coro->status = newAV ();
2056 2165
2057 /* items are actually not so common, so optimise for this case */ 2166 /* items are actually not so common, so optimise for this case */
2058 if (items) 2167 if (items)
2059 { 2168 {
2060 int i; 2169 int i;
… …
2062 av_extend (av, items - 1); 2171 av_extend (av, items - 1);
2063 2172
2064 for (i = 0; i < items; ++i) 2173 for (i = 0; i < items; ++i)
2065 av_push (av, SvREFCNT_inc_NN (arg [i])); 2174 av_push (av, SvREFCNT_inc_NN (arg [i]));
2066 } 2175 }
2067
2068 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2069} 2176}
2070 2177
2071static void 2178static void
2072slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2179slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2073{ 2180{
… …
2085static void 2192static void
2086slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2193slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2087{ 2194{
2088 HV *coro_hv = (HV *)SvRV (coro_current); 2195 HV *coro_hv = (HV *)SvRV (coro_current);
2089 2196
2090 coro_set_status (coro_hv, arg, items); 2197 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2091 slf_init_terminate_cancel_common (frame, coro_hv); 2198 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2092} 2199}
2093 2200
2094static void 2201static void
2095slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2202slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2096{ 2203{
… …
2101 croak ("Coro::cancel called without coro object,"); 2208 croak ("Coro::cancel called without coro object,");
2102 2209
2103 coro = SvSTATE (arg [0]); 2210 coro = SvSTATE (arg [0]);
2104 coro_hv = coro->hv; 2211 coro_hv = coro->hv;
2105 2212
2106 coro_set_status (coro_hv, arg + 1, items - 1); 2213 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2107 2214
2108 if (expect_false (coro->flags & CF_NOCANCEL)) 2215 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2109 { 2216 {
2110 /* coro currently busy cancelling something, so just notify it */ 2217 /* coro currently busy cancelling something, so just notify it */
2111 coro->slf_frame.data = (void *)coro; 2218 coro->slf_frame.data = (void *)coro;
2112 2219
2113 frame->prepare = prepare_nop; 2220 frame->prepare = prepare_nop;
2114 frame->check = slf_check_nop; 2221 frame->check = slf_check_nop;
2115 } 2222 }
2116 else if (coro_hv == (HV *)SvRV (coro_current)) 2223 else if (coro_hv == (HV *)SvRV (coro_current))
2117 { 2224 {
2118 /* cancelling the current coro is allowed, and equals terminate */ 2225 /* cancelling the current coro is allowed, and equals terminate */
2119 slf_init_terminate_cancel_common (frame, coro_hv); 2226 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2120 } 2227 }
2121 else 2228 else
2122 { 2229 {
2123 struct coro *self = SvSTATE_current; 2230 struct coro *self = SvSTATE_current;
2124 2231
… …
2128 * this is ugly, and hopefully fully worth the extra speed. 2235 * this is ugly, and hopefully fully worth the extra speed.
2129 * besides, I can't get the slow-but-safe version working... 2236 * besides, I can't get the slow-but-safe version working...
2130 */ 2237 */
2131 slf_frame.data = 0; 2238 slf_frame.data = 0;
2132 self->flags |= CF_NOCANCEL; 2239 self->flags |= CF_NOCANCEL;
2133
2134 coro_state_destroy (aTHX_ coro); 2240 coro_state_destroy (aTHX_ coro);
2135 coro_call_on_destroy (aTHX_ coro);
2136
2137 self->flags &= ~CF_NOCANCEL; 2241 self->flags &= ~CF_NOCANCEL;
2138 2242
2139 if (slf_frame.data) 2243 if (slf_frame.data)
2140 { 2244 {
2141 /* while we were busy we have been cancelled, so terminate */ 2245 /* while we were busy we have been cancelled, so terminate */
2142 slf_init_terminate_cancel_common (frame, self->hv); 2246 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2143 } 2247 }
2144 else 2248 else
2145 { 2249 {
2146 frame->prepare = prepare_nop; 2250 frame->prepare = prepare_nop;
2147 frame->check = slf_check_nop; 2251 frame->check = slf_check_nop;
2148 } 2252 }
2149 } 2253 }
2150} 2254}
2151 2255
2256static int
2257slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2258{
2259 frame->prepare = 0;
2260 coro_unwind_stacks (aTHX);
2261
2262 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2263
2264 return 1;
2265}
2266
2267static int
2268safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2269{
2270 if (coro->cctx)
2271 croak ("coro inside C callback, unable to cancel at this time, caught");
2272
2273 if (coro->flags & CF_NEW)
2274 {
2275 coro_set_status (aTHX_ coro, arg, items);
2276 coro_state_destroy (aTHX_ coro);
2277 }
2278 else
2279 {
2280 if (!coro->slf_frame.prepare)
2281 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2282
2283 slf_destroy (aTHX_ coro);
2284
2285 coro_set_status (aTHX_ coro, arg, items);
2286 coro->slf_frame.prepare = prepare_nop;
2287 coro->slf_frame.check = slf_check_safe_cancel;
2288
2289 api_ready (aTHX_ (SV *)coro->hv);
2290 }
2291
2292 return 1;
2293}
2294
2152/*****************************************************************************/ 2295/*****************************************************************************/
2153/* async pool handler */ 2296/* async pool handler */
2154 2297
2155static int 2298static int
2156slf_check_pool_handler (pTHX_ struct CoroSLF *frame) 2299slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
… …
2185slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2328slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2186{ 2329{
2187 HV *hv = (HV *)SvRV (coro_current); 2330 HV *hv = (HV *)SvRV (coro_current);
2188 struct coro *coro = SvSTATE_hv ((SV *)hv); 2331 struct coro *coro = SvSTATE_hv ((SV *)hv);
2189 2332
2190 if (expect_true (coro->saved_deffh)) 2333 if (ecb_expect_true (coro->saved_deffh))
2191 { 2334 {
2192 /* subsequent iteration */ 2335 /* subsequent iteration */
2193 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2336 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2194 coro->saved_deffh = 0; 2337 coro->saved_deffh = 0;
2195 2338
2196 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2339 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2197 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2340 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2198 { 2341 {
2199 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2342 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2200 coro->invoke_av = newAV (); 2343 return;
2201
2202 frame->prepare = prepare_nop;
2203 } 2344 }
2204 else 2345 else
2205 { 2346 {
2206 av_clear (GvAV (PL_defgv)); 2347 av_clear (GvAV (PL_defgv));
2207 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2348 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2257 2398
2258static int 2399static int
2259slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2400slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2260{ 2401{
2261 SV *data = (SV *)frame->data; 2402 SV *data = (SV *)frame->data;
2262 2403
2263 if (CORO_THROW) 2404 if (CORO_THROW)
2264 return 0; 2405 return 0;
2265 2406
2266 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2407 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2267 return 1; 2408 return 1;
… …
2303 cb = sv_2mortal (coro->rouse_cb); 2444 cb = sv_2mortal (coro->rouse_cb);
2304 coro->rouse_cb = 0; 2445 coro->rouse_cb = 0;
2305 } 2446 }
2306 2447
2307 if (!SvROK (cb) 2448 if (!SvROK (cb)
2308 || SvTYPE (SvRV (cb)) != SVt_PVCV 2449 || SvTYPE (SvRV (cb)) != SVt_PVCV
2309 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2450 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2310 croak ("Coro::rouse_wait called with illegal callback argument,"); 2451 croak ("Coro::rouse_wait called with illegal callback argument,");
2311 2452
2312 { 2453 {
2313 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2454 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2430static void 2571static void
2431slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2572slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2432{ 2573{
2433 frame->prepare = prepare_cede_notself; 2574 frame->prepare = prepare_cede_notself;
2434 frame->check = slf_check_nop; 2575 frame->check = slf_check_nop;
2576}
2577
2578/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2579static void
2580slf_destroy (pTHX_ struct coro *coro)
2581{
2582 /* this callback is reserved for slf functions needing to do cleanup */
2583 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2584 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2585
2586 /*
2587 * The on_destroy above most likely is from an SLF call.
2588 * Since by definition the SLF call will not finish when we destroy
2589 * the coro, we will have to force-finish it here, otherwise
2590 * cleanup functions cannot call SLF functions.
2591 */
2592 coro->slf_frame.prepare = 0;
2435} 2593}
2436 2594
2437/* 2595/*
2438 * these not obviously related functions are all rolled into one 2596 * these not obviously related functions are all rolled into one
2439 * function to increase chances that they all will call transfer with the same 2597 * function to increase chances that they all will call transfer with the same
… …
2446 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2604 I32 checkmark; /* mark SP to see how many elements check has pushed */
2447 2605
2448 /* set up the slf frame, unless it has already been set-up */ 2606 /* set up the slf frame, unless it has already been set-up */
2449 /* the latter happens when a new coro has been started */ 2607 /* the latter happens when a new coro has been started */
2450 /* or when a new cctx was attached to an existing coroutine */ 2608 /* or when a new cctx was attached to an existing coroutine */
2451 if (expect_true (!slf_frame.prepare)) 2609 if (ecb_expect_true (!slf_frame.prepare))
2452 { 2610 {
2453 /* first iteration */ 2611 /* first iteration */
2454 dSP; 2612 dSP;
2455 SV **arg = PL_stack_base + TOPMARK + 1; 2613 SV **arg = PL_stack_base + TOPMARK + 1;
2456 int items = SP - arg; /* args without function object */ 2614 int items = SP - arg; /* args without function object */
… …
2497 while (slf_frame.check (aTHX_ &slf_frame)); 2655 while (slf_frame.check (aTHX_ &slf_frame));
2498 2656
2499 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2657 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2500 2658
2501 /* exception handling */ 2659 /* exception handling */
2502 if (expect_false (CORO_THROW)) 2660 if (ecb_expect_false (CORO_THROW))
2503 { 2661 {
2504 SV *exception = sv_2mortal (CORO_THROW); 2662 SV *exception = sv_2mortal (CORO_THROW);
2505 2663
2506 CORO_THROW = 0; 2664 CORO_THROW = 0;
2507 sv_setsv (ERRSV, exception); 2665 sv_setsv (ERRSV, exception);
2508 croak (0); 2666 croak (0);
2509 } 2667 }
2510 2668
2511 /* return value handling - mostly like entersub */ 2669 /* return value handling - mostly like entersub */
2512 /* make sure we put something on the stack in scalar context */ 2670 /* make sure we put something on the stack in scalar context */
2513 if (GIMME_V == G_SCALAR) 2671 if (GIMME_V == G_SCALAR
2672 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2514 { 2673 {
2515 dSP; 2674 dSP;
2516 SV **bot = PL_stack_base + checkmark; 2675 SV **bot = PL_stack_base + checkmark;
2517 2676
2518 if (sp == bot) /* too few, push undef */ 2677 if (sp == bot) /* too few, push undef */
2519 bot [1] = &PL_sv_undef; 2678 bot [1] = &PL_sv_undef;
2520 else if (sp != bot + 1) /* too many, take last one */ 2679 else /* too many, take last one */
2521 bot [1] = *sp; 2680 bot [1] = *sp;
2522 2681
2523 SP = bot + 1; 2682 SP = bot + 1;
2524 2683
2525 PUTBACK; 2684 PUTBACK;
… …
2632{ 2791{
2633 PerlIOBuf base; 2792 PerlIOBuf base;
2634 NV next, every; 2793 NV next, every;
2635} PerlIOCede; 2794} PerlIOCede;
2636 2795
2637static IV 2796static IV ecb_cold
2638PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2797PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2639{ 2798{
2640 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2799 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2641 2800
2642 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2801 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2643 self->next = nvtime () + self->every; 2802 self->next = nvtime () + self->every;
2644 2803
2645 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2804 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2646} 2805}
2647 2806
2648static SV * 2807static SV * ecb_cold
2649PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2808PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2650{ 2809{
2651 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2810 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2652 2811
2653 return newSVnv (self->every); 2812 return newSVnv (self->every);
… …
2765 SvREFCNT_dec (cb); 2924 SvREFCNT_dec (cb);
2766 } 2925 }
2767} 2926}
2768 2927
2769static void 2928static void
2770coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2929coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2771{ 2930{
2772 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2931 /* call $sem->adjust (0) to possibly wake up some other waiters */
2773 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2932 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2774} 2933}
2775 2934
2776static int 2935static int
2777slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2936slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2778{ 2937{
2779 AV *av = (AV *)frame->data; 2938 AV *av = (AV *)frame->data;
2780 SV *count_sv = AvARRAY (av)[0]; 2939 SV *count_sv = AvARRAY (av)[0];
2940 SV *coro_hv = SvRV (coro_current);
2781 2941
2782 /* if we are about to throw, don't actually acquire the lock, just throw */ 2942 /* if we are about to throw, don't actually acquire the lock, just throw */
2783 if (CORO_THROW) 2943 if (CORO_THROW)
2784 return 0; 2944 return 0;
2785 else if (SvIVX (count_sv) > 0) 2945 else if (SvIVX (count_sv) > 0)
2786 { 2946 {
2787 SvSTATE_current->on_destroy = 0; 2947 frame->destroy = 0;
2788 2948
2789 if (acquire) 2949 if (acquire)
2790 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2950 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2791 else 2951 else
2792 coro_semaphore_adjust (aTHX_ av, 0); 2952 coro_semaphore_adjust (aTHX_ av, 0);
… …
2797 { 2957 {
2798 int i; 2958 int i;
2799 /* if we were woken up but can't down, we look through the whole */ 2959 /* if we were woken up but can't down, we look through the whole */
2800 /* waiters list and only add us if we aren't in there already */ 2960 /* waiters list and only add us if we aren't in there already */
2801 /* this avoids some degenerate memory usage cases */ 2961 /* this avoids some degenerate memory usage cases */
2802 2962 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2803 for (i = 1; i <= AvFILLp (av); ++i)
2804 if (AvARRAY (av)[i] == SvRV (coro_current)) 2963 if (AvARRAY (av)[i] == coro_hv)
2805 return 1; 2964 return 1;
2806 2965
2807 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2966 av_push (av, SvREFCNT_inc (coro_hv));
2808 return 1; 2967 return 1;
2809 } 2968 }
2810} 2969}
2811 2970
2812static int 2971static int
… …
2835 { 2994 {
2836 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2995 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2837 2996
2838 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2997 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2839 frame->prepare = prepare_schedule; 2998 frame->prepare = prepare_schedule;
2840
2841 /* to avoid race conditions when a woken-up coro gets terminated */ 2999 /* to avoid race conditions when a woken-up coro gets terminated */
2842 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3000 /* we arrange for a temporary on_destroy that calls adjust (0) */
2843 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3001 frame->destroy = coro_semaphore_destroy;
2844 } 3002 }
2845} 3003}
2846 3004
2847static void 3005static void
2848slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3006slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
3017 /* it quickly returns */ 3175 /* it quickly returns */
3018 if (CORO_THROW) 3176 if (CORO_THROW)
3019 return 0; 3177 return 0;
3020 3178
3021 /* one element that is an RV? repeat! */ 3179 /* one element that is an RV? repeat! */
3022 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3180 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3023 return 1; 3181 return 1;
3024 3182
3025 /* restore status */ 3183 /* restore status */
3026 { 3184 {
3027 SV *data_sv = av_pop (state); 3185 SV *data_sv = av_pop (state);
… …
3066 dSP; 3224 dSP;
3067 3225
3068 static SV *prio_cv; 3226 static SV *prio_cv;
3069 static SV *prio_sv; 3227 static SV *prio_sv;
3070 3228
3071 if (expect_false (!prio_cv)) 3229 if (ecb_expect_false (!prio_cv))
3072 { 3230 {
3073 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3231 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3074 prio_sv = newSViv (0); 3232 prio_sv = newSViv (0);
3075 } 3233 }
3076 3234
… …
3182 } 3340 }
3183 3341
3184 return coro_sv; 3342 return coro_sv;
3185} 3343}
3186 3344
3345#ifndef __cplusplus
3346ecb_cold XS(boot_Coro__State);
3347#endif
3348
3349#if CORO_JIT
3350
3351static void ecb_noinline ecb_cold
3352pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3353{
3354 dSP;
3355 AV *av = newAV ();
3356
3357 av_store (av, 3, newSVuv (d));
3358 av_store (av, 2, newSVuv (c));
3359 av_store (av, 1, newSVuv (b));
3360 av_store (av, 0, newSVuv (a));
3361
3362 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3363
3364 PUTBACK;
3365}
3366
3367static void ecb_noinline ecb_cold
3368jit_init (pTHX)
3369{
3370 dSP;
3371 SV *load, *save;
3372 char *map_base;
3373 char *load_ptr, *save_ptr;
3374 STRLEN load_len, save_len, map_len;
3375 int count;
3376
3377 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3378
3379 PUSHMARK (SP);
3380 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3381 #include "state.h"
3382 count = call_pv ("Coro::State::_jit", G_ARRAY);
3383 SPAGAIN;
3384
3385 save = POPs; save_ptr = SvPVbyte (save, save_len);
3386 load = POPs; load_ptr = SvPVbyte (load, load_len);
3387
3388 map_len = load_len + save_len + 16;
3389
3390 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3391
3392 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3393
3394 load_perl_slots = (load_save_perl_slots_type)map_base;
3395 memcpy (map_base, load_ptr, load_len);
3396
3397 map_base += (load_len + 15) & ~15;
3398
3399 save_perl_slots = (load_save_perl_slots_type)map_base;
3400 memcpy (map_base, save_ptr, save_len);
3401
3402 /* we are good citizens and try to make the page read-only, so the evil evil */
3403 /* hackers might have it a bit more difficult */
3404 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3405
3406 PUTBACK;
3407 eval_pv ("undef &Coro::State::_jit", 1);
3408}
3409
3410#endif
3411
3187MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3412MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3188 3413
3189PROTOTYPES: DISABLE 3414PROTOTYPES: DISABLE
3190 3415
3191BOOT: 3416BOOT:
… …
3193#ifdef USE_ITHREADS 3418#ifdef USE_ITHREADS
3194# if CORO_PTHREAD 3419# if CORO_PTHREAD
3195 coro_thx = PERL_GET_CONTEXT; 3420 coro_thx = PERL_GET_CONTEXT;
3196# endif 3421# endif
3197#endif 3422#endif
3198 BOOT_PAGESIZE; 3423 /* perl defines these to check for existance first, but why it doesn't */
3424 /* just create them one at init time is not clear to me, except for */
3425 /* programs trying to delete them, but... */
3426 /* anyway, we declare this as invalid and make sure they are initialised here */
3427 DEFSV;
3428 ERRSV;
3199 3429
3200 cctx_current = cctx_new_empty (); 3430 cctx_current = cctx_new_empty ();
3201 3431
3202 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3432 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3203 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3433 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3246 coroapi.prepare_cede_notself = prepare_cede_notself; 3476 coroapi.prepare_cede_notself = prepare_cede_notself;
3247 3477
3248 time_init (aTHX); 3478 time_init (aTHX);
3249 3479
3250 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3480 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3481#if CORO_JIT
3482 PUTBACK;
3483 jit_init (aTHX);
3484 SPAGAIN;
3485#endif
3251} 3486}
3252 3487
3253SV * 3488SV *
3254new (SV *klass, ...) 3489new (SV *klass, ...)
3255 ALIAS: 3490 ALIAS:
… …
3262void 3497void
3263transfer (...) 3498transfer (...)
3264 PROTOTYPE: $$ 3499 PROTOTYPE: $$
3265 CODE: 3500 CODE:
3266 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3501 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3267
3268void
3269_exit (int code)
3270 PROTOTYPE: $
3271 CODE:
3272 _exit (code);
3273 3502
3274SV * 3503SV *
3275clone (Coro::State coro) 3504clone (Coro::State coro)
3276 CODE: 3505 CODE:
3277{ 3506{
… …
3332void 3561void
3333list () 3562list ()
3334 PROTOTYPE: 3563 PROTOTYPE:
3335 PPCODE: 3564 PPCODE:
3336{ 3565{
3337 struct coro *coro; 3566 struct coro *coro;
3338 for (coro = coro_first; coro; coro = coro->next) 3567 for (coro = coro_first; coro; coro = coro->next)
3339 if (coro->hv) 3568 if (coro->hv)
3340 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3569 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3341} 3570}
3342 3571
… …
3397 PROTOTYPE: $ 3626 PROTOTYPE: $
3398 ALIAS: 3627 ALIAS:
3399 is_ready = CF_READY 3628 is_ready = CF_READY
3400 is_running = CF_RUNNING 3629 is_running = CF_RUNNING
3401 is_new = CF_NEW 3630 is_new = CF_NEW
3402 is_destroyed = CF_DESTROYED 3631 is_destroyed = CF_ZOMBIE
3632 is_zombie = CF_ZOMBIE
3403 is_suspended = CF_SUSPENDED 3633 is_suspended = CF_SUSPENDED
3404 CODE: 3634 CODE:
3405 RETVAL = boolSV (coro->flags & ix); 3635 RETVAL = boolSV (coro->flags & ix);
3406 OUTPUT: 3636 OUTPUT:
3407 RETVAL 3637 RETVAL
3408 3638
3409void 3639void
3410throw (Coro::State self, SV *exception = &PL_sv_undef) 3640throw (SV *self, SV *exception = &PL_sv_undef)
3411 PROTOTYPE: $;$ 3641 PROTOTYPE: $;$
3412 CODE: 3642 CODE:
3413{ 3643{
3644 struct coro *coro = SvSTATE (self);
3414 struct coro *current = SvSTATE_current; 3645 struct coro *current = SvSTATE_current;
3415 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3646 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3416 SvREFCNT_dec (*exceptionp); 3647 SvREFCNT_dec (*exceptionp);
3417 SvGETMAGIC (exception); 3648 SvGETMAGIC (exception);
3418 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3649 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3650
3651 api_ready (aTHX_ self);
3419} 3652}
3420 3653
3421void 3654void
3422api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3655api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3423 PROTOTYPE: $;$ 3656 PROTOTYPE: $;$
… …
3500 3733
3501void 3734void
3502times (Coro::State self) 3735times (Coro::State self)
3503 PPCODE: 3736 PPCODE:
3504{ 3737{
3505 struct coro *current = SvSTATE (coro_current); 3738 struct coro *current = SvSTATE (coro_current);
3506 3739
3507 if (expect_false (current == self)) 3740 if (ecb_expect_false (current == self))
3508 { 3741 {
3509 coro_times_update (); 3742 coro_times_update ();
3510 coro_times_add (SvSTATE (coro_current)); 3743 coro_times_add (SvSTATE (coro_current));
3511 } 3744 }
3512 3745
3513 EXTEND (SP, 2); 3746 EXTEND (SP, 2);
3514 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3747 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3515 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3748 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3516 3749
3517 if (expect_false (current == self)) 3750 if (ecb_expect_false (current == self))
3518 coro_times_sub (SvSTATE (coro_current)); 3751 coro_times_sub (SvSTATE (coro_current));
3519} 3752}
3520 3753
3521void 3754void
3522swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3755swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3543BOOT: 3776BOOT:
3544{ 3777{
3545 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3778 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3546 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3779 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3547 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3780 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3548 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3549 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3781 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3550 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3782 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3551 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3783 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3552 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3784 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3553 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3785 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3554 3786
3555 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3787 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3556 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3788 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3557 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3789 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3558 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3790 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3559 3791
3560 coro_stash = gv_stashpv ("Coro", TRUE); 3792 coro_stash = gv_stashpv ("Coro", TRUE);
3561 3793
3562 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3794 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3563 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3795 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3564 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3796 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3596void 3828void
3597_destroy (Coro::State coro) 3829_destroy (Coro::State coro)
3598 CODE: 3830 CODE:
3599 /* used by the manager thread */ 3831 /* used by the manager thread */
3600 coro_state_destroy (aTHX_ coro); 3832 coro_state_destroy (aTHX_ coro);
3833
3834void
3835on_destroy (Coro::State coro, SV *cb)
3836 CODE:
3601 coro_call_on_destroy (aTHX_ coro); 3837 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3838
3839void
3840join (...)
3841 CODE:
3842 CORO_EXECUTE_SLF_XS (slf_init_join);
3602 3843
3603void 3844void
3604terminate (...) 3845terminate (...)
3605 CODE: 3846 CODE:
3606 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3847 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3607 3848
3608void 3849void
3609cancel (...) 3850cancel (...)
3610 CODE: 3851 CODE:
3611 CORO_EXECUTE_SLF_XS (slf_init_cancel); 3852 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3853
3854int
3855safe_cancel (Coro::State self, ...)
3856 C_ARGS: aTHX_ self, &ST (1), items - 1
3612 3857
3613void 3858void
3614schedule (...) 3859schedule (...)
3615 CODE: 3860 CODE:
3616 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3861 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3773 on_leave = 1 4018 on_leave = 1
3774 PROTOTYPE: & 4019 PROTOTYPE: &
3775 CODE: 4020 CODE:
3776{ 4021{
3777 struct coro *coro = SvSTATE_current; 4022 struct coro *coro = SvSTATE_current;
3778 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4023 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3779 4024
3780 block = s_get_cv_croak (block); 4025 block = s_get_cv_croak (block);
3781 4026
3782 if (!*avp) 4027 if (!*avp)
3783 *avp = newAV (); 4028 *avp = newAV ();
… …
3803 4048
3804SV * 4049SV *
3805new (SV *klass, SV *count = 0) 4050new (SV *klass, SV *count = 0)
3806 CODE: 4051 CODE:
3807{ 4052{
3808 int semcnt = 1; 4053 int semcnt = 1;
3809 4054
3810 if (count) 4055 if (count)
3811 { 4056 {
3812 SvGETMAGIC (count); 4057 SvGETMAGIC (count);
3813 4058
… …
3873 XSRETURN_NO; 4118 XSRETURN_NO;
3874} 4119}
3875 4120
3876void 4121void
3877waiters (SV *self) 4122waiters (SV *self)
3878 PPCODE: 4123 PPCODE:
3879{ 4124{
3880 AV *av = (AV *)SvRV (self); 4125 AV *av = (AV *)SvRV (self);
3881 int wcount = AvFILLp (av) + 1 - 1; 4126 int wcount = AvFILLp (av) + 1 - 1;
3882 4127
3883 if (GIMME_V == G_SCALAR) 4128 if (GIMME_V == G_SCALAR)
… …
3892} 4137}
3893 4138
3894MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4139MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3895 4140
3896void 4141void
3897_may_delete (SV *sem, int count, int extra_refs) 4142_may_delete (SV *sem, int count, unsigned int extra_refs)
3898 PPCODE: 4143 PPCODE:
3899{ 4144{
3900 AV *av = (AV *)SvRV (sem); 4145 AV *av = (AV *)SvRV (sem);
3901 4146
3902 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4147 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3903 && AvFILLp (av) == 0 /* no waiters, just count */ 4148 && AvFILLp (av) == 0 /* no waiters, just count */
3904 && SvIV (AvARRAY (av)[0]) == count) 4149 && SvIV (AvARRAY (av)[0]) == count)
3905 XSRETURN_YES; 4150 XSRETURN_YES;
… …
3926 4171
3927void 4172void
3928broadcast (SV *self) 4173broadcast (SV *self)
3929 CODE: 4174 CODE:
3930{ 4175{
3931 AV *av = (AV *)SvRV (self); 4176 AV *av = (AV *)SvRV (self);
3932 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4177 coro_signal_wake (aTHX_ av, AvFILLp (av));
3933} 4178}
3934 4179
3935void 4180void
3936send (SV *self) 4181send (SV *self)
… …
3944 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4189 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3945} 4190}
3946 4191
3947IV 4192IV
3948awaited (SV *self) 4193awaited (SV *self)
3949 CODE: 4194 CODE:
3950 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4195 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3951 OUTPUT: 4196 OUTPUT:
3952 RETVAL 4197 RETVAL
3953 4198
3954 4199
… …
3959 4204
3960void 4205void
3961_schedule (...) 4206_schedule (...)
3962 CODE: 4207 CODE:
3963{ 4208{
3964 static int incede; 4209 static int incede;
3965 4210
3966 api_cede_notself (aTHX); 4211 api_cede_notself (aTHX);
3967 4212
3968 ++incede; 4213 ++incede;
3969 while (coro_nready >= incede && api_cede (aTHX)) 4214 while (coro_nready >= incede && api_cede (aTHX))
… …
4013 { 4258 {
4014 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4259 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4015 coro_old_pp_sselect = 0; 4260 coro_old_pp_sselect = 0;
4016 } 4261 }
4017 4262
4263MODULE = Coro::State PACKAGE = Coro::Util
4264
4265void
4266_exit (int code)
4267 CODE:
4268 _exit (code);
4269
4270NV
4271time ()
4272 CODE:
4273 RETVAL = nvtime (aTHX);
4274 OUTPUT:
4275 RETVAL
4276
4277NV
4278gettimeofday ()
4279 PPCODE:
4280{
4281 UV tv [2];
4282 u2time (aTHX_ tv);
4283 EXTEND (SP, 2);
4284 PUSHs (sv_2mortal (newSVuv (tv [0])));
4285 PUSHs (sv_2mortal (newSVuv (tv [1])));
4286}
4287

Diff Legend

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