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

Diff Legend

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