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.368 by root, Thu Aug 13 02:35:41 2009 UTC vs.
Revision 1.416 by root, Mon Dec 12 15:19:56 2011 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
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
… …
7#include "perl.h" 12#include "perl.h"
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"
17#include "ecb.h"
12 18
19#include <stddef.h>
13#include <stdio.h> 20#include <stdio.h>
14#include <errno.h> 21#include <errno.h>
15#include <assert.h> 22#include <assert.h>
16 23
17#ifdef WIN32 24#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0
26#endif
27
28#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY
18# undef setjmp 30# undef setjmp
19# undef longjmp 31# undef longjmp
20# undef _exit 32# undef _exit
21# define setjmp _setjmp /* deep magic */ 33# define setjmp _setjmp /* deep magic */
22#else 34#else
23# include <inttypes.h> /* most portable stdint.h */ 35# include <inttypes.h> /* most portable stdint.h */
24#endif 36#endif
25 37
26#ifdef HAVE_MMAP 38#if HAVE_MMAP
27# include <unistd.h> 39# include <unistd.h>
28# include <sys/mman.h> 40# include <sys/mman.h>
29# ifndef MAP_ANONYMOUS 41# ifndef MAP_ANONYMOUS
30# ifdef MAP_ANON 42# ifdef MAP_ANON
31# define MAP_ANONYMOUS MAP_ANON 43# define MAP_ANONYMOUS MAP_ANON
… …
51#endif 63#endif
52 64
53/* the maximum number of idle cctx that will be pooled */ 65/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 66static int cctx_max_idle = 4;
55 67
68#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# define HAS_SCOPESTACK_NAME 1
70#endif
71
56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 72#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
57# undef CORO_STACKGUARD 73# undef CORO_STACKGUARD
58#endif 74#endif
59 75
60#ifndef CORO_STACKGUARD 76#ifndef CORO_STACKGUARD
… …
76# define STACKLEVEL ((void *)&stacklevel) 92# define STACKLEVEL ((void *)&stacklevel)
77#endif 93#endif
78 94
79#define IN_DESTRUCT PL_dirty 95#define IN_DESTRUCT PL_dirty
80 96
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" 97#include "CoroAPI.h"
97#define GCoroAPI (&coroapi) /* very sneaky */ 98#define GCoroAPI (&coroapi) /* very sneaky */
98 99
99#ifdef USE_ITHREADS 100#ifdef USE_ITHREADS
100# if CORO_PTHREAD 101# if CORO_PTHREAD
101static void *coro_thx; 102static void *coro_thx;
102# endif 103# endif
103#endif 104#endif
105
106/* used in state.h */
107#define VAR(name,type) VARx(name, PL_ ## name, type)
104 108
105#ifdef __linux 109#ifdef __linux
106# include <time.h> /* for timespec */ 110# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */ 111# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime 112# ifdef SYS_clock_gettime
… …
116static void (*u2time)(pTHX_ UV ret[2]); 120static void (*u2time)(pTHX_ UV ret[2]);
117 121
118/* we hijack an hopefully unused CV flag for our purposes */ 122/* we hijack an hopefully unused CV flag for our purposes */
119#define CVf_SLF 0x4000 123#define CVf_SLF 0x4000
120static OP *pp_slf (pTHX); 124static OP *pp_slf (pTHX);
125static void slf_destroy (pTHX_ struct coro *coro);
121 126
122static U32 cctx_gen; 127static U32 cctx_gen;
123static size_t cctx_stacksize = CORO_STACKSIZE; 128static size_t cctx_stacksize = CORO_STACKSIZE;
124static struct CoroAPI coroapi; 129static struct CoroAPI coroapi;
125static AV *main_mainstack; /* used to differentiate between $main and others */ 130static AV *main_mainstack; /* used to differentiate between $main and others */
… …
142static SV *sv_pool_size; 147static SV *sv_pool_size;
143static SV *sv_async_pool_idle; /* description string */ 148static SV *sv_async_pool_idle; /* description string */
144static AV *av_async_pool; /* idle pool */ 149static AV *av_async_pool; /* idle pool */
145static SV *sv_Coro; /* class string */ 150static SV *sv_Coro; /* class string */
146static CV *cv_pool_handler; 151static CV *cv_pool_handler;
147static CV *cv_coro_state_new;
148 152
149/* Coro::AnyEvent */ 153/* Coro::AnyEvent */
150static SV *sv_activity; 154static SV *sv_activity;
151 155
152/* enable processtime/realtime profiling */ 156/* enable processtime/realtime profiling */
… …
156static char times_valid; 160static char times_valid;
157 161
158static struct coro_cctx *cctx_first; 162static struct coro_cctx *cctx_first;
159static int cctx_count, cctx_idle; 163static int cctx_count, cctx_idle;
160 164
161enum { 165enum
166{
162 CC_MAPPED = 0x01, 167 CC_MAPPED = 0x01,
163 CC_NOREUSE = 0x02, /* throw this away after tracing */ 168 CC_NOREUSE = 0x02, /* throw this away after tracing */
164 CC_TRACE = 0x04, 169 CC_TRACE = 0x04,
165 CC_TRACE_SUB = 0x08, /* trace sub calls */ 170 CC_TRACE_SUB = 0x08, /* trace sub calls */
166 CC_TRACE_LINE = 0x10, /* trace each statement */ 171 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
176 void *sptr; 181 void *sptr;
177 size_t ssize; 182 size_t ssize;
178 183
179 /* cpu state */ 184 /* cpu state */
180 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
186#ifndef NDEBUG
181 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 187 JMPENV *idle_te; /* same as idle_sp, but for top_env */
188#endif
182 JMPENV *top_env; 189 JMPENV *top_env;
183 coro_context cctx; 190 coro_context cctx;
184 191
185 U32 gen; 192 U32 gen;
186#if CORO_USE_VALGRIND 193#if CORO_USE_VALGRIND
187 int valgrind_id; 194 int valgrind_id;
188#endif 195#endif
189 unsigned char flags; 196 unsigned char flags;
190} coro_cctx; 197} coro_cctx;
191 198
192coro_cctx *cctx_current; /* the currently running cctx */ 199static coro_cctx *cctx_current; /* the currently running cctx */
193 200
194/*****************************************************************************/ 201/*****************************************************************************/
195 202
203static MGVTBL coro_state_vtbl;
204
196enum { 205enum
206{
197 CF_RUNNING = 0x0001, /* coroutine is running */ 207 CF_RUNNING = 0x0001, /* coroutine is running */
198 CF_READY = 0x0002, /* coroutine is ready */ 208 CF_READY = 0x0002, /* coroutine is ready */
199 CF_NEW = 0x0004, /* has never been switched to */ 209 CF_NEW = 0x0004, /* has never been switched to */
200 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 210 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
201 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
202}; 213};
203 214
204/* the structure where most of the perl state is stored, overlaid on the cxstack */ 215/* the structure where most of the perl state is stored, overlaid on the cxstack */
205typedef struct 216typedef struct
206{ 217{
207 SV *defsv;
208 AV *defav;
209 SV *errsv;
210 SV *irsgv;
211 HV *hinthv;
212#define VAR(name,type) type name; 218#define VARx(name,expr,type) type name;
213# include "state.h" 219# include "state.h"
214#undef VAR 220#undef VARx
215} perl_slots; 221} perl_slots;
216 222
223/* how many context stack entries do we need for perl_slots */
217#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 224#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
218 225
219/* this is a structure representing a perl-level coroutine */ 226/* this is a structure representing a perl-level coroutine */
220struct coro { 227struct coro
228{
221 /* the C coroutine allocated to this perl coroutine, if any */ 229 /* the C coroutine allocated to this perl coroutine, if any */
222 coro_cctx *cctx; 230 coro_cctx *cctx;
223 231
224 /* ready queue */ 232 /* ready queue */
225 struct coro *next_ready; 233 struct coro *next_ready;
… …
227 /* state data */ 235 /* state data */
228 struct CoroSLF slf_frame; /* saved slf frame */ 236 struct CoroSLF slf_frame; /* saved slf frame */
229 AV *mainstack; 237 AV *mainstack;
230 perl_slots *slot; /* basically the saved sp */ 238 perl_slots *slot; /* basically the saved sp */
231 239
232 CV *startcv; /* the CV to execute */ 240 CV *startcv; /* the CV to execute */
233 AV *args; /* data associated with this coroutine (initial args) */ 241 AV *args; /* data associated with this coroutine (initial args) */
234 int refcnt; /* coroutines are refcounted, yes */
235 int flags; /* CF_ flags */ 242 int flags; /* CF_ flags */
236 HV *hv; /* the perl hash associated with this coro, if any */ 243 HV *hv; /* the perl hash associated with this coro, if any */
237 void (*on_destroy)(pTHX_ struct coro *coro);
238 244
239 /* statistics */ 245 /* statistics */
240 int usecount; /* number of transfers to this coro */ 246 int usecount; /* number of transfers to this coro */
241 247
242 /* coro process data */ 248 /* coro process data */
243 int prio; 249 int prio;
244 SV *except; /* exception to be thrown */ 250 SV *except; /* exception to be thrown */
245 SV *rouse_cb; 251 SV *rouse_cb; /* last rouse callback */
252 AV *on_destroy; /* callbacks or coros to notify on destroy */
253 AV *status; /* the exit status list */
246 254
247 /* async_pool */ 255 /* async_pool */
248 SV *saved_deffh; 256 SV *saved_deffh;
249 SV *invoke_cb; 257 SV *invoke_cb;
250 AV *invoke_av; 258 AV *invoke_av;
251 259
252 /* on_enter/on_leave */ 260 /* on_enter/on_leave */
253 AV *on_enter; 261 AV *on_enter;
254 AV *on_leave; 262 AV *on_leave;
255 263
264 /* swap_sv */
265 AV *swap_sv;
266
256 /* times */ 267 /* times */
257 coro_ts t_cpu, t_real; 268 coro_ts t_cpu, t_real;
258 269
259 /* linked list */ 270 /* linked list */
260 struct coro *next, *prev; 271 struct coro *next, *prev;
… …
263typedef struct coro *Coro__State; 274typedef struct coro *Coro__State;
264typedef struct coro *Coro__State_or_hashref; 275typedef struct coro *Coro__State_or_hashref;
265 276
266/* the following variables are effectively part of the perl context */ 277/* the following variables are effectively part of the perl context */
267/* and get copied between struct coro and these variables */ 278/* and get copied between struct coro and these variables */
268/* the mainr easonw e don't support windows process emulation */ 279/* the main reason we don't support windows process emulation */
269static struct CoroSLF slf_frame; /* the current slf frame */ 280static struct CoroSLF slf_frame; /* the current slf frame */
270 281
271/** Coro ********************************************************************/ 282/** Coro ********************************************************************/
272 283
273#define CORO_PRIO_MAX 3 284#define CORO_PRIO_MAX 3
… …
279 290
280/* for Coro.pm */ 291/* for Coro.pm */
281static SV *coro_current; 292static SV *coro_current;
282static SV *coro_readyhook; 293static SV *coro_readyhook;
283static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
284static CV *cv_coro_run, *cv_coro_terminate; 295static CV *cv_coro_run;
285static struct coro *coro_first; 296static struct coro *coro_first;
286#define coro_nready coroapi.nready 297#define coro_nready coroapi.nready
287 298
299/** JIT *********************************************************************/
300
301#if CORO_JIT
302 /* APPLE doesn't have HAVE_MMAP though */
303 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
304 #ifndef CORO_JIT_TYPE
305 #if __x86_64 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "amd64-unix"
307 #elif __i386 && CORO_JIT_UNIXY
308 #define CORO_JIT_TYPE "x86-unix"
309 #endif
310 #endif
311#endif
312
313#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP
314 #undef CORO_JIT
315#endif
316
317#if CORO_JIT
318 typedef void (*load_save_perl_slots_type)(perl_slots *);
319 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
320#endif
321
288/** Coro::Select ************************************************************/ 322/** Coro::Select ************************************************************/
289 323
290static OP *(*coro_old_pp_sselect) (pTHX); 324static OP *(*coro_old_pp_sselect) (pTHX);
291static SV *coro_select_select; 325static SV *coro_select_select;
292 326
293/* horrible hack, but if it works... */ 327/* horrible hack, but if it works... */
294static OP * 328static OP *
295coro_pp_sselect (aTHX) 329coro_pp_sselect (pTHX)
296{ 330{
297 dSP; 331 dSP;
298 PUSHMARK (SP - 4); /* fake argument list */ 332 PUSHMARK (SP - 4); /* fake argument list */
299 XPUSHs (coro_select_select); 333 XPUSHs (coro_select_select);
300 PUTBACK; 334 PUTBACK;
… …
303 PL_op->op_flags |= OPf_STACKED; 337 PL_op->op_flags |= OPf_STACKED;
304 PL_op->op_private = 0; 338 PL_op->op_private = 0;
305 return PL_ppaddr [OP_ENTERSUB](aTHX); 339 return PL_ppaddr [OP_ENTERSUB](aTHX);
306} 340}
307 341
342/** time stuff **************************************************************/
343
344#ifdef HAS_GETTIMEOFDAY
345
346ecb_inline void
347coro_u2time (pTHX_ UV ret[2])
348{
349 struct timeval tv;
350 gettimeofday (&tv, 0);
351
352 ret [0] = tv.tv_sec;
353 ret [1] = tv.tv_usec;
354}
355
356ecb_inline double
357coro_nvtime (void)
358{
359 struct timeval tv;
360 gettimeofday (&tv, 0);
361
362 return tv.tv_sec + tv.tv_usec * 1e-6;
363}
364
365ecb_inline void
366time_init (pTHX)
367{
368 nvtime = coro_nvtime;
369 u2time = coro_u2time;
370}
371
372#else
373
374ecb_inline void
375time_init (pTHX)
376{
377 SV **svp;
378
379 require_pv ("Time/HiRes.pm");
380
381 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
382
383 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
384 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
385
386 nvtime = INT2PTR (double (*)(), SvIV (*svp));
387
388 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
389 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
390}
391
392#endif
393
308/** lowlevel stuff **********************************************************/ 394/** lowlevel stuff **********************************************************/
309 395
310static SV * 396static SV * ecb_noinline
311coro_get_sv (pTHX_ const char *name, int create) 397coro_get_sv (pTHX_ const char *name, int create)
312{ 398{
313#if PERL_VERSION_ATLEAST (5,10,0) 399#if PERL_VERSION_ATLEAST (5,10,0)
314 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 400 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
315 get_sv (name, create); 401 get_sv (name, create);
316#endif 402#endif
317 return get_sv (name, create); 403 return get_sv (name, create);
318} 404}
319 405
320static AV * 406static AV * ecb_noinline
321coro_get_av (pTHX_ const char *name, int create) 407coro_get_av (pTHX_ const char *name, int create)
322{ 408{
323#if PERL_VERSION_ATLEAST (5,10,0) 409#if PERL_VERSION_ATLEAST (5,10,0)
324 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 410 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
325 get_av (name, create); 411 get_av (name, create);
326#endif 412#endif
327 return get_av (name, create); 413 return get_av (name, create);
328} 414}
329 415
330static HV * 416static HV * ecb_noinline
331coro_get_hv (pTHX_ const char *name, int create) 417coro_get_hv (pTHX_ const char *name, int create)
332{ 418{
333#if PERL_VERSION_ATLEAST (5,10,0) 419#if PERL_VERSION_ATLEAST (5,10,0)
334 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 420 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
335 get_hv (name, create); 421 get_hv (name, create);
336#endif 422#endif
337 return get_hv (name, create); 423 return get_hv (name, create);
338} 424}
339 425
340INLINE void 426ecb_inline void
341coro_times_update () 427coro_times_update (void)
342{ 428{
343#ifdef coro_clock_gettime 429#ifdef coro_clock_gettime
344 struct timespec ts; 430 struct timespec ts;
345 431
346 ts.tv_sec = ts.tv_nsec = 0; 432 ts.tv_sec = ts.tv_nsec = 0;
… …
358 time_real [0] = tv [0]; 444 time_real [0] = tv [0];
359 time_real [1] = tv [1] * 1000; 445 time_real [1] = tv [1] * 1000;
360#endif 446#endif
361} 447}
362 448
363INLINE void 449ecb_inline void
364coro_times_add (struct coro *c) 450coro_times_add (struct coro *c)
365{ 451{
366 c->t_real [1] += time_real [1]; 452 c->t_real [1] += time_real [1];
367 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 453 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
368 c->t_real [0] += time_real [0]; 454 c->t_real [0] += time_real [0];
… …
370 c->t_cpu [1] += time_cpu [1]; 456 c->t_cpu [1] += time_cpu [1];
371 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 457 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
372 c->t_cpu [0] += time_cpu [0]; 458 c->t_cpu [0] += time_cpu [0];
373} 459}
374 460
375INLINE void 461ecb_inline void
376coro_times_sub (struct coro *c) 462coro_times_sub (struct coro *c)
377{ 463{
378 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 464 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
379 c->t_real [1] -= time_real [1]; 465 c->t_real [1] -= time_real [1];
380 c->t_real [0] -= time_real [0]; 466 c->t_real [0] -= time_real [0];
… …
388/* magic glue */ 474/* magic glue */
389 475
390#define CORO_MAGIC_type_cv 26 476#define CORO_MAGIC_type_cv 26
391#define CORO_MAGIC_type_state PERL_MAGIC_ext 477#define CORO_MAGIC_type_state PERL_MAGIC_ext
392 478
393#define CORO_MAGIC_NN(sv, type) \ 479#define CORO_MAGIC_NN(sv, type) \
394 (expect_true (SvMAGIC (sv)->mg_type == type) \ 480 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
395 ? SvMAGIC (sv) \ 481 ? SvMAGIC (sv) \
396 : mg_find (sv, type)) 482 : mg_find (sv, type))
397 483
398#define CORO_MAGIC(sv, type) \ 484#define CORO_MAGIC(sv, type) \
399 (expect_true (SvMAGIC (sv)) \ 485 (ecb_expect_true (SvMAGIC (sv)) \
400 ? CORO_MAGIC_NN (sv, type) \ 486 ? CORO_MAGIC_NN (sv, type) \
401 : 0) 487 : 0)
402 488
403#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 489#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
404#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 490#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
405 491
406INLINE struct coro * 492ecb_inline MAGIC *
493SvSTATEhv_p (pTHX_ SV *coro)
494{
495 MAGIC *mg;
496
497 if (ecb_expect_true (
498 SvTYPE (coro) == SVt_PVHV
499 && (mg = CORO_MAGIC_state (coro))
500 && mg->mg_virtual == &coro_state_vtbl
501 ))
502 return mg;
503
504 return 0;
505}
506
507ecb_inline struct coro *
407SvSTATE_ (pTHX_ SV *coro) 508SvSTATE_ (pTHX_ SV *coro)
408{ 509{
409 HV *stash;
410 MAGIC *mg; 510 MAGIC *mg;
411 511
412 if (SvROK (coro)) 512 if (SvROK (coro))
413 coro = SvRV (coro); 513 coro = SvRV (coro);
414 514
415 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 515 mg = SvSTATEhv_p (aTHX_ coro);
516 if (!mg)
416 croak ("Coro::State object required"); 517 croak ("Coro::State object required");
417 518
418 stash = SvSTASH (coro);
419 if (expect_false (stash != coro_stash && stash != coro_state_stash))
420 {
421 /* very slow, but rare, check */
422 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
423 croak ("Coro::State object required");
424 }
425
426 mg = CORO_MAGIC_state (coro);
427 return (struct coro *)mg->mg_ptr; 519 return (struct coro *)mg->mg_ptr;
428} 520}
429 521
430#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 522#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
431 523
… …
434#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 526#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
435 527
436/*****************************************************************************/ 528/*****************************************************************************/
437/* padlist management and caching */ 529/* padlist management and caching */
438 530
439static AV * 531ecb_inline AV *
440coro_derive_padlist (pTHX_ CV *cv) 532coro_derive_padlist (pTHX_ CV *cv)
441{ 533{
442 AV *padlist = CvPADLIST (cv); 534 AV *padlist = CvPADLIST (cv);
443 AV *newpadlist, *newpad; 535 AV *newpadlist, *newpad;
444 536
… …
456 av_store (newpadlist, 1, (SV *)newpad); 548 av_store (newpadlist, 1, (SV *)newpad);
457 549
458 return newpadlist; 550 return newpadlist;
459} 551}
460 552
461static void 553ecb_inline void
462free_padlist (pTHX_ AV *padlist) 554free_padlist (pTHX_ AV *padlist)
463{ 555{
464 /* may be during global destruction */ 556 /* may be during global destruction */
465 if (!IN_DESTRUCT) 557 if (!IN_DESTRUCT)
466 { 558 {
… …
509 0, 0, 0, 0, 601 0, 0, 0, 0,
510 coro_cv_free 602 coro_cv_free
511}; 603};
512 604
513/* the next two functions merely cache the padlists */ 605/* the next two functions merely cache the padlists */
514static void 606ecb_inline void
515get_padlist (pTHX_ CV *cv) 607get_padlist (pTHX_ CV *cv)
516{ 608{
517 MAGIC *mg = CORO_MAGIC_cv (cv); 609 MAGIC *mg = CORO_MAGIC_cv (cv);
518 AV *av; 610 AV *av;
519 611
520 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 612 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
521 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 613 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
522 else 614 else
523 { 615 {
524#if CORO_PREFER_PERL_FUNCTIONS 616#if CORO_PREFER_PERL_FUNCTIONS
525 /* this is probably cleaner? but also slower! */ 617 /* this is probably cleaner? but also slower! */
… …
532 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 624 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
533#endif 625#endif
534 } 626 }
535} 627}
536 628
537static void 629ecb_inline void
538put_padlist (pTHX_ CV *cv) 630put_padlist (pTHX_ CV *cv)
539{ 631{
540 MAGIC *mg = CORO_MAGIC_cv (cv); 632 MAGIC *mg = CORO_MAGIC_cv (cv);
541 AV *av; 633 AV *av;
542 634
543 if (expect_false (!mg)) 635 if (ecb_expect_false (!mg))
544 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 636 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
545 637
546 av = (AV *)mg->mg_obj; 638 av = (AV *)mg->mg_obj;
547 639
548 if (expect_false (AvFILLp (av) >= AvMAX (av))) 640 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
549 av_extend (av, AvFILLp (av) + 1); 641 av_extend (av, AvFILLp (av) + 1);
550 642
551 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 643 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
552} 644}
553 645
554/** load & save, init *******************************************************/ 646/** load & save, init *******************************************************/
647
648ecb_inline void
649swap_sv (SV *a, SV *b)
650{
651 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
652 SV tmp;
653
654 /* swap sv_any */
655 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
656
657 /* swap sv_flags */
658 SvFLAGS (&tmp) = SvFLAGS (a);
659 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
660 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
661
662#if PERL_VERSION_ATLEAST (5,10,0)
663 /* perl 5.10 and later complicates this _quite_ a bit, but it also
664 * is much faster, so no quarrels here. alternatively, we could
665 * sv_upgrade to avoid this.
666 */
667 {
668 /* swap sv_u */
669 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
670
671 /* if SvANY points to the head, we need to adjust the pointers,
672 * as the pointer for a still points to b, and maybe vice versa.
673 */
674 #define svany_in_head(type) \
675 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
676
677 if (svany_in_head (SvTYPE (a)))
678 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
679
680 if (svany_in_head (SvTYPE (b)))
681 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
682 }
683#endif
684}
685
686/* swap sv heads, at least logically */
687static void
688swap_svs (pTHX_ Coro__State c)
689{
690 int i;
691
692 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
693 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
694}
695
696#define SWAP_SVS(coro) \
697 if (ecb_expect_false ((coro)->swap_sv)) \
698 swap_svs (aTHX_ (coro))
555 699
556static void 700static void
557on_enterleave_call (pTHX_ SV *cb); 701on_enterleave_call (pTHX_ SV *cb);
558 702
559static void 703static void
… …
562 perl_slots *slot = c->slot; 706 perl_slots *slot = c->slot;
563 c->slot = 0; 707 c->slot = 0;
564 708
565 PL_mainstack = c->mainstack; 709 PL_mainstack = c->mainstack;
566 710
567 GvSV (PL_defgv) = slot->defsv; 711#if CORO_JIT
568 GvAV (PL_defgv) = slot->defav; 712 load_perl_slots (slot);
569 GvSV (PL_errgv) = slot->errsv; 713#else
570 GvSV (irsgv) = slot->irsgv;
571 GvHV (PL_hintgv) = slot->hinthv;
572
573 #define VAR(name,type) PL_ ## name = slot->name; 714 #define VARx(name,expr,type) expr = slot->name;
574 # include "state.h" 715 # include "state.h"
575 #undef VAR 716 #undef VARx
717#endif
576 718
577 { 719 {
578 dSP; 720 dSP;
579 721
580 CV *cv; 722 CV *cv;
581 723
582 /* now do the ugly restore mess */ 724 /* now do the ugly restore mess */
583 while (expect_true (cv = (CV *)POPs)) 725 while (ecb_expect_true (cv = (CV *)POPs))
584 { 726 {
585 put_padlist (aTHX_ cv); /* mark this padlist as available */ 727 put_padlist (aTHX_ cv); /* mark this padlist as available */
586 CvDEPTH (cv) = PTR2IV (POPs); 728 CvDEPTH (cv) = PTR2IV (POPs);
587 CvPADLIST (cv) = (AV *)POPs; 729 CvPADLIST (cv) = (AV *)POPs;
588 } 730 }
… …
591 } 733 }
592 734
593 slf_frame = c->slf_frame; 735 slf_frame = c->slf_frame;
594 CORO_THROW = c->except; 736 CORO_THROW = c->except;
595 737
596 if (expect_false (enable_times)) 738 if (ecb_expect_false (enable_times))
597 { 739 {
598 if (expect_false (!times_valid)) 740 if (ecb_expect_false (!times_valid))
599 coro_times_update (); 741 coro_times_update ();
600 742
601 coro_times_sub (c); 743 coro_times_sub (c);
602 } 744 }
603 745
604 if (expect_false (c->on_enter)) 746 if (ecb_expect_false (c->on_enter))
605 { 747 {
606 int i; 748 int i;
607 749
608 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 750 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 751 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
610 } 752 }
753
754 SWAP_SVS (c);
611} 755}
612 756
613static void 757static void
614save_perl (pTHX_ Coro__State c) 758save_perl (pTHX_ Coro__State c)
615{ 759{
760 SWAP_SVS (c);
761
616 if (expect_false (c->on_leave)) 762 if (ecb_expect_false (c->on_leave))
617 { 763 {
618 int i; 764 int i;
619 765
620 for (i = AvFILLp (c->on_leave); i >= 0; --i) 766 for (i = AvFILLp (c->on_leave); i >= 0; --i)
621 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 767 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
622 } 768 }
623 769
624 times_valid = 0; 770 times_valid = 0;
625 771
626 if (expect_false (enable_times)) 772 if (ecb_expect_false (enable_times))
627 { 773 {
628 coro_times_update (); times_valid = 1; 774 coro_times_update (); times_valid = 1;
629 coro_times_add (c); 775 coro_times_add (c);
630 } 776 }
631 777
… …
645 791
646 XPUSHs (Nullsv); 792 XPUSHs (Nullsv);
647 /* this loop was inspired by pp_caller */ 793 /* this loop was inspired by pp_caller */
648 for (;;) 794 for (;;)
649 { 795 {
650 while (expect_true (cxix >= 0)) 796 while (ecb_expect_true (cxix >= 0))
651 { 797 {
652 PERL_CONTEXT *cx = &ccstk[cxix--]; 798 PERL_CONTEXT *cx = &ccstk[cxix--];
653 799
654 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 800 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
655 { 801 {
656 CV *cv = cx->blk_sub.cv; 802 CV *cv = cx->blk_sub.cv;
657 803
658 if (expect_true (CvDEPTH (cv))) 804 if (ecb_expect_true (CvDEPTH (cv)))
659 { 805 {
660 EXTEND (SP, 3); 806 EXTEND (SP, 3);
661 PUSHs ((SV *)CvPADLIST (cv)); 807 PUSHs ((SV *)CvPADLIST (cv));
662 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 808 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
663 PUSHs ((SV *)cv); 809 PUSHs ((SV *)cv);
… …
666 get_padlist (aTHX_ cv); 812 get_padlist (aTHX_ cv);
667 } 813 }
668 } 814 }
669 } 815 }
670 816
671 if (expect_true (top_si->si_type == PERLSI_MAIN)) 817 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
672 break; 818 break;
673 819
674 top_si = top_si->si_prev; 820 top_si = top_si->si_prev;
675 ccstk = top_si->si_cxstack; 821 ccstk = top_si->si_cxstack;
676 cxix = top_si->si_cxix; 822 cxix = top_si->si_cxix;
… …
678 824
679 PUTBACK; 825 PUTBACK;
680 } 826 }
681 827
682 /* allocate some space on the context stack for our purposes */ 828 /* allocate some space on the context stack for our purposes */
683 /* we manually unroll here, as usually 2 slots is enough */ 829 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
684 if (SLOT_COUNT >= 1) CXINC;
685 if (SLOT_COUNT >= 2) CXINC;
686 if (SLOT_COUNT >= 3) CXINC;
687 { 830 {
688 unsigned int i; 831 unsigned int i;
832
689 for (i = 3; i < SLOT_COUNT; ++i) 833 for (i = 0; i < SLOT_COUNT; ++i)
690 CXINC; 834 CXINC;
691 } 835
692 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 836 cxstack_ix -= SLOT_COUNT; /* undo allocation */
837 }
693 838
694 c->mainstack = PL_mainstack; 839 c->mainstack = PL_mainstack;
695 840
696 { 841 {
697 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 842 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
698 843
699 slot->defav = GvAV (PL_defgv); 844#if CORO_JIT
700 slot->defsv = DEFSV; 845 save_perl_slots (slot);
701 slot->errsv = ERRSV; 846#else
702 slot->irsgv = GvSV (irsgv);
703 slot->hinthv = GvHV (PL_hintgv);
704
705 #define VAR(name,type) slot->name = PL_ ## name; 847 #define VARx(name,expr,type) slot->name = expr;
706 # include "state.h" 848 # include "state.h"
707 #undef VAR 849 #undef VARx
850#endif
708 } 851 }
709} 852}
710 853
711/* 854/*
712 * allocate various perl stacks. This is almost an exact copy 855 * allocate various perl stacks. This is almost an exact copy
… …
718# define coro_init_stacks(thx) init_stacks () 861# define coro_init_stacks(thx) init_stacks ()
719#else 862#else
720static void 863static void
721coro_init_stacks (pTHX) 864coro_init_stacks (pTHX)
722{ 865{
723 PL_curstackinfo = new_stackinfo(32, 8); 866 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
724 PL_curstackinfo->si_type = PERLSI_MAIN; 867 PL_curstackinfo->si_type = PERLSI_MAIN;
725 PL_curstack = PL_curstackinfo->si_stack; 868 PL_curstack = PL_curstackinfo->si_stack;
726 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 869 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
727 870
728 PL_stack_base = AvARRAY(PL_curstack); 871 PL_stack_base = AvARRAY(PL_curstack);
… …
743#endif 886#endif
744 887
745 New(54,PL_scopestack,8,I32); 888 New(54,PL_scopestack,8,I32);
746 PL_scopestack_ix = 0; 889 PL_scopestack_ix = 0;
747 PL_scopestack_max = 8; 890 PL_scopestack_max = 8;
891#if HAS_SCOPESTACK_NAME
892 New(54,PL_scopestack_name,8,const char*);
893#endif
748 894
749 New(54,PL_savestack,24,ANY); 895 New(54,PL_savestack,24,ANY);
750 PL_savestack_ix = 0; 896 PL_savestack_ix = 0;
751 PL_savestack_max = 24; 897 PL_savestack_max = 24;
752 898
… …
780 } 926 }
781 927
782 Safefree (PL_tmps_stack); 928 Safefree (PL_tmps_stack);
783 Safefree (PL_markstack); 929 Safefree (PL_markstack);
784 Safefree (PL_scopestack); 930 Safefree (PL_scopestack);
931#if HAS_SCOPESTACK_NAME
932 Safefree (PL_scopestack_name);
933#endif
785 Safefree (PL_savestack); 934 Safefree (PL_savestack);
786#if !PERL_VERSION_ATLEAST (5,10,0) 935#if !PERL_VERSION_ATLEAST (5,10,0)
787 Safefree (PL_retstack); 936 Safefree (PL_retstack);
788#endif 937#endif
789} 938}
… …
835#endif 984#endif
836 985
837/* 986/*
838 * This overrides the default magic get method of %SIG elements. 987 * This overrides the default magic get method of %SIG elements.
839 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 988 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
840 * and instead of trying to save and restore the hash elements, we just provide 989 * and instead of trying to save and restore the hash elements (extremely slow),
841 * readback here. 990 * we just provide our own readback here.
842 */ 991 */
843static int 992static int ecb_cold
844coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 993coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
845{ 994{
846 const char *s = MgPV_nolen_const (mg); 995 const char *s = MgPV_nolen_const (mg);
847 996
848 if (*s == '_') 997 if (*s == '_')
… …
852 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1001 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
853 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1002 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
854 1003
855 if (svp) 1004 if (svp)
856 { 1005 {
857 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1006 SV *ssv;
1007
1008 if (!*svp)
1009 ssv = &PL_sv_undef;
1010 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1011 ssv = sv_2mortal (newRV_inc (*svp));
1012 else
1013 ssv = *svp;
1014
1015 sv_setsv (sv, ssv);
858 return 0; 1016 return 0;
859 } 1017 }
860 } 1018 }
861 1019
862 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1020 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
863} 1021}
864 1022
865static int 1023static int ecb_cold
866coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1024coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
867{ 1025{
868 const char *s = MgPV_nolen_const (mg); 1026 const char *s = MgPV_nolen_const (mg);
869 1027
870 if (*s == '_') 1028 if (*s == '_')
… …
884 } 1042 }
885 1043
886 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1044 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
887} 1045}
888 1046
889static int 1047static int ecb_cold
890coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1048coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
891{ 1049{
892 const char *s = MgPV_nolen_const (mg); 1050 const char *s = MgPV_nolen_const (mg);
893 1051
894 if (*s == '_') 1052 if (*s == '_')
… …
927slf_check_repeat (pTHX_ struct CoroSLF *frame) 1085slf_check_repeat (pTHX_ struct CoroSLF *frame)
928{ 1086{
929 return 1; 1087 return 1;
930} 1088}
931 1089
932static UNOP coro_setup_op; 1090static UNOP init_perl_op;
933 1091
934static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1092ecb_noinline static void /* noinline to keep it out of the transfer fast path */
935coro_setup (pTHX_ struct coro *coro) 1093init_perl (pTHX_ struct coro *coro)
936{ 1094{
937 /* 1095 /*
938 * emulate part of the perl startup here. 1096 * emulate part of the perl startup here.
939 */ 1097 */
940 coro_init_stacks (aTHX); 1098 coro_init_stacks (aTHX);
… …
947 PL_comppad_name_fill = 0; 1105 PL_comppad_name_fill = 0;
948 PL_comppad_name_floor = 0; 1106 PL_comppad_name_floor = 0;
949 PL_curpm = 0; 1107 PL_curpm = 0;
950 PL_curpad = 0; 1108 PL_curpad = 0;
951 PL_localizing = 0; 1109 PL_localizing = 0;
952 PL_dirty = 0;
953 PL_restartop = 0; 1110 PL_restartop = 0;
954#if PERL_VERSION_ATLEAST (5,10,0) 1111#if PERL_VERSION_ATLEAST (5,10,0)
955 PL_parser = 0; 1112 PL_parser = 0;
956#endif 1113#endif
957 PL_hints = 0; 1114 PL_hints = 0;
958 1115
959 /* recreate the die/warn hooks */ 1116 /* recreate the die/warn hooks */
960 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1117 PL_diehook = SvREFCNT_inc (rv_diehook);
961 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1118 PL_warnhook = SvREFCNT_inc (rv_warnhook);
962 1119
963 GvSV (PL_defgv) = newSV (0); 1120 GvSV (PL_defgv) = newSV (0);
964 GvAV (PL_defgv) = coro->args; coro->args = 0; 1121 GvAV (PL_defgv) = coro->args; coro->args = 0;
965 GvSV (PL_errgv) = newSV (0); 1122 GvSV (PL_errgv) = newSV (0);
966 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1123 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
987 /* this newly created coroutine might be run on an existing cctx which most 1144 /* this newly created coroutine might be run on an existing cctx which most
988 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1145 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
989 */ 1146 */
990 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1147 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
991 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1148 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1149 slf_frame.destroy = 0;
992 1150
993 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1151 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
994 coro_setup_op.op_next = PL_op; 1152 init_perl_op.op_next = PL_op;
995 coro_setup_op.op_type = OP_ENTERSUB; 1153 init_perl_op.op_type = OP_ENTERSUB;
996 coro_setup_op.op_ppaddr = pp_slf; 1154 init_perl_op.op_ppaddr = pp_slf;
997 /* no flags etc. required, as an init function won't be called */ 1155 /* no flags etc. required, as an init function won't be called */
998 1156
999 PL_op = (OP *)&coro_setup_op; 1157 PL_op = (OP *)&init_perl_op;
1000 1158
1001 /* copy throw, in case it was set before coro_setup */ 1159 /* copy throw, in case it was set before init_perl */
1002 CORO_THROW = coro->except; 1160 CORO_THROW = coro->except;
1003 1161
1162 SWAP_SVS (coro);
1163
1004 if (expect_false (enable_times)) 1164 if (ecb_expect_false (enable_times))
1005 { 1165 {
1006 coro_times_update (); 1166 coro_times_update ();
1007 coro_times_sub (coro); 1167 coro_times_sub (coro);
1008 } 1168 }
1009} 1169}
… …
1028 dounwind (-1); 1188 dounwind (-1);
1029 } 1189 }
1030} 1190}
1031 1191
1032static void 1192static void
1033coro_destruct_perl (pTHX_ struct coro *coro) 1193destroy_perl (pTHX_ struct coro *coro)
1034{ 1194{
1035 SV *svf [9]; 1195 SV *svf [9];
1036 1196
1037 { 1197 {
1198 SV *old_current = SvRV (coro_current);
1038 struct coro *current = SvSTATE_current; 1199 struct coro *current = SvSTATE (old_current);
1039 1200
1040 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1201 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1041 1202
1042 save_perl (aTHX_ current); 1203 save_perl (aTHX_ current);
1204
1205 /* this will cause transfer_check to croak on block*/
1206 SvRV_set (coro_current, (SV *)coro->hv);
1207
1043 load_perl (aTHX_ coro); 1208 load_perl (aTHX_ coro);
1044 1209
1045 coro_unwind_stacks (aTHX); 1210 coro_unwind_stacks (aTHX);
1211
1212 /* restore swapped sv's */
1213 SWAP_SVS (coro);
1214
1046 coro_destruct_stacks (aTHX); 1215 coro_destruct_stacks (aTHX);
1047 1216
1048 // now save some sv's to be free'd later 1217 /* now save some sv's to be free'd later */
1049 svf [0] = GvSV (PL_defgv); 1218 svf [0] = GvSV (PL_defgv);
1050 svf [1] = (SV *)GvAV (PL_defgv); 1219 svf [1] = (SV *)GvAV (PL_defgv);
1051 svf [2] = GvSV (PL_errgv); 1220 svf [2] = GvSV (PL_errgv);
1052 svf [3] = (SV *)PL_defoutgv; 1221 svf [3] = (SV *)PL_defoutgv;
1053 svf [4] = PL_rs; 1222 svf [4] = PL_rs;
… …
1055 svf [6] = (SV *)GvHV (PL_hintgv); 1224 svf [6] = (SV *)GvHV (PL_hintgv);
1056 svf [7] = PL_diehook; 1225 svf [7] = PL_diehook;
1057 svf [8] = PL_warnhook; 1226 svf [8] = PL_warnhook;
1058 assert (9 == sizeof (svf) / sizeof (*svf)); 1227 assert (9 == sizeof (svf) / sizeof (*svf));
1059 1228
1229 SvRV_set (coro_current, old_current);
1230
1060 load_perl (aTHX_ current); 1231 load_perl (aTHX_ current);
1061 } 1232 }
1062 1233
1063 { 1234 {
1064 unsigned int i; 1235 unsigned int i;
… …
1071 SvREFCNT_dec (coro->invoke_cb); 1242 SvREFCNT_dec (coro->invoke_cb);
1072 SvREFCNT_dec (coro->invoke_av); 1243 SvREFCNT_dec (coro->invoke_av);
1073 } 1244 }
1074} 1245}
1075 1246
1076INLINE void 1247ecb_inline void
1077free_coro_mortal (pTHX) 1248free_coro_mortal (pTHX)
1078{ 1249{
1079 if (expect_true (coro_mortal)) 1250 if (ecb_expect_true (coro_mortal))
1080 { 1251 {
1081 SvREFCNT_dec (coro_mortal); 1252 SvREFCNT_dec ((SV *)coro_mortal);
1082 coro_mortal = 0; 1253 coro_mortal = 0;
1083 } 1254 }
1084} 1255}
1085 1256
1086static int 1257static int
… …
1219 1390
1220 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1391 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1221} 1392}
1222 1393
1223/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1394/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1224static void NOINLINE 1395static void ecb_noinline
1225cctx_prepare (pTHX) 1396cctx_prepare (pTHX)
1226{ 1397{
1227 PL_top_env = &PL_start_env; 1398 PL_top_env = &PL_start_env;
1228 1399
1229 if (cctx_current->flags & CC_TRACE) 1400 if (cctx_current->flags & CC_TRACE)
… …
1240 slf_frame.prepare = slf_prepare_set_stacklevel; 1411 slf_frame.prepare = slf_prepare_set_stacklevel;
1241 slf_frame.check = slf_check_set_stacklevel; 1412 slf_frame.check = slf_check_set_stacklevel;
1242} 1413}
1243 1414
1244/* the tail of transfer: execute stuff we can only do after a transfer */ 1415/* the tail of transfer: execute stuff we can only do after a transfer */
1245INLINE void 1416ecb_inline void
1246transfer_tail (pTHX) 1417transfer_tail (pTHX)
1247{ 1418{
1248 free_coro_mortal (aTHX); 1419 free_coro_mortal (aTHX);
1249} 1420}
1250 1421
… …
1294 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1465 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1295 } 1466 }
1296} 1467}
1297 1468
1298static coro_cctx * 1469static coro_cctx *
1299cctx_new () 1470cctx_new (void)
1300{ 1471{
1301 coro_cctx *cctx; 1472 coro_cctx *cctx;
1302 1473
1303 ++cctx_count; 1474 ++cctx_count;
1304 New (0, cctx, 1, coro_cctx); 1475 New (0, cctx, 1, coro_cctx);
… …
1310 return cctx; 1481 return cctx;
1311} 1482}
1312 1483
1313/* create a new cctx only suitable as source */ 1484/* create a new cctx only suitable as source */
1314static coro_cctx * 1485static coro_cctx *
1315cctx_new_empty () 1486cctx_new_empty (void)
1316{ 1487{
1317 coro_cctx *cctx = cctx_new (); 1488 coro_cctx *cctx = cctx_new ();
1318 1489
1319 cctx->sptr = 0; 1490 cctx->sptr = 0;
1320 coro_create (&cctx->cctx, 0, 0, 0, 0); 1491 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1322 return cctx; 1493 return cctx;
1323} 1494}
1324 1495
1325/* create a new cctx suitable as destination/running a perl interpreter */ 1496/* create a new cctx suitable as destination/running a perl interpreter */
1326static coro_cctx * 1497static coro_cctx *
1327cctx_new_run () 1498cctx_new_run (void)
1328{ 1499{
1329 coro_cctx *cctx = cctx_new (); 1500 coro_cctx *cctx = cctx_new ();
1330 void *stack_start; 1501 void *stack_start;
1331 size_t stack_size; 1502 size_t stack_size;
1332 1503
1333#if HAVE_MMAP 1504#if HAVE_MMAP
1334 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1505 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1335 /* mmap supposedly does allocate-on-write for us */ 1506 /* mmap supposedly does allocate-on-write for us */
1336 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1507 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1337 1508
1338 if (cctx->sptr != (void *)-1) 1509 if (cctx->sptr != (void *)-1)
1339 { 1510 {
1340 #if CORO_STACKGUARD 1511 #if CORO_STACKGUARD
1341 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1512 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1373cctx_destroy (coro_cctx *cctx) 1544cctx_destroy (coro_cctx *cctx)
1374{ 1545{
1375 if (!cctx) 1546 if (!cctx)
1376 return; 1547 return;
1377 1548
1378 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1549 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1379 1550
1380 --cctx_count; 1551 --cctx_count;
1381 coro_destroy (&cctx->cctx); 1552 coro_destroy (&cctx->cctx);
1382 1553
1383 /* coro_transfer creates new, empty cctx's */ 1554 /* coro_transfer creates new, empty cctx's */
… …
1402#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1573#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1403 1574
1404static coro_cctx * 1575static coro_cctx *
1405cctx_get (pTHX) 1576cctx_get (pTHX)
1406{ 1577{
1407 while (expect_true (cctx_first)) 1578 while (ecb_expect_true (cctx_first))
1408 { 1579 {
1409 coro_cctx *cctx = cctx_first; 1580 coro_cctx *cctx = cctx_first;
1410 cctx_first = cctx->next; 1581 cctx_first = cctx->next;
1411 --cctx_idle; 1582 --cctx_idle;
1412 1583
1413 if (expect_true (!CCTX_EXPIRED (cctx))) 1584 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1414 return cctx; 1585 return cctx;
1415 1586
1416 cctx_destroy (cctx); 1587 cctx_destroy (cctx);
1417 } 1588 }
1418 1589
… …
1423cctx_put (coro_cctx *cctx) 1594cctx_put (coro_cctx *cctx)
1424{ 1595{
1425 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1596 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1426 1597
1427 /* free another cctx if overlimit */ 1598 /* free another cctx if overlimit */
1428 if (expect_false (cctx_idle >= cctx_max_idle)) 1599 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1429 { 1600 {
1430 coro_cctx *first = cctx_first; 1601 coro_cctx *first = cctx_first;
1431 cctx_first = first->next; 1602 cctx_first = first->next;
1432 --cctx_idle; 1603 --cctx_idle;
1433 1604
… …
1444static void 1615static void
1445transfer_check (pTHX_ struct coro *prev, struct coro *next) 1616transfer_check (pTHX_ struct coro *prev, struct coro *next)
1446{ 1617{
1447 /* TODO: throwing up here is considered harmful */ 1618 /* TODO: throwing up here is considered harmful */
1448 1619
1449 if (expect_true (prev != next)) 1620 if (ecb_expect_true (prev != next))
1450 { 1621 {
1451 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1622 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1452 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1623 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1453 1624
1454 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1625 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1455 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1626 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1456 1627
1457#if !PERL_VERSION_ATLEAST (5,10,0) 1628#if !PERL_VERSION_ATLEAST (5,10,0)
1458 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1629 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1459 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1630 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1460#endif 1631#endif
1461 } 1632 }
1462} 1633}
1463 1634
1464/* always use the TRANSFER macro */ 1635/* always use the TRANSFER macro */
1465static void NOINLINE /* noinline so we have a fixed stackframe */ 1636static void ecb_noinline /* noinline so we have a fixed stackframe */
1466transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1637transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1467{ 1638{
1468 dSTACKLEVEL; 1639 dSTACKLEVEL;
1469 1640
1470 /* sometimes transfer is only called to set idle_sp */ 1641 /* sometimes transfer is only called to set idle_sp */
1471 if (expect_false (!prev)) 1642 if (ecb_expect_false (!prev))
1472 { 1643 {
1473 cctx_current->idle_sp = STACKLEVEL; 1644 cctx_current->idle_sp = STACKLEVEL;
1474 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1645 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1475 } 1646 }
1476 else if (expect_true (prev != next)) 1647 else if (ecb_expect_true (prev != next))
1477 { 1648 {
1478 coro_cctx *cctx_prev; 1649 coro_cctx *cctx_prev;
1479 1650
1480 if (expect_false (prev->flags & CF_NEW)) 1651 if (ecb_expect_false (prev->flags & CF_NEW))
1481 { 1652 {
1482 /* create a new empty/source context */ 1653 /* create a new empty/source context */
1483 prev->flags &= ~CF_NEW; 1654 prev->flags &= ~CF_NEW;
1484 prev->flags |= CF_RUNNING; 1655 prev->flags |= CF_RUNNING;
1485 } 1656 }
… …
1488 next->flags |= CF_RUNNING; 1659 next->flags |= CF_RUNNING;
1489 1660
1490 /* first get rid of the old state */ 1661 /* first get rid of the old state */
1491 save_perl (aTHX_ prev); 1662 save_perl (aTHX_ prev);
1492 1663
1493 if (expect_false (next->flags & CF_NEW)) 1664 if (ecb_expect_false (next->flags & CF_NEW))
1494 { 1665 {
1495 /* need to start coroutine */ 1666 /* need to start coroutine */
1496 next->flags &= ~CF_NEW; 1667 next->flags &= ~CF_NEW;
1497 /* setup coroutine call */ 1668 /* setup coroutine call */
1498 coro_setup (aTHX_ next); 1669 init_perl (aTHX_ next);
1499 } 1670 }
1500 else 1671 else
1501 load_perl (aTHX_ next); 1672 load_perl (aTHX_ next);
1502 1673
1503 /* possibly untie and reuse the cctx */ 1674 /* possibly untie and reuse the cctx */
1504 if (expect_true ( 1675 if (ecb_expect_true (
1505 cctx_current->idle_sp == STACKLEVEL 1676 cctx_current->idle_sp == STACKLEVEL
1506 && !(cctx_current->flags & CC_TRACE) 1677 && !(cctx_current->flags & CC_TRACE)
1507 && !force_cctx 1678 && !force_cctx
1508 )) 1679 ))
1509 { 1680 {
1510 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1681 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1511 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1682 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1512 1683
1513 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1684 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1514 /* without this the next cctx_get might destroy the running cctx while still in use */ 1685 /* without this the next cctx_get might destroy the running cctx while still in use */
1515 if (expect_false (CCTX_EXPIRED (cctx_current))) 1686 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1516 if (expect_true (!next->cctx)) 1687 if (ecb_expect_true (!next->cctx))
1517 next->cctx = cctx_get (aTHX); 1688 next->cctx = cctx_get (aTHX);
1518 1689
1519 cctx_put (cctx_current); 1690 cctx_put (cctx_current);
1520 } 1691 }
1521 else 1692 else
1522 prev->cctx = cctx_current; 1693 prev->cctx = cctx_current;
1523 1694
1524 ++next->usecount; 1695 ++next->usecount;
1525 1696
1526 cctx_prev = cctx_current; 1697 cctx_prev = cctx_current;
1527 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1698 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1528 1699
1529 next->cctx = 0; 1700 next->cctx = 0;
1530 1701
1531 if (expect_false (cctx_prev != cctx_current)) 1702 if (ecb_expect_false (cctx_prev != cctx_current))
1532 { 1703 {
1533 cctx_prev->top_env = PL_top_env; 1704 cctx_prev->top_env = PL_top_env;
1534 PL_top_env = cctx_current->top_env; 1705 PL_top_env = cctx_current->top_env;
1535 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1706 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1536 } 1707 }
… …
1542#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1713#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1543#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1714#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1544 1715
1545/** high level stuff ********************************************************/ 1716/** high level stuff ********************************************************/
1546 1717
1718/* this function is actually Coro, not Coro::State, but we call it from here */
1719/* because it is convenient - but it hasn't been declared yet for that reason */
1547static int 1720static void
1721coro_call_on_destroy (pTHX_ struct coro *coro);
1722
1723static void
1548coro_state_destroy (pTHX_ struct coro *coro) 1724coro_state_destroy (pTHX_ struct coro *coro)
1549{ 1725{
1550 if (coro->flags & CF_DESTROYED) 1726 if (coro->flags & CF_ZOMBIE)
1551 return 0; 1727 return;
1552 1728
1553 if (coro->on_destroy && !PL_dirty)
1554 coro->on_destroy (aTHX_ coro); 1729 slf_destroy (aTHX_ coro);
1555 1730
1556 coro->flags |= CF_DESTROYED; 1731 coro->flags |= CF_ZOMBIE;
1557 1732
1558 if (coro->flags & CF_READY) 1733 if (coro->flags & CF_READY)
1559 { 1734 {
1560 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1735 /* reduce nready, as destroying a ready coro effectively unreadies it */
1561 /* alternative: look through all ready queues and remove the coro */ 1736 /* alternative: look through all ready queues and remove the coro */
1562 --coro_nready; 1737 --coro_nready;
1563 } 1738 }
1564 else 1739 else
1565 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1740 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1741
1742 if (coro->next) coro->next->prev = coro->prev;
1743 if (coro->prev) coro->prev->next = coro->next;
1744 if (coro == coro_first) coro_first = coro->next;
1566 1745
1567 if (coro->mainstack 1746 if (coro->mainstack
1568 && coro->mainstack != main_mainstack 1747 && coro->mainstack != main_mainstack
1569 && coro->slot 1748 && coro->slot
1570 && !PL_dirty) 1749 && !PL_dirty)
1571 coro_destruct_perl (aTHX_ coro); 1750 destroy_perl (aTHX_ coro);
1572 1751
1573 cctx_destroy (coro->cctx); 1752 cctx_destroy (coro->cctx);
1574 SvREFCNT_dec (coro->startcv); 1753 SvREFCNT_dec (coro->startcv);
1575 SvREFCNT_dec (coro->args); 1754 SvREFCNT_dec (coro->args);
1755 SvREFCNT_dec (coro->swap_sv);
1576 SvREFCNT_dec (CORO_THROW); 1756 SvREFCNT_dec (CORO_THROW);
1577 1757
1578 if (coro->next) coro->next->prev = coro->prev; 1758 coro_call_on_destroy (aTHX_ coro);
1579 if (coro->prev) coro->prev->next = coro->next;
1580 if (coro == coro_first) coro_first = coro->next;
1581 1759
1582 return 1; 1760 /* more destruction mayhem in coro_state_free */
1583} 1761}
1584 1762
1585static int 1763static int
1586coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1764coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1587{ 1765{
1588 struct coro *coro = (struct coro *)mg->mg_ptr; 1766 struct coro *coro = (struct coro *)mg->mg_ptr;
1589 mg->mg_ptr = 0; 1767 mg->mg_ptr = 0;
1590 1768
1591 coro->hv = 0;
1592
1593 if (--coro->refcnt < 0)
1594 {
1595 coro_state_destroy (aTHX_ coro); 1769 coro_state_destroy (aTHX_ coro);
1770 SvREFCNT_dec (coro->on_destroy);
1771 SvREFCNT_dec (coro->status);
1772
1596 Safefree (coro); 1773 Safefree (coro);
1597 }
1598 1774
1599 return 0; 1775 return 0;
1600} 1776}
1601 1777
1602static int 1778static int ecb_cold
1603coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1779coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1604{ 1780{
1605 struct coro *coro = (struct coro *)mg->mg_ptr; 1781 /* called when perl clones the current process the slow way (windows process emulation) */
1606 1782 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1607 ++coro->refcnt; 1783 mg->mg_ptr = 0;
1784 mg->mg_virtual = 0;
1608 1785
1609 return 0; 1786 return 0;
1610} 1787}
1611 1788
1612static MGVTBL coro_state_vtbl = { 1789static MGVTBL coro_state_vtbl = {
… …
1637 TRANSFER (ta, 1); 1814 TRANSFER (ta, 1);
1638} 1815}
1639 1816
1640/** Coro ********************************************************************/ 1817/** Coro ********************************************************************/
1641 1818
1642INLINE void 1819ecb_inline void
1643coro_enq (pTHX_ struct coro *coro) 1820coro_enq (pTHX_ struct coro *coro)
1644{ 1821{
1645 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1822 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1646 1823
1647 SvREFCNT_inc_NN (coro->hv); 1824 SvREFCNT_inc_NN (coro->hv);
… …
1649 coro->next_ready = 0; 1826 coro->next_ready = 0;
1650 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1827 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1651 ready [1] = coro; 1828 ready [1] = coro;
1652} 1829}
1653 1830
1654INLINE struct coro * 1831ecb_inline struct coro *
1655coro_deq (pTHX) 1832coro_deq (pTHX)
1656{ 1833{
1657 int prio; 1834 int prio;
1658 1835
1659 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1836 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1712{ 1889{
1713 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1890 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1714} 1891}
1715 1892
1716/* expects to own a reference to next->hv */ 1893/* expects to own a reference to next->hv */
1717INLINE void 1894ecb_inline void
1718prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1895prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1719{ 1896{
1720 SV *prev_sv = SvRV (coro_current); 1897 SV *prev_sv = SvRV (coro_current);
1721 1898
1722 ta->prev = SvSTATE_hv (prev_sv); 1899 ta->prev = SvSTATE_hv (prev_sv);
… …
1735{ 1912{
1736 for (;;) 1913 for (;;)
1737 { 1914 {
1738 struct coro *next = coro_deq (aTHX); 1915 struct coro *next = coro_deq (aTHX);
1739 1916
1740 if (expect_true (next)) 1917 if (ecb_expect_true (next))
1741 { 1918 {
1742 /* cannot transfer to destroyed coros, skip and look for next */ 1919 /* cannot transfer to destroyed coros, skip and look for next */
1743 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1920 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1744 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1921 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1745 else 1922 else
1746 { 1923 {
1747 next->flags &= ~CF_READY; 1924 next->flags &= ~CF_READY;
1748 --coro_nready; 1925 --coro_nready;
… …
1755 { 1932 {
1756 /* nothing to schedule: call the idle handler */ 1933 /* nothing to schedule: call the idle handler */
1757 if (SvROK (sv_idle) 1934 if (SvROK (sv_idle)
1758 && SvOBJECT (SvRV (sv_idle))) 1935 && SvOBJECT (SvRV (sv_idle)))
1759 { 1936 {
1937 if (SvRV (sv_idle) == SvRV (coro_current))
1938 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1939
1760 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1940 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1761 api_ready (aTHX_ SvRV (sv_idle)); 1941 api_ready (aTHX_ SvRV (sv_idle));
1762 --coro_nready; 1942 --coro_nready;
1763 } 1943 }
1764 else 1944 else
1765 { 1945 {
1946 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1766 dSP; 1947 dSP;
1767 1948
1768 ENTER; 1949 ENTER;
1769 SAVETMPS; 1950 SAVETMPS;
1770 1951
… …
1777 } 1958 }
1778 } 1959 }
1779 } 1960 }
1780} 1961}
1781 1962
1782INLINE void 1963ecb_inline void
1783prepare_cede (pTHX_ struct coro_transfer_args *ta) 1964prepare_cede (pTHX_ struct coro_transfer_args *ta)
1784{ 1965{
1785 api_ready (aTHX_ coro_current); 1966 api_ready (aTHX_ coro_current);
1786 prepare_schedule (aTHX_ ta); 1967 prepare_schedule (aTHX_ ta);
1787} 1968}
1788 1969
1789INLINE void 1970ecb_inline void
1790prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1971prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1791{ 1972{
1792 SV *prev = SvRV (coro_current); 1973 SV *prev = SvRV (coro_current);
1793 1974
1794 if (coro_nready) 1975 if (coro_nready)
… …
1824{ 2005{
1825 struct coro_transfer_args ta; 2006 struct coro_transfer_args ta;
1826 2007
1827 prepare_cede (aTHX_ &ta); 2008 prepare_cede (aTHX_ &ta);
1828 2009
1829 if (expect_true (ta.prev != ta.next)) 2010 if (ecb_expect_true (ta.prev != ta.next))
1830 { 2011 {
1831 TRANSFER (ta, 1); 2012 TRANSFER (ta, 1);
1832 return 1; 2013 return 1;
1833 } 2014 }
1834 else 2015 else
… …
1877 coro->slot->runops = RUNOPS_DEFAULT; 2058 coro->slot->runops = RUNOPS_DEFAULT;
1878 } 2059 }
1879} 2060}
1880 2061
1881static void 2062static void
2063coro_push_av (pTHX_ AV *av, I32 gimme_v)
2064{
2065 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2066 {
2067 dSP;
2068
2069 if (gimme_v == G_SCALAR)
2070 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2071 else
2072 {
2073 int i;
2074 EXTEND (SP, AvFILLp (av) + 1);
2075
2076 for (i = 0; i <= AvFILLp (av); ++i)
2077 PUSHs (AvARRAY (av)[i]);
2078 }
2079
2080 PUTBACK;
2081 }
2082}
2083
2084static void
2085coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2086{
2087 if (!coro->on_destroy)
2088 coro->on_destroy = newAV ();
2089
2090 av_push (coro->on_destroy, cb);
2091}
2092
2093static void
2094slf_destroy_join (pTHX_ struct CoroSLF *frame)
2095{
2096 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2097}
2098
2099static int
2100slf_check_join (pTHX_ struct CoroSLF *frame)
2101{
2102 struct coro *coro = (struct coro *)frame->data;
2103
2104 if (!coro->status)
2105 return 1;
2106
2107 frame->destroy = 0;
2108
2109 coro_push_av (aTHX_ coro->status, GIMME_V);
2110
2111 SvREFCNT_dec ((SV *)coro->hv);
2112
2113 return 0;
2114}
2115
2116static void
2117slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2118{
2119 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2120
2121 if (items > 1)
2122 croak ("join called with too many arguments");
2123
2124 if (coro->status)
2125 frame->prepare = prepare_nop;
2126 else
2127 {
2128 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2129 frame->prepare = prepare_schedule;
2130 }
2131
2132 frame->check = slf_check_join;
2133 frame->destroy = slf_destroy_join;
2134 frame->data = (void *)coro;
2135 SvREFCNT_inc (coro->hv);
2136}
2137
2138static void
1882coro_call_on_destroy (pTHX_ struct coro *coro) 2139coro_call_on_destroy (pTHX_ struct coro *coro)
1883{ 2140{
1884 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2141 AV *od = coro->on_destroy;
1885 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1886 2142
1887 if (on_destroyp) 2143 if (!od)
1888 { 2144 return;
1889 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1890 2145
1891 while (AvFILLp (on_destroy) >= 0) 2146 while (AvFILLp (od) >= 0)
2147 {
2148 SV *cb = sv_2mortal (av_pop (od));
2149
2150 /* coro hv's (and only hv's at the moment) are supported as well */
2151 if (SvSTATEhv_p (aTHX_ cb))
2152 api_ready (aTHX_ cb);
2153 else
1892 { 2154 {
1893 dSP; /* don't disturb outer sp */ 2155 dSP; /* don't disturb outer sp */
1894 SV *cb = av_pop (on_destroy);
1895
1896 PUSHMARK (SP); 2156 PUSHMARK (SP);
1897 2157
1898 if (statusp) 2158 if (coro->status)
1899 { 2159 {
1900 int i; 2160 PUTBACK;
1901 AV *status = (AV *)SvRV (*statusp); 2161 coro_push_av (aTHX_ coro->status, G_ARRAY);
1902 EXTEND (SP, AvFILLp (status) + 1); 2162 SPAGAIN;
1903
1904 for (i = 0; i <= AvFILLp (status); ++i)
1905 PUSHs (AvARRAY (status)[i]);
1906 } 2163 }
1907 2164
1908 PUTBACK; 2165 PUTBACK;
1909 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2166 call_sv (cb, G_VOID | G_DISCARD);
1910 } 2167 }
1911 } 2168 }
1912} 2169}
1913 2170
1914static void 2171static void
1915slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2172coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1916{ 2173{
1917 int i; 2174 AV *av;
1918 HV *hv = (HV *)SvRV (coro_current); 2175
1919 AV *av = newAV (); 2176 if (coro->status)
2177 {
2178 av = coro->status;
2179 av_clear (av);
2180 }
2181 else
2182 av = coro->status = newAV ();
1920 2183
1921 /* items are actually not so common, so optimise for this case */ 2184 /* items are actually not so common, so optimise for this case */
1922 if (items) 2185 if (items)
1923 { 2186 {
2187 int i;
2188
1924 av_extend (av, items - 1); 2189 av_extend (av, items - 1);
1925 2190
1926 for (i = 0; i < items; ++i) 2191 for (i = 0; i < items; ++i)
1927 av_push (av, SvREFCNT_inc_NN (arg [i])); 2192 av_push (av, SvREFCNT_inc_NN (arg [i]));
1928 } 2193 }
2194}
1929 2195
1930 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2196static void
1931 2197slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2198{
1932 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2199 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1933 api_ready (aTHX_ sv_manager); 2200 api_ready (aTHX_ sv_manager);
1934 2201
1935 frame->prepare = prepare_schedule; 2202 frame->prepare = prepare_schedule;
1936 frame->check = slf_check_repeat; 2203 frame->check = slf_check_repeat;
1937 2204
1938 /* as a minor optimisation, we could unwind all stacks here */ 2205 /* as a minor optimisation, we could unwind all stacks here */
1939 /* but that puts extra pressure on pp_slf, and is not worth much */ 2206 /* but that puts extra pressure on pp_slf, and is not worth much */
1940 /*coro_unwind_stacks (aTHX);*/ 2207 /*coro_unwind_stacks (aTHX);*/
2208}
2209
2210static void
2211slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2212{
2213 HV *coro_hv = (HV *)SvRV (coro_current);
2214
2215 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2216 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2217}
2218
2219static void
2220slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2221{
2222 HV *coro_hv;
2223 struct coro *coro;
2224
2225 if (items <= 0)
2226 croak ("Coro::cancel called without coro object,");
2227
2228 coro = SvSTATE (arg [0]);
2229 coro_hv = coro->hv;
2230
2231 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2232
2233 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2234 {
2235 /* coro currently busy cancelling something, so just notify it */
2236 coro->slf_frame.data = (void *)coro;
2237
2238 frame->prepare = prepare_nop;
2239 frame->check = slf_check_nop;
2240 }
2241 else if (coro_hv == (HV *)SvRV (coro_current))
2242 {
2243 /* cancelling the current coro is allowed, and equals terminate */
2244 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2245 }
2246 else
2247 {
2248 struct coro *self = SvSTATE_current;
2249
2250 /* otherwise we cancel directly, purely for speed reasons
2251 * unfortunately, this requires some magic trickery, as
2252 * somebody else could cancel us, so we have to fight the cancellation.
2253 * this is ugly, and hopefully fully worth the extra speed.
2254 * besides, I can't get the slow-but-safe version working...
2255 */
2256 slf_frame.data = 0;
2257 self->flags |= CF_NOCANCEL;
2258 coro_state_destroy (aTHX_ coro);
2259 self->flags &= ~CF_NOCANCEL;
2260
2261 if (slf_frame.data)
2262 {
2263 /* while we were busy we have been cancelled, so terminate */
2264 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2265 }
2266 else
2267 {
2268 frame->prepare = prepare_nop;
2269 frame->check = slf_check_nop;
2270 }
2271 }
2272}
2273
2274static int
2275slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2276{
2277 frame->prepare = 0;
2278 coro_unwind_stacks (aTHX);
2279
2280 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2281
2282 return 1;
2283}
2284
2285static int
2286safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2287{
2288 if (coro->cctx)
2289 croak ("coro inside C callback, unable to cancel at this time, caught");
2290
2291 if (coro->flags & CF_NEW)
2292 {
2293 coro_set_status (aTHX_ coro, arg, items);
2294 coro_state_destroy (aTHX_ coro);
2295 }
2296 else
2297 {
2298 if (!coro->slf_frame.prepare)
2299 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2300
2301 slf_destroy (aTHX_ coro);
2302
2303 coro_set_status (aTHX_ coro, arg, items);
2304 coro->slf_frame.prepare = prepare_nop;
2305 coro->slf_frame.check = slf_check_safe_cancel;
2306
2307 api_ready (aTHX_ (SV *)coro->hv);
2308 }
2309
2310 return 1;
1941} 2311}
1942 2312
1943/*****************************************************************************/ 2313/*****************************************************************************/
1944/* async pool handler */ 2314/* async pool handler */
1945 2315
… …
1976slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2346slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1977{ 2347{
1978 HV *hv = (HV *)SvRV (coro_current); 2348 HV *hv = (HV *)SvRV (coro_current);
1979 struct coro *coro = SvSTATE_hv ((SV *)hv); 2349 struct coro *coro = SvSTATE_hv ((SV *)hv);
1980 2350
1981 if (expect_true (coro->saved_deffh)) 2351 if (ecb_expect_true (coro->saved_deffh))
1982 { 2352 {
1983 /* subsequent iteration */ 2353 /* subsequent iteration */
1984 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2354 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1985 coro->saved_deffh = 0; 2355 coro->saved_deffh = 0;
1986 2356
1987 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2357 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1988 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2358 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1989 { 2359 {
1990 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2360 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1991 coro->invoke_av = newAV (); 2361 return;
1992
1993 frame->prepare = prepare_nop;
1994 } 2362 }
1995 else 2363 else
1996 { 2364 {
1997 av_clear (GvAV (PL_defgv)); 2365 av_clear (GvAV (PL_defgv));
1998 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2366 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2221static void 2589static void
2222slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2590slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2223{ 2591{
2224 frame->prepare = prepare_cede_notself; 2592 frame->prepare = prepare_cede_notself;
2225 frame->check = slf_check_nop; 2593 frame->check = slf_check_nop;
2594}
2595
2596/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2597static void
2598slf_destroy (pTHX_ struct coro *coro)
2599{
2600 /* this callback is reserved for slf functions needing to do cleanup */
2601 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2602 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2603
2604 /*
2605 * The on_destroy above most likely is from an SLF call.
2606 * Since by definition the SLF call will not finish when we destroy
2607 * the coro, we will have to force-finish it here, otherwise
2608 * cleanup functions cannot call SLF functions.
2609 */
2610 coro->slf_frame.prepare = 0;
2226} 2611}
2227 2612
2228/* 2613/*
2229 * these not obviously related functions are all rolled into one 2614 * these not obviously related functions are all rolled into one
2230 * function to increase chances that they all will call transfer with the same 2615 * function to increase chances that they all will call transfer with the same
… …
2237 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2622 I32 checkmark; /* mark SP to see how many elements check has pushed */
2238 2623
2239 /* set up the slf frame, unless it has already been set-up */ 2624 /* set up the slf frame, unless it has already been set-up */
2240 /* the latter happens when a new coro has been started */ 2625 /* the latter happens when a new coro has been started */
2241 /* or when a new cctx was attached to an existing coroutine */ 2626 /* or when a new cctx was attached to an existing coroutine */
2242 if (expect_true (!slf_frame.prepare)) 2627 if (ecb_expect_true (!slf_frame.prepare))
2243 { 2628 {
2244 /* first iteration */ 2629 /* first iteration */
2245 dSP; 2630 dSP;
2246 SV **arg = PL_stack_base + TOPMARK + 1; 2631 SV **arg = PL_stack_base + TOPMARK + 1;
2247 int items = SP - arg; /* args without function object */ 2632 int items = SP - arg; /* args without function object */
… …
2288 while (slf_frame.check (aTHX_ &slf_frame)); 2673 while (slf_frame.check (aTHX_ &slf_frame));
2289 2674
2290 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2675 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2291 2676
2292 /* exception handling */ 2677 /* exception handling */
2293 if (expect_false (CORO_THROW)) 2678 if (ecb_expect_false (CORO_THROW))
2294 { 2679 {
2295 SV *exception = sv_2mortal (CORO_THROW); 2680 SV *exception = sv_2mortal (CORO_THROW);
2296 2681
2297 CORO_THROW = 0; 2682 CORO_THROW = 0;
2298 sv_setsv (ERRSV, exception); 2683 sv_setsv (ERRSV, exception);
2299 croak (0); 2684 croak (0);
2300 } 2685 }
2301 2686
2302 /* return value handling - mostly like entersub */ 2687 /* return value handling - mostly like entersub */
2303 /* make sure we put something on the stack in scalar context */ 2688 /* make sure we put something on the stack in scalar context */
2304 if (GIMME_V == G_SCALAR) 2689 if (GIMME_V == G_SCALAR
2690 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2305 { 2691 {
2306 dSP; 2692 dSP;
2307 SV **bot = PL_stack_base + checkmark; 2693 SV **bot = PL_stack_base + checkmark;
2308 2694
2309 if (sp == bot) /* too few, push undef */ 2695 if (sp == bot) /* too few, push undef */
2310 bot [1] = &PL_sv_undef; 2696 bot [1] = &PL_sv_undef;
2311 else if (sp != bot + 1) /* too many, take last one */ 2697 else /* too many, take last one */
2312 bot [1] = *sp; 2698 bot [1] = *sp;
2313 2699
2314 SP = bot + 1; 2700 SP = bot + 1;
2315 2701
2316 PUTBACK; 2702 PUTBACK;
… …
2349 if (PL_op->op_flags & OPf_STACKED) 2735 if (PL_op->op_flags & OPf_STACKED)
2350 { 2736 {
2351 if (items > slf_arga) 2737 if (items > slf_arga)
2352 { 2738 {
2353 slf_arga = items; 2739 slf_arga = items;
2354 free (slf_argv); 2740 Safefree (slf_argv);
2355 slf_argv = malloc (slf_arga * sizeof (SV *)); 2741 New (0, slf_argv, slf_arga, SV *);
2356 } 2742 }
2357 2743
2358 slf_argc = items; 2744 slf_argc = items;
2359 2745
2360 for (i = 0; i < items; ++i) 2746 for (i = 0; i < items; ++i)
… …
2423{ 2809{
2424 PerlIOBuf base; 2810 PerlIOBuf base;
2425 NV next, every; 2811 NV next, every;
2426} PerlIOCede; 2812} PerlIOCede;
2427 2813
2428static IV 2814static IV ecb_cold
2429PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2815PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2430{ 2816{
2431 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2817 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2432 2818
2433 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2819 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2434 self->next = nvtime () + self->every; 2820 self->next = nvtime () + self->every;
2435 2821
2436 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2822 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2437} 2823}
2438 2824
2439static SV * 2825static SV * ecb_cold
2440PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2826PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2441{ 2827{
2442 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2828 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2443 2829
2444 return newSVnv (self->every); 2830 return newSVnv (self->every);
… …
2556 SvREFCNT_dec (cb); 2942 SvREFCNT_dec (cb);
2557 } 2943 }
2558} 2944}
2559 2945
2560static void 2946static void
2561coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2947coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2562{ 2948{
2563 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2949 /* call $sem->adjust (0) to possibly wake up some other waiters */
2564 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2950 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2565} 2951}
2566 2952
2567static int 2953static int
2568slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2954slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2569{ 2955{
2570 AV *av = (AV *)frame->data; 2956 AV *av = (AV *)frame->data;
2571 SV *count_sv = AvARRAY (av)[0]; 2957 SV *count_sv = AvARRAY (av)[0];
2958 SV *coro_hv = SvRV (coro_current);
2572 2959
2573 /* if we are about to throw, don't actually acquire the lock, just throw */ 2960 /* if we are about to throw, don't actually acquire the lock, just throw */
2574 if (CORO_THROW) 2961 if (CORO_THROW)
2575 return 0; 2962 return 0;
2576 else if (SvIVX (count_sv) > 0) 2963 else if (SvIVX (count_sv) > 0)
2577 { 2964 {
2578 SvSTATE_current->on_destroy = 0; 2965 frame->destroy = 0;
2579 2966
2580 if (acquire) 2967 if (acquire)
2581 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2968 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2582 else 2969 else
2583 coro_semaphore_adjust (aTHX_ av, 0); 2970 coro_semaphore_adjust (aTHX_ av, 0);
… …
2588 { 2975 {
2589 int i; 2976 int i;
2590 /* if we were woken up but can't down, we look through the whole */ 2977 /* if we were woken up but can't down, we look through the whole */
2591 /* waiters list and only add us if we aren't in there already */ 2978 /* waiters list and only add us if we aren't in there already */
2592 /* this avoids some degenerate memory usage cases */ 2979 /* this avoids some degenerate memory usage cases */
2593 2980 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2594 for (i = 1; i <= AvFILLp (av); ++i)
2595 if (AvARRAY (av)[i] == SvRV (coro_current)) 2981 if (AvARRAY (av)[i] == coro_hv)
2596 return 1; 2982 return 1;
2597 2983
2598 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2984 av_push (av, SvREFCNT_inc (coro_hv));
2599 return 1; 2985 return 1;
2600 } 2986 }
2601} 2987}
2602 2988
2603static int 2989static int
… …
2626 { 3012 {
2627 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3013 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2628 3014
2629 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3015 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2630 frame->prepare = prepare_schedule; 3016 frame->prepare = prepare_schedule;
2631
2632 /* to avoid race conditions when a woken-up coro gets terminated */ 3017 /* to avoid race conditions when a woken-up coro gets terminated */
2633 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3018 /* we arrange for a temporary on_destroy that calls adjust (0) */
2634 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3019 frame->destroy = coro_semaphore_destroy;
2635 } 3020 }
2636} 3021}
2637 3022
2638static void 3023static void
2639slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3024slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2721 { 3106 {
2722 SV *cb_cv = s_get_cv_croak (arg [1]); 3107 SV *cb_cv = s_get_cv_croak (arg [1]);
2723 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3108 av_push (av, SvREFCNT_inc_NN (cb_cv));
2724 3109
2725 if (SvIVX (AvARRAY (av)[0])) 3110 if (SvIVX (AvARRAY (av)[0]))
2726 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3111 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2727 3112
2728 frame->prepare = prepare_nop; 3113 frame->prepare = prepare_nop;
2729 frame->check = slf_check_nop; 3114 frame->check = slf_check_nop;
2730 } 3115 }
2731 else if (SvIVX (AvARRAY (av)[0])) 3116 else if (SvIVX (AvARRAY (av)[0]))
… …
2857 dSP; 3242 dSP;
2858 3243
2859 static SV *prio_cv; 3244 static SV *prio_cv;
2860 static SV *prio_sv; 3245 static SV *prio_sv;
2861 3246
2862 if (expect_false (!prio_cv)) 3247 if (ecb_expect_false (!prio_cv))
2863 { 3248 {
2864 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3249 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2865 prio_sv = newSViv (0); 3250 prio_sv = newSViv (0);
2866 } 3251 }
2867 3252
… …
2893 /* now call the AIO function - we assume our request is uncancelable */ 3278 /* now call the AIO function - we assume our request is uncancelable */
2894 PUTBACK; 3279 PUTBACK;
2895 call_sv ((SV *)req, G_VOID | G_DISCARD); 3280 call_sv ((SV *)req, G_VOID | G_DISCARD);
2896 } 3281 }
2897 3282
2898 /* now that the requets is going, we loop toll we have a result */ 3283 /* now that the request is going, we loop till we have a result */
2899 frame->data = (void *)state; 3284 frame->data = (void *)state;
2900 frame->prepare = prepare_schedule; 3285 frame->prepare = prepare_schedule;
2901 frame->check = slf_check_aio_req; 3286 frame->check = slf_check_aio_req;
2902} 3287}
2903 3288
… …
2918#endif 3303#endif
2919 3304
2920/*****************************************************************************/ 3305/*****************************************************************************/
2921 3306
2922static SV * 3307static SV *
2923coro_new (HV *stash, SV **argv, int argc, int is_coro) 3308coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2924{ 3309{
2925 SV *coro_sv; 3310 SV *coro_sv;
2926 struct coro *coro; 3311 struct coro *coro;
2927 MAGIC *mg; 3312 MAGIC *mg;
2928 HV *hv; 3313 HV *hv;
… …
2973 } 3358 }
2974 3359
2975 return coro_sv; 3360 return coro_sv;
2976} 3361}
2977 3362
3363#ifndef __cplusplus
3364ecb_cold XS(boot_Coro__State);
3365#endif
3366
3367#if CORO_JIT
3368
3369static void ecb_noinline ecb_cold
3370pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3371{
3372 dSP;
3373 AV *av = newAV ();
3374
3375 av_store (av, 3, newSVuv (d));
3376 av_store (av, 2, newSVuv (c));
3377 av_store (av, 1, newSVuv (b));
3378 av_store (av, 0, newSVuv (a));
3379
3380 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3381
3382 PUTBACK;
3383}
3384
3385static void ecb_noinline ecb_cold
3386jit_init (pTHX)
3387{
3388 dSP;
3389 SV *load, *save;
3390 char *map_base;
3391 char *load_ptr, *save_ptr;
3392 STRLEN load_len, save_len, map_len;
3393 int count;
3394
3395 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3396
3397 PUSHMARK (SP);
3398#define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3399# include "state.h"
3400#undef VARx
3401 count = call_pv ("Coro::State::_jit", G_ARRAY);
3402 SPAGAIN;
3403
3404 save = POPs; save_ptr = SvPVbyte (save, save_len);
3405 load = POPs; load_ptr = SvPVbyte (load, load_len);
3406
3407 map_len = load_len + save_len + 16;
3408
3409 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3410
3411 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3412
3413 load_perl_slots = (load_save_perl_slots_type)map_base;
3414 memcpy (map_base, load_ptr, load_len);
3415
3416 map_base += (load_len + 15) & ~15;
3417
3418 save_perl_slots = (load_save_perl_slots_type)map_base;
3419 memcpy (map_base, save_ptr, save_len);
3420
3421 /* we are good citizens and try to make the page read-only, so the evil evil */
3422 /* hackers might have it a bit more difficult */
3423 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3424
3425 PUTBACK;
3426 eval_pv ("undef &Coro::State::_jit", 1);
3427}
3428
3429#endif
3430
2978MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3431MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2979 3432
2980PROTOTYPES: DISABLE 3433PROTOTYPES: DISABLE
2981 3434
2982BOOT: 3435BOOT:
… …
2985# if CORO_PTHREAD 3438# if CORO_PTHREAD
2986 coro_thx = PERL_GET_CONTEXT; 3439 coro_thx = PERL_GET_CONTEXT;
2987# endif 3440# endif
2988#endif 3441#endif
2989 BOOT_PAGESIZE; 3442 BOOT_PAGESIZE;
3443
3444 /* perl defines these to check for existance first, but why it doesn't */
3445 /* just create them one at init time is not clear to me, except for */
3446 /* programs trying to delete them, but... */
3447 /* anyway, we declare this as invalid and make sure they are initialised here */
3448 DEFSV;
3449 ERRSV;
2990 3450
2991 cctx_current = cctx_new_empty (); 3451 cctx_current = cctx_new_empty ();
2992 3452
2993 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3453 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2994 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3454 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3034 coroapi.prepare_nop = prepare_nop; 3494 coroapi.prepare_nop = prepare_nop;
3035 coroapi.prepare_schedule = prepare_schedule; 3495 coroapi.prepare_schedule = prepare_schedule;
3036 coroapi.prepare_cede = prepare_cede; 3496 coroapi.prepare_cede = prepare_cede;
3037 coroapi.prepare_cede_notself = prepare_cede_notself; 3497 coroapi.prepare_cede_notself = prepare_cede_notself;
3038 3498
3039 { 3499 time_init (aTHX);
3040 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3041
3042 if (!svp) croak ("Time::HiRes is required");
3043 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3044
3045 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3046
3047 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3048 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3049 }
3050 3500
3051 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3501 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3502#if CORO_JIT
3503 PUTBACK;
3504 jit_init (aTHX);
3505 SPAGAIN;
3506#endif
3052} 3507}
3053 3508
3054SV * 3509SV *
3055new (SV *klass, ...) 3510new (SV *klass, ...)
3056 ALIAS: 3511 ALIAS:
3057 Coro::new = 1 3512 Coro::new = 1
3058 CODE: 3513 CODE:
3059 RETVAL = coro_new (ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix); 3514 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
3060 OUTPUT: 3515 OUTPUT:
3061 RETVAL 3516 RETVAL
3062 3517
3063void 3518void
3064transfer (...) 3519transfer (...)
3065 PROTOTYPE: $$ 3520 PROTOTYPE: $$
3066 CODE: 3521 CODE:
3067 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3522 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3068
3069bool
3070_destroy (SV *coro_sv)
3071 CODE:
3072 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3073 OUTPUT:
3074 RETVAL
3075 3523
3076void 3524void
3077_exit (int code) 3525_exit (int code)
3078 PROTOTYPE: $ 3526 PROTOTYPE: $
3079 CODE: 3527 CODE:
… …
3155 CODE: 3603 CODE:
3156{ 3604{
3157 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3605 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3158 { 3606 {
3159 struct coro *current = SvSTATE_current; 3607 struct coro *current = SvSTATE_current;
3608 struct CoroSLF slf_save;
3160 3609
3161 if (current != coro) 3610 if (current != coro)
3162 { 3611 {
3163 PUTBACK; 3612 PUTBACK;
3164 save_perl (aTHX_ current); 3613 save_perl (aTHX_ current);
3165 load_perl (aTHX_ coro); 3614 load_perl (aTHX_ coro);
3615 /* the coro is most likely in an active SLF call.
3616 * while not strictly required (the code we execute is
3617 * not allowed to call any SLF functions), it's cleaner
3618 * to reinitialise the slf_frame and restore it later.
3619 * This might one day allow us to actually do SLF calls
3620 * from code executed here.
3621 */
3622 slf_save = slf_frame;
3623 slf_frame.prepare = 0;
3166 SPAGAIN; 3624 SPAGAIN;
3167 } 3625 }
3168 3626
3169 PUSHSTACK; 3627 PUSHSTACK;
3170 3628
… …
3180 SPAGAIN; 3638 SPAGAIN;
3181 3639
3182 if (current != coro) 3640 if (current != coro)
3183 { 3641 {
3184 PUTBACK; 3642 PUTBACK;
3643 slf_frame = slf_save;
3185 save_perl (aTHX_ coro); 3644 save_perl (aTHX_ coro);
3186 load_perl (aTHX_ current); 3645 load_perl (aTHX_ current);
3187 SPAGAIN; 3646 SPAGAIN;
3188 } 3647 }
3189 } 3648 }
… …
3194 PROTOTYPE: $ 3653 PROTOTYPE: $
3195 ALIAS: 3654 ALIAS:
3196 is_ready = CF_READY 3655 is_ready = CF_READY
3197 is_running = CF_RUNNING 3656 is_running = CF_RUNNING
3198 is_new = CF_NEW 3657 is_new = CF_NEW
3199 is_destroyed = CF_DESTROYED 3658 is_destroyed = CF_ZOMBIE
3659 is_zombie = CF_ZOMBIE
3200 is_suspended = CF_SUSPENDED 3660 is_suspended = CF_SUSPENDED
3201 CODE: 3661 CODE:
3202 RETVAL = boolSV (coro->flags & ix); 3662 RETVAL = boolSV (coro->flags & ix);
3203 OUTPUT: 3663 OUTPUT:
3204 RETVAL 3664 RETVAL
3205 3665
3206void 3666void
3207throw (Coro::State self, SV *throw = &PL_sv_undef) 3667throw (Coro::State self, SV *exception = &PL_sv_undef)
3208 PROTOTYPE: $;$ 3668 PROTOTYPE: $;$
3209 CODE: 3669 CODE:
3210{ 3670{
3211 struct coro *current = SvSTATE_current; 3671 struct coro *current = SvSTATE_current;
3212 SV **throwp = self == current ? &CORO_THROW : &self->except; 3672 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3213 SvREFCNT_dec (*throwp); 3673 SvREFCNT_dec (*exceptionp);
3214 SvGETMAGIC (throw); 3674 SvGETMAGIC (exception);
3215 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3675 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3216} 3676}
3217 3677
3218void 3678void
3219api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3679api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3220 PROTOTYPE: $;$ 3680 PROTOTYPE: $;$
… …
3275 3735
3276void 3736void
3277cancel (Coro::State self) 3737cancel (Coro::State self)
3278 CODE: 3738 CODE:
3279 coro_state_destroy (aTHX_ self); 3739 coro_state_destroy (aTHX_ self);
3280 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3281
3282 3740
3283SV * 3741SV *
3284enable_times (int enabled = enable_times) 3742enable_times (int enabled = enable_times)
3285 CODE: 3743 CODE:
3286{ 3744{
… …
3301times (Coro::State self) 3759times (Coro::State self)
3302 PPCODE: 3760 PPCODE:
3303{ 3761{
3304 struct coro *current = SvSTATE (coro_current); 3762 struct coro *current = SvSTATE (coro_current);
3305 3763
3306 if (expect_false (current == self)) 3764 if (ecb_expect_false (current == self))
3307 { 3765 {
3308 coro_times_update (); 3766 coro_times_update ();
3309 coro_times_add (SvSTATE (coro_current)); 3767 coro_times_add (SvSTATE (coro_current));
3310 } 3768 }
3311 3769
3312 EXTEND (SP, 2); 3770 EXTEND (SP, 2);
3313 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3771 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3314 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3772 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3315 3773
3316 if (expect_false (current == self)) 3774 if (ecb_expect_false (current == self))
3317 coro_times_sub (SvSTATE (coro_current)); 3775 coro_times_sub (SvSTATE (coro_current));
3318} 3776}
3777
3778void
3779swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3780 CODE:
3781{
3782 struct coro *current = SvSTATE_current;
3783
3784 if (current == coro)
3785 SWAP_SVS (current);
3786
3787 if (!coro->swap_sv)
3788 coro->swap_sv = newAV ();
3789
3790 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3791 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3792
3793 if (current == coro)
3794 SWAP_SVS (current);
3795}
3796
3319 3797
3320MODULE = Coro::State PACKAGE = Coro 3798MODULE = Coro::State PACKAGE = Coro
3321 3799
3322BOOT: 3800BOOT:
3323{ 3801{
3324 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3802 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3325 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3803 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3326 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3804 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3327 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3328 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3805 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3329 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3806 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3330 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3807 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3331 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3808 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3332 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3809 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3333 3810
3334 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3811 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3335 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3812 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3336 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3813 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3337 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3814 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3338 3815
3339 coro_stash = gv_stashpv ("Coro", TRUE); 3816 coro_stash = gv_stashpv ("Coro", TRUE);
3340 3817
3341 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3818 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3342 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3819 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3343 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3820 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3365 3842
3366SV * 3843SV *
3367async (...) 3844async (...)
3368 PROTOTYPE: &@ 3845 PROTOTYPE: &@
3369 CODE: 3846 CODE:
3370 RETVAL = coro_new (coro_stash, &ST (0), items, 1); 3847 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3371 api_ready (RETVAL); 3848 api_ready (aTHX_ RETVAL);
3372 OUTPUT: 3849 OUTPUT:
3373 RETVAL 3850 RETVAL
3851
3852void
3853_destroy (Coro::State coro)
3854 CODE:
3855 /* used by the manager thread */
3856 coro_state_destroy (aTHX_ coro);
3857
3858void
3859on_destroy (Coro::State coro, SV *cb)
3860 CODE:
3861 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3862
3863void
3864join (...)
3865 CODE:
3866 CORO_EXECUTE_SLF_XS (slf_init_join);
3374 3867
3375void 3868void
3376terminate (...) 3869terminate (...)
3377 CODE: 3870 CODE:
3378 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3871 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3872
3873void
3874cancel (...)
3875 CODE:
3876 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3877
3878int
3879safe_cancel (Coro::State self, ...)
3880 C_ARGS: aTHX_ self, &ST (1), items - 1
3379 3881
3380void 3882void
3381schedule (...) 3883schedule (...)
3382 CODE: 3884 CODE:
3383 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3885 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3496 for (i = 1; i < items; ++i) 3998 for (i = 1; i < items; ++i)
3497 av_push (av, SvREFCNT_inc_NN (ST (i))); 3999 av_push (av, SvREFCNT_inc_NN (ST (i)));
3498 4000
3499 if ((SV *)hv == &PL_sv_undef) 4001 if ((SV *)hv == &PL_sv_undef)
3500 { 4002 {
3501 PUSHMARK (SP); 4003 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3502 EXTEND (SP, 2);
3503 PUSHs (sv_Coro);
3504 PUSHs ((SV *)cv_pool_handler);
3505 PUTBACK;
3506 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3507 SPAGAIN;
3508
3509 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4004 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4005 SvREFCNT_dec (sv);
3510 } 4006 }
3511 4007
3512 { 4008 {
3513 struct coro *coro = SvSTATE_hv (hv); 4009 struct coro *coro = SvSTATE_hv (hv);
3514 4010
… …
3665} 4161}
3666 4162
3667MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4163MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3668 4164
3669void 4165void
3670_may_delete (SV *sem, int count, int extra_refs) 4166_may_delete (SV *sem, int count, unsigned int extra_refs)
3671 PPCODE: 4167 PPCODE:
3672{ 4168{
3673 AV *av = (AV *)SvRV (sem); 4169 AV *av = (AV *)SvRV (sem);
3674 4170
3675 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4171 if (SvREFCNT ((SV *)av) == 1 + extra_refs
… …
3786 { 4282 {
3787 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4283 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3788 coro_old_pp_sselect = 0; 4284 coro_old_pp_sselect = 0;
3789 } 4285 }
3790 4286
3791

Diff Legend

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