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.366 by root, Tue Jul 21 03:39:58 2009 UTC vs.
Revision 1.450 by root, Sun Jun 28 22:31:03 2015 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
… …
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "schmorp.h" 16#include "schmorp.h"
12 17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
13#include <stdio.h> 23#include <stdio.h>
14#include <errno.h> 24#include <errno.h>
15#include <assert.h> 25#include <assert.h>
16 26
17#ifdef WIN32 27#ifndef SVs_PADSTALE
28# define SVs_PADSTALE 0
29#endif
30
31#ifdef PadARRAY
32# define NEWPADAPI 1
33# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
34#else
35typedef AV PADNAMELIST;
36# if !PERL_VERSION_ATLEAST(5,8,0)
37typedef AV PADLIST;
38typedef AV PAD;
39# endif
40# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
41# define PadlistMAX(pl) AvFILLp (pl)
42# define PadlistNAMES(pl) (*PadlistARRAY (pl))
43# define PadARRAY AvARRAY
44# define PadMAX AvFILLp
45# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
46#endif
47#ifndef PadnamelistREFCNT
48# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
49#endif
50#ifndef PadnamelistREFCNT_dec
51# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
52#endif
53
54/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
55/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
56#if PERL_VERSION_ATLEAST(5,19,0)
57# define SVt_BIND SVt_IV
58#endif
59
60#if defined(_WIN32)
61# undef HAS_GETTIMEOFDAY
18# undef setjmp 62# undef setjmp
19# undef longjmp 63# undef longjmp
20# undef _exit 64# undef _exit
21# define setjmp _setjmp /* deep magic */ 65# define setjmp _setjmp /* deep magic */
22#else 66#else
23# include <inttypes.h> /* most portable stdint.h */ 67# include <inttypes.h> /* most portable stdint.h */
24#endif 68#endif
25 69
26#ifdef HAVE_MMAP
27# include <unistd.h>
28# include <sys/mman.h>
29# ifndef MAP_ANONYMOUS
30# ifdef MAP_ANON
31# define MAP_ANONYMOUS MAP_ANON
32# else
33# undef HAVE_MMAP
34# endif
35# endif
36# include <limits.h>
37# ifndef PAGESIZE
38# define PAGESIZE pagesize
39# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
40static long pagesize;
41# else
42# define BOOT_PAGESIZE (void)0
43# endif
44#else
45# define PAGESIZE 0
46# define BOOT_PAGESIZE (void)0
47#endif
48
49#if CORO_USE_VALGRIND
50# include <valgrind/valgrind.h>
51#endif
52
53/* the maximum number of idle cctx that will be pooled */ 70/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 71static int cctx_max_idle = 4;
55 72
56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 73#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57# undef CORO_STACKGUARD 74# define HAS_SCOPESTACK_NAME 1
58#endif
59
60#ifndef CORO_STACKGUARD
61# define CORO_STACKGUARD 0
62#endif 75#endif
63 76
64/* prefer perl internal functions over our own? */ 77/* prefer perl internal functions over our own? */
65#ifndef CORO_PREFER_PERL_FUNCTIONS 78#ifndef CORO_PREFER_PERL_FUNCTIONS
66# define CORO_PREFER_PERL_FUNCTIONS 0 79# define CORO_PREFER_PERL_FUNCTIONS 0
… …
76# define STACKLEVEL ((void *)&stacklevel) 89# define STACKLEVEL ((void *)&stacklevel)
77#endif 90#endif
78 91
79#define IN_DESTRUCT PL_dirty 92#define IN_DESTRUCT PL_dirty
80 93
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" 94#include "CoroAPI.h"
97#define GCoroAPI (&coroapi) /* very sneaky */ 95#define GCoroAPI (&coroapi) /* very sneaky */
98 96
99#ifdef USE_ITHREADS 97#ifdef USE_ITHREADS
100# if CORO_PTHREAD 98# if CORO_PTHREAD
… …
116static void (*u2time)(pTHX_ UV ret[2]); 114static void (*u2time)(pTHX_ UV ret[2]);
117 115
118/* we hijack an hopefully unused CV flag for our purposes */ 116/* we hijack an hopefully unused CV flag for our purposes */
119#define CVf_SLF 0x4000 117#define CVf_SLF 0x4000
120static OP *pp_slf (pTHX); 118static OP *pp_slf (pTHX);
119static void slf_destroy (pTHX_ struct coro *coro);
121 120
122static U32 cctx_gen; 121static U32 cctx_gen;
123static size_t cctx_stacksize = CORO_STACKSIZE; 122static size_t cctx_stacksize = CORO_STACKSIZE;
124static struct CoroAPI coroapi; 123static struct CoroAPI coroapi;
125static AV *main_mainstack; /* used to differentiate between $main and others */ 124static AV *main_mainstack; /* used to differentiate between $main and others */
… …
142static SV *sv_pool_size; 141static SV *sv_pool_size;
143static SV *sv_async_pool_idle; /* description string */ 142static SV *sv_async_pool_idle; /* description string */
144static AV *av_async_pool; /* idle pool */ 143static AV *av_async_pool; /* idle pool */
145static SV *sv_Coro; /* class string */ 144static SV *sv_Coro; /* class string */
146static CV *cv_pool_handler; 145static CV *cv_pool_handler;
147static CV *cv_coro_state_new;
148 146
149/* Coro::AnyEvent */ 147/* Coro::AnyEvent */
150static SV *sv_activity; 148static SV *sv_activity;
151 149
152/* enable processtime/realtime profiling */ 150/* enable processtime/realtime profiling */
… …
156static char times_valid; 154static char times_valid;
157 155
158static struct coro_cctx *cctx_first; 156static struct coro_cctx *cctx_first;
159static int cctx_count, cctx_idle; 157static int cctx_count, cctx_idle;
160 158
161enum { 159enum
160{
162 CC_MAPPED = 0x01, 161 CC_MAPPED = 0x01,
163 CC_NOREUSE = 0x02, /* throw this away after tracing */ 162 CC_NOREUSE = 0x02, /* throw this away after tracing */
164 CC_TRACE = 0x04, 163 CC_TRACE = 0x04,
165 CC_TRACE_SUB = 0x08, /* trace sub calls */ 164 CC_TRACE_SUB = 0x08, /* trace sub calls */
166 CC_TRACE_LINE = 0x10, /* trace each statement */ 165 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
171typedef struct coro_cctx 170typedef struct coro_cctx
172{ 171{
173 struct coro_cctx *next; 172 struct coro_cctx *next;
174 173
175 /* the stack */ 174 /* the stack */
176 void *sptr; 175 struct coro_stack stack;
177 size_t ssize;
178 176
179 /* cpu state */ 177 /* cpu state */
180 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 178 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
179#ifndef NDEBUG
181 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 180 JMPENV *idle_te; /* same as idle_sp, but for top_env */
181#endif
182 JMPENV *top_env; 182 JMPENV *top_env;
183 coro_context cctx; 183 coro_context cctx;
184 184
185 U32 gen; 185 U32 gen;
186#if CORO_USE_VALGRIND 186#if CORO_USE_VALGRIND
187 int valgrind_id; 187 int valgrind_id;
188#endif 188#endif
189 unsigned char flags; 189 unsigned char flags;
190} coro_cctx; 190} coro_cctx;
191 191
192coro_cctx *cctx_current; /* the currently running cctx */ 192static coro_cctx *cctx_current; /* the currently running cctx */
193 193
194/*****************************************************************************/ 194/*****************************************************************************/
195 195
196static MGVTBL coro_state_vtbl;
197
196enum { 198enum
199{
197 CF_RUNNING = 0x0001, /* coroutine is running */ 200 CF_RUNNING = 0x0001, /* coroutine is running */
198 CF_READY = 0x0002, /* coroutine is ready */ 201 CF_READY = 0x0002, /* coroutine is ready */
199 CF_NEW = 0x0004, /* has never been switched to */ 202 CF_NEW = 0x0004, /* has never been switched to */
200 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 203 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
201 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 204 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
205 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
202}; 206};
203 207
204/* the structure where most of the perl state is stored, overlaid on the cxstack */ 208/* the structure where most of the perl state is stored, overlaid on the cxstack */
205typedef struct 209typedef struct
206{ 210{
207 SV *defsv;
208 AV *defav;
209 SV *errsv;
210 SV *irsgv;
211 HV *hinthv;
212#define VAR(name,type) type name; 211 #define VARx(name,expr,type) type name;
213# include "state.h" 212 #include "state.h"
214#undef VAR
215} perl_slots; 213} perl_slots;
216 214
215/* 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)) 216#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
218 217
219/* this is a structure representing a perl-level coroutine */ 218/* this is a structure representing a perl-level coroutine */
220struct coro { 219struct coro
220{
221 /* the C coroutine allocated to this perl coroutine, if any */ 221 /* the C coroutine allocated to this perl coroutine, if any */
222 coro_cctx *cctx; 222 coro_cctx *cctx;
223 223
224 /* ready queue */ 224 /* ready queue */
225 struct coro *next_ready; 225 struct coro *next_ready;
… …
227 /* state data */ 227 /* state data */
228 struct CoroSLF slf_frame; /* saved slf frame */ 228 struct CoroSLF slf_frame; /* saved slf frame */
229 AV *mainstack; 229 AV *mainstack;
230 perl_slots *slot; /* basically the saved sp */ 230 perl_slots *slot; /* basically the saved sp */
231 231
232 CV *startcv; /* the CV to execute */ 232 CV *startcv; /* the CV to execute */
233 AV *args; /* data associated with this coroutine (initial args) */ 233 AV *args; /* data associated with this coroutine (initial args) */
234 int refcnt; /* coroutines are refcounted, yes */
235 int flags; /* CF_ flags */ 234 int flags; /* CF_ flags */
236 HV *hv; /* the perl hash associated with this coro, if any */ 235 HV *hv; /* the perl hash associated with this coro, if any */
237 void (*on_destroy)(pTHX_ struct coro *coro);
238 236
239 /* statistics */ 237 /* statistics */
240 int usecount; /* number of transfers to this coro */ 238 int usecount; /* number of transfers to this coro */
241 239
242 /* coro process data */ 240 /* coro process data */
243 int prio; 241 int prio;
244 SV *except; /* exception to be thrown */ 242 SV *except; /* exception to be thrown */
245 SV *rouse_cb; 243 SV *rouse_cb; /* last rouse callback */
244 AV *on_destroy; /* callbacks or coros to notify on destroy */
245 AV *status; /* the exit status list */
246 246
247 /* async_pool */ 247 /* async_pool */
248 SV *saved_deffh; 248 SV *saved_deffh;
249 SV *invoke_cb; 249 SV *invoke_cb;
250 AV *invoke_av; 250 AV *invoke_av;
251 251
252 /* on_enter/on_leave */ 252 /* on_enter/on_leave */
253 AV *on_enter; 253 AV *on_enter; AV *on_enter_xs;
254 AV *on_leave; 254 AV *on_leave; AV *on_leave_xs;
255
256 /* swap_sv */
257 AV *swap_sv;
255 258
256 /* times */ 259 /* times */
257 coro_ts t_cpu, t_real; 260 coro_ts t_cpu, t_real;
258 261
259 /* linked list */ 262 /* linked list */
… …
263typedef struct coro *Coro__State; 266typedef struct coro *Coro__State;
264typedef struct coro *Coro__State_or_hashref; 267typedef struct coro *Coro__State_or_hashref;
265 268
266/* the following variables are effectively part of the perl context */ 269/* the following variables are effectively part of the perl context */
267/* and get copied between struct coro and these variables */ 270/* and get copied between struct coro and these variables */
268/* the mainr easonw e don't support windows process emulation */ 271/* the main reason we don't support windows process emulation */
269static struct CoroSLF slf_frame; /* the current slf frame */ 272static struct CoroSLF slf_frame; /* the current slf frame */
270 273
271/** Coro ********************************************************************/ 274/** Coro ********************************************************************/
272 275
273#define CORO_PRIO_MAX 3 276#define CORO_PRIO_MAX 3
… …
279 282
280/* for Coro.pm */ 283/* for Coro.pm */
281static SV *coro_current; 284static SV *coro_current;
282static SV *coro_readyhook; 285static SV *coro_readyhook;
283static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 286static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
284static CV *cv_coro_run, *cv_coro_terminate; 287static CV *cv_coro_run;
285static struct coro *coro_first; 288static struct coro *coro_first;
286#define coro_nready coroapi.nready 289#define coro_nready coroapi.nready
287 290
291/** JIT *********************************************************************/
292
293#if CORO_JIT
294 /* APPLE doesn't have mmap though */
295 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
296 #ifndef CORO_JIT_TYPE
297 #if ECB_AMD64 && CORO_JIT_UNIXY
298 #define CORO_JIT_TYPE "amd64-unix"
299 #elif __i386 && CORO_JIT_UNIXY
300 #define CORO_JIT_TYPE "x86-unix"
301 #endif
302 #endif
303#endif
304
305#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
306 #undef CORO_JIT
307#endif
308
309#if CORO_JIT
310 typedef void (*load_save_perl_slots_type)(perl_slots *);
311 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
312#endif
313
288/** Coro::Select ************************************************************/ 314/** Coro::Select ************************************************************/
289 315
290static OP *(*coro_old_pp_sselect) (pTHX); 316static OP *(*coro_old_pp_sselect) (pTHX);
291static SV *coro_select_select; 317static SV *coro_select_select;
292 318
293/* horrible hack, but if it works... */ 319/* horrible hack, but if it works... */
294static OP * 320static OP *
295coro_pp_sselect (aTHX) 321coro_pp_sselect (pTHX)
296{ 322{
297 dSP; 323 dSP;
298 PUSHMARK (SP - 4); /* fake argument list */ 324 PUSHMARK (SP - 4); /* fake argument list */
299 XPUSHs (coro_select_select); 325 XPUSHs (coro_select_select);
300 PUTBACK; 326 PUTBACK;
… …
303 PL_op->op_flags |= OPf_STACKED; 329 PL_op->op_flags |= OPf_STACKED;
304 PL_op->op_private = 0; 330 PL_op->op_private = 0;
305 return PL_ppaddr [OP_ENTERSUB](aTHX); 331 return PL_ppaddr [OP_ENTERSUB](aTHX);
306} 332}
307 333
334/** time stuff **************************************************************/
335
336#ifdef HAS_GETTIMEOFDAY
337
338ecb_inline void
339coro_u2time (pTHX_ UV ret[2])
340{
341 struct timeval tv;
342 gettimeofday (&tv, 0);
343
344 ret [0] = tv.tv_sec;
345 ret [1] = tv.tv_usec;
346}
347
348ecb_inline double
349coro_nvtime (void)
350{
351 struct timeval tv;
352 gettimeofday (&tv, 0);
353
354 return tv.tv_sec + tv.tv_usec * 1e-6;
355}
356
357ecb_inline void
358time_init (pTHX)
359{
360 nvtime = coro_nvtime;
361 u2time = coro_u2time;
362}
363
364#else
365
366ecb_inline void
367time_init (pTHX)
368{
369 SV **svp;
370
371 require_pv ("Time/HiRes.pm");
372
373 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
374
375 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
376 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
377
378 nvtime = INT2PTR (double (*)(), SvIV (*svp));
379
380 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
381 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
382}
383
384#endif
385
308/** lowlevel stuff **********************************************************/ 386/** lowlevel stuff **********************************************************/
309 387
310static SV * 388static SV * ecb_noinline
311coro_get_sv (pTHX_ const char *name, int create) 389coro_get_sv (pTHX_ const char *name, int create)
312{ 390{
313#if PERL_VERSION_ATLEAST (5,10,0) 391#if PERL_VERSION_ATLEAST (5,10,0)
314 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 392 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
315 get_sv (name, create); 393 get_sv (name, create);
316#endif 394#endif
317 return get_sv (name, create); 395 return get_sv (name, create);
318} 396}
319 397
320static AV * 398static AV * ecb_noinline
321coro_get_av (pTHX_ const char *name, int create) 399coro_get_av (pTHX_ const char *name, int create)
322{ 400{
323#if PERL_VERSION_ATLEAST (5,10,0) 401#if PERL_VERSION_ATLEAST (5,10,0)
324 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 402 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
325 get_av (name, create); 403 get_av (name, create);
326#endif 404#endif
327 return get_av (name, create); 405 return get_av (name, create);
328} 406}
329 407
330static HV * 408static HV * ecb_noinline
331coro_get_hv (pTHX_ const char *name, int create) 409coro_get_hv (pTHX_ const char *name, int create)
332{ 410{
333#if PERL_VERSION_ATLEAST (5,10,0) 411#if PERL_VERSION_ATLEAST (5,10,0)
334 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 412 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
335 get_hv (name, create); 413 get_hv (name, create);
336#endif 414#endif
337 return get_hv (name, create); 415 return get_hv (name, create);
338} 416}
339 417
340INLINE void 418ecb_inline void
341coro_times_update () 419coro_times_update (void)
342{ 420{
343#ifdef coro_clock_gettime 421#ifdef coro_clock_gettime
344 struct timespec ts; 422 struct timespec ts;
345 423
346 ts.tv_sec = ts.tv_nsec = 0; 424 ts.tv_sec = ts.tv_nsec = 0;
… …
358 time_real [0] = tv [0]; 436 time_real [0] = tv [0];
359 time_real [1] = tv [1] * 1000; 437 time_real [1] = tv [1] * 1000;
360#endif 438#endif
361} 439}
362 440
363INLINE void 441ecb_inline void
364coro_times_add (struct coro *c) 442coro_times_add (struct coro *c)
365{ 443{
366 c->t_real [1] += time_real [1]; 444 c->t_real [1] += time_real [1];
367 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 445 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
368 c->t_real [0] += time_real [0]; 446 c->t_real [0] += time_real [0];
… …
370 c->t_cpu [1] += time_cpu [1]; 448 c->t_cpu [1] += time_cpu [1];
371 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 449 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
372 c->t_cpu [0] += time_cpu [0]; 450 c->t_cpu [0] += time_cpu [0];
373} 451}
374 452
375INLINE void 453ecb_inline void
376coro_times_sub (struct coro *c) 454coro_times_sub (struct coro *c)
377{ 455{
378 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 456 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]; 457 c->t_real [1] -= time_real [1];
380 c->t_real [0] -= time_real [0]; 458 c->t_real [0] -= time_real [0];
… …
388/* magic glue */ 466/* magic glue */
389 467
390#define CORO_MAGIC_type_cv 26 468#define CORO_MAGIC_type_cv 26
391#define CORO_MAGIC_type_state PERL_MAGIC_ext 469#define CORO_MAGIC_type_state PERL_MAGIC_ext
392 470
393#define CORO_MAGIC_NN(sv, type) \ 471#define CORO_MAGIC_NN(sv, type) \
394 (expect_true (SvMAGIC (sv)->mg_type == type) \ 472 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
395 ? SvMAGIC (sv) \ 473 ? SvMAGIC (sv) \
396 : mg_find (sv, type)) 474 : mg_find (sv, type))
397 475
398#define CORO_MAGIC(sv, type) \ 476#define CORO_MAGIC(sv, type) \
399 (expect_true (SvMAGIC (sv)) \ 477 (ecb_expect_true (SvMAGIC (sv)) \
400 ? CORO_MAGIC_NN (sv, type) \ 478 ? CORO_MAGIC_NN (sv, type) \
401 : 0) 479 : 0)
402 480
403#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 481#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) 482#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
405 483
406INLINE struct coro * 484ecb_inline MAGIC *
407SvSTATE_ (pTHX_ SV *coro) 485SvSTATEhv_p (pTHX_ SV *coro)
408{ 486{
409 HV *stash;
410 MAGIC *mg; 487 MAGIC *mg;
411 488
489 if (ecb_expect_true (
490 SvTYPE (coro) == SVt_PVHV
491 && (mg = CORO_MAGIC_state (coro))
492 && mg->mg_virtual == &coro_state_vtbl
493 ))
494 return mg;
495
496 return 0;
497}
498
499ecb_inline struct coro *
500SvSTATE_ (pTHX_ SV *coro_sv)
501{
502 MAGIC *mg;
503
412 if (SvROK (coro)) 504 if (SvROK (coro_sv))
413 coro = SvRV (coro); 505 coro_sv = SvRV (coro_sv);
414 506
415 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 507 mg = SvSTATEhv_p (aTHX_ coro_sv);
508 if (!mg)
416 croak ("Coro::State object required"); 509 croak ("Coro::State object required");
417 510
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; 511 return (struct coro *)mg->mg_ptr;
428} 512}
429 513
430#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 514#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
431 515
… …
434#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 518#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
435 519
436/*****************************************************************************/ 520/*****************************************************************************/
437/* padlist management and caching */ 521/* padlist management and caching */
438 522
439static AV * 523ecb_inline PADLIST *
440coro_derive_padlist (pTHX_ CV *cv) 524coro_derive_padlist (pTHX_ CV *cv)
441{ 525{
442 AV *padlist = CvPADLIST (cv); 526 PADLIST *padlist = CvPADLIST (cv);
443 AV *newpadlist, *newpad; 527 PADLIST *newpadlist;
528 PADNAMELIST *padnames;
529 PAD *newpad;
530 PADOFFSET off = PadlistMAX (padlist) + 1;
444 531
445 newpadlist = newAV (); 532#if NEWPADAPI
533
534 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
535 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
536 while (!PadlistARRAY (padlist)[off - 1])
537 --off;
538
539 Perl_pad_push (aTHX_ padlist, off);
540
541 newpad = PadlistARRAY (padlist)[off];
542 PadlistARRAY (padlist)[off] = 0;
543
544#else
545
546#if PERL_VERSION_ATLEAST (5,10,0)
547 Perl_pad_push (aTHX_ padlist, off);
548#else
549 Perl_pad_push (aTHX_ padlist, off, 1);
550#endif
551
552 newpad = PadlistARRAY (padlist)[off];
553 PadlistMAX (padlist) = off - 1;
554
555#endif
556
557 newPADLIST (newpadlist);
558#if !PERL_VERSION_ATLEAST(5,15,3)
559 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
446 AvREAL_off (newpadlist); 560 AvREAL_off (newpadlist);
447#if PERL_VERSION_ATLEAST (5,10,0)
448 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
449#else
450 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
451#endif 561#endif
452 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
453 --AvFILLp (padlist);
454 562
455 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 563 /* Already extended to 2 elements by newPADLIST. */
456 av_store (newpadlist, 1, (SV *)newpad); 564 PadlistMAX (newpadlist) = 1;
565
566 padnames = PadlistNAMES (padlist);
567 ++PadnamelistREFCNT (padnames);
568 PadlistNAMES (newpadlist) = padnames;
569
570 PadlistARRAY (newpadlist)[1] = newpad;
457 571
458 return newpadlist; 572 return newpadlist;
459} 573}
460 574
461static void 575ecb_inline void
462free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
463{ 577{
464 /* may be during global destruction */ 578 /* may be during global destruction */
465 if (!IN_DESTRUCT) 579 if (!IN_DESTRUCT)
466 { 580 {
467 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
468 582
469 while (i > 0) /* special-case index 0 */ 583 while (i > 0) /* special-case index 0 */
470 { 584 {
471 /* we try to be extra-careful here */ 585 /* we try to be extra-careful here */
472 AV *av = (AV *)AvARRAY (padlist)[i--]; 586 PAD *pad = PadlistARRAY (padlist)[i--];
473 I32 j = AvFILLp (av);
474 587
588 if (pad)
589 {
590 I32 j = PadMAX (pad);
591
475 while (j >= 0) 592 while (j >= 0)
476 SvREFCNT_dec (AvARRAY (av)[j--]); 593 SvREFCNT_dec (PadARRAY (pad)[j--]);
477 594
478 AvFILLp (av) = -1; 595 PadMAX (pad) = -1;
479 SvREFCNT_dec (av); 596 SvREFCNT_dec (pad);
597 }
480 } 598 }
481 599
482 SvREFCNT_dec (AvARRAY (padlist)[0]); 600 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
483 601
602#if NEWPADAPI
603 Safefree (PadlistARRAY (padlist));
604 Safefree (padlist);
605#else
484 AvFILLp (padlist) = -1; 606 AvFILLp (padlist) = -1;
607 AvREAL_off (padlist);
485 SvREFCNT_dec ((SV*)padlist); 608 SvREFCNT_dec ((SV*)padlist);
609#endif
486 } 610 }
487} 611}
488 612
489static int 613static int
490coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 614coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
491{ 615{
492 AV *padlist; 616 PADLIST *padlist;
493 AV *av = (AV *)mg->mg_obj; 617 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
618 size_t len = *(size_t *)mg->mg_ptr;
494 619
495 /* perl manages to free our internal AV and _then_ call us */ 620 /* perl manages to free our internal AV and _then_ call us */
496 if (IN_DESTRUCT) 621 if (IN_DESTRUCT)
497 return 0; 622 return 0;
498 623
499 /* casting is fun. */ 624 while (len--)
500 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
501 free_padlist (aTHX_ padlist); 625 free_padlist (aTHX_ padlists[len]);
502
503 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
504 626
505 return 0; 627 return 0;
506} 628}
507 629
508static MGVTBL coro_cv_vtbl = { 630static MGVTBL coro_cv_vtbl = {
509 0, 0, 0, 0, 631 0, 0, 0, 0,
510 coro_cv_free 632 coro_cv_free
511}; 633};
512 634
513/* the next two functions merely cache the padlists */ 635/* the next two functions merely cache the padlists */
514static void 636ecb_inline void
515get_padlist (pTHX_ CV *cv) 637get_padlist (pTHX_ CV *cv)
516{ 638{
517 MAGIC *mg = CORO_MAGIC_cv (cv); 639 MAGIC *mg = CORO_MAGIC_cv (cv);
518 AV *av; 640 size_t *lenp;
519 641
520 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 642 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
521 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 643 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
522 else 644 else
523 { 645 {
524#if CORO_PREFER_PERL_FUNCTIONS 646#if CORO_PREFER_PERL_FUNCTIONS
525 /* this is probably cleaner? but also slower! */ 647 /* this is probably cleaner? but also slower! */
526 /* in practise, it seems to be less stable */ 648 /* in practise, it seems to be less stable */
… …
532 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 654 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
533#endif 655#endif
534 } 656 }
535} 657}
536 658
537static void 659ecb_inline void
538put_padlist (pTHX_ CV *cv) 660put_padlist (pTHX_ CV *cv)
539{ 661{
540 MAGIC *mg = CORO_MAGIC_cv (cv); 662 MAGIC *mg = CORO_MAGIC_cv (cv);
541 AV *av;
542 663
543 if (expect_false (!mg)) 664 if (ecb_expect_false (!mg))
665 {
544 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 666 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
667 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
668 mg->mg_len = 1; /* so mg_free frees mg_ptr */
669 }
670 else
671 Renew (mg->mg_ptr,
672 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
673 char);
545 674
546 av = (AV *)mg->mg_obj; 675 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
547
548 if (expect_false (AvFILLp (av) >= AvMAX (av)))
549 av_extend (av, AvFILLp (av) + 1);
550
551 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
552} 676}
553 677
554/** load & save, init *******************************************************/ 678/** load & save, init *******************************************************/
679
680ecb_inline void
681swap_sv (SV *a, SV *b)
682{
683 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
684 SV tmp;
685
686 /* swap sv_any */
687 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
688
689 /* swap sv_flags */
690 SvFLAGS (&tmp) = SvFLAGS (a);
691 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
692 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
693
694#if PERL_VERSION_ATLEAST (5,10,0)
695 /* perl 5.10 and later complicates this _quite_ a bit, but it also
696 * is much faster, so no quarrels here. alternatively, we could
697 * sv_upgrade to avoid this.
698 */
699 {
700 /* swap sv_u */
701 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
702
703 /* if SvANY points to the head, we need to adjust the pointers,
704 * as the pointer for a still points to b, and maybe vice versa.
705 */
706 #define svany_in_head(type) \
707 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
708
709 if (svany_in_head (SvTYPE (a)))
710 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
711
712 if (svany_in_head (SvTYPE (b)))
713 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
714 }
715#endif
716}
717
718/* swap sv heads, at least logically */
719static void
720swap_svs (pTHX_ Coro__State c)
721{
722 int i;
723
724 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
725 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
726}
727
728#define SWAP_SVS(coro) \
729 if (ecb_expect_false ((coro)->swap_sv)) \
730 swap_svs (aTHX_ (coro))
555 731
556static void 732static void
557on_enterleave_call (pTHX_ SV *cb); 733on_enterleave_call (pTHX_ SV *cb);
558 734
559static void 735static void
… …
562 perl_slots *slot = c->slot; 738 perl_slots *slot = c->slot;
563 c->slot = 0; 739 c->slot = 0;
564 740
565 PL_mainstack = c->mainstack; 741 PL_mainstack = c->mainstack;
566 742
567 GvSV (PL_defgv) = slot->defsv; 743#if CORO_JIT
568 GvAV (PL_defgv) = slot->defav; 744 load_perl_slots (slot);
569 GvSV (PL_errgv) = slot->errsv; 745#else
570 GvSV (irsgv) = slot->irsgv;
571 GvHV (PL_hintgv) = slot->hinthv;
572
573 #define VAR(name,type) PL_ ## name = slot->name; 746 #define VARx(name,expr,type) expr = slot->name;
574 # include "state.h" 747 #include "state.h"
575 #undef VAR 748#endif
576 749
577 { 750 {
578 dSP; 751 dSP;
579 752
580 CV *cv; 753 CV *cv;
581 754
582 /* now do the ugly restore mess */ 755 /* now do the ugly restore mess */
583 while (expect_true (cv = (CV *)POPs)) 756 while (ecb_expect_true (cv = (CV *)POPs))
584 { 757 {
585 put_padlist (aTHX_ cv); /* mark this padlist as available */ 758 put_padlist (aTHX_ cv); /* mark this padlist as available */
586 CvDEPTH (cv) = PTR2IV (POPs); 759 CvDEPTH (cv) = PTR2IV (POPs);
587 CvPADLIST (cv) = (AV *)POPs; 760 CvPADLIST (cv) = (PADLIST *)POPs;
588 } 761 }
589 762
590 PUTBACK; 763 PUTBACK;
591 } 764 }
592 765
593 slf_frame = c->slf_frame; 766 slf_frame = c->slf_frame;
594 CORO_THROW = c->except; 767 CORO_THROW = c->except;
595 768
596 if (expect_false (enable_times)) 769 if (ecb_expect_false (enable_times))
597 { 770 {
598 if (expect_false (!times_valid)) 771 if (ecb_expect_false (!times_valid))
599 coro_times_update (); 772 coro_times_update ();
600 773
601 coro_times_sub (c); 774 coro_times_sub (c);
602 } 775 }
603 776
604 if (expect_false (c->on_enter)) 777 if (ecb_expect_false (c->on_enter))
605 { 778 {
606 int i; 779 int i;
607 780
608 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 781 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 782 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
610 } 783 }
784
785 if (ecb_expect_false (c->on_enter_xs))
786 {
787 int i;
788
789 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
790 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
791 }
792
793 SWAP_SVS (c);
611} 794}
612 795
613static void 796static void
614save_perl (pTHX_ Coro__State c) 797save_perl (pTHX_ Coro__State c)
615{ 798{
799 SWAP_SVS (c);
800
801 if (ecb_expect_false (c->on_leave_xs))
802 {
803 int i;
804
805 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
806 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
807 }
808
616 if (expect_false (c->on_leave)) 809 if (ecb_expect_false (c->on_leave))
617 { 810 {
618 int i; 811 int i;
619 812
620 for (i = AvFILLp (c->on_leave); i >= 0; --i) 813 for (i = AvFILLp (c->on_leave); i >= 0; --i)
621 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 814 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
622 } 815 }
623 816
624 times_valid = 0; 817 times_valid = 0;
625 818
626 if (expect_false (enable_times)) 819 if (ecb_expect_false (enable_times))
627 { 820 {
628 coro_times_update (); times_valid = 1; 821 coro_times_update (); times_valid = 1;
629 coro_times_add (c); 822 coro_times_add (c);
630 } 823 }
631 824
… …
645 838
646 XPUSHs (Nullsv); 839 XPUSHs (Nullsv);
647 /* this loop was inspired by pp_caller */ 840 /* this loop was inspired by pp_caller */
648 for (;;) 841 for (;;)
649 { 842 {
650 while (expect_true (cxix >= 0)) 843 while (ecb_expect_true (cxix >= 0))
651 { 844 {
652 PERL_CONTEXT *cx = &ccstk[cxix--]; 845 PERL_CONTEXT *cx = &ccstk[cxix--];
653 846
654 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 847 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
655 { 848 {
656 CV *cv = cx->blk_sub.cv; 849 CV *cv = cx->blk_sub.cv;
657 850
658 if (expect_true (CvDEPTH (cv))) 851 if (ecb_expect_true (CvDEPTH (cv)))
659 { 852 {
660 EXTEND (SP, 3); 853 EXTEND (SP, 3);
661 PUSHs ((SV *)CvPADLIST (cv)); 854 PUSHs ((SV *)CvPADLIST (cv));
662 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 855 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
663 PUSHs ((SV *)cv); 856 PUSHs ((SV *)cv);
… …
666 get_padlist (aTHX_ cv); 859 get_padlist (aTHX_ cv);
667 } 860 }
668 } 861 }
669 } 862 }
670 863
671 if (expect_true (top_si->si_type == PERLSI_MAIN)) 864 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
672 break; 865 break;
673 866
674 top_si = top_si->si_prev; 867 top_si = top_si->si_prev;
675 ccstk = top_si->si_cxstack; 868 ccstk = top_si->si_cxstack;
676 cxix = top_si->si_cxix; 869 cxix = top_si->si_cxix;
… …
678 871
679 PUTBACK; 872 PUTBACK;
680 } 873 }
681 874
682 /* allocate some space on the context stack for our purposes */ 875 /* allocate some space on the context stack for our purposes */
683 /* we manually unroll here, as usually 2 slots is enough */ 876 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 { 877 {
688 unsigned int i; 878 unsigned int i;
879
689 for (i = 3; i < SLOT_COUNT; ++i) 880 for (i = 0; i < SLOT_COUNT; ++i)
690 CXINC; 881 CXINC;
691 } 882
692 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 883 cxstack_ix -= SLOT_COUNT; /* undo allocation */
884 }
693 885
694 c->mainstack = PL_mainstack; 886 c->mainstack = PL_mainstack;
695 887
696 { 888 {
697 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 889 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
698 890
699 slot->defav = GvAV (PL_defgv); 891#if CORO_JIT
700 slot->defsv = DEFSV; 892 save_perl_slots (slot);
701 slot->errsv = ERRSV; 893#else
702 slot->irsgv = GvSV (irsgv);
703 slot->hinthv = GvHV (PL_hintgv);
704
705 #define VAR(name,type) slot->name = PL_ ## name; 894 #define VARx(name,expr,type) slot->name = expr;
706 # include "state.h" 895 #include "state.h"
707 #undef VAR 896#endif
708 } 897 }
709} 898}
710 899
711/* 900/*
712 * allocate various perl stacks. This is almost an exact copy 901 * allocate various perl stacks. This is almost an exact copy
… …
718# define coro_init_stacks(thx) init_stacks () 907# define coro_init_stacks(thx) init_stacks ()
719#else 908#else
720static void 909static void
721coro_init_stacks (pTHX) 910coro_init_stacks (pTHX)
722{ 911{
723 PL_curstackinfo = new_stackinfo(32, 8); 912 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; 913 PL_curstackinfo->si_type = PERLSI_MAIN;
725 PL_curstack = PL_curstackinfo->si_stack; 914 PL_curstack = PL_curstackinfo->si_stack;
726 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 915 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
727 916
728 PL_stack_base = AvARRAY(PL_curstack); 917 PL_stack_base = AvARRAY(PL_curstack);
… …
743#endif 932#endif
744 933
745 New(54,PL_scopestack,8,I32); 934 New(54,PL_scopestack,8,I32);
746 PL_scopestack_ix = 0; 935 PL_scopestack_ix = 0;
747 PL_scopestack_max = 8; 936 PL_scopestack_max = 8;
937#if HAS_SCOPESTACK_NAME
938 New(54,PL_scopestack_name,8,const char*);
939#endif
748 940
749 New(54,PL_savestack,24,ANY); 941 New(54,PL_savestack,24,ANY);
750 PL_savestack_ix = 0; 942 PL_savestack_ix = 0;
751 PL_savestack_max = 24; 943 PL_savestack_max = 24;
752 944
… …
780 } 972 }
781 973
782 Safefree (PL_tmps_stack); 974 Safefree (PL_tmps_stack);
783 Safefree (PL_markstack); 975 Safefree (PL_markstack);
784 Safefree (PL_scopestack); 976 Safefree (PL_scopestack);
977#if HAS_SCOPESTACK_NAME
978 Safefree (PL_scopestack_name);
979#endif
785 Safefree (PL_savestack); 980 Safefree (PL_savestack);
786#if !PERL_VERSION_ATLEAST (5,10,0) 981#if !PERL_VERSION_ATLEAST (5,10,0)
787 Safefree (PL_retstack); 982 Safefree (PL_retstack);
788#endif 983#endif
789} 984}
… …
835#endif 1030#endif
836 1031
837/* 1032/*
838 * This overrides the default magic get method of %SIG elements. 1033 * 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 1034 * 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 1035 * and instead of trying to save and restore the hash elements (extremely slow),
841 * readback here. 1036 * we just provide our own readback here.
842 */ 1037 */
843static int 1038static int ecb_cold
844coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1039coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
845{ 1040{
846 const char *s = MgPV_nolen_const (mg); 1041 const char *s = MgPV_nolen_const (mg);
847 1042
848 if (*s == '_') 1043 if (*s == '_')
849 { 1044 {
850 SV **svp = 0; 1045 SV **svp = 0;
851 1046
852 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1047 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
853 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1048 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
854 1049
855 if (svp) 1050 if (svp)
856 { 1051 {
857 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1052 SV *ssv;
1053
1054 if (!*svp)
1055 ssv = &PL_sv_undef;
1056 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1057 ssv = sv_2mortal (newRV_inc (*svp));
1058 else
1059 ssv = *svp;
1060
1061 sv_setsv (sv, ssv);
858 return 0; 1062 return 0;
859 } 1063 }
860 } 1064 }
861 1065
862 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1066 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
863} 1067}
864 1068
865static int 1069static int ecb_cold
866coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1070coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
867{ 1071{
868 const char *s = MgPV_nolen_const (mg); 1072 const char *s = MgPV_nolen_const (mg);
869 1073
870 if (*s == '_') 1074 if (*s == '_')
… …
884 } 1088 }
885 1089
886 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1090 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
887} 1091}
888 1092
889static int 1093static int ecb_cold
890coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1094coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
891{ 1095{
892 const char *s = MgPV_nolen_const (mg); 1096 const char *s = MgPV_nolen_const (mg);
893 1097
894 if (*s == '_') 1098 if (*s == '_')
… …
927slf_check_repeat (pTHX_ struct CoroSLF *frame) 1131slf_check_repeat (pTHX_ struct CoroSLF *frame)
928{ 1132{
929 return 1; 1133 return 1;
930} 1134}
931 1135
932static UNOP coro_setup_op; 1136static UNOP init_perl_op;
933 1137
934static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1138ecb_noinline static void /* noinline to keep it out of the transfer fast path */
935coro_setup (pTHX_ struct coro *coro) 1139init_perl (pTHX_ struct coro *coro)
936{ 1140{
937 /* 1141 /*
938 * emulate part of the perl startup here. 1142 * emulate part of the perl startup here.
939 */ 1143 */
940 coro_init_stacks (aTHX); 1144 coro_init_stacks (aTHX);
… …
947 PL_comppad_name_fill = 0; 1151 PL_comppad_name_fill = 0;
948 PL_comppad_name_floor = 0; 1152 PL_comppad_name_floor = 0;
949 PL_curpm = 0; 1153 PL_curpm = 0;
950 PL_curpad = 0; 1154 PL_curpad = 0;
951 PL_localizing = 0; 1155 PL_localizing = 0;
952 PL_dirty = 0;
953 PL_restartop = 0; 1156 PL_restartop = 0;
954#if PERL_VERSION_ATLEAST (5,10,0) 1157#if PERL_VERSION_ATLEAST (5,10,0)
955 PL_parser = 0; 1158 PL_parser = 0;
956#endif 1159#endif
957 PL_hints = 0; 1160 PL_hints = 0;
958 1161
959 /* recreate the die/warn hooks */ 1162 /* recreate the die/warn hooks */
960 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1163 PL_diehook = SvREFCNT_inc (rv_diehook);
961 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1164 PL_warnhook = SvREFCNT_inc (rv_warnhook);
962 1165
963 GvSV (PL_defgv) = newSV (0); 1166 GvSV (PL_defgv) = newSV (0);
964 GvAV (PL_defgv) = coro->args; coro->args = 0; 1167 GvAV (PL_defgv) = coro->args; coro->args = 0;
965 GvSV (PL_errgv) = newSV (0); 1168 GvSV (PL_errgv) = newSV (0);
966 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1169 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
967 GvHV (PL_hintgv) = 0; 1170 GvHV (PL_hintgv) = newHV ();
1171#if PERL_VERSION_ATLEAST (5,10,0)
1172 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1173#endif
968 PL_rs = newSVsv (GvSV (irsgv)); 1174 PL_rs = newSVsv (GvSV (irsgv));
969 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1175 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
970 1176
971 { 1177 {
972 dSP; 1178 dSP;
… …
987 /* this newly created coroutine might be run on an existing cctx which most 1193 /* 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. 1194 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
989 */ 1195 */
990 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1196 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 */ 1197 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1198 slf_frame.destroy = 0;
992 1199
993 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1200 /* 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; 1201 init_perl_op.op_next = PL_op;
995 coro_setup_op.op_type = OP_ENTERSUB; 1202 init_perl_op.op_type = OP_ENTERSUB;
996 coro_setup_op.op_ppaddr = pp_slf; 1203 init_perl_op.op_ppaddr = pp_slf;
997 /* no flags etc. required, as an init function won't be called */ 1204 /* no flags etc. required, as an init function won't be called */
998 1205
999 PL_op = (OP *)&coro_setup_op; 1206 PL_op = (OP *)&init_perl_op;
1000 1207
1001 /* copy throw, in case it was set before coro_setup */ 1208 /* copy throw, in case it was set before init_perl */
1002 CORO_THROW = coro->except; 1209 CORO_THROW = coro->except;
1003 1210
1211 SWAP_SVS (coro);
1212
1004 if (expect_false (enable_times)) 1213 if (ecb_expect_false (enable_times))
1005 { 1214 {
1006 coro_times_update (); 1215 coro_times_update ();
1007 coro_times_sub (coro); 1216 coro_times_sub (coro);
1008 } 1217 }
1009} 1218}
… …
1028 dounwind (-1); 1237 dounwind (-1);
1029 } 1238 }
1030} 1239}
1031 1240
1032static void 1241static void
1033coro_destruct_perl (pTHX_ struct coro *coro) 1242destroy_perl (pTHX_ struct coro *coro)
1034{ 1243{
1035 SV *svf [9]; 1244 SV *svf [9];
1036 1245
1037 { 1246 {
1247 SV *old_current = SvRV (coro_current);
1038 struct coro *current = SvSTATE_current; 1248 struct coro *current = SvSTATE (old_current);
1039 1249
1040 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1250 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1041 1251
1042 save_perl (aTHX_ current); 1252 save_perl (aTHX_ current);
1253
1254 /* this will cause transfer_check to croak on block*/
1255 SvRV_set (coro_current, (SV *)coro->hv);
1256
1043 load_perl (aTHX_ coro); 1257 load_perl (aTHX_ coro);
1044 1258
1045 coro_unwind_stacks (aTHX); 1259 coro_unwind_stacks (aTHX);
1260
1261 /* restore swapped sv's */
1262 SWAP_SVS (coro);
1263
1046 coro_destruct_stacks (aTHX); 1264 coro_destruct_stacks (aTHX);
1047 1265
1048 // now save some sv's to be free'd later 1266 /* now save some sv's to be free'd later */
1049 svf [0] = GvSV (PL_defgv); 1267 svf [0] = GvSV (PL_defgv);
1050 svf [1] = (SV *)GvAV (PL_defgv); 1268 svf [1] = (SV *)GvAV (PL_defgv);
1051 svf [2] = GvSV (PL_errgv); 1269 svf [2] = GvSV (PL_errgv);
1052 svf [3] = (SV *)PL_defoutgv; 1270 svf [3] = (SV *)PL_defoutgv;
1053 svf [4] = PL_rs; 1271 svf [4] = PL_rs;
… …
1055 svf [6] = (SV *)GvHV (PL_hintgv); 1273 svf [6] = (SV *)GvHV (PL_hintgv);
1056 svf [7] = PL_diehook; 1274 svf [7] = PL_diehook;
1057 svf [8] = PL_warnhook; 1275 svf [8] = PL_warnhook;
1058 assert (9 == sizeof (svf) / sizeof (*svf)); 1276 assert (9 == sizeof (svf) / sizeof (*svf));
1059 1277
1278 SvRV_set (coro_current, old_current);
1279
1060 load_perl (aTHX_ current); 1280 load_perl (aTHX_ current);
1061 } 1281 }
1062 1282
1063 { 1283 {
1064 unsigned int i; 1284 unsigned int i;
… …
1068 1288
1069 SvREFCNT_dec (coro->saved_deffh); 1289 SvREFCNT_dec (coro->saved_deffh);
1070 SvREFCNT_dec (coro->rouse_cb); 1290 SvREFCNT_dec (coro->rouse_cb);
1071 SvREFCNT_dec (coro->invoke_cb); 1291 SvREFCNT_dec (coro->invoke_cb);
1072 SvREFCNT_dec (coro->invoke_av); 1292 SvREFCNT_dec (coro->invoke_av);
1293 SvREFCNT_dec (coro->on_enter_xs);
1294 SvREFCNT_dec (coro->on_leave_xs);
1073 } 1295 }
1074} 1296}
1075 1297
1076INLINE void 1298ecb_inline void
1077free_coro_mortal (pTHX) 1299free_coro_mortal (pTHX)
1078{ 1300{
1079 if (expect_true (coro_mortal)) 1301 if (ecb_expect_true (coro_mortal))
1080 { 1302 {
1081 SvREFCNT_dec (coro_mortal); 1303 SvREFCNT_dec ((SV *)coro_mortal);
1082 coro_mortal = 0; 1304 coro_mortal = 0;
1083 } 1305 }
1084} 1306}
1085 1307
1086static int 1308static int
… …
1140 1362
1141 if (PL_curcop != &PL_compiling) 1363 if (PL_curcop != &PL_compiling)
1142 { 1364 {
1143 SV **cb; 1365 SV **cb;
1144 1366
1145 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1367 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1146 { 1368 {
1147 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1369 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1148 1370
1149 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1371 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1150 { 1372 {
… …
1219 1441
1220 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1442 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1221} 1443}
1222 1444
1223/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1445/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1224static void NOINLINE 1446static void ecb_noinline
1225cctx_prepare (pTHX) 1447cctx_prepare (pTHX)
1226{ 1448{
1227 PL_top_env = &PL_start_env; 1449 PL_top_env = &PL_start_env;
1228 1450
1229 if (cctx_current->flags & CC_TRACE) 1451 if (cctx_current->flags & CC_TRACE)
… …
1240 slf_frame.prepare = slf_prepare_set_stacklevel; 1462 slf_frame.prepare = slf_prepare_set_stacklevel;
1241 slf_frame.check = slf_check_set_stacklevel; 1463 slf_frame.check = slf_check_set_stacklevel;
1242} 1464}
1243 1465
1244/* the tail of transfer: execute stuff we can only do after a transfer */ 1466/* the tail of transfer: execute stuff we can only do after a transfer */
1245INLINE void 1467ecb_inline void
1246transfer_tail (pTHX) 1468transfer_tail (pTHX)
1247{ 1469{
1248 free_coro_mortal (aTHX); 1470 free_coro_mortal (aTHX);
1471}
1472
1473/* try to exit the same way perl's main function would do */
1474/* we do not bother resetting the environment or other things *7
1475/* that are not, uhm, essential */
1476/* this obviously also doesn't work when perl is embedded */
1477static void ecb_noinline ecb_cold
1478perlish_exit (pTHX)
1479{
1480 int exitstatus = perl_destruct (PL_curinterp);
1481 perl_free (PL_curinterp);
1482 exit (exitstatus);
1249} 1483}
1250 1484
1251/* 1485/*
1252 * this is a _very_ stripped down perl interpreter ;) 1486 * this is a _very_ stripped down perl interpreter ;)
1253 */ 1487 */
… …
1275 /* somebody or something will hit me for both perl_run and PL_restartop */ 1509 /* somebody or something will hit me for both perl_run and PL_restartop */
1276 PL_restartop = PL_op; 1510 PL_restartop = PL_op;
1277 perl_run (PL_curinterp); 1511 perl_run (PL_curinterp);
1278 /* 1512 /*
1279 * Unfortunately, there is no way to get at the return values of the 1513 * Unfortunately, there is no way to get at the return values of the
1280 * coro body here, as perl_run destroys these 1514 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1515 * runtime errors here, as this is just a random interpreter, not a thread.
1281 */ 1516 */
1282 1517
1283 /* 1518 /*
1284 * If perl-run returns we assume exit() was being called or the coro 1519 * If perl-run returns we assume exit() was being called or the coro
1285 * fell off the end, which seems to be the only valid (non-bug) 1520 * fell off the end, which seems to be the only valid (non-bug)
1286 * reason for perl_run to return. We try to exit by jumping to the 1521 * reason for perl_run to return. We try to mimic whatever perl is normally
1287 * bootstrap-time "top" top_env, as we cannot restore the "main" 1522 * doing in that case. YMMV.
1288 * coroutine as Coro has no such concept.
1289 * This actually isn't valid with the pthread backend, but OSes requiring
1290 * that backend are too broken to do it in a standards-compliant way.
1291 */ 1523 */
1292 PL_top_env = main_top_env; 1524 perlish_exit (aTHX);
1293 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1294 } 1525 }
1295} 1526}
1296 1527
1297static coro_cctx * 1528static coro_cctx *
1298cctx_new () 1529cctx_new (void)
1299{ 1530{
1300 coro_cctx *cctx; 1531 coro_cctx *cctx;
1301 1532
1302 ++cctx_count; 1533 ++cctx_count;
1303 New (0, cctx, 1, coro_cctx); 1534 New (0, cctx, 1, coro_cctx);
… …
1309 return cctx; 1540 return cctx;
1310} 1541}
1311 1542
1312/* create a new cctx only suitable as source */ 1543/* create a new cctx only suitable as source */
1313static coro_cctx * 1544static coro_cctx *
1314cctx_new_empty () 1545cctx_new_empty (void)
1315{ 1546{
1316 coro_cctx *cctx = cctx_new (); 1547 coro_cctx *cctx = cctx_new ();
1317 1548
1318 cctx->sptr = 0; 1549 cctx->stack.sptr = 0;
1319 coro_create (&cctx->cctx, 0, 0, 0, 0); 1550 coro_create (&cctx->cctx, 0, 0, 0, 0);
1320 1551
1321 return cctx; 1552 return cctx;
1322} 1553}
1323 1554
1324/* create a new cctx suitable as destination/running a perl interpreter */ 1555/* create a new cctx suitable as destination/running a perl interpreter */
1325static coro_cctx * 1556static coro_cctx *
1326cctx_new_run () 1557cctx_new_run (void)
1327{ 1558{
1328 coro_cctx *cctx = cctx_new (); 1559 coro_cctx *cctx = cctx_new ();
1329 void *stack_start;
1330 size_t stack_size;
1331 1560
1332#if HAVE_MMAP 1561 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1333 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1334 /* mmap supposedly does allocate-on-write for us */
1335 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1336
1337 if (cctx->sptr != (void *)-1)
1338 {
1339 #if CORO_STACKGUARD
1340 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1341 #endif
1342 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1343 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1344 cctx->flags |= CC_MAPPED;
1345 } 1562 {
1346 else
1347#endif
1348 {
1349 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1350 New (0, cctx->sptr, cctx_stacksize, long);
1351
1352 if (!cctx->sptr)
1353 {
1354 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1563 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1355 _exit (EXIT_FAILURE); 1564 _exit (EXIT_FAILURE);
1356 }
1357
1358 stack_start = cctx->sptr;
1359 stack_size = cctx->ssize;
1360 } 1565 }
1361 1566
1362 #if CORO_USE_VALGRIND
1363 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1364 #endif
1365
1366 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1567 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1367 1568
1368 return cctx; 1569 return cctx;
1369} 1570}
1370 1571
1371static void 1572static void
1372cctx_destroy (coro_cctx *cctx) 1573cctx_destroy (coro_cctx *cctx)
1373{ 1574{
1374 if (!cctx) 1575 if (!cctx)
1375 return; 1576 return;
1376 1577
1377 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1578 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1378 1579
1379 --cctx_count; 1580 --cctx_count;
1380 coro_destroy (&cctx->cctx); 1581 coro_destroy (&cctx->cctx);
1381 1582
1382 /* coro_transfer creates new, empty cctx's */ 1583 coro_stack_free (&cctx->stack);
1383 if (cctx->sptr)
1384 {
1385 #if CORO_USE_VALGRIND
1386 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1387 #endif
1388
1389#if HAVE_MMAP
1390 if (cctx->flags & CC_MAPPED)
1391 munmap (cctx->sptr, cctx->ssize);
1392 else
1393#endif
1394 Safefree (cctx->sptr);
1395 }
1396 1584
1397 Safefree (cctx); 1585 Safefree (cctx);
1398} 1586}
1399 1587
1400/* wether this cctx should be destructed */ 1588/* wether this cctx should be destructed */
1401#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1589#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1402 1590
1403static coro_cctx * 1591static coro_cctx *
1404cctx_get (pTHX) 1592cctx_get (pTHX)
1405{ 1593{
1406 while (expect_true (cctx_first)) 1594 while (ecb_expect_true (cctx_first))
1407 { 1595 {
1408 coro_cctx *cctx = cctx_first; 1596 coro_cctx *cctx = cctx_first;
1409 cctx_first = cctx->next; 1597 cctx_first = cctx->next;
1410 --cctx_idle; 1598 --cctx_idle;
1411 1599
1412 if (expect_true (!CCTX_EXPIRED (cctx))) 1600 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1413 return cctx; 1601 return cctx;
1414 1602
1415 cctx_destroy (cctx); 1603 cctx_destroy (cctx);
1416 } 1604 }
1417 1605
… …
1419} 1607}
1420 1608
1421static void 1609static void
1422cctx_put (coro_cctx *cctx) 1610cctx_put (coro_cctx *cctx)
1423{ 1611{
1424 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1612 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1425 1613
1426 /* free another cctx if overlimit */ 1614 /* free another cctx if overlimit */
1427 if (expect_false (cctx_idle >= cctx_max_idle)) 1615 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1428 { 1616 {
1429 coro_cctx *first = cctx_first; 1617 coro_cctx *first = cctx_first;
1430 cctx_first = first->next; 1618 cctx_first = first->next;
1431 --cctx_idle; 1619 --cctx_idle;
1432 1620
… …
1443static void 1631static void
1444transfer_check (pTHX_ struct coro *prev, struct coro *next) 1632transfer_check (pTHX_ struct coro *prev, struct coro *next)
1445{ 1633{
1446 /* TODO: throwing up here is considered harmful */ 1634 /* TODO: throwing up here is considered harmful */
1447 1635
1448 if (expect_true (prev != next)) 1636 if (ecb_expect_true (prev != next))
1449 { 1637 {
1450 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1638 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1451 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1639 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1452 1640
1453 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1641 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1454 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1642 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1455 1643
1456#if !PERL_VERSION_ATLEAST (5,10,0) 1644#if !PERL_VERSION_ATLEAST (5,10,0)
1457 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1645 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1458 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1646 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1459#endif 1647#endif
1460 } 1648 }
1461} 1649}
1462 1650
1463/* always use the TRANSFER macro */ 1651/* always use the TRANSFER macro */
1464static void NOINLINE /* noinline so we have a fixed stackframe */ 1652static void ecb_noinline /* noinline so we have a fixed stackframe */
1465transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1653transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1466{ 1654{
1467 dSTACKLEVEL; 1655 dSTACKLEVEL;
1468 1656
1469 /* sometimes transfer is only called to set idle_sp */ 1657 /* sometimes transfer is only called to set idle_sp */
1470 if (expect_false (!prev)) 1658 if (ecb_expect_false (!prev))
1471 { 1659 {
1472 cctx_current->idle_sp = STACKLEVEL; 1660 cctx_current->idle_sp = STACKLEVEL;
1473 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1661 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1474 } 1662 }
1475 else if (expect_true (prev != next)) 1663 else if (ecb_expect_true (prev != next))
1476 { 1664 {
1477 coro_cctx *cctx_prev; 1665 coro_cctx *cctx_prev;
1478 1666
1479 if (expect_false (prev->flags & CF_NEW)) 1667 if (ecb_expect_false (prev->flags & CF_NEW))
1480 { 1668 {
1481 /* create a new empty/source context */ 1669 /* create a new empty/source context */
1482 prev->flags &= ~CF_NEW; 1670 prev->flags &= ~CF_NEW;
1483 prev->flags |= CF_RUNNING; 1671 prev->flags |= CF_RUNNING;
1484 } 1672 }
… …
1487 next->flags |= CF_RUNNING; 1675 next->flags |= CF_RUNNING;
1488 1676
1489 /* first get rid of the old state */ 1677 /* first get rid of the old state */
1490 save_perl (aTHX_ prev); 1678 save_perl (aTHX_ prev);
1491 1679
1492 if (expect_false (next->flags & CF_NEW)) 1680 if (ecb_expect_false (next->flags & CF_NEW))
1493 { 1681 {
1494 /* need to start coroutine */ 1682 /* need to start coroutine */
1495 next->flags &= ~CF_NEW; 1683 next->flags &= ~CF_NEW;
1496 /* setup coroutine call */ 1684 /* setup coroutine call */
1497 coro_setup (aTHX_ next); 1685 init_perl (aTHX_ next);
1498 } 1686 }
1499 else 1687 else
1500 load_perl (aTHX_ next); 1688 load_perl (aTHX_ next);
1501 1689
1502 /* possibly untie and reuse the cctx */ 1690 /* possibly untie and reuse the cctx */
1503 if (expect_true ( 1691 if (ecb_expect_true (
1504 cctx_current->idle_sp == STACKLEVEL 1692 cctx_current->idle_sp == STACKLEVEL
1505 && !(cctx_current->flags & CC_TRACE) 1693 && !(cctx_current->flags & CC_TRACE)
1506 && !force_cctx 1694 && !force_cctx
1507 )) 1695 ))
1508 { 1696 {
1509 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1697 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1510 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1698 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1511 1699
1512 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1700 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1513 /* without this the next cctx_get might destroy the running cctx while still in use */ 1701 /* without this the next cctx_get might destroy the running cctx while still in use */
1514 if (expect_false (CCTX_EXPIRED (cctx_current))) 1702 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1515 if (expect_true (!next->cctx)) 1703 if (ecb_expect_true (!next->cctx))
1516 next->cctx = cctx_get (aTHX); 1704 next->cctx = cctx_get (aTHX);
1517 1705
1518 cctx_put (cctx_current); 1706 cctx_put (cctx_current);
1519 } 1707 }
1520 else 1708 else
1521 prev->cctx = cctx_current; 1709 prev->cctx = cctx_current;
1522 1710
1523 ++next->usecount; 1711 ++next->usecount;
1524 1712
1525 cctx_prev = cctx_current; 1713 cctx_prev = cctx_current;
1526 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1714 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1527 1715
1528 next->cctx = 0; 1716 next->cctx = 0;
1529 1717
1530 if (expect_false (cctx_prev != cctx_current)) 1718 if (ecb_expect_false (cctx_prev != cctx_current))
1531 { 1719 {
1532 cctx_prev->top_env = PL_top_env; 1720 cctx_prev->top_env = PL_top_env;
1533 PL_top_env = cctx_current->top_env; 1721 PL_top_env = cctx_current->top_env;
1534 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1722 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1535 } 1723 }
… …
1541#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1729#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1542#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1730#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1543 1731
1544/** high level stuff ********************************************************/ 1732/** high level stuff ********************************************************/
1545 1733
1734/* this function is actually Coro, not Coro::State, but we call it from here */
1735/* because it is convenient - but it hasn't been declared yet for that reason */
1546static int 1736static void
1737coro_call_on_destroy (pTHX_ struct coro *coro);
1738
1739static void
1547coro_state_destroy (pTHX_ struct coro *coro) 1740coro_state_destroy (pTHX_ struct coro *coro)
1548{ 1741{
1549 if (coro->flags & CF_DESTROYED) 1742 if (coro->flags & CF_ZOMBIE)
1550 return 0; 1743 return;
1551 1744
1552 if (coro->on_destroy && !PL_dirty)
1553 coro->on_destroy (aTHX_ coro); 1745 slf_destroy (aTHX_ coro);
1554 1746
1555 coro->flags |= CF_DESTROYED; 1747 coro->flags |= CF_ZOMBIE;
1556 1748
1557 if (coro->flags & CF_READY) 1749 if (coro->flags & CF_READY)
1558 { 1750 {
1559 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1751 /* reduce nready, as destroying a ready coro effectively unreadies it */
1560 /* alternative: look through all ready queues and remove the coro */ 1752 /* alternative: look through all ready queues and remove the coro */
1561 --coro_nready; 1753 --coro_nready;
1562 } 1754 }
1563 else 1755 else
1564 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1756 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1757
1758 if (coro->next) coro->next->prev = coro->prev;
1759 if (coro->prev) coro->prev->next = coro->next;
1760 if (coro == coro_first) coro_first = coro->next;
1565 1761
1566 if (coro->mainstack 1762 if (coro->mainstack
1567 && coro->mainstack != main_mainstack 1763 && coro->mainstack != main_mainstack
1568 && coro->slot 1764 && coro->slot
1569 && !PL_dirty) 1765 && !PL_dirty)
1570 coro_destruct_perl (aTHX_ coro); 1766 destroy_perl (aTHX_ coro);
1571 1767
1572 cctx_destroy (coro->cctx); 1768 cctx_destroy (coro->cctx);
1573 SvREFCNT_dec (coro->startcv); 1769 SvREFCNT_dec (coro->startcv);
1574 SvREFCNT_dec (coro->args); 1770 SvREFCNT_dec (coro->args);
1771 SvREFCNT_dec (coro->swap_sv);
1575 SvREFCNT_dec (CORO_THROW); 1772 SvREFCNT_dec (CORO_THROW);
1576 1773
1577 if (coro->next) coro->next->prev = coro->prev; 1774 coro_call_on_destroy (aTHX_ coro);
1578 if (coro->prev) coro->prev->next = coro->next;
1579 if (coro == coro_first) coro_first = coro->next;
1580 1775
1581 return 1; 1776 /* more destruction mayhem in coro_state_free */
1582} 1777}
1583 1778
1584static int 1779static int
1585coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1780coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1586{ 1781{
1587 struct coro *coro = (struct coro *)mg->mg_ptr; 1782 struct coro *coro = (struct coro *)mg->mg_ptr;
1588 mg->mg_ptr = 0; 1783 mg->mg_ptr = 0;
1589 1784
1590 coro->hv = 0;
1591
1592 if (--coro->refcnt < 0)
1593 {
1594 coro_state_destroy (aTHX_ coro); 1785 coro_state_destroy (aTHX_ coro);
1786 SvREFCNT_dec (coro->on_destroy);
1787 SvREFCNT_dec (coro->status);
1788
1595 Safefree (coro); 1789 Safefree (coro);
1596 }
1597 1790
1598 return 0; 1791 return 0;
1599} 1792}
1600 1793
1601static int 1794static int ecb_cold
1602coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1795coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1603{ 1796{
1604 struct coro *coro = (struct coro *)mg->mg_ptr; 1797 /* called when perl clones the current process the slow way (windows process emulation) */
1605 1798 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1606 ++coro->refcnt; 1799 mg->mg_ptr = 0;
1800 mg->mg_virtual = 0;
1607 1801
1608 return 0; 1802 return 0;
1609} 1803}
1610 1804
1611static MGVTBL coro_state_vtbl = { 1805static MGVTBL coro_state_vtbl = {
… …
1636 TRANSFER (ta, 1); 1830 TRANSFER (ta, 1);
1637} 1831}
1638 1832
1639/** Coro ********************************************************************/ 1833/** Coro ********************************************************************/
1640 1834
1641INLINE void 1835ecb_inline void
1642coro_enq (pTHX_ struct coro *coro) 1836coro_enq (pTHX_ struct coro *coro)
1643{ 1837{
1644 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1838 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1645 1839
1646 SvREFCNT_inc_NN (coro->hv); 1840 SvREFCNT_inc_NN (coro->hv);
… …
1648 coro->next_ready = 0; 1842 coro->next_ready = 0;
1649 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1843 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1650 ready [1] = coro; 1844 ready [1] = coro;
1651} 1845}
1652 1846
1653INLINE struct coro * 1847ecb_inline struct coro *
1654coro_deq (pTHX) 1848coro_deq (pTHX)
1655{ 1849{
1656 int prio; 1850 int prio;
1657 1851
1658 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1852 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1711{ 1905{
1712 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1906 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1713} 1907}
1714 1908
1715/* expects to own a reference to next->hv */ 1909/* expects to own a reference to next->hv */
1716INLINE void 1910ecb_inline void
1717prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1911prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1718{ 1912{
1719 SV *prev_sv = SvRV (coro_current); 1913 SV *prev_sv = SvRV (coro_current);
1720 1914
1721 ta->prev = SvSTATE_hv (prev_sv); 1915 ta->prev = SvSTATE_hv (prev_sv);
… …
1734{ 1928{
1735 for (;;) 1929 for (;;)
1736 { 1930 {
1737 struct coro *next = coro_deq (aTHX); 1931 struct coro *next = coro_deq (aTHX);
1738 1932
1739 if (expect_true (next)) 1933 if (ecb_expect_true (next))
1740 { 1934 {
1741 /* cannot transfer to destroyed coros, skip and look for next */ 1935 /* cannot transfer to destroyed coros, skip and look for next */
1742 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1936 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1743 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1937 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1744 else 1938 else
1745 { 1939 {
1746 next->flags &= ~CF_READY; 1940 next->flags &= ~CF_READY;
1747 --coro_nready; 1941 --coro_nready;
… …
1754 { 1948 {
1755 /* nothing to schedule: call the idle handler */ 1949 /* nothing to schedule: call the idle handler */
1756 if (SvROK (sv_idle) 1950 if (SvROK (sv_idle)
1757 && SvOBJECT (SvRV (sv_idle))) 1951 && SvOBJECT (SvRV (sv_idle)))
1758 { 1952 {
1953 if (SvRV (sv_idle) == SvRV (coro_current))
1954 {
1955 require_pv ("Carp");
1956
1957 {
1958 dSP;
1959
1960 ENTER;
1961 SAVETMPS;
1962
1963 PUSHMARK (SP);
1964 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1965 PUTBACK;
1966 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1967
1968 FREETMPS;
1969 LEAVE;
1970 }
1971 }
1972
1759 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1973 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1760 api_ready (aTHX_ SvRV (sv_idle)); 1974 api_ready (aTHX_ SvRV (sv_idle));
1761 --coro_nready; 1975 --coro_nready;
1762 } 1976 }
1763 else 1977 else
1764 { 1978 {
1979 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1765 dSP; 1980 dSP;
1766 1981
1767 ENTER; 1982 ENTER;
1768 SAVETMPS; 1983 SAVETMPS;
1769 1984
… …
1776 } 1991 }
1777 } 1992 }
1778 } 1993 }
1779} 1994}
1780 1995
1781INLINE void 1996ecb_inline void
1782prepare_cede (pTHX_ struct coro_transfer_args *ta) 1997prepare_cede (pTHX_ struct coro_transfer_args *ta)
1783{ 1998{
1784 api_ready (aTHX_ coro_current); 1999 api_ready (aTHX_ coro_current);
1785 prepare_schedule (aTHX_ ta); 2000 prepare_schedule (aTHX_ ta);
1786} 2001}
1787 2002
1788INLINE void 2003ecb_inline void
1789prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2004prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1790{ 2005{
1791 SV *prev = SvRV (coro_current); 2006 SV *prev = SvRV (coro_current);
1792 2007
1793 if (coro_nready) 2008 if (coro_nready)
… …
1823{ 2038{
1824 struct coro_transfer_args ta; 2039 struct coro_transfer_args ta;
1825 2040
1826 prepare_cede (aTHX_ &ta); 2041 prepare_cede (aTHX_ &ta);
1827 2042
1828 if (expect_true (ta.prev != ta.next)) 2043 if (ecb_expect_true (ta.prev != ta.next))
1829 { 2044 {
1830 TRANSFER (ta, 1); 2045 TRANSFER (ta, 1);
1831 return 1; 2046 return 1;
1832 } 2047 }
1833 else 2048 else
… …
1876 coro->slot->runops = RUNOPS_DEFAULT; 2091 coro->slot->runops = RUNOPS_DEFAULT;
1877 } 2092 }
1878} 2093}
1879 2094
1880static void 2095static void
2096coro_push_av (pTHX_ AV *av, I32 gimme_v)
2097{
2098 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2099 {
2100 dSP;
2101
2102 if (gimme_v == G_SCALAR)
2103 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2104 else
2105 {
2106 int i;
2107 EXTEND (SP, AvFILLp (av) + 1);
2108
2109 for (i = 0; i <= AvFILLp (av); ++i)
2110 PUSHs (AvARRAY (av)[i]);
2111 }
2112
2113 PUTBACK;
2114 }
2115}
2116
2117static void
2118coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2119{
2120 if (!coro->on_destroy)
2121 coro->on_destroy = newAV ();
2122
2123 av_push (coro->on_destroy, cb);
2124}
2125
2126static void
2127slf_destroy_join (pTHX_ struct CoroSLF *frame)
2128{
2129 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2130}
2131
2132static int
2133slf_check_join (pTHX_ struct CoroSLF *frame)
2134{
2135 struct coro *coro = (struct coro *)frame->data;
2136
2137 if (!coro->status)
2138 return 1;
2139
2140 frame->destroy = 0;
2141
2142 coro_push_av (aTHX_ coro->status, GIMME_V);
2143
2144 SvREFCNT_dec ((SV *)coro->hv);
2145
2146 return 0;
2147}
2148
2149static void
2150slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2151{
2152 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2153
2154 if (items > 1)
2155 croak ("join called with too many arguments");
2156
2157 if (coro->status)
2158 frame->prepare = prepare_nop;
2159 else
2160 {
2161 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2162 frame->prepare = prepare_schedule;
2163 }
2164
2165 frame->check = slf_check_join;
2166 frame->destroy = slf_destroy_join;
2167 frame->data = (void *)coro;
2168 SvREFCNT_inc (coro->hv);
2169}
2170
2171static void
1881coro_call_on_destroy (pTHX_ struct coro *coro) 2172coro_call_on_destroy (pTHX_ struct coro *coro)
1882{ 2173{
1883 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2174 AV *od = coro->on_destroy;
1884 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1885 2175
1886 if (on_destroyp) 2176 if (!od)
1887 { 2177 return;
1888 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1889 2178
2179 coro->on_destroy = 0;
2180 sv_2mortal ((SV *)od);
2181
1890 while (AvFILLp (on_destroy) >= 0) 2182 while (AvFILLp (od) >= 0)
2183 {
2184 SV *cb = sv_2mortal (av_pop (od));
2185
2186 /* coro hv's (and only hv's at the moment) are supported as well */
2187 if (SvSTATEhv_p (aTHX_ cb))
2188 api_ready (aTHX_ cb);
2189 else
1891 { 2190 {
1892 dSP; /* don't disturb outer sp */ 2191 dSP; /* don't disturb outer sp */
1893 SV *cb = av_pop (on_destroy);
1894
1895 PUSHMARK (SP); 2192 PUSHMARK (SP);
1896 2193
1897 if (statusp) 2194 if (coro->status)
1898 { 2195 {
1899 int i; 2196 PUTBACK;
1900 AV *status = (AV *)SvRV (*statusp); 2197 coro_push_av (aTHX_ coro->status, G_ARRAY);
1901 EXTEND (SP, AvFILLp (status) + 1); 2198 SPAGAIN;
1902
1903 for (i = 0; i <= AvFILLp (status); ++i)
1904 PUSHs (AvARRAY (status)[i]);
1905 } 2199 }
1906 2200
1907 PUTBACK; 2201 PUTBACK;
1908 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2202 call_sv (cb, G_VOID | G_DISCARD);
1909 } 2203 }
1910 } 2204 }
1911} 2205}
1912 2206
1913static void 2207static void
1914slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2208coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1915{ 2209{
2210 AV *av;
2211
2212 if (coro->status)
2213 {
2214 av = coro->status;
2215 av_clear (av);
2216 }
2217 else
2218 av = coro->status = newAV ();
2219
2220 /* items are actually not so common, so optimise for this case */
2221 if (items)
2222 {
1916 int i; 2223 int i;
1917 HV *hv = (HV *)SvRV (coro_current);
1918 AV *av = newAV ();
1919 2224
1920 av_extend (av, items - 1); 2225 av_extend (av, items - 1);
2226
1921 for (i = 0; i < items; ++i) 2227 for (i = 0; i < items; ++i)
1922 av_push (av, SvREFCNT_inc_NN (arg [i])); 2228 av_push (av, SvREFCNT_inc_NN (arg [i]));
2229 }
2230}
1923 2231
1924 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2232static void
1925 2233slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2234{
1926 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2235 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1927 api_ready (aTHX_ sv_manager); 2236 api_ready (aTHX_ sv_manager);
1928 2237
1929 frame->prepare = prepare_schedule; 2238 frame->prepare = prepare_schedule;
1930 frame->check = slf_check_repeat; 2239 frame->check = slf_check_repeat;
1931 2240
1932 /* as a minor optimisation, we could unwind all stacks here */ 2241 /* as a minor optimisation, we could unwind all stacks here */
1933 /* but that puts extra pressure on pp_slf, and is not worth much */ 2242 /* but that puts extra pressure on pp_slf, and is not worth much */
1934 /*coro_unwind_stacks (aTHX);*/ 2243 /*coro_unwind_stacks (aTHX);*/
2244}
2245
2246static void
2247slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2248{
2249 HV *coro_hv = (HV *)SvRV (coro_current);
2250
2251 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2252 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2253}
2254
2255static void
2256slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2257{
2258 HV *coro_hv;
2259 struct coro *coro;
2260
2261 if (items <= 0)
2262 croak ("Coro::cancel called without coro object,");
2263
2264 coro = SvSTATE (arg [0]);
2265 coro_hv = coro->hv;
2266
2267 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2268
2269 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2270 {
2271 /* coro currently busy cancelling something, so just notify it */
2272 coro->slf_frame.data = (void *)coro;
2273
2274 frame->prepare = prepare_nop;
2275 frame->check = slf_check_nop;
2276 }
2277 else if (coro_hv == (HV *)SvRV (coro_current))
2278 {
2279 /* cancelling the current coro is allowed, and equals terminate */
2280 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2281 }
2282 else
2283 {
2284 struct coro *self = SvSTATE_current;
2285
2286 if (!self)
2287 croak ("Coro::cancel called outside of thread content,");
2288
2289 /* otherwise we cancel directly, purely for speed reasons
2290 * unfortunately, this requires some magic trickery, as
2291 * somebody else could cancel us, so we have to fight the cancellation.
2292 * this is ugly, and hopefully fully worth the extra speed.
2293 * besides, I can't get the slow-but-safe version working...
2294 */
2295 slf_frame.data = 0;
2296 self->flags |= CF_NOCANCEL;
2297 coro_state_destroy (aTHX_ coro);
2298 self->flags &= ~CF_NOCANCEL;
2299
2300 if (slf_frame.data)
2301 {
2302 /* while we were busy we have been cancelled, so terminate */
2303 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2304 }
2305 else
2306 {
2307 frame->prepare = prepare_nop;
2308 frame->check = slf_check_nop;
2309 }
2310 }
2311}
2312
2313static int
2314slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2315{
2316 frame->prepare = 0;
2317 coro_unwind_stacks (aTHX);
2318
2319 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2320
2321 return 1;
2322}
2323
2324static int
2325safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2326{
2327 if (coro->cctx)
2328 croak ("coro inside C callback, unable to cancel at this time, caught");
2329
2330 if (coro->flags & CF_NEW)
2331 {
2332 coro_set_status (aTHX_ coro, arg, items);
2333 coro_state_destroy (aTHX_ coro);
2334 }
2335 else
2336 {
2337 if (!coro->slf_frame.prepare)
2338 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2339
2340 slf_destroy (aTHX_ coro);
2341
2342 coro_set_status (aTHX_ coro, arg, items);
2343 coro->slf_frame.prepare = prepare_nop;
2344 coro->slf_frame.check = slf_check_safe_cancel;
2345
2346 api_ready (aTHX_ (SV *)coro->hv);
2347 }
2348
2349 return 1;
1935} 2350}
1936 2351
1937/*****************************************************************************/ 2352/*****************************************************************************/
1938/* async pool handler */ 2353/* async pool handler */
1939 2354
… …
1970slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2385slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1971{ 2386{
1972 HV *hv = (HV *)SvRV (coro_current); 2387 HV *hv = (HV *)SvRV (coro_current);
1973 struct coro *coro = SvSTATE_hv ((SV *)hv); 2388 struct coro *coro = SvSTATE_hv ((SV *)hv);
1974 2389
1975 if (expect_true (coro->saved_deffh)) 2390 if (ecb_expect_true (coro->saved_deffh))
1976 { 2391 {
1977 /* subsequent iteration */ 2392 /* subsequent iteration */
1978 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2393 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1979 coro->saved_deffh = 0; 2394 coro->saved_deffh = 0;
1980 2395
1981 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2396 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1982 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2397 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1983 { 2398 {
1984 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2399 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1985 coro->invoke_av = newAV (); 2400 return;
1986
1987 frame->prepare = prepare_nop;
1988 } 2401 }
1989 else 2402 else
1990 { 2403 {
1991 av_clear (GvAV (PL_defgv)); 2404 av_clear (GvAV (PL_defgv));
1992 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2405 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2042 2455
2043static int 2456static int
2044slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2457slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2045{ 2458{
2046 SV *data = (SV *)frame->data; 2459 SV *data = (SV *)frame->data;
2047 2460
2048 if (CORO_THROW) 2461 if (CORO_THROW)
2049 return 0; 2462 return 0;
2050 2463
2051 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2464 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2052 return 1; 2465 return 1;
… …
2088 cb = sv_2mortal (coro->rouse_cb); 2501 cb = sv_2mortal (coro->rouse_cb);
2089 coro->rouse_cb = 0; 2502 coro->rouse_cb = 0;
2090 } 2503 }
2091 2504
2092 if (!SvROK (cb) 2505 if (!SvROK (cb)
2093 || SvTYPE (SvRV (cb)) != SVt_PVCV 2506 || SvTYPE (SvRV (cb)) != SVt_PVCV
2094 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2507 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2095 croak ("Coro::rouse_wait called with illegal callback argument,"); 2508 croak ("Coro::rouse_wait called with illegal callback argument,");
2096 2509
2097 { 2510 {
2098 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2511 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2215static void 2628static void
2216slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2629slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2217{ 2630{
2218 frame->prepare = prepare_cede_notself; 2631 frame->prepare = prepare_cede_notself;
2219 frame->check = slf_check_nop; 2632 frame->check = slf_check_nop;
2633}
2634
2635/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2636static void
2637slf_destroy (pTHX_ struct coro *coro)
2638{
2639 struct CoroSLF frame = coro->slf_frame;
2640
2641 /*
2642 * The on_destroy below most likely is from an SLF call.
2643 * Since by definition the SLF call will not finish when we destroy
2644 * the coro, we will have to force-finish it here, otherwise
2645 * cleanup functions cannot call SLF functions.
2646 */
2647 coro->slf_frame.prepare = 0;
2648
2649 /* this callback is reserved for slf functions needing to do cleanup */
2650 if (frame.destroy && frame.prepare && !PL_dirty)
2651 frame.destroy (aTHX_ &frame);
2220} 2652}
2221 2653
2222/* 2654/*
2223 * these not obviously related functions are all rolled into one 2655 * these not obviously related functions are all rolled into one
2224 * function to increase chances that they all will call transfer with the same 2656 * function to increase chances that they all will call transfer with the same
… …
2231 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2663 I32 checkmark; /* mark SP to see how many elements check has pushed */
2232 2664
2233 /* set up the slf frame, unless it has already been set-up */ 2665 /* set up the slf frame, unless it has already been set-up */
2234 /* the latter happens when a new coro has been started */ 2666 /* the latter happens when a new coro has been started */
2235 /* or when a new cctx was attached to an existing coroutine */ 2667 /* or when a new cctx was attached to an existing coroutine */
2236 if (expect_true (!slf_frame.prepare)) 2668 if (ecb_expect_true (!slf_frame.prepare))
2237 { 2669 {
2238 /* first iteration */ 2670 /* first iteration */
2239 dSP; 2671 dSP;
2240 SV **arg = PL_stack_base + TOPMARK + 1; 2672 SV **arg = PL_stack_base + TOPMARK + 1;
2241 int items = SP - arg; /* args without function object */ 2673 int items = SP - arg; /* args without function object */
… …
2282 while (slf_frame.check (aTHX_ &slf_frame)); 2714 while (slf_frame.check (aTHX_ &slf_frame));
2283 2715
2284 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2716 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2285 2717
2286 /* exception handling */ 2718 /* exception handling */
2287 if (expect_false (CORO_THROW)) 2719 if (ecb_expect_false (CORO_THROW))
2288 { 2720 {
2289 SV *exception = sv_2mortal (CORO_THROW); 2721 SV *exception = sv_2mortal (CORO_THROW);
2290 2722
2291 CORO_THROW = 0; 2723 CORO_THROW = 0;
2292 sv_setsv (ERRSV, exception); 2724 sv_setsv (ERRSV, exception);
2293 croak (0); 2725 croak (0);
2294 } 2726 }
2295 2727
2296 /* return value handling - mostly like entersub */ 2728 /* return value handling - mostly like entersub */
2297 /* make sure we put something on the stack in scalar context */ 2729 /* make sure we put something on the stack in scalar context */
2298 if (GIMME_V == G_SCALAR) 2730 if (GIMME_V == G_SCALAR
2731 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2299 { 2732 {
2300 dSP; 2733 dSP;
2301 SV **bot = PL_stack_base + checkmark; 2734 SV **bot = PL_stack_base + checkmark;
2302 2735
2303 if (sp == bot) /* too few, push undef */ 2736 if (sp == bot) /* too few, push undef */
2304 bot [1] = &PL_sv_undef; 2737 bot [1] = &PL_sv_undef;
2305 else if (sp != bot + 1) /* too many, take last one */ 2738 else /* too many, take last one */
2306 bot [1] = *sp; 2739 bot [1] = *sp;
2307 2740
2308 SP = bot + 1; 2741 SP = bot + 1;
2309 2742
2310 PUTBACK; 2743 PUTBACK;
… …
2343 if (PL_op->op_flags & OPf_STACKED) 2776 if (PL_op->op_flags & OPf_STACKED)
2344 { 2777 {
2345 if (items > slf_arga) 2778 if (items > slf_arga)
2346 { 2779 {
2347 slf_arga = items; 2780 slf_arga = items;
2348 free (slf_argv); 2781 Safefree (slf_argv);
2349 slf_argv = malloc (slf_arga * sizeof (SV *)); 2782 New (0, slf_argv, slf_arga, SV *);
2350 } 2783 }
2351 2784
2352 slf_argc = items; 2785 slf_argc = items;
2353 2786
2354 for (i = 0; i < items; ++i) 2787 for (i = 0; i < items; ++i)
… …
2408{ 2841{
2409 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2842 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2410 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2843 on_enterleave_call (aTHX_ sv_2mortal (cb));
2411} 2844}
2412 2845
2846static void
2847enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2848{
2849 if (!hook)
2850 return;
2851
2852 if (!*avp)
2853 {
2854 *avp = newAV ();
2855 AvREAL_off (*avp);
2856 }
2857
2858 av_push (*avp, (SV *)hook);
2859 av_push (*avp, (SV *)arg);
2860}
2861
2862static void
2863enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2864{
2865 AV *av = *avp;
2866 int i;
2867
2868 if (!av)
2869 return;
2870
2871 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2872 if (AvARRAY (av)[i] == (SV *)hook)
2873 {
2874 if (execute)
2875 hook ((void *)AvARRAY (av)[i + 1]);
2876
2877 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2878 av_pop (av);
2879 av_pop (av);
2880 break;
2881 }
2882
2883 if (AvFILLp (av) >= 0)
2884 {
2885 *avp = 0;
2886 SvREFCNT_dec_NN (av);
2887 }
2888}
2889
2890static void
2891api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2892{
2893 struct coro *coro = SvSTATE (coro_sv);
2894
2895 if (SvSTATE_current == coro)
2896 if (enter)
2897 enter (aTHX enter_arg);
2898
2899 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2900 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2901}
2902
2903static void
2904api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2905{
2906 struct coro *coro = SvSTATE (coro_sv);
2907
2908 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2909 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2910}
2911
2912static void
2913savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2914{
2915 struct coro *coro = SvSTATE_current;
2916
2917 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2918}
2919
2920static void
2921savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2922{
2923 struct coro *coro = SvSTATE_current;
2924
2925 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2926}
2927
2928static void
2929api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2930{
2931 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2932
2933 /* this ought to be much cheaper than malloc + a single destructor call */
2934 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2935 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2936}
2937
2413/*****************************************************************************/ 2938/*****************************************************************************/
2414/* PerlIO::cede */ 2939/* PerlIO::cede */
2415 2940
2416typedef struct 2941typedef struct
2417{ 2942{
2418 PerlIOBuf base; 2943 PerlIOBuf base;
2419 NV next, every; 2944 NV next, every;
2420} PerlIOCede; 2945} PerlIOCede;
2421 2946
2422static IV 2947static IV ecb_cold
2423PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2948PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2424{ 2949{
2425 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2950 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2426 2951
2427 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2952 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2428 self->next = nvtime () + self->every; 2953 self->next = nvtime () + self->every;
2429 2954
2430 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2955 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2431} 2956}
2432 2957
2433static SV * 2958static SV * ecb_cold
2434PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2959PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2435{ 2960{
2436 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2961 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2437 2962
2438 return newSVnv (self->every); 2963 return newSVnv (self->every);
… …
2545 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3070 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2546 PUTBACK; 3071 PUTBACK;
2547 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3072 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2548 } 3073 }
2549 3074
2550 SvREFCNT_dec (cb); 3075 SvREFCNT_dec_NN (cb);
2551 } 3076 }
2552} 3077}
2553 3078
2554static void 3079static void
2555coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3080coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2556{ 3081{
2557 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3082 /* call $sem->adjust (0) to possibly wake up some other waiters */
2558 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3083 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2559} 3084}
2560 3085
2561static int 3086static int
2562slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3087slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2563{ 3088{
2564 AV *av = (AV *)frame->data; 3089 AV *av = (AV *)frame->data;
2565 SV *count_sv = AvARRAY (av)[0]; 3090 SV *count_sv = AvARRAY (av)[0];
3091 SV *coro_hv = SvRV (coro_current);
3092
3093 frame->destroy = 0;
2566 3094
2567 /* if we are about to throw, don't actually acquire the lock, just throw */ 3095 /* if we are about to throw, don't actually acquire the lock, just throw */
2568 if (CORO_THROW) 3096 if (ecb_expect_false (CORO_THROW))
3097 {
3098 /* we still might be responsible for the semaphore, so wake up others */
3099 coro_semaphore_adjust (aTHX_ av, 0);
3100
2569 return 0; 3101 return 0;
3102 }
2570 else if (SvIVX (count_sv) > 0) 3103 else if (SvIVX (count_sv) > 0)
2571 { 3104 {
2572 SvSTATE_current->on_destroy = 0;
2573
2574 if (acquire) 3105 if (acquire)
2575 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3106 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2576 else 3107 else
2577 coro_semaphore_adjust (aTHX_ av, 0); 3108 coro_semaphore_adjust (aTHX_ av, 0);
2578 3109
… …
2582 { 3113 {
2583 int i; 3114 int i;
2584 /* if we were woken up but can't down, we look through the whole */ 3115 /* if we were woken up but can't down, we look through the whole */
2585 /* waiters list and only add us if we aren't in there already */ 3116 /* waiters list and only add us if we aren't in there already */
2586 /* this avoids some degenerate memory usage cases */ 3117 /* this avoids some degenerate memory usage cases */
2587 3118 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2588 for (i = 1; i <= AvFILLp (av); ++i)
2589 if (AvARRAY (av)[i] == SvRV (coro_current)) 3119 if (AvARRAY (av)[i] == coro_hv)
2590 return 1; 3120 return 1;
2591 3121
2592 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3122 av_push (av, SvREFCNT_inc (coro_hv));
2593 return 1; 3123 return 1;
2594 } 3124 }
2595} 3125}
2596 3126
2597static int 3127static int
… …
2620 { 3150 {
2621 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3151 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2622 3152
2623 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3153 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2624 frame->prepare = prepare_schedule; 3154 frame->prepare = prepare_schedule;
2625
2626 /* to avoid race conditions when a woken-up coro gets terminated */ 3155 /* to avoid race conditions when a woken-up coro gets terminated */
2627 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3156 /* we arrange for a temporary on_destroy that calls adjust (0) */
2628 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3157 frame->destroy = coro_semaphore_destroy;
2629 } 3158 }
2630} 3159}
2631 3160
2632static void 3161static void
2633slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3162slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2691 { 3220 {
2692 api_ready (aTHX_ cb); 3221 api_ready (aTHX_ cb);
2693 sv_setiv (cb, 0); /* signal waiter */ 3222 sv_setiv (cb, 0); /* signal waiter */
2694 } 3223 }
2695 3224
2696 SvREFCNT_dec (cb); 3225 SvREFCNT_dec_NN (cb);
2697 3226
2698 --count; 3227 --count;
2699 } 3228 }
2700} 3229}
2701 3230
… …
2715 { 3244 {
2716 SV *cb_cv = s_get_cv_croak (arg [1]); 3245 SV *cb_cv = s_get_cv_croak (arg [1]);
2717 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3246 av_push (av, SvREFCNT_inc_NN (cb_cv));
2718 3247
2719 if (SvIVX (AvARRAY (av)[0])) 3248 if (SvIVX (AvARRAY (av)[0]))
2720 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3249 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2721 3250
2722 frame->prepare = prepare_nop; 3251 frame->prepare = prepare_nop;
2723 frame->check = slf_check_nop; 3252 frame->check = slf_check_nop;
2724 } 3253 }
2725 else if (SvIVX (AvARRAY (av)[0])) 3254 else if (SvIVX (AvARRAY (av)[0]))
… …
2786 } 3315 }
2787 3316
2788 av_push (state, data_sv); 3317 av_push (state, data_sv);
2789 3318
2790 api_ready (aTHX_ coro); 3319 api_ready (aTHX_ coro);
2791 SvREFCNT_dec (coro); 3320 SvREFCNT_dec_NN (coro);
2792 SvREFCNT_dec ((AV *)state); 3321 SvREFCNT_dec_NN ((AV *)state);
2793} 3322}
2794 3323
2795static int 3324static int
2796slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3325slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2797{ 3326{
… …
2802 /* it quickly returns */ 3331 /* it quickly returns */
2803 if (CORO_THROW) 3332 if (CORO_THROW)
2804 return 0; 3333 return 0;
2805 3334
2806 /* one element that is an RV? repeat! */ 3335 /* one element that is an RV? repeat! */
2807 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3336 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2808 return 1; 3337 return 1;
2809 3338
2810 /* restore status */ 3339 /* restore status */
2811 { 3340 {
2812 SV *data_sv = av_pop (state); 3341 SV *data_sv = av_pop (state);
… …
2815 errno = data->errorno; 3344 errno = data->errorno;
2816 PL_laststype = data->laststype; 3345 PL_laststype = data->laststype;
2817 PL_laststatval = data->laststatval; 3346 PL_laststatval = data->laststatval;
2818 PL_statcache = data->statcache; 3347 PL_statcache = data->statcache;
2819 3348
2820 SvREFCNT_dec (data_sv); 3349 SvREFCNT_dec_NN (data_sv);
2821 } 3350 }
2822 3351
2823 /* push result values */ 3352 /* push result values */
2824 { 3353 {
2825 dSP; 3354 dSP;
… …
2851 dSP; 3380 dSP;
2852 3381
2853 static SV *prio_cv; 3382 static SV *prio_cv;
2854 static SV *prio_sv; 3383 static SV *prio_sv;
2855 3384
2856 if (expect_false (!prio_cv)) 3385 if (ecb_expect_false (!prio_cv))
2857 { 3386 {
2858 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3387 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2859 prio_sv = newSViv (0); 3388 prio_sv = newSViv (0);
2860 } 3389 }
2861 3390
… …
2887 /* now call the AIO function - we assume our request is uncancelable */ 3416 /* now call the AIO function - we assume our request is uncancelable */
2888 PUTBACK; 3417 PUTBACK;
2889 call_sv ((SV *)req, G_VOID | G_DISCARD); 3418 call_sv ((SV *)req, G_VOID | G_DISCARD);
2890 } 3419 }
2891 3420
2892 /* now that the requets is going, we loop toll we have a result */ 3421 /* now that the request is going, we loop till we have a result */
2893 frame->data = (void *)state; 3422 frame->data = (void *)state;
2894 frame->prepare = prepare_schedule; 3423 frame->prepare = prepare_schedule;
2895 frame->check = slf_check_aio_req; 3424 frame->check = slf_check_aio_req;
2896} 3425}
2897 3426
… …
2909 3438
2910#if CORO_CLONE 3439#if CORO_CLONE
2911# include "clone.c" 3440# include "clone.c"
2912#endif 3441#endif
2913 3442
3443/*****************************************************************************/
3444
3445static SV *
3446coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3447{
3448 SV *coro_sv;
3449 struct coro *coro;
3450 MAGIC *mg;
3451 HV *hv;
3452 SV *cb;
3453 int i;
3454
3455 if (argc > 0)
3456 {
3457 cb = s_get_cv_croak (argv [0]);
3458
3459 if (!is_coro)
3460 {
3461 if (CvISXSUB (cb))
3462 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3463
3464 if (!CvROOT (cb))
3465 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3466 }
3467 }
3468
3469 Newz (0, coro, 1, struct coro);
3470 coro->args = newAV ();
3471 coro->flags = CF_NEW;
3472
3473 if (coro_first) coro_first->prev = coro;
3474 coro->next = coro_first;
3475 coro_first = coro;
3476
3477 coro->hv = hv = newHV ();
3478 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3479 mg->mg_flags |= MGf_DUP;
3480 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3481
3482 if (argc > 0)
3483 {
3484 av_extend (coro->args, argc + is_coro - 1);
3485
3486 if (is_coro)
3487 {
3488 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3489 cb = (SV *)cv_coro_run;
3490 }
3491
3492 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3493
3494 for (i = 1; i < argc; i++)
3495 av_push (coro->args, newSVsv (argv [i]));
3496 }
3497
3498 return coro_sv;
3499}
3500
3501#ifndef __cplusplus
3502ecb_cold XS(boot_Coro__State);
3503#endif
3504
3505#if CORO_JIT
3506
3507static void ecb_noinline ecb_cold
3508pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3509{
3510 dSP;
3511 AV *av = newAV ();
3512
3513 av_store (av, 3, newSVuv (d));
3514 av_store (av, 2, newSVuv (c));
3515 av_store (av, 1, newSVuv (b));
3516 av_store (av, 0, newSVuv (a));
3517
3518 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3519
3520 PUTBACK;
3521}
3522
3523static void ecb_noinline ecb_cold
3524jit_init (pTHX)
3525{
3526 dSP;
3527 SV *load, *save;
3528 char *map_base;
3529 char *load_ptr, *save_ptr;
3530 STRLEN load_len, save_len, map_len;
3531 int count;
3532
3533 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3534
3535 PUSHMARK (SP);
3536 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3537 #include "state.h"
3538 count = call_pv ("Coro::State::_jit", G_ARRAY);
3539 SPAGAIN;
3540
3541 save = POPs; save_ptr = SvPVbyte (save, save_len);
3542 load = POPs; load_ptr = SvPVbyte (load, load_len);
3543
3544 map_len = load_len + save_len + 16;
3545
3546 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3547
3548 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3549
3550 load_perl_slots = (load_save_perl_slots_type)map_base;
3551 memcpy (map_base, load_ptr, load_len);
3552
3553 map_base += (load_len + 15) & ~15;
3554
3555 save_perl_slots = (load_save_perl_slots_type)map_base;
3556 memcpy (map_base, save_ptr, save_len);
3557
3558 /* we are good citizens and try to make the page read-only, so the evil evil */
3559 /* hackers might have it a bit more difficult */
3560 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3561
3562 PUTBACK;
3563 eval_pv ("undef &Coro::State::_jit", 1);
3564}
3565
3566#endif
3567
2914MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3568MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2915 3569
2916PROTOTYPES: DISABLE 3570PROTOTYPES: DISABLE
2917 3571
2918BOOT: 3572BOOT:
2919{ 3573{
3574#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3575#include "state.h"
2920#ifdef USE_ITHREADS 3576#ifdef USE_ITHREADS
2921# if CORO_PTHREAD 3577# if CORO_PTHREAD
2922 coro_thx = PERL_GET_CONTEXT; 3578 coro_thx = PERL_GET_CONTEXT;
2923# endif 3579# endif
2924#endif 3580#endif
2925 BOOT_PAGESIZE; 3581 /* perl defines these to check for existance first, but why it doesn't */
3582 /* just create them one at init time is not clear to me, except for */
3583 /* programs trying to delete them, but... */
3584 /* anyway, we declare this as invalid and make sure they are initialised here */
3585 DEFSV;
3586 ERRSV;
2926 3587
2927 cctx_current = cctx_new_empty (); 3588 cctx_current = cctx_new_empty ();
2928 3589
2929 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3590 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2930 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3591 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2970 coroapi.prepare_nop = prepare_nop; 3631 coroapi.prepare_nop = prepare_nop;
2971 coroapi.prepare_schedule = prepare_schedule; 3632 coroapi.prepare_schedule = prepare_schedule;
2972 coroapi.prepare_cede = prepare_cede; 3633 coroapi.prepare_cede = prepare_cede;
2973 coroapi.prepare_cede_notself = prepare_cede_notself; 3634 coroapi.prepare_cede_notself = prepare_cede_notself;
2974 3635
2975 { 3636 time_init (aTHX);
2976 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2977
2978 if (!svp) croak ("Time::HiRes is required");
2979 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2980
2981 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2982
2983 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
2984 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2985 }
2986 3637
2987 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3638 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3639#if CORO_JIT
3640 PUTBACK;
3641 jit_init (aTHX);
3642 SPAGAIN;
3643#endif
2988} 3644}
2989 3645
2990SV * 3646SV *
2991new (char *klass, ...) 3647new (SV *klass, ...)
2992 ALIAS: 3648 ALIAS:
2993 Coro::new = 1 3649 Coro::new = 1
2994 CODE: 3650 CODE:
2995{ 3651 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2996 struct coro *coro; 3652 OUTPUT:
2997 MAGIC *mg;
2998 HV *hv;
2999 SV *cb;
3000 int i;
3001
3002 if (items > 1)
3003 {
3004 cb = s_get_cv_croak (ST (1));
3005
3006 if (!ix)
3007 {
3008 if (CvISXSUB (cb))
3009 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3010
3011 if (!CvROOT (cb))
3012 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3013 }
3014 }
3015
3016 Newz (0, coro, 1, struct coro);
3017 coro->args = newAV ();
3018 coro->flags = CF_NEW;
3019
3020 if (coro_first) coro_first->prev = coro;
3021 coro->next = coro_first;
3022 coro_first = coro;
3023
3024 coro->hv = hv = newHV ();
3025 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3026 mg->mg_flags |= MGf_DUP;
3027 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3028
3029 if (items > 1)
3030 {
3031 av_extend (coro->args, items - 1 + ix - 1);
3032
3033 if (ix)
3034 {
3035 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3036 cb = (SV *)cv_coro_run;
3037 }
3038
3039 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3040
3041 for (i = 2; i < items; i++)
3042 av_push (coro->args, newSVsv (ST (i)));
3043 }
3044}
3045 OUTPUT:
3046 RETVAL 3653 RETVAL
3047 3654
3048void 3655void
3049transfer (...) 3656transfer (...)
3050 PROTOTYPE: $$ 3657 PROTOTYPE: $$
3051 CODE: 3658 CODE:
3052 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3659 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3053
3054bool
3055_destroy (SV *coro_sv)
3056 CODE:
3057 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3058 OUTPUT:
3059 RETVAL
3060
3061void
3062_exit (int code)
3063 PROTOTYPE: $
3064 CODE:
3065 _exit (code);
3066 3660
3067SV * 3661SV *
3068clone (Coro::State coro) 3662clone (Coro::State coro)
3069 CODE: 3663 CODE:
3070{ 3664{
… …
3125void 3719void
3126list () 3720list ()
3127 PROTOTYPE: 3721 PROTOTYPE:
3128 PPCODE: 3722 PPCODE:
3129{ 3723{
3130 struct coro *coro; 3724 struct coro *coro;
3131 for (coro = coro_first; coro; coro = coro->next) 3725 for (coro = coro_first; coro; coro = coro->next)
3132 if (coro->hv) 3726 if (coro->hv)
3133 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3727 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3134} 3728}
3135 3729
… …
3140 CODE: 3734 CODE:
3141{ 3735{
3142 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3736 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3143 { 3737 {
3144 struct coro *current = SvSTATE_current; 3738 struct coro *current = SvSTATE_current;
3739 struct CoroSLF slf_save;
3145 3740
3146 if (current != coro) 3741 if (current != coro)
3147 { 3742 {
3148 PUTBACK; 3743 PUTBACK;
3149 save_perl (aTHX_ current); 3744 save_perl (aTHX_ current);
3150 load_perl (aTHX_ coro); 3745 load_perl (aTHX_ coro);
3746 /* the coro is most likely in an active SLF call.
3747 * while not strictly required (the code we execute is
3748 * not allowed to call any SLF functions), it's cleaner
3749 * to reinitialise the slf_frame and restore it later.
3750 * This might one day allow us to actually do SLF calls
3751 * from code executed here.
3752 */
3753 slf_save = slf_frame;
3754 slf_frame.prepare = 0;
3151 SPAGAIN; 3755 SPAGAIN;
3152 } 3756 }
3153 3757
3154 PUSHSTACK; 3758 PUSHSTACK;
3155 3759
… …
3165 SPAGAIN; 3769 SPAGAIN;
3166 3770
3167 if (current != coro) 3771 if (current != coro)
3168 { 3772 {
3169 PUTBACK; 3773 PUTBACK;
3774 slf_frame = slf_save;
3170 save_perl (aTHX_ coro); 3775 save_perl (aTHX_ coro);
3171 load_perl (aTHX_ current); 3776 load_perl (aTHX_ current);
3172 SPAGAIN; 3777 SPAGAIN;
3173 } 3778 }
3174 } 3779 }
… …
3179 PROTOTYPE: $ 3784 PROTOTYPE: $
3180 ALIAS: 3785 ALIAS:
3181 is_ready = CF_READY 3786 is_ready = CF_READY
3182 is_running = CF_RUNNING 3787 is_running = CF_RUNNING
3183 is_new = CF_NEW 3788 is_new = CF_NEW
3184 is_destroyed = CF_DESTROYED 3789 is_destroyed = CF_ZOMBIE
3790 is_zombie = CF_ZOMBIE
3185 is_suspended = CF_SUSPENDED 3791 is_suspended = CF_SUSPENDED
3186 CODE: 3792 CODE:
3187 RETVAL = boolSV (coro->flags & ix); 3793 RETVAL = boolSV (coro->flags & ix);
3188 OUTPUT: 3794 OUTPUT:
3189 RETVAL 3795 RETVAL
3190 3796
3191void 3797void
3192throw (Coro::State self, SV *throw = &PL_sv_undef) 3798throw (SV *self, SV *exception = &PL_sv_undef)
3193 PROTOTYPE: $;$ 3799 PROTOTYPE: $;$
3194 CODE: 3800 CODE:
3195{ 3801{
3802 struct coro *coro = SvSTATE (self);
3196 struct coro *current = SvSTATE_current; 3803 struct coro *current = SvSTATE_current;
3197 SV **throwp = self == current ? &CORO_THROW : &self->except; 3804 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3198 SvREFCNT_dec (*throwp); 3805 SvREFCNT_dec (*exceptionp);
3199 SvGETMAGIC (throw); 3806 SvGETMAGIC (exception);
3200 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3807 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3808
3809 api_ready (aTHX_ self);
3201} 3810}
3202 3811
3203void 3812void
3204api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3813api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3205 PROTOTYPE: $;$ 3814 PROTOTYPE: $;$
… …
3260 3869
3261void 3870void
3262cancel (Coro::State self) 3871cancel (Coro::State self)
3263 CODE: 3872 CODE:
3264 coro_state_destroy (aTHX_ self); 3873 coro_state_destroy (aTHX_ self);
3265 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3266
3267 3874
3268SV * 3875SV *
3269enable_times (int enabled = enable_times) 3876enable_times (int enabled = enable_times)
3270 CODE: 3877 CODE:
3271{ 3878{
… …
3284 3891
3285void 3892void
3286times (Coro::State self) 3893times (Coro::State self)
3287 PPCODE: 3894 PPCODE:
3288{ 3895{
3289 struct coro *current = SvSTATE (coro_current); 3896 struct coro *current = SvSTATE (coro_current);
3290 3897
3291 if (expect_false (current == self)) 3898 if (ecb_expect_false (current == self))
3292 { 3899 {
3293 coro_times_update (); 3900 coro_times_update ();
3294 coro_times_add (SvSTATE (coro_current)); 3901 coro_times_add (SvSTATE (coro_current));
3295 } 3902 }
3296 3903
3297 EXTEND (SP, 2); 3904 EXTEND (SP, 2);
3298 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3905 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3299 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3906 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3300 3907
3301 if (expect_false (current == self)) 3908 if (ecb_expect_false (current == self))
3302 coro_times_sub (SvSTATE (coro_current)); 3909 coro_times_sub (SvSTATE (coro_current));
3303} 3910}
3911
3912void
3913swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3914 CODE:
3915{
3916 struct coro *current = SvSTATE_current;
3917
3918 if (current == coro)
3919 SWAP_SVS (current);
3920
3921 if (!coro->swap_sv)
3922 coro->swap_sv = newAV ();
3923
3924 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3925 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3926
3927 if (current == coro)
3928 SWAP_SVS (current);
3929}
3930
3304 3931
3305MODULE = Coro::State PACKAGE = Coro 3932MODULE = Coro::State PACKAGE = Coro
3306 3933
3307BOOT: 3934BOOT:
3308{ 3935{
3309 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3936 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3310 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3937 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3311 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3938 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3312 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3313 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3939 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3314 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3940 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3315 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3941 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3316 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3942 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3317 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3943 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3318 3944
3319 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3945 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3320 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3946 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3321 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3947 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3322 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3948 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3323 3949
3324 coro_stash = gv_stashpv ("Coro", TRUE); 3950 coro_stash = gv_stashpv ("Coro", TRUE);
3325 3951
3326 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3952 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3327 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3953 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
… …
3340 coroapi.ready = api_ready; 3966 coroapi.ready = api_ready;
3341 coroapi.is_ready = api_is_ready; 3967 coroapi.is_ready = api_is_ready;
3342 coroapi.nready = coro_nready; 3968 coroapi.nready = coro_nready;
3343 coroapi.current = coro_current; 3969 coroapi.current = coro_current;
3344 3970
3971 coroapi.enterleave_hook = api_enterleave_hook;
3972 coroapi.enterleave_unhook = api_enterleave_unhook;
3973 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3974
3345 /*GCoroAPI = &coroapi;*/ 3975 /*GCoroAPI = &coroapi;*/
3346 sv_setiv (sv, (IV)&coroapi); 3976 sv_setiv (sv, (IV)&coroapi);
3347 SvREADONLY_on (sv); 3977 SvREADONLY_on (sv);
3348 } 3978 }
3349} 3979}
3350 3980
3981SV *
3982async (...)
3983 PROTOTYPE: &@
3984 CODE:
3985 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3986 api_ready (aTHX_ RETVAL);
3987 OUTPUT:
3988 RETVAL
3989
3990void
3991_destroy (Coro::State coro)
3992 CODE:
3993 /* used by the manager thread */
3994 coro_state_destroy (aTHX_ coro);
3995
3996void
3997on_destroy (Coro::State coro, SV *cb)
3998 CODE:
3999 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4000
4001void
4002join (...)
4003 CODE:
4004 CORO_EXECUTE_SLF_XS (slf_init_join);
4005
3351void 4006void
3352terminate (...) 4007terminate (...)
3353 CODE: 4008 CODE:
3354 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4009 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3355 4010
3356void 4011void
4012cancel (...)
4013 CODE:
4014 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4015
4016int
4017safe_cancel (Coro::State self, ...)
4018 C_ARGS: aTHX_ self, &ST (1), items - 1
4019
4020void
3357schedule (...) 4021schedule (...)
3358 CODE: 4022 CODE:
3359 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4023 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3360 4024
3361void 4025void
… …
3380 4044
3381void 4045void
3382_set_current (SV *current) 4046_set_current (SV *current)
3383 PROTOTYPE: $ 4047 PROTOTYPE: $
3384 CODE: 4048 CODE:
3385 SvREFCNT_dec (SvRV (coro_current)); 4049 SvREFCNT_dec_NN (SvRV (coro_current));
3386 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4050 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3387 4051
3388void 4052void
3389_set_readyhook (SV *hook) 4053_set_readyhook (SV *hook)
3390 PROTOTYPE: $ 4054 PROTOTYPE: $
… …
3472 for (i = 1; i < items; ++i) 4136 for (i = 1; i < items; ++i)
3473 av_push (av, SvREFCNT_inc_NN (ST (i))); 4137 av_push (av, SvREFCNT_inc_NN (ST (i)));
3474 4138
3475 if ((SV *)hv == &PL_sv_undef) 4139 if ((SV *)hv == &PL_sv_undef)
3476 { 4140 {
3477 PUSHMARK (SP); 4141 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3478 EXTEND (SP, 2);
3479 PUSHs (sv_Coro);
3480 PUSHs ((SV *)cv_pool_handler);
3481 PUTBACK;
3482 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3483 SPAGAIN;
3484
3485 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4142 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4143 SvREFCNT_dec_NN (sv);
3486 } 4144 }
3487 4145
3488 { 4146 {
3489 struct coro *coro = SvSTATE_hv (hv); 4147 struct coro *coro = SvSTATE_hv (hv);
3490 4148
… …
3497 api_ready (aTHX_ (SV *)hv); 4155 api_ready (aTHX_ (SV *)hv);
3498 4156
3499 if (GIMME_V != G_VOID) 4157 if (GIMME_V != G_VOID)
3500 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4158 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3501 else 4159 else
3502 SvREFCNT_dec (hv); 4160 SvREFCNT_dec_NN (hv);
3503} 4161}
3504 4162
3505SV * 4163SV *
3506rouse_cb () 4164rouse_cb ()
3507 PROTOTYPE: 4165 PROTOTYPE:
… …
3522 on_leave = 1 4180 on_leave = 1
3523 PROTOTYPE: & 4181 PROTOTYPE: &
3524 CODE: 4182 CODE:
3525{ 4183{
3526 struct coro *coro = SvSTATE_current; 4184 struct coro *coro = SvSTATE_current;
3527 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4185 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3528 4186
3529 block = s_get_cv_croak (block); 4187 block = s_get_cv_croak (block);
3530 4188
3531 if (!*avp) 4189 if (!*avp)
3532 *avp = newAV (); 4190 *avp = newAV ();
… …
3552 4210
3553SV * 4211SV *
3554new (SV *klass, SV *count = 0) 4212new (SV *klass, SV *count = 0)
3555 CODE: 4213 CODE:
3556{ 4214{
3557 int semcnt = 1; 4215 int semcnt = 1;
3558 4216
3559 if (count) 4217 if (count)
3560 { 4218 {
3561 SvGETMAGIC (count); 4219 SvGETMAGIC (count);
3562 4220
… …
3622 XSRETURN_NO; 4280 XSRETURN_NO;
3623} 4281}
3624 4282
3625void 4283void
3626waiters (SV *self) 4284waiters (SV *self)
3627 PPCODE: 4285 PPCODE:
3628{ 4286{
3629 AV *av = (AV *)SvRV (self); 4287 AV *av = (AV *)SvRV (self);
3630 int wcount = AvFILLp (av) + 1 - 1; 4288 int wcount = AvFILLp (av) + 1 - 1;
3631 4289
3632 if (GIMME_V == G_SCALAR) 4290 if (GIMME_V == G_SCALAR)
… …
3641} 4299}
3642 4300
3643MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4301MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3644 4302
3645void 4303void
3646_may_delete (SV *sem, int count, int extra_refs) 4304_may_delete (SV *sem, int count, unsigned int extra_refs)
3647 PPCODE: 4305 PPCODE:
3648{ 4306{
3649 AV *av = (AV *)SvRV (sem); 4307 AV *av = (AV *)SvRV (sem);
3650 4308
3651 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4309 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3652 && AvFILLp (av) == 0 /* no waiters, just count */ 4310 && AvFILLp (av) == 0 /* no waiters, just count */
3653 && SvIV (AvARRAY (av)[0]) == count) 4311 && SvIV (AvARRAY (av)[0]) == count)
3654 XSRETURN_YES; 4312 XSRETURN_YES;
… …
3675 4333
3676void 4334void
3677broadcast (SV *self) 4335broadcast (SV *self)
3678 CODE: 4336 CODE:
3679{ 4337{
3680 AV *av = (AV *)SvRV (self); 4338 AV *av = (AV *)SvRV (self);
3681 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4339 coro_signal_wake (aTHX_ av, AvFILLp (av));
3682} 4340}
3683 4341
3684void 4342void
3685send (SV *self) 4343send (SV *self)
… …
3693 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4351 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3694} 4352}
3695 4353
3696IV 4354IV
3697awaited (SV *self) 4355awaited (SV *self)
3698 CODE: 4356 CODE:
3699 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4357 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3700 OUTPUT: 4358 OUTPUT:
3701 RETVAL 4359 RETVAL
3702 4360
3703 4361
… …
3708 4366
3709void 4367void
3710_schedule (...) 4368_schedule (...)
3711 CODE: 4369 CODE:
3712{ 4370{
3713 static int incede; 4371 static int incede;
3714 4372
3715 api_cede_notself (aTHX); 4373 api_cede_notself (aTHX);
3716 4374
3717 ++incede; 4375 ++incede;
3718 while (coro_nready >= incede && api_cede (aTHX)) 4376 while (coro_nready >= incede && api_cede (aTHX))
… …
3762 { 4420 {
3763 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4421 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3764 coro_old_pp_sselect = 0; 4422 coro_old_pp_sselect = 0;
3765 } 4423 }
3766 4424
4425MODULE = Coro::State PACKAGE = Coro::Util
3767 4426
4427void
4428_exit (int code)
4429 CODE:
4430 _exit (code);
4431
4432NV
4433time ()
4434 CODE:
4435 RETVAL = nvtime (aTHX);
4436 OUTPUT:
4437 RETVAL
4438
4439NV
4440gettimeofday ()
4441 PPCODE:
4442{
4443 UV tv [2];
4444 u2time (aTHX_ tv);
4445 EXTEND (SP, 2);
4446 PUSHs (sv_2mortal (newSVuv (tv [0])));
4447 PUSHs (sv_2mortal (newSVuv (tv [1])));
4448}
4449

Diff Legend

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