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.440 by root, Sat Feb 22 14:12:45 2014 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#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
13#include <stdio.h> 23#include <stdio.h>
14#include <errno.h> 24#include <errno.h>
15#include <assert.h> 25#include <assert.h>
16 26
17#ifdef WIN32 27#ifndef SVs_PADSTALE
28# define SVs_PADSTALE 0
29#endif
30
31#ifdef PadARRAY
32# define NEWPADAPI 1
33# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
34#else
35typedef AV PADNAMELIST;
36# if !PERL_VERSION_ATLEAST(5,8,0)
37typedef AV PADLIST;
38typedef AV PAD;
39# endif
40# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
41# define PadlistMAX(pl) AvFILLp (pl)
42# define PadlistNAMES(pl) (*PadlistARRAY (pl))
43# define PadARRAY AvARRAY
44# define PadMAX AvFILLp
45# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
46#endif
47
48/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
49/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
50#if PERL_VERSION_ATLEAST(5,19,0)
51# define SVt_BIND SVt_IV
52#endif
53
54#if defined(_WIN32)
55# undef HAS_GETTIMEOFDAY
18# undef setjmp 56# undef setjmp
19# undef longjmp 57# undef longjmp
20# undef _exit 58# undef _exit
21# define setjmp _setjmp /* deep magic */ 59# define setjmp _setjmp /* deep magic */
22#else 60#else
23# include <inttypes.h> /* most portable stdint.h */ 61# include <inttypes.h> /* most portable stdint.h */
24#endif 62#endif
25 63
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 */ 64/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 65static int cctx_max_idle = 4;
55 66
56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 67#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57# undef CORO_STACKGUARD 68# define HAS_SCOPESTACK_NAME 1
58#endif
59
60#ifndef CORO_STACKGUARD
61# define CORO_STACKGUARD 0
62#endif 69#endif
63 70
64/* prefer perl internal functions over our own? */ 71/* prefer perl internal functions over our own? */
65#ifndef CORO_PREFER_PERL_FUNCTIONS 72#ifndef CORO_PREFER_PERL_FUNCTIONS
66# define CORO_PREFER_PERL_FUNCTIONS 0 73# define CORO_PREFER_PERL_FUNCTIONS 0
… …
76# define STACKLEVEL ((void *)&stacklevel) 83# define STACKLEVEL ((void *)&stacklevel)
77#endif 84#endif
78 85
79#define IN_DESTRUCT PL_dirty 86#define IN_DESTRUCT PL_dirty
80 87
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" 88#include "CoroAPI.h"
97#define GCoroAPI (&coroapi) /* very sneaky */ 89#define GCoroAPI (&coroapi) /* very sneaky */
98 90
99#ifdef USE_ITHREADS 91#ifdef USE_ITHREADS
100# if CORO_PTHREAD 92# if CORO_PTHREAD
… …
116static void (*u2time)(pTHX_ UV ret[2]); 108static void (*u2time)(pTHX_ UV ret[2]);
117 109
118/* we hijack an hopefully unused CV flag for our purposes */ 110/* we hijack an hopefully unused CV flag for our purposes */
119#define CVf_SLF 0x4000 111#define CVf_SLF 0x4000
120static OP *pp_slf (pTHX); 112static OP *pp_slf (pTHX);
113static void slf_destroy (pTHX_ struct coro *coro);
121 114
122static U32 cctx_gen; 115static U32 cctx_gen;
123static size_t cctx_stacksize = CORO_STACKSIZE; 116static size_t cctx_stacksize = CORO_STACKSIZE;
124static struct CoroAPI coroapi; 117static struct CoroAPI coroapi;
125static AV *main_mainstack; /* used to differentiate between $main and others */ 118static AV *main_mainstack; /* used to differentiate between $main and others */
… …
155static char times_valid; 148static char times_valid;
156 149
157static struct coro_cctx *cctx_first; 150static struct coro_cctx *cctx_first;
158static int cctx_count, cctx_idle; 151static int cctx_count, cctx_idle;
159 152
160enum { 153enum
154{
161 CC_MAPPED = 0x01, 155 CC_MAPPED = 0x01,
162 CC_NOREUSE = 0x02, /* throw this away after tracing */ 156 CC_NOREUSE = 0x02, /* throw this away after tracing */
163 CC_TRACE = 0x04, 157 CC_TRACE = 0x04,
164 CC_TRACE_SUB = 0x08, /* trace sub calls */ 158 CC_TRACE_SUB = 0x08, /* trace sub calls */
165 CC_TRACE_LINE = 0x10, /* trace each statement */ 159 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
170typedef struct coro_cctx 164typedef struct coro_cctx
171{ 165{
172 struct coro_cctx *next; 166 struct coro_cctx *next;
173 167
174 /* the stack */ 168 /* the stack */
175 void *sptr; 169 struct coro_stack stack;
176 size_t ssize;
177 170
178 /* cpu state */ 171 /* cpu state */
179 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 172 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
173#ifndef NDEBUG
180 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 174 JMPENV *idle_te; /* same as idle_sp, but for top_env */
175#endif
181 JMPENV *top_env; 176 JMPENV *top_env;
182 coro_context cctx; 177 coro_context cctx;
183 178
184 U32 gen; 179 U32 gen;
185#if CORO_USE_VALGRIND 180#if CORO_USE_VALGRIND
186 int valgrind_id; 181 int valgrind_id;
187#endif 182#endif
188 unsigned char flags; 183 unsigned char flags;
189} coro_cctx; 184} coro_cctx;
190 185
191coro_cctx *cctx_current; /* the currently running cctx */ 186static coro_cctx *cctx_current; /* the currently running cctx */
192 187
193/*****************************************************************************/ 188/*****************************************************************************/
194 189
190static MGVTBL coro_state_vtbl;
191
195enum { 192enum
193{
196 CF_RUNNING = 0x0001, /* coroutine is running */ 194 CF_RUNNING = 0x0001, /* coroutine is running */
197 CF_READY = 0x0002, /* coroutine is ready */ 195 CF_READY = 0x0002, /* coroutine is ready */
198 CF_NEW = 0x0004, /* has never been switched to */ 196 CF_NEW = 0x0004, /* has never been switched to */
199 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 197 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
200 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 198 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
199 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
201}; 200};
202 201
203/* the structure where most of the perl state is stored, overlaid on the cxstack */ 202/* the structure where most of the perl state is stored, overlaid on the cxstack */
204typedef struct 203typedef struct
205{ 204{
206 SV *defsv;
207 AV *defav;
208 SV *errsv;
209 SV *irsgv;
210 HV *hinthv;
211#define VAR(name,type) type name; 205 #define VARx(name,expr,type) type name;
212# include "state.h" 206 #include "state.h"
213#undef VAR
214} perl_slots; 207} perl_slots;
215 208
209/* 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)) 210#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
217 211
218/* this is a structure representing a perl-level coroutine */ 212/* this is a structure representing a perl-level coroutine */
219struct coro { 213struct coro
214{
220 /* the C coroutine allocated to this perl coroutine, if any */ 215 /* the C coroutine allocated to this perl coroutine, if any */
221 coro_cctx *cctx; 216 coro_cctx *cctx;
222 217
223 /* ready queue */ 218 /* ready queue */
224 struct coro *next_ready; 219 struct coro *next_ready;
… …
226 /* state data */ 221 /* state data */
227 struct CoroSLF slf_frame; /* saved slf frame */ 222 struct CoroSLF slf_frame; /* saved slf frame */
228 AV *mainstack; 223 AV *mainstack;
229 perl_slots *slot; /* basically the saved sp */ 224 perl_slots *slot; /* basically the saved sp */
230 225
231 CV *startcv; /* the CV to execute */ 226 CV *startcv; /* the CV to execute */
232 AV *args; /* data associated with this coroutine (initial args) */ 227 AV *args; /* data associated with this coroutine (initial args) */
233 int refcnt; /* coroutines are refcounted, yes */
234 int flags; /* CF_ flags */ 228 int flags; /* CF_ flags */
235 HV *hv; /* the perl hash associated with this coro, if any */ 229 HV *hv; /* the perl hash associated with this coro, if any */
236 void (*on_destroy)(pTHX_ struct coro *coro);
237 230
238 /* statistics */ 231 /* statistics */
239 int usecount; /* number of transfers to this coro */ 232 int usecount; /* number of transfers to this coro */
240 233
241 /* coro process data */ 234 /* coro process data */
242 int prio; 235 int prio;
243 SV *except; /* exception to be thrown */ 236 SV *except; /* exception to be thrown */
244 SV *rouse_cb; 237 SV *rouse_cb; /* last rouse callback */
238 AV *on_destroy; /* callbacks or coros to notify on destroy */
239 AV *status; /* the exit status list */
245 240
246 /* async_pool */ 241 /* async_pool */
247 SV *saved_deffh; 242 SV *saved_deffh;
248 SV *invoke_cb; 243 SV *invoke_cb;
249 AV *invoke_av; 244 AV *invoke_av;
250 245
251 /* on_enter/on_leave */ 246 /* on_enter/on_leave */
252 AV *on_enter; 247 AV *on_enter;
253 AV *on_leave; 248 AV *on_leave;
254 249
250 /* swap_sv */
251 AV *swap_sv;
252
255 /* times */ 253 /* times */
256 coro_ts t_cpu, t_real; 254 coro_ts t_cpu, t_real;
257 255
258 /* linked list */ 256 /* linked list */
259 struct coro *next, *prev; 257 struct coro *next, *prev;
… …
262typedef struct coro *Coro__State; 260typedef struct coro *Coro__State;
263typedef struct coro *Coro__State_or_hashref; 261typedef struct coro *Coro__State_or_hashref;
264 262
265/* the following variables are effectively part of the perl context */ 263/* the following variables are effectively part of the perl context */
266/* and get copied between struct coro and these variables */ 264/* and get copied between struct coro and these variables */
267/* the mainr easonw e don't support windows process emulation */ 265/* the main reason we don't support windows process emulation */
268static struct CoroSLF slf_frame; /* the current slf frame */ 266static struct CoroSLF slf_frame; /* the current slf frame */
269 267
270/** Coro ********************************************************************/ 268/** Coro ********************************************************************/
271 269
272#define CORO_PRIO_MAX 3 270#define CORO_PRIO_MAX 3
… …
278 276
279/* for Coro.pm */ 277/* for Coro.pm */
280static SV *coro_current; 278static SV *coro_current;
281static SV *coro_readyhook; 279static SV *coro_readyhook;
282static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 280static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
283static CV *cv_coro_run, *cv_coro_terminate; 281static CV *cv_coro_run;
284static struct coro *coro_first; 282static struct coro *coro_first;
285#define coro_nready coroapi.nready 283#define coro_nready coroapi.nready
286 284
285/** JIT *********************************************************************/
286
287#if CORO_JIT
288 /* APPLE doesn't have mmap though */
289 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
290 #ifndef CORO_JIT_TYPE
291 #if ECB_AMD64 && CORO_JIT_UNIXY
292 #define CORO_JIT_TYPE "amd64-unix"
293 #elif __i386 && CORO_JIT_UNIXY
294 #define CORO_JIT_TYPE "x86-unix"
295 #endif
296 #endif
297#endif
298
299#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
300 #undef CORO_JIT
301#endif
302
303#if CORO_JIT
304 typedef void (*load_save_perl_slots_type)(perl_slots *);
305 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
306#endif
307
287/** Coro::Select ************************************************************/ 308/** Coro::Select ************************************************************/
288 309
289static OP *(*coro_old_pp_sselect) (pTHX); 310static OP *(*coro_old_pp_sselect) (pTHX);
290static SV *coro_select_select; 311static SV *coro_select_select;
291 312
292/* horrible hack, but if it works... */ 313/* horrible hack, but if it works... */
293static OP * 314static OP *
294coro_pp_sselect (aTHX) 315coro_pp_sselect (pTHX)
295{ 316{
296 dSP; 317 dSP;
297 PUSHMARK (SP - 4); /* fake argument list */ 318 PUSHMARK (SP - 4); /* fake argument list */
298 XPUSHs (coro_select_select); 319 XPUSHs (coro_select_select);
299 PUTBACK; 320 PUTBACK;
… …
302 PL_op->op_flags |= OPf_STACKED; 323 PL_op->op_flags |= OPf_STACKED;
303 PL_op->op_private = 0; 324 PL_op->op_private = 0;
304 return PL_ppaddr [OP_ENTERSUB](aTHX); 325 return PL_ppaddr [OP_ENTERSUB](aTHX);
305} 326}
306 327
328/** time stuff **************************************************************/
329
330#ifdef HAS_GETTIMEOFDAY
331
332ecb_inline void
333coro_u2time (pTHX_ UV ret[2])
334{
335 struct timeval tv;
336 gettimeofday (&tv, 0);
337
338 ret [0] = tv.tv_sec;
339 ret [1] = tv.tv_usec;
340}
341
342ecb_inline double
343coro_nvtime (void)
344{
345 struct timeval tv;
346 gettimeofday (&tv, 0);
347
348 return tv.tv_sec + tv.tv_usec * 1e-6;
349}
350
351ecb_inline void
352time_init (pTHX)
353{
354 nvtime = coro_nvtime;
355 u2time = coro_u2time;
356}
357
358#else
359
360ecb_inline void
361time_init (pTHX)
362{
363 SV **svp;
364
365 require_pv ("Time/HiRes.pm");
366
367 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
368
369 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
370 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
371
372 nvtime = INT2PTR (double (*)(), SvIV (*svp));
373
374 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
375 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
376}
377
378#endif
379
307/** lowlevel stuff **********************************************************/ 380/** lowlevel stuff **********************************************************/
308 381
309static SV * 382static SV * ecb_noinline
310coro_get_sv (pTHX_ const char *name, int create) 383coro_get_sv (pTHX_ const char *name, int create)
311{ 384{
312#if PERL_VERSION_ATLEAST (5,10,0) 385#if PERL_VERSION_ATLEAST (5,10,0)
313 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 386 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
314 get_sv (name, create); 387 get_sv (name, create);
315#endif 388#endif
316 return get_sv (name, create); 389 return get_sv (name, create);
317} 390}
318 391
319static AV * 392static AV * ecb_noinline
320coro_get_av (pTHX_ const char *name, int create) 393coro_get_av (pTHX_ const char *name, int create)
321{ 394{
322#if PERL_VERSION_ATLEAST (5,10,0) 395#if PERL_VERSION_ATLEAST (5,10,0)
323 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 396 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
324 get_av (name, create); 397 get_av (name, create);
325#endif 398#endif
326 return get_av (name, create); 399 return get_av (name, create);
327} 400}
328 401
329static HV * 402static HV * ecb_noinline
330coro_get_hv (pTHX_ const char *name, int create) 403coro_get_hv (pTHX_ const char *name, int create)
331{ 404{
332#if PERL_VERSION_ATLEAST (5,10,0) 405#if PERL_VERSION_ATLEAST (5,10,0)
333 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 406 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
334 get_hv (name, create); 407 get_hv (name, create);
335#endif 408#endif
336 return get_hv (name, create); 409 return get_hv (name, create);
337} 410}
338 411
339INLINE void 412ecb_inline void
340coro_times_update () 413coro_times_update (void)
341{ 414{
342#ifdef coro_clock_gettime 415#ifdef coro_clock_gettime
343 struct timespec ts; 416 struct timespec ts;
344 417
345 ts.tv_sec = ts.tv_nsec = 0; 418 ts.tv_sec = ts.tv_nsec = 0;
… …
357 time_real [0] = tv [0]; 430 time_real [0] = tv [0];
358 time_real [1] = tv [1] * 1000; 431 time_real [1] = tv [1] * 1000;
359#endif 432#endif
360} 433}
361 434
362INLINE void 435ecb_inline void
363coro_times_add (struct coro *c) 436coro_times_add (struct coro *c)
364{ 437{
365 c->t_real [1] += time_real [1]; 438 c->t_real [1] += time_real [1];
366 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 439 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
367 c->t_real [0] += time_real [0]; 440 c->t_real [0] += time_real [0];
… …
369 c->t_cpu [1] += time_cpu [1]; 442 c->t_cpu [1] += time_cpu [1];
370 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 443 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
371 c->t_cpu [0] += time_cpu [0]; 444 c->t_cpu [0] += time_cpu [0];
372} 445}
373 446
374INLINE void 447ecb_inline void
375coro_times_sub (struct coro *c) 448coro_times_sub (struct coro *c)
376{ 449{
377 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 450 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
378 c->t_real [1] -= time_real [1]; 451 c->t_real [1] -= time_real [1];
379 c->t_real [0] -= time_real [0]; 452 c->t_real [0] -= time_real [0];
… …
387/* magic glue */ 460/* magic glue */
388 461
389#define CORO_MAGIC_type_cv 26 462#define CORO_MAGIC_type_cv 26
390#define CORO_MAGIC_type_state PERL_MAGIC_ext 463#define CORO_MAGIC_type_state PERL_MAGIC_ext
391 464
392#define CORO_MAGIC_NN(sv, type) \ 465#define CORO_MAGIC_NN(sv, type) \
393 (expect_true (SvMAGIC (sv)->mg_type == type) \ 466 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
394 ? SvMAGIC (sv) \ 467 ? SvMAGIC (sv) \
395 : mg_find (sv, type)) 468 : mg_find (sv, type))
396 469
397#define CORO_MAGIC(sv, type) \ 470#define CORO_MAGIC(sv, type) \
398 (expect_true (SvMAGIC (sv)) \ 471 (ecb_expect_true (SvMAGIC (sv)) \
399 ? CORO_MAGIC_NN (sv, type) \ 472 ? CORO_MAGIC_NN (sv, type) \
400 : 0) 473 : 0)
401 474
402#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 475#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
403#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 476#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
404 477
405INLINE struct coro * 478ecb_inline MAGIC *
479SvSTATEhv_p (pTHX_ SV *coro)
480{
481 MAGIC *mg;
482
483 if (ecb_expect_true (
484 SvTYPE (coro) == SVt_PVHV
485 && (mg = CORO_MAGIC_state (coro))
486 && mg->mg_virtual == &coro_state_vtbl
487 ))
488 return mg;
489
490 return 0;
491}
492
493ecb_inline struct coro *
406SvSTATE_ (pTHX_ SV *coro) 494SvSTATE_ (pTHX_ SV *coro)
407{ 495{
408 HV *stash;
409 MAGIC *mg; 496 MAGIC *mg;
410 497
411 if (SvROK (coro)) 498 if (SvROK (coro))
412 coro = SvRV (coro); 499 coro = SvRV (coro);
413 500
414 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 501 mg = SvSTATEhv_p (aTHX_ coro);
502 if (!mg)
415 croak ("Coro::State object required"); 503 croak ("Coro::State object required");
416 504
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; 505 return (struct coro *)mg->mg_ptr;
427} 506}
428 507
429#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 508#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
430 509
… …
433#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 512#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
434 513
435/*****************************************************************************/ 514/*****************************************************************************/
436/* padlist management and caching */ 515/* padlist management and caching */
437 516
438static AV * 517ecb_inline PADLIST *
439coro_derive_padlist (pTHX_ CV *cv) 518coro_derive_padlist (pTHX_ CV *cv)
440{ 519{
441 AV *padlist = CvPADLIST (cv); 520 PADLIST *padlist = CvPADLIST (cv);
442 AV *newpadlist, *newpad; 521 PADLIST *newpadlist;
522 PAD *newpad;
523 PADOFFSET off = PadlistMAX (padlist) + 1;
443 524
444 newpadlist = newAV (); 525#if NEWPADAPI
526
527 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
528 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
529 while (!PadlistARRAY (padlist)[off - 1])
530 --off;
531
532 Perl_pad_push (aTHX_ padlist, off);
533
534 newpad = PadlistARRAY (padlist)[off];
535 PadlistARRAY (padlist)[off] = 0;
536
537#else
538
539#if PERL_VERSION_ATLEAST (5,10,0)
540 Perl_pad_push (aTHX_ padlist, off);
541#else
542 Perl_pad_push (aTHX_ padlist, off, 1);
543#endif
544
545 newpad = PadlistARRAY (padlist)[off];
546 PadlistMAX (padlist) = off - 1;
547
548#endif
549
550 newPADLIST (newpadlist);
551#if !PERL_VERSION_ATLEAST(5,15,3)
552 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
445 AvREAL_off (newpadlist); 553 AvREAL_off (newpadlist);
446#if PERL_VERSION_ATLEAST (5,10,0)
447 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
448#else
449 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
450#endif 554#endif
451 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
452 --AvFILLp (padlist);
453 555
454 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 556 /* Already extended to 2 elements by newPADLIST. */
455 av_store (newpadlist, 1, (SV *)newpad); 557 PadlistMAX (newpadlist) = 1;
558 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
559 PadlistARRAY (newpadlist)[1] = newpad;
456 560
457 return newpadlist; 561 return newpadlist;
458} 562}
459 563
460static void 564ecb_inline void
461free_padlist (pTHX_ AV *padlist) 565free_padlist (pTHX_ PADLIST *padlist)
462{ 566{
463 /* may be during global destruction */ 567 /* may be during global destruction */
464 if (!IN_DESTRUCT) 568 if (!IN_DESTRUCT)
465 { 569 {
466 I32 i = AvFILLp (padlist); 570 I32 i = PadlistMAX (padlist);
467 571
468 while (i > 0) /* special-case index 0 */ 572 while (i > 0) /* special-case index 0 */
469 { 573 {
470 /* we try to be extra-careful here */ 574 /* we try to be extra-careful here */
471 AV *av = (AV *)AvARRAY (padlist)[i--]; 575 PAD *pad = PadlistARRAY (padlist)[i--];
472 I32 j = AvFILLp (av);
473 576
577 if (pad)
578 {
579 I32 j = PadMAX (pad);
580
474 while (j >= 0) 581 while (j >= 0)
475 SvREFCNT_dec (AvARRAY (av)[j--]); 582 SvREFCNT_dec (PadARRAY (pad)[j--]);
476 583
477 AvFILLp (av) = -1; 584 PadMAX (pad) = -1;
478 SvREFCNT_dec (av); 585 SvREFCNT_dec (pad);
586 }
479 } 587 }
480 588
481 SvREFCNT_dec (AvARRAY (padlist)[0]); 589 SvREFCNT_dec (PadlistNAMES (padlist));
482 590
591#if NEWPADAPI
592 Safefree (PadlistARRAY (padlist));
593 Safefree (padlist);
594#else
483 AvFILLp (padlist) = -1; 595 AvFILLp (padlist) = -1;
596 AvREAL_off (padlist);
484 SvREFCNT_dec ((SV*)padlist); 597 SvREFCNT_dec ((SV*)padlist);
598#endif
485 } 599 }
486} 600}
487 601
488static int 602static int
489coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 603coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
490{ 604{
491 AV *padlist; 605 PADLIST *padlist;
492 AV *av = (AV *)mg->mg_obj; 606 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
607 size_t len = *(size_t *)mg->mg_ptr;
493 608
494 /* perl manages to free our internal AV and _then_ call us */ 609 /* perl manages to free our internal AV and _then_ call us */
495 if (IN_DESTRUCT) 610 if (IN_DESTRUCT)
496 return 0; 611 return 0;
497 612
498 /* casting is fun. */ 613 while (len--)
499 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
500 free_padlist (aTHX_ padlist); 614 free_padlist (aTHX_ padlists[len]);
501
502 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
503 615
504 return 0; 616 return 0;
505} 617}
506 618
507static MGVTBL coro_cv_vtbl = { 619static MGVTBL coro_cv_vtbl = {
508 0, 0, 0, 0, 620 0, 0, 0, 0,
509 coro_cv_free 621 coro_cv_free
510}; 622};
511 623
512/* the next two functions merely cache the padlists */ 624/* the next two functions merely cache the padlists */
513static void 625ecb_inline void
514get_padlist (pTHX_ CV *cv) 626get_padlist (pTHX_ CV *cv)
515{ 627{
516 MAGIC *mg = CORO_MAGIC_cv (cv); 628 MAGIC *mg = CORO_MAGIC_cv (cv);
517 AV *av; 629 size_t *lenp;
518 630
519 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 631 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
520 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 632 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
521 else 633 else
522 { 634 {
523#if CORO_PREFER_PERL_FUNCTIONS 635#if CORO_PREFER_PERL_FUNCTIONS
524 /* this is probably cleaner? but also slower! */ 636 /* this is probably cleaner? but also slower! */
525 /* in practise, it seems to be less stable */ 637 /* in practise, it seems to be less stable */
… …
531 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 643 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
532#endif 644#endif
533 } 645 }
534} 646}
535 647
536static void 648ecb_inline void
537put_padlist (pTHX_ CV *cv) 649put_padlist (pTHX_ CV *cv)
538{ 650{
539 MAGIC *mg = CORO_MAGIC_cv (cv); 651 MAGIC *mg = CORO_MAGIC_cv (cv);
540 AV *av;
541 652
542 if (expect_false (!mg)) 653 if (ecb_expect_false (!mg))
654 {
543 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 655 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
656 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
657 mg->mg_len = 1; /* so mg_free frees mg_ptr */
658 }
659 else
660 Renew (mg->mg_ptr,
661 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
662 char);
544 663
545 av = (AV *)mg->mg_obj; 664 ((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} 665}
552 666
553/** load & save, init *******************************************************/ 667/** load & save, init *******************************************************/
668
669ecb_inline void
670swap_sv (SV *a, SV *b)
671{
672 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
673 SV tmp;
674
675 /* swap sv_any */
676 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
677
678 /* swap sv_flags */
679 SvFLAGS (&tmp) = SvFLAGS (a);
680 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
681 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
682
683#if PERL_VERSION_ATLEAST (5,10,0)
684 /* perl 5.10 and later complicates this _quite_ a bit, but it also
685 * is much faster, so no quarrels here. alternatively, we could
686 * sv_upgrade to avoid this.
687 */
688 {
689 /* swap sv_u */
690 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
691
692 /* if SvANY points to the head, we need to adjust the pointers,
693 * as the pointer for a still points to b, and maybe vice versa.
694 */
695 #define svany_in_head(type) \
696 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
697
698 if (svany_in_head (SvTYPE (a)))
699 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
700
701 if (svany_in_head (SvTYPE (b)))
702 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
703 }
704#endif
705}
706
707/* swap sv heads, at least logically */
708static void
709swap_svs (pTHX_ Coro__State c)
710{
711 int i;
712
713 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
714 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
715}
716
717#define SWAP_SVS(coro) \
718 if (ecb_expect_false ((coro)->swap_sv)) \
719 swap_svs (aTHX_ (coro))
554 720
555static void 721static void
556on_enterleave_call (pTHX_ SV *cb); 722on_enterleave_call (pTHX_ SV *cb);
557 723
558static void 724static void
… …
561 perl_slots *slot = c->slot; 727 perl_slots *slot = c->slot;
562 c->slot = 0; 728 c->slot = 0;
563 729
564 PL_mainstack = c->mainstack; 730 PL_mainstack = c->mainstack;
565 731
566 GvSV (PL_defgv) = slot->defsv; 732#if CORO_JIT
567 GvAV (PL_defgv) = slot->defav; 733 load_perl_slots (slot);
568 GvSV (PL_errgv) = slot->errsv; 734#else
569 GvSV (irsgv) = slot->irsgv;
570 GvHV (PL_hintgv) = slot->hinthv;
571
572 #define VAR(name,type) PL_ ## name = slot->name; 735 #define VARx(name,expr,type) expr = slot->name;
573 # include "state.h" 736 #include "state.h"
574 #undef VAR 737#endif
575 738
576 { 739 {
577 dSP; 740 dSP;
578 741
579 CV *cv; 742 CV *cv;
580 743
581 /* now do the ugly restore mess */ 744 /* now do the ugly restore mess */
582 while (expect_true (cv = (CV *)POPs)) 745 while (ecb_expect_true (cv = (CV *)POPs))
583 { 746 {
584 put_padlist (aTHX_ cv); /* mark this padlist as available */ 747 put_padlist (aTHX_ cv); /* mark this padlist as available */
585 CvDEPTH (cv) = PTR2IV (POPs); 748 CvDEPTH (cv) = PTR2IV (POPs);
586 CvPADLIST (cv) = (AV *)POPs; 749 CvPADLIST (cv) = (PADLIST *)POPs;
587 } 750 }
588 751
589 PUTBACK; 752 PUTBACK;
590 } 753 }
591 754
592 slf_frame = c->slf_frame; 755 slf_frame = c->slf_frame;
593 CORO_THROW = c->except; 756 CORO_THROW = c->except;
594 757
595 if (expect_false (enable_times)) 758 if (ecb_expect_false (enable_times))
596 { 759 {
597 if (expect_false (!times_valid)) 760 if (ecb_expect_false (!times_valid))
598 coro_times_update (); 761 coro_times_update ();
599 762
600 coro_times_sub (c); 763 coro_times_sub (c);
601 } 764 }
602 765
603 if (expect_false (c->on_enter)) 766 if (ecb_expect_false (c->on_enter))
604 { 767 {
605 int i; 768 int i;
606 769
607 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 770 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
608 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 771 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
609 } 772 }
773
774 SWAP_SVS (c);
610} 775}
611 776
612static void 777static void
613save_perl (pTHX_ Coro__State c) 778save_perl (pTHX_ Coro__State c)
614{ 779{
780 SWAP_SVS (c);
781
615 if (expect_false (c->on_leave)) 782 if (ecb_expect_false (c->on_leave))
616 { 783 {
617 int i; 784 int i;
618 785
619 for (i = AvFILLp (c->on_leave); i >= 0; --i) 786 for (i = AvFILLp (c->on_leave); i >= 0; --i)
620 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 787 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
621 } 788 }
622 789
623 times_valid = 0; 790 times_valid = 0;
624 791
625 if (expect_false (enable_times)) 792 if (ecb_expect_false (enable_times))
626 { 793 {
627 coro_times_update (); times_valid = 1; 794 coro_times_update (); times_valid = 1;
628 coro_times_add (c); 795 coro_times_add (c);
629 } 796 }
630 797
… …
644 811
645 XPUSHs (Nullsv); 812 XPUSHs (Nullsv);
646 /* this loop was inspired by pp_caller */ 813 /* this loop was inspired by pp_caller */
647 for (;;) 814 for (;;)
648 { 815 {
649 while (expect_true (cxix >= 0)) 816 while (ecb_expect_true (cxix >= 0))
650 { 817 {
651 PERL_CONTEXT *cx = &ccstk[cxix--]; 818 PERL_CONTEXT *cx = &ccstk[cxix--];
652 819
653 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 820 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
654 { 821 {
655 CV *cv = cx->blk_sub.cv; 822 CV *cv = cx->blk_sub.cv;
656 823
657 if (expect_true (CvDEPTH (cv))) 824 if (ecb_expect_true (CvDEPTH (cv)))
658 { 825 {
659 EXTEND (SP, 3); 826 EXTEND (SP, 3);
660 PUSHs ((SV *)CvPADLIST (cv)); 827 PUSHs ((SV *)CvPADLIST (cv));
661 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 828 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
662 PUSHs ((SV *)cv); 829 PUSHs ((SV *)cv);
… …
665 get_padlist (aTHX_ cv); 832 get_padlist (aTHX_ cv);
666 } 833 }
667 } 834 }
668 } 835 }
669 836
670 if (expect_true (top_si->si_type == PERLSI_MAIN)) 837 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
671 break; 838 break;
672 839
673 top_si = top_si->si_prev; 840 top_si = top_si->si_prev;
674 ccstk = top_si->si_cxstack; 841 ccstk = top_si->si_cxstack;
675 cxix = top_si->si_cxix; 842 cxix = top_si->si_cxix;
… …
677 844
678 PUTBACK; 845 PUTBACK;
679 } 846 }
680 847
681 /* allocate some space on the context stack for our purposes */ 848 /* allocate some space on the context stack for our purposes */
682 /* we manually unroll here, as usually 2 slots is enough */ 849 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 { 850 {
687 unsigned int i; 851 unsigned int i;
852
688 for (i = 3; i < SLOT_COUNT; ++i) 853 for (i = 0; i < SLOT_COUNT; ++i)
689 CXINC; 854 CXINC;
690 } 855
691 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 856 cxstack_ix -= SLOT_COUNT; /* undo allocation */
857 }
692 858
693 c->mainstack = PL_mainstack; 859 c->mainstack = PL_mainstack;
694 860
695 { 861 {
696 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 862 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
697 863
698 slot->defav = GvAV (PL_defgv); 864#if CORO_JIT
699 slot->defsv = DEFSV; 865 save_perl_slots (slot);
700 slot->errsv = ERRSV; 866#else
701 slot->irsgv = GvSV (irsgv);
702 slot->hinthv = GvHV (PL_hintgv);
703
704 #define VAR(name,type) slot->name = PL_ ## name; 867 #define VARx(name,expr,type) slot->name = expr;
705 # include "state.h" 868 #include "state.h"
706 #undef VAR 869#endif
707 } 870 }
708} 871}
709 872
710/* 873/*
711 * allocate various perl stacks. This is almost an exact copy 874 * allocate various perl stacks. This is almost an exact copy
… …
717# define coro_init_stacks(thx) init_stacks () 880# define coro_init_stacks(thx) init_stacks ()
718#else 881#else
719static void 882static void
720coro_init_stacks (pTHX) 883coro_init_stacks (pTHX)
721{ 884{
722 PL_curstackinfo = new_stackinfo(32, 8); 885 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
723 PL_curstackinfo->si_type = PERLSI_MAIN; 886 PL_curstackinfo->si_type = PERLSI_MAIN;
724 PL_curstack = PL_curstackinfo->si_stack; 887 PL_curstack = PL_curstackinfo->si_stack;
725 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 888 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
726 889
727 PL_stack_base = AvARRAY(PL_curstack); 890 PL_stack_base = AvARRAY(PL_curstack);
… …
742#endif 905#endif
743 906
744 New(54,PL_scopestack,8,I32); 907 New(54,PL_scopestack,8,I32);
745 PL_scopestack_ix = 0; 908 PL_scopestack_ix = 0;
746 PL_scopestack_max = 8; 909 PL_scopestack_max = 8;
910#if HAS_SCOPESTACK_NAME
911 New(54,PL_scopestack_name,8,const char*);
912#endif
747 913
748 New(54,PL_savestack,24,ANY); 914 New(54,PL_savestack,24,ANY);
749 PL_savestack_ix = 0; 915 PL_savestack_ix = 0;
750 PL_savestack_max = 24; 916 PL_savestack_max = 24;
751 917
… …
779 } 945 }
780 946
781 Safefree (PL_tmps_stack); 947 Safefree (PL_tmps_stack);
782 Safefree (PL_markstack); 948 Safefree (PL_markstack);
783 Safefree (PL_scopestack); 949 Safefree (PL_scopestack);
950#if HAS_SCOPESTACK_NAME
951 Safefree (PL_scopestack_name);
952#endif
784 Safefree (PL_savestack); 953 Safefree (PL_savestack);
785#if !PERL_VERSION_ATLEAST (5,10,0) 954#if !PERL_VERSION_ATLEAST (5,10,0)
786 Safefree (PL_retstack); 955 Safefree (PL_retstack);
787#endif 956#endif
788} 957}
… …
834#endif 1003#endif
835 1004
836/* 1005/*
837 * This overrides the default magic get method of %SIG elements. 1006 * 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 1007 * 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 1008 * and instead of trying to save and restore the hash elements (extremely slow),
840 * readback here. 1009 * we just provide our own readback here.
841 */ 1010 */
842static int 1011static int ecb_cold
843coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1012coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
844{ 1013{
845 const char *s = MgPV_nolen_const (mg); 1014 const char *s = MgPV_nolen_const (mg);
846 1015
847 if (*s == '_') 1016 if (*s == '_')
848 { 1017 {
849 SV **svp = 0; 1018 SV **svp = 0;
850 1019
851 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1020 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
852 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1021 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
853 1022
854 if (svp) 1023 if (svp)
855 { 1024 {
856 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1025 SV *ssv;
1026
1027 if (!*svp)
1028 ssv = &PL_sv_undef;
1029 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1030 ssv = sv_2mortal (newRV_inc (*svp));
1031 else
1032 ssv = *svp;
1033
1034 sv_setsv (sv, ssv);
857 return 0; 1035 return 0;
858 } 1036 }
859 } 1037 }
860 1038
861 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1039 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
862} 1040}
863 1041
864static int 1042static int ecb_cold
865coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1043coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
866{ 1044{
867 const char *s = MgPV_nolen_const (mg); 1045 const char *s = MgPV_nolen_const (mg);
868 1046
869 if (*s == '_') 1047 if (*s == '_')
… …
883 } 1061 }
884 1062
885 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1063 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
886} 1064}
887 1065
888static int 1066static int ecb_cold
889coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1067coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
890{ 1068{
891 const char *s = MgPV_nolen_const (mg); 1069 const char *s = MgPV_nolen_const (mg);
892 1070
893 if (*s == '_') 1071 if (*s == '_')
… …
926slf_check_repeat (pTHX_ struct CoroSLF *frame) 1104slf_check_repeat (pTHX_ struct CoroSLF *frame)
927{ 1105{
928 return 1; 1106 return 1;
929} 1107}
930 1108
931static UNOP coro_setup_op; 1109static UNOP init_perl_op;
932 1110
933static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1111ecb_noinline static void /* noinline to keep it out of the transfer fast path */
934coro_setup (pTHX_ struct coro *coro) 1112init_perl (pTHX_ struct coro *coro)
935{ 1113{
936 /* 1114 /*
937 * emulate part of the perl startup here. 1115 * emulate part of the perl startup here.
938 */ 1116 */
939 coro_init_stacks (aTHX); 1117 coro_init_stacks (aTHX);
… …
946 PL_comppad_name_fill = 0; 1124 PL_comppad_name_fill = 0;
947 PL_comppad_name_floor = 0; 1125 PL_comppad_name_floor = 0;
948 PL_curpm = 0; 1126 PL_curpm = 0;
949 PL_curpad = 0; 1127 PL_curpad = 0;
950 PL_localizing = 0; 1128 PL_localizing = 0;
951 PL_dirty = 0;
952 PL_restartop = 0; 1129 PL_restartop = 0;
953#if PERL_VERSION_ATLEAST (5,10,0) 1130#if PERL_VERSION_ATLEAST (5,10,0)
954 PL_parser = 0; 1131 PL_parser = 0;
955#endif 1132#endif
956 PL_hints = 0; 1133 PL_hints = 0;
957 1134
958 /* recreate the die/warn hooks */ 1135 /* recreate the die/warn hooks */
959 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1136 PL_diehook = SvREFCNT_inc (rv_diehook);
960 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1137 PL_warnhook = SvREFCNT_inc (rv_warnhook);
961 1138
962 GvSV (PL_defgv) = newSV (0); 1139 GvSV (PL_defgv) = newSV (0);
963 GvAV (PL_defgv) = coro->args; coro->args = 0; 1140 GvAV (PL_defgv) = coro->args; coro->args = 0;
964 GvSV (PL_errgv) = newSV (0); 1141 GvSV (PL_errgv) = newSV (0);
965 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1142 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
966 GvHV (PL_hintgv) = 0; 1143 GvHV (PL_hintgv) = 0;
… …
986 /* this newly created coroutine might be run on an existing cctx which most 1163 /* this newly created coroutine might be run on an existing cctx which most
987 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1164 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
988 */ 1165 */
989 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1166 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
990 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1167 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1168 slf_frame.destroy = 0;
991 1169
992 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1170 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
993 coro_setup_op.op_next = PL_op; 1171 init_perl_op.op_next = PL_op;
994 coro_setup_op.op_type = OP_ENTERSUB; 1172 init_perl_op.op_type = OP_ENTERSUB;
995 coro_setup_op.op_ppaddr = pp_slf; 1173 init_perl_op.op_ppaddr = pp_slf;
996 /* no flags etc. required, as an init function won't be called */ 1174 /* no flags etc. required, as an init function won't be called */
997 1175
998 PL_op = (OP *)&coro_setup_op; 1176 PL_op = (OP *)&init_perl_op;
999 1177
1000 /* copy throw, in case it was set before coro_setup */ 1178 /* copy throw, in case it was set before init_perl */
1001 CORO_THROW = coro->except; 1179 CORO_THROW = coro->except;
1002 1180
1181 SWAP_SVS (coro);
1182
1003 if (expect_false (enable_times)) 1183 if (ecb_expect_false (enable_times))
1004 { 1184 {
1005 coro_times_update (); 1185 coro_times_update ();
1006 coro_times_sub (coro); 1186 coro_times_sub (coro);
1007 } 1187 }
1008} 1188}
… …
1027 dounwind (-1); 1207 dounwind (-1);
1028 } 1208 }
1029} 1209}
1030 1210
1031static void 1211static void
1032coro_destruct_perl (pTHX_ struct coro *coro) 1212destroy_perl (pTHX_ struct coro *coro)
1033{ 1213{
1034 SV *svf [9]; 1214 SV *svf [9];
1035 1215
1036 { 1216 {
1217 SV *old_current = SvRV (coro_current);
1037 struct coro *current = SvSTATE_current; 1218 struct coro *current = SvSTATE (old_current);
1038 1219
1039 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1220 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1040 1221
1041 save_perl (aTHX_ current); 1222 save_perl (aTHX_ current);
1223
1224 /* this will cause transfer_check to croak on block*/
1225 SvRV_set (coro_current, (SV *)coro->hv);
1226
1042 load_perl (aTHX_ coro); 1227 load_perl (aTHX_ coro);
1043 1228
1044 coro_unwind_stacks (aTHX); 1229 coro_unwind_stacks (aTHX);
1230
1231 /* restore swapped sv's */
1232 SWAP_SVS (coro);
1233
1045 coro_destruct_stacks (aTHX); 1234 coro_destruct_stacks (aTHX);
1046 1235
1047 // now save some sv's to be free'd later 1236 /* now save some sv's to be free'd later */
1048 svf [0] = GvSV (PL_defgv); 1237 svf [0] = GvSV (PL_defgv);
1049 svf [1] = (SV *)GvAV (PL_defgv); 1238 svf [1] = (SV *)GvAV (PL_defgv);
1050 svf [2] = GvSV (PL_errgv); 1239 svf [2] = GvSV (PL_errgv);
1051 svf [3] = (SV *)PL_defoutgv; 1240 svf [3] = (SV *)PL_defoutgv;
1052 svf [4] = PL_rs; 1241 svf [4] = PL_rs;
… …
1054 svf [6] = (SV *)GvHV (PL_hintgv); 1243 svf [6] = (SV *)GvHV (PL_hintgv);
1055 svf [7] = PL_diehook; 1244 svf [7] = PL_diehook;
1056 svf [8] = PL_warnhook; 1245 svf [8] = PL_warnhook;
1057 assert (9 == sizeof (svf) / sizeof (*svf)); 1246 assert (9 == sizeof (svf) / sizeof (*svf));
1058 1247
1248 SvRV_set (coro_current, old_current);
1249
1059 load_perl (aTHX_ current); 1250 load_perl (aTHX_ current);
1060 } 1251 }
1061 1252
1062 { 1253 {
1063 unsigned int i; 1254 unsigned int i;
… …
1070 SvREFCNT_dec (coro->invoke_cb); 1261 SvREFCNT_dec (coro->invoke_cb);
1071 SvREFCNT_dec (coro->invoke_av); 1262 SvREFCNT_dec (coro->invoke_av);
1072 } 1263 }
1073} 1264}
1074 1265
1075INLINE void 1266ecb_inline void
1076free_coro_mortal (pTHX) 1267free_coro_mortal (pTHX)
1077{ 1268{
1078 if (expect_true (coro_mortal)) 1269 if (ecb_expect_true (coro_mortal))
1079 { 1270 {
1080 SvREFCNT_dec (coro_mortal); 1271 SvREFCNT_dec ((SV *)coro_mortal);
1081 coro_mortal = 0; 1272 coro_mortal = 0;
1082 } 1273 }
1083} 1274}
1084 1275
1085static int 1276static int
… …
1218 1409
1219 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1410 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1220} 1411}
1221 1412
1222/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1413/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1223static void NOINLINE 1414static void ecb_noinline
1224cctx_prepare (pTHX) 1415cctx_prepare (pTHX)
1225{ 1416{
1226 PL_top_env = &PL_start_env; 1417 PL_top_env = &PL_start_env;
1227 1418
1228 if (cctx_current->flags & CC_TRACE) 1419 if (cctx_current->flags & CC_TRACE)
… …
1239 slf_frame.prepare = slf_prepare_set_stacklevel; 1430 slf_frame.prepare = slf_prepare_set_stacklevel;
1240 slf_frame.check = slf_check_set_stacklevel; 1431 slf_frame.check = slf_check_set_stacklevel;
1241} 1432}
1242 1433
1243/* the tail of transfer: execute stuff we can only do after a transfer */ 1434/* the tail of transfer: execute stuff we can only do after a transfer */
1244INLINE void 1435ecb_inline void
1245transfer_tail (pTHX) 1436transfer_tail (pTHX)
1246{ 1437{
1247 free_coro_mortal (aTHX); 1438 free_coro_mortal (aTHX);
1439}
1440
1441/* try to exit the same way perl's main function would do */
1442/* we do not bother resetting the environment or other things *7
1443/* that are not, uhm, essential */
1444/* this obviously also doesn't work when perl is embedded */
1445static void ecb_noinline ecb_cold
1446perlish_exit (pTHX)
1447{
1448 int exitstatus = perl_destruct (PL_curinterp);
1449 perl_free (PL_curinterp);
1450 exit (exitstatus);
1248} 1451}
1249 1452
1250/* 1453/*
1251 * this is a _very_ stripped down perl interpreter ;) 1454 * this is a _very_ stripped down perl interpreter ;)
1252 */ 1455 */
… …
1281 */ 1484 */
1282 1485
1283 /* 1486 /*
1284 * If perl-run returns we assume exit() was being called or the coro 1487 * If perl-run returns we assume exit() was being called or the coro
1285 * fell off the end, which seems to be the only valid (non-bug) 1488 * fell off the end, which seems to be the only valid (non-bug)
1286 * reason for perl_run to return. We try to exit by jumping to the 1489 * reason for perl_run to return. We try to mimic whatever perl is normally
1287 * bootstrap-time "top" top_env, as we cannot restore the "main" 1490 * 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 */ 1491 */
1292 PL_top_env = main_top_env; 1492 perlish_exit (aTHX);
1293 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1294 } 1493 }
1295} 1494}
1296 1495
1297static coro_cctx * 1496static coro_cctx *
1298cctx_new () 1497cctx_new (void)
1299{ 1498{
1300 coro_cctx *cctx; 1499 coro_cctx *cctx;
1301 1500
1302 ++cctx_count; 1501 ++cctx_count;
1303 New (0, cctx, 1, coro_cctx); 1502 New (0, cctx, 1, coro_cctx);
… …
1309 return cctx; 1508 return cctx;
1310} 1509}
1311 1510
1312/* create a new cctx only suitable as source */ 1511/* create a new cctx only suitable as source */
1313static coro_cctx * 1512static coro_cctx *
1314cctx_new_empty () 1513cctx_new_empty (void)
1315{ 1514{
1316 coro_cctx *cctx = cctx_new (); 1515 coro_cctx *cctx = cctx_new ();
1317 1516
1318 cctx->sptr = 0; 1517 cctx->stack.sptr = 0;
1319 coro_create (&cctx->cctx, 0, 0, 0, 0); 1518 coro_create (&cctx->cctx, 0, 0, 0, 0);
1320 1519
1321 return cctx; 1520 return cctx;
1322} 1521}
1323 1522
1324/* create a new cctx suitable as destination/running a perl interpreter */ 1523/* create a new cctx suitable as destination/running a perl interpreter */
1325static coro_cctx * 1524static coro_cctx *
1326cctx_new_run () 1525cctx_new_run (void)
1327{ 1526{
1328 coro_cctx *cctx = cctx_new (); 1527 coro_cctx *cctx = cctx_new ();
1329 void *stack_start;
1330 size_t stack_size;
1331 1528
1332#if HAVE_MMAP 1529 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 } 1530 {
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."); 1531 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1355 _exit (EXIT_FAILURE); 1532 _exit (EXIT_FAILURE);
1356 }
1357
1358 stack_start = cctx->sptr;
1359 stack_size = cctx->ssize;
1360 } 1533 }
1361 1534
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); 1535 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1367 1536
1368 return cctx; 1537 return cctx;
1369} 1538}
1370 1539
1371static void 1540static void
1372cctx_destroy (coro_cctx *cctx) 1541cctx_destroy (coro_cctx *cctx)
1373{ 1542{
1374 if (!cctx) 1543 if (!cctx)
1375 return; 1544 return;
1376 1545
1377 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1546 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1378 1547
1379 --cctx_count; 1548 --cctx_count;
1380 coro_destroy (&cctx->cctx); 1549 coro_destroy (&cctx->cctx);
1381 1550
1382 /* coro_transfer creates new, empty cctx's */ 1551 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 1552
1397 Safefree (cctx); 1553 Safefree (cctx);
1398} 1554}
1399 1555
1400/* wether this cctx should be destructed */ 1556/* wether this cctx should be destructed */
1401#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1557#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1402 1558
1403static coro_cctx * 1559static coro_cctx *
1404cctx_get (pTHX) 1560cctx_get (pTHX)
1405{ 1561{
1406 while (expect_true (cctx_first)) 1562 while (ecb_expect_true (cctx_first))
1407 { 1563 {
1408 coro_cctx *cctx = cctx_first; 1564 coro_cctx *cctx = cctx_first;
1409 cctx_first = cctx->next; 1565 cctx_first = cctx->next;
1410 --cctx_idle; 1566 --cctx_idle;
1411 1567
1412 if (expect_true (!CCTX_EXPIRED (cctx))) 1568 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1413 return cctx; 1569 return cctx;
1414 1570
1415 cctx_destroy (cctx); 1571 cctx_destroy (cctx);
1416 } 1572 }
1417 1573
… …
1419} 1575}
1420 1576
1421static void 1577static void
1422cctx_put (coro_cctx *cctx) 1578cctx_put (coro_cctx *cctx)
1423{ 1579{
1424 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1580 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1425 1581
1426 /* free another cctx if overlimit */ 1582 /* free another cctx if overlimit */
1427 if (expect_false (cctx_idle >= cctx_max_idle)) 1583 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1428 { 1584 {
1429 coro_cctx *first = cctx_first; 1585 coro_cctx *first = cctx_first;
1430 cctx_first = first->next; 1586 cctx_first = first->next;
1431 --cctx_idle; 1587 --cctx_idle;
1432 1588
… …
1443static void 1599static void
1444transfer_check (pTHX_ struct coro *prev, struct coro *next) 1600transfer_check (pTHX_ struct coro *prev, struct coro *next)
1445{ 1601{
1446 /* TODO: throwing up here is considered harmful */ 1602 /* TODO: throwing up here is considered harmful */
1447 1603
1448 if (expect_true (prev != next)) 1604 if (ecb_expect_true (prev != next))
1449 { 1605 {
1450 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1606 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,"); 1607 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1452 1608
1453 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1609 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,"); 1610 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1455 1611
1456#if !PERL_VERSION_ATLEAST (5,10,0) 1612#if !PERL_VERSION_ATLEAST (5,10,0)
1457 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1613 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,"); 1614 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1459#endif 1615#endif
1460 } 1616 }
1461} 1617}
1462 1618
1463/* always use the TRANSFER macro */ 1619/* always use the TRANSFER macro */
1464static void NOINLINE /* noinline so we have a fixed stackframe */ 1620static void ecb_noinline /* noinline so we have a fixed stackframe */
1465transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1621transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1466{ 1622{
1467 dSTACKLEVEL; 1623 dSTACKLEVEL;
1468 1624
1469 /* sometimes transfer is only called to set idle_sp */ 1625 /* sometimes transfer is only called to set idle_sp */
1470 if (expect_false (!prev)) 1626 if (ecb_expect_false (!prev))
1471 { 1627 {
1472 cctx_current->idle_sp = STACKLEVEL; 1628 cctx_current->idle_sp = STACKLEVEL;
1473 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1629 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1474 } 1630 }
1475 else if (expect_true (prev != next)) 1631 else if (ecb_expect_true (prev != next))
1476 { 1632 {
1477 coro_cctx *cctx_prev; 1633 coro_cctx *cctx_prev;
1478 1634
1479 if (expect_false (prev->flags & CF_NEW)) 1635 if (ecb_expect_false (prev->flags & CF_NEW))
1480 { 1636 {
1481 /* create a new empty/source context */ 1637 /* create a new empty/source context */
1482 prev->flags &= ~CF_NEW; 1638 prev->flags &= ~CF_NEW;
1483 prev->flags |= CF_RUNNING; 1639 prev->flags |= CF_RUNNING;
1484 } 1640 }
… …
1487 next->flags |= CF_RUNNING; 1643 next->flags |= CF_RUNNING;
1488 1644
1489 /* first get rid of the old state */ 1645 /* first get rid of the old state */
1490 save_perl (aTHX_ prev); 1646 save_perl (aTHX_ prev);
1491 1647
1492 if (expect_false (next->flags & CF_NEW)) 1648 if (ecb_expect_false (next->flags & CF_NEW))
1493 { 1649 {
1494 /* need to start coroutine */ 1650 /* need to start coroutine */
1495 next->flags &= ~CF_NEW; 1651 next->flags &= ~CF_NEW;
1496 /* setup coroutine call */ 1652 /* setup coroutine call */
1497 coro_setup (aTHX_ next); 1653 init_perl (aTHX_ next);
1498 } 1654 }
1499 else 1655 else
1500 load_perl (aTHX_ next); 1656 load_perl (aTHX_ next);
1501 1657
1502 /* possibly untie and reuse the cctx */ 1658 /* possibly untie and reuse the cctx */
1503 if (expect_true ( 1659 if (ecb_expect_true (
1504 cctx_current->idle_sp == STACKLEVEL 1660 cctx_current->idle_sp == STACKLEVEL
1505 && !(cctx_current->flags & CC_TRACE) 1661 && !(cctx_current->flags & CC_TRACE)
1506 && !force_cctx 1662 && !force_cctx
1507 )) 1663 ))
1508 { 1664 {
1509 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1665 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1510 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1666 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1511 1667
1512 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1668 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1513 /* without this the next cctx_get might destroy the running cctx while still in use */ 1669 /* without this the next cctx_get might destroy the running cctx while still in use */
1514 if (expect_false (CCTX_EXPIRED (cctx_current))) 1670 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1515 if (expect_true (!next->cctx)) 1671 if (ecb_expect_true (!next->cctx))
1516 next->cctx = cctx_get (aTHX); 1672 next->cctx = cctx_get (aTHX);
1517 1673
1518 cctx_put (cctx_current); 1674 cctx_put (cctx_current);
1519 } 1675 }
1520 else 1676 else
1521 prev->cctx = cctx_current; 1677 prev->cctx = cctx_current;
1522 1678
1523 ++next->usecount; 1679 ++next->usecount;
1524 1680
1525 cctx_prev = cctx_current; 1681 cctx_prev = cctx_current;
1526 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1682 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1527 1683
1528 next->cctx = 0; 1684 next->cctx = 0;
1529 1685
1530 if (expect_false (cctx_prev != cctx_current)) 1686 if (ecb_expect_false (cctx_prev != cctx_current))
1531 { 1687 {
1532 cctx_prev->top_env = PL_top_env; 1688 cctx_prev->top_env = PL_top_env;
1533 PL_top_env = cctx_current->top_env; 1689 PL_top_env = cctx_current->top_env;
1534 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1690 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1535 } 1691 }
… …
1541#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1697#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1542#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1698#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1543 1699
1544/** high level stuff ********************************************************/ 1700/** high level stuff ********************************************************/
1545 1701
1702/* this function is actually Coro, not Coro::State, but we call it from here */
1703/* because it is convenient - but it hasn't been declared yet for that reason */
1546static int 1704static void
1705coro_call_on_destroy (pTHX_ struct coro *coro);
1706
1707static void
1547coro_state_destroy (pTHX_ struct coro *coro) 1708coro_state_destroy (pTHX_ struct coro *coro)
1548{ 1709{
1549 if (coro->flags & CF_DESTROYED) 1710 if (coro->flags & CF_ZOMBIE)
1550 return 0; 1711 return;
1551 1712
1552 if (coro->on_destroy && !PL_dirty)
1553 coro->on_destroy (aTHX_ coro); 1713 slf_destroy (aTHX_ coro);
1554 1714
1555 coro->flags |= CF_DESTROYED; 1715 coro->flags |= CF_ZOMBIE;
1556 1716
1557 if (coro->flags & CF_READY) 1717 if (coro->flags & CF_READY)
1558 { 1718 {
1559 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1719 /* reduce nready, as destroying a ready coro effectively unreadies it */
1560 /* alternative: look through all ready queues and remove the coro */ 1720 /* alternative: look through all ready queues and remove the coro */
1561 --coro_nready; 1721 --coro_nready;
1562 } 1722 }
1563 else 1723 else
1564 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1724 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1725
1726 if (coro->next) coro->next->prev = coro->prev;
1727 if (coro->prev) coro->prev->next = coro->next;
1728 if (coro == coro_first) coro_first = coro->next;
1565 1729
1566 if (coro->mainstack 1730 if (coro->mainstack
1567 && coro->mainstack != main_mainstack 1731 && coro->mainstack != main_mainstack
1568 && coro->slot 1732 && coro->slot
1569 && !PL_dirty) 1733 && !PL_dirty)
1570 coro_destruct_perl (aTHX_ coro); 1734 destroy_perl (aTHX_ coro);
1571 1735
1572 cctx_destroy (coro->cctx); 1736 cctx_destroy (coro->cctx);
1573 SvREFCNT_dec (coro->startcv); 1737 SvREFCNT_dec (coro->startcv);
1574 SvREFCNT_dec (coro->args); 1738 SvREFCNT_dec (coro->args);
1739 SvREFCNT_dec (coro->swap_sv);
1575 SvREFCNT_dec (CORO_THROW); 1740 SvREFCNT_dec (CORO_THROW);
1576 1741
1577 if (coro->next) coro->next->prev = coro->prev; 1742 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 1743
1581 return 1; 1744 /* more destruction mayhem in coro_state_free */
1582} 1745}
1583 1746
1584static int 1747static int
1585coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1748coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1586{ 1749{
1587 struct coro *coro = (struct coro *)mg->mg_ptr; 1750 struct coro *coro = (struct coro *)mg->mg_ptr;
1588 mg->mg_ptr = 0; 1751 mg->mg_ptr = 0;
1589 1752
1590 coro->hv = 0;
1591
1592 if (--coro->refcnt < 0)
1593 {
1594 coro_state_destroy (aTHX_ coro); 1753 coro_state_destroy (aTHX_ coro);
1754 SvREFCNT_dec (coro->on_destroy);
1755 SvREFCNT_dec (coro->status);
1756
1595 Safefree (coro); 1757 Safefree (coro);
1596 }
1597 1758
1598 return 0; 1759 return 0;
1599} 1760}
1600 1761
1601static int 1762static int ecb_cold
1602coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1763coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1603{ 1764{
1604 struct coro *coro = (struct coro *)mg->mg_ptr; 1765 /* called when perl clones the current process the slow way (windows process emulation) */
1605 1766 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1606 ++coro->refcnt; 1767 mg->mg_ptr = 0;
1768 mg->mg_virtual = 0;
1607 1769
1608 return 0; 1770 return 0;
1609} 1771}
1610 1772
1611static MGVTBL coro_state_vtbl = { 1773static MGVTBL coro_state_vtbl = {
… …
1636 TRANSFER (ta, 1); 1798 TRANSFER (ta, 1);
1637} 1799}
1638 1800
1639/** Coro ********************************************************************/ 1801/** Coro ********************************************************************/
1640 1802
1641INLINE void 1803ecb_inline void
1642coro_enq (pTHX_ struct coro *coro) 1804coro_enq (pTHX_ struct coro *coro)
1643{ 1805{
1644 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1806 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1645 1807
1646 SvREFCNT_inc_NN (coro->hv); 1808 SvREFCNT_inc_NN (coro->hv);
… …
1648 coro->next_ready = 0; 1810 coro->next_ready = 0;
1649 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1811 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1650 ready [1] = coro; 1812 ready [1] = coro;
1651} 1813}
1652 1814
1653INLINE struct coro * 1815ecb_inline struct coro *
1654coro_deq (pTHX) 1816coro_deq (pTHX)
1655{ 1817{
1656 int prio; 1818 int prio;
1657 1819
1658 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1820 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1711{ 1873{
1712 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1874 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1713} 1875}
1714 1876
1715/* expects to own a reference to next->hv */ 1877/* expects to own a reference to next->hv */
1716INLINE void 1878ecb_inline void
1717prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1879prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1718{ 1880{
1719 SV *prev_sv = SvRV (coro_current); 1881 SV *prev_sv = SvRV (coro_current);
1720 1882
1721 ta->prev = SvSTATE_hv (prev_sv); 1883 ta->prev = SvSTATE_hv (prev_sv);
… …
1734{ 1896{
1735 for (;;) 1897 for (;;)
1736 { 1898 {
1737 struct coro *next = coro_deq (aTHX); 1899 struct coro *next = coro_deq (aTHX);
1738 1900
1739 if (expect_true (next)) 1901 if (ecb_expect_true (next))
1740 { 1902 {
1741 /* cannot transfer to destroyed coros, skip and look for next */ 1903 /* cannot transfer to destroyed coros, skip and look for next */
1742 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1904 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 */ 1905 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1744 else 1906 else
1745 { 1907 {
1746 next->flags &= ~CF_READY; 1908 next->flags &= ~CF_READY;
1747 --coro_nready; 1909 --coro_nready;
… …
1754 { 1916 {
1755 /* nothing to schedule: call the idle handler */ 1917 /* nothing to schedule: call the idle handler */
1756 if (SvROK (sv_idle) 1918 if (SvROK (sv_idle)
1757 && SvOBJECT (SvRV (sv_idle))) 1919 && SvOBJECT (SvRV (sv_idle)))
1758 { 1920 {
1921 if (SvRV (sv_idle) == SvRV (coro_current))
1922 {
1923 require_pv ("Carp");
1924
1925 {
1926 dSP;
1927
1928 ENTER;
1929 SAVETMPS;
1930
1931 PUSHMARK (SP);
1932 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1933 PUTBACK;
1934 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1935
1936 FREETMPS;
1937 LEAVE;
1938 }
1939 }
1940
1759 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1941 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1760 api_ready (aTHX_ SvRV (sv_idle)); 1942 api_ready (aTHX_ SvRV (sv_idle));
1761 --coro_nready; 1943 --coro_nready;
1762 } 1944 }
1763 else 1945 else
1764 { 1946 {
1947 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1765 dSP; 1948 dSP;
1766 1949
1767 ENTER; 1950 ENTER;
1768 SAVETMPS; 1951 SAVETMPS;
1769 1952
… …
1776 } 1959 }
1777 } 1960 }
1778 } 1961 }
1779} 1962}
1780 1963
1781INLINE void 1964ecb_inline void
1782prepare_cede (pTHX_ struct coro_transfer_args *ta) 1965prepare_cede (pTHX_ struct coro_transfer_args *ta)
1783{ 1966{
1784 api_ready (aTHX_ coro_current); 1967 api_ready (aTHX_ coro_current);
1785 prepare_schedule (aTHX_ ta); 1968 prepare_schedule (aTHX_ ta);
1786} 1969}
1787 1970
1788INLINE void 1971ecb_inline void
1789prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1972prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1790{ 1973{
1791 SV *prev = SvRV (coro_current); 1974 SV *prev = SvRV (coro_current);
1792 1975
1793 if (coro_nready) 1976 if (coro_nready)
… …
1823{ 2006{
1824 struct coro_transfer_args ta; 2007 struct coro_transfer_args ta;
1825 2008
1826 prepare_cede (aTHX_ &ta); 2009 prepare_cede (aTHX_ &ta);
1827 2010
1828 if (expect_true (ta.prev != ta.next)) 2011 if (ecb_expect_true (ta.prev != ta.next))
1829 { 2012 {
1830 TRANSFER (ta, 1); 2013 TRANSFER (ta, 1);
1831 return 1; 2014 return 1;
1832 } 2015 }
1833 else 2016 else
… …
1876 coro->slot->runops = RUNOPS_DEFAULT; 2059 coro->slot->runops = RUNOPS_DEFAULT;
1877 } 2060 }
1878} 2061}
1879 2062
1880static void 2063static void
2064coro_push_av (pTHX_ AV *av, I32 gimme_v)
2065{
2066 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2067 {
2068 dSP;
2069
2070 if (gimme_v == G_SCALAR)
2071 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2072 else
2073 {
2074 int i;
2075 EXTEND (SP, AvFILLp (av) + 1);
2076
2077 for (i = 0; i <= AvFILLp (av); ++i)
2078 PUSHs (AvARRAY (av)[i]);
2079 }
2080
2081 PUTBACK;
2082 }
2083}
2084
2085static void
2086coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2087{
2088 if (!coro->on_destroy)
2089 coro->on_destroy = newAV ();
2090
2091 av_push (coro->on_destroy, cb);
2092}
2093
2094static void
2095slf_destroy_join (pTHX_ struct CoroSLF *frame)
2096{
2097 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2098}
2099
2100static int
2101slf_check_join (pTHX_ struct CoroSLF *frame)
2102{
2103 struct coro *coro = (struct coro *)frame->data;
2104
2105 if (!coro->status)
2106 return 1;
2107
2108 frame->destroy = 0;
2109
2110 coro_push_av (aTHX_ coro->status, GIMME_V);
2111
2112 SvREFCNT_dec ((SV *)coro->hv);
2113
2114 return 0;
2115}
2116
2117static void
2118slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2119{
2120 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2121
2122 if (items > 1)
2123 croak ("join called with too many arguments");
2124
2125 if (coro->status)
2126 frame->prepare = prepare_nop;
2127 else
2128 {
2129 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2130 frame->prepare = prepare_schedule;
2131 }
2132
2133 frame->check = slf_check_join;
2134 frame->destroy = slf_destroy_join;
2135 frame->data = (void *)coro;
2136 SvREFCNT_inc (coro->hv);
2137}
2138
2139static void
1881coro_call_on_destroy (pTHX_ struct coro *coro) 2140coro_call_on_destroy (pTHX_ struct coro *coro)
1882{ 2141{
1883 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2142 AV *od = coro->on_destroy;
1884 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1885 2143
1886 if (on_destroyp) 2144 if (!od)
1887 { 2145 return;
1888 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1889 2146
2147 coro->on_destroy = 0;
2148 sv_2mortal ((SV *)od);
2149
1890 while (AvFILLp (on_destroy) >= 0) 2150 while (AvFILLp (od) >= 0)
2151 {
2152 SV *cb = sv_2mortal (av_pop (od));
2153
2154 /* coro hv's (and only hv's at the moment) are supported as well */
2155 if (SvSTATEhv_p (aTHX_ cb))
2156 api_ready (aTHX_ cb);
2157 else
1891 { 2158 {
1892 dSP; /* don't disturb outer sp */ 2159 dSP; /* don't disturb outer sp */
1893 SV *cb = av_pop (on_destroy);
1894
1895 PUSHMARK (SP); 2160 PUSHMARK (SP);
1896 2161
1897 if (statusp) 2162 if (coro->status)
1898 { 2163 {
1899 int i; 2164 PUTBACK;
1900 AV *status = (AV *)SvRV (*statusp); 2165 coro_push_av (aTHX_ coro->status, G_ARRAY);
1901 EXTEND (SP, AvFILLp (status) + 1); 2166 SPAGAIN;
1902
1903 for (i = 0; i <= AvFILLp (status); ++i)
1904 PUSHs (AvARRAY (status)[i]);
1905 } 2167 }
1906 2168
1907 PUTBACK; 2169 PUTBACK;
1908 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2170 call_sv (cb, G_VOID | G_DISCARD);
1909 } 2171 }
1910 } 2172 }
1911} 2173}
1912 2174
1913static void 2175static void
1914slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2176coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1915{ 2177{
1916 int i; 2178 AV *av;
1917 HV *hv = (HV *)SvRV (coro_current); 2179
1918 AV *av = newAV (); 2180 if (coro->status)
2181 {
2182 av = coro->status;
2183 av_clear (av);
2184 }
2185 else
2186 av = coro->status = newAV ();
1919 2187
1920 /* items are actually not so common, so optimise for this case */ 2188 /* items are actually not so common, so optimise for this case */
1921 if (items) 2189 if (items)
1922 { 2190 {
2191 int i;
2192
1923 av_extend (av, items - 1); 2193 av_extend (av, items - 1);
1924 2194
1925 for (i = 0; i < items; ++i) 2195 for (i = 0; i < items; ++i)
1926 av_push (av, SvREFCNT_inc_NN (arg [i])); 2196 av_push (av, SvREFCNT_inc_NN (arg [i]));
1927 } 2197 }
2198}
1928 2199
1929 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2200static void
1930 2201slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2202{
1931 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2203 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1932 api_ready (aTHX_ sv_manager); 2204 api_ready (aTHX_ sv_manager);
1933 2205
1934 frame->prepare = prepare_schedule; 2206 frame->prepare = prepare_schedule;
1935 frame->check = slf_check_repeat; 2207 frame->check = slf_check_repeat;
1936 2208
1937 /* as a minor optimisation, we could unwind all stacks here */ 2209 /* as a minor optimisation, we could unwind all stacks here */
1938 /* but that puts extra pressure on pp_slf, and is not worth much */ 2210 /* but that puts extra pressure on pp_slf, and is not worth much */
1939 /*coro_unwind_stacks (aTHX);*/ 2211 /*coro_unwind_stacks (aTHX);*/
2212}
2213
2214static void
2215slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2216{
2217 HV *coro_hv = (HV *)SvRV (coro_current);
2218
2219 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2220 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2221}
2222
2223static void
2224slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2225{
2226 HV *coro_hv;
2227 struct coro *coro;
2228
2229 if (items <= 0)
2230 croak ("Coro::cancel called without coro object,");
2231
2232 coro = SvSTATE (arg [0]);
2233 coro_hv = coro->hv;
2234
2235 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2236
2237 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2238 {
2239 /* coro currently busy cancelling something, so just notify it */
2240 coro->slf_frame.data = (void *)coro;
2241
2242 frame->prepare = prepare_nop;
2243 frame->check = slf_check_nop;
2244 }
2245 else if (coro_hv == (HV *)SvRV (coro_current))
2246 {
2247 /* cancelling the current coro is allowed, and equals terminate */
2248 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2249 }
2250 else
2251 {
2252 struct coro *self = SvSTATE_current;
2253
2254 /* otherwise we cancel directly, purely for speed reasons
2255 * unfortunately, this requires some magic trickery, as
2256 * somebody else could cancel us, so we have to fight the cancellation.
2257 * this is ugly, and hopefully fully worth the extra speed.
2258 * besides, I can't get the slow-but-safe version working...
2259 */
2260 slf_frame.data = 0;
2261 self->flags |= CF_NOCANCEL;
2262 coro_state_destroy (aTHX_ coro);
2263 self->flags &= ~CF_NOCANCEL;
2264
2265 if (slf_frame.data)
2266 {
2267 /* while we were busy we have been cancelled, so terminate */
2268 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2269 }
2270 else
2271 {
2272 frame->prepare = prepare_nop;
2273 frame->check = slf_check_nop;
2274 }
2275 }
2276}
2277
2278static int
2279slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2280{
2281 frame->prepare = 0;
2282 coro_unwind_stacks (aTHX);
2283
2284 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2285
2286 return 1;
2287}
2288
2289static int
2290safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2291{
2292 if (coro->cctx)
2293 croak ("coro inside C callback, unable to cancel at this time, caught");
2294
2295 if (coro->flags & CF_NEW)
2296 {
2297 coro_set_status (aTHX_ coro, arg, items);
2298 coro_state_destroy (aTHX_ coro);
2299 }
2300 else
2301 {
2302 if (!coro->slf_frame.prepare)
2303 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2304
2305 slf_destroy (aTHX_ coro);
2306
2307 coro_set_status (aTHX_ coro, arg, items);
2308 coro->slf_frame.prepare = prepare_nop;
2309 coro->slf_frame.check = slf_check_safe_cancel;
2310
2311 api_ready (aTHX_ (SV *)coro->hv);
2312 }
2313
2314 return 1;
1940} 2315}
1941 2316
1942/*****************************************************************************/ 2317/*****************************************************************************/
1943/* async pool handler */ 2318/* async pool handler */
1944 2319
… …
1975slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2350slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1976{ 2351{
1977 HV *hv = (HV *)SvRV (coro_current); 2352 HV *hv = (HV *)SvRV (coro_current);
1978 struct coro *coro = SvSTATE_hv ((SV *)hv); 2353 struct coro *coro = SvSTATE_hv ((SV *)hv);
1979 2354
1980 if (expect_true (coro->saved_deffh)) 2355 if (ecb_expect_true (coro->saved_deffh))
1981 { 2356 {
1982 /* subsequent iteration */ 2357 /* subsequent iteration */
1983 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2358 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1984 coro->saved_deffh = 0; 2359 coro->saved_deffh = 0;
1985 2360
1986 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2361 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1987 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2362 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1988 { 2363 {
1989 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2364 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1990 coro->invoke_av = newAV (); 2365 return;
1991
1992 frame->prepare = prepare_nop;
1993 } 2366 }
1994 else 2367 else
1995 { 2368 {
1996 av_clear (GvAV (PL_defgv)); 2369 av_clear (GvAV (PL_defgv));
1997 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2370 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2047 2420
2048static int 2421static int
2049slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2422slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2050{ 2423{
2051 SV *data = (SV *)frame->data; 2424 SV *data = (SV *)frame->data;
2052 2425
2053 if (CORO_THROW) 2426 if (CORO_THROW)
2054 return 0; 2427 return 0;
2055 2428
2056 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2429 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2057 return 1; 2430 return 1;
… …
2093 cb = sv_2mortal (coro->rouse_cb); 2466 cb = sv_2mortal (coro->rouse_cb);
2094 coro->rouse_cb = 0; 2467 coro->rouse_cb = 0;
2095 } 2468 }
2096 2469
2097 if (!SvROK (cb) 2470 if (!SvROK (cb)
2098 || SvTYPE (SvRV (cb)) != SVt_PVCV 2471 || SvTYPE (SvRV (cb)) != SVt_PVCV
2099 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2472 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2100 croak ("Coro::rouse_wait called with illegal callback argument,"); 2473 croak ("Coro::rouse_wait called with illegal callback argument,");
2101 2474
2102 { 2475 {
2103 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2476 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2220static void 2593static void
2221slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2594slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2222{ 2595{
2223 frame->prepare = prepare_cede_notself; 2596 frame->prepare = prepare_cede_notself;
2224 frame->check = slf_check_nop; 2597 frame->check = slf_check_nop;
2598}
2599
2600/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2601static void
2602slf_destroy (pTHX_ struct coro *coro)
2603{
2604 /* this callback is reserved for slf functions needing to do cleanup */
2605 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2606 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2607
2608 /*
2609 * The on_destroy above most likely is from an SLF call.
2610 * Since by definition the SLF call will not finish when we destroy
2611 * the coro, we will have to force-finish it here, otherwise
2612 * cleanup functions cannot call SLF functions.
2613 */
2614 coro->slf_frame.prepare = 0;
2225} 2615}
2226 2616
2227/* 2617/*
2228 * these not obviously related functions are all rolled into one 2618 * these not obviously related functions are all rolled into one
2229 * function to increase chances that they all will call transfer with the same 2619 * 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 */ 2626 I32 checkmark; /* mark SP to see how many elements check has pushed */
2237 2627
2238 /* set up the slf frame, unless it has already been set-up */ 2628 /* set up the slf frame, unless it has already been set-up */
2239 /* the latter happens when a new coro has been started */ 2629 /* the latter happens when a new coro has been started */
2240 /* or when a new cctx was attached to an existing coroutine */ 2630 /* or when a new cctx was attached to an existing coroutine */
2241 if (expect_true (!slf_frame.prepare)) 2631 if (ecb_expect_true (!slf_frame.prepare))
2242 { 2632 {
2243 /* first iteration */ 2633 /* first iteration */
2244 dSP; 2634 dSP;
2245 SV **arg = PL_stack_base + TOPMARK + 1; 2635 SV **arg = PL_stack_base + TOPMARK + 1;
2246 int items = SP - arg; /* args without function object */ 2636 int items = SP - arg; /* args without function object */
… …
2287 while (slf_frame.check (aTHX_ &slf_frame)); 2677 while (slf_frame.check (aTHX_ &slf_frame));
2288 2678
2289 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2679 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2290 2680
2291 /* exception handling */ 2681 /* exception handling */
2292 if (expect_false (CORO_THROW)) 2682 if (ecb_expect_false (CORO_THROW))
2293 { 2683 {
2294 SV *exception = sv_2mortal (CORO_THROW); 2684 SV *exception = sv_2mortal (CORO_THROW);
2295 2685
2296 CORO_THROW = 0; 2686 CORO_THROW = 0;
2297 sv_setsv (ERRSV, exception); 2687 sv_setsv (ERRSV, exception);
2298 croak (0); 2688 croak (0);
2299 } 2689 }
2300 2690
2301 /* return value handling - mostly like entersub */ 2691 /* return value handling - mostly like entersub */
2302 /* make sure we put something on the stack in scalar context */ 2692 /* make sure we put something on the stack in scalar context */
2303 if (GIMME_V == G_SCALAR) 2693 if (GIMME_V == G_SCALAR
2694 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2304 { 2695 {
2305 dSP; 2696 dSP;
2306 SV **bot = PL_stack_base + checkmark; 2697 SV **bot = PL_stack_base + checkmark;
2307 2698
2308 if (sp == bot) /* too few, push undef */ 2699 if (sp == bot) /* too few, push undef */
2309 bot [1] = &PL_sv_undef; 2700 bot [1] = &PL_sv_undef;
2310 else if (sp != bot + 1) /* too many, take last one */ 2701 else /* too many, take last one */
2311 bot [1] = *sp; 2702 bot [1] = *sp;
2312 2703
2313 SP = bot + 1; 2704 SP = bot + 1;
2314 2705
2315 PUTBACK; 2706 PUTBACK;
… …
2348 if (PL_op->op_flags & OPf_STACKED) 2739 if (PL_op->op_flags & OPf_STACKED)
2349 { 2740 {
2350 if (items > slf_arga) 2741 if (items > slf_arga)
2351 { 2742 {
2352 slf_arga = items; 2743 slf_arga = items;
2353 free (slf_argv); 2744 Safefree (slf_argv);
2354 slf_argv = malloc (slf_arga * sizeof (SV *)); 2745 New (0, slf_argv, slf_arga, SV *);
2355 } 2746 }
2356 2747
2357 slf_argc = items; 2748 slf_argc = items;
2358 2749
2359 for (i = 0; i < items; ++i) 2750 for (i = 0; i < items; ++i)
… …
2422{ 2813{
2423 PerlIOBuf base; 2814 PerlIOBuf base;
2424 NV next, every; 2815 NV next, every;
2425} PerlIOCede; 2816} PerlIOCede;
2426 2817
2427static IV 2818static IV ecb_cold
2428PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2819PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2429{ 2820{
2430 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2821 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2431 2822
2432 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2823 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2433 self->next = nvtime () + self->every; 2824 self->next = nvtime () + self->every;
2434 2825
2435 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2826 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2436} 2827}
2437 2828
2438static SV * 2829static SV * ecb_cold
2439PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2830PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2440{ 2831{
2441 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2832 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2442 2833
2443 return newSVnv (self->every); 2834 return newSVnv (self->every);
… …
2555 SvREFCNT_dec (cb); 2946 SvREFCNT_dec (cb);
2556 } 2947 }
2557} 2948}
2558 2949
2559static void 2950static void
2560coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2951coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2561{ 2952{
2562 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2953 /* call $sem->adjust (0) to possibly wake up some other waiters */
2563 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2954 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2564} 2955}
2565 2956
2566static int 2957static int
2567slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2958slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2568{ 2959{
2569 AV *av = (AV *)frame->data; 2960 AV *av = (AV *)frame->data;
2570 SV *count_sv = AvARRAY (av)[0]; 2961 SV *count_sv = AvARRAY (av)[0];
2962 SV *coro_hv = SvRV (coro_current);
2571 2963
2572 /* if we are about to throw, don't actually acquire the lock, just throw */ 2964 /* if we are about to throw, don't actually acquire the lock, just throw */
2573 if (CORO_THROW) 2965 if (CORO_THROW)
2574 return 0; 2966 return 0;
2575 else if (SvIVX (count_sv) > 0) 2967 else if (SvIVX (count_sv) > 0)
2576 { 2968 {
2577 SvSTATE_current->on_destroy = 0; 2969 frame->destroy = 0;
2578 2970
2579 if (acquire) 2971 if (acquire)
2580 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2972 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2581 else 2973 else
2582 coro_semaphore_adjust (aTHX_ av, 0); 2974 coro_semaphore_adjust (aTHX_ av, 0);
… …
2587 { 2979 {
2588 int i; 2980 int i;
2589 /* if we were woken up but can't down, we look through the whole */ 2981 /* 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 */ 2982 /* waiters list and only add us if we aren't in there already */
2591 /* this avoids some degenerate memory usage cases */ 2983 /* this avoids some degenerate memory usage cases */
2592 2984 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)) 2985 if (AvARRAY (av)[i] == coro_hv)
2595 return 1; 2986 return 1;
2596 2987
2597 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2988 av_push (av, SvREFCNT_inc (coro_hv));
2598 return 1; 2989 return 1;
2599 } 2990 }
2600} 2991}
2601 2992
2602static int 2993static int
… …
2625 { 3016 {
2626 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3017 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2627 3018
2628 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3019 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2629 frame->prepare = prepare_schedule; 3020 frame->prepare = prepare_schedule;
2630
2631 /* to avoid race conditions when a woken-up coro gets terminated */ 3021 /* to avoid race conditions when a woken-up coro gets terminated */
2632 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3022 /* we arrange for a temporary on_destroy that calls adjust (0) */
2633 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3023 frame->destroy = coro_semaphore_destroy;
2634 } 3024 }
2635} 3025}
2636 3026
2637static void 3027static void
2638slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3028slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2720 { 3110 {
2721 SV *cb_cv = s_get_cv_croak (arg [1]); 3111 SV *cb_cv = s_get_cv_croak (arg [1]);
2722 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3112 av_push (av, SvREFCNT_inc_NN (cb_cv));
2723 3113
2724 if (SvIVX (AvARRAY (av)[0])) 3114 if (SvIVX (AvARRAY (av)[0]))
2725 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3115 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2726 3116
2727 frame->prepare = prepare_nop; 3117 frame->prepare = prepare_nop;
2728 frame->check = slf_check_nop; 3118 frame->check = slf_check_nop;
2729 } 3119 }
2730 else if (SvIVX (AvARRAY (av)[0])) 3120 else if (SvIVX (AvARRAY (av)[0]))
… …
2807 /* it quickly returns */ 3197 /* it quickly returns */
2808 if (CORO_THROW) 3198 if (CORO_THROW)
2809 return 0; 3199 return 0;
2810 3200
2811 /* one element that is an RV? repeat! */ 3201 /* one element that is an RV? repeat! */
2812 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3202 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2813 return 1; 3203 return 1;
2814 3204
2815 /* restore status */ 3205 /* restore status */
2816 { 3206 {
2817 SV *data_sv = av_pop (state); 3207 SV *data_sv = av_pop (state);
… …
2856 dSP; 3246 dSP;
2857 3247
2858 static SV *prio_cv; 3248 static SV *prio_cv;
2859 static SV *prio_sv; 3249 static SV *prio_sv;
2860 3250
2861 if (expect_false (!prio_cv)) 3251 if (ecb_expect_false (!prio_cv))
2862 { 3252 {
2863 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3253 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2864 prio_sv = newSViv (0); 3254 prio_sv = newSViv (0);
2865 } 3255 }
2866 3256
… …
2892 /* now call the AIO function - we assume our request is uncancelable */ 3282 /* now call the AIO function - we assume our request is uncancelable */
2893 PUTBACK; 3283 PUTBACK;
2894 call_sv ((SV *)req, G_VOID | G_DISCARD); 3284 call_sv ((SV *)req, G_VOID | G_DISCARD);
2895 } 3285 }
2896 3286
2897 /* now that the requets is going, we loop toll we have a result */ 3287 /* now that the request is going, we loop till we have a result */
2898 frame->data = (void *)state; 3288 frame->data = (void *)state;
2899 frame->prepare = prepare_schedule; 3289 frame->prepare = prepare_schedule;
2900 frame->check = slf_check_aio_req; 3290 frame->check = slf_check_aio_req;
2901} 3291}
2902 3292
… …
2972 } 3362 }
2973 3363
2974 return coro_sv; 3364 return coro_sv;
2975} 3365}
2976 3366
3367#ifndef __cplusplus
3368ecb_cold XS(boot_Coro__State);
3369#endif
3370
3371#if CORO_JIT
3372
3373static void ecb_noinline ecb_cold
3374pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3375{
3376 dSP;
3377 AV *av = newAV ();
3378
3379 av_store (av, 3, newSVuv (d));
3380 av_store (av, 2, newSVuv (c));
3381 av_store (av, 1, newSVuv (b));
3382 av_store (av, 0, newSVuv (a));
3383
3384 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3385
3386 PUTBACK;
3387}
3388
3389static void ecb_noinline ecb_cold
3390jit_init (pTHX)
3391{
3392 dSP;
3393 SV *load, *save;
3394 char *map_base;
3395 char *load_ptr, *save_ptr;
3396 STRLEN load_len, save_len, map_len;
3397 int count;
3398
3399 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3400
3401 PUSHMARK (SP);
3402 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3403 #include "state.h"
3404 count = call_pv ("Coro::State::_jit", G_ARRAY);
3405 SPAGAIN;
3406
3407 save = POPs; save_ptr = SvPVbyte (save, save_len);
3408 load = POPs; load_ptr = SvPVbyte (load, load_len);
3409
3410 map_len = load_len + save_len + 16;
3411
3412 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3413
3414 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3415
3416 load_perl_slots = (load_save_perl_slots_type)map_base;
3417 memcpy (map_base, load_ptr, load_len);
3418
3419 map_base += (load_len + 15) & ~15;
3420
3421 save_perl_slots = (load_save_perl_slots_type)map_base;
3422 memcpy (map_base, save_ptr, save_len);
3423
3424 /* we are good citizens and try to make the page read-only, so the evil evil */
3425 /* hackers might have it a bit more difficult */
3426 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3427
3428 PUTBACK;
3429 eval_pv ("undef &Coro::State::_jit", 1);
3430}
3431
3432#endif
3433
2977MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3434MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2978 3435
2979PROTOTYPES: DISABLE 3436PROTOTYPES: DISABLE
2980 3437
2981BOOT: 3438BOOT:
… …
2983#ifdef USE_ITHREADS 3440#ifdef USE_ITHREADS
2984# if CORO_PTHREAD 3441# if CORO_PTHREAD
2985 coro_thx = PERL_GET_CONTEXT; 3442 coro_thx = PERL_GET_CONTEXT;
2986# endif 3443# endif
2987#endif 3444#endif
2988 BOOT_PAGESIZE; 3445 /* perl defines these to check for existance first, but why it doesn't */
3446 /* just create them one at init time is not clear to me, except for */
3447 /* programs trying to delete them, but... */
3448 /* anyway, we declare this as invalid and make sure they are initialised here */
3449 DEFSV;
3450 ERRSV;
2989 3451
2990 cctx_current = cctx_new_empty (); 3452 cctx_current = cctx_new_empty ();
2991 3453
2992 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3454 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2993 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3455 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3033 coroapi.prepare_nop = prepare_nop; 3495 coroapi.prepare_nop = prepare_nop;
3034 coroapi.prepare_schedule = prepare_schedule; 3496 coroapi.prepare_schedule = prepare_schedule;
3035 coroapi.prepare_cede = prepare_cede; 3497 coroapi.prepare_cede = prepare_cede;
3036 coroapi.prepare_cede_notself = prepare_cede_notself; 3498 coroapi.prepare_cede_notself = prepare_cede_notself;
3037 3499
3038 { 3500 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 3501
3050 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3502 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3503#if CORO_JIT
3504 PUTBACK;
3505 jit_init (aTHX);
3506 SPAGAIN;
3507#endif
3051} 3508}
3052 3509
3053SV * 3510SV *
3054new (SV *klass, ...) 3511new (SV *klass, ...)
3055 ALIAS: 3512 ALIAS:
… …
3062void 3519void
3063transfer (...) 3520transfer (...)
3064 PROTOTYPE: $$ 3521 PROTOTYPE: $$
3065 CODE: 3522 CODE:
3066 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3523 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
3075void
3076_exit (int code)
3077 PROTOTYPE: $
3078 CODE:
3079 _exit (code);
3080 3524
3081SV * 3525SV *
3082clone (Coro::State coro) 3526clone (Coro::State coro)
3083 CODE: 3527 CODE:
3084{ 3528{
… …
3139void 3583void
3140list () 3584list ()
3141 PROTOTYPE: 3585 PROTOTYPE:
3142 PPCODE: 3586 PPCODE:
3143{ 3587{
3144 struct coro *coro; 3588 struct coro *coro;
3145 for (coro = coro_first; coro; coro = coro->next) 3589 for (coro = coro_first; coro; coro = coro->next)
3146 if (coro->hv) 3590 if (coro->hv)
3147 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3591 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3148} 3592}
3149 3593
… …
3154 CODE: 3598 CODE:
3155{ 3599{
3156 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3600 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3157 { 3601 {
3158 struct coro *current = SvSTATE_current; 3602 struct coro *current = SvSTATE_current;
3603 struct CoroSLF slf_save;
3159 3604
3160 if (current != coro) 3605 if (current != coro)
3161 { 3606 {
3162 PUTBACK; 3607 PUTBACK;
3163 save_perl (aTHX_ current); 3608 save_perl (aTHX_ current);
3164 load_perl (aTHX_ coro); 3609 load_perl (aTHX_ coro);
3610 /* the coro is most likely in an active SLF call.
3611 * while not strictly required (the code we execute is
3612 * not allowed to call any SLF functions), it's cleaner
3613 * to reinitialise the slf_frame and restore it later.
3614 * This might one day allow us to actually do SLF calls
3615 * from code executed here.
3616 */
3617 slf_save = slf_frame;
3618 slf_frame.prepare = 0;
3165 SPAGAIN; 3619 SPAGAIN;
3166 } 3620 }
3167 3621
3168 PUSHSTACK; 3622 PUSHSTACK;
3169 3623
… …
3179 SPAGAIN; 3633 SPAGAIN;
3180 3634
3181 if (current != coro) 3635 if (current != coro)
3182 { 3636 {
3183 PUTBACK; 3637 PUTBACK;
3638 slf_frame = slf_save;
3184 save_perl (aTHX_ coro); 3639 save_perl (aTHX_ coro);
3185 load_perl (aTHX_ current); 3640 load_perl (aTHX_ current);
3186 SPAGAIN; 3641 SPAGAIN;
3187 } 3642 }
3188 } 3643 }
… …
3193 PROTOTYPE: $ 3648 PROTOTYPE: $
3194 ALIAS: 3649 ALIAS:
3195 is_ready = CF_READY 3650 is_ready = CF_READY
3196 is_running = CF_RUNNING 3651 is_running = CF_RUNNING
3197 is_new = CF_NEW 3652 is_new = CF_NEW
3198 is_destroyed = CF_DESTROYED 3653 is_destroyed = CF_ZOMBIE
3654 is_zombie = CF_ZOMBIE
3199 is_suspended = CF_SUSPENDED 3655 is_suspended = CF_SUSPENDED
3200 CODE: 3656 CODE:
3201 RETVAL = boolSV (coro->flags & ix); 3657 RETVAL = boolSV (coro->flags & ix);
3202 OUTPUT: 3658 OUTPUT:
3203 RETVAL 3659 RETVAL
3204 3660
3205void 3661void
3206throw (Coro::State self, SV *throw = &PL_sv_undef) 3662throw (SV *self, SV *exception = &PL_sv_undef)
3207 PROTOTYPE: $;$ 3663 PROTOTYPE: $;$
3208 CODE: 3664 CODE:
3209{ 3665{
3666 struct coro *coro = SvSTATE (self);
3210 struct coro *current = SvSTATE_current; 3667 struct coro *current = SvSTATE_current;
3211 SV **throwp = self == current ? &CORO_THROW : &self->except; 3668 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3212 SvREFCNT_dec (*throwp); 3669 SvREFCNT_dec (*exceptionp);
3213 SvGETMAGIC (throw); 3670 SvGETMAGIC (exception);
3214 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3671 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3672
3673 api_ready (aTHX_ self);
3215} 3674}
3216 3675
3217void 3676void
3218api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3677api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3219 PROTOTYPE: $;$ 3678 PROTOTYPE: $;$
… …
3274 3733
3275void 3734void
3276cancel (Coro::State self) 3735cancel (Coro::State self)
3277 CODE: 3736 CODE:
3278 coro_state_destroy (aTHX_ self); 3737 coro_state_destroy (aTHX_ self);
3279 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3280
3281 3738
3282SV * 3739SV *
3283enable_times (int enabled = enable_times) 3740enable_times (int enabled = enable_times)
3284 CODE: 3741 CODE:
3285{ 3742{
… …
3298 3755
3299void 3756void
3300times (Coro::State self) 3757times (Coro::State self)
3301 PPCODE: 3758 PPCODE:
3302{ 3759{
3303 struct coro *current = SvSTATE (coro_current); 3760 struct coro *current = SvSTATE (coro_current);
3304 3761
3305 if (expect_false (current == self)) 3762 if (ecb_expect_false (current == self))
3306 { 3763 {
3307 coro_times_update (); 3764 coro_times_update ();
3308 coro_times_add (SvSTATE (coro_current)); 3765 coro_times_add (SvSTATE (coro_current));
3309 } 3766 }
3310 3767
3311 EXTEND (SP, 2); 3768 EXTEND (SP, 2);
3312 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3769 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))); 3770 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3314 3771
3315 if (expect_false (current == self)) 3772 if (ecb_expect_false (current == self))
3316 coro_times_sub (SvSTATE (coro_current)); 3773 coro_times_sub (SvSTATE (coro_current));
3317} 3774}
3775
3776void
3777swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3778 CODE:
3779{
3780 struct coro *current = SvSTATE_current;
3781
3782 if (current == coro)
3783 SWAP_SVS (current);
3784
3785 if (!coro->swap_sv)
3786 coro->swap_sv = newAV ();
3787
3788 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3789 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3790
3791 if (current == coro)
3792 SWAP_SVS (current);
3793}
3794
3318 3795
3319MODULE = Coro::State PACKAGE = Coro 3796MODULE = Coro::State PACKAGE = Coro
3320 3797
3321BOOT: 3798BOOT:
3322{ 3799{
3323 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3800 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3324 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3801 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3325 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3802 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); 3803 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); 3804 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3329 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3805 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3330 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3806 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3331 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3807 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3332 3808
3333 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3809 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); 3810 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); 3811 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 */ 3812 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3337 3813
3338 coro_stash = gv_stashpv ("Coro", TRUE); 3814 coro_stash = gv_stashpv ("Coro", TRUE);
3339 3815
3340 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3816 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3341 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3817 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3342 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3818 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3365SV * 3841SV *
3366async (...) 3842async (...)
3367 PROTOTYPE: &@ 3843 PROTOTYPE: &@
3368 CODE: 3844 CODE:
3369 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1); 3845 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3370 api_ready (RETVAL); 3846 api_ready (aTHX_ RETVAL);
3371 OUTPUT: 3847 OUTPUT:
3372 RETVAL 3848 RETVAL
3849
3850void
3851_destroy (Coro::State coro)
3852 CODE:
3853 /* used by the manager thread */
3854 coro_state_destroy (aTHX_ coro);
3855
3856void
3857on_destroy (Coro::State coro, SV *cb)
3858 CODE:
3859 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3860
3861void
3862join (...)
3863 CODE:
3864 CORO_EXECUTE_SLF_XS (slf_init_join);
3373 3865
3374void 3866void
3375terminate (...) 3867terminate (...)
3376 CODE: 3868 CODE:
3377 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3869 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3870
3871void
3872cancel (...)
3873 CODE:
3874 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3875
3876int
3877safe_cancel (Coro::State self, ...)
3878 C_ARGS: aTHX_ self, &ST (1), items - 1
3378 3879
3379void 3880void
3380schedule (...) 3881schedule (...)
3381 CODE: 3882 CODE:
3382 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3883 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3539 on_leave = 1 4040 on_leave = 1
3540 PROTOTYPE: & 4041 PROTOTYPE: &
3541 CODE: 4042 CODE:
3542{ 4043{
3543 struct coro *coro = SvSTATE_current; 4044 struct coro *coro = SvSTATE_current;
3544 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4045 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3545 4046
3546 block = s_get_cv_croak (block); 4047 block = s_get_cv_croak (block);
3547 4048
3548 if (!*avp) 4049 if (!*avp)
3549 *avp = newAV (); 4050 *avp = newAV ();
… …
3569 4070
3570SV * 4071SV *
3571new (SV *klass, SV *count = 0) 4072new (SV *klass, SV *count = 0)
3572 CODE: 4073 CODE:
3573{ 4074{
3574 int semcnt = 1; 4075 int semcnt = 1;
3575 4076
3576 if (count) 4077 if (count)
3577 { 4078 {
3578 SvGETMAGIC (count); 4079 SvGETMAGIC (count);
3579 4080
… …
3639 XSRETURN_NO; 4140 XSRETURN_NO;
3640} 4141}
3641 4142
3642void 4143void
3643waiters (SV *self) 4144waiters (SV *self)
3644 PPCODE: 4145 PPCODE:
3645{ 4146{
3646 AV *av = (AV *)SvRV (self); 4147 AV *av = (AV *)SvRV (self);
3647 int wcount = AvFILLp (av) + 1 - 1; 4148 int wcount = AvFILLp (av) + 1 - 1;
3648 4149
3649 if (GIMME_V == G_SCALAR) 4150 if (GIMME_V == G_SCALAR)
… …
3658} 4159}
3659 4160
3660MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4161MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3661 4162
3662void 4163void
3663_may_delete (SV *sem, int count, int extra_refs) 4164_may_delete (SV *sem, int count, unsigned int extra_refs)
3664 PPCODE: 4165 PPCODE:
3665{ 4166{
3666 AV *av = (AV *)SvRV (sem); 4167 AV *av = (AV *)SvRV (sem);
3667 4168
3668 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4169 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3669 && AvFILLp (av) == 0 /* no waiters, just count */ 4170 && AvFILLp (av) == 0 /* no waiters, just count */
3670 && SvIV (AvARRAY (av)[0]) == count) 4171 && SvIV (AvARRAY (av)[0]) == count)
3671 XSRETURN_YES; 4172 XSRETURN_YES;
… …
3692 4193
3693void 4194void
3694broadcast (SV *self) 4195broadcast (SV *self)
3695 CODE: 4196 CODE:
3696{ 4197{
3697 AV *av = (AV *)SvRV (self); 4198 AV *av = (AV *)SvRV (self);
3698 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4199 coro_signal_wake (aTHX_ av, AvFILLp (av));
3699} 4200}
3700 4201
3701void 4202void
3702send (SV *self) 4203send (SV *self)
… …
3710 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4211 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3711} 4212}
3712 4213
3713IV 4214IV
3714awaited (SV *self) 4215awaited (SV *self)
3715 CODE: 4216 CODE:
3716 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4217 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3717 OUTPUT: 4218 OUTPUT:
3718 RETVAL 4219 RETVAL
3719 4220
3720 4221
… …
3725 4226
3726void 4227void
3727_schedule (...) 4228_schedule (...)
3728 CODE: 4229 CODE:
3729{ 4230{
3730 static int incede; 4231 static int incede;
3731 4232
3732 api_cede_notself (aTHX); 4233 api_cede_notself (aTHX);
3733 4234
3734 ++incede; 4235 ++incede;
3735 while (coro_nready >= incede && api_cede (aTHX)) 4236 while (coro_nready >= incede && api_cede (aTHX))
… …
3779 { 4280 {
3780 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4281 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3781 coro_old_pp_sselect = 0; 4282 coro_old_pp_sselect = 0;
3782 } 4283 }
3783 4284
4285MODULE = Coro::State PACKAGE = Coro::Util
3784 4286
4287void
4288_exit (int code)
4289 CODE:
4290 _exit (code);
4291
4292NV
4293time ()
4294 CODE:
4295 RETVAL = nvtime (aTHX);
4296 OUTPUT:
4297 RETVAL
4298
4299NV
4300gettimeofday ()
4301 PPCODE:
4302{
4303 UV tv [2];
4304 u2time (aTHX_ tv);
4305 EXTEND (SP, 2);
4306 PUSHs (sv_2mortal (newSVuv (tv [0])));
4307 PUSHs (sv_2mortal (newSVuv (tv [1])));
4308}
4309

Diff Legend

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