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.382 by root, Thu Feb 10 08:06:27 2011 UTC vs.
Revision 1.443 by root, Thu Mar 6 06:40:32 2014 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#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
18#include <stdio.h> 23#include <stdio.h>
19#include <errno.h> 24#include <errno.h>
20#include <assert.h> 25#include <assert.h>
21 26
22#ifndef SVs_PADSTALE 27#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0 28# define SVs_PADSTALE 0
24#endif 29#endif
25 30
26#ifdef WIN32 31#ifdef PadARRAY
32# define NEWPADAPI 1
33# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
34#else
35typedef AV PADNAMELIST;
36# if !PERL_VERSION_ATLEAST(5,8,0)
37typedef AV PADLIST;
38typedef AV PAD;
39# endif
40# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
41# define PadlistMAX(pl) AvFILLp (pl)
42# define PadlistNAMES(pl) (*PadlistARRAY (pl))
43# define PadARRAY AvARRAY
44# define PadMAX AvFILLp
45# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
46#endif
47
48/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
49/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
50#if PERL_VERSION_ATLEAST(5,19,0)
51# define SVt_BIND SVt_IV
52#endif
53
54#if defined(_WIN32)
55# undef HAS_GETTIMEOFDAY
27# undef setjmp 56# undef setjmp
28# undef longjmp 57# undef longjmp
29# undef _exit 58# undef _exit
30# define setjmp _setjmp /* deep magic */ 59# define setjmp _setjmp /* deep magic */
31#else 60#else
32# include <inttypes.h> /* most portable stdint.h */ 61# include <inttypes.h> /* most portable stdint.h */
33#endif 62#endif
34 63
35#ifdef HAVE_MMAP
36# include <unistd.h>
37# include <sys/mman.h>
38# ifndef MAP_ANONYMOUS
39# ifdef MAP_ANON
40# define MAP_ANONYMOUS MAP_ANON
41# else
42# undef HAVE_MMAP
43# endif
44# endif
45# include <limits.h>
46# ifndef PAGESIZE
47# define PAGESIZE pagesize
48# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
49static long pagesize;
50# else
51# define BOOT_PAGESIZE (void)0
52# endif
53#else
54# define PAGESIZE 0
55# define BOOT_PAGESIZE (void)0
56#endif
57
58#if CORO_USE_VALGRIND
59# include <valgrind/valgrind.h>
60#endif
61
62/* the maximum number of idle cctx that will be pooled */ 64/* the maximum number of idle cctx that will be pooled */
63static int cctx_max_idle = 4; 65static int cctx_max_idle = 4;
64 66
65#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 67#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
66# undef CORO_STACKGUARD 68# define HAS_SCOPESTACK_NAME 1
67#endif
68
69#ifndef CORO_STACKGUARD
70# define CORO_STACKGUARD 0
71#endif 69#endif
72 70
73/* prefer perl internal functions over our own? */ 71/* prefer perl internal functions over our own? */
74#ifndef CORO_PREFER_PERL_FUNCTIONS 72#ifndef CORO_PREFER_PERL_FUNCTIONS
75# define CORO_PREFER_PERL_FUNCTIONS 0 73# define CORO_PREFER_PERL_FUNCTIONS 0
… …
85# define STACKLEVEL ((void *)&stacklevel) 83# define STACKLEVEL ((void *)&stacklevel)
86#endif 84#endif
87 85
88#define IN_DESTRUCT PL_dirty 86#define IN_DESTRUCT PL_dirty
89 87
90#if __GNUC__ >= 3
91# define attribute(x) __attribute__(x)
92# define expect(expr,value) __builtin_expect ((expr), (value))
93# define INLINE static inline
94#else
95# define attribute(x)
96# define expect(expr,value) (expr)
97# define INLINE static
98#endif
99
100#define expect_false(expr) expect ((expr) != 0, 0)
101#define expect_true(expr) expect ((expr) != 0, 1)
102
103#define NOINLINE attribute ((noinline))
104
105#include "CoroAPI.h" 88#include "CoroAPI.h"
106#define GCoroAPI (&coroapi) /* very sneaky */ 89#define GCoroAPI (&coroapi) /* very sneaky */
107 90
108#ifdef USE_ITHREADS 91#ifdef USE_ITHREADS
109# if CORO_PTHREAD 92# if CORO_PTHREAD
… …
125static void (*u2time)(pTHX_ UV ret[2]); 108static void (*u2time)(pTHX_ UV ret[2]);
126 109
127/* we hijack an hopefully unused CV flag for our purposes */ 110/* we hijack an hopefully unused CV flag for our purposes */
128#define CVf_SLF 0x4000 111#define CVf_SLF 0x4000
129static OP *pp_slf (pTHX); 112static OP *pp_slf (pTHX);
113static void slf_destroy (pTHX_ struct coro *coro);
130 114
131static U32 cctx_gen; 115static U32 cctx_gen;
132static size_t cctx_stacksize = CORO_STACKSIZE; 116static size_t cctx_stacksize = CORO_STACKSIZE;
133static struct CoroAPI coroapi; 117static struct CoroAPI coroapi;
134static AV *main_mainstack; /* used to differentiate between $main and others */ 118static AV *main_mainstack; /* used to differentiate between $main and others */
… …
164static char times_valid; 148static char times_valid;
165 149
166static struct coro_cctx *cctx_first; 150static struct coro_cctx *cctx_first;
167static int cctx_count, cctx_idle; 151static int cctx_count, cctx_idle;
168 152
169enum { 153enum
154{
170 CC_MAPPED = 0x01, 155 CC_MAPPED = 0x01,
171 CC_NOREUSE = 0x02, /* throw this away after tracing */ 156 CC_NOREUSE = 0x02, /* throw this away after tracing */
172 CC_TRACE = 0x04, 157 CC_TRACE = 0x04,
173 CC_TRACE_SUB = 0x08, /* trace sub calls */ 158 CC_TRACE_SUB = 0x08, /* trace sub calls */
174 CC_TRACE_LINE = 0x10, /* trace each statement */ 159 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
179typedef struct coro_cctx 164typedef struct coro_cctx
180{ 165{
181 struct coro_cctx *next; 166 struct coro_cctx *next;
182 167
183 /* the stack */ 168 /* the stack */
184 void *sptr; 169 struct coro_stack stack;
185 size_t ssize;
186 170
187 /* cpu state */ 171 /* cpu state */
188 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 172 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
173#ifndef NDEBUG
189 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 174 JMPENV *idle_te; /* same as idle_sp, but for top_env */
175#endif
190 JMPENV *top_env; 176 JMPENV *top_env;
191 coro_context cctx; 177 coro_context cctx;
192 178
193 U32 gen; 179 U32 gen;
194#if CORO_USE_VALGRIND 180#if CORO_USE_VALGRIND
195 int valgrind_id; 181 int valgrind_id;
196#endif 182#endif
197 unsigned char flags; 183 unsigned char flags;
198} coro_cctx; 184} coro_cctx;
199 185
200coro_cctx *cctx_current; /* the currently running cctx */ 186static coro_cctx *cctx_current; /* the currently running cctx */
201 187
202/*****************************************************************************/ 188/*****************************************************************************/
203 189
190static MGVTBL coro_state_vtbl;
191
204enum { 192enum
193{
205 CF_RUNNING = 0x0001, /* coroutine is running */ 194 CF_RUNNING = 0x0001, /* coroutine is running */
206 CF_READY = 0x0002, /* coroutine is ready */ 195 CF_READY = 0x0002, /* coroutine is ready */
207 CF_NEW = 0x0004, /* has never been switched to */ 196 CF_NEW = 0x0004, /* has never been switched to */
208 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 197 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
209 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 198 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
199 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
210}; 200};
211 201
212/* the structure where most of the perl state is stored, overlaid on the cxstack */ 202/* the structure where most of the perl state is stored, overlaid on the cxstack */
213typedef struct 203typedef struct
214{ 204{
215 SV *defsv;
216 AV *defav;
217 SV *errsv;
218 SV *irsgv;
219 HV *hinthv;
220#define VAR(name,type) type name; 205 #define VARx(name,expr,type) type name;
221# include "state.h" 206 #include "state.h"
222#undef VAR
223} perl_slots; 207} perl_slots;
224 208
209/* how many context stack entries do we need for perl_slots */
225#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 210#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
226 211
227/* this is a structure representing a perl-level coroutine */ 212/* this is a structure representing a perl-level coroutine */
228struct coro { 213struct coro
214{
229 /* the C coroutine allocated to this perl coroutine, if any */ 215 /* the C coroutine allocated to this perl coroutine, if any */
230 coro_cctx *cctx; 216 coro_cctx *cctx;
231 217
232 /* ready queue */ 218 /* ready queue */
233 struct coro *next_ready; 219 struct coro *next_ready;
… …
235 /* state data */ 221 /* state data */
236 struct CoroSLF slf_frame; /* saved slf frame */ 222 struct CoroSLF slf_frame; /* saved slf frame */
237 AV *mainstack; 223 AV *mainstack;
238 perl_slots *slot; /* basically the saved sp */ 224 perl_slots *slot; /* basically the saved sp */
239 225
240 CV *startcv; /* the CV to execute */ 226 CV *startcv; /* the CV to execute */
241 AV *args; /* data associated with this coroutine (initial args) */ 227 AV *args; /* data associated with this coroutine (initial args) */
242 int refcnt; /* coroutines are refcounted, yes */
243 int flags; /* CF_ flags */ 228 int flags; /* CF_ flags */
244 HV *hv; /* the perl hash associated with this coro, if any */ 229 HV *hv; /* the perl hash associated with this coro, if any */
245 void (*on_destroy)(pTHX_ struct coro *coro);
246 230
247 /* statistics */ 231 /* statistics */
248 int usecount; /* number of transfers to this coro */ 232 int usecount; /* number of transfers to this coro */
249 233
250 /* coro process data */ 234 /* coro process data */
251 int prio; 235 int prio;
252 SV *except; /* exception to be thrown */ 236 SV *except; /* exception to be thrown */
253 SV *rouse_cb; 237 SV *rouse_cb; /* last rouse callback */
238 AV *on_destroy; /* callbacks or coros to notify on destroy */
239 AV *status; /* the exit status list */
254 240
255 /* async_pool */ 241 /* async_pool */
256 SV *saved_deffh; 242 SV *saved_deffh;
257 SV *invoke_cb; 243 SV *invoke_cb;
258 AV *invoke_av; 244 AV *invoke_av;
… …
274typedef struct coro *Coro__State; 260typedef struct coro *Coro__State;
275typedef struct coro *Coro__State_or_hashref; 261typedef struct coro *Coro__State_or_hashref;
276 262
277/* the following variables are effectively part of the perl context */ 263/* the following variables are effectively part of the perl context */
278/* and get copied between struct coro and these variables */ 264/* and get copied between struct coro and these variables */
279/* the mainr easonw e don't support windows process emulation */ 265/* the main reason we don't support windows process emulation */
280static struct CoroSLF slf_frame; /* the current slf frame */ 266static struct CoroSLF slf_frame; /* the current slf frame */
281 267
282/** Coro ********************************************************************/ 268/** Coro ********************************************************************/
283 269
284#define CORO_PRIO_MAX 3 270#define CORO_PRIO_MAX 3
… …
290 276
291/* for Coro.pm */ 277/* for Coro.pm */
292static SV *coro_current; 278static SV *coro_current;
293static SV *coro_readyhook; 279static SV *coro_readyhook;
294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 280static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
295static CV *cv_coro_run, *cv_coro_terminate; 281static CV *cv_coro_run;
296static struct coro *coro_first; 282static struct coro *coro_first;
297#define coro_nready coroapi.nready 283#define coro_nready coroapi.nready
284
285/** JIT *********************************************************************/
286
287#if CORO_JIT
288 /* APPLE doesn't have mmap though */
289 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
290 #ifndef CORO_JIT_TYPE
291 #if ECB_AMD64 && CORO_JIT_UNIXY
292 #define CORO_JIT_TYPE "amd64-unix"
293 #elif __i386 && CORO_JIT_UNIXY
294 #define CORO_JIT_TYPE "x86-unix"
295 #endif
296 #endif
297#endif
298
299#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
300 #undef CORO_JIT
301#endif
302
303#if CORO_JIT
304 typedef void (*load_save_perl_slots_type)(perl_slots *);
305 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
306#endif
298 307
299/** Coro::Select ************************************************************/ 308/** Coro::Select ************************************************************/
300 309
301static OP *(*coro_old_pp_sselect) (pTHX); 310static OP *(*coro_old_pp_sselect) (pTHX);
302static SV *coro_select_select; 311static SV *coro_select_select;
… …
314 PL_op->op_flags |= OPf_STACKED; 323 PL_op->op_flags |= OPf_STACKED;
315 PL_op->op_private = 0; 324 PL_op->op_private = 0;
316 return PL_ppaddr [OP_ENTERSUB](aTHX); 325 return PL_ppaddr [OP_ENTERSUB](aTHX);
317} 326}
318 327
328/** time stuff **************************************************************/
329
330#ifdef HAS_GETTIMEOFDAY
331
332ecb_inline void
333coro_u2time (pTHX_ UV ret[2])
334{
335 struct timeval tv;
336 gettimeofday (&tv, 0);
337
338 ret [0] = tv.tv_sec;
339 ret [1] = tv.tv_usec;
340}
341
342ecb_inline double
343coro_nvtime (void)
344{
345 struct timeval tv;
346 gettimeofday (&tv, 0);
347
348 return tv.tv_sec + tv.tv_usec * 1e-6;
349}
350
351ecb_inline void
352time_init (pTHX)
353{
354 nvtime = coro_nvtime;
355 u2time = coro_u2time;
356}
357
358#else
359
360ecb_inline void
361time_init (pTHX)
362{
363 SV **svp;
364
365 require_pv ("Time/HiRes.pm");
366
367 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
368
369 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
370 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
371
372 nvtime = INT2PTR (double (*)(), SvIV (*svp));
373
374 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
375 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
376}
377
378#endif
379
319/** lowlevel stuff **********************************************************/ 380/** lowlevel stuff **********************************************************/
320 381
321static SV * 382static SV * ecb_noinline
322coro_get_sv (pTHX_ const char *name, int create) 383coro_get_sv (pTHX_ const char *name, int create)
323{ 384{
324#if PERL_VERSION_ATLEAST (5,10,0) 385#if PERL_VERSION_ATLEAST (5,10,0)
325 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 386 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
326 get_sv (name, create); 387 get_sv (name, create);
327#endif 388#endif
328 return get_sv (name, create); 389 return get_sv (name, create);
329} 390}
330 391
331static AV * 392static AV * ecb_noinline
332coro_get_av (pTHX_ const char *name, int create) 393coro_get_av (pTHX_ const char *name, int create)
333{ 394{
334#if PERL_VERSION_ATLEAST (5,10,0) 395#if PERL_VERSION_ATLEAST (5,10,0)
335 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 396 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
336 get_av (name, create); 397 get_av (name, create);
337#endif 398#endif
338 return get_av (name, create); 399 return get_av (name, create);
339} 400}
340 401
341static HV * 402static HV * ecb_noinline
342coro_get_hv (pTHX_ const char *name, int create) 403coro_get_hv (pTHX_ const char *name, int create)
343{ 404{
344#if PERL_VERSION_ATLEAST (5,10,0) 405#if PERL_VERSION_ATLEAST (5,10,0)
345 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 406 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
346 get_hv (name, create); 407 get_hv (name, create);
347#endif 408#endif
348 return get_hv (name, create); 409 return get_hv (name, create);
349} 410}
350 411
351INLINE void 412ecb_inline void
352coro_times_update () 413coro_times_update (void)
353{ 414{
354#ifdef coro_clock_gettime 415#ifdef coro_clock_gettime
355 struct timespec ts; 416 struct timespec ts;
356 417
357 ts.tv_sec = ts.tv_nsec = 0; 418 ts.tv_sec = ts.tv_nsec = 0;
… …
369 time_real [0] = tv [0]; 430 time_real [0] = tv [0];
370 time_real [1] = tv [1] * 1000; 431 time_real [1] = tv [1] * 1000;
371#endif 432#endif
372} 433}
373 434
374INLINE void 435ecb_inline void
375coro_times_add (struct coro *c) 436coro_times_add (struct coro *c)
376{ 437{
377 c->t_real [1] += time_real [1]; 438 c->t_real [1] += time_real [1];
378 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 439 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
379 c->t_real [0] += time_real [0]; 440 c->t_real [0] += time_real [0];
… …
381 c->t_cpu [1] += time_cpu [1]; 442 c->t_cpu [1] += time_cpu [1];
382 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 443 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
383 c->t_cpu [0] += time_cpu [0]; 444 c->t_cpu [0] += time_cpu [0];
384} 445}
385 446
386INLINE void 447ecb_inline void
387coro_times_sub (struct coro *c) 448coro_times_sub (struct coro *c)
388{ 449{
389 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 450 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
390 c->t_real [1] -= time_real [1]; 451 c->t_real [1] -= time_real [1];
391 c->t_real [0] -= time_real [0]; 452 c->t_real [0] -= time_real [0];
… …
399/* magic glue */ 460/* magic glue */
400 461
401#define CORO_MAGIC_type_cv 26 462#define CORO_MAGIC_type_cv 26
402#define CORO_MAGIC_type_state PERL_MAGIC_ext 463#define CORO_MAGIC_type_state PERL_MAGIC_ext
403 464
404#define CORO_MAGIC_NN(sv, type) \ 465#define CORO_MAGIC_NN(sv, type) \
405 (expect_true (SvMAGIC (sv)->mg_type == type) \ 466 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
406 ? SvMAGIC (sv) \ 467 ? SvMAGIC (sv) \
407 : mg_find (sv, type)) 468 : mg_find (sv, type))
408 469
409#define CORO_MAGIC(sv, type) \ 470#define CORO_MAGIC(sv, type) \
410 (expect_true (SvMAGIC (sv)) \ 471 (ecb_expect_true (SvMAGIC (sv)) \
411 ? CORO_MAGIC_NN (sv, type) \ 472 ? CORO_MAGIC_NN (sv, type) \
412 : 0) 473 : 0)
413 474
414#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 475#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
415#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 476#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
416 477
417INLINE struct coro * 478ecb_inline MAGIC *
479SvSTATEhv_p (pTHX_ SV *coro)
480{
481 MAGIC *mg;
482
483 if (ecb_expect_true (
484 SvTYPE (coro) == SVt_PVHV
485 && (mg = CORO_MAGIC_state (coro))
486 && mg->mg_virtual == &coro_state_vtbl
487 ))
488 return mg;
489
490 return 0;
491}
492
493ecb_inline struct coro *
418SvSTATE_ (pTHX_ SV *coro) 494SvSTATE_ (pTHX_ SV *coro)
419{ 495{
420 HV *stash;
421 MAGIC *mg; 496 MAGIC *mg;
422 497
423 if (SvROK (coro)) 498 if (SvROK (coro))
424 coro = SvRV (coro); 499 coro = SvRV (coro);
425 500
426 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 501 mg = SvSTATEhv_p (aTHX_ coro);
502 if (!mg)
427 croak ("Coro::State object required"); 503 croak ("Coro::State object required");
428 504
429 stash = SvSTASH (coro);
430 if (expect_false (stash != coro_stash && stash != coro_state_stash))
431 {
432 /* very slow, but rare, check */
433 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
434 croak ("Coro::State object required");
435 }
436
437 mg = CORO_MAGIC_state (coro);
438 return (struct coro *)mg->mg_ptr; 505 return (struct coro *)mg->mg_ptr;
439} 506}
440 507
441#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 508#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
442 509
… …
445#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 512#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
446 513
447/*****************************************************************************/ 514/*****************************************************************************/
448/* padlist management and caching */ 515/* padlist management and caching */
449 516
450static AV * 517ecb_inline PADLIST *
451coro_derive_padlist (pTHX_ CV *cv) 518coro_derive_padlist (pTHX_ CV *cv)
452{ 519{
453 AV *padlist = CvPADLIST (cv); 520 PADLIST *padlist = CvPADLIST (cv);
454 AV *newpadlist, *newpad; 521 PADLIST *newpadlist;
522 PAD *newpad;
523 PADOFFSET off = PadlistMAX (padlist) + 1;
455 524
456 newpadlist = newAV (); 525#if NEWPADAPI
526
527 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
528 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
529 while (!PadlistARRAY (padlist)[off - 1])
530 --off;
531
532 Perl_pad_push (aTHX_ padlist, off);
533
534 newpad = PadlistARRAY (padlist)[off];
535 PadlistARRAY (padlist)[off] = 0;
536
537#else
538
539#if PERL_VERSION_ATLEAST (5,10,0)
540 Perl_pad_push (aTHX_ padlist, off);
541#else
542 Perl_pad_push (aTHX_ padlist, off, 1);
543#endif
544
545 newpad = PadlistARRAY (padlist)[off];
546 PadlistMAX (padlist) = off - 1;
547
548#endif
549
550 newPADLIST (newpadlist);
551#if !PERL_VERSION_ATLEAST(5,15,3)
552 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
457 AvREAL_off (newpadlist); 553 AvREAL_off (newpadlist);
458#if PERL_VERSION_ATLEAST (5,10,0)
459 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
460#else
461 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
462#endif 554#endif
463 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
464 --AvFILLp (padlist);
465 555
466 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 556 /* Already extended to 2 elements by newPADLIST. */
467 av_store (newpadlist, 1, (SV *)newpad); 557 PadlistMAX (newpadlist) = 1;
558 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
559 PadlistARRAY (newpadlist)[1] = newpad;
468 560
469 return newpadlist; 561 return newpadlist;
470} 562}
471 563
472static void 564ecb_inline void
473free_padlist (pTHX_ AV *padlist) 565free_padlist (pTHX_ PADLIST *padlist)
474{ 566{
475 /* may be during global destruction */ 567 /* may be during global destruction */
476 if (!IN_DESTRUCT) 568 if (!IN_DESTRUCT)
477 { 569 {
478 I32 i = AvFILLp (padlist); 570 I32 i = PadlistMAX (padlist);
479 571
480 while (i > 0) /* special-case index 0 */ 572 while (i > 0) /* special-case index 0 */
481 { 573 {
482 /* we try to be extra-careful here */ 574 /* we try to be extra-careful here */
483 AV *av = (AV *)AvARRAY (padlist)[i--]; 575 PAD *pad = PadlistARRAY (padlist)[i--];
484 I32 j = AvFILLp (av);
485 576
577 if (pad)
578 {
579 I32 j = PadMAX (pad);
580
486 while (j >= 0) 581 while (j >= 0)
487 SvREFCNT_dec (AvARRAY (av)[j--]); 582 SvREFCNT_dec (PadARRAY (pad)[j--]);
488 583
489 AvFILLp (av) = -1; 584 PadMAX (pad) = -1;
490 SvREFCNT_dec (av); 585 SvREFCNT_dec (pad);
586 }
491 } 587 }
492 588
493 SvREFCNT_dec (AvARRAY (padlist)[0]); 589 SvREFCNT_dec (PadlistNAMES (padlist));
494 590
591#if NEWPADAPI
592 Safefree (PadlistARRAY (padlist));
593 Safefree (padlist);
594#else
495 AvFILLp (padlist) = -1; 595 AvFILLp (padlist) = -1;
596 AvREAL_off (padlist);
496 SvREFCNT_dec ((SV*)padlist); 597 SvREFCNT_dec ((SV*)padlist);
598#endif
497 } 599 }
498} 600}
499 601
500static int 602static int
501coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 603coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
502{ 604{
503 AV *padlist; 605 PADLIST *padlist;
504 AV *av = (AV *)mg->mg_obj; 606 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
607 size_t len = *(size_t *)mg->mg_ptr;
505 608
506 /* perl manages to free our internal AV and _then_ call us */ 609 /* perl manages to free our internal AV and _then_ call us */
507 if (IN_DESTRUCT) 610 if (IN_DESTRUCT)
508 return 0; 611 return 0;
509 612
510 /* casting is fun. */ 613 while (len--)
511 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
512 free_padlist (aTHX_ padlist); 614 free_padlist (aTHX_ padlists[len]);
513
514 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
515 615
516 return 0; 616 return 0;
517} 617}
518 618
519static MGVTBL coro_cv_vtbl = { 619static MGVTBL coro_cv_vtbl = {
520 0, 0, 0, 0, 620 0, 0, 0, 0,
521 coro_cv_free 621 coro_cv_free
522}; 622};
523 623
524/* the next two functions merely cache the padlists */ 624/* the next two functions merely cache the padlists */
525static void 625ecb_inline void
526get_padlist (pTHX_ CV *cv) 626get_padlist (pTHX_ CV *cv)
527{ 627{
528 MAGIC *mg = CORO_MAGIC_cv (cv); 628 MAGIC *mg = CORO_MAGIC_cv (cv);
529 AV *av; 629 size_t *lenp;
530 630
531 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 631 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
532 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 632 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
533 else 633 else
534 { 634 {
535#if CORO_PREFER_PERL_FUNCTIONS 635#if CORO_PREFER_PERL_FUNCTIONS
536 /* this is probably cleaner? but also slower! */ 636 /* this is probably cleaner? but also slower! */
537 /* in practise, it seems to be less stable */ 637 /* in practise, it seems to be less stable */
… …
543 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 643 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
544#endif 644#endif
545 } 645 }
546} 646}
547 647
548static void 648ecb_inline void
549put_padlist (pTHX_ CV *cv) 649put_padlist (pTHX_ CV *cv)
550{ 650{
551 MAGIC *mg = CORO_MAGIC_cv (cv); 651 MAGIC *mg = CORO_MAGIC_cv (cv);
552 AV *av;
553 652
554 if (expect_false (!mg)) 653 if (ecb_expect_false (!mg))
654 {
555 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 655 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
656 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
657 mg->mg_len = 1; /* so mg_free frees mg_ptr */
658 }
659 else
660 Renew (mg->mg_ptr,
661 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
662 char);
556 663
557 av = (AV *)mg->mg_obj; 664 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
558
559 if (expect_false (AvFILLp (av) >= AvMAX (av)))
560 av_extend (av, AvFILLp (av) + 1);
561
562 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
563} 665}
564 666
565/** load & save, init *******************************************************/ 667/** load & save, init *******************************************************/
566 668
669ecb_inline void
670swap_sv (SV *a, SV *b)
671{
672 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
673 SV tmp;
674
675 /* swap sv_any */
676 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
677
678 /* swap sv_flags */
679 SvFLAGS (&tmp) = SvFLAGS (a);
680 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
681 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
682
683#if PERL_VERSION_ATLEAST (5,10,0)
684 /* perl 5.10 and later complicates this _quite_ a bit, but it also
685 * is much faster, so no quarrels here. alternatively, we could
686 * sv_upgrade to avoid this.
687 */
688 {
689 /* swap sv_u */
690 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
691
692 /* if SvANY points to the head, we need to adjust the pointers,
693 * as the pointer for a still points to b, and maybe vice versa.
694 */
695 #define svany_in_head(type) \
696 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
697
698 if (svany_in_head (SvTYPE (a)))
699 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
700
701 if (svany_in_head (SvTYPE (b)))
702 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
703 }
704#endif
705}
706
567/* swap sv heads, at least logically */ 707/* swap sv heads, at least logically */
568static void 708static void
569swap_svs (pTHX_ Coro__State c) 709swap_svs (pTHX_ Coro__State c)
570{ 710{
571 int i; 711 int i;
572 712
573 for (i = 0; i <= AvFILLp (c->swap_sv); ) 713 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
574 { 714 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
575 SV *a = AvARRAY (c->swap_sv)[i++];
576 SV *b = AvARRAY (c->swap_sv)[i++];
577
578 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
579 SV tmp;
580
581 /* swap sv_any */
582 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
583
584 /* swap sv_flags */
585 SvFLAGS (&tmp) = SvFLAGS (a);
586 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
587 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
588
589#if PERL_VERSION_ATLEAST (5,10,0)
590 /* perl 5.10 complicates this _quite_ a bit, but it also is
591 * is much faster, so no quarrels here. alternatively, we could
592 * sv_upgrade to avoid this.
593 */
594 {
595 /* swap sv_u */
596 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
597
598 /* if SvANY points to the head, we need to adjust the pointers,
599 * as the pointer for a still points to b, and maybe vice versa.
600 */
601 #define svany_in_head(type) \
602 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
603
604 if (svany_in_head (SvTYPE (a)))
605 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
606
607 if (svany_in_head (SvTYPE (b)))
608 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
609 }
610#endif
611 }
612} 715}
613 716
614#define SWAP_SVS(coro) \ 717#define SWAP_SVS(coro) \
615 if (expect_false ((coro)->swap_sv)) \ 718 if (ecb_expect_false ((coro)->swap_sv)) \
616 swap_svs (aTHX_ (coro)) 719 swap_svs (aTHX_ (coro))
617 720
618static void 721static void
619on_enterleave_call (pTHX_ SV *cb); 722on_enterleave_call (pTHX_ SV *cb);
620 723
… …
624 perl_slots *slot = c->slot; 727 perl_slots *slot = c->slot;
625 c->slot = 0; 728 c->slot = 0;
626 729
627 PL_mainstack = c->mainstack; 730 PL_mainstack = c->mainstack;
628 731
629 GvSV (PL_defgv) = slot->defsv; 732#if CORO_JIT
630 GvAV (PL_defgv) = slot->defav; 733 load_perl_slots (slot);
631 GvSV (PL_errgv) = slot->errsv; 734#else
632 GvSV (irsgv) = slot->irsgv;
633 GvHV (PL_hintgv) = slot->hinthv;
634
635 #define VAR(name,type) PL_ ## name = slot->name; 735 #define VARx(name,expr,type) expr = slot->name;
636 # include "state.h" 736 #include "state.h"
637 #undef VAR 737#endif
638 738
639 { 739 {
640 dSP; 740 dSP;
641 741
642 CV *cv; 742 CV *cv;
643 743
644 /* now do the ugly restore mess */ 744 /* now do the ugly restore mess */
645 while (expect_true (cv = (CV *)POPs)) 745 while (ecb_expect_true (cv = (CV *)POPs))
646 { 746 {
647 put_padlist (aTHX_ cv); /* mark this padlist as available */ 747 put_padlist (aTHX_ cv); /* mark this padlist as available */
648 CvDEPTH (cv) = PTR2IV (POPs); 748 CvDEPTH (cv) = PTR2IV (POPs);
649 CvPADLIST (cv) = (AV *)POPs; 749 CvPADLIST (cv) = (PADLIST *)POPs;
650 } 750 }
651 751
652 PUTBACK; 752 PUTBACK;
653 } 753 }
654 754
655 slf_frame = c->slf_frame; 755 slf_frame = c->slf_frame;
656 CORO_THROW = c->except; 756 CORO_THROW = c->except;
657 757
658 if (expect_false (enable_times)) 758 if (ecb_expect_false (enable_times))
659 { 759 {
660 if (expect_false (!times_valid)) 760 if (ecb_expect_false (!times_valid))
661 coro_times_update (); 761 coro_times_update ();
662 762
663 coro_times_sub (c); 763 coro_times_sub (c);
664 } 764 }
665 765
666 if (expect_false (c->on_enter)) 766 if (ecb_expect_false (c->on_enter))
667 { 767 {
668 int i; 768 int i;
669 769
670 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 770 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
671 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 771 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
677static void 777static void
678save_perl (pTHX_ Coro__State c) 778save_perl (pTHX_ Coro__State c)
679{ 779{
680 SWAP_SVS (c); 780 SWAP_SVS (c);
681 781
682 if (expect_false (c->on_leave)) 782 if (ecb_expect_false (c->on_leave))
683 { 783 {
684 int i; 784 int i;
685 785
686 for (i = AvFILLp (c->on_leave); i >= 0; --i) 786 for (i = AvFILLp (c->on_leave); i >= 0; --i)
687 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 787 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
688 } 788 }
689 789
690 times_valid = 0; 790 times_valid = 0;
691 791
692 if (expect_false (enable_times)) 792 if (ecb_expect_false (enable_times))
693 { 793 {
694 coro_times_update (); times_valid = 1; 794 coro_times_update (); times_valid = 1;
695 coro_times_add (c); 795 coro_times_add (c);
696 } 796 }
697 797
… …
711 811
712 XPUSHs (Nullsv); 812 XPUSHs (Nullsv);
713 /* this loop was inspired by pp_caller */ 813 /* this loop was inspired by pp_caller */
714 for (;;) 814 for (;;)
715 { 815 {
716 while (expect_true (cxix >= 0)) 816 while (ecb_expect_true (cxix >= 0))
717 { 817 {
718 PERL_CONTEXT *cx = &ccstk[cxix--]; 818 PERL_CONTEXT *cx = &ccstk[cxix--];
719 819
720 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 820 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
721 { 821 {
722 CV *cv = cx->blk_sub.cv; 822 CV *cv = cx->blk_sub.cv;
723 823
724 if (expect_true (CvDEPTH (cv))) 824 if (ecb_expect_true (CvDEPTH (cv)))
725 { 825 {
726 EXTEND (SP, 3); 826 EXTEND (SP, 3);
727 PUSHs ((SV *)CvPADLIST (cv)); 827 PUSHs ((SV *)CvPADLIST (cv));
728 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 828 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
729 PUSHs ((SV *)cv); 829 PUSHs ((SV *)cv);
… …
732 get_padlist (aTHX_ cv); 832 get_padlist (aTHX_ cv);
733 } 833 }
734 } 834 }
735 } 835 }
736 836
737 if (expect_true (top_si->si_type == PERLSI_MAIN)) 837 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
738 break; 838 break;
739 839
740 top_si = top_si->si_prev; 840 top_si = top_si->si_prev;
741 ccstk = top_si->si_cxstack; 841 ccstk = top_si->si_cxstack;
742 cxix = top_si->si_cxix; 842 cxix = top_si->si_cxix;
… …
744 844
745 PUTBACK; 845 PUTBACK;
746 } 846 }
747 847
748 /* allocate some space on the context stack for our purposes */ 848 /* allocate some space on the context stack for our purposes */
749 /* we manually unroll here, as usually 2 slots is enough */ 849 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
750 if (SLOT_COUNT >= 1) CXINC;
751 if (SLOT_COUNT >= 2) CXINC;
752 if (SLOT_COUNT >= 3) CXINC;
753 { 850 {
754 unsigned int i; 851 unsigned int i;
852
755 for (i = 3; i < SLOT_COUNT; ++i) 853 for (i = 0; i < SLOT_COUNT; ++i)
756 CXINC; 854 CXINC;
757 } 855
758 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 856 cxstack_ix -= SLOT_COUNT; /* undo allocation */
857 }
759 858
760 c->mainstack = PL_mainstack; 859 c->mainstack = PL_mainstack;
761 860
762 { 861 {
763 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 862 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
764 863
765 slot->defav = GvAV (PL_defgv); 864#if CORO_JIT
766 slot->defsv = DEFSV; 865 save_perl_slots (slot);
767 slot->errsv = ERRSV; 866#else
768 slot->irsgv = GvSV (irsgv);
769 slot->hinthv = GvHV (PL_hintgv);
770
771 #define VAR(name,type) slot->name = PL_ ## name; 867 #define VARx(name,expr,type) slot->name = expr;
772 # include "state.h" 868 #include "state.h"
773 #undef VAR 869#endif
774 } 870 }
775} 871}
776 872
777/* 873/*
778 * allocate various perl stacks. This is almost an exact copy 874 * allocate various perl stacks. This is almost an exact copy
… …
784# define coro_init_stacks(thx) init_stacks () 880# define coro_init_stacks(thx) init_stacks ()
785#else 881#else
786static void 882static void
787coro_init_stacks (pTHX) 883coro_init_stacks (pTHX)
788{ 884{
789 PL_curstackinfo = new_stackinfo(32, 8); 885 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
790 PL_curstackinfo->si_type = PERLSI_MAIN; 886 PL_curstackinfo->si_type = PERLSI_MAIN;
791 PL_curstack = PL_curstackinfo->si_stack; 887 PL_curstack = PL_curstackinfo->si_stack;
792 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 888 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
793 889
794 PL_stack_base = AvARRAY(PL_curstack); 890 PL_stack_base = AvARRAY(PL_curstack);
… …
809#endif 905#endif
810 906
811 New(54,PL_scopestack,8,I32); 907 New(54,PL_scopestack,8,I32);
812 PL_scopestack_ix = 0; 908 PL_scopestack_ix = 0;
813 PL_scopestack_max = 8; 909 PL_scopestack_max = 8;
910#if HAS_SCOPESTACK_NAME
911 New(54,PL_scopestack_name,8,const char*);
912#endif
814 913
815 New(54,PL_savestack,24,ANY); 914 New(54,PL_savestack,24,ANY);
816 PL_savestack_ix = 0; 915 PL_savestack_ix = 0;
817 PL_savestack_max = 24; 916 PL_savestack_max = 24;
818 917
… …
846 } 945 }
847 946
848 Safefree (PL_tmps_stack); 947 Safefree (PL_tmps_stack);
849 Safefree (PL_markstack); 948 Safefree (PL_markstack);
850 Safefree (PL_scopestack); 949 Safefree (PL_scopestack);
950#if HAS_SCOPESTACK_NAME
951 Safefree (PL_scopestack_name);
952#endif
851 Safefree (PL_savestack); 953 Safefree (PL_savestack);
852#if !PERL_VERSION_ATLEAST (5,10,0) 954#if !PERL_VERSION_ATLEAST (5,10,0)
853 Safefree (PL_retstack); 955 Safefree (PL_retstack);
854#endif 956#endif
855} 957}
… …
901#endif 1003#endif
902 1004
903/* 1005/*
904 * This overrides the default magic get method of %SIG elements. 1006 * This overrides the default magic get method of %SIG elements.
905 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1007 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
906 * and instead of trying to save and restore the hash elements, we just provide 1008 * and instead of trying to save and restore the hash elements (extremely slow),
907 * readback here. 1009 * we just provide our own readback here.
908 */ 1010 */
909static int 1011static int ecb_cold
910coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1012coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
911{ 1013{
912 const char *s = MgPV_nolen_const (mg); 1014 const char *s = MgPV_nolen_const (mg);
913 1015
914 if (*s == '_') 1016 if (*s == '_')
915 { 1017 {
916 SV **svp = 0; 1018 SV **svp = 0;
917 1019
918 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1020 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
919 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1021 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
920 1022
921 if (svp) 1023 if (svp)
922 { 1024 {
923 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1025 SV *ssv;
1026
1027 if (!*svp)
1028 ssv = &PL_sv_undef;
1029 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1030 ssv = sv_2mortal (newRV_inc (*svp));
1031 else
1032 ssv = *svp;
1033
1034 sv_setsv (sv, ssv);
924 return 0; 1035 return 0;
925 } 1036 }
926 } 1037 }
927 1038
928 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1039 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
929} 1040}
930 1041
931static int 1042static int ecb_cold
932coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1043coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
933{ 1044{
934 const char *s = MgPV_nolen_const (mg); 1045 const char *s = MgPV_nolen_const (mg);
935 1046
936 if (*s == '_') 1047 if (*s == '_')
… …
950 } 1061 }
951 1062
952 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1063 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
953} 1064}
954 1065
955static int 1066static int ecb_cold
956coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1067coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
957{ 1068{
958 const char *s = MgPV_nolen_const (mg); 1069 const char *s = MgPV_nolen_const (mg);
959 1070
960 if (*s == '_') 1071 if (*s == '_')
… …
995 return 1; 1106 return 1;
996} 1107}
997 1108
998static UNOP init_perl_op; 1109static UNOP init_perl_op;
999 1110
1000static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1111ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1001init_perl (pTHX_ struct coro *coro) 1112init_perl (pTHX_ struct coro *coro)
1002{ 1113{
1003 /* 1114 /*
1004 * emulate part of the perl startup here. 1115 * emulate part of the perl startup here.
1005 */ 1116 */
… …
1013 PL_comppad_name_fill = 0; 1124 PL_comppad_name_fill = 0;
1014 PL_comppad_name_floor = 0; 1125 PL_comppad_name_floor = 0;
1015 PL_curpm = 0; 1126 PL_curpm = 0;
1016 PL_curpad = 0; 1127 PL_curpad = 0;
1017 PL_localizing = 0; 1128 PL_localizing = 0;
1018 PL_dirty = 0;
1019 PL_restartop = 0; 1129 PL_restartop = 0;
1020#if PERL_VERSION_ATLEAST (5,10,0) 1130#if PERL_VERSION_ATLEAST (5,10,0)
1021 PL_parser = 0; 1131 PL_parser = 0;
1022#endif 1132#endif
1023 PL_hints = 0; 1133 PL_hints = 0;
1024 1134
1025 /* recreate the die/warn hooks */ 1135 /* recreate the die/warn hooks */
1026 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1136 PL_diehook = SvREFCNT_inc (rv_diehook);
1027 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1137 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1028 1138
1029 GvSV (PL_defgv) = newSV (0); 1139 GvSV (PL_defgv) = newSV (0);
1030 GvAV (PL_defgv) = coro->args; coro->args = 0; 1140 GvAV (PL_defgv) = coro->args; coro->args = 0;
1031 GvSV (PL_errgv) = newSV (0); 1141 GvSV (PL_errgv) = newSV (0);
1032 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1142 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1033 GvHV (PL_hintgv) = 0; 1143 GvHV (PL_hintgv) = 0;
… …
1053 /* this newly created coroutine might be run on an existing cctx which most 1163 /* this newly created coroutine might be run on an existing cctx which most
1054 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1164 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1055 */ 1165 */
1056 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1166 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1057 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1167 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1168 slf_frame.destroy = 0;
1058 1169
1059 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1170 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1060 init_perl_op.op_next = PL_op; 1171 init_perl_op.op_next = PL_op;
1061 init_perl_op.op_type = OP_ENTERSUB; 1172 init_perl_op.op_type = OP_ENTERSUB;
1062 init_perl_op.op_ppaddr = pp_slf; 1173 init_perl_op.op_ppaddr = pp_slf;
… …
1067 /* copy throw, in case it was set before init_perl */ 1178 /* copy throw, in case it was set before init_perl */
1068 CORO_THROW = coro->except; 1179 CORO_THROW = coro->except;
1069 1180
1070 SWAP_SVS (coro); 1181 SWAP_SVS (coro);
1071 1182
1072 if (expect_false (enable_times)) 1183 if (ecb_expect_false (enable_times))
1073 { 1184 {
1074 coro_times_update (); 1185 coro_times_update ();
1075 coro_times_sub (coro); 1186 coro_times_sub (coro);
1076 } 1187 }
1077} 1188}
… …
1101destroy_perl (pTHX_ struct coro *coro) 1212destroy_perl (pTHX_ struct coro *coro)
1102{ 1213{
1103 SV *svf [9]; 1214 SV *svf [9];
1104 1215
1105 { 1216 {
1217 SV *old_current = SvRV (coro_current);
1106 struct coro *current = SvSTATE_current; 1218 struct coro *current = SvSTATE (old_current);
1107 1219
1108 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1220 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1109 1221
1110 save_perl (aTHX_ current); 1222 save_perl (aTHX_ current);
1223
1224 /* this will cause transfer_check to croak on block*/
1225 SvRV_set (coro_current, (SV *)coro->hv);
1226
1111 load_perl (aTHX_ coro); 1227 load_perl (aTHX_ coro);
1112 1228
1113 coro_unwind_stacks (aTHX); 1229 coro_unwind_stacks (aTHX);
1114 coro_destruct_stacks (aTHX);
1115 1230
1116 /* restore swapped sv's */ 1231 /* restore swapped sv's */
1117 SWAP_SVS (coro); 1232 SWAP_SVS (coro);
1118 1233
1234 coro_destruct_stacks (aTHX);
1235
1119 // now save some sv's to be free'd later 1236 /* now save some sv's to be free'd later */
1120 svf [0] = GvSV (PL_defgv); 1237 svf [0] = GvSV (PL_defgv);
1121 svf [1] = (SV *)GvAV (PL_defgv); 1238 svf [1] = (SV *)GvAV (PL_defgv);
1122 svf [2] = GvSV (PL_errgv); 1239 svf [2] = GvSV (PL_errgv);
1123 svf [3] = (SV *)PL_defoutgv; 1240 svf [3] = (SV *)PL_defoutgv;
1124 svf [4] = PL_rs; 1241 svf [4] = PL_rs;
… …
1126 svf [6] = (SV *)GvHV (PL_hintgv); 1243 svf [6] = (SV *)GvHV (PL_hintgv);
1127 svf [7] = PL_diehook; 1244 svf [7] = PL_diehook;
1128 svf [8] = PL_warnhook; 1245 svf [8] = PL_warnhook;
1129 assert (9 == sizeof (svf) / sizeof (*svf)); 1246 assert (9 == sizeof (svf) / sizeof (*svf));
1130 1247
1248 SvRV_set (coro_current, old_current);
1249
1131 load_perl (aTHX_ current); 1250 load_perl (aTHX_ current);
1132 } 1251 }
1133 1252
1134 { 1253 {
1135 unsigned int i; 1254 unsigned int i;
… …
1142 SvREFCNT_dec (coro->invoke_cb); 1261 SvREFCNT_dec (coro->invoke_cb);
1143 SvREFCNT_dec (coro->invoke_av); 1262 SvREFCNT_dec (coro->invoke_av);
1144 } 1263 }
1145} 1264}
1146 1265
1147INLINE void 1266ecb_inline void
1148free_coro_mortal (pTHX) 1267free_coro_mortal (pTHX)
1149{ 1268{
1150 if (expect_true (coro_mortal)) 1269 if (ecb_expect_true (coro_mortal))
1151 { 1270 {
1152 SvREFCNT_dec (coro_mortal); 1271 SvREFCNT_dec ((SV *)coro_mortal);
1153 coro_mortal = 0; 1272 coro_mortal = 0;
1154 } 1273 }
1155} 1274}
1156 1275
1157static int 1276static int
… …
1290 1409
1291 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1410 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1292} 1411}
1293 1412
1294/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1413/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1295static void NOINLINE 1414static void ecb_noinline
1296cctx_prepare (pTHX) 1415cctx_prepare (pTHX)
1297{ 1416{
1298 PL_top_env = &PL_start_env; 1417 PL_top_env = &PL_start_env;
1299 1418
1300 if (cctx_current->flags & CC_TRACE) 1419 if (cctx_current->flags & CC_TRACE)
… …
1311 slf_frame.prepare = slf_prepare_set_stacklevel; 1430 slf_frame.prepare = slf_prepare_set_stacklevel;
1312 slf_frame.check = slf_check_set_stacklevel; 1431 slf_frame.check = slf_check_set_stacklevel;
1313} 1432}
1314 1433
1315/* the tail of transfer: execute stuff we can only do after a transfer */ 1434/* the tail of transfer: execute stuff we can only do after a transfer */
1316INLINE void 1435ecb_inline void
1317transfer_tail (pTHX) 1436transfer_tail (pTHX)
1318{ 1437{
1319 free_coro_mortal (aTHX); 1438 free_coro_mortal (aTHX);
1439}
1440
1441/* try to exit the same way perl's main function would do */
1442/* we do not bother resetting the environment or other things *7
1443/* that are not, uhm, essential */
1444/* this obviously also doesn't work when perl is embedded */
1445static void ecb_noinline ecb_cold
1446perlish_exit (pTHX)
1447{
1448 int exitstatus = perl_destruct (PL_curinterp);
1449 perl_free (PL_curinterp);
1450 exit (exitstatus);
1320} 1451}
1321 1452
1322/* 1453/*
1323 * this is a _very_ stripped down perl interpreter ;) 1454 * this is a _very_ stripped down perl interpreter ;)
1324 */ 1455 */
… …
1353 */ 1484 */
1354 1485
1355 /* 1486 /*
1356 * If perl-run returns we assume exit() was being called or the coro 1487 * If perl-run returns we assume exit() was being called or the coro
1357 * fell off the end, which seems to be the only valid (non-bug) 1488 * fell off the end, which seems to be the only valid (non-bug)
1358 * reason for perl_run to return. We try to exit by jumping to the 1489 * reason for perl_run to return. We try to mimic whatever perl is normally
1359 * bootstrap-time "top" top_env, as we cannot restore the "main" 1490 * doing in that case. YMMV.
1360 * coroutine as Coro has no such concept.
1361 * This actually isn't valid with the pthread backend, but OSes requiring
1362 * that backend are too broken to do it in a standards-compliant way.
1363 */ 1491 */
1364 PL_top_env = main_top_env; 1492 perlish_exit (aTHX);
1365 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1366 } 1493 }
1367} 1494}
1368 1495
1369static coro_cctx * 1496static coro_cctx *
1370cctx_new () 1497cctx_new (void)
1371{ 1498{
1372 coro_cctx *cctx; 1499 coro_cctx *cctx;
1373 1500
1374 ++cctx_count; 1501 ++cctx_count;
1375 New (0, cctx, 1, coro_cctx); 1502 New (0, cctx, 1, coro_cctx);
… …
1381 return cctx; 1508 return cctx;
1382} 1509}
1383 1510
1384/* create a new cctx only suitable as source */ 1511/* create a new cctx only suitable as source */
1385static coro_cctx * 1512static coro_cctx *
1386cctx_new_empty () 1513cctx_new_empty (void)
1387{ 1514{
1388 coro_cctx *cctx = cctx_new (); 1515 coro_cctx *cctx = cctx_new ();
1389 1516
1390 cctx->sptr = 0; 1517 cctx->stack.sptr = 0;
1391 coro_create (&cctx->cctx, 0, 0, 0, 0); 1518 coro_create (&cctx->cctx, 0, 0, 0, 0);
1392 1519
1393 return cctx; 1520 return cctx;
1394} 1521}
1395 1522
1396/* create a new cctx suitable as destination/running a perl interpreter */ 1523/* create a new cctx suitable as destination/running a perl interpreter */
1397static coro_cctx * 1524static coro_cctx *
1398cctx_new_run () 1525cctx_new_run (void)
1399{ 1526{
1400 coro_cctx *cctx = cctx_new (); 1527 coro_cctx *cctx = cctx_new ();
1401 void *stack_start;
1402 size_t stack_size;
1403 1528
1404#if HAVE_MMAP 1529 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1405 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1406 /* mmap supposedly does allocate-on-write for us */
1407 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1408
1409 if (cctx->sptr != (void *)-1)
1410 {
1411 #if CORO_STACKGUARD
1412 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1413 #endif
1414 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1415 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1416 cctx->flags |= CC_MAPPED;
1417 } 1530 {
1418 else
1419#endif
1420 {
1421 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1422 New (0, cctx->sptr, cctx_stacksize, long);
1423
1424 if (!cctx->sptr)
1425 {
1426 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1531 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1427 _exit (EXIT_FAILURE); 1532 _exit (EXIT_FAILURE);
1428 }
1429
1430 stack_start = cctx->sptr;
1431 stack_size = cctx->ssize;
1432 } 1533 }
1433 1534
1434 #if CORO_USE_VALGRIND
1435 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1436 #endif
1437
1438 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1535 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1439 1536
1440 return cctx; 1537 return cctx;
1441} 1538}
1442 1539
1443static void 1540static void
1444cctx_destroy (coro_cctx *cctx) 1541cctx_destroy (coro_cctx *cctx)
1445{ 1542{
1446 if (!cctx) 1543 if (!cctx)
1447 return; 1544 return;
1448 1545
1449 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1546 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1450 1547
1451 --cctx_count; 1548 --cctx_count;
1452 coro_destroy (&cctx->cctx); 1549 coro_destroy (&cctx->cctx);
1453 1550
1454 /* coro_transfer creates new, empty cctx's */ 1551 coro_stack_free (&cctx->stack);
1455 if (cctx->sptr)
1456 {
1457 #if CORO_USE_VALGRIND
1458 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1459 #endif
1460
1461#if HAVE_MMAP
1462 if (cctx->flags & CC_MAPPED)
1463 munmap (cctx->sptr, cctx->ssize);
1464 else
1465#endif
1466 Safefree (cctx->sptr);
1467 }
1468 1552
1469 Safefree (cctx); 1553 Safefree (cctx);
1470} 1554}
1471 1555
1472/* wether this cctx should be destructed */ 1556/* wether this cctx should be destructed */
1473#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1557#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1474 1558
1475static coro_cctx * 1559static coro_cctx *
1476cctx_get (pTHX) 1560cctx_get (pTHX)
1477{ 1561{
1478 while (expect_true (cctx_first)) 1562 while (ecb_expect_true (cctx_first))
1479 { 1563 {
1480 coro_cctx *cctx = cctx_first; 1564 coro_cctx *cctx = cctx_first;
1481 cctx_first = cctx->next; 1565 cctx_first = cctx->next;
1482 --cctx_idle; 1566 --cctx_idle;
1483 1567
1484 if (expect_true (!CCTX_EXPIRED (cctx))) 1568 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1485 return cctx; 1569 return cctx;
1486 1570
1487 cctx_destroy (cctx); 1571 cctx_destroy (cctx);
1488 } 1572 }
1489 1573
… …
1491} 1575}
1492 1576
1493static void 1577static void
1494cctx_put (coro_cctx *cctx) 1578cctx_put (coro_cctx *cctx)
1495{ 1579{
1496 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1580 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1497 1581
1498 /* free another cctx if overlimit */ 1582 /* free another cctx if overlimit */
1499 if (expect_false (cctx_idle >= cctx_max_idle)) 1583 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1500 { 1584 {
1501 coro_cctx *first = cctx_first; 1585 coro_cctx *first = cctx_first;
1502 cctx_first = first->next; 1586 cctx_first = first->next;
1503 --cctx_idle; 1587 --cctx_idle;
1504 1588
… …
1515static void 1599static void
1516transfer_check (pTHX_ struct coro *prev, struct coro *next) 1600transfer_check (pTHX_ struct coro *prev, struct coro *next)
1517{ 1601{
1518 /* TODO: throwing up here is considered harmful */ 1602 /* TODO: throwing up here is considered harmful */
1519 1603
1520 if (expect_true (prev != next)) 1604 if (ecb_expect_true (prev != next))
1521 { 1605 {
1522 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1606 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1523 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1607 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1524 1608
1525 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1609 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1526 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1610 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1527 1611
1528#if !PERL_VERSION_ATLEAST (5,10,0) 1612#if !PERL_VERSION_ATLEAST (5,10,0)
1529 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1613 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1530 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1614 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1531#endif 1615#endif
1532 } 1616 }
1533} 1617}
1534 1618
1535/* always use the TRANSFER macro */ 1619/* always use the TRANSFER macro */
1536static void NOINLINE /* noinline so we have a fixed stackframe */ 1620static void ecb_noinline /* noinline so we have a fixed stackframe */
1537transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1621transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1538{ 1622{
1539 dSTACKLEVEL; 1623 dSTACKLEVEL;
1540 1624
1541 /* sometimes transfer is only called to set idle_sp */ 1625 /* sometimes transfer is only called to set idle_sp */
1542 if (expect_false (!prev)) 1626 if (ecb_expect_false (!prev))
1543 { 1627 {
1544 cctx_current->idle_sp = STACKLEVEL; 1628 cctx_current->idle_sp = STACKLEVEL;
1545 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1629 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1546 } 1630 }
1547 else if (expect_true (prev != next)) 1631 else if (ecb_expect_true (prev != next))
1548 { 1632 {
1549 coro_cctx *cctx_prev; 1633 coro_cctx *cctx_prev;
1550 1634
1551 if (expect_false (prev->flags & CF_NEW)) 1635 if (ecb_expect_false (prev->flags & CF_NEW))
1552 { 1636 {
1553 /* create a new empty/source context */ 1637 /* create a new empty/source context */
1554 prev->flags &= ~CF_NEW; 1638 prev->flags &= ~CF_NEW;
1555 prev->flags |= CF_RUNNING; 1639 prev->flags |= CF_RUNNING;
1556 } 1640 }
… …
1559 next->flags |= CF_RUNNING; 1643 next->flags |= CF_RUNNING;
1560 1644
1561 /* first get rid of the old state */ 1645 /* first get rid of the old state */
1562 save_perl (aTHX_ prev); 1646 save_perl (aTHX_ prev);
1563 1647
1564 if (expect_false (next->flags & CF_NEW)) 1648 if (ecb_expect_false (next->flags & CF_NEW))
1565 { 1649 {
1566 /* need to start coroutine */ 1650 /* need to start coroutine */
1567 next->flags &= ~CF_NEW; 1651 next->flags &= ~CF_NEW;
1568 /* setup coroutine call */ 1652 /* setup coroutine call */
1569 init_perl (aTHX_ next); 1653 init_perl (aTHX_ next);
1570 } 1654 }
1571 else 1655 else
1572 load_perl (aTHX_ next); 1656 load_perl (aTHX_ next);
1573 1657
1574 /* possibly untie and reuse the cctx */ 1658 /* possibly untie and reuse the cctx */
1575 if (expect_true ( 1659 if (ecb_expect_true (
1576 cctx_current->idle_sp == STACKLEVEL 1660 cctx_current->idle_sp == STACKLEVEL
1577 && !(cctx_current->flags & CC_TRACE) 1661 && !(cctx_current->flags & CC_TRACE)
1578 && !force_cctx 1662 && !force_cctx
1579 )) 1663 ))
1580 { 1664 {
1581 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1665 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1582 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1666 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1583 1667
1584 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1668 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1585 /* without this the next cctx_get might destroy the running cctx while still in use */ 1669 /* without this the next cctx_get might destroy the running cctx while still in use */
1586 if (expect_false (CCTX_EXPIRED (cctx_current))) 1670 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1587 if (expect_true (!next->cctx)) 1671 if (ecb_expect_true (!next->cctx))
1588 next->cctx = cctx_get (aTHX); 1672 next->cctx = cctx_get (aTHX);
1589 1673
1590 cctx_put (cctx_current); 1674 cctx_put (cctx_current);
1591 } 1675 }
1592 else 1676 else
1593 prev->cctx = cctx_current; 1677 prev->cctx = cctx_current;
1594 1678
1595 ++next->usecount; 1679 ++next->usecount;
1596 1680
1597 cctx_prev = cctx_current; 1681 cctx_prev = cctx_current;
1598 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1682 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1599 1683
1600 next->cctx = 0; 1684 next->cctx = 0;
1601 1685
1602 if (expect_false (cctx_prev != cctx_current)) 1686 if (ecb_expect_false (cctx_prev != cctx_current))
1603 { 1687 {
1604 cctx_prev->top_env = PL_top_env; 1688 cctx_prev->top_env = PL_top_env;
1605 PL_top_env = cctx_current->top_env; 1689 PL_top_env = cctx_current->top_env;
1606 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1690 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1607 } 1691 }
… …
1613#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1697#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1614#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1698#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1615 1699
1616/** high level stuff ********************************************************/ 1700/** high level stuff ********************************************************/
1617 1701
1702/* this function is actually Coro, not Coro::State, but we call it from here */
1703/* because it is convenient - but it hasn't been declared yet for that reason */
1618static int 1704static void
1705coro_call_on_destroy (pTHX_ struct coro *coro);
1706
1707static void
1619coro_state_destroy (pTHX_ struct coro *coro) 1708coro_state_destroy (pTHX_ struct coro *coro)
1620{ 1709{
1621 if (coro->flags & CF_DESTROYED) 1710 if (coro->flags & CF_ZOMBIE)
1622 return 0; 1711 return;
1623 1712
1624 if (coro->on_destroy && !PL_dirty)
1625 coro->on_destroy (aTHX_ coro); 1713 slf_destroy (aTHX_ coro);
1626 1714
1627 coro->flags |= CF_DESTROYED; 1715 coro->flags |= CF_ZOMBIE;
1628 1716
1629 if (coro->flags & CF_READY) 1717 if (coro->flags & CF_READY)
1630 { 1718 {
1631 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1719 /* reduce nready, as destroying a ready coro effectively unreadies it */
1632 /* alternative: look through all ready queues and remove the coro */ 1720 /* alternative: look through all ready queues and remove the coro */
1633 --coro_nready; 1721 --coro_nready;
1634 } 1722 }
1635 else 1723 else
1636 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1724 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1725
1726 if (coro->next) coro->next->prev = coro->prev;
1727 if (coro->prev) coro->prev->next = coro->next;
1728 if (coro == coro_first) coro_first = coro->next;
1637 1729
1638 if (coro->mainstack 1730 if (coro->mainstack
1639 && coro->mainstack != main_mainstack 1731 && coro->mainstack != main_mainstack
1640 && coro->slot 1732 && coro->slot
1641 && !PL_dirty) 1733 && !PL_dirty)
1642 destroy_perl (aTHX_ coro); 1734 destroy_perl (aTHX_ coro);
1643 1735
1644 if (coro->next) coro->next->prev = coro->prev;
1645 if (coro->prev) coro->prev->next = coro->next;
1646 if (coro == coro_first) coro_first = coro->next;
1647
1648 cctx_destroy (coro->cctx); 1736 cctx_destroy (coro->cctx);
1649 SvREFCNT_dec (coro->startcv); 1737 SvREFCNT_dec (coro->startcv);
1650 SvREFCNT_dec (coro->args); 1738 SvREFCNT_dec (coro->args);
1651 SvREFCNT_dec (coro->swap_sv); 1739 SvREFCNT_dec (coro->swap_sv);
1652 SvREFCNT_dec (CORO_THROW); 1740 SvREFCNT_dec (CORO_THROW);
1653 1741
1654 return 1; 1742 coro_call_on_destroy (aTHX_ coro);
1743
1744 /* more destruction mayhem in coro_state_free */
1655} 1745}
1656 1746
1657static int 1747static int
1658coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1748coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1659{ 1749{
1660 struct coro *coro = (struct coro *)mg->mg_ptr; 1750 struct coro *coro = (struct coro *)mg->mg_ptr;
1661 mg->mg_ptr = 0; 1751 mg->mg_ptr = 0;
1662 1752
1663 coro->hv = 0;
1664
1665 if (--coro->refcnt < 0)
1666 {
1667 coro_state_destroy (aTHX_ coro); 1753 coro_state_destroy (aTHX_ coro);
1754 SvREFCNT_dec (coro->on_destroy);
1755 SvREFCNT_dec (coro->status);
1756
1668 Safefree (coro); 1757 Safefree (coro);
1669 }
1670 1758
1671 return 0; 1759 return 0;
1672} 1760}
1673 1761
1674static int 1762static int ecb_cold
1675coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1763coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1676{ 1764{
1677 struct coro *coro = (struct coro *)mg->mg_ptr; 1765 /* called when perl clones the current process the slow way (windows process emulation) */
1678 1766 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1679 ++coro->refcnt; 1767 mg->mg_ptr = 0;
1768 mg->mg_virtual = 0;
1680 1769
1681 return 0; 1770 return 0;
1682} 1771}
1683 1772
1684static MGVTBL coro_state_vtbl = { 1773static MGVTBL coro_state_vtbl = {
… …
1709 TRANSFER (ta, 1); 1798 TRANSFER (ta, 1);
1710} 1799}
1711 1800
1712/** Coro ********************************************************************/ 1801/** Coro ********************************************************************/
1713 1802
1714INLINE void 1803ecb_inline void
1715coro_enq (pTHX_ struct coro *coro) 1804coro_enq (pTHX_ struct coro *coro)
1716{ 1805{
1717 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1806 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1718 1807
1719 SvREFCNT_inc_NN (coro->hv); 1808 SvREFCNT_inc_NN (coro->hv);
… …
1721 coro->next_ready = 0; 1810 coro->next_ready = 0;
1722 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1811 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1723 ready [1] = coro; 1812 ready [1] = coro;
1724} 1813}
1725 1814
1726INLINE struct coro * 1815ecb_inline struct coro *
1727coro_deq (pTHX) 1816coro_deq (pTHX)
1728{ 1817{
1729 int prio; 1818 int prio;
1730 1819
1731 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1820 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1784{ 1873{
1785 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1874 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1786} 1875}
1787 1876
1788/* expects to own a reference to next->hv */ 1877/* expects to own a reference to next->hv */
1789INLINE void 1878ecb_inline void
1790prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1879prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1791{ 1880{
1792 SV *prev_sv = SvRV (coro_current); 1881 SV *prev_sv = SvRV (coro_current);
1793 1882
1794 ta->prev = SvSTATE_hv (prev_sv); 1883 ta->prev = SvSTATE_hv (prev_sv);
… …
1807{ 1896{
1808 for (;;) 1897 for (;;)
1809 { 1898 {
1810 struct coro *next = coro_deq (aTHX); 1899 struct coro *next = coro_deq (aTHX);
1811 1900
1812 if (expect_true (next)) 1901 if (ecb_expect_true (next))
1813 { 1902 {
1814 /* cannot transfer to destroyed coros, skip and look for next */ 1903 /* cannot transfer to destroyed coros, skip and look for next */
1815 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1904 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1816 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1905 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1817 else 1906 else
1818 { 1907 {
1819 next->flags &= ~CF_READY; 1908 next->flags &= ~CF_READY;
1820 --coro_nready; 1909 --coro_nready;
… …
1828 /* nothing to schedule: call the idle handler */ 1917 /* nothing to schedule: call the idle handler */
1829 if (SvROK (sv_idle) 1918 if (SvROK (sv_idle)
1830 && SvOBJECT (SvRV (sv_idle))) 1919 && SvOBJECT (SvRV (sv_idle)))
1831 { 1920 {
1832 if (SvRV (sv_idle) == SvRV (coro_current)) 1921 if (SvRV (sv_idle) == SvRV (coro_current))
1922 {
1923 require_pv ("Carp");
1924
1925 {
1926 dSP;
1927
1928 ENTER;
1929 SAVETMPS;
1930
1931 PUSHMARK (SP);
1833 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1932 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1933 PUTBACK;
1934 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1935
1936 FREETMPS;
1937 LEAVE;
1938 }
1939 }
1834 1940
1835 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1941 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1836 api_ready (aTHX_ SvRV (sv_idle)); 1942 api_ready (aTHX_ SvRV (sv_idle));
1837 --coro_nready; 1943 --coro_nready;
1838 } 1944 }
… …
1853 } 1959 }
1854 } 1960 }
1855 } 1961 }
1856} 1962}
1857 1963
1858INLINE void 1964ecb_inline void
1859prepare_cede (pTHX_ struct coro_transfer_args *ta) 1965prepare_cede (pTHX_ struct coro_transfer_args *ta)
1860{ 1966{
1861 api_ready (aTHX_ coro_current); 1967 api_ready (aTHX_ coro_current);
1862 prepare_schedule (aTHX_ ta); 1968 prepare_schedule (aTHX_ ta);
1863} 1969}
1864 1970
1865INLINE void 1971ecb_inline void
1866prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1972prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1867{ 1973{
1868 SV *prev = SvRV (coro_current); 1974 SV *prev = SvRV (coro_current);
1869 1975
1870 if (coro_nready) 1976 if (coro_nready)
… …
1900{ 2006{
1901 struct coro_transfer_args ta; 2007 struct coro_transfer_args ta;
1902 2008
1903 prepare_cede (aTHX_ &ta); 2009 prepare_cede (aTHX_ &ta);
1904 2010
1905 if (expect_true (ta.prev != ta.next)) 2011 if (ecb_expect_true (ta.prev != ta.next))
1906 { 2012 {
1907 TRANSFER (ta, 1); 2013 TRANSFER (ta, 1);
1908 return 1; 2014 return 1;
1909 } 2015 }
1910 else 2016 else
… …
1953 coro->slot->runops = RUNOPS_DEFAULT; 2059 coro->slot->runops = RUNOPS_DEFAULT;
1954 } 2060 }
1955} 2061}
1956 2062
1957static void 2063static void
2064coro_push_av (pTHX_ AV *av, I32 gimme_v)
2065{
2066 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2067 {
2068 dSP;
2069
2070 if (gimme_v == G_SCALAR)
2071 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2072 else
2073 {
2074 int i;
2075 EXTEND (SP, AvFILLp (av) + 1);
2076
2077 for (i = 0; i <= AvFILLp (av); ++i)
2078 PUSHs (AvARRAY (av)[i]);
2079 }
2080
2081 PUTBACK;
2082 }
2083}
2084
2085static void
2086coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2087{
2088 if (!coro->on_destroy)
2089 coro->on_destroy = newAV ();
2090
2091 av_push (coro->on_destroy, cb);
2092}
2093
2094static void
2095slf_destroy_join (pTHX_ struct CoroSLF *frame)
2096{
2097 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2098}
2099
2100static int
2101slf_check_join (pTHX_ struct CoroSLF *frame)
2102{
2103 struct coro *coro = (struct coro *)frame->data;
2104
2105 if (!coro->status)
2106 return 1;
2107
2108 frame->destroy = 0;
2109
2110 coro_push_av (aTHX_ coro->status, GIMME_V);
2111
2112 SvREFCNT_dec ((SV *)coro->hv);
2113
2114 return 0;
2115}
2116
2117static void
2118slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2119{
2120 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2121
2122 if (items > 1)
2123 croak ("join called with too many arguments");
2124
2125 if (coro->status)
2126 frame->prepare = prepare_nop;
2127 else
2128 {
2129 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2130 frame->prepare = prepare_schedule;
2131 }
2132
2133 frame->check = slf_check_join;
2134 frame->destroy = slf_destroy_join;
2135 frame->data = (void *)coro;
2136 SvREFCNT_inc (coro->hv);
2137}
2138
2139static void
1958coro_call_on_destroy (pTHX_ struct coro *coro) 2140coro_call_on_destroy (pTHX_ struct coro *coro)
1959{ 2141{
1960 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2142 AV *od = coro->on_destroy;
1961 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1962 2143
1963 if (on_destroyp) 2144 if (!od)
1964 { 2145 return;
1965 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1966 2146
2147 coro->on_destroy = 0;
2148 sv_2mortal ((SV *)od);
2149
1967 while (AvFILLp (on_destroy) >= 0) 2150 while (AvFILLp (od) >= 0)
2151 {
2152 SV *cb = sv_2mortal (av_pop (od));
2153
2154 /* coro hv's (and only hv's at the moment) are supported as well */
2155 if (SvSTATEhv_p (aTHX_ cb))
2156 api_ready (aTHX_ cb);
2157 else
1968 { 2158 {
1969 dSP; /* don't disturb outer sp */ 2159 dSP; /* don't disturb outer sp */
1970 SV *cb = av_pop (on_destroy);
1971
1972 PUSHMARK (SP); 2160 PUSHMARK (SP);
1973 2161
1974 if (statusp) 2162 if (coro->status)
1975 { 2163 {
1976 int i; 2164 PUTBACK;
1977 AV *status = (AV *)SvRV (*statusp); 2165 coro_push_av (aTHX_ coro->status, G_ARRAY);
1978 EXTEND (SP, AvFILLp (status) + 1); 2166 SPAGAIN;
1979
1980 for (i = 0; i <= AvFILLp (status); ++i)
1981 PUSHs (AvARRAY (status)[i]);
1982 } 2167 }
1983 2168
1984 PUTBACK; 2169 PUTBACK;
1985 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2170 call_sv (cb, G_VOID | G_DISCARD);
1986 } 2171 }
1987 } 2172 }
1988} 2173}
1989 2174
1990static void 2175static void
1991slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2176coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1992{ 2177{
1993 int i; 2178 AV *av;
1994 HV *hv = (HV *)SvRV (coro_current); 2179
1995 AV *av = newAV (); 2180 if (coro->status)
2181 {
2182 av = coro->status;
2183 av_clear (av);
2184 }
2185 else
2186 av = coro->status = newAV ();
1996 2187
1997 /* items are actually not so common, so optimise for this case */ 2188 /* items are actually not so common, so optimise for this case */
1998 if (items) 2189 if (items)
1999 { 2190 {
2191 int i;
2192
2000 av_extend (av, items - 1); 2193 av_extend (av, items - 1);
2001 2194
2002 for (i = 0; i < items; ++i) 2195 for (i = 0; i < items; ++i)
2003 av_push (av, SvREFCNT_inc_NN (arg [i])); 2196 av_push (av, SvREFCNT_inc_NN (arg [i]));
2004 } 2197 }
2198}
2005 2199
2006 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2200static void
2007 2201slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2202{
2008 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2203 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2009 api_ready (aTHX_ sv_manager); 2204 api_ready (aTHX_ sv_manager);
2010 2205
2011 frame->prepare = prepare_schedule; 2206 frame->prepare = prepare_schedule;
2012 frame->check = slf_check_repeat; 2207 frame->check = slf_check_repeat;
2013 2208
2014 /* as a minor optimisation, we could unwind all stacks here */ 2209 /* as a minor optimisation, we could unwind all stacks here */
2015 /* but that puts extra pressure on pp_slf, and is not worth much */ 2210 /* but that puts extra pressure on pp_slf, and is not worth much */
2016 /*coro_unwind_stacks (aTHX);*/ 2211 /*coro_unwind_stacks (aTHX);*/
2212}
2213
2214static void
2215slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2216{
2217 HV *coro_hv = (HV *)SvRV (coro_current);
2218
2219 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2220 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2221}
2222
2223static void
2224slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2225{
2226 HV *coro_hv;
2227 struct coro *coro;
2228
2229 if (items <= 0)
2230 croak ("Coro::cancel called without coro object,");
2231
2232 coro = SvSTATE (arg [0]);
2233 coro_hv = coro->hv;
2234
2235 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2236
2237 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2238 {
2239 /* coro currently busy cancelling something, so just notify it */
2240 coro->slf_frame.data = (void *)coro;
2241
2242 frame->prepare = prepare_nop;
2243 frame->check = slf_check_nop;
2244 }
2245 else if (coro_hv == (HV *)SvRV (coro_current))
2246 {
2247 /* cancelling the current coro is allowed, and equals terminate */
2248 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2249 }
2250 else
2251 {
2252 struct coro *self = SvSTATE_current;
2253
2254 if (!self)
2255 croak ("Coro::cancel called outside of thread content,");
2256
2257 /* otherwise we cancel directly, purely for speed reasons
2258 * unfortunately, this requires some magic trickery, as
2259 * somebody else could cancel us, so we have to fight the cancellation.
2260 * this is ugly, and hopefully fully worth the extra speed.
2261 * besides, I can't get the slow-but-safe version working...
2262 */
2263 slf_frame.data = 0;
2264 self->flags |= CF_NOCANCEL;
2265 coro_state_destroy (aTHX_ coro);
2266 self->flags &= ~CF_NOCANCEL;
2267
2268 if (slf_frame.data)
2269 {
2270 /* while we were busy we have been cancelled, so terminate */
2271 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2272 }
2273 else
2274 {
2275 frame->prepare = prepare_nop;
2276 frame->check = slf_check_nop;
2277 }
2278 }
2279}
2280
2281static int
2282slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2283{
2284 frame->prepare = 0;
2285 coro_unwind_stacks (aTHX);
2286
2287 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2288
2289 return 1;
2290}
2291
2292static int
2293safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2294{
2295 if (coro->cctx)
2296 croak ("coro inside C callback, unable to cancel at this time, caught");
2297
2298 if (coro->flags & CF_NEW)
2299 {
2300 coro_set_status (aTHX_ coro, arg, items);
2301 coro_state_destroy (aTHX_ coro);
2302 }
2303 else
2304 {
2305 if (!coro->slf_frame.prepare)
2306 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2307
2308 slf_destroy (aTHX_ coro);
2309
2310 coro_set_status (aTHX_ coro, arg, items);
2311 coro->slf_frame.prepare = prepare_nop;
2312 coro->slf_frame.check = slf_check_safe_cancel;
2313
2314 api_ready (aTHX_ (SV *)coro->hv);
2315 }
2316
2317 return 1;
2017} 2318}
2018 2319
2019/*****************************************************************************/ 2320/*****************************************************************************/
2020/* async pool handler */ 2321/* async pool handler */
2021 2322
… …
2052slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2353slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2053{ 2354{
2054 HV *hv = (HV *)SvRV (coro_current); 2355 HV *hv = (HV *)SvRV (coro_current);
2055 struct coro *coro = SvSTATE_hv ((SV *)hv); 2356 struct coro *coro = SvSTATE_hv ((SV *)hv);
2056 2357
2057 if (expect_true (coro->saved_deffh)) 2358 if (ecb_expect_true (coro->saved_deffh))
2058 { 2359 {
2059 /* subsequent iteration */ 2360 /* subsequent iteration */
2060 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2361 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2061 coro->saved_deffh = 0; 2362 coro->saved_deffh = 0;
2062 2363
2063 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2364 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2064 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2365 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2065 { 2366 {
2066 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2367 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2067 coro->invoke_av = newAV (); 2368 return;
2068
2069 frame->prepare = prepare_nop;
2070 } 2369 }
2071 else 2370 else
2072 { 2371 {
2073 av_clear (GvAV (PL_defgv)); 2372 av_clear (GvAV (PL_defgv));
2074 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2373 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2124 2423
2125static int 2424static int
2126slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2425slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2127{ 2426{
2128 SV *data = (SV *)frame->data; 2427 SV *data = (SV *)frame->data;
2129 2428
2130 if (CORO_THROW) 2429 if (CORO_THROW)
2131 return 0; 2430 return 0;
2132 2431
2133 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2432 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2134 return 1; 2433 return 1;
… …
2170 cb = sv_2mortal (coro->rouse_cb); 2469 cb = sv_2mortal (coro->rouse_cb);
2171 coro->rouse_cb = 0; 2470 coro->rouse_cb = 0;
2172 } 2471 }
2173 2472
2174 if (!SvROK (cb) 2473 if (!SvROK (cb)
2175 || SvTYPE (SvRV (cb)) != SVt_PVCV 2474 || SvTYPE (SvRV (cb)) != SVt_PVCV
2176 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2475 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2177 croak ("Coro::rouse_wait called with illegal callback argument,"); 2476 croak ("Coro::rouse_wait called with illegal callback argument,");
2178 2477
2179 { 2478 {
2180 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2479 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2297static void 2596static void
2298slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2597slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2299{ 2598{
2300 frame->prepare = prepare_cede_notself; 2599 frame->prepare = prepare_cede_notself;
2301 frame->check = slf_check_nop; 2600 frame->check = slf_check_nop;
2601}
2602
2603/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2604static void
2605slf_destroy (pTHX_ struct coro *coro)
2606{
2607 struct CoroSLF frame = coro->slf_frame;
2608
2609 /*
2610 * The on_destroy below most likely is from an SLF call.
2611 * Since by definition the SLF call will not finish when we destroy
2612 * the coro, we will have to force-finish it here, otherwise
2613 * cleanup functions cannot call SLF functions.
2614 */
2615 coro->slf_frame.prepare = 0;
2616
2617 /* this callback is reserved for slf functions needing to do cleanup */
2618 if (frame.destroy && frame.prepare && !PL_dirty)
2619 frame.destroy (aTHX_ &frame);
2302} 2620}
2303 2621
2304/* 2622/*
2305 * these not obviously related functions are all rolled into one 2623 * these not obviously related functions are all rolled into one
2306 * function to increase chances that they all will call transfer with the same 2624 * function to increase chances that they all will call transfer with the same
… …
2313 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2631 I32 checkmark; /* mark SP to see how many elements check has pushed */
2314 2632
2315 /* set up the slf frame, unless it has already been set-up */ 2633 /* set up the slf frame, unless it has already been set-up */
2316 /* the latter happens when a new coro has been started */ 2634 /* the latter happens when a new coro has been started */
2317 /* or when a new cctx was attached to an existing coroutine */ 2635 /* or when a new cctx was attached to an existing coroutine */
2318 if (expect_true (!slf_frame.prepare)) 2636 if (ecb_expect_true (!slf_frame.prepare))
2319 { 2637 {
2320 /* first iteration */ 2638 /* first iteration */
2321 dSP; 2639 dSP;
2322 SV **arg = PL_stack_base + TOPMARK + 1; 2640 SV **arg = PL_stack_base + TOPMARK + 1;
2323 int items = SP - arg; /* args without function object */ 2641 int items = SP - arg; /* args without function object */
… …
2364 while (slf_frame.check (aTHX_ &slf_frame)); 2682 while (slf_frame.check (aTHX_ &slf_frame));
2365 2683
2366 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2684 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2367 2685
2368 /* exception handling */ 2686 /* exception handling */
2369 if (expect_false (CORO_THROW)) 2687 if (ecb_expect_false (CORO_THROW))
2370 { 2688 {
2371 SV *exception = sv_2mortal (CORO_THROW); 2689 SV *exception = sv_2mortal (CORO_THROW);
2372 2690
2373 CORO_THROW = 0; 2691 CORO_THROW = 0;
2374 sv_setsv (ERRSV, exception); 2692 sv_setsv (ERRSV, exception);
2375 croak (0); 2693 croak (0);
2376 } 2694 }
2377 2695
2378 /* return value handling - mostly like entersub */ 2696 /* return value handling - mostly like entersub */
2379 /* make sure we put something on the stack in scalar context */ 2697 /* make sure we put something on the stack in scalar context */
2380 if (GIMME_V == G_SCALAR) 2698 if (GIMME_V == G_SCALAR
2699 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2381 { 2700 {
2382 dSP; 2701 dSP;
2383 SV **bot = PL_stack_base + checkmark; 2702 SV **bot = PL_stack_base + checkmark;
2384 2703
2385 if (sp == bot) /* too few, push undef */ 2704 if (sp == bot) /* too few, push undef */
2386 bot [1] = &PL_sv_undef; 2705 bot [1] = &PL_sv_undef;
2387 else if (sp != bot + 1) /* too many, take last one */ 2706 else /* too many, take last one */
2388 bot [1] = *sp; 2707 bot [1] = *sp;
2389 2708
2390 SP = bot + 1; 2709 SP = bot + 1;
2391 2710
2392 PUTBACK; 2711 PUTBACK;
… …
2499{ 2818{
2500 PerlIOBuf base; 2819 PerlIOBuf base;
2501 NV next, every; 2820 NV next, every;
2502} PerlIOCede; 2821} PerlIOCede;
2503 2822
2504static IV 2823static IV ecb_cold
2505PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2824PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2506{ 2825{
2507 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2826 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2508 2827
2509 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2828 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2510 self->next = nvtime () + self->every; 2829 self->next = nvtime () + self->every;
2511 2830
2512 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2831 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2513} 2832}
2514 2833
2515static SV * 2834static SV * ecb_cold
2516PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2835PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2517{ 2836{
2518 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2837 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2519 2838
2520 return newSVnv (self->every); 2839 return newSVnv (self->every);
… …
2632 SvREFCNT_dec (cb); 2951 SvREFCNT_dec (cb);
2633 } 2952 }
2634} 2953}
2635 2954
2636static void 2955static void
2637coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2956coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2638{ 2957{
2639 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2958 /* call $sem->adjust (0) to possibly wake up some other waiters */
2640 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2959 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2641} 2960}
2642 2961
2643static int 2962static int
2644slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2963slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2645{ 2964{
2646 AV *av = (AV *)frame->data; 2965 AV *av = (AV *)frame->data;
2647 SV *count_sv = AvARRAY (av)[0]; 2966 SV *count_sv = AvARRAY (av)[0];
2967 SV *coro_hv = SvRV (coro_current);
2968
2969 frame->destroy = 0;
2648 2970
2649 /* if we are about to throw, don't actually acquire the lock, just throw */ 2971 /* if we are about to throw, don't actually acquire the lock, just throw */
2650 if (CORO_THROW) 2972 if (ecb_expect_false (CORO_THROW))
2973 {
2974 /* we still might be responsible for the semaphore, so wake up others */
2975 coro_semaphore_adjust (aTHX_ av, 0);
2976
2651 return 0; 2977 return 0;
2978 }
2652 else if (SvIVX (count_sv) > 0) 2979 else if (SvIVX (count_sv) > 0)
2653 { 2980 {
2654 SvSTATE_current->on_destroy = 0;
2655
2656 if (acquire) 2981 if (acquire)
2657 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2982 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2658 else 2983 else
2659 coro_semaphore_adjust (aTHX_ av, 0); 2984 coro_semaphore_adjust (aTHX_ av, 0);
2660 2985
… …
2664 { 2989 {
2665 int i; 2990 int i;
2666 /* if we were woken up but can't down, we look through the whole */ 2991 /* if we were woken up but can't down, we look through the whole */
2667 /* waiters list and only add us if we aren't in there already */ 2992 /* waiters list and only add us if we aren't in there already */
2668 /* this avoids some degenerate memory usage cases */ 2993 /* this avoids some degenerate memory usage cases */
2669 2994 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2670 for (i = 1; i <= AvFILLp (av); ++i)
2671 if (AvARRAY (av)[i] == SvRV (coro_current)) 2995 if (AvARRAY (av)[i] == coro_hv)
2672 return 1; 2996 return 1;
2673 2997
2674 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2998 av_push (av, SvREFCNT_inc (coro_hv));
2675 return 1; 2999 return 1;
2676 } 3000 }
2677} 3001}
2678 3002
2679static int 3003static int
… …
2702 { 3026 {
2703 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3027 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2704 3028
2705 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3029 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2706 frame->prepare = prepare_schedule; 3030 frame->prepare = prepare_schedule;
2707
2708 /* to avoid race conditions when a woken-up coro gets terminated */ 3031 /* to avoid race conditions when a woken-up coro gets terminated */
2709 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3032 /* we arrange for a temporary on_destroy that calls adjust (0) */
2710 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3033 frame->destroy = coro_semaphore_destroy;
2711 } 3034 }
2712} 3035}
2713 3036
2714static void 3037static void
2715slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3038slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2884 /* it quickly returns */ 3207 /* it quickly returns */
2885 if (CORO_THROW) 3208 if (CORO_THROW)
2886 return 0; 3209 return 0;
2887 3210
2888 /* one element that is an RV? repeat! */ 3211 /* one element that is an RV? repeat! */
2889 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3212 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2890 return 1; 3213 return 1;
2891 3214
2892 /* restore status */ 3215 /* restore status */
2893 { 3216 {
2894 SV *data_sv = av_pop (state); 3217 SV *data_sv = av_pop (state);
… …
2933 dSP; 3256 dSP;
2934 3257
2935 static SV *prio_cv; 3258 static SV *prio_cv;
2936 static SV *prio_sv; 3259 static SV *prio_sv;
2937 3260
2938 if (expect_false (!prio_cv)) 3261 if (ecb_expect_false (!prio_cv))
2939 { 3262 {
2940 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3263 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2941 prio_sv = newSViv (0); 3264 prio_sv = newSViv (0);
2942 } 3265 }
2943 3266
… …
3049 } 3372 }
3050 3373
3051 return coro_sv; 3374 return coro_sv;
3052} 3375}
3053 3376
3377#ifndef __cplusplus
3378ecb_cold XS(boot_Coro__State);
3379#endif
3380
3381#if CORO_JIT
3382
3383static void ecb_noinline ecb_cold
3384pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3385{
3386 dSP;
3387 AV *av = newAV ();
3388
3389 av_store (av, 3, newSVuv (d));
3390 av_store (av, 2, newSVuv (c));
3391 av_store (av, 1, newSVuv (b));
3392 av_store (av, 0, newSVuv (a));
3393
3394 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3395
3396 PUTBACK;
3397}
3398
3399static void ecb_noinline ecb_cold
3400jit_init (pTHX)
3401{
3402 dSP;
3403 SV *load, *save;
3404 char *map_base;
3405 char *load_ptr, *save_ptr;
3406 STRLEN load_len, save_len, map_len;
3407 int count;
3408
3409 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3410
3411 PUSHMARK (SP);
3412 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3413 #include "state.h"
3414 count = call_pv ("Coro::State::_jit", G_ARRAY);
3415 SPAGAIN;
3416
3417 save = POPs; save_ptr = SvPVbyte (save, save_len);
3418 load = POPs; load_ptr = SvPVbyte (load, load_len);
3419
3420 map_len = load_len + save_len + 16;
3421
3422 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3423
3424 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3425
3426 load_perl_slots = (load_save_perl_slots_type)map_base;
3427 memcpy (map_base, load_ptr, load_len);
3428
3429 map_base += (load_len + 15) & ~15;
3430
3431 save_perl_slots = (load_save_perl_slots_type)map_base;
3432 memcpy (map_base, save_ptr, save_len);
3433
3434 /* we are good citizens and try to make the page read-only, so the evil evil */
3435 /* hackers might have it a bit more difficult */
3436 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3437
3438 PUTBACK;
3439 eval_pv ("undef &Coro::State::_jit", 1);
3440}
3441
3442#endif
3443
3054MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3444MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3055 3445
3056PROTOTYPES: DISABLE 3446PROTOTYPES: DISABLE
3057 3447
3058BOOT: 3448BOOT:
… …
3060#ifdef USE_ITHREADS 3450#ifdef USE_ITHREADS
3061# if CORO_PTHREAD 3451# if CORO_PTHREAD
3062 coro_thx = PERL_GET_CONTEXT; 3452 coro_thx = PERL_GET_CONTEXT;
3063# endif 3453# endif
3064#endif 3454#endif
3065 BOOT_PAGESIZE; 3455 /* perl defines these to check for existance first, but why it doesn't */
3456 /* just create them one at init time is not clear to me, except for */
3457 /* programs trying to delete them, but... */
3458 /* anyway, we declare this as invalid and make sure they are initialised here */
3459 DEFSV;
3460 ERRSV;
3066 3461
3067 cctx_current = cctx_new_empty (); 3462 cctx_current = cctx_new_empty ();
3068 3463
3069 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3464 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3070 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3465 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3110 coroapi.prepare_nop = prepare_nop; 3505 coroapi.prepare_nop = prepare_nop;
3111 coroapi.prepare_schedule = prepare_schedule; 3506 coroapi.prepare_schedule = prepare_schedule;
3112 coroapi.prepare_cede = prepare_cede; 3507 coroapi.prepare_cede = prepare_cede;
3113 coroapi.prepare_cede_notself = prepare_cede_notself; 3508 coroapi.prepare_cede_notself = prepare_cede_notself;
3114 3509
3115 { 3510 time_init (aTHX);
3116 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3117
3118 if (!svp) croak ("Time::HiRes is required");
3119 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3120
3121 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3122
3123 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3124 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3125 }
3126 3511
3127 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3512 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3513#if CORO_JIT
3514 PUTBACK;
3515 jit_init (aTHX);
3516 SPAGAIN;
3517#endif
3128} 3518}
3129 3519
3130SV * 3520SV *
3131new (SV *klass, ...) 3521new (SV *klass, ...)
3132 ALIAS: 3522 ALIAS:
… …
3139void 3529void
3140transfer (...) 3530transfer (...)
3141 PROTOTYPE: $$ 3531 PROTOTYPE: $$
3142 CODE: 3532 CODE:
3143 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3533 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3144
3145bool
3146_destroy (SV *coro_sv)
3147 CODE:
3148 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3149 OUTPUT:
3150 RETVAL
3151
3152void
3153_exit (int code)
3154 PROTOTYPE: $
3155 CODE:
3156 _exit (code);
3157 3534
3158SV * 3535SV *
3159clone (Coro::State coro) 3536clone (Coro::State coro)
3160 CODE: 3537 CODE:
3161{ 3538{
… …
3216void 3593void
3217list () 3594list ()
3218 PROTOTYPE: 3595 PROTOTYPE:
3219 PPCODE: 3596 PPCODE:
3220{ 3597{
3221 struct coro *coro; 3598 struct coro *coro;
3222 for (coro = coro_first; coro; coro = coro->next) 3599 for (coro = coro_first; coro; coro = coro->next)
3223 if (coro->hv) 3600 if (coro->hv)
3224 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3601 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3225} 3602}
3226 3603
… …
3231 CODE: 3608 CODE:
3232{ 3609{
3233 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3610 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3234 { 3611 {
3235 struct coro *current = SvSTATE_current; 3612 struct coro *current = SvSTATE_current;
3613 struct CoroSLF slf_save;
3236 3614
3237 if (current != coro) 3615 if (current != coro)
3238 { 3616 {
3239 PUTBACK; 3617 PUTBACK;
3240 save_perl (aTHX_ current); 3618 save_perl (aTHX_ current);
3241 load_perl (aTHX_ coro); 3619 load_perl (aTHX_ coro);
3620 /* the coro is most likely in an active SLF call.
3621 * while not strictly required (the code we execute is
3622 * not allowed to call any SLF functions), it's cleaner
3623 * to reinitialise the slf_frame and restore it later.
3624 * This might one day allow us to actually do SLF calls
3625 * from code executed here.
3626 */
3627 slf_save = slf_frame;
3628 slf_frame.prepare = 0;
3242 SPAGAIN; 3629 SPAGAIN;
3243 } 3630 }
3244 3631
3245 PUSHSTACK; 3632 PUSHSTACK;
3246 3633
… …
3256 SPAGAIN; 3643 SPAGAIN;
3257 3644
3258 if (current != coro) 3645 if (current != coro)
3259 { 3646 {
3260 PUTBACK; 3647 PUTBACK;
3648 slf_frame = slf_save;
3261 save_perl (aTHX_ coro); 3649 save_perl (aTHX_ coro);
3262 load_perl (aTHX_ current); 3650 load_perl (aTHX_ current);
3263 SPAGAIN; 3651 SPAGAIN;
3264 } 3652 }
3265 } 3653 }
… …
3270 PROTOTYPE: $ 3658 PROTOTYPE: $
3271 ALIAS: 3659 ALIAS:
3272 is_ready = CF_READY 3660 is_ready = CF_READY
3273 is_running = CF_RUNNING 3661 is_running = CF_RUNNING
3274 is_new = CF_NEW 3662 is_new = CF_NEW
3275 is_destroyed = CF_DESTROYED 3663 is_destroyed = CF_ZOMBIE
3664 is_zombie = CF_ZOMBIE
3276 is_suspended = CF_SUSPENDED 3665 is_suspended = CF_SUSPENDED
3277 CODE: 3666 CODE:
3278 RETVAL = boolSV (coro->flags & ix); 3667 RETVAL = boolSV (coro->flags & ix);
3279 OUTPUT: 3668 OUTPUT:
3280 RETVAL 3669 RETVAL
3281 3670
3282void 3671void
3283throw (Coro::State self, SV *exception = &PL_sv_undef) 3672throw (SV *self, SV *exception = &PL_sv_undef)
3284 PROTOTYPE: $;$ 3673 PROTOTYPE: $;$
3285 CODE: 3674 CODE:
3286{ 3675{
3676 struct coro *coro = SvSTATE (self);
3287 struct coro *current = SvSTATE_current; 3677 struct coro *current = SvSTATE_current;
3288 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3678 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3289 SvREFCNT_dec (*exceptionp); 3679 SvREFCNT_dec (*exceptionp);
3290 SvGETMAGIC (exception); 3680 SvGETMAGIC (exception);
3291 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3681 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3682
3683 api_ready (aTHX_ self);
3292} 3684}
3293 3685
3294void 3686void
3295api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3687api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3296 PROTOTYPE: $;$ 3688 PROTOTYPE: $;$
… …
3351 3743
3352void 3744void
3353cancel (Coro::State self) 3745cancel (Coro::State self)
3354 CODE: 3746 CODE:
3355 coro_state_destroy (aTHX_ self); 3747 coro_state_destroy (aTHX_ self);
3356 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3357
3358 3748
3359SV * 3749SV *
3360enable_times (int enabled = enable_times) 3750enable_times (int enabled = enable_times)
3361 CODE: 3751 CODE:
3362{ 3752{
… …
3375 3765
3376void 3766void
3377times (Coro::State self) 3767times (Coro::State self)
3378 PPCODE: 3768 PPCODE:
3379{ 3769{
3380 struct coro *current = SvSTATE (coro_current); 3770 struct coro *current = SvSTATE (coro_current);
3381 3771
3382 if (expect_false (current == self)) 3772 if (ecb_expect_false (current == self))
3383 { 3773 {
3384 coro_times_update (); 3774 coro_times_update ();
3385 coro_times_add (SvSTATE (coro_current)); 3775 coro_times_add (SvSTATE (coro_current));
3386 } 3776 }
3387 3777
3388 EXTEND (SP, 2); 3778 EXTEND (SP, 2);
3389 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3779 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3390 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3780 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3391 3781
3392 if (expect_false (current == self)) 3782 if (ecb_expect_false (current == self))
3393 coro_times_sub (SvSTATE (coro_current)); 3783 coro_times_sub (SvSTATE (coro_current));
3394} 3784}
3395 3785
3396void 3786void
3397swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3787swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3418BOOT: 3808BOOT:
3419{ 3809{
3420 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3810 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3421 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3811 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3422 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3812 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3423 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3424 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3813 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3425 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3814 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3426 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3815 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3427 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3816 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3428 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3817 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3429 3818
3430 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3819 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3431 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3820 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3432 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3821 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3433 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3822 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3434 3823
3435 coro_stash = gv_stashpv ("Coro", TRUE); 3824 coro_stash = gv_stashpv ("Coro", TRUE);
3436 3825
3437 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3826 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3438 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3827 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3439 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3828 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3467 api_ready (aTHX_ RETVAL); 3856 api_ready (aTHX_ RETVAL);
3468 OUTPUT: 3857 OUTPUT:
3469 RETVAL 3858 RETVAL
3470 3859
3471void 3860void
3861_destroy (Coro::State coro)
3862 CODE:
3863 /* used by the manager thread */
3864 coro_state_destroy (aTHX_ coro);
3865
3866void
3867on_destroy (Coro::State coro, SV *cb)
3868 CODE:
3869 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3870
3871void
3872join (...)
3873 CODE:
3874 CORO_EXECUTE_SLF_XS (slf_init_join);
3875
3876void
3472terminate (...) 3877terminate (...)
3473 CODE: 3878 CODE:
3474 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3879 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3880
3881void
3882cancel (...)
3883 CODE:
3884 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3885
3886int
3887safe_cancel (Coro::State self, ...)
3888 C_ARGS: aTHX_ self, &ST (1), items - 1
3475 3889
3476void 3890void
3477schedule (...) 3891schedule (...)
3478 CODE: 3892 CODE:
3479 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3893 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3636 on_leave = 1 4050 on_leave = 1
3637 PROTOTYPE: & 4051 PROTOTYPE: &
3638 CODE: 4052 CODE:
3639{ 4053{
3640 struct coro *coro = SvSTATE_current; 4054 struct coro *coro = SvSTATE_current;
3641 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4055 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3642 4056
3643 block = s_get_cv_croak (block); 4057 block = s_get_cv_croak (block);
3644 4058
3645 if (!*avp) 4059 if (!*avp)
3646 *avp = newAV (); 4060 *avp = newAV ();
… …
3666 4080
3667SV * 4081SV *
3668new (SV *klass, SV *count = 0) 4082new (SV *klass, SV *count = 0)
3669 CODE: 4083 CODE:
3670{ 4084{
3671 int semcnt = 1; 4085 int semcnt = 1;
3672 4086
3673 if (count) 4087 if (count)
3674 { 4088 {
3675 SvGETMAGIC (count); 4089 SvGETMAGIC (count);
3676 4090
… …
3736 XSRETURN_NO; 4150 XSRETURN_NO;
3737} 4151}
3738 4152
3739void 4153void
3740waiters (SV *self) 4154waiters (SV *self)
3741 PPCODE: 4155 PPCODE:
3742{ 4156{
3743 AV *av = (AV *)SvRV (self); 4157 AV *av = (AV *)SvRV (self);
3744 int wcount = AvFILLp (av) + 1 - 1; 4158 int wcount = AvFILLp (av) + 1 - 1;
3745 4159
3746 if (GIMME_V == G_SCALAR) 4160 if (GIMME_V == G_SCALAR)
… …
3755} 4169}
3756 4170
3757MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4171MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3758 4172
3759void 4173void
3760_may_delete (SV *sem, int count, int extra_refs) 4174_may_delete (SV *sem, int count, unsigned int extra_refs)
3761 PPCODE: 4175 PPCODE:
3762{ 4176{
3763 AV *av = (AV *)SvRV (sem); 4177 AV *av = (AV *)SvRV (sem);
3764 4178
3765 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4179 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3766 && AvFILLp (av) == 0 /* no waiters, just count */ 4180 && AvFILLp (av) == 0 /* no waiters, just count */
3767 && SvIV (AvARRAY (av)[0]) == count) 4181 && SvIV (AvARRAY (av)[0]) == count)
3768 XSRETURN_YES; 4182 XSRETURN_YES;
… …
3789 4203
3790void 4204void
3791broadcast (SV *self) 4205broadcast (SV *self)
3792 CODE: 4206 CODE:
3793{ 4207{
3794 AV *av = (AV *)SvRV (self); 4208 AV *av = (AV *)SvRV (self);
3795 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4209 coro_signal_wake (aTHX_ av, AvFILLp (av));
3796} 4210}
3797 4211
3798void 4212void
3799send (SV *self) 4213send (SV *self)
… …
3807 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4221 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3808} 4222}
3809 4223
3810IV 4224IV
3811awaited (SV *self) 4225awaited (SV *self)
3812 CODE: 4226 CODE:
3813 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4227 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3814 OUTPUT: 4228 OUTPUT:
3815 RETVAL 4229 RETVAL
3816 4230
3817 4231
… …
3822 4236
3823void 4237void
3824_schedule (...) 4238_schedule (...)
3825 CODE: 4239 CODE:
3826{ 4240{
3827 static int incede; 4241 static int incede;
3828 4242
3829 api_cede_notself (aTHX); 4243 api_cede_notself (aTHX);
3830 4244
3831 ++incede; 4245 ++incede;
3832 while (coro_nready >= incede && api_cede (aTHX)) 4246 while (coro_nready >= incede && api_cede (aTHX))
… …
3876 { 4290 {
3877 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4291 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3878 coro_old_pp_sselect = 0; 4292 coro_old_pp_sselect = 0;
3879 } 4293 }
3880 4294
4295MODULE = Coro::State PACKAGE = Coro::Util
4296
4297void
4298_exit (int code)
4299 CODE:
4300 _exit (code);
4301
4302NV
4303time ()
4304 CODE:
4305 RETVAL = nvtime (aTHX);
4306 OUTPUT:
4307 RETVAL
4308
4309NV
4310gettimeofday ()
4311 PPCODE:
4312{
4313 UV tv [2];
4314 u2time (aTHX_ tv);
4315 EXTEND (SP, 2);
4316 PUSHs (sv_2mortal (newSVuv (tv [0])));
4317 PUSHs (sv_2mortal (newSVuv (tv [1])));
4318}
4319

Diff Legend

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