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.438 by root, Mon Nov 18 10:27:53 2013 UTC

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

Diff Legend

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