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.370 by root, Thu Aug 20 21:38:51 2009 UTC vs.
Revision 1.430 by root, Wed Dec 19 23:36:16 2012 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
… …
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "schmorp.h" 16#include "schmorp.h"
12 17
18#define ECB_NO_THREADS 1
19#include "ecb.h"
20
21#include <stddef.h>
13#include <stdio.h> 22#include <stdio.h>
14#include <errno.h> 23#include <errno.h>
15#include <assert.h> 24#include <assert.h>
16 25
17#ifdef WIN32 26#ifndef SVs_PADSTALE
27# define SVs_PADSTALE 0
28#endif
29
30#ifdef PadARRAY
31# define NEWPADAPI
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#if defined(_WIN32)
48# undef HAS_GETTIMEOFDAY
18# undef setjmp 49# undef setjmp
19# undef longjmp 50# undef longjmp
20# undef _exit 51# undef _exit
21# define setjmp _setjmp /* deep magic */ 52# define setjmp _setjmp /* deep magic */
22#else 53#else
23# include <inttypes.h> /* most portable stdint.h */ 54# include <inttypes.h> /* most portable stdint.h */
24#endif 55#endif
25 56
26#ifdef HAVE_MMAP
27# include <unistd.h>
28# include <sys/mman.h>
29# ifndef MAP_ANONYMOUS
30# ifdef MAP_ANON
31# define MAP_ANONYMOUS MAP_ANON
32# else
33# undef HAVE_MMAP
34# endif
35# endif
36# include <limits.h>
37# ifndef PAGESIZE
38# define PAGESIZE pagesize
39# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
40static long pagesize;
41# else
42# define BOOT_PAGESIZE (void)0
43# endif
44#else
45# define PAGESIZE 0
46# define BOOT_PAGESIZE (void)0
47#endif
48
49#if CORO_USE_VALGRIND
50# include <valgrind/valgrind.h>
51#endif
52
53/* the maximum number of idle cctx that will be pooled */ 57/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 58static int cctx_max_idle = 4;
55 59
56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 60#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57# undef CORO_STACKGUARD 61# define HAS_SCOPESTACK_NAME 1
58#endif
59
60#ifndef CORO_STACKGUARD
61# define CORO_STACKGUARD 0
62#endif 62#endif
63 63
64/* prefer perl internal functions over our own? */ 64/* prefer perl internal functions over our own? */
65#ifndef CORO_PREFER_PERL_FUNCTIONS 65#ifndef CORO_PREFER_PERL_FUNCTIONS
66# define CORO_PREFER_PERL_FUNCTIONS 0 66# define CORO_PREFER_PERL_FUNCTIONS 0
… …
76# define STACKLEVEL ((void *)&stacklevel) 76# define STACKLEVEL ((void *)&stacklevel)
77#endif 77#endif
78 78
79#define IN_DESTRUCT PL_dirty 79#define IN_DESTRUCT PL_dirty
80 80
81#if __GNUC__ >= 3
82# define attribute(x) __attribute__(x)
83# define expect(expr,value) __builtin_expect ((expr), (value))
84# define INLINE static inline
85#else
86# define attribute(x)
87# define expect(expr,value) (expr)
88# define INLINE static
89#endif
90
91#define expect_false(expr) expect ((expr) != 0, 0)
92#define expect_true(expr) expect ((expr) != 0, 1)
93
94#define NOINLINE attribute ((noinline))
95
96#include "CoroAPI.h" 81#include "CoroAPI.h"
97#define GCoroAPI (&coroapi) /* very sneaky */ 82#define GCoroAPI (&coroapi) /* very sneaky */
98 83
99#ifdef USE_ITHREADS 84#ifdef USE_ITHREADS
100# if CORO_PTHREAD 85# if CORO_PTHREAD
… …
116static void (*u2time)(pTHX_ UV ret[2]); 101static void (*u2time)(pTHX_ UV ret[2]);
117 102
118/* we hijack an hopefully unused CV flag for our purposes */ 103/* we hijack an hopefully unused CV flag for our purposes */
119#define CVf_SLF 0x4000 104#define CVf_SLF 0x4000
120static OP *pp_slf (pTHX); 105static OP *pp_slf (pTHX);
106static void slf_destroy (pTHX_ struct coro *coro);
121 107
122static U32 cctx_gen; 108static U32 cctx_gen;
123static size_t cctx_stacksize = CORO_STACKSIZE; 109static size_t cctx_stacksize = CORO_STACKSIZE;
124static struct CoroAPI coroapi; 110static struct CoroAPI coroapi;
125static AV *main_mainstack; /* used to differentiate between $main and others */ 111static AV *main_mainstack; /* used to differentiate between $main and others */
… …
155static char times_valid; 141static char times_valid;
156 142
157static struct coro_cctx *cctx_first; 143static struct coro_cctx *cctx_first;
158static int cctx_count, cctx_idle; 144static int cctx_count, cctx_idle;
159 145
160enum { 146enum
147{
161 CC_MAPPED = 0x01, 148 CC_MAPPED = 0x01,
162 CC_NOREUSE = 0x02, /* throw this away after tracing */ 149 CC_NOREUSE = 0x02, /* throw this away after tracing */
163 CC_TRACE = 0x04, 150 CC_TRACE = 0x04,
164 CC_TRACE_SUB = 0x08, /* trace sub calls */ 151 CC_TRACE_SUB = 0x08, /* trace sub calls */
165 CC_TRACE_LINE = 0x10, /* trace each statement */ 152 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
170typedef struct coro_cctx 157typedef struct coro_cctx
171{ 158{
172 struct coro_cctx *next; 159 struct coro_cctx *next;
173 160
174 /* the stack */ 161 /* the stack */
175 void *sptr; 162 struct coro_stack stack;
176 size_t ssize;
177 163
178 /* cpu state */ 164 /* cpu state */
179 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 165 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
166#ifndef NDEBUG
180 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 167 JMPENV *idle_te; /* same as idle_sp, but for top_env */
168#endif
181 JMPENV *top_env; 169 JMPENV *top_env;
182 coro_context cctx; 170 coro_context cctx;
183 171
184 U32 gen; 172 U32 gen;
185#if CORO_USE_VALGRIND 173#if CORO_USE_VALGRIND
186 int valgrind_id; 174 int valgrind_id;
187#endif 175#endif
188 unsigned char flags; 176 unsigned char flags;
189} coro_cctx; 177} coro_cctx;
190 178
191coro_cctx *cctx_current; /* the currently running cctx */ 179static coro_cctx *cctx_current; /* the currently running cctx */
192 180
193/*****************************************************************************/ 181/*****************************************************************************/
194 182
183static MGVTBL coro_state_vtbl;
184
195enum { 185enum
186{
196 CF_RUNNING = 0x0001, /* coroutine is running */ 187 CF_RUNNING = 0x0001, /* coroutine is running */
197 CF_READY = 0x0002, /* coroutine is ready */ 188 CF_READY = 0x0002, /* coroutine is ready */
198 CF_NEW = 0x0004, /* has never been switched to */ 189 CF_NEW = 0x0004, /* has never been switched to */
199 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 190 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
200 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 191 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
192 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
201}; 193};
202 194
203/* the structure where most of the perl state is stored, overlaid on the cxstack */ 195/* the structure where most of the perl state is stored, overlaid on the cxstack */
204typedef struct 196typedef struct
205{ 197{
206 SV *defsv;
207 AV *defav;
208 SV *errsv;
209 SV *irsgv;
210 HV *hinthv;
211#define VAR(name,type) type name; 198 #define VARx(name,expr,type) type name;
212# include "state.h" 199 #include "state.h"
213#undef VAR
214} perl_slots; 200} perl_slots;
215 201
202/* how many context stack entries do we need for perl_slots */
216#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 203#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
217 204
218/* this is a structure representing a perl-level coroutine */ 205/* this is a structure representing a perl-level coroutine */
219struct coro { 206struct coro
207{
220 /* the C coroutine allocated to this perl coroutine, if any */ 208 /* the C coroutine allocated to this perl coroutine, if any */
221 coro_cctx *cctx; 209 coro_cctx *cctx;
222 210
223 /* ready queue */ 211 /* ready queue */
224 struct coro *next_ready; 212 struct coro *next_ready;
… …
226 /* state data */ 214 /* state data */
227 struct CoroSLF slf_frame; /* saved slf frame */ 215 struct CoroSLF slf_frame; /* saved slf frame */
228 AV *mainstack; 216 AV *mainstack;
229 perl_slots *slot; /* basically the saved sp */ 217 perl_slots *slot; /* basically the saved sp */
230 218
231 CV *startcv; /* the CV to execute */ 219 CV *startcv; /* the CV to execute */
232 AV *args; /* data associated with this coroutine (initial args) */ 220 AV *args; /* data associated with this coroutine (initial args) */
233 int refcnt; /* coroutines are refcounted, yes */
234 int flags; /* CF_ flags */ 221 int flags; /* CF_ flags */
235 HV *hv; /* the perl hash associated with this coro, if any */ 222 HV *hv; /* the perl hash associated with this coro, if any */
236 void (*on_destroy)(pTHX_ struct coro *coro);
237 223
238 /* statistics */ 224 /* statistics */
239 int usecount; /* number of transfers to this coro */ 225 int usecount; /* number of transfers to this coro */
240 226
241 /* coro process data */ 227 /* coro process data */
242 int prio; 228 int prio;
243 SV *except; /* exception to be thrown */ 229 SV *except; /* exception to be thrown */
244 SV *rouse_cb; 230 SV *rouse_cb; /* last rouse callback */
231 AV *on_destroy; /* callbacks or coros to notify on destroy */
232 AV *status; /* the exit status list */
245 233
246 /* async_pool */ 234 /* async_pool */
247 SV *saved_deffh; 235 SV *saved_deffh;
248 SV *invoke_cb; 236 SV *invoke_cb;
249 AV *invoke_av; 237 AV *invoke_av;
250 238
251 /* on_enter/on_leave */ 239 /* on_enter/on_leave */
252 AV *on_enter; 240 AV *on_enter;
253 AV *on_leave; 241 AV *on_leave;
254 242
243 /* swap_sv */
244 AV *swap_sv;
245
255 /* times */ 246 /* times */
256 coro_ts t_cpu, t_real; 247 coro_ts t_cpu, t_real;
257 248
258 /* linked list */ 249 /* linked list */
259 struct coro *next, *prev; 250 struct coro *next, *prev;
… …
262typedef struct coro *Coro__State; 253typedef struct coro *Coro__State;
263typedef struct coro *Coro__State_or_hashref; 254typedef struct coro *Coro__State_or_hashref;
264 255
265/* the following variables are effectively part of the perl context */ 256/* the following variables are effectively part of the perl context */
266/* and get copied between struct coro and these variables */ 257/* and get copied between struct coro and these variables */
267/* the mainr easonw e don't support windows process emulation */ 258/* the main reason we don't support windows process emulation */
268static struct CoroSLF slf_frame; /* the current slf frame */ 259static struct CoroSLF slf_frame; /* the current slf frame */
269 260
270/** Coro ********************************************************************/ 261/** Coro ********************************************************************/
271 262
272#define CORO_PRIO_MAX 3 263#define CORO_PRIO_MAX 3
… …
278 269
279/* for Coro.pm */ 270/* for Coro.pm */
280static SV *coro_current; 271static SV *coro_current;
281static SV *coro_readyhook; 272static SV *coro_readyhook;
282static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 273static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
283static CV *cv_coro_run, *cv_coro_terminate; 274static CV *cv_coro_run;
284static struct coro *coro_first; 275static struct coro *coro_first;
285#define coro_nready coroapi.nready 276#define coro_nready coroapi.nready
286 277
278/** JIT *********************************************************************/
279
280#if CORO_JIT
281 /* APPLE doesn't have mmap though */
282 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
283 #ifndef CORO_JIT_TYPE
284 #if ECB_AMD64 && CORO_JIT_UNIXY
285 #define CORO_JIT_TYPE "amd64-unix"
286 #elif __i386 && CORO_JIT_UNIXY
287 #define CORO_JIT_TYPE "x86-unix"
288 #endif
289 #endif
290#endif
291
292#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
293 #undef CORO_JIT
294#endif
295
296#if CORO_JIT
297 typedef void (*load_save_perl_slots_type)(perl_slots *);
298 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
299#endif
300
287/** Coro::Select ************************************************************/ 301/** Coro::Select ************************************************************/
288 302
289static OP *(*coro_old_pp_sselect) (pTHX); 303static OP *(*coro_old_pp_sselect) (pTHX);
290static SV *coro_select_select; 304static SV *coro_select_select;
291 305
292/* horrible hack, but if it works... */ 306/* horrible hack, but if it works... */
293static OP * 307static OP *
294coro_pp_sselect (aTHX) 308coro_pp_sselect (pTHX)
295{ 309{
296 dSP; 310 dSP;
297 PUSHMARK (SP - 4); /* fake argument list */ 311 PUSHMARK (SP - 4); /* fake argument list */
298 XPUSHs (coro_select_select); 312 XPUSHs (coro_select_select);
299 PUTBACK; 313 PUTBACK;
… …
302 PL_op->op_flags |= OPf_STACKED; 316 PL_op->op_flags |= OPf_STACKED;
303 PL_op->op_private = 0; 317 PL_op->op_private = 0;
304 return PL_ppaddr [OP_ENTERSUB](aTHX); 318 return PL_ppaddr [OP_ENTERSUB](aTHX);
305} 319}
306 320
321/** time stuff **************************************************************/
322
323#ifdef HAS_GETTIMEOFDAY
324
325ecb_inline void
326coro_u2time (pTHX_ UV ret[2])
327{
328 struct timeval tv;
329 gettimeofday (&tv, 0);
330
331 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec;
333}
334
335ecb_inline double
336coro_nvtime (void)
337{
338 struct timeval tv;
339 gettimeofday (&tv, 0);
340
341 return tv.tv_sec + tv.tv_usec * 1e-6;
342}
343
344ecb_inline void
345time_init (pTHX)
346{
347 nvtime = coro_nvtime;
348 u2time = coro_u2time;
349}
350
351#else
352
353ecb_inline void
354time_init (pTHX)
355{
356 SV **svp;
357
358 require_pv ("Time/HiRes.pm");
359
360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
361
362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
364
365 nvtime = INT2PTR (double (*)(), SvIV (*svp));
366
367 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
368 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
369}
370
371#endif
372
307/** lowlevel stuff **********************************************************/ 373/** lowlevel stuff **********************************************************/
308 374
309static SV * 375static SV * ecb_noinline
310coro_get_sv (pTHX_ const char *name, int create) 376coro_get_sv (pTHX_ const char *name, int create)
311{ 377{
312#if PERL_VERSION_ATLEAST (5,10,0) 378#if PERL_VERSION_ATLEAST (5,10,0)
313 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 379 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
314 get_sv (name, create); 380 get_sv (name, create);
315#endif 381#endif
316 return get_sv (name, create); 382 return get_sv (name, create);
317} 383}
318 384
319static AV * 385static AV * ecb_noinline
320coro_get_av (pTHX_ const char *name, int create) 386coro_get_av (pTHX_ const char *name, int create)
321{ 387{
322#if PERL_VERSION_ATLEAST (5,10,0) 388#if PERL_VERSION_ATLEAST (5,10,0)
323 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 389 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
324 get_av (name, create); 390 get_av (name, create);
325#endif 391#endif
326 return get_av (name, create); 392 return get_av (name, create);
327} 393}
328 394
329static HV * 395static HV * ecb_noinline
330coro_get_hv (pTHX_ const char *name, int create) 396coro_get_hv (pTHX_ const char *name, int create)
331{ 397{
332#if PERL_VERSION_ATLEAST (5,10,0) 398#if PERL_VERSION_ATLEAST (5,10,0)
333 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
334 get_hv (name, create); 400 get_hv (name, create);
335#endif 401#endif
336 return get_hv (name, create); 402 return get_hv (name, create);
337} 403}
338 404
339INLINE void 405ecb_inline void
340coro_times_update () 406coro_times_update (void)
341{ 407{
342#ifdef coro_clock_gettime 408#ifdef coro_clock_gettime
343 struct timespec ts; 409 struct timespec ts;
344 410
345 ts.tv_sec = ts.tv_nsec = 0; 411 ts.tv_sec = ts.tv_nsec = 0;
… …
357 time_real [0] = tv [0]; 423 time_real [0] = tv [0];
358 time_real [1] = tv [1] * 1000; 424 time_real [1] = tv [1] * 1000;
359#endif 425#endif
360} 426}
361 427
362INLINE void 428ecb_inline void
363coro_times_add (struct coro *c) 429coro_times_add (struct coro *c)
364{ 430{
365 c->t_real [1] += time_real [1]; 431 c->t_real [1] += time_real [1];
366 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
367 c->t_real [0] += time_real [0]; 433 c->t_real [0] += time_real [0];
… …
369 c->t_cpu [1] += time_cpu [1]; 435 c->t_cpu [1] += time_cpu [1];
370 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
371 c->t_cpu [0] += time_cpu [0]; 437 c->t_cpu [0] += time_cpu [0];
372} 438}
373 439
374INLINE void 440ecb_inline void
375coro_times_sub (struct coro *c) 441coro_times_sub (struct coro *c)
376{ 442{
377 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 443 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
378 c->t_real [1] -= time_real [1]; 444 c->t_real [1] -= time_real [1];
379 c->t_real [0] -= time_real [0]; 445 c->t_real [0] -= time_real [0];
… …
387/* magic glue */ 453/* magic glue */
388 454
389#define CORO_MAGIC_type_cv 26 455#define CORO_MAGIC_type_cv 26
390#define CORO_MAGIC_type_state PERL_MAGIC_ext 456#define CORO_MAGIC_type_state PERL_MAGIC_ext
391 457
392#define CORO_MAGIC_NN(sv, type) \ 458#define CORO_MAGIC_NN(sv, type) \
393 (expect_true (SvMAGIC (sv)->mg_type == type) \ 459 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
394 ? SvMAGIC (sv) \ 460 ? SvMAGIC (sv) \
395 : mg_find (sv, type)) 461 : mg_find (sv, type))
396 462
397#define CORO_MAGIC(sv, type) \ 463#define CORO_MAGIC(sv, type) \
398 (expect_true (SvMAGIC (sv)) \ 464 (ecb_expect_true (SvMAGIC (sv)) \
399 ? CORO_MAGIC_NN (sv, type) \ 465 ? CORO_MAGIC_NN (sv, type) \
400 : 0) 466 : 0)
401 467
402#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 468#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
403#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 469#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
404 470
405INLINE struct coro * 471ecb_inline MAGIC *
472SvSTATEhv_p (pTHX_ SV *coro)
473{
474 MAGIC *mg;
475
476 if (ecb_expect_true (
477 SvTYPE (coro) == SVt_PVHV
478 && (mg = CORO_MAGIC_state (coro))
479 && mg->mg_virtual == &coro_state_vtbl
480 ))
481 return mg;
482
483 return 0;
484}
485
486ecb_inline struct coro *
406SvSTATE_ (pTHX_ SV *coro) 487SvSTATE_ (pTHX_ SV *coro)
407{ 488{
408 HV *stash;
409 MAGIC *mg; 489 MAGIC *mg;
410 490
411 if (SvROK (coro)) 491 if (SvROK (coro))
412 coro = SvRV (coro); 492 coro = SvRV (coro);
413 493
414 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 494 mg = SvSTATEhv_p (aTHX_ coro);
495 if (!mg)
415 croak ("Coro::State object required"); 496 croak ("Coro::State object required");
416 497
417 stash = SvSTASH (coro);
418 if (expect_false (stash != coro_stash && stash != coro_state_stash))
419 {
420 /* very slow, but rare, check */
421 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
422 croak ("Coro::State object required");
423 }
424
425 mg = CORO_MAGIC_state (coro);
426 return (struct coro *)mg->mg_ptr; 498 return (struct coro *)mg->mg_ptr;
427} 499}
428 500
429#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 501#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
430 502
… …
433#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 505#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
434 506
435/*****************************************************************************/ 507/*****************************************************************************/
436/* padlist management and caching */ 508/* padlist management and caching */
437 509
438static AV * 510ecb_inline PADLIST *
439coro_derive_padlist (pTHX_ CV *cv) 511coro_derive_padlist (pTHX_ CV *cv)
440{ 512{
441 AV *padlist = CvPADLIST (cv); 513 PADLIST *padlist = CvPADLIST (cv);
442 AV *newpadlist, *newpad; 514 PADLIST *newpadlist;
515 PAD *newpad;
516 PADOFFSET const off = PadlistMAX (padlist) + 1;
443 517
444 newpadlist = newAV (); 518 newPADLIST(newpadlist);
519#if !PERL_VERSION_ATLEAST(5,15,3)
520 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
445 AvREAL_off (newpadlist); 521 AvREAL_off (newpadlist);
522#endif
446#if PERL_VERSION_ATLEAST (5,10,0) 523#if PERL_VERSION_ATLEAST (5,10,0)
447 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 524 Perl_pad_push (aTHX_ padlist, off);
448#else 525#else
449 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 526 Perl_pad_push (aTHX_ padlist, off, 1);
450#endif 527#endif
451 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 528 newpad = PadlistARRAY (padlist)[off];
452 --AvFILLp (padlist); 529 PadlistMAX (padlist) = off - 1;
453 530
454 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 531 /* Already extended to 2 elements by newPADLIST. */
455 av_store (newpadlist, 1, (SV *)newpad); 532 PadlistMAX (newpadlist) = 1;
533 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
534 PadlistARRAY (newpadlist)[1] = newpad;
456 535
457 return newpadlist; 536 return newpadlist;
458} 537}
459 538
460static void 539ecb_inline void
461free_padlist (pTHX_ AV *padlist) 540free_padlist (pTHX_ PADLIST *padlist)
462{ 541{
463 /* may be during global destruction */ 542 /* may be during global destruction */
464 if (!IN_DESTRUCT) 543 if (!IN_DESTRUCT)
465 { 544 {
466 I32 i = AvFILLp (padlist); 545 I32 i = PadlistMAX (padlist);
467 546
468 while (i > 0) /* special-case index 0 */ 547 while (i > 0) /* special-case index 0 */
469 { 548 {
470 /* we try to be extra-careful here */ 549 /* we try to be extra-careful here */
471 AV *av = (AV *)AvARRAY (padlist)[i--]; 550 PAD *pad = PadlistARRAY (padlist)[i--];
472 I32 j = AvFILLp (av); 551 I32 j = PadMAX (pad);
473 552
474 while (j >= 0) 553 while (j >= 0)
475 SvREFCNT_dec (AvARRAY (av)[j--]); 554 SvREFCNT_dec (PadARRAY (pad)[j--]);
476 555
477 AvFILLp (av) = -1; 556 PadMAX (pad) = -1;
478 SvREFCNT_dec (av); 557 SvREFCNT_dec (pad);
479 } 558 }
480 559
481 SvREFCNT_dec (AvARRAY (padlist)[0]); 560 SvREFCNT_dec (PadlistNAMES (padlist));
482 561
562#ifdef NEWPADAPI
563 Safefree (PadlistARRAY (padlist));
564 Safefree (padlist);
565#else
483 AvFILLp (padlist) = -1; 566 AvFILLp (padlist) = -1;
567 AvREAL_off (padlist);
484 SvREFCNT_dec ((SV*)padlist); 568 SvREFCNT_dec ((SV*)padlist);
569#endif
485 } 570 }
486} 571}
487 572
488static int 573static int
489coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 574coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
490{ 575{
491 AV *padlist; 576 PADLIST *padlist;
492 AV *av = (AV *)mg->mg_obj; 577 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
578 size_t len = *(size_t *)mg->mg_ptr;
493 579
494 /* perl manages to free our internal AV and _then_ call us */ 580 /* perl manages to free our internal AV and _then_ call us */
495 if (IN_DESTRUCT) 581 if (IN_DESTRUCT)
496 return 0; 582 return 0;
497 583
498 /* casting is fun. */ 584 while (len--)
499 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
500 free_padlist (aTHX_ padlist); 585 free_padlist (aTHX_ padlists[len]);
501
502 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
503 586
504 return 0; 587 return 0;
505} 588}
506 589
507static MGVTBL coro_cv_vtbl = { 590static MGVTBL coro_cv_vtbl = {
508 0, 0, 0, 0, 591 0, 0, 0, 0,
509 coro_cv_free 592 coro_cv_free
510}; 593};
511 594
512/* the next two functions merely cache the padlists */ 595/* the next two functions merely cache the padlists */
513static void 596ecb_inline void
514get_padlist (pTHX_ CV *cv) 597get_padlist (pTHX_ CV *cv)
515{ 598{
516 MAGIC *mg = CORO_MAGIC_cv (cv); 599 MAGIC *mg = CORO_MAGIC_cv (cv);
517 AV *av; 600 size_t *lenp;
518 601
519 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 602 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
520 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 603 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
521 else 604 else
522 { 605 {
523#if CORO_PREFER_PERL_FUNCTIONS 606#if CORO_PREFER_PERL_FUNCTIONS
524 /* this is probably cleaner? but also slower! */ 607 /* this is probably cleaner? but also slower! */
525 /* in practise, it seems to be less stable */ 608 /* in practise, it seems to be less stable */
… …
531 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 614 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
532#endif 615#endif
533 } 616 }
534} 617}
535 618
536static void 619ecb_inline void
537put_padlist (pTHX_ CV *cv) 620put_padlist (pTHX_ CV *cv)
538{ 621{
539 MAGIC *mg = CORO_MAGIC_cv (cv); 622 MAGIC *mg = CORO_MAGIC_cv (cv);
540 AV *av;
541 623
542 if (expect_false (!mg)) 624 if (ecb_expect_false (!mg))
625 {
543 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 626 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
627 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
628 mg->mg_len = 1; /* so mg_free frees mg_ptr */
629 }
630 else
631 Renew (mg->mg_ptr,
632 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
633 char);
544 634
545 av = (AV *)mg->mg_obj; 635 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
546
547 if (expect_false (AvFILLp (av) >= AvMAX (av)))
548 av_extend (av, AvFILLp (av) + 1);
549
550 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
551} 636}
552 637
553/** load & save, init *******************************************************/ 638/** load & save, init *******************************************************/
639
640ecb_inline void
641swap_sv (SV *a, SV *b)
642{
643 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
644 SV tmp;
645
646 /* swap sv_any */
647 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
648
649 /* swap sv_flags */
650 SvFLAGS (&tmp) = SvFLAGS (a);
651 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
652 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
653
654#if PERL_VERSION_ATLEAST (5,10,0)
655 /* perl 5.10 and later complicates this _quite_ a bit, but it also
656 * is much faster, so no quarrels here. alternatively, we could
657 * sv_upgrade to avoid this.
658 */
659 {
660 /* swap sv_u */
661 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
662
663 /* if SvANY points to the head, we need to adjust the pointers,
664 * as the pointer for a still points to b, and maybe vice versa.
665 */
666 #define svany_in_head(type) \
667 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
668
669 if (svany_in_head (SvTYPE (a)))
670 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
671
672 if (svany_in_head (SvTYPE (b)))
673 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
674 }
675#endif
676}
677
678/* swap sv heads, at least logically */
679static void
680swap_svs (pTHX_ Coro__State c)
681{
682 int i;
683
684 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
685 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
686}
687
688#define SWAP_SVS(coro) \
689 if (ecb_expect_false ((coro)->swap_sv)) \
690 swap_svs (aTHX_ (coro))
554 691
555static void 692static void
556on_enterleave_call (pTHX_ SV *cb); 693on_enterleave_call (pTHX_ SV *cb);
557 694
558static void 695static void
… …
561 perl_slots *slot = c->slot; 698 perl_slots *slot = c->slot;
562 c->slot = 0; 699 c->slot = 0;
563 700
564 PL_mainstack = c->mainstack; 701 PL_mainstack = c->mainstack;
565 702
566 GvSV (PL_defgv) = slot->defsv; 703#if CORO_JIT
567 GvAV (PL_defgv) = slot->defav; 704 load_perl_slots (slot);
568 GvSV (PL_errgv) = slot->errsv; 705#else
569 GvSV (irsgv) = slot->irsgv;
570 GvHV (PL_hintgv) = slot->hinthv;
571
572 #define VAR(name,type) PL_ ## name = slot->name; 706 #define VARx(name,expr,type) expr = slot->name;
573 # include "state.h" 707 #include "state.h"
574 #undef VAR 708#endif
575 709
576 { 710 {
577 dSP; 711 dSP;
578 712
579 CV *cv; 713 CV *cv;
580 714
581 /* now do the ugly restore mess */ 715 /* now do the ugly restore mess */
582 while (expect_true (cv = (CV *)POPs)) 716 while (ecb_expect_true (cv = (CV *)POPs))
583 { 717 {
584 put_padlist (aTHX_ cv); /* mark this padlist as available */ 718 put_padlist (aTHX_ cv); /* mark this padlist as available */
585 CvDEPTH (cv) = PTR2IV (POPs); 719 CvDEPTH (cv) = PTR2IV (POPs);
586 CvPADLIST (cv) = (AV *)POPs; 720 CvPADLIST (cv) = (PADLIST *)POPs;
587 } 721 }
588 722
589 PUTBACK; 723 PUTBACK;
590 } 724 }
591 725
592 slf_frame = c->slf_frame; 726 slf_frame = c->slf_frame;
593 CORO_THROW = c->except; 727 CORO_THROW = c->except;
594 728
595 if (expect_false (enable_times)) 729 if (ecb_expect_false (enable_times))
596 { 730 {
597 if (expect_false (!times_valid)) 731 if (ecb_expect_false (!times_valid))
598 coro_times_update (); 732 coro_times_update ();
599 733
600 coro_times_sub (c); 734 coro_times_sub (c);
601 } 735 }
602 736
603 if (expect_false (c->on_enter)) 737 if (ecb_expect_false (c->on_enter))
604 { 738 {
605 int i; 739 int i;
606 740
607 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 741 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
608 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 742 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
609 } 743 }
744
745 SWAP_SVS (c);
610} 746}
611 747
612static void 748static void
613save_perl (pTHX_ Coro__State c) 749save_perl (pTHX_ Coro__State c)
614{ 750{
751 SWAP_SVS (c);
752
615 if (expect_false (c->on_leave)) 753 if (ecb_expect_false (c->on_leave))
616 { 754 {
617 int i; 755 int i;
618 756
619 for (i = AvFILLp (c->on_leave); i >= 0; --i) 757 for (i = AvFILLp (c->on_leave); i >= 0; --i)
620 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 758 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
621 } 759 }
622 760
623 times_valid = 0; 761 times_valid = 0;
624 762
625 if (expect_false (enable_times)) 763 if (ecb_expect_false (enable_times))
626 { 764 {
627 coro_times_update (); times_valid = 1; 765 coro_times_update (); times_valid = 1;
628 coro_times_add (c); 766 coro_times_add (c);
629 } 767 }
630 768
… …
644 782
645 XPUSHs (Nullsv); 783 XPUSHs (Nullsv);
646 /* this loop was inspired by pp_caller */ 784 /* this loop was inspired by pp_caller */
647 for (;;) 785 for (;;)
648 { 786 {
649 while (expect_true (cxix >= 0)) 787 while (ecb_expect_true (cxix >= 0))
650 { 788 {
651 PERL_CONTEXT *cx = &ccstk[cxix--]; 789 PERL_CONTEXT *cx = &ccstk[cxix--];
652 790
653 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 791 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
654 { 792 {
655 CV *cv = cx->blk_sub.cv; 793 CV *cv = cx->blk_sub.cv;
656 794
657 if (expect_true (CvDEPTH (cv))) 795 if (ecb_expect_true (CvDEPTH (cv)))
658 { 796 {
659 EXTEND (SP, 3); 797 EXTEND (SP, 3);
660 PUSHs ((SV *)CvPADLIST (cv)); 798 PUSHs ((SV *)CvPADLIST (cv));
661 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 799 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
662 PUSHs ((SV *)cv); 800 PUSHs ((SV *)cv);
… …
665 get_padlist (aTHX_ cv); 803 get_padlist (aTHX_ cv);
666 } 804 }
667 } 805 }
668 } 806 }
669 807
670 if (expect_true (top_si->si_type == PERLSI_MAIN)) 808 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
671 break; 809 break;
672 810
673 top_si = top_si->si_prev; 811 top_si = top_si->si_prev;
674 ccstk = top_si->si_cxstack; 812 ccstk = top_si->si_cxstack;
675 cxix = top_si->si_cxix; 813 cxix = top_si->si_cxix;
… …
677 815
678 PUTBACK; 816 PUTBACK;
679 } 817 }
680 818
681 /* allocate some space on the context stack for our purposes */ 819 /* allocate some space on the context stack for our purposes */
682 /* we manually unroll here, as usually 2 slots is enough */ 820 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
683 if (SLOT_COUNT >= 1) CXINC;
684 if (SLOT_COUNT >= 2) CXINC;
685 if (SLOT_COUNT >= 3) CXINC;
686 { 821 {
687 unsigned int i; 822 unsigned int i;
823
688 for (i = 3; i < SLOT_COUNT; ++i) 824 for (i = 0; i < SLOT_COUNT; ++i)
689 CXINC; 825 CXINC;
690 } 826
691 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 827 cxstack_ix -= SLOT_COUNT; /* undo allocation */
828 }
692 829
693 c->mainstack = PL_mainstack; 830 c->mainstack = PL_mainstack;
694 831
695 { 832 {
696 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 833 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
697 834
698 slot->defav = GvAV (PL_defgv); 835#if CORO_JIT
699 slot->defsv = DEFSV; 836 save_perl_slots (slot);
700 slot->errsv = ERRSV; 837#else
701 slot->irsgv = GvSV (irsgv);
702 slot->hinthv = GvHV (PL_hintgv);
703
704 #define VAR(name,type) slot->name = PL_ ## name; 838 #define VARx(name,expr,type) slot->name = expr;
705 # include "state.h" 839 #include "state.h"
706 #undef VAR 840#endif
707 } 841 }
708} 842}
709 843
710/* 844/*
711 * allocate various perl stacks. This is almost an exact copy 845 * allocate various perl stacks. This is almost an exact copy
… …
717# define coro_init_stacks(thx) init_stacks () 851# define coro_init_stacks(thx) init_stacks ()
718#else 852#else
719static void 853static void
720coro_init_stacks (pTHX) 854coro_init_stacks (pTHX)
721{ 855{
722 PL_curstackinfo = new_stackinfo(32, 8); 856 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
723 PL_curstackinfo->si_type = PERLSI_MAIN; 857 PL_curstackinfo->si_type = PERLSI_MAIN;
724 PL_curstack = PL_curstackinfo->si_stack; 858 PL_curstack = PL_curstackinfo->si_stack;
725 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 859 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
726 860
727 PL_stack_base = AvARRAY(PL_curstack); 861 PL_stack_base = AvARRAY(PL_curstack);
… …
742#endif 876#endif
743 877
744 New(54,PL_scopestack,8,I32); 878 New(54,PL_scopestack,8,I32);
745 PL_scopestack_ix = 0; 879 PL_scopestack_ix = 0;
746 PL_scopestack_max = 8; 880 PL_scopestack_max = 8;
881#if HAS_SCOPESTACK_NAME
882 New(54,PL_scopestack_name,8,const char*);
883#endif
747 884
748 New(54,PL_savestack,24,ANY); 885 New(54,PL_savestack,24,ANY);
749 PL_savestack_ix = 0; 886 PL_savestack_ix = 0;
750 PL_savestack_max = 24; 887 PL_savestack_max = 24;
751 888
… …
779 } 916 }
780 917
781 Safefree (PL_tmps_stack); 918 Safefree (PL_tmps_stack);
782 Safefree (PL_markstack); 919 Safefree (PL_markstack);
783 Safefree (PL_scopestack); 920 Safefree (PL_scopestack);
921#if HAS_SCOPESTACK_NAME
922 Safefree (PL_scopestack_name);
923#endif
784 Safefree (PL_savestack); 924 Safefree (PL_savestack);
785#if !PERL_VERSION_ATLEAST (5,10,0) 925#if !PERL_VERSION_ATLEAST (5,10,0)
786 Safefree (PL_retstack); 926 Safefree (PL_retstack);
787#endif 927#endif
788} 928}
… …
834#endif 974#endif
835 975
836/* 976/*
837 * This overrides the default magic get method of %SIG elements. 977 * This overrides the default magic get method of %SIG elements.
838 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 978 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
839 * and instead of trying to save and restore the hash elements, we just provide 979 * and instead of trying to save and restore the hash elements (extremely slow),
840 * readback here. 980 * we just provide our own readback here.
841 */ 981 */
842static int 982static int ecb_cold
843coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 983coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
844{ 984{
845 const char *s = MgPV_nolen_const (mg); 985 const char *s = MgPV_nolen_const (mg);
846 986
847 if (*s == '_') 987 if (*s == '_')
848 { 988 {
849 SV **svp = 0; 989 SV **svp = 0;
850 990
851 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 991 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
852 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 992 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
853 993
854 if (svp) 994 if (svp)
855 { 995 {
856 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 996 SV *ssv;
997
998 if (!*svp)
999 ssv = &PL_sv_undef;
1000 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1001 ssv = sv_2mortal (newRV_inc (*svp));
1002 else
1003 ssv = *svp;
1004
1005 sv_setsv (sv, ssv);
857 return 0; 1006 return 0;
858 } 1007 }
859 } 1008 }
860 1009
861 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1010 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
862} 1011}
863 1012
864static int 1013static int ecb_cold
865coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1014coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
866{ 1015{
867 const char *s = MgPV_nolen_const (mg); 1016 const char *s = MgPV_nolen_const (mg);
868 1017
869 if (*s == '_') 1018 if (*s == '_')
… …
883 } 1032 }
884 1033
885 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1034 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
886} 1035}
887 1036
888static int 1037static int ecb_cold
889coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1038coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
890{ 1039{
891 const char *s = MgPV_nolen_const (mg); 1040 const char *s = MgPV_nolen_const (mg);
892 1041
893 if (*s == '_') 1042 if (*s == '_')
… …
926slf_check_repeat (pTHX_ struct CoroSLF *frame) 1075slf_check_repeat (pTHX_ struct CoroSLF *frame)
927{ 1076{
928 return 1; 1077 return 1;
929} 1078}
930 1079
931static UNOP coro_setup_op; 1080static UNOP init_perl_op;
932 1081
933static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1082ecb_noinline static void /* noinline to keep it out of the transfer fast path */
934coro_setup (pTHX_ struct coro *coro) 1083init_perl (pTHX_ struct coro *coro)
935{ 1084{
936 /* 1085 /*
937 * emulate part of the perl startup here. 1086 * emulate part of the perl startup here.
938 */ 1087 */
939 coro_init_stacks (aTHX); 1088 coro_init_stacks (aTHX);
… …
946 PL_comppad_name_fill = 0; 1095 PL_comppad_name_fill = 0;
947 PL_comppad_name_floor = 0; 1096 PL_comppad_name_floor = 0;
948 PL_curpm = 0; 1097 PL_curpm = 0;
949 PL_curpad = 0; 1098 PL_curpad = 0;
950 PL_localizing = 0; 1099 PL_localizing = 0;
951 PL_dirty = 0;
952 PL_restartop = 0; 1100 PL_restartop = 0;
953#if PERL_VERSION_ATLEAST (5,10,0) 1101#if PERL_VERSION_ATLEAST (5,10,0)
954 PL_parser = 0; 1102 PL_parser = 0;
955#endif 1103#endif
956 PL_hints = 0; 1104 PL_hints = 0;
957 1105
958 /* recreate the die/warn hooks */ 1106 /* recreate the die/warn hooks */
959 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1107 PL_diehook = SvREFCNT_inc (rv_diehook);
960 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1108 PL_warnhook = SvREFCNT_inc (rv_warnhook);
961 1109
962 GvSV (PL_defgv) = newSV (0); 1110 GvSV (PL_defgv) = newSV (0);
963 GvAV (PL_defgv) = coro->args; coro->args = 0; 1111 GvAV (PL_defgv) = coro->args; coro->args = 0;
964 GvSV (PL_errgv) = newSV (0); 1112 GvSV (PL_errgv) = newSV (0);
965 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1113 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
966 GvHV (PL_hintgv) = 0; 1114 GvHV (PL_hintgv) = 0;
… …
986 /* this newly created coroutine might be run on an existing cctx which most 1134 /* this newly created coroutine might be run on an existing cctx which most
987 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1135 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
988 */ 1136 */
989 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1137 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
990 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1138 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1139 slf_frame.destroy = 0;
991 1140
992 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1141 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
993 coro_setup_op.op_next = PL_op; 1142 init_perl_op.op_next = PL_op;
994 coro_setup_op.op_type = OP_ENTERSUB; 1143 init_perl_op.op_type = OP_ENTERSUB;
995 coro_setup_op.op_ppaddr = pp_slf; 1144 init_perl_op.op_ppaddr = pp_slf;
996 /* no flags etc. required, as an init function won't be called */ 1145 /* no flags etc. required, as an init function won't be called */
997 1146
998 PL_op = (OP *)&coro_setup_op; 1147 PL_op = (OP *)&init_perl_op;
999 1148
1000 /* copy throw, in case it was set before coro_setup */ 1149 /* copy throw, in case it was set before init_perl */
1001 CORO_THROW = coro->except; 1150 CORO_THROW = coro->except;
1002 1151
1152 SWAP_SVS (coro);
1153
1003 if (expect_false (enable_times)) 1154 if (ecb_expect_false (enable_times))
1004 { 1155 {
1005 coro_times_update (); 1156 coro_times_update ();
1006 coro_times_sub (coro); 1157 coro_times_sub (coro);
1007 } 1158 }
1008} 1159}
… …
1027 dounwind (-1); 1178 dounwind (-1);
1028 } 1179 }
1029} 1180}
1030 1181
1031static void 1182static void
1032coro_destruct_perl (pTHX_ struct coro *coro) 1183destroy_perl (pTHX_ struct coro *coro)
1033{ 1184{
1034 SV *svf [9]; 1185 SV *svf [9];
1035 1186
1036 { 1187 {
1188 SV *old_current = SvRV (coro_current);
1037 struct coro *current = SvSTATE_current; 1189 struct coro *current = SvSTATE (old_current);
1038 1190
1039 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1191 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1040 1192
1041 save_perl (aTHX_ current); 1193 save_perl (aTHX_ current);
1194
1195 /* this will cause transfer_check to croak on block*/
1196 SvRV_set (coro_current, (SV *)coro->hv);
1197
1042 load_perl (aTHX_ coro); 1198 load_perl (aTHX_ coro);
1043 1199
1044 coro_unwind_stacks (aTHX); 1200 coro_unwind_stacks (aTHX);
1201
1202 /* restore swapped sv's */
1203 SWAP_SVS (coro);
1204
1045 coro_destruct_stacks (aTHX); 1205 coro_destruct_stacks (aTHX);
1046 1206
1047 // now save some sv's to be free'd later 1207 /* now save some sv's to be free'd later */
1048 svf [0] = GvSV (PL_defgv); 1208 svf [0] = GvSV (PL_defgv);
1049 svf [1] = (SV *)GvAV (PL_defgv); 1209 svf [1] = (SV *)GvAV (PL_defgv);
1050 svf [2] = GvSV (PL_errgv); 1210 svf [2] = GvSV (PL_errgv);
1051 svf [3] = (SV *)PL_defoutgv; 1211 svf [3] = (SV *)PL_defoutgv;
1052 svf [4] = PL_rs; 1212 svf [4] = PL_rs;
… …
1054 svf [6] = (SV *)GvHV (PL_hintgv); 1214 svf [6] = (SV *)GvHV (PL_hintgv);
1055 svf [7] = PL_diehook; 1215 svf [7] = PL_diehook;
1056 svf [8] = PL_warnhook; 1216 svf [8] = PL_warnhook;
1057 assert (9 == sizeof (svf) / sizeof (*svf)); 1217 assert (9 == sizeof (svf) / sizeof (*svf));
1058 1218
1219 SvRV_set (coro_current, old_current);
1220
1059 load_perl (aTHX_ current); 1221 load_perl (aTHX_ current);
1060 } 1222 }
1061 1223
1062 { 1224 {
1063 unsigned int i; 1225 unsigned int i;
… …
1070 SvREFCNT_dec (coro->invoke_cb); 1232 SvREFCNT_dec (coro->invoke_cb);
1071 SvREFCNT_dec (coro->invoke_av); 1233 SvREFCNT_dec (coro->invoke_av);
1072 } 1234 }
1073} 1235}
1074 1236
1075INLINE void 1237ecb_inline void
1076free_coro_mortal (pTHX) 1238free_coro_mortal (pTHX)
1077{ 1239{
1078 if (expect_true (coro_mortal)) 1240 if (ecb_expect_true (coro_mortal))
1079 { 1241 {
1080 SvREFCNT_dec (coro_mortal); 1242 SvREFCNT_dec ((SV *)coro_mortal);
1081 coro_mortal = 0; 1243 coro_mortal = 0;
1082 } 1244 }
1083} 1245}
1084 1246
1085static int 1247static int
… …
1218 1380
1219 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1381 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1220} 1382}
1221 1383
1222/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1384/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1223static void NOINLINE 1385static void ecb_noinline
1224cctx_prepare (pTHX) 1386cctx_prepare (pTHX)
1225{ 1387{
1226 PL_top_env = &PL_start_env; 1388 PL_top_env = &PL_start_env;
1227 1389
1228 if (cctx_current->flags & CC_TRACE) 1390 if (cctx_current->flags & CC_TRACE)
… …
1239 slf_frame.prepare = slf_prepare_set_stacklevel; 1401 slf_frame.prepare = slf_prepare_set_stacklevel;
1240 slf_frame.check = slf_check_set_stacklevel; 1402 slf_frame.check = slf_check_set_stacklevel;
1241} 1403}
1242 1404
1243/* the tail of transfer: execute stuff we can only do after a transfer */ 1405/* the tail of transfer: execute stuff we can only do after a transfer */
1244INLINE void 1406ecb_inline void
1245transfer_tail (pTHX) 1407transfer_tail (pTHX)
1246{ 1408{
1247 free_coro_mortal (aTHX); 1409 free_coro_mortal (aTHX);
1410}
1411
1412/* try to exit the same way perl's main function would do */
1413/* we do not bother resetting the environment or other things *7
1414/* that are not, uhm, essential */
1415/* this obviously also doesn't work when perl is embedded */
1416static void ecb_noinline ecb_cold
1417perlish_exit (pTHX)
1418{
1419 int exitstatus = perl_destruct (PL_curinterp);
1420 perl_free (PL_curinterp);
1421 exit (exitstatus);
1248} 1422}
1249 1423
1250/* 1424/*
1251 * this is a _very_ stripped down perl interpreter ;) 1425 * this is a _very_ stripped down perl interpreter ;)
1252 */ 1426 */
… …
1281 */ 1455 */
1282 1456
1283 /* 1457 /*
1284 * If perl-run returns we assume exit() was being called or the coro 1458 * If perl-run returns we assume exit() was being called or the coro
1285 * fell off the end, which seems to be the only valid (non-bug) 1459 * fell off the end, which seems to be the only valid (non-bug)
1286 * reason for perl_run to return. We try to exit by jumping to the 1460 * reason for perl_run to return. We try to mimic whatever perl is normally
1287 * bootstrap-time "top" top_env, as we cannot restore the "main" 1461 * doing in that case. YMMV.
1288 * coroutine as Coro has no such concept.
1289 * This actually isn't valid with the pthread backend, but OSes requiring
1290 * that backend are too broken to do it in a standards-compliant way.
1291 */ 1462 */
1292 PL_top_env = main_top_env; 1463 perlish_exit (aTHX);
1293 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1294 } 1464 }
1295} 1465}
1296 1466
1297static coro_cctx * 1467static coro_cctx *
1298cctx_new () 1468cctx_new (void)
1299{ 1469{
1300 coro_cctx *cctx; 1470 coro_cctx *cctx;
1301 1471
1302 ++cctx_count; 1472 ++cctx_count;
1303 New (0, cctx, 1, coro_cctx); 1473 New (0, cctx, 1, coro_cctx);
… …
1309 return cctx; 1479 return cctx;
1310} 1480}
1311 1481
1312/* create a new cctx only suitable as source */ 1482/* create a new cctx only suitable as source */
1313static coro_cctx * 1483static coro_cctx *
1314cctx_new_empty () 1484cctx_new_empty (void)
1315{ 1485{
1316 coro_cctx *cctx = cctx_new (); 1486 coro_cctx *cctx = cctx_new ();
1317 1487
1318 cctx->sptr = 0; 1488 cctx->stack.sptr = 0;
1319 coro_create (&cctx->cctx, 0, 0, 0, 0); 1489 coro_create (&cctx->cctx, 0, 0, 0, 0);
1320 1490
1321 return cctx; 1491 return cctx;
1322} 1492}
1323 1493
1324/* create a new cctx suitable as destination/running a perl interpreter */ 1494/* create a new cctx suitable as destination/running a perl interpreter */
1325static coro_cctx * 1495static coro_cctx *
1326cctx_new_run () 1496cctx_new_run (void)
1327{ 1497{
1328 coro_cctx *cctx = cctx_new (); 1498 coro_cctx *cctx = cctx_new ();
1329 void *stack_start;
1330 size_t stack_size;
1331 1499
1332#if HAVE_MMAP 1500 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1333 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1334 /* mmap supposedly does allocate-on-write for us */
1335 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1336
1337 if (cctx->sptr != (void *)-1)
1338 {
1339 #if CORO_STACKGUARD
1340 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1341 #endif
1342 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1343 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1344 cctx->flags |= CC_MAPPED;
1345 } 1501 {
1346 else
1347#endif
1348 {
1349 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1350 New (0, cctx->sptr, cctx_stacksize, long);
1351
1352 if (!cctx->sptr)
1353 {
1354 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1502 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1355 _exit (EXIT_FAILURE); 1503 _exit (EXIT_FAILURE);
1356 }
1357
1358 stack_start = cctx->sptr;
1359 stack_size = cctx->ssize;
1360 } 1504 }
1361 1505
1362 #if CORO_USE_VALGRIND
1363 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1364 #endif
1365
1366 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1506 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1367 1507
1368 return cctx; 1508 return cctx;
1369} 1509}
1370 1510
1371static void 1511static void
1372cctx_destroy (coro_cctx *cctx) 1512cctx_destroy (coro_cctx *cctx)
1373{ 1513{
1374 if (!cctx) 1514 if (!cctx)
1375 return; 1515 return;
1376 1516
1377 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1517 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1378 1518
1379 --cctx_count; 1519 --cctx_count;
1380 coro_destroy (&cctx->cctx); 1520 coro_destroy (&cctx->cctx);
1381 1521
1382 /* coro_transfer creates new, empty cctx's */ 1522 coro_stack_free (&cctx->stack);
1383 if (cctx->sptr)
1384 {
1385 #if CORO_USE_VALGRIND
1386 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1387 #endif
1388
1389#if HAVE_MMAP
1390 if (cctx->flags & CC_MAPPED)
1391 munmap (cctx->sptr, cctx->ssize);
1392 else
1393#endif
1394 Safefree (cctx->sptr);
1395 }
1396 1523
1397 Safefree (cctx); 1524 Safefree (cctx);
1398} 1525}
1399 1526
1400/* wether this cctx should be destructed */ 1527/* wether this cctx should be destructed */
1401#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1528#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1402 1529
1403static coro_cctx * 1530static coro_cctx *
1404cctx_get (pTHX) 1531cctx_get (pTHX)
1405{ 1532{
1406 while (expect_true (cctx_first)) 1533 while (ecb_expect_true (cctx_first))
1407 { 1534 {
1408 coro_cctx *cctx = cctx_first; 1535 coro_cctx *cctx = cctx_first;
1409 cctx_first = cctx->next; 1536 cctx_first = cctx->next;
1410 --cctx_idle; 1537 --cctx_idle;
1411 1538
1412 if (expect_true (!CCTX_EXPIRED (cctx))) 1539 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1413 return cctx; 1540 return cctx;
1414 1541
1415 cctx_destroy (cctx); 1542 cctx_destroy (cctx);
1416 } 1543 }
1417 1544
… …
1419} 1546}
1420 1547
1421static void 1548static void
1422cctx_put (coro_cctx *cctx) 1549cctx_put (coro_cctx *cctx)
1423{ 1550{
1424 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1551 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1425 1552
1426 /* free another cctx if overlimit */ 1553 /* free another cctx if overlimit */
1427 if (expect_false (cctx_idle >= cctx_max_idle)) 1554 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1428 { 1555 {
1429 coro_cctx *first = cctx_first; 1556 coro_cctx *first = cctx_first;
1430 cctx_first = first->next; 1557 cctx_first = first->next;
1431 --cctx_idle; 1558 --cctx_idle;
1432 1559
… …
1443static void 1570static void
1444transfer_check (pTHX_ struct coro *prev, struct coro *next) 1571transfer_check (pTHX_ struct coro *prev, struct coro *next)
1445{ 1572{
1446 /* TODO: throwing up here is considered harmful */ 1573 /* TODO: throwing up here is considered harmful */
1447 1574
1448 if (expect_true (prev != next)) 1575 if (ecb_expect_true (prev != next))
1449 { 1576 {
1450 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1577 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1451 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1578 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1452 1579
1453 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1580 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1454 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1581 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1455 1582
1456#if !PERL_VERSION_ATLEAST (5,10,0) 1583#if !PERL_VERSION_ATLEAST (5,10,0)
1457 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1584 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1458 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1585 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1459#endif 1586#endif
1460 } 1587 }
1461} 1588}
1462 1589
1463/* always use the TRANSFER macro */ 1590/* always use the TRANSFER macro */
1464static void NOINLINE /* noinline so we have a fixed stackframe */ 1591static void ecb_noinline /* noinline so we have a fixed stackframe */
1465transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1592transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1466{ 1593{
1467 dSTACKLEVEL; 1594 dSTACKLEVEL;
1468 1595
1469 /* sometimes transfer is only called to set idle_sp */ 1596 /* sometimes transfer is only called to set idle_sp */
1470 if (expect_false (!prev)) 1597 if (ecb_expect_false (!prev))
1471 { 1598 {
1472 cctx_current->idle_sp = STACKLEVEL; 1599 cctx_current->idle_sp = STACKLEVEL;
1473 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1600 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1474 } 1601 }
1475 else if (expect_true (prev != next)) 1602 else if (ecb_expect_true (prev != next))
1476 { 1603 {
1477 coro_cctx *cctx_prev; 1604 coro_cctx *cctx_prev;
1478 1605
1479 if (expect_false (prev->flags & CF_NEW)) 1606 if (ecb_expect_false (prev->flags & CF_NEW))
1480 { 1607 {
1481 /* create a new empty/source context */ 1608 /* create a new empty/source context */
1482 prev->flags &= ~CF_NEW; 1609 prev->flags &= ~CF_NEW;
1483 prev->flags |= CF_RUNNING; 1610 prev->flags |= CF_RUNNING;
1484 } 1611 }
… …
1487 next->flags |= CF_RUNNING; 1614 next->flags |= CF_RUNNING;
1488 1615
1489 /* first get rid of the old state */ 1616 /* first get rid of the old state */
1490 save_perl (aTHX_ prev); 1617 save_perl (aTHX_ prev);
1491 1618
1492 if (expect_false (next->flags & CF_NEW)) 1619 if (ecb_expect_false (next->flags & CF_NEW))
1493 { 1620 {
1494 /* need to start coroutine */ 1621 /* need to start coroutine */
1495 next->flags &= ~CF_NEW; 1622 next->flags &= ~CF_NEW;
1496 /* setup coroutine call */ 1623 /* setup coroutine call */
1497 coro_setup (aTHX_ next); 1624 init_perl (aTHX_ next);
1498 } 1625 }
1499 else 1626 else
1500 load_perl (aTHX_ next); 1627 load_perl (aTHX_ next);
1501 1628
1502 /* possibly untie and reuse the cctx */ 1629 /* possibly untie and reuse the cctx */
1503 if (expect_true ( 1630 if (ecb_expect_true (
1504 cctx_current->idle_sp == STACKLEVEL 1631 cctx_current->idle_sp == STACKLEVEL
1505 && !(cctx_current->flags & CC_TRACE) 1632 && !(cctx_current->flags & CC_TRACE)
1506 && !force_cctx 1633 && !force_cctx
1507 )) 1634 ))
1508 { 1635 {
1509 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1636 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1510 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1637 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1511 1638
1512 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1639 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1513 /* without this the next cctx_get might destroy the running cctx while still in use */ 1640 /* without this the next cctx_get might destroy the running cctx while still in use */
1514 if (expect_false (CCTX_EXPIRED (cctx_current))) 1641 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1515 if (expect_true (!next->cctx)) 1642 if (ecb_expect_true (!next->cctx))
1516 next->cctx = cctx_get (aTHX); 1643 next->cctx = cctx_get (aTHX);
1517 1644
1518 cctx_put (cctx_current); 1645 cctx_put (cctx_current);
1519 } 1646 }
1520 else 1647 else
1521 prev->cctx = cctx_current; 1648 prev->cctx = cctx_current;
1522 1649
1523 ++next->usecount; 1650 ++next->usecount;
1524 1651
1525 cctx_prev = cctx_current; 1652 cctx_prev = cctx_current;
1526 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1653 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1527 1654
1528 next->cctx = 0; 1655 next->cctx = 0;
1529 1656
1530 if (expect_false (cctx_prev != cctx_current)) 1657 if (ecb_expect_false (cctx_prev != cctx_current))
1531 { 1658 {
1532 cctx_prev->top_env = PL_top_env; 1659 cctx_prev->top_env = PL_top_env;
1533 PL_top_env = cctx_current->top_env; 1660 PL_top_env = cctx_current->top_env;
1534 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1661 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1535 } 1662 }
… …
1541#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1668#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1542#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1669#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1543 1670
1544/** high level stuff ********************************************************/ 1671/** high level stuff ********************************************************/
1545 1672
1673/* this function is actually Coro, not Coro::State, but we call it from here */
1674/* because it is convenient - but it hasn't been declared yet for that reason */
1546static int 1675static void
1676coro_call_on_destroy (pTHX_ struct coro *coro);
1677
1678static void
1547coro_state_destroy (pTHX_ struct coro *coro) 1679coro_state_destroy (pTHX_ struct coro *coro)
1548{ 1680{
1549 if (coro->flags & CF_DESTROYED) 1681 if (coro->flags & CF_ZOMBIE)
1550 return 0; 1682 return;
1551 1683
1552 if (coro->on_destroy && !PL_dirty)
1553 coro->on_destroy (aTHX_ coro); 1684 slf_destroy (aTHX_ coro);
1554 1685
1555 coro->flags |= CF_DESTROYED; 1686 coro->flags |= CF_ZOMBIE;
1556 1687
1557 if (coro->flags & CF_READY) 1688 if (coro->flags & CF_READY)
1558 { 1689 {
1559 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1690 /* reduce nready, as destroying a ready coro effectively unreadies it */
1560 /* alternative: look through all ready queues and remove the coro */ 1691 /* alternative: look through all ready queues and remove the coro */
1561 --coro_nready; 1692 --coro_nready;
1562 } 1693 }
1563 else 1694 else
1564 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1695 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1696
1697 if (coro->next) coro->next->prev = coro->prev;
1698 if (coro->prev) coro->prev->next = coro->next;
1699 if (coro == coro_first) coro_first = coro->next;
1565 1700
1566 if (coro->mainstack 1701 if (coro->mainstack
1567 && coro->mainstack != main_mainstack 1702 && coro->mainstack != main_mainstack
1568 && coro->slot 1703 && coro->slot
1569 && !PL_dirty) 1704 && !PL_dirty)
1570 coro_destruct_perl (aTHX_ coro); 1705 destroy_perl (aTHX_ coro);
1571 1706
1572 cctx_destroy (coro->cctx); 1707 cctx_destroy (coro->cctx);
1573 SvREFCNT_dec (coro->startcv); 1708 SvREFCNT_dec (coro->startcv);
1574 SvREFCNT_dec (coro->args); 1709 SvREFCNT_dec (coro->args);
1710 SvREFCNT_dec (coro->swap_sv);
1575 SvREFCNT_dec (CORO_THROW); 1711 SvREFCNT_dec (CORO_THROW);
1576 1712
1577 if (coro->next) coro->next->prev = coro->prev; 1713 coro_call_on_destroy (aTHX_ coro);
1578 if (coro->prev) coro->prev->next = coro->next;
1579 if (coro == coro_first) coro_first = coro->next;
1580 1714
1581 return 1; 1715 /* more destruction mayhem in coro_state_free */
1582} 1716}
1583 1717
1584static int 1718static int
1585coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1719coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1586{ 1720{
1587 struct coro *coro = (struct coro *)mg->mg_ptr; 1721 struct coro *coro = (struct coro *)mg->mg_ptr;
1588 mg->mg_ptr = 0; 1722 mg->mg_ptr = 0;
1589 1723
1590 coro->hv = 0;
1591
1592 if (--coro->refcnt < 0)
1593 {
1594 coro_state_destroy (aTHX_ coro); 1724 coro_state_destroy (aTHX_ coro);
1725 SvREFCNT_dec (coro->on_destroy);
1726 SvREFCNT_dec (coro->status);
1727
1595 Safefree (coro); 1728 Safefree (coro);
1596 }
1597 1729
1598 return 0; 1730 return 0;
1599} 1731}
1600 1732
1601static int 1733static int ecb_cold
1602coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1734coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1603{ 1735{
1604 struct coro *coro = (struct coro *)mg->mg_ptr; 1736 /* called when perl clones the current process the slow way (windows process emulation) */
1605 1737 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1606 ++coro->refcnt; 1738 mg->mg_ptr = 0;
1739 mg->mg_virtual = 0;
1607 1740
1608 return 0; 1741 return 0;
1609} 1742}
1610 1743
1611static MGVTBL coro_state_vtbl = { 1744static MGVTBL coro_state_vtbl = {
… …
1636 TRANSFER (ta, 1); 1769 TRANSFER (ta, 1);
1637} 1770}
1638 1771
1639/** Coro ********************************************************************/ 1772/** Coro ********************************************************************/
1640 1773
1641INLINE void 1774ecb_inline void
1642coro_enq (pTHX_ struct coro *coro) 1775coro_enq (pTHX_ struct coro *coro)
1643{ 1776{
1644 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1777 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1645 1778
1646 SvREFCNT_inc_NN (coro->hv); 1779 SvREFCNT_inc_NN (coro->hv);
… …
1648 coro->next_ready = 0; 1781 coro->next_ready = 0;
1649 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1782 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1650 ready [1] = coro; 1783 ready [1] = coro;
1651} 1784}
1652 1785
1653INLINE struct coro * 1786ecb_inline struct coro *
1654coro_deq (pTHX) 1787coro_deq (pTHX)
1655{ 1788{
1656 int prio; 1789 int prio;
1657 1790
1658 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1791 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1711{ 1844{
1712 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1845 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1713} 1846}
1714 1847
1715/* expects to own a reference to next->hv */ 1848/* expects to own a reference to next->hv */
1716INLINE void 1849ecb_inline void
1717prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1850prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1718{ 1851{
1719 SV *prev_sv = SvRV (coro_current); 1852 SV *prev_sv = SvRV (coro_current);
1720 1853
1721 ta->prev = SvSTATE_hv (prev_sv); 1854 ta->prev = SvSTATE_hv (prev_sv);
… …
1734{ 1867{
1735 for (;;) 1868 for (;;)
1736 { 1869 {
1737 struct coro *next = coro_deq (aTHX); 1870 struct coro *next = coro_deq (aTHX);
1738 1871
1739 if (expect_true (next)) 1872 if (ecb_expect_true (next))
1740 { 1873 {
1741 /* cannot transfer to destroyed coros, skip and look for next */ 1874 /* cannot transfer to destroyed coros, skip and look for next */
1742 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1875 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1743 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1876 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1744 else 1877 else
1745 { 1878 {
1746 next->flags &= ~CF_READY; 1879 next->flags &= ~CF_READY;
1747 --coro_nready; 1880 --coro_nready;
… …
1754 { 1887 {
1755 /* nothing to schedule: call the idle handler */ 1888 /* nothing to schedule: call the idle handler */
1756 if (SvROK (sv_idle) 1889 if (SvROK (sv_idle)
1757 && SvOBJECT (SvRV (sv_idle))) 1890 && SvOBJECT (SvRV (sv_idle)))
1758 { 1891 {
1892 if (SvRV (sv_idle) == SvRV (coro_current))
1893 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1894
1759 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1895 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1760 api_ready (aTHX_ SvRV (sv_idle)); 1896 api_ready (aTHX_ SvRV (sv_idle));
1761 --coro_nready; 1897 --coro_nready;
1762 } 1898 }
1763 else 1899 else
1764 { 1900 {
1901 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1765 dSP; 1902 dSP;
1766 1903
1767 ENTER; 1904 ENTER;
1768 SAVETMPS; 1905 SAVETMPS;
1769 1906
… …
1776 } 1913 }
1777 } 1914 }
1778 } 1915 }
1779} 1916}
1780 1917
1781INLINE void 1918ecb_inline void
1782prepare_cede (pTHX_ struct coro_transfer_args *ta) 1919prepare_cede (pTHX_ struct coro_transfer_args *ta)
1783{ 1920{
1784 api_ready (aTHX_ coro_current); 1921 api_ready (aTHX_ coro_current);
1785 prepare_schedule (aTHX_ ta); 1922 prepare_schedule (aTHX_ ta);
1786} 1923}
1787 1924
1788INLINE void 1925ecb_inline void
1789prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1926prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1790{ 1927{
1791 SV *prev = SvRV (coro_current); 1928 SV *prev = SvRV (coro_current);
1792 1929
1793 if (coro_nready) 1930 if (coro_nready)
… …
1823{ 1960{
1824 struct coro_transfer_args ta; 1961 struct coro_transfer_args ta;
1825 1962
1826 prepare_cede (aTHX_ &ta); 1963 prepare_cede (aTHX_ &ta);
1827 1964
1828 if (expect_true (ta.prev != ta.next)) 1965 if (ecb_expect_true (ta.prev != ta.next))
1829 { 1966 {
1830 TRANSFER (ta, 1); 1967 TRANSFER (ta, 1);
1831 return 1; 1968 return 1;
1832 } 1969 }
1833 else 1970 else
… …
1876 coro->slot->runops = RUNOPS_DEFAULT; 2013 coro->slot->runops = RUNOPS_DEFAULT;
1877 } 2014 }
1878} 2015}
1879 2016
1880static void 2017static void
2018coro_push_av (pTHX_ AV *av, I32 gimme_v)
2019{
2020 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2021 {
2022 dSP;
2023
2024 if (gimme_v == G_SCALAR)
2025 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2026 else
2027 {
2028 int i;
2029 EXTEND (SP, AvFILLp (av) + 1);
2030
2031 for (i = 0; i <= AvFILLp (av); ++i)
2032 PUSHs (AvARRAY (av)[i]);
2033 }
2034
2035 PUTBACK;
2036 }
2037}
2038
2039static void
2040coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2041{
2042 if (!coro->on_destroy)
2043 coro->on_destroy = newAV ();
2044
2045 av_push (coro->on_destroy, cb);
2046}
2047
2048static void
2049slf_destroy_join (pTHX_ struct CoroSLF *frame)
2050{
2051 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2052}
2053
2054static int
2055slf_check_join (pTHX_ struct CoroSLF *frame)
2056{
2057 struct coro *coro = (struct coro *)frame->data;
2058
2059 if (!coro->status)
2060 return 1;
2061
2062 frame->destroy = 0;
2063
2064 coro_push_av (aTHX_ coro->status, GIMME_V);
2065
2066 SvREFCNT_dec ((SV *)coro->hv);
2067
2068 return 0;
2069}
2070
2071static void
2072slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2073{
2074 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2075
2076 if (items > 1)
2077 croak ("join called with too many arguments");
2078
2079 if (coro->status)
2080 frame->prepare = prepare_nop;
2081 else
2082 {
2083 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2084 frame->prepare = prepare_schedule;
2085 }
2086
2087 frame->check = slf_check_join;
2088 frame->destroy = slf_destroy_join;
2089 frame->data = (void *)coro;
2090 SvREFCNT_inc (coro->hv);
2091}
2092
2093static void
1881coro_call_on_destroy (pTHX_ struct coro *coro) 2094coro_call_on_destroy (pTHX_ struct coro *coro)
1882{ 2095{
1883 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2096 AV *od = coro->on_destroy;
1884 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1885 2097
1886 if (on_destroyp) 2098 if (!od)
1887 { 2099 return;
1888 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1889 2100
1890 while (AvFILLp (on_destroy) >= 0) 2101 while (AvFILLp (od) >= 0)
2102 {
2103 SV *cb = sv_2mortal (av_pop (od));
2104
2105 /* coro hv's (and only hv's at the moment) are supported as well */
2106 if (SvSTATEhv_p (aTHX_ cb))
2107 api_ready (aTHX_ cb);
2108 else
1891 { 2109 {
1892 dSP; /* don't disturb outer sp */ 2110 dSP; /* don't disturb outer sp */
1893 SV *cb = av_pop (on_destroy);
1894
1895 PUSHMARK (SP); 2111 PUSHMARK (SP);
1896 2112
1897 if (statusp) 2113 if (coro->status)
1898 { 2114 {
1899 int i; 2115 PUTBACK;
1900 AV *status = (AV *)SvRV (*statusp); 2116 coro_push_av (aTHX_ coro->status, G_ARRAY);
1901 EXTEND (SP, AvFILLp (status) + 1); 2117 SPAGAIN;
1902
1903 for (i = 0; i <= AvFILLp (status); ++i)
1904 PUSHs (AvARRAY (status)[i]);
1905 } 2118 }
1906 2119
1907 PUTBACK; 2120 PUTBACK;
1908 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2121 call_sv (cb, G_VOID | G_DISCARD);
1909 } 2122 }
1910 } 2123 }
1911} 2124}
1912 2125
1913static void 2126static void
1914slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2127coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1915{ 2128{
1916 int i; 2129 AV *av;
1917 HV *hv = (HV *)SvRV (coro_current); 2130
1918 AV *av = newAV (); 2131 if (coro->status)
2132 {
2133 av = coro->status;
2134 av_clear (av);
2135 }
2136 else
2137 av = coro->status = newAV ();
1919 2138
1920 /* items are actually not so common, so optimise for this case */ 2139 /* items are actually not so common, so optimise for this case */
1921 if (items) 2140 if (items)
1922 { 2141 {
2142 int i;
2143
1923 av_extend (av, items - 1); 2144 av_extend (av, items - 1);
1924 2145
1925 for (i = 0; i < items; ++i) 2146 for (i = 0; i < items; ++i)
1926 av_push (av, SvREFCNT_inc_NN (arg [i])); 2147 av_push (av, SvREFCNT_inc_NN (arg [i]));
1927 } 2148 }
2149}
1928 2150
1929 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2151static void
1930 2152slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2153{
1931 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2154 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1932 api_ready (aTHX_ sv_manager); 2155 api_ready (aTHX_ sv_manager);
1933 2156
1934 frame->prepare = prepare_schedule; 2157 frame->prepare = prepare_schedule;
1935 frame->check = slf_check_repeat; 2158 frame->check = slf_check_repeat;
1936 2159
1937 /* as a minor optimisation, we could unwind all stacks here */ 2160 /* as a minor optimisation, we could unwind all stacks here */
1938 /* but that puts extra pressure on pp_slf, and is not worth much */ 2161 /* but that puts extra pressure on pp_slf, and is not worth much */
1939 /*coro_unwind_stacks (aTHX);*/ 2162 /*coro_unwind_stacks (aTHX);*/
2163}
2164
2165static void
2166slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2167{
2168 HV *coro_hv = (HV *)SvRV (coro_current);
2169
2170 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2171 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2172}
2173
2174static void
2175slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2176{
2177 HV *coro_hv;
2178 struct coro *coro;
2179
2180 if (items <= 0)
2181 croak ("Coro::cancel called without coro object,");
2182
2183 coro = SvSTATE (arg [0]);
2184 coro_hv = coro->hv;
2185
2186 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2187
2188 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2189 {
2190 /* coro currently busy cancelling something, so just notify it */
2191 coro->slf_frame.data = (void *)coro;
2192
2193 frame->prepare = prepare_nop;
2194 frame->check = slf_check_nop;
2195 }
2196 else if (coro_hv == (HV *)SvRV (coro_current))
2197 {
2198 /* cancelling the current coro is allowed, and equals terminate */
2199 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2200 }
2201 else
2202 {
2203 struct coro *self = SvSTATE_current;
2204
2205 /* otherwise we cancel directly, purely for speed reasons
2206 * unfortunately, this requires some magic trickery, as
2207 * somebody else could cancel us, so we have to fight the cancellation.
2208 * this is ugly, and hopefully fully worth the extra speed.
2209 * besides, I can't get the slow-but-safe version working...
2210 */
2211 slf_frame.data = 0;
2212 self->flags |= CF_NOCANCEL;
2213 coro_state_destroy (aTHX_ coro);
2214 self->flags &= ~CF_NOCANCEL;
2215
2216 if (slf_frame.data)
2217 {
2218 /* while we were busy we have been cancelled, so terminate */
2219 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2220 }
2221 else
2222 {
2223 frame->prepare = prepare_nop;
2224 frame->check = slf_check_nop;
2225 }
2226 }
2227}
2228
2229static int
2230slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2231{
2232 frame->prepare = 0;
2233 coro_unwind_stacks (aTHX);
2234
2235 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2236
2237 return 1;
2238}
2239
2240static int
2241safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2242{
2243 if (coro->cctx)
2244 croak ("coro inside C callback, unable to cancel at this time, caught");
2245
2246 if (coro->flags & CF_NEW)
2247 {
2248 coro_set_status (aTHX_ coro, arg, items);
2249 coro_state_destroy (aTHX_ coro);
2250 }
2251 else
2252 {
2253 if (!coro->slf_frame.prepare)
2254 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2255
2256 slf_destroy (aTHX_ coro);
2257
2258 coro_set_status (aTHX_ coro, arg, items);
2259 coro->slf_frame.prepare = prepare_nop;
2260 coro->slf_frame.check = slf_check_safe_cancel;
2261
2262 api_ready (aTHX_ (SV *)coro->hv);
2263 }
2264
2265 return 1;
1940} 2266}
1941 2267
1942/*****************************************************************************/ 2268/*****************************************************************************/
1943/* async pool handler */ 2269/* async pool handler */
1944 2270
… …
1975slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2301slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1976{ 2302{
1977 HV *hv = (HV *)SvRV (coro_current); 2303 HV *hv = (HV *)SvRV (coro_current);
1978 struct coro *coro = SvSTATE_hv ((SV *)hv); 2304 struct coro *coro = SvSTATE_hv ((SV *)hv);
1979 2305
1980 if (expect_true (coro->saved_deffh)) 2306 if (ecb_expect_true (coro->saved_deffh))
1981 { 2307 {
1982 /* subsequent iteration */ 2308 /* subsequent iteration */
1983 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2309 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1984 coro->saved_deffh = 0; 2310 coro->saved_deffh = 0;
1985 2311
1986 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2312 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1987 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2313 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1988 { 2314 {
1989 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2315 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1990 coro->invoke_av = newAV (); 2316 return;
1991
1992 frame->prepare = prepare_nop;
1993 } 2317 }
1994 else 2318 else
1995 { 2319 {
1996 av_clear (GvAV (PL_defgv)); 2320 av_clear (GvAV (PL_defgv));
1997 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2321 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2047 2371
2048static int 2372static int
2049slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2373slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2050{ 2374{
2051 SV *data = (SV *)frame->data; 2375 SV *data = (SV *)frame->data;
2052 2376
2053 if (CORO_THROW) 2377 if (CORO_THROW)
2054 return 0; 2378 return 0;
2055 2379
2056 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2380 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2057 return 1; 2381 return 1;
… …
2093 cb = sv_2mortal (coro->rouse_cb); 2417 cb = sv_2mortal (coro->rouse_cb);
2094 coro->rouse_cb = 0; 2418 coro->rouse_cb = 0;
2095 } 2419 }
2096 2420
2097 if (!SvROK (cb) 2421 if (!SvROK (cb)
2098 || SvTYPE (SvRV (cb)) != SVt_PVCV 2422 || SvTYPE (SvRV (cb)) != SVt_PVCV
2099 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2423 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2100 croak ("Coro::rouse_wait called with illegal callback argument,"); 2424 croak ("Coro::rouse_wait called with illegal callback argument,");
2101 2425
2102 { 2426 {
2103 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2427 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2220static void 2544static void
2221slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2545slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2222{ 2546{
2223 frame->prepare = prepare_cede_notself; 2547 frame->prepare = prepare_cede_notself;
2224 frame->check = slf_check_nop; 2548 frame->check = slf_check_nop;
2549}
2550
2551/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2552static void
2553slf_destroy (pTHX_ struct coro *coro)
2554{
2555 /* this callback is reserved for slf functions needing to do cleanup */
2556 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2557 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2558
2559 /*
2560 * The on_destroy above most likely is from an SLF call.
2561 * Since by definition the SLF call will not finish when we destroy
2562 * the coro, we will have to force-finish it here, otherwise
2563 * cleanup functions cannot call SLF functions.
2564 */
2565 coro->slf_frame.prepare = 0;
2225} 2566}
2226 2567
2227/* 2568/*
2228 * these not obviously related functions are all rolled into one 2569 * these not obviously related functions are all rolled into one
2229 * function to increase chances that they all will call transfer with the same 2570 * function to increase chances that they all will call transfer with the same
… …
2236 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2577 I32 checkmark; /* mark SP to see how many elements check has pushed */
2237 2578
2238 /* set up the slf frame, unless it has already been set-up */ 2579 /* set up the slf frame, unless it has already been set-up */
2239 /* the latter happens when a new coro has been started */ 2580 /* the latter happens when a new coro has been started */
2240 /* or when a new cctx was attached to an existing coroutine */ 2581 /* or when a new cctx was attached to an existing coroutine */
2241 if (expect_true (!slf_frame.prepare)) 2582 if (ecb_expect_true (!slf_frame.prepare))
2242 { 2583 {
2243 /* first iteration */ 2584 /* first iteration */
2244 dSP; 2585 dSP;
2245 SV **arg = PL_stack_base + TOPMARK + 1; 2586 SV **arg = PL_stack_base + TOPMARK + 1;
2246 int items = SP - arg; /* args without function object */ 2587 int items = SP - arg; /* args without function object */
… …
2287 while (slf_frame.check (aTHX_ &slf_frame)); 2628 while (slf_frame.check (aTHX_ &slf_frame));
2288 2629
2289 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2630 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2290 2631
2291 /* exception handling */ 2632 /* exception handling */
2292 if (expect_false (CORO_THROW)) 2633 if (ecb_expect_false (CORO_THROW))
2293 { 2634 {
2294 SV *exception = sv_2mortal (CORO_THROW); 2635 SV *exception = sv_2mortal (CORO_THROW);
2295 2636
2296 CORO_THROW = 0; 2637 CORO_THROW = 0;
2297 sv_setsv (ERRSV, exception); 2638 sv_setsv (ERRSV, exception);
2298 croak (0); 2639 croak (0);
2299 } 2640 }
2300 2641
2301 /* return value handling - mostly like entersub */ 2642 /* return value handling - mostly like entersub */
2302 /* make sure we put something on the stack in scalar context */ 2643 /* make sure we put something on the stack in scalar context */
2303 if (GIMME_V == G_SCALAR) 2644 if (GIMME_V == G_SCALAR
2645 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2304 { 2646 {
2305 dSP; 2647 dSP;
2306 SV **bot = PL_stack_base + checkmark; 2648 SV **bot = PL_stack_base + checkmark;
2307 2649
2308 if (sp == bot) /* too few, push undef */ 2650 if (sp == bot) /* too few, push undef */
2309 bot [1] = &PL_sv_undef; 2651 bot [1] = &PL_sv_undef;
2310 else if (sp != bot + 1) /* too many, take last one */ 2652 else /* too many, take last one */
2311 bot [1] = *sp; 2653 bot [1] = *sp;
2312 2654
2313 SP = bot + 1; 2655 SP = bot + 1;
2314 2656
2315 PUTBACK; 2657 PUTBACK;
… …
2348 if (PL_op->op_flags & OPf_STACKED) 2690 if (PL_op->op_flags & OPf_STACKED)
2349 { 2691 {
2350 if (items > slf_arga) 2692 if (items > slf_arga)
2351 { 2693 {
2352 slf_arga = items; 2694 slf_arga = items;
2353 free (slf_argv); 2695 Safefree (slf_argv);
2354 slf_argv = malloc (slf_arga * sizeof (SV *)); 2696 New (0, slf_argv, slf_arga, SV *);
2355 } 2697 }
2356 2698
2357 slf_argc = items; 2699 slf_argc = items;
2358 2700
2359 for (i = 0; i < items; ++i) 2701 for (i = 0; i < items; ++i)
… …
2422{ 2764{
2423 PerlIOBuf base; 2765 PerlIOBuf base;
2424 NV next, every; 2766 NV next, every;
2425} PerlIOCede; 2767} PerlIOCede;
2426 2768
2427static IV 2769static IV ecb_cold
2428PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2770PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2429{ 2771{
2430 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2772 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2431 2773
2432 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2774 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2433 self->next = nvtime () + self->every; 2775 self->next = nvtime () + self->every;
2434 2776
2435 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2777 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2436} 2778}
2437 2779
2438static SV * 2780static SV * ecb_cold
2439PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2781PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2440{ 2782{
2441 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2783 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2442 2784
2443 return newSVnv (self->every); 2785 return newSVnv (self->every);
… …
2555 SvREFCNT_dec (cb); 2897 SvREFCNT_dec (cb);
2556 } 2898 }
2557} 2899}
2558 2900
2559static void 2901static void
2560coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2902coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2561{ 2903{
2562 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2904 /* call $sem->adjust (0) to possibly wake up some other waiters */
2563 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2905 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2564} 2906}
2565 2907
2566static int 2908static int
2567slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2909slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2568{ 2910{
2569 AV *av = (AV *)frame->data; 2911 AV *av = (AV *)frame->data;
2570 SV *count_sv = AvARRAY (av)[0]; 2912 SV *count_sv = AvARRAY (av)[0];
2913 SV *coro_hv = SvRV (coro_current);
2571 2914
2572 /* if we are about to throw, don't actually acquire the lock, just throw */ 2915 /* if we are about to throw, don't actually acquire the lock, just throw */
2573 if (CORO_THROW) 2916 if (CORO_THROW)
2574 return 0; 2917 return 0;
2575 else if (SvIVX (count_sv) > 0) 2918 else if (SvIVX (count_sv) > 0)
2576 { 2919 {
2577 SvSTATE_current->on_destroy = 0; 2920 frame->destroy = 0;
2578 2921
2579 if (acquire) 2922 if (acquire)
2580 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2923 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2581 else 2924 else
2582 coro_semaphore_adjust (aTHX_ av, 0); 2925 coro_semaphore_adjust (aTHX_ av, 0);
… …
2587 { 2930 {
2588 int i; 2931 int i;
2589 /* if we were woken up but can't down, we look through the whole */ 2932 /* if we were woken up but can't down, we look through the whole */
2590 /* waiters list and only add us if we aren't in there already */ 2933 /* waiters list and only add us if we aren't in there already */
2591 /* this avoids some degenerate memory usage cases */ 2934 /* this avoids some degenerate memory usage cases */
2592 2935 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2593 for (i = 1; i <= AvFILLp (av); ++i)
2594 if (AvARRAY (av)[i] == SvRV (coro_current)) 2936 if (AvARRAY (av)[i] == coro_hv)
2595 return 1; 2937 return 1;
2596 2938
2597 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2939 av_push (av, SvREFCNT_inc (coro_hv));
2598 return 1; 2940 return 1;
2599 } 2941 }
2600} 2942}
2601 2943
2602static int 2944static int
… …
2625 { 2967 {
2626 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2968 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2627 2969
2628 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2970 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2629 frame->prepare = prepare_schedule; 2971 frame->prepare = prepare_schedule;
2630
2631 /* to avoid race conditions when a woken-up coro gets terminated */ 2972 /* to avoid race conditions when a woken-up coro gets terminated */
2632 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2973 /* we arrange for a temporary on_destroy that calls adjust (0) */
2633 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2974 frame->destroy = coro_semaphore_destroy;
2634 } 2975 }
2635} 2976}
2636 2977
2637static void 2978static void
2638slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2979slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2720 { 3061 {
2721 SV *cb_cv = s_get_cv_croak (arg [1]); 3062 SV *cb_cv = s_get_cv_croak (arg [1]);
2722 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3063 av_push (av, SvREFCNT_inc_NN (cb_cv));
2723 3064
2724 if (SvIVX (AvARRAY (av)[0])) 3065 if (SvIVX (AvARRAY (av)[0]))
2725 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3066 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2726 3067
2727 frame->prepare = prepare_nop; 3068 frame->prepare = prepare_nop;
2728 frame->check = slf_check_nop; 3069 frame->check = slf_check_nop;
2729 } 3070 }
2730 else if (SvIVX (AvARRAY (av)[0])) 3071 else if (SvIVX (AvARRAY (av)[0]))
… …
2856 dSP; 3197 dSP;
2857 3198
2858 static SV *prio_cv; 3199 static SV *prio_cv;
2859 static SV *prio_sv; 3200 static SV *prio_sv;
2860 3201
2861 if (expect_false (!prio_cv)) 3202 if (ecb_expect_false (!prio_cv))
2862 { 3203 {
2863 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3204 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2864 prio_sv = newSViv (0); 3205 prio_sv = newSViv (0);
2865 } 3206 }
2866 3207
… …
2892 /* now call the AIO function - we assume our request is uncancelable */ 3233 /* now call the AIO function - we assume our request is uncancelable */
2893 PUTBACK; 3234 PUTBACK;
2894 call_sv ((SV *)req, G_VOID | G_DISCARD); 3235 call_sv ((SV *)req, G_VOID | G_DISCARD);
2895 } 3236 }
2896 3237
2897 /* now that the requets is going, we loop toll we have a result */ 3238 /* now that the request is going, we loop till we have a result */
2898 frame->data = (void *)state; 3239 frame->data = (void *)state;
2899 frame->prepare = prepare_schedule; 3240 frame->prepare = prepare_schedule;
2900 frame->check = slf_check_aio_req; 3241 frame->check = slf_check_aio_req;
2901} 3242}
2902 3243
… …
2972 } 3313 }
2973 3314
2974 return coro_sv; 3315 return coro_sv;
2975} 3316}
2976 3317
3318#ifndef __cplusplus
3319ecb_cold XS(boot_Coro__State);
3320#endif
3321
3322#if CORO_JIT
3323
3324static void ecb_noinline ecb_cold
3325pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3326{
3327 dSP;
3328 AV *av = newAV ();
3329
3330 av_store (av, 3, newSVuv (d));
3331 av_store (av, 2, newSVuv (c));
3332 av_store (av, 1, newSVuv (b));
3333 av_store (av, 0, newSVuv (a));
3334
3335 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3336
3337 PUTBACK;
3338}
3339
3340static void ecb_noinline ecb_cold
3341jit_init (pTHX)
3342{
3343 dSP;
3344 SV *load, *save;
3345 char *map_base;
3346 char *load_ptr, *save_ptr;
3347 STRLEN load_len, save_len, map_len;
3348 int count;
3349
3350 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3351
3352 PUSHMARK (SP);
3353 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3354 #include "state.h"
3355 count = call_pv ("Coro::State::_jit", G_ARRAY);
3356 SPAGAIN;
3357
3358 save = POPs; save_ptr = SvPVbyte (save, save_len);
3359 load = POPs; load_ptr = SvPVbyte (load, load_len);
3360
3361 map_len = load_len + save_len + 16;
3362
3363 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3364
3365 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3366
3367 load_perl_slots = (load_save_perl_slots_type)map_base;
3368 memcpy (map_base, load_ptr, load_len);
3369
3370 map_base += (load_len + 15) & ~15;
3371
3372 save_perl_slots = (load_save_perl_slots_type)map_base;
3373 memcpy (map_base, save_ptr, save_len);
3374
3375 /* we are good citizens and try to make the page read-only, so the evil evil */
3376 /* hackers might have it a bit more difficult */
3377 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3378
3379 PUTBACK;
3380 eval_pv ("undef &Coro::State::_jit", 1);
3381}
3382
3383#endif
3384
2977MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3385MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2978 3386
2979PROTOTYPES: DISABLE 3387PROTOTYPES: DISABLE
2980 3388
2981BOOT: 3389BOOT:
… …
2983#ifdef USE_ITHREADS 3391#ifdef USE_ITHREADS
2984# if CORO_PTHREAD 3392# if CORO_PTHREAD
2985 coro_thx = PERL_GET_CONTEXT; 3393 coro_thx = PERL_GET_CONTEXT;
2986# endif 3394# endif
2987#endif 3395#endif
2988 BOOT_PAGESIZE; 3396 /* perl defines these to check for existance first, but why it doesn't */
3397 /* just create them one at init time is not clear to me, except for */
3398 /* programs trying to delete them, but... */
3399 /* anyway, we declare this as invalid and make sure they are initialised here */
3400 DEFSV;
3401 ERRSV;
2989 3402
2990 cctx_current = cctx_new_empty (); 3403 cctx_current = cctx_new_empty ();
2991 3404
2992 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3405 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2993 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3406 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3033 coroapi.prepare_nop = prepare_nop; 3446 coroapi.prepare_nop = prepare_nop;
3034 coroapi.prepare_schedule = prepare_schedule; 3447 coroapi.prepare_schedule = prepare_schedule;
3035 coroapi.prepare_cede = prepare_cede; 3448 coroapi.prepare_cede = prepare_cede;
3036 coroapi.prepare_cede_notself = prepare_cede_notself; 3449 coroapi.prepare_cede_notself = prepare_cede_notself;
3037 3450
3038 { 3451 time_init (aTHX);
3039 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3040
3041 if (!svp) croak ("Time::HiRes is required");
3042 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3043
3044 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3045
3046 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3047 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3048 }
3049 3452
3050 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3453 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3454#if CORO_JIT
3455 PUTBACK;
3456 jit_init (aTHX);
3457 SPAGAIN;
3458#endif
3051} 3459}
3052 3460
3053SV * 3461SV *
3054new (SV *klass, ...) 3462new (SV *klass, ...)
3055 ALIAS: 3463 ALIAS:
… …
3062void 3470void
3063transfer (...) 3471transfer (...)
3064 PROTOTYPE: $$ 3472 PROTOTYPE: $$
3065 CODE: 3473 CODE:
3066 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3474 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3067
3068bool
3069_destroy (SV *coro_sv)
3070 CODE:
3071 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3072 OUTPUT:
3073 RETVAL
3074 3475
3075void 3476void
3076_exit (int code) 3477_exit (int code)
3077 PROTOTYPE: $ 3478 PROTOTYPE: $
3078 CODE: 3479 CODE:
… …
3139void 3540void
3140list () 3541list ()
3141 PROTOTYPE: 3542 PROTOTYPE:
3142 PPCODE: 3543 PPCODE:
3143{ 3544{
3144 struct coro *coro; 3545 struct coro *coro;
3145 for (coro = coro_first; coro; coro = coro->next) 3546 for (coro = coro_first; coro; coro = coro->next)
3146 if (coro->hv) 3547 if (coro->hv)
3147 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3548 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3148} 3549}
3149 3550
… …
3154 CODE: 3555 CODE:
3155{ 3556{
3156 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3557 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3157 { 3558 {
3158 struct coro *current = SvSTATE_current; 3559 struct coro *current = SvSTATE_current;
3560 struct CoroSLF slf_save;
3159 3561
3160 if (current != coro) 3562 if (current != coro)
3161 { 3563 {
3162 PUTBACK; 3564 PUTBACK;
3163 save_perl (aTHX_ current); 3565 save_perl (aTHX_ current);
3164 load_perl (aTHX_ coro); 3566 load_perl (aTHX_ coro);
3567 /* the coro is most likely in an active SLF call.
3568 * while not strictly required (the code we execute is
3569 * not allowed to call any SLF functions), it's cleaner
3570 * to reinitialise the slf_frame and restore it later.
3571 * This might one day allow us to actually do SLF calls
3572 * from code executed here.
3573 */
3574 slf_save = slf_frame;
3575 slf_frame.prepare = 0;
3165 SPAGAIN; 3576 SPAGAIN;
3166 } 3577 }
3167 3578
3168 PUSHSTACK; 3579 PUSHSTACK;
3169 3580
… …
3179 SPAGAIN; 3590 SPAGAIN;
3180 3591
3181 if (current != coro) 3592 if (current != coro)
3182 { 3593 {
3183 PUTBACK; 3594 PUTBACK;
3595 slf_frame = slf_save;
3184 save_perl (aTHX_ coro); 3596 save_perl (aTHX_ coro);
3185 load_perl (aTHX_ current); 3597 load_perl (aTHX_ current);
3186 SPAGAIN; 3598 SPAGAIN;
3187 } 3599 }
3188 } 3600 }
… …
3193 PROTOTYPE: $ 3605 PROTOTYPE: $
3194 ALIAS: 3606 ALIAS:
3195 is_ready = CF_READY 3607 is_ready = CF_READY
3196 is_running = CF_RUNNING 3608 is_running = CF_RUNNING
3197 is_new = CF_NEW 3609 is_new = CF_NEW
3198 is_destroyed = CF_DESTROYED 3610 is_destroyed = CF_ZOMBIE
3611 is_zombie = CF_ZOMBIE
3199 is_suspended = CF_SUSPENDED 3612 is_suspended = CF_SUSPENDED
3200 CODE: 3613 CODE:
3201 RETVAL = boolSV (coro->flags & ix); 3614 RETVAL = boolSV (coro->flags & ix);
3202 OUTPUT: 3615 OUTPUT:
3203 RETVAL 3616 RETVAL
3204 3617
3205void 3618void
3206throw (Coro::State self, SV *throw = &PL_sv_undef) 3619throw (SV *self, SV *exception = &PL_sv_undef)
3207 PROTOTYPE: $;$ 3620 PROTOTYPE: $;$
3208 CODE: 3621 CODE:
3209{ 3622{
3623 struct coro *coro = SvSTATE (self);
3210 struct coro *current = SvSTATE_current; 3624 struct coro *current = SvSTATE_current;
3211 SV **throwp = self == current ? &CORO_THROW : &self->except; 3625 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3212 SvREFCNT_dec (*throwp); 3626 SvREFCNT_dec (*exceptionp);
3213 SvGETMAGIC (throw); 3627 SvGETMAGIC (exception);
3214 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3628 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3629
3630 api_ready (aTHX_ self);
3215} 3631}
3216 3632
3217void 3633void
3218api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3634api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3219 PROTOTYPE: $;$ 3635 PROTOTYPE: $;$
… …
3274 3690
3275void 3691void
3276cancel (Coro::State self) 3692cancel (Coro::State self)
3277 CODE: 3693 CODE:
3278 coro_state_destroy (aTHX_ self); 3694 coro_state_destroy (aTHX_ self);
3279 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3280
3281 3695
3282SV * 3696SV *
3283enable_times (int enabled = enable_times) 3697enable_times (int enabled = enable_times)
3284 CODE: 3698 CODE:
3285{ 3699{
… …
3298 3712
3299void 3713void
3300times (Coro::State self) 3714times (Coro::State self)
3301 PPCODE: 3715 PPCODE:
3302{ 3716{
3303 struct coro *current = SvSTATE (coro_current); 3717 struct coro *current = SvSTATE (coro_current);
3304 3718
3305 if (expect_false (current == self)) 3719 if (ecb_expect_false (current == self))
3306 { 3720 {
3307 coro_times_update (); 3721 coro_times_update ();
3308 coro_times_add (SvSTATE (coro_current)); 3722 coro_times_add (SvSTATE (coro_current));
3309 } 3723 }
3310 3724
3311 EXTEND (SP, 2); 3725 EXTEND (SP, 2);
3312 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3726 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3313 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3727 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3314 3728
3315 if (expect_false (current == self)) 3729 if (ecb_expect_false (current == self))
3316 coro_times_sub (SvSTATE (coro_current)); 3730 coro_times_sub (SvSTATE (coro_current));
3317} 3731}
3732
3733void
3734swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3735 CODE:
3736{
3737 struct coro *current = SvSTATE_current;
3738
3739 if (current == coro)
3740 SWAP_SVS (current);
3741
3742 if (!coro->swap_sv)
3743 coro->swap_sv = newAV ();
3744
3745 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3746 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3747
3748 if (current == coro)
3749 SWAP_SVS (current);
3750}
3751
3318 3752
3319MODULE = Coro::State PACKAGE = Coro 3753MODULE = Coro::State PACKAGE = Coro
3320 3754
3321BOOT: 3755BOOT:
3322{ 3756{
3323 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3757 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3324 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3758 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3325 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3759 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3326 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3327 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3760 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3328 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3761 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3329 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3762 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3330 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3763 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3331 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3764 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3332 3765
3333 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3766 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3334 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3767 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3335 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3768 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3336 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3769 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3337 3770
3338 coro_stash = gv_stashpv ("Coro", TRUE); 3771 coro_stash = gv_stashpv ("Coro", TRUE);
3339 3772
3340 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3773 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3341 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3774 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3342 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3775 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3365SV * 3798SV *
3366async (...) 3799async (...)
3367 PROTOTYPE: &@ 3800 PROTOTYPE: &@
3368 CODE: 3801 CODE:
3369 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1); 3802 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3370 api_ready (RETVAL); 3803 api_ready (aTHX_ RETVAL);
3371 OUTPUT: 3804 OUTPUT:
3372 RETVAL 3805 RETVAL
3806
3807void
3808_destroy (Coro::State coro)
3809 CODE:
3810 /* used by the manager thread */
3811 coro_state_destroy (aTHX_ coro);
3812
3813void
3814on_destroy (Coro::State coro, SV *cb)
3815 CODE:
3816 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3817
3818void
3819join (...)
3820 CODE:
3821 CORO_EXECUTE_SLF_XS (slf_init_join);
3373 3822
3374void 3823void
3375terminate (...) 3824terminate (...)
3376 CODE: 3825 CODE:
3377 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3826 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3827
3828void
3829cancel (...)
3830 CODE:
3831 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3832
3833int
3834safe_cancel (Coro::State self, ...)
3835 C_ARGS: aTHX_ self, &ST (1), items - 1
3378 3836
3379void 3837void
3380schedule (...) 3838schedule (...)
3381 CODE: 3839 CODE:
3382 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3840 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3539 on_leave = 1 3997 on_leave = 1
3540 PROTOTYPE: & 3998 PROTOTYPE: &
3541 CODE: 3999 CODE:
3542{ 4000{
3543 struct coro *coro = SvSTATE_current; 4001 struct coro *coro = SvSTATE_current;
3544 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4002 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3545 4003
3546 block = s_get_cv_croak (block); 4004 block = s_get_cv_croak (block);
3547 4005
3548 if (!*avp) 4006 if (!*avp)
3549 *avp = newAV (); 4007 *avp = newAV ();
… …
3569 4027
3570SV * 4028SV *
3571new (SV *klass, SV *count = 0) 4029new (SV *klass, SV *count = 0)
3572 CODE: 4030 CODE:
3573{ 4031{
3574 int semcnt = 1; 4032 int semcnt = 1;
3575 4033
3576 if (count) 4034 if (count)
3577 { 4035 {
3578 SvGETMAGIC (count); 4036 SvGETMAGIC (count);
3579 4037
… …
3639 XSRETURN_NO; 4097 XSRETURN_NO;
3640} 4098}
3641 4099
3642void 4100void
3643waiters (SV *self) 4101waiters (SV *self)
3644 PPCODE: 4102 PPCODE:
3645{ 4103{
3646 AV *av = (AV *)SvRV (self); 4104 AV *av = (AV *)SvRV (self);
3647 int wcount = AvFILLp (av) + 1 - 1; 4105 int wcount = AvFILLp (av) + 1 - 1;
3648 4106
3649 if (GIMME_V == G_SCALAR) 4107 if (GIMME_V == G_SCALAR)
… …
3658} 4116}
3659 4117
3660MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4118MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3661 4119
3662void 4120void
3663_may_delete (SV *sem, int count, int extra_refs) 4121_may_delete (SV *sem, int count, unsigned int extra_refs)
3664 PPCODE: 4122 PPCODE:
3665{ 4123{
3666 AV *av = (AV *)SvRV (sem); 4124 AV *av = (AV *)SvRV (sem);
3667 4125
3668 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4126 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3669 && AvFILLp (av) == 0 /* no waiters, just count */ 4127 && AvFILLp (av) == 0 /* no waiters, just count */
3670 && SvIV (AvARRAY (av)[0]) == count) 4128 && SvIV (AvARRAY (av)[0]) == count)
3671 XSRETURN_YES; 4129 XSRETURN_YES;
… …
3692 4150
3693void 4151void
3694broadcast (SV *self) 4152broadcast (SV *self)
3695 CODE: 4153 CODE:
3696{ 4154{
3697 AV *av = (AV *)SvRV (self); 4155 AV *av = (AV *)SvRV (self);
3698 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4156 coro_signal_wake (aTHX_ av, AvFILLp (av));
3699} 4157}
3700 4158
3701void 4159void
3702send (SV *self) 4160send (SV *self)
… …
3710 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4168 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3711} 4169}
3712 4170
3713IV 4171IV
3714awaited (SV *self) 4172awaited (SV *self)
3715 CODE: 4173 CODE:
3716 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4174 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3717 OUTPUT: 4175 OUTPUT:
3718 RETVAL 4176 RETVAL
3719 4177
3720 4178
… …
3725 4183
3726void 4184void
3727_schedule (...) 4185_schedule (...)
3728 CODE: 4186 CODE:
3729{ 4187{
3730 static int incede; 4188 static int incede;
3731 4189
3732 api_cede_notself (aTHX); 4190 api_cede_notself (aTHX);
3733 4191
3734 ++incede; 4192 ++incede;
3735 while (coro_nready >= incede && api_cede (aTHX)) 4193 while (coro_nready >= incede && api_cede (aTHX))
… …
3779 { 4237 {
3780 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4238 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3781 coro_old_pp_sselect = 0; 4239 coro_old_pp_sselect = 0;
3782 } 4240 }
3783 4241
3784

Diff Legend

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