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

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

Diff Legend

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