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.369 by root, Thu Aug 13 02:48:32 2009 UTC vs.
Revision 1.457 by root, Fri Jun 17 04:49:22 2016 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 SvREFCNT_dec_NN
28 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
29#endif
30
31#ifndef SvREFCNT_inc_NN
32 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
33#endif
34
35#ifndef SVs_PADSTALE
36# define SVs_PADSTALE 0
37#endif
38
39#ifdef PadARRAY
40# define NEWPADAPI 1
41# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
42#else
43typedef AV PADNAMELIST;
44# if !PERL_VERSION_ATLEAST(5,8,0)
45typedef AV PADLIST;
46typedef AV PAD;
47# endif
48# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
49# define PadlistMAX(pl) AvFILLp (pl)
50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
51# define PadARRAY AvARRAY
52# define PadMAX AvFILLp
53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
54#endif
55#ifndef PadnamelistREFCNT
56# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
57#endif
58#ifndef PadnamelistREFCNT_dec
59# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
60#endif
61
62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
64#if PERL_VERSION_ATLEAST(5,19,0)
65# define SVt_BIND SVt_IV
66#endif
67
68#if defined(_WIN32)
69# undef HAS_GETTIMEOFDAY
18# undef setjmp 70# undef setjmp
19# undef longjmp 71# undef longjmp
20# undef _exit 72# undef _exit
21# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
22#else 74#else
23# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
24#endif 76#endif
25 77
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 */ 78/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
55 80
56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57# undef CORO_STACKGUARD 82# define HAS_SCOPESTACK_NAME 1
58#endif
59
60#ifndef CORO_STACKGUARD
61# define CORO_STACKGUARD 0
62#endif 83#endif
63 84
64/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
65#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
66# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
76# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
77#endif 98#endif
78 99
79#define IN_DESTRUCT PL_dirty 100#define IN_DESTRUCT PL_dirty
80 101
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" 102#include "CoroAPI.h"
97#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
98 104
99#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
100# if CORO_PTHREAD 106# if CORO_PTHREAD
… …
116static void (*u2time)(pTHX_ UV ret[2]); 122static void (*u2time)(pTHX_ UV ret[2]);
117 123
118/* we hijack an hopefully unused CV flag for our purposes */ 124/* we hijack an hopefully unused CV flag for our purposes */
119#define CVf_SLF 0x4000 125#define CVf_SLF 0x4000
120static OP *pp_slf (pTHX); 126static OP *pp_slf (pTHX);
127static void slf_destroy (pTHX_ struct coro *coro);
121 128
122static U32 cctx_gen; 129static U32 cctx_gen;
123static size_t cctx_stacksize = CORO_STACKSIZE; 130static size_t cctx_stacksize = CORO_STACKSIZE;
124static struct CoroAPI coroapi; 131static struct CoroAPI coroapi;
125static AV *main_mainstack; /* used to differentiate between $main and others */ 132static AV *main_mainstack; /* used to differentiate between $main and others */
… …
133 140
134static GV *irsgv; /* $/ */ 141static GV *irsgv; /* $/ */
135static GV *stdoutgv; /* *STDOUT */ 142static GV *stdoutgv; /* *STDOUT */
136static SV *rv_diehook; 143static SV *rv_diehook;
137static SV *rv_warnhook; 144static SV *rv_warnhook;
138static HV *hv_sig; /* %SIG */
139 145
140/* async_pool helper stuff */ 146/* async_pool helper stuff */
141static SV *sv_pool_rss; 147static SV *sv_pool_rss;
142static SV *sv_pool_size; 148static SV *sv_pool_size;
143static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
… …
155static char times_valid; 161static char times_valid;
156 162
157static struct coro_cctx *cctx_first; 163static struct coro_cctx *cctx_first;
158static int cctx_count, cctx_idle; 164static int cctx_count, cctx_idle;
159 165
160enum { 166enum
167{
161 CC_MAPPED = 0x01, 168 CC_MAPPED = 0x01,
162 CC_NOREUSE = 0x02, /* throw this away after tracing */ 169 CC_NOREUSE = 0x02, /* throw this away after tracing */
163 CC_TRACE = 0x04, 170 CC_TRACE = 0x04,
164 CC_TRACE_SUB = 0x08, /* trace sub calls */ 171 CC_TRACE_SUB = 0x08, /* trace sub calls */
165 CC_TRACE_LINE = 0x10, /* trace each statement */ 172 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
170typedef struct coro_cctx 177typedef struct coro_cctx
171{ 178{
172 struct coro_cctx *next; 179 struct coro_cctx *next;
173 180
174 /* the stack */ 181 /* the stack */
175 void *sptr; 182 struct coro_stack stack;
176 size_t ssize;
177 183
178 /* cpu state */ 184 /* cpu state */
179 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
186#ifndef NDEBUG
180 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 187 JMPENV *idle_te; /* same as idle_sp, but for top_env */
188#endif
181 JMPENV *top_env; 189 JMPENV *top_env;
182 coro_context cctx; 190 coro_context cctx;
183 191
184 U32 gen; 192 U32 gen;
185#if CORO_USE_VALGRIND 193#if CORO_USE_VALGRIND
186 int valgrind_id; 194 int valgrind_id;
187#endif 195#endif
188 unsigned char flags; 196 unsigned char flags;
189} coro_cctx; 197} coro_cctx;
190 198
191coro_cctx *cctx_current; /* the currently running cctx */ 199static coro_cctx *cctx_current; /* the currently running cctx */
192 200
193/*****************************************************************************/ 201/*****************************************************************************/
194 202
203static MGVTBL coro_state_vtbl;
204
195enum { 205enum
206{
196 CF_RUNNING = 0x0001, /* coroutine is running */ 207 CF_RUNNING = 0x0001, /* coroutine is running */
197 CF_READY = 0x0002, /* coroutine is ready */ 208 CF_READY = 0x0002, /* coroutine is ready */
198 CF_NEW = 0x0004, /* has never been switched to */ 209 CF_NEW = 0x0004, /* has never been switched to */
199 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 210 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
200 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
201}; 213};
202 214
203/* the structure where most of the perl state is stored, overlaid on the cxstack */ 215/* the structure where most of the perl state is stored, overlaid on the cxstack */
204typedef struct 216typedef struct
205{ 217{
206 SV *defsv;
207 AV *defav;
208 SV *errsv;
209 SV *irsgv;
210 HV *hinthv;
211#define VAR(name,type) type name; 218 #define VARx(name,expr,type) type name;
212# include "state.h" 219 #include "state.h"
213#undef VAR
214} perl_slots; 220} perl_slots;
215 221
222/* how many context stack entries do we need for perl_slots */
216#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 223#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
217 224
218/* this is a structure representing a perl-level coroutine */ 225/* this is a structure representing a perl-level coroutine */
219struct coro { 226struct coro
227{
220 /* the C coroutine allocated to this perl coroutine, if any */ 228 /* the C coroutine allocated to this perl coroutine, if any */
221 coro_cctx *cctx; 229 coro_cctx *cctx;
222 230
223 /* ready queue */ 231 /* ready queue */
224 struct coro *next_ready; 232 struct coro *next_ready;
… …
226 /* state data */ 234 /* state data */
227 struct CoroSLF slf_frame; /* saved slf frame */ 235 struct CoroSLF slf_frame; /* saved slf frame */
228 AV *mainstack; 236 AV *mainstack;
229 perl_slots *slot; /* basically the saved sp */ 237 perl_slots *slot; /* basically the saved sp */
230 238
231 CV *startcv; /* the CV to execute */ 239 CV *startcv; /* the CV to execute */
232 AV *args; /* data associated with this coroutine (initial args) */ 240 AV *args; /* data associated with this coroutine (initial args) */
233 int refcnt; /* coroutines are refcounted, yes */
234 int flags; /* CF_ flags */ 241 int flags; /* CF_ flags */
235 HV *hv; /* the perl hash associated with this coro, if any */ 242 HV *hv; /* the perl hash associated with this coro, if any */
236 void (*on_destroy)(pTHX_ struct coro *coro);
237 243
238 /* statistics */ 244 /* statistics */
239 int usecount; /* number of transfers to this coro */ 245 int usecount; /* number of transfers to this coro */
240 246
241 /* coro process data */ 247 /* coro process data */
242 int prio; 248 int prio;
243 SV *except; /* exception to be thrown */ 249 SV *except; /* exception to be thrown */
244 SV *rouse_cb; 250 SV *rouse_cb; /* last rouse callback */
251 AV *on_destroy; /* callbacks or coros to notify on destroy */
252 AV *status; /* the exit status list */
245 253
246 /* async_pool */ 254 /* async_pool */
247 SV *saved_deffh; 255 SV *saved_deffh;
248 SV *invoke_cb; 256 SV *invoke_cb;
249 AV *invoke_av; 257 AV *invoke_av;
250 258
251 /* on_enter/on_leave */ 259 /* on_enter/on_leave */
252 AV *on_enter; 260 AV *on_enter; AV *on_enter_xs;
253 AV *on_leave; 261 AV *on_leave; AV *on_leave_xs;
262
263 /* swap_sv */
264 AV *swap_sv;
254 265
255 /* times */ 266 /* times */
256 coro_ts t_cpu, t_real; 267 coro_ts t_cpu, t_real;
257 268
258 /* linked list */ 269 /* linked list */
… …
262typedef struct coro *Coro__State; 273typedef struct coro *Coro__State;
263typedef struct coro *Coro__State_or_hashref; 274typedef struct coro *Coro__State_or_hashref;
264 275
265/* the following variables are effectively part of the perl context */ 276/* the following variables are effectively part of the perl context */
266/* and get copied between struct coro and these variables */ 277/* and get copied between struct coro and these variables */
267/* the mainr easonw e don't support windows process emulation */ 278/* the main reason we don't support windows process emulation */
268static struct CoroSLF slf_frame; /* the current slf frame */ 279static struct CoroSLF slf_frame; /* the current slf frame */
269 280
270/** Coro ********************************************************************/ 281/** Coro ********************************************************************/
271 282
272#define CORO_PRIO_MAX 3 283#define CORO_PRIO_MAX 3
… …
278 289
279/* for Coro.pm */ 290/* for Coro.pm */
280static SV *coro_current; 291static SV *coro_current;
281static SV *coro_readyhook; 292static SV *coro_readyhook;
282static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 293static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
283static CV *cv_coro_run, *cv_coro_terminate; 294static CV *cv_coro_run;
284static struct coro *coro_first; 295static struct coro *coro_first;
285#define coro_nready coroapi.nready 296#define coro_nready coroapi.nready
286 297
298/** JIT *********************************************************************/
299
300#if CORO_JIT
301 /* APPLE doesn't have mmap though */
302 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
303 #ifndef CORO_JIT_TYPE
304 #if ECB_AMD64 && CORO_JIT_UNIXY
305 #define CORO_JIT_TYPE "amd64-unix"
306 #elif __i386 && CORO_JIT_UNIXY
307 #define CORO_JIT_TYPE "x86-unix"
308 #endif
309 #endif
310#endif
311
312#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
313 #undef CORO_JIT
314#endif
315
316#if CORO_JIT
317 typedef void (*load_save_perl_slots_type)(perl_slots *);
318 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
319#endif
320
287/** Coro::Select ************************************************************/ 321/** Coro::Select ************************************************************/
288 322
289static OP *(*coro_old_pp_sselect) (pTHX); 323static OP *(*coro_old_pp_sselect) (pTHX);
290static SV *coro_select_select; 324static SV *coro_select_select;
291 325
292/* horrible hack, but if it works... */ 326/* horrible hack, but if it works... */
293static OP * 327static OP *
294coro_pp_sselect (aTHX) 328coro_pp_sselect (pTHX)
295{ 329{
296 dSP; 330 dSP;
297 PUSHMARK (SP - 4); /* fake argument list */ 331 PUSHMARK (SP - 4); /* fake argument list */
298 XPUSHs (coro_select_select); 332 XPUSHs (coro_select_select);
299 PUTBACK; 333 PUTBACK;
… …
302 PL_op->op_flags |= OPf_STACKED; 336 PL_op->op_flags |= OPf_STACKED;
303 PL_op->op_private = 0; 337 PL_op->op_private = 0;
304 return PL_ppaddr [OP_ENTERSUB](aTHX); 338 return PL_ppaddr [OP_ENTERSUB](aTHX);
305} 339}
306 340
341/** time stuff **************************************************************/
342
343#ifdef HAS_GETTIMEOFDAY
344
345ecb_inline void
346coro_u2time (pTHX_ UV ret[2])
347{
348 struct timeval tv;
349 gettimeofday (&tv, 0);
350
351 ret [0] = tv.tv_sec;
352 ret [1] = tv.tv_usec;
353}
354
355ecb_inline double
356coro_nvtime (void)
357{
358 struct timeval tv;
359 gettimeofday (&tv, 0);
360
361 return tv.tv_sec + tv.tv_usec * 1e-6;
362}
363
364ecb_inline void
365time_init (pTHX)
366{
367 nvtime = coro_nvtime;
368 u2time = coro_u2time;
369}
370
371#else
372
373ecb_inline void
374time_init (pTHX)
375{
376 SV **svp;
377
378 require_pv ("Time/HiRes.pm");
379
380 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
381
382 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
383 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
384
385 nvtime = INT2PTR (double (*)(), SvIV (*svp));
386
387 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
388 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
389}
390
391#endif
392
307/** lowlevel stuff **********************************************************/ 393/** lowlevel stuff **********************************************************/
308 394
309static SV * 395static SV * ecb_noinline
310coro_get_sv (pTHX_ const char *name, int create) 396coro_get_sv (pTHX_ const char *name, int create)
311{ 397{
312#if PERL_VERSION_ATLEAST (5,10,0) 398#if PERL_VERSION_ATLEAST (5,10,0)
313 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
314 get_sv (name, create); 400 get_sv (name, create);
315#endif 401#endif
316 return get_sv (name, create); 402 return get_sv (name, create);
317} 403}
318 404
319static AV * 405static AV * ecb_noinline
320coro_get_av (pTHX_ const char *name, int create) 406coro_get_av (pTHX_ const char *name, int create)
321{ 407{
322#if PERL_VERSION_ATLEAST (5,10,0) 408#if PERL_VERSION_ATLEAST (5,10,0)
323 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 409 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
324 get_av (name, create); 410 get_av (name, create);
325#endif 411#endif
326 return get_av (name, create); 412 return get_av (name, create);
327} 413}
328 414
329static HV * 415static HV * ecb_noinline
330coro_get_hv (pTHX_ const char *name, int create) 416coro_get_hv (pTHX_ const char *name, int create)
331{ 417{
332#if PERL_VERSION_ATLEAST (5,10,0) 418#if PERL_VERSION_ATLEAST (5,10,0)
333 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 419 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
334 get_hv (name, create); 420 get_hv (name, create);
335#endif 421#endif
336 return get_hv (name, create); 422 return get_hv (name, create);
337} 423}
338 424
339INLINE void 425ecb_inline void
340coro_times_update () 426coro_times_update (void)
341{ 427{
342#ifdef coro_clock_gettime 428#ifdef coro_clock_gettime
343 struct timespec ts; 429 struct timespec ts;
344 430
345 ts.tv_sec = ts.tv_nsec = 0; 431 ts.tv_sec = ts.tv_nsec = 0;
… …
357 time_real [0] = tv [0]; 443 time_real [0] = tv [0];
358 time_real [1] = tv [1] * 1000; 444 time_real [1] = tv [1] * 1000;
359#endif 445#endif
360} 446}
361 447
362INLINE void 448ecb_inline void
363coro_times_add (struct coro *c) 449coro_times_add (struct coro *c)
364{ 450{
365 c->t_real [1] += time_real [1]; 451 c->t_real [1] += time_real [1];
366 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 452 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
367 c->t_real [0] += time_real [0]; 453 c->t_real [0] += time_real [0];
… …
369 c->t_cpu [1] += time_cpu [1]; 455 c->t_cpu [1] += time_cpu [1];
370 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 456 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
371 c->t_cpu [0] += time_cpu [0]; 457 c->t_cpu [0] += time_cpu [0];
372} 458}
373 459
374INLINE void 460ecb_inline void
375coro_times_sub (struct coro *c) 461coro_times_sub (struct coro *c)
376{ 462{
377 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 463 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
378 c->t_real [1] -= time_real [1]; 464 c->t_real [1] -= time_real [1];
379 c->t_real [0] -= time_real [0]; 465 c->t_real [0] -= time_real [0];
… …
387/* magic glue */ 473/* magic glue */
388 474
389#define CORO_MAGIC_type_cv 26 475#define CORO_MAGIC_type_cv 26
390#define CORO_MAGIC_type_state PERL_MAGIC_ext 476#define CORO_MAGIC_type_state PERL_MAGIC_ext
391 477
392#define CORO_MAGIC_NN(sv, type) \ 478#define CORO_MAGIC_NN(sv, type) \
393 (expect_true (SvMAGIC (sv)->mg_type == type) \ 479 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
394 ? SvMAGIC (sv) \ 480 ? SvMAGIC (sv) \
395 : mg_find (sv, type)) 481 : mg_find (sv, type))
396 482
397#define CORO_MAGIC(sv, type) \ 483#define CORO_MAGIC(sv, type) \
398 (expect_true (SvMAGIC (sv)) \ 484 (ecb_expect_true (SvMAGIC (sv)) \
399 ? CORO_MAGIC_NN (sv, type) \ 485 ? CORO_MAGIC_NN (sv, type) \
400 : 0) 486 : 0)
401 487
402#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 488#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
403#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 489#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
404 490
405INLINE struct coro * 491ecb_inline MAGIC *
406SvSTATE_ (pTHX_ SV *coro) 492SvSTATEhv_p (pTHX_ SV *coro)
407{ 493{
408 HV *stash;
409 MAGIC *mg; 494 MAGIC *mg;
410 495
496 if (ecb_expect_true (
497 SvTYPE (coro) == SVt_PVHV
498 && (mg = CORO_MAGIC_state (coro))
499 && mg->mg_virtual == &coro_state_vtbl
500 ))
501 return mg;
502
503 return 0;
504}
505
506ecb_inline struct coro *
507SvSTATE_ (pTHX_ SV *coro_sv)
508{
509 MAGIC *mg;
510
411 if (SvROK (coro)) 511 if (SvROK (coro_sv))
412 coro = SvRV (coro); 512 coro_sv = SvRV (coro_sv);
413 513
414 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 514 mg = SvSTATEhv_p (aTHX_ coro_sv);
515 if (!mg)
415 croak ("Coro::State object required"); 516 croak ("Coro::State object required");
416 517
417 stash = SvSTASH (coro);
418 if (expect_false (stash != coro_stash && stash != coro_state_stash))
419 {
420 /* very slow, but rare, check */
421 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
422 croak ("Coro::State object required");
423 }
424
425 mg = CORO_MAGIC_state (coro);
426 return (struct coro *)mg->mg_ptr; 518 return (struct coro *)mg->mg_ptr;
427} 519}
428 520
429#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 521#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
430 522
… …
433#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 525#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
434 526
435/*****************************************************************************/ 527/*****************************************************************************/
436/* padlist management and caching */ 528/* padlist management and caching */
437 529
438static AV * 530ecb_inline PADLIST *
439coro_derive_padlist (pTHX_ CV *cv) 531coro_derive_padlist (pTHX_ CV *cv)
440{ 532{
441 AV *padlist = CvPADLIST (cv); 533 PADLIST *padlist = CvPADLIST (cv);
442 AV *newpadlist, *newpad; 534 PADLIST *newpadlist;
535 PADNAMELIST *padnames;
536 PAD *newpad;
537 PADOFFSET off = PadlistMAX (padlist) + 1;
443 538
444 newpadlist = newAV (); 539#if NEWPADAPI
540
541 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
542 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
543 while (!PadlistARRAY (padlist)[off - 1])
544 --off;
545
546 Perl_pad_push (aTHX_ padlist, off);
547
548 newpad = PadlistARRAY (padlist)[off];
549 PadlistARRAY (padlist)[off] = 0;
550
551#else
552
553#if PERL_VERSION_ATLEAST (5,10,0)
554 Perl_pad_push (aTHX_ padlist, off);
555#else
556 Perl_pad_push (aTHX_ padlist, off, 1);
557#endif
558
559 newpad = PadlistARRAY (padlist)[off];
560 PadlistMAX (padlist) = off - 1;
561
562#endif
563
564 newPADLIST (newpadlist);
565#if !PERL_VERSION_ATLEAST(5,15,3)
566 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
445 AvREAL_off (newpadlist); 567 AvREAL_off (newpadlist);
446#if PERL_VERSION_ATLEAST (5,10,0)
447 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
448#else
449 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
450#endif 568#endif
451 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
452 --AvFILLp (padlist);
453 569
454 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 570 /* Already extended to 2 elements by newPADLIST. */
455 av_store (newpadlist, 1, (SV *)newpad); 571 PadlistMAX (newpadlist) = 1;
572
573 padnames = PadlistNAMES (padlist);
574 ++PadnamelistREFCNT (padnames);
575 PadlistNAMES (newpadlist) = padnames;
576
577 PadlistARRAY (newpadlist)[1] = newpad;
456 578
457 return newpadlist; 579 return newpadlist;
458} 580}
459 581
460static void 582ecb_inline void
461free_padlist (pTHX_ AV *padlist) 583free_padlist (pTHX_ PADLIST *padlist)
462{ 584{
463 /* may be during global destruction */ 585 /* may be during global destruction */
464 if (!IN_DESTRUCT) 586 if (!IN_DESTRUCT)
465 { 587 {
466 I32 i = AvFILLp (padlist); 588 I32 i = PadlistMAX (padlist);
467 589
468 while (i > 0) /* special-case index 0 */ 590 while (i > 0) /* special-case index 0 */
469 { 591 {
470 /* we try to be extra-careful here */ 592 /* we try to be extra-careful here */
471 AV *av = (AV *)AvARRAY (padlist)[i--]; 593 PAD *pad = PadlistARRAY (padlist)[i--];
472 I32 j = AvFILLp (av);
473 594
595 if (pad)
596 {
597 I32 j = PadMAX (pad);
598
474 while (j >= 0) 599 while (j >= 0)
475 SvREFCNT_dec (AvARRAY (av)[j--]); 600 SvREFCNT_dec (PadARRAY (pad)[j--]);
476 601
477 AvFILLp (av) = -1; 602 PadMAX (pad) = -1;
478 SvREFCNT_dec (av); 603 SvREFCNT_dec (pad);
604 }
479 } 605 }
480 606
481 SvREFCNT_dec (AvARRAY (padlist)[0]); 607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
482 608
609#if NEWPADAPI
610 Safefree (PadlistARRAY (padlist));
611 Safefree (padlist);
612#else
483 AvFILLp (padlist) = -1; 613 AvFILLp (padlist) = -1;
614 AvREAL_off (padlist);
484 SvREFCNT_dec ((SV*)padlist); 615 SvREFCNT_dec ((SV*)padlist);
616#endif
485 } 617 }
486} 618}
487 619
488static int 620static int
489coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 621coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
490{ 622{
491 AV *padlist; 623 PADLIST *padlist;
492 AV *av = (AV *)mg->mg_obj; 624 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
625 size_t len = *(size_t *)mg->mg_ptr;
493 626
494 /* perl manages to free our internal AV and _then_ call us */ 627 /* perl manages to free our internal AV and _then_ call us */
495 if (IN_DESTRUCT) 628 if (IN_DESTRUCT)
496 return 0; 629 return 0;
497 630
498 /* casting is fun. */ 631 while (len--)
499 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
500 free_padlist (aTHX_ padlist); 632 free_padlist (aTHX_ padlists[len]);
501
502 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
503 633
504 return 0; 634 return 0;
505} 635}
506 636
507static MGVTBL coro_cv_vtbl = { 637static MGVTBL coro_cv_vtbl = {
508 0, 0, 0, 0, 638 0, 0, 0, 0,
509 coro_cv_free 639 coro_cv_free
510}; 640};
511 641
512/* the next two functions merely cache the padlists */ 642/* the next two functions merely cache the padlists */
513static void 643ecb_inline void
514get_padlist (pTHX_ CV *cv) 644get_padlist (pTHX_ CV *cv)
515{ 645{
516 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
517 AV *av; 647 size_t *lenp;
518 648
519 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 649 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
520 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 650 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
521 else 651 else
522 { 652 {
523#if CORO_PREFER_PERL_FUNCTIONS 653#if CORO_PREFER_PERL_FUNCTIONS
524 /* this is probably cleaner? but also slower! */ 654 /* this is probably cleaner? but also slower! */
525 /* in practise, it seems to be less stable */ 655 /* in practise, it seems to be less stable */
… …
531 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 661 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
532#endif 662#endif
533 } 663 }
534} 664}
535 665
536static void 666ecb_inline void
537put_padlist (pTHX_ CV *cv) 667put_padlist (pTHX_ CV *cv)
538{ 668{
539 MAGIC *mg = CORO_MAGIC_cv (cv); 669 MAGIC *mg = CORO_MAGIC_cv (cv);
540 AV *av;
541 670
542 if (expect_false (!mg)) 671 if (ecb_expect_false (!mg))
672 {
543 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 673 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
674 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
675 mg->mg_len = 1; /* so mg_free frees mg_ptr */
676 }
677 else
678 Renew (mg->mg_ptr,
679 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
680 char);
544 681
545 av = (AV *)mg->mg_obj; 682 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
546
547 if (expect_false (AvFILLp (av) >= AvMAX (av)))
548 av_extend (av, AvFILLp (av) + 1);
549
550 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
551} 683}
552 684
553/** load & save, init *******************************************************/ 685/** load & save, init *******************************************************/
686
687ecb_inline void
688swap_sv (SV *a, SV *b)
689{
690 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
691 SV tmp;
692
693 /* swap sv_any */
694 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
695
696 /* swap sv_flags */
697 SvFLAGS (&tmp) = SvFLAGS (a);
698 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
699 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
700
701#if PERL_VERSION_ATLEAST (5,10,0)
702 /* perl 5.10 and later complicates this _quite_ a bit, but it also
703 * is much faster, so no quarrels here. alternatively, we could
704 * sv_upgrade to avoid this.
705 */
706 {
707 /* swap sv_u */
708 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
709
710 /* if SvANY points to the head, we need to adjust the pointers,
711 * as the pointer for a still points to b, and maybe vice versa.
712 */
713 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
714 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
715 svany_in_head_set |= 1 << SVt_NV;
716 #endif
717
718 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
719
720 if (svany_in_head (SvTYPE (a)))
721 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
722
723 if (svany_in_head (SvTYPE (b)))
724 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
725 }
726#endif
727}
728
729/* swap sv heads, at least logically */
730static void
731swap_svs_enter (pTHX_ Coro__State c)
732{
733 int i;
734
735 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
736 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
737}
738
739static void
740swap_svs_leave (pTHX_ Coro__State c)
741{
742 int i;
743
744 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
745 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
746}
747
748#define SWAP_SVS_ENTER(coro) \
749 if (ecb_expect_false ((coro)->swap_sv)) \
750 swap_svs_enter (aTHX_ (coro))
751
752#define SWAP_SVS_LEAVE(coro) \
753 if (ecb_expect_false ((coro)->swap_sv)) \
754 swap_svs_leave (aTHX_ (coro))
554 755
555static void 756static void
556on_enterleave_call (pTHX_ SV *cb); 757on_enterleave_call (pTHX_ SV *cb);
557 758
558static void 759static void
… …
561 perl_slots *slot = c->slot; 762 perl_slots *slot = c->slot;
562 c->slot = 0; 763 c->slot = 0;
563 764
564 PL_mainstack = c->mainstack; 765 PL_mainstack = c->mainstack;
565 766
566 GvSV (PL_defgv) = slot->defsv; 767#if CORO_JIT
567 GvAV (PL_defgv) = slot->defav; 768 load_perl_slots (slot);
568 GvSV (PL_errgv) = slot->errsv; 769#else
569 GvSV (irsgv) = slot->irsgv;
570 GvHV (PL_hintgv) = slot->hinthv;
571
572 #define VAR(name,type) PL_ ## name = slot->name; 770 #define VARx(name,expr,type) expr = slot->name;
573 # include "state.h" 771 #include "state.h"
574 #undef VAR 772#endif
575 773
576 { 774 {
577 dSP; 775 dSP;
578 776
579 CV *cv; 777 CV *cv;
580 778
581 /* now do the ugly restore mess */ 779 /* now do the ugly restore mess */
582 while (expect_true (cv = (CV *)POPs)) 780 while (ecb_expect_true (cv = (CV *)POPs))
583 { 781 {
584 put_padlist (aTHX_ cv); /* mark this padlist as available */ 782 put_padlist (aTHX_ cv); /* mark this padlist as available */
585 CvDEPTH (cv) = PTR2IV (POPs); 783 CvDEPTH (cv) = PTR2IV (POPs);
586 CvPADLIST (cv) = (AV *)POPs; 784 CvPADLIST (cv) = (PADLIST *)POPs;
587 } 785 }
588 786
589 PUTBACK; 787 PUTBACK;
590 } 788 }
591 789
592 slf_frame = c->slf_frame; 790 slf_frame = c->slf_frame;
593 CORO_THROW = c->except; 791 CORO_THROW = c->except;
594 792
595 if (expect_false (enable_times)) 793 if (ecb_expect_false (enable_times))
596 { 794 {
597 if (expect_false (!times_valid)) 795 if (ecb_expect_false (!times_valid))
598 coro_times_update (); 796 coro_times_update ();
599 797
600 coro_times_sub (c); 798 coro_times_sub (c);
601 } 799 }
602 800
603 if (expect_false (c->on_enter)) 801 if (ecb_expect_false (c->on_enter))
604 { 802 {
605 int i; 803 int i;
606 804
607 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 805 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
608 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 806 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
609 } 807 }
808
809 if (ecb_expect_false (c->on_enter_xs))
810 {
811 int i;
812
813 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
814 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
815 }
816
817 SWAP_SVS_ENTER (c);
610} 818}
611 819
612static void 820static void
613save_perl (pTHX_ Coro__State c) 821save_perl (pTHX_ Coro__State c)
614{ 822{
823 SWAP_SVS_LEAVE (c);
824
825 if (ecb_expect_false (c->on_leave_xs))
826 {
827 int i;
828
829 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
830 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
831 }
832
615 if (expect_false (c->on_leave)) 833 if (ecb_expect_false (c->on_leave))
616 { 834 {
617 int i; 835 int i;
618 836
619 for (i = AvFILLp (c->on_leave); i >= 0; --i) 837 for (i = AvFILLp (c->on_leave); i >= 0; --i)
620 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 838 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
621 } 839 }
622 840
623 times_valid = 0; 841 times_valid = 0;
624 842
625 if (expect_false (enable_times)) 843 if (ecb_expect_false (enable_times))
626 { 844 {
627 coro_times_update (); times_valid = 1; 845 coro_times_update (); times_valid = 1;
628 coro_times_add (c); 846 coro_times_add (c);
629 } 847 }
630 848
… …
644 862
645 XPUSHs (Nullsv); 863 XPUSHs (Nullsv);
646 /* this loop was inspired by pp_caller */ 864 /* this loop was inspired by pp_caller */
647 for (;;) 865 for (;;)
648 { 866 {
649 while (expect_true (cxix >= 0)) 867 while (ecb_expect_true (cxix >= 0))
650 { 868 {
651 PERL_CONTEXT *cx = &ccstk[cxix--]; 869 PERL_CONTEXT *cx = &ccstk[cxix--];
652 870
653 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 871 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
654 { 872 {
655 CV *cv = cx->blk_sub.cv; 873 CV *cv = cx->blk_sub.cv;
656 874
657 if (expect_true (CvDEPTH (cv))) 875 if (ecb_expect_true (CvDEPTH (cv)))
658 { 876 {
659 EXTEND (SP, 3); 877 EXTEND (SP, 3);
660 PUSHs ((SV *)CvPADLIST (cv)); 878 PUSHs ((SV *)CvPADLIST (cv));
661 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 879 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
662 PUSHs ((SV *)cv); 880 PUSHs ((SV *)cv);
… …
665 get_padlist (aTHX_ cv); 883 get_padlist (aTHX_ cv);
666 } 884 }
667 } 885 }
668 } 886 }
669 887
670 if (expect_true (top_si->si_type == PERLSI_MAIN)) 888 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
671 break; 889 break;
672 890
673 top_si = top_si->si_prev; 891 top_si = top_si->si_prev;
674 ccstk = top_si->si_cxstack; 892 ccstk = top_si->si_cxstack;
675 cxix = top_si->si_cxix; 893 cxix = top_si->si_cxix;
… …
677 895
678 PUTBACK; 896 PUTBACK;
679 } 897 }
680 898
681 /* allocate some space on the context stack for our purposes */ 899 /* allocate some space on the context stack for our purposes */
682 /* we manually unroll here, as usually 2 slots is enough */ 900 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
683 if (SLOT_COUNT >= 1) CXINC;
684 if (SLOT_COUNT >= 2) CXINC;
685 if (SLOT_COUNT >= 3) CXINC;
686 { 901 {
687 unsigned int i; 902 unsigned int i;
903
688 for (i = 3; i < SLOT_COUNT; ++i) 904 for (i = 0; i < SLOT_COUNT; ++i)
689 CXINC; 905 CXINC;
690 } 906
691 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 907 cxstack_ix -= SLOT_COUNT; /* undo allocation */
908 }
692 909
693 c->mainstack = PL_mainstack; 910 c->mainstack = PL_mainstack;
694 911
695 { 912 {
696 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 913 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
697 914
698 slot->defav = GvAV (PL_defgv); 915#if CORO_JIT
699 slot->defsv = DEFSV; 916 save_perl_slots (slot);
700 slot->errsv = ERRSV; 917#else
701 slot->irsgv = GvSV (irsgv);
702 slot->hinthv = GvHV (PL_hintgv);
703
704 #define VAR(name,type) slot->name = PL_ ## name; 918 #define VARx(name,expr,type) slot->name = expr;
705 # include "state.h" 919 #include "state.h"
706 #undef VAR 920#endif
707 } 921 }
708} 922}
709 923
710/* 924/*
711 * allocate various perl stacks. This is almost an exact copy 925 * allocate various perl stacks. This is almost an exact copy
… …
717# define coro_init_stacks(thx) init_stacks () 931# define coro_init_stacks(thx) init_stacks ()
718#else 932#else
719static void 933static void
720coro_init_stacks (pTHX) 934coro_init_stacks (pTHX)
721{ 935{
722 PL_curstackinfo = new_stackinfo(32, 8); 936 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
723 PL_curstackinfo->si_type = PERLSI_MAIN; 937 PL_curstackinfo->si_type = PERLSI_MAIN;
724 PL_curstack = PL_curstackinfo->si_stack; 938 PL_curstack = PL_curstackinfo->si_stack;
725 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 939 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
726 940
727 PL_stack_base = AvARRAY(PL_curstack); 941 PL_stack_base = AvARRAY(PL_curstack);
… …
742#endif 956#endif
743 957
744 New(54,PL_scopestack,8,I32); 958 New(54,PL_scopestack,8,I32);
745 PL_scopestack_ix = 0; 959 PL_scopestack_ix = 0;
746 PL_scopestack_max = 8; 960 PL_scopestack_max = 8;
961#if HAS_SCOPESTACK_NAME
962 New(54,PL_scopestack_name,8,const char*);
963#endif
747 964
748 New(54,PL_savestack,24,ANY); 965 New(54,PL_savestack,24,ANY);
749 PL_savestack_ix = 0; 966 PL_savestack_ix = 0;
750 PL_savestack_max = 24; 967 PL_savestack_max = 24;
751 968
… …
779 } 996 }
780 997
781 Safefree (PL_tmps_stack); 998 Safefree (PL_tmps_stack);
782 Safefree (PL_markstack); 999 Safefree (PL_markstack);
783 Safefree (PL_scopestack); 1000 Safefree (PL_scopestack);
1001#if HAS_SCOPESTACK_NAME
1002 Safefree (PL_scopestack_name);
1003#endif
784 Safefree (PL_savestack); 1004 Safefree (PL_savestack);
785#if !PERL_VERSION_ATLEAST (5,10,0) 1005#if !PERL_VERSION_ATLEAST (5,10,0)
786 Safefree (PL_retstack); 1006 Safefree (PL_retstack);
787#endif 1007#endif
788} 1008}
… …
834#endif 1054#endif
835 1055
836/* 1056/*
837 * This overrides the default magic get method of %SIG elements. 1057 * This overrides the default magic get method of %SIG elements.
838 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1058 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
839 * and instead of trying to save and restore the hash elements, we just provide 1059 * and instead of trying to save and restore the hash elements (extremely slow),
840 * readback here. 1060 * we just provide our own readback here.
841 */ 1061 */
842static int 1062static int ecb_cold
843coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1063coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
844{ 1064{
845 const char *s = MgPV_nolen_const (mg); 1065 const char *s = MgPV_nolen_const (mg);
846 1066
847 if (*s == '_') 1067 if (*s == '_')
848 { 1068 {
849 SV **svp = 0; 1069 SV **svp = 0;
850 1070
851 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1071 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
852 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1072 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
853 1073
854 if (svp) 1074 if (svp)
855 { 1075 {
856 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1076 SV *ssv;
1077
1078 if (!*svp)
1079 ssv = &PL_sv_undef;
1080 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1081 ssv = sv_2mortal (newRV_inc (*svp));
1082 else
1083 ssv = *svp;
1084
1085 sv_setsv (sv, ssv);
857 return 0; 1086 return 0;
858 } 1087 }
859 } 1088 }
860 1089
861 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1090 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
862} 1091}
863 1092
864static int 1093static int ecb_cold
865coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1094coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
866{ 1095{
867 const char *s = MgPV_nolen_const (mg); 1096 const char *s = MgPV_nolen_const (mg);
868 1097
869 if (*s == '_') 1098 if (*s == '_')
… …
883 } 1112 }
884 1113
885 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1114 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
886} 1115}
887 1116
888static int 1117static int ecb_cold
889coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1118coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
890{ 1119{
891 const char *s = MgPV_nolen_const (mg); 1120 const char *s = MgPV_nolen_const (mg);
892 1121
893 if (*s == '_') 1122 if (*s == '_')
… …
926slf_check_repeat (pTHX_ struct CoroSLF *frame) 1155slf_check_repeat (pTHX_ struct CoroSLF *frame)
927{ 1156{
928 return 1; 1157 return 1;
929} 1158}
930 1159
931static UNOP coro_setup_op; 1160static UNOP init_perl_op;
932 1161
933static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1162ecb_noinline static void /* noinline to keep it out of the transfer fast path */
934coro_setup (pTHX_ struct coro *coro) 1163init_perl (pTHX_ struct coro *coro)
935{ 1164{
936 /* 1165 /*
937 * emulate part of the perl startup here. 1166 * emulate part of the perl startup here.
938 */ 1167 */
939 coro_init_stacks (aTHX); 1168 coro_init_stacks (aTHX);
… …
946 PL_comppad_name_fill = 0; 1175 PL_comppad_name_fill = 0;
947 PL_comppad_name_floor = 0; 1176 PL_comppad_name_floor = 0;
948 PL_curpm = 0; 1177 PL_curpm = 0;
949 PL_curpad = 0; 1178 PL_curpad = 0;
950 PL_localizing = 0; 1179 PL_localizing = 0;
951 PL_dirty = 0;
952 PL_restartop = 0; 1180 PL_restartop = 0;
953#if PERL_VERSION_ATLEAST (5,10,0) 1181#if PERL_VERSION_ATLEAST (5,10,0)
954 PL_parser = 0; 1182 PL_parser = 0;
955#endif 1183#endif
956 PL_hints = 0; 1184 PL_hints = 0;
957 1185
958 /* recreate the die/warn hooks */ 1186 /* recreate the die/warn hooks */
959 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1187 PL_diehook = SvREFCNT_inc (rv_diehook);
960 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1188 PL_warnhook = SvREFCNT_inc (rv_warnhook);
961 1189
962 GvSV (PL_defgv) = newSV (0); 1190 GvSV (PL_defgv) = newSV (0);
963 GvAV (PL_defgv) = coro->args; coro->args = 0; 1191 GvAV (PL_defgv) = coro->args; coro->args = 0;
964 GvSV (PL_errgv) = newSV (0); 1192 GvSV (PL_errgv) = newSV (0);
965 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1193 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
966 GvHV (PL_hintgv) = 0; 1194 GvHV (PL_hintgv) = newHV ();
1195#if PERL_VERSION_ATLEAST (5,10,0)
1196 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1197#endif
967 PL_rs = newSVsv (GvSV (irsgv)); 1198 PL_rs = newSVsv (GvSV (irsgv));
968 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1199 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
969 1200
970 { 1201 {
971 dSP; 1202 dSP;
… …
986 /* this newly created coroutine might be run on an existing cctx which most 1217 /* this newly created coroutine might be run on an existing cctx which most
987 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1218 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
988 */ 1219 */
989 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1220 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
990 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1221 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1222 slf_frame.destroy = 0;
991 1223
992 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1224 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
993 coro_setup_op.op_next = PL_op; 1225 init_perl_op.op_next = PL_op;
994 coro_setup_op.op_type = OP_ENTERSUB; 1226 init_perl_op.op_type = OP_ENTERSUB;
995 coro_setup_op.op_ppaddr = pp_slf; 1227 init_perl_op.op_ppaddr = pp_slf;
996 /* no flags etc. required, as an init function won't be called */ 1228 /* no flags etc. required, as an init function won't be called */
997 1229
998 PL_op = (OP *)&coro_setup_op; 1230 PL_op = (OP *)&init_perl_op;
999 1231
1000 /* copy throw, in case it was set before coro_setup */ 1232 /* copy throw, in case it was set before init_perl */
1001 CORO_THROW = coro->except; 1233 CORO_THROW = coro->except;
1002 1234
1235 SWAP_SVS_ENTER (coro);
1236
1003 if (expect_false (enable_times)) 1237 if (ecb_expect_false (enable_times))
1004 { 1238 {
1005 coro_times_update (); 1239 coro_times_update ();
1006 coro_times_sub (coro); 1240 coro_times_sub (coro);
1007 } 1241 }
1008} 1242}
… …
1027 dounwind (-1); 1261 dounwind (-1);
1028 } 1262 }
1029} 1263}
1030 1264
1031static void 1265static void
1032coro_destruct_perl (pTHX_ struct coro *coro) 1266destroy_perl (pTHX_ struct coro *coro)
1033{ 1267{
1034 SV *svf [9]; 1268 SV *svf [9];
1035 1269
1036 { 1270 {
1271 SV *old_current = SvRV (coro_current);
1037 struct coro *current = SvSTATE_current; 1272 struct coro *current = SvSTATE (old_current);
1038 1273
1039 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1274 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1040 1275
1041 save_perl (aTHX_ current); 1276 save_perl (aTHX_ current);
1277
1278 /* this will cause transfer_check to croak on block*/
1279 SvRV_set (coro_current, (SV *)coro->hv);
1280
1042 load_perl (aTHX_ coro); 1281 load_perl (aTHX_ coro);
1043 1282
1283 /* restore swapped sv's */
1284 SWAP_SVS_LEAVE (coro);
1285
1044 coro_unwind_stacks (aTHX); 1286 coro_unwind_stacks (aTHX);
1287
1045 coro_destruct_stacks (aTHX); 1288 coro_destruct_stacks (aTHX);
1046 1289
1047 // now save some sv's to be free'd later 1290 /* now save some sv's to be free'd later */
1048 svf [0] = GvSV (PL_defgv); 1291 svf [0] = GvSV (PL_defgv);
1049 svf [1] = (SV *)GvAV (PL_defgv); 1292 svf [1] = (SV *)GvAV (PL_defgv);
1050 svf [2] = GvSV (PL_errgv); 1293 svf [2] = GvSV (PL_errgv);
1051 svf [3] = (SV *)PL_defoutgv; 1294 svf [3] = (SV *)PL_defoutgv;
1052 svf [4] = PL_rs; 1295 svf [4] = PL_rs;
… …
1054 svf [6] = (SV *)GvHV (PL_hintgv); 1297 svf [6] = (SV *)GvHV (PL_hintgv);
1055 svf [7] = PL_diehook; 1298 svf [7] = PL_diehook;
1056 svf [8] = PL_warnhook; 1299 svf [8] = PL_warnhook;
1057 assert (9 == sizeof (svf) / sizeof (*svf)); 1300 assert (9 == sizeof (svf) / sizeof (*svf));
1058 1301
1302 SvRV_set (coro_current, old_current);
1303
1059 load_perl (aTHX_ current); 1304 load_perl (aTHX_ current);
1060 } 1305 }
1061 1306
1062 { 1307 {
1063 unsigned int i; 1308 unsigned int i;
… …
1067 1312
1068 SvREFCNT_dec (coro->saved_deffh); 1313 SvREFCNT_dec (coro->saved_deffh);
1069 SvREFCNT_dec (coro->rouse_cb); 1314 SvREFCNT_dec (coro->rouse_cb);
1070 SvREFCNT_dec (coro->invoke_cb); 1315 SvREFCNT_dec (coro->invoke_cb);
1071 SvREFCNT_dec (coro->invoke_av); 1316 SvREFCNT_dec (coro->invoke_av);
1317 SvREFCNT_dec (coro->on_enter_xs);
1318 SvREFCNT_dec (coro->on_leave_xs);
1072 } 1319 }
1073} 1320}
1074 1321
1075INLINE void 1322ecb_inline void
1076free_coro_mortal (pTHX) 1323free_coro_mortal (pTHX)
1077{ 1324{
1078 if (expect_true (coro_mortal)) 1325 if (ecb_expect_true (coro_mortal))
1079 { 1326 {
1080 SvREFCNT_dec (coro_mortal); 1327 SvREFCNT_dec ((SV *)coro_mortal);
1081 coro_mortal = 0; 1328 coro_mortal = 0;
1082 } 1329 }
1083} 1330}
1084 1331
1085static int 1332static int
… …
1139 1386
1140 if (PL_curcop != &PL_compiling) 1387 if (PL_curcop != &PL_compiling)
1141 { 1388 {
1142 SV **cb; 1389 SV **cb;
1143 1390
1144 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1391 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1145 { 1392 {
1146 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1393 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1147 1394
1148 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1395 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1149 { 1396 {
… …
1218 1465
1219 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1466 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1220} 1467}
1221 1468
1222/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1469/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1223static void NOINLINE 1470static void ecb_noinline
1224cctx_prepare (pTHX) 1471cctx_prepare (pTHX)
1225{ 1472{
1226 PL_top_env = &PL_start_env; 1473 PL_top_env = &PL_start_env;
1227 1474
1228 if (cctx_current->flags & CC_TRACE) 1475 if (cctx_current->flags & CC_TRACE)
… …
1239 slf_frame.prepare = slf_prepare_set_stacklevel; 1486 slf_frame.prepare = slf_prepare_set_stacklevel;
1240 slf_frame.check = slf_check_set_stacklevel; 1487 slf_frame.check = slf_check_set_stacklevel;
1241} 1488}
1242 1489
1243/* the tail of transfer: execute stuff we can only do after a transfer */ 1490/* the tail of transfer: execute stuff we can only do after a transfer */
1244INLINE void 1491ecb_inline void
1245transfer_tail (pTHX) 1492transfer_tail (pTHX)
1246{ 1493{
1247 free_coro_mortal (aTHX); 1494 free_coro_mortal (aTHX);
1495}
1496
1497/* try to exit the same way perl's main function would do */
1498/* we do not bother resetting the environment or other things *7
1499/* that are not, uhm, essential */
1500/* this obviously also doesn't work when perl is embedded */
1501static void ecb_noinline ecb_cold
1502perlish_exit (pTHX)
1503{
1504 int exitstatus = perl_destruct (PL_curinterp);
1505 perl_free (PL_curinterp);
1506 exit (exitstatus);
1248} 1507}
1249 1508
1250/* 1509/*
1251 * this is a _very_ stripped down perl interpreter ;) 1510 * this is a _very_ stripped down perl interpreter ;)
1252 */ 1511 */
… …
1281 */ 1540 */
1282 1541
1283 /* 1542 /*
1284 * If perl-run returns we assume exit() was being called or the coro 1543 * 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) 1544 * 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 1545 * 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" 1546 * 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 */ 1547 */
1292 PL_top_env = main_top_env; 1548 perlish_exit (aTHX);
1293 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1294 } 1549 }
1295} 1550}
1296 1551
1297static coro_cctx * 1552static coro_cctx *
1298cctx_new () 1553cctx_new (void)
1299{ 1554{
1300 coro_cctx *cctx; 1555 coro_cctx *cctx;
1301 1556
1302 ++cctx_count; 1557 ++cctx_count;
1303 New (0, cctx, 1, coro_cctx); 1558 New (0, cctx, 1, coro_cctx);
… …
1309 return cctx; 1564 return cctx;
1310} 1565}
1311 1566
1312/* create a new cctx only suitable as source */ 1567/* create a new cctx only suitable as source */
1313static coro_cctx * 1568static coro_cctx *
1314cctx_new_empty () 1569cctx_new_empty (void)
1315{ 1570{
1316 coro_cctx *cctx = cctx_new (); 1571 coro_cctx *cctx = cctx_new ();
1317 1572
1318 cctx->sptr = 0; 1573 cctx->stack.sptr = 0;
1319 coro_create (&cctx->cctx, 0, 0, 0, 0); 1574 coro_create (&cctx->cctx, 0, 0, 0, 0);
1320 1575
1321 return cctx; 1576 return cctx;
1322} 1577}
1323 1578
1324/* create a new cctx suitable as destination/running a perl interpreter */ 1579/* create a new cctx suitable as destination/running a perl interpreter */
1325static coro_cctx * 1580static coro_cctx *
1326cctx_new_run () 1581cctx_new_run (void)
1327{ 1582{
1328 coro_cctx *cctx = cctx_new (); 1583 coro_cctx *cctx = cctx_new ();
1329 void *stack_start;
1330 size_t stack_size;
1331 1584
1332#if HAVE_MMAP 1585 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 } 1586 {
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."); 1587 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1355 _exit (EXIT_FAILURE); 1588 _exit (EXIT_FAILURE);
1356 }
1357
1358 stack_start = cctx->sptr;
1359 stack_size = cctx->ssize;
1360 } 1589 }
1361 1590
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); 1591 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1367 1592
1368 return cctx; 1593 return cctx;
1369} 1594}
1370 1595
1371static void 1596static void
1372cctx_destroy (coro_cctx *cctx) 1597cctx_destroy (coro_cctx *cctx)
1373{ 1598{
1374 if (!cctx) 1599 if (!cctx)
1375 return; 1600 return;
1376 1601
1377 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1602 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1378 1603
1379 --cctx_count; 1604 --cctx_count;
1380 coro_destroy (&cctx->cctx); 1605 coro_destroy (&cctx->cctx);
1381 1606
1382 /* coro_transfer creates new, empty cctx's */ 1607 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 1608
1397 Safefree (cctx); 1609 Safefree (cctx);
1398} 1610}
1399 1611
1400/* wether this cctx should be destructed */ 1612/* wether this cctx should be destructed */
1401#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1613#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1402 1614
1403static coro_cctx * 1615static coro_cctx *
1404cctx_get (pTHX) 1616cctx_get (pTHX)
1405{ 1617{
1406 while (expect_true (cctx_first)) 1618 while (ecb_expect_true (cctx_first))
1407 { 1619 {
1408 coro_cctx *cctx = cctx_first; 1620 coro_cctx *cctx = cctx_first;
1409 cctx_first = cctx->next; 1621 cctx_first = cctx->next;
1410 --cctx_idle; 1622 --cctx_idle;
1411 1623
1412 if (expect_true (!CCTX_EXPIRED (cctx))) 1624 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1413 return cctx; 1625 return cctx;
1414 1626
1415 cctx_destroy (cctx); 1627 cctx_destroy (cctx);
1416 } 1628 }
1417 1629
… …
1419} 1631}
1420 1632
1421static void 1633static void
1422cctx_put (coro_cctx *cctx) 1634cctx_put (coro_cctx *cctx)
1423{ 1635{
1424 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1636 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1425 1637
1426 /* free another cctx if overlimit */ 1638 /* free another cctx if overlimit */
1427 if (expect_false (cctx_idle >= cctx_max_idle)) 1639 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1428 { 1640 {
1429 coro_cctx *first = cctx_first; 1641 coro_cctx *first = cctx_first;
1430 cctx_first = first->next; 1642 cctx_first = first->next;
1431 --cctx_idle; 1643 --cctx_idle;
1432 1644
… …
1443static void 1655static void
1444transfer_check (pTHX_ struct coro *prev, struct coro *next) 1656transfer_check (pTHX_ struct coro *prev, struct coro *next)
1445{ 1657{
1446 /* TODO: throwing up here is considered harmful */ 1658 /* TODO: throwing up here is considered harmful */
1447 1659
1448 if (expect_true (prev != next)) 1660 if (ecb_expect_true (prev != next))
1449 { 1661 {
1450 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1662 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,"); 1663 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1452 1664
1453 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1665 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,"); 1666 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1455 1667
1456#if !PERL_VERSION_ATLEAST (5,10,0) 1668#if !PERL_VERSION_ATLEAST (5,10,0)
1457 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1669 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,"); 1670 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1459#endif 1671#endif
1460 } 1672 }
1461} 1673}
1462 1674
1463/* always use the TRANSFER macro */ 1675/* always use the TRANSFER macro */
1464static void NOINLINE /* noinline so we have a fixed stackframe */ 1676static void ecb_noinline /* noinline so we have a fixed stackframe */
1465transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1677transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1466{ 1678{
1467 dSTACKLEVEL; 1679 dSTACKLEVEL;
1468 1680
1469 /* sometimes transfer is only called to set idle_sp */ 1681 /* sometimes transfer is only called to set idle_sp */
1470 if (expect_false (!prev)) 1682 if (ecb_expect_false (!prev))
1471 { 1683 {
1472 cctx_current->idle_sp = STACKLEVEL; 1684 cctx_current->idle_sp = STACKLEVEL;
1473 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1685 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1474 } 1686 }
1475 else if (expect_true (prev != next)) 1687 else if (ecb_expect_true (prev != next))
1476 { 1688 {
1477 coro_cctx *cctx_prev; 1689 coro_cctx *cctx_prev;
1478 1690
1479 if (expect_false (prev->flags & CF_NEW)) 1691 if (ecb_expect_false (prev->flags & CF_NEW))
1480 { 1692 {
1481 /* create a new empty/source context */ 1693 /* create a new empty/source context */
1482 prev->flags &= ~CF_NEW; 1694 prev->flags &= ~CF_NEW;
1483 prev->flags |= CF_RUNNING; 1695 prev->flags |= CF_RUNNING;
1484 } 1696 }
… …
1487 next->flags |= CF_RUNNING; 1699 next->flags |= CF_RUNNING;
1488 1700
1489 /* first get rid of the old state */ 1701 /* first get rid of the old state */
1490 save_perl (aTHX_ prev); 1702 save_perl (aTHX_ prev);
1491 1703
1492 if (expect_false (next->flags & CF_NEW)) 1704 if (ecb_expect_false (next->flags & CF_NEW))
1493 { 1705 {
1494 /* need to start coroutine */ 1706 /* need to start coroutine */
1495 next->flags &= ~CF_NEW; 1707 next->flags &= ~CF_NEW;
1496 /* setup coroutine call */ 1708 /* setup coroutine call */
1497 coro_setup (aTHX_ next); 1709 init_perl (aTHX_ next);
1498 } 1710 }
1499 else 1711 else
1500 load_perl (aTHX_ next); 1712 load_perl (aTHX_ next);
1501 1713
1502 /* possibly untie and reuse the cctx */ 1714 /* possibly untie and reuse the cctx */
1503 if (expect_true ( 1715 if (ecb_expect_true (
1504 cctx_current->idle_sp == STACKLEVEL 1716 cctx_current->idle_sp == STACKLEVEL
1505 && !(cctx_current->flags & CC_TRACE) 1717 && !(cctx_current->flags & CC_TRACE)
1506 && !force_cctx 1718 && !force_cctx
1507 )) 1719 ))
1508 { 1720 {
1509 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1721 /* 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)); 1722 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1511 1723
1512 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1724 /* 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 */ 1725 /* without this the next cctx_get might destroy the running cctx while still in use */
1514 if (expect_false (CCTX_EXPIRED (cctx_current))) 1726 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1515 if (expect_true (!next->cctx)) 1727 if (ecb_expect_true (!next->cctx))
1516 next->cctx = cctx_get (aTHX); 1728 next->cctx = cctx_get (aTHX);
1517 1729
1518 cctx_put (cctx_current); 1730 cctx_put (cctx_current);
1519 } 1731 }
1520 else 1732 else
1521 prev->cctx = cctx_current; 1733 prev->cctx = cctx_current;
1522 1734
1523 ++next->usecount; 1735 ++next->usecount;
1524 1736
1525 cctx_prev = cctx_current; 1737 cctx_prev = cctx_current;
1526 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1738 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1527 1739
1528 next->cctx = 0; 1740 next->cctx = 0;
1529 1741
1530 if (expect_false (cctx_prev != cctx_current)) 1742 if (ecb_expect_false (cctx_prev != cctx_current))
1531 { 1743 {
1532 cctx_prev->top_env = PL_top_env; 1744 cctx_prev->top_env = PL_top_env;
1533 PL_top_env = cctx_current->top_env; 1745 PL_top_env = cctx_current->top_env;
1534 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1746 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1535 } 1747 }
… …
1541#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1753#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) 1754#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1543 1755
1544/** high level stuff ********************************************************/ 1756/** high level stuff ********************************************************/
1545 1757
1758/* this function is actually Coro, not Coro::State, but we call it from here */
1759/* because it is convenient - but it hasn't been declared yet for that reason */
1546static int 1760static void
1761coro_call_on_destroy (pTHX_ struct coro *coro);
1762
1763static void
1547coro_state_destroy (pTHX_ struct coro *coro) 1764coro_state_destroy (pTHX_ struct coro *coro)
1548{ 1765{
1549 if (coro->flags & CF_DESTROYED) 1766 if (coro->flags & CF_ZOMBIE)
1550 return 0; 1767 return;
1551 1768
1552 if (coro->on_destroy && !PL_dirty)
1553 coro->on_destroy (aTHX_ coro); 1769 slf_destroy (aTHX_ coro);
1554 1770
1555 coro->flags |= CF_DESTROYED; 1771 coro->flags |= CF_ZOMBIE;
1556 1772
1557 if (coro->flags & CF_READY) 1773 if (coro->flags & CF_READY)
1558 { 1774 {
1559 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1775 /* reduce nready, as destroying a ready coro effectively unreadies it */
1560 /* alternative: look through all ready queues and remove the coro */ 1776 /* alternative: look through all ready queues and remove the coro */
1561 --coro_nready; 1777 --coro_nready;
1562 } 1778 }
1563 else 1779 else
1564 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1780 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1781
1782 if (coro->next) coro->next->prev = coro->prev;
1783 if (coro->prev) coro->prev->next = coro->next;
1784 if (coro == coro_first) coro_first = coro->next;
1565 1785
1566 if (coro->mainstack 1786 if (coro->mainstack
1567 && coro->mainstack != main_mainstack 1787 && coro->mainstack != main_mainstack
1568 && coro->slot 1788 && coro->slot
1569 && !PL_dirty) 1789 && !PL_dirty)
1570 coro_destruct_perl (aTHX_ coro); 1790 destroy_perl (aTHX_ coro);
1571 1791
1572 cctx_destroy (coro->cctx); 1792 cctx_destroy (coro->cctx);
1573 SvREFCNT_dec (coro->startcv); 1793 SvREFCNT_dec (coro->startcv);
1574 SvREFCNT_dec (coro->args); 1794 SvREFCNT_dec (coro->args);
1795 SvREFCNT_dec (coro->swap_sv);
1575 SvREFCNT_dec (CORO_THROW); 1796 SvREFCNT_dec (CORO_THROW);
1576 1797
1577 if (coro->next) coro->next->prev = coro->prev; 1798 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 1799
1581 return 1; 1800 /* more destruction mayhem in coro_state_free */
1582} 1801}
1583 1802
1584static int 1803static int
1585coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1804coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1586{ 1805{
1587 struct coro *coro = (struct coro *)mg->mg_ptr; 1806 struct coro *coro = (struct coro *)mg->mg_ptr;
1588 mg->mg_ptr = 0; 1807 mg->mg_ptr = 0;
1589 1808
1590 coro->hv = 0;
1591
1592 if (--coro->refcnt < 0)
1593 {
1594 coro_state_destroy (aTHX_ coro); 1809 coro_state_destroy (aTHX_ coro);
1810 SvREFCNT_dec (coro->on_destroy);
1811 SvREFCNT_dec (coro->status);
1812
1595 Safefree (coro); 1813 Safefree (coro);
1596 }
1597 1814
1598 return 0; 1815 return 0;
1599} 1816}
1600 1817
1601static int 1818static int ecb_cold
1602coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1819coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1603{ 1820{
1604 struct coro *coro = (struct coro *)mg->mg_ptr; 1821 /* called when perl clones the current process the slow way (windows process emulation) */
1605 1822 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1606 ++coro->refcnt; 1823 mg->mg_ptr = 0;
1824 mg->mg_virtual = 0;
1607 1825
1608 return 0; 1826 return 0;
1609} 1827}
1610 1828
1611static MGVTBL coro_state_vtbl = { 1829static MGVTBL coro_state_vtbl = {
… …
1636 TRANSFER (ta, 1); 1854 TRANSFER (ta, 1);
1637} 1855}
1638 1856
1639/** Coro ********************************************************************/ 1857/** Coro ********************************************************************/
1640 1858
1641INLINE void 1859ecb_inline void
1642coro_enq (pTHX_ struct coro *coro) 1860coro_enq (pTHX_ struct coro *coro)
1643{ 1861{
1644 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1862 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1645 1863
1646 SvREFCNT_inc_NN (coro->hv); 1864 SvREFCNT_inc_NN (coro->hv);
… …
1648 coro->next_ready = 0; 1866 coro->next_ready = 0;
1649 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1867 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1650 ready [1] = coro; 1868 ready [1] = coro;
1651} 1869}
1652 1870
1653INLINE struct coro * 1871ecb_inline struct coro *
1654coro_deq (pTHX) 1872coro_deq (pTHX)
1655{ 1873{
1656 int prio; 1874 int prio;
1657 1875
1658 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1876 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1711{ 1929{
1712 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1930 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1713} 1931}
1714 1932
1715/* expects to own a reference to next->hv */ 1933/* expects to own a reference to next->hv */
1716INLINE void 1934ecb_inline void
1717prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1935prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1718{ 1936{
1719 SV *prev_sv = SvRV (coro_current); 1937 SV *prev_sv = SvRV (coro_current);
1720 1938
1721 ta->prev = SvSTATE_hv (prev_sv); 1939 ta->prev = SvSTATE_hv (prev_sv);
… …
1734{ 1952{
1735 for (;;) 1953 for (;;)
1736 { 1954 {
1737 struct coro *next = coro_deq (aTHX); 1955 struct coro *next = coro_deq (aTHX);
1738 1956
1739 if (expect_true (next)) 1957 if (ecb_expect_true (next))
1740 { 1958 {
1741 /* cannot transfer to destroyed coros, skip and look for next */ 1959 /* cannot transfer to destroyed coros, skip and look for next */
1742 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1960 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 */ 1961 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1744 else 1962 else
1745 { 1963 {
1746 next->flags &= ~CF_READY; 1964 next->flags &= ~CF_READY;
1747 --coro_nready; 1965 --coro_nready;
… …
1754 { 1972 {
1755 /* nothing to schedule: call the idle handler */ 1973 /* nothing to schedule: call the idle handler */
1756 if (SvROK (sv_idle) 1974 if (SvROK (sv_idle)
1757 && SvOBJECT (SvRV (sv_idle))) 1975 && SvOBJECT (SvRV (sv_idle)))
1758 { 1976 {
1977 if (SvRV (sv_idle) == SvRV (coro_current))
1978 {
1979 require_pv ("Carp");
1980
1981 {
1982 dSP;
1983
1984 ENTER;
1985 SAVETMPS;
1986
1987 PUSHMARK (SP);
1988 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1989 PUTBACK;
1990 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1991
1992 FREETMPS;
1993 LEAVE;
1994 }
1995 }
1996
1759 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1997 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1760 api_ready (aTHX_ SvRV (sv_idle)); 1998 api_ready (aTHX_ SvRV (sv_idle));
1761 --coro_nready; 1999 --coro_nready;
1762 } 2000 }
1763 else 2001 else
1764 { 2002 {
2003 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1765 dSP; 2004 dSP;
1766 2005
1767 ENTER; 2006 ENTER;
1768 SAVETMPS; 2007 SAVETMPS;
1769 2008
… …
1776 } 2015 }
1777 } 2016 }
1778 } 2017 }
1779} 2018}
1780 2019
1781INLINE void 2020ecb_inline void
1782prepare_cede (pTHX_ struct coro_transfer_args *ta) 2021prepare_cede (pTHX_ struct coro_transfer_args *ta)
1783{ 2022{
1784 api_ready (aTHX_ coro_current); 2023 api_ready (aTHX_ coro_current);
1785 prepare_schedule (aTHX_ ta); 2024 prepare_schedule (aTHX_ ta);
1786} 2025}
1787 2026
1788INLINE void 2027ecb_inline void
1789prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2028prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1790{ 2029{
1791 SV *prev = SvRV (coro_current); 2030 SV *prev = SvRV (coro_current);
1792 2031
1793 if (coro_nready) 2032 if (coro_nready)
… …
1823{ 2062{
1824 struct coro_transfer_args ta; 2063 struct coro_transfer_args ta;
1825 2064
1826 prepare_cede (aTHX_ &ta); 2065 prepare_cede (aTHX_ &ta);
1827 2066
1828 if (expect_true (ta.prev != ta.next)) 2067 if (ecb_expect_true (ta.prev != ta.next))
1829 { 2068 {
1830 TRANSFER (ta, 1); 2069 TRANSFER (ta, 1);
1831 return 1; 2070 return 1;
1832 } 2071 }
1833 else 2072 else
… …
1876 coro->slot->runops = RUNOPS_DEFAULT; 2115 coro->slot->runops = RUNOPS_DEFAULT;
1877 } 2116 }
1878} 2117}
1879 2118
1880static void 2119static void
2120coro_push_av (pTHX_ AV *av, I32 gimme_v)
2121{
2122 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2123 {
2124 dSP;
2125
2126 if (gimme_v == G_SCALAR)
2127 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2128 else
2129 {
2130 int i;
2131 EXTEND (SP, AvFILLp (av) + 1);
2132
2133 for (i = 0; i <= AvFILLp (av); ++i)
2134 PUSHs (AvARRAY (av)[i]);
2135 }
2136
2137 PUTBACK;
2138 }
2139}
2140
2141static void
2142coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2143{
2144 if (!coro->on_destroy)
2145 coro->on_destroy = newAV ();
2146
2147 av_push (coro->on_destroy, cb);
2148}
2149
2150static void
2151slf_destroy_join (pTHX_ struct CoroSLF *frame)
2152{
2153 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2154}
2155
2156static int
2157slf_check_join (pTHX_ struct CoroSLF *frame)
2158{
2159 struct coro *coro = (struct coro *)frame->data;
2160
2161 if (!coro->status)
2162 return 1;
2163
2164 frame->destroy = 0;
2165
2166 coro_push_av (aTHX_ coro->status, GIMME_V);
2167
2168 SvREFCNT_dec ((SV *)coro->hv);
2169
2170 return 0;
2171}
2172
2173static void
2174slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2175{
2176 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2177
2178 if (items > 1)
2179 croak ("join called with too many arguments");
2180
2181 if (coro->status)
2182 frame->prepare = prepare_nop;
2183 else
2184 {
2185 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2186 frame->prepare = prepare_schedule;
2187 }
2188
2189 frame->check = slf_check_join;
2190 frame->destroy = slf_destroy_join;
2191 frame->data = (void *)coro;
2192 SvREFCNT_inc (coro->hv);
2193}
2194
2195static void
1881coro_call_on_destroy (pTHX_ struct coro *coro) 2196coro_call_on_destroy (pTHX_ struct coro *coro)
1882{ 2197{
1883 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2198 AV *od = coro->on_destroy;
1884 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1885 2199
1886 if (on_destroyp) 2200 if (!od)
1887 { 2201 return;
1888 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1889 2202
2203 coro->on_destroy = 0;
2204 sv_2mortal ((SV *)od);
2205
1890 while (AvFILLp (on_destroy) >= 0) 2206 while (AvFILLp (od) >= 0)
2207 {
2208 SV *cb = sv_2mortal (av_pop (od));
2209
2210 /* coro hv's (and only hv's at the moment) are supported as well */
2211 if (SvSTATEhv_p (aTHX_ cb))
2212 api_ready (aTHX_ cb);
2213 else
1891 { 2214 {
1892 dSP; /* don't disturb outer sp */ 2215 dSP; /* don't disturb outer sp */
1893 SV *cb = av_pop (on_destroy);
1894
1895 PUSHMARK (SP); 2216 PUSHMARK (SP);
1896 2217
1897 if (statusp) 2218 if (coro->status)
1898 { 2219 {
1899 int i; 2220 PUTBACK;
1900 AV *status = (AV *)SvRV (*statusp); 2221 coro_push_av (aTHX_ coro->status, G_ARRAY);
1901 EXTEND (SP, AvFILLp (status) + 1); 2222 SPAGAIN;
1902
1903 for (i = 0; i <= AvFILLp (status); ++i)
1904 PUSHs (AvARRAY (status)[i]);
1905 } 2223 }
1906 2224
1907 PUTBACK; 2225 PUTBACK;
1908 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2226 call_sv (cb, G_VOID | G_DISCARD);
1909 } 2227 }
1910 } 2228 }
1911} 2229}
1912 2230
1913static void 2231static void
1914slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2232coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1915{ 2233{
1916 int i; 2234 AV *av;
1917 HV *hv = (HV *)SvRV (coro_current); 2235
1918 AV *av = newAV (); 2236 if (coro->status)
2237 {
2238 av = coro->status;
2239 av_clear (av);
2240 }
2241 else
2242 av = coro->status = newAV ();
1919 2243
1920 /* items are actually not so common, so optimise for this case */ 2244 /* items are actually not so common, so optimise for this case */
1921 if (items) 2245 if (items)
1922 { 2246 {
2247 int i;
2248
1923 av_extend (av, items - 1); 2249 av_extend (av, items - 1);
1924 2250
1925 for (i = 0; i < items; ++i) 2251 for (i = 0; i < items; ++i)
1926 av_push (av, SvREFCNT_inc_NN (arg [i])); 2252 av_push (av, SvREFCNT_inc_NN (arg [i]));
1927 } 2253 }
2254}
1928 2255
1929 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2256static void
1930 2257slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2258{
1931 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2259 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1932 api_ready (aTHX_ sv_manager); 2260 api_ready (aTHX_ sv_manager);
1933 2261
1934 frame->prepare = prepare_schedule; 2262 frame->prepare = prepare_schedule;
1935 frame->check = slf_check_repeat; 2263 frame->check = slf_check_repeat;
1936 2264
1937 /* as a minor optimisation, we could unwind all stacks here */ 2265 /* as a minor optimisation, we could unwind all stacks here */
1938 /* but that puts extra pressure on pp_slf, and is not worth much */ 2266 /* but that puts extra pressure on pp_slf, and is not worth much */
1939 /*coro_unwind_stacks (aTHX);*/ 2267 /*coro_unwind_stacks (aTHX);*/
2268}
2269
2270static void
2271slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2272{
2273 HV *coro_hv = (HV *)SvRV (coro_current);
2274
2275 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2276 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2277}
2278
2279static void
2280slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2281{
2282 HV *coro_hv;
2283 struct coro *coro;
2284
2285 if (items <= 0)
2286 croak ("Coro::cancel called without coro object,");
2287
2288 coro = SvSTATE (arg [0]);
2289 coro_hv = coro->hv;
2290
2291 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2292
2293 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2294 {
2295 /* coro currently busy cancelling something, so just notify it */
2296 coro->slf_frame.data = (void *)coro;
2297
2298 frame->prepare = prepare_nop;
2299 frame->check = slf_check_nop;
2300 }
2301 else if (coro_hv == (HV *)SvRV (coro_current))
2302 {
2303 /* cancelling the current coro is allowed, and equals terminate */
2304 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2305 }
2306 else
2307 {
2308 struct coro *self = SvSTATE_current;
2309
2310 if (!self)
2311 croak ("Coro::cancel called outside of thread content,");
2312
2313 /* otherwise we cancel directly, purely for speed reasons
2314 * unfortunately, this requires some magic trickery, as
2315 * somebody else could cancel us, so we have to fight the cancellation.
2316 * this is ugly, and hopefully fully worth the extra speed.
2317 * besides, I can't get the slow-but-safe version working...
2318 */
2319 slf_frame.data = 0;
2320 self->flags |= CF_NOCANCEL;
2321 coro_state_destroy (aTHX_ coro);
2322 self->flags &= ~CF_NOCANCEL;
2323
2324 if (slf_frame.data)
2325 {
2326 /* while we were busy we have been cancelled, so terminate */
2327 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2328 }
2329 else
2330 {
2331 frame->prepare = prepare_nop;
2332 frame->check = slf_check_nop;
2333 }
2334 }
2335}
2336
2337static int
2338slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2339{
2340 frame->prepare = 0;
2341 coro_unwind_stacks (aTHX);
2342
2343 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2344
2345 return 1;
2346}
2347
2348static int
2349safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2350{
2351 if (coro->cctx)
2352 croak ("coro inside C callback, unable to cancel at this time, caught");
2353
2354 if (coro->flags & CF_NEW)
2355 {
2356 coro_set_status (aTHX_ coro, arg, items);
2357 coro_state_destroy (aTHX_ coro);
2358 }
2359 else
2360 {
2361 if (!coro->slf_frame.prepare)
2362 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2363
2364 slf_destroy (aTHX_ coro);
2365
2366 coro_set_status (aTHX_ coro, arg, items);
2367 coro->slf_frame.prepare = prepare_nop;
2368 coro->slf_frame.check = slf_check_safe_cancel;
2369
2370 api_ready (aTHX_ (SV *)coro->hv);
2371 }
2372
2373 return 1;
1940} 2374}
1941 2375
1942/*****************************************************************************/ 2376/*****************************************************************************/
1943/* async pool handler */ 2377/* async pool handler */
1944 2378
… …
1975slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2409slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1976{ 2410{
1977 HV *hv = (HV *)SvRV (coro_current); 2411 HV *hv = (HV *)SvRV (coro_current);
1978 struct coro *coro = SvSTATE_hv ((SV *)hv); 2412 struct coro *coro = SvSTATE_hv ((SV *)hv);
1979 2413
1980 if (expect_true (coro->saved_deffh)) 2414 if (ecb_expect_true (coro->saved_deffh))
1981 { 2415 {
1982 /* subsequent iteration */ 2416 /* subsequent iteration */
1983 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2417 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1984 coro->saved_deffh = 0; 2418 coro->saved_deffh = 0;
1985 2419
1986 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2420 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1987 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2421 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1988 { 2422 {
1989 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2423 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1990 coro->invoke_av = newAV (); 2424 return;
1991
1992 frame->prepare = prepare_nop;
1993 } 2425 }
1994 else 2426 else
1995 { 2427 {
1996 av_clear (GvAV (PL_defgv)); 2428 av_clear (GvAV (PL_defgv));
1997 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2429 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2047 2479
2048static int 2480static int
2049slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2481slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2050{ 2482{
2051 SV *data = (SV *)frame->data; 2483 SV *data = (SV *)frame->data;
2052 2484
2053 if (CORO_THROW) 2485 if (CORO_THROW)
2054 return 0; 2486 return 0;
2055 2487
2056 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2488 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2057 return 1; 2489 return 1;
… …
2093 cb = sv_2mortal (coro->rouse_cb); 2525 cb = sv_2mortal (coro->rouse_cb);
2094 coro->rouse_cb = 0; 2526 coro->rouse_cb = 0;
2095 } 2527 }
2096 2528
2097 if (!SvROK (cb) 2529 if (!SvROK (cb)
2098 || SvTYPE (SvRV (cb)) != SVt_PVCV 2530 || SvTYPE (SvRV (cb)) != SVt_PVCV
2099 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2531 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2100 croak ("Coro::rouse_wait called with illegal callback argument,"); 2532 croak ("Coro::rouse_wait called with illegal callback argument,");
2101 2533
2102 { 2534 {
2103 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2535 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2220static void 2652static void
2221slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2653slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2222{ 2654{
2223 frame->prepare = prepare_cede_notself; 2655 frame->prepare = prepare_cede_notself;
2224 frame->check = slf_check_nop; 2656 frame->check = slf_check_nop;
2657}
2658
2659/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2660static void
2661slf_destroy (pTHX_ struct coro *coro)
2662{
2663 struct CoroSLF frame = coro->slf_frame;
2664
2665 /*
2666 * The on_destroy below most likely is from an SLF call.
2667 * Since by definition the SLF call will not finish when we destroy
2668 * the coro, we will have to force-finish it here, otherwise
2669 * cleanup functions cannot call SLF functions.
2670 */
2671 coro->slf_frame.prepare = 0;
2672
2673 /* this callback is reserved for slf functions needing to do cleanup */
2674 if (frame.destroy && frame.prepare && !PL_dirty)
2675 frame.destroy (aTHX_ &frame);
2225} 2676}
2226 2677
2227/* 2678/*
2228 * these not obviously related functions are all rolled into one 2679 * these not obviously related functions are all rolled into one
2229 * function to increase chances that they all will call transfer with the same 2680 * function to increase chances that they all will call transfer with the same
… …
2236 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2687 I32 checkmark; /* mark SP to see how many elements check has pushed */
2237 2688
2238 /* set up the slf frame, unless it has already been set-up */ 2689 /* set up the slf frame, unless it has already been set-up */
2239 /* the latter happens when a new coro has been started */ 2690 /* the latter happens when a new coro has been started */
2240 /* or when a new cctx was attached to an existing coroutine */ 2691 /* or when a new cctx was attached to an existing coroutine */
2241 if (expect_true (!slf_frame.prepare)) 2692 if (ecb_expect_true (!slf_frame.prepare))
2242 { 2693 {
2243 /* first iteration */ 2694 /* first iteration */
2244 dSP; 2695 dSP;
2245 SV **arg = PL_stack_base + TOPMARK + 1; 2696 SV **arg = PL_stack_base + TOPMARK + 1;
2246 int items = SP - arg; /* args without function object */ 2697 int items = SP - arg; /* args without function object */
… …
2287 while (slf_frame.check (aTHX_ &slf_frame)); 2738 while (slf_frame.check (aTHX_ &slf_frame));
2288 2739
2289 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2740 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2290 2741
2291 /* exception handling */ 2742 /* exception handling */
2292 if (expect_false (CORO_THROW)) 2743 if (ecb_expect_false (CORO_THROW))
2293 { 2744 {
2294 SV *exception = sv_2mortal (CORO_THROW); 2745 SV *exception = sv_2mortal (CORO_THROW);
2295 2746
2296 CORO_THROW = 0; 2747 CORO_THROW = 0;
2297 sv_setsv (ERRSV, exception); 2748 sv_setsv (ERRSV, exception);
2298 croak (0); 2749 croak (0);
2299 } 2750 }
2300 2751
2301 /* return value handling - mostly like entersub */ 2752 /* return value handling - mostly like entersub */
2302 /* make sure we put something on the stack in scalar context */ 2753 /* make sure we put something on the stack in scalar context */
2303 if (GIMME_V == G_SCALAR) 2754 if (GIMME_V == G_SCALAR
2755 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2304 { 2756 {
2305 dSP; 2757 dSP;
2306 SV **bot = PL_stack_base + checkmark; 2758 SV **bot = PL_stack_base + checkmark;
2307 2759
2308 if (sp == bot) /* too few, push undef */ 2760 if (sp == bot) /* too few, push undef */
2309 bot [1] = &PL_sv_undef; 2761 bot [1] = &PL_sv_undef;
2310 else if (sp != bot + 1) /* too many, take last one */ 2762 else /* too many, take last one */
2311 bot [1] = *sp; 2763 bot [1] = *sp;
2312 2764
2313 SP = bot + 1; 2765 SP = bot + 1;
2314 2766
2315 PUTBACK; 2767 PUTBACK;
… …
2348 if (PL_op->op_flags & OPf_STACKED) 2800 if (PL_op->op_flags & OPf_STACKED)
2349 { 2801 {
2350 if (items > slf_arga) 2802 if (items > slf_arga)
2351 { 2803 {
2352 slf_arga = items; 2804 slf_arga = items;
2353 free (slf_argv); 2805 Safefree (slf_argv);
2354 slf_argv = malloc (slf_arga * sizeof (SV *)); 2806 New (0, slf_argv, slf_arga, SV *);
2355 } 2807 }
2356 2808
2357 slf_argc = items; 2809 slf_argc = items;
2358 2810
2359 for (i = 0; i < items; ++i) 2811 for (i = 0; i < items; ++i)
… …
2413{ 2865{
2414 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2866 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2415 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2867 on_enterleave_call (aTHX_ sv_2mortal (cb));
2416} 2868}
2417 2869
2870static void
2871enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2872{
2873 if (!hook)
2874 return;
2875
2876 if (!*avp)
2877 {
2878 *avp = newAV ();
2879 AvREAL_off (*avp);
2880 }
2881
2882 av_push (*avp, (SV *)hook);
2883 av_push (*avp, (SV *)arg);
2884}
2885
2886static void
2887enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2888{
2889 AV *av = *avp;
2890 int i;
2891
2892 if (!av)
2893 return;
2894
2895 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2896 if (AvARRAY (av)[i] == (SV *)hook)
2897 {
2898 if (execute)
2899 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2900
2901 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2902 av_pop (av);
2903 av_pop (av);
2904 break;
2905 }
2906
2907 if (AvFILLp (av) >= 0)
2908 {
2909 *avp = 0;
2910 SvREFCNT_dec_NN (av);
2911 }
2912}
2913
2914static void
2915api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2916{
2917 struct coro *coro = SvSTATE (coro_sv);
2918
2919 if (SvSTATE_current == coro)
2920 if (enter)
2921 enter (aTHX_ enter_arg);
2922
2923 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2924 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2925}
2926
2927static void
2928api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2929{
2930 struct coro *coro = SvSTATE (coro_sv);
2931
2932 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2933 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2934}
2935
2936static void
2937savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2938{
2939 struct coro *coro = SvSTATE_current;
2940
2941 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2942}
2943
2944static void
2945savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2946{
2947 struct coro *coro = SvSTATE_current;
2948
2949 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2950}
2951
2952static void
2953api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2954{
2955 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2956
2957 /* this ought to be much cheaper than malloc + a single destructor call */
2958 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2959 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2960}
2961
2418/*****************************************************************************/ 2962/*****************************************************************************/
2419/* PerlIO::cede */ 2963/* PerlIO::cede */
2420 2964
2421typedef struct 2965typedef struct
2422{ 2966{
2423 PerlIOBuf base; 2967 PerlIOBuf base;
2424 NV next, every; 2968 NV next, every;
2425} PerlIOCede; 2969} PerlIOCede;
2426 2970
2427static IV 2971static IV ecb_cold
2428PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2972PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2429{ 2973{
2430 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2974 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2431 2975
2432 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2976 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2433 self->next = nvtime () + self->every; 2977 self->next = nvtime () + self->every;
2434 2978
2435 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2979 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2436} 2980}
2437 2981
2438static SV * 2982static SV * ecb_cold
2439PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2983PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2440{ 2984{
2441 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2985 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2442 2986
2443 return newSVnv (self->every); 2987 return newSVnv (self->every);
… …
2550 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3094 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2551 PUTBACK; 3095 PUTBACK;
2552 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3096 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2553 } 3097 }
2554 3098
2555 SvREFCNT_dec (cb); 3099 SvREFCNT_dec_NN (cb);
2556 } 3100 }
2557} 3101}
2558 3102
2559static void 3103static void
2560coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3104coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2561{ 3105{
2562 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3106 /* call $sem->adjust (0) to possibly wake up some other waiters */
2563 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3107 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2564} 3108}
2565 3109
2566static int 3110static int
2567slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3111slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2568{ 3112{
2569 AV *av = (AV *)frame->data; 3113 AV *av = (AV *)frame->data;
2570 SV *count_sv = AvARRAY (av)[0]; 3114 SV *count_sv = AvARRAY (av)[0];
3115 SV *coro_hv = SvRV (coro_current);
3116
3117 frame->destroy = 0;
2571 3118
2572 /* if we are about to throw, don't actually acquire the lock, just throw */ 3119 /* if we are about to throw, don't actually acquire the lock, just throw */
2573 if (CORO_THROW) 3120 if (ecb_expect_false (CORO_THROW))
3121 {
3122 /* we still might be responsible for the semaphore, so wake up others */
3123 coro_semaphore_adjust (aTHX_ av, 0);
3124
2574 return 0; 3125 return 0;
3126 }
2575 else if (SvIVX (count_sv) > 0) 3127 else if (SvIVX (count_sv) > 0)
2576 { 3128 {
2577 SvSTATE_current->on_destroy = 0;
2578
2579 if (acquire) 3129 if (acquire)
2580 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3130 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2581 else 3131 else
2582 coro_semaphore_adjust (aTHX_ av, 0); 3132 coro_semaphore_adjust (aTHX_ av, 0);
2583 3133
… …
2587 { 3137 {
2588 int i; 3138 int i;
2589 /* if we were woken up but can't down, we look through the whole */ 3139 /* if we were woken up but can't down, we look through the whole */
2590 /* waiters list and only add us if we aren't in there already */ 3140 /* waiters list and only add us if we aren't in there already */
2591 /* this avoids some degenerate memory usage cases */ 3141 /* this avoids some degenerate memory usage cases */
2592 3142 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2593 for (i = 1; i <= AvFILLp (av); ++i)
2594 if (AvARRAY (av)[i] == SvRV (coro_current)) 3143 if (AvARRAY (av)[i] == coro_hv)
2595 return 1; 3144 return 1;
2596 3145
2597 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3146 av_push (av, SvREFCNT_inc (coro_hv));
2598 return 1; 3147 return 1;
2599 } 3148 }
2600} 3149}
2601 3150
2602static int 3151static int
… …
2625 { 3174 {
2626 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3175 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2627 3176
2628 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3177 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2629 frame->prepare = prepare_schedule; 3178 frame->prepare = prepare_schedule;
2630
2631 /* to avoid race conditions when a woken-up coro gets terminated */ 3179 /* to avoid race conditions when a woken-up coro gets terminated */
2632 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3180 /* we arrange for a temporary on_destroy that calls adjust (0) */
2633 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3181 frame->destroy = coro_semaphore_destroy;
2634 } 3182 }
2635} 3183}
2636 3184
2637static void 3185static void
2638slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3186slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2696 { 3244 {
2697 api_ready (aTHX_ cb); 3245 api_ready (aTHX_ cb);
2698 sv_setiv (cb, 0); /* signal waiter */ 3246 sv_setiv (cb, 0); /* signal waiter */
2699 } 3247 }
2700 3248
2701 SvREFCNT_dec (cb); 3249 SvREFCNT_dec_NN (cb);
2702 3250
2703 --count; 3251 --count;
2704 } 3252 }
2705} 3253}
2706 3254
… …
2720 { 3268 {
2721 SV *cb_cv = s_get_cv_croak (arg [1]); 3269 SV *cb_cv = s_get_cv_croak (arg [1]);
2722 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3270 av_push (av, SvREFCNT_inc_NN (cb_cv));
2723 3271
2724 if (SvIVX (AvARRAY (av)[0])) 3272 if (SvIVX (AvARRAY (av)[0]))
2725 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3273 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2726 3274
2727 frame->prepare = prepare_nop; 3275 frame->prepare = prepare_nop;
2728 frame->check = slf_check_nop; 3276 frame->check = slf_check_nop;
2729 } 3277 }
2730 else if (SvIVX (AvARRAY (av)[0])) 3278 else if (SvIVX (AvARRAY (av)[0]))
… …
2791 } 3339 }
2792 3340
2793 av_push (state, data_sv); 3341 av_push (state, data_sv);
2794 3342
2795 api_ready (aTHX_ coro); 3343 api_ready (aTHX_ coro);
2796 SvREFCNT_dec (coro); 3344 SvREFCNT_dec_NN (coro);
2797 SvREFCNT_dec ((AV *)state); 3345 SvREFCNT_dec_NN ((AV *)state);
2798} 3346}
2799 3347
2800static int 3348static int
2801slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3349slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2802{ 3350{
… …
2807 /* it quickly returns */ 3355 /* it quickly returns */
2808 if (CORO_THROW) 3356 if (CORO_THROW)
2809 return 0; 3357 return 0;
2810 3358
2811 /* one element that is an RV? repeat! */ 3359 /* one element that is an RV? repeat! */
2812 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3360 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2813 return 1; 3361 return 1;
2814 3362
2815 /* restore status */ 3363 /* restore status */
2816 { 3364 {
2817 SV *data_sv = av_pop (state); 3365 SV *data_sv = av_pop (state);
… …
2820 errno = data->errorno; 3368 errno = data->errorno;
2821 PL_laststype = data->laststype; 3369 PL_laststype = data->laststype;
2822 PL_laststatval = data->laststatval; 3370 PL_laststatval = data->laststatval;
2823 PL_statcache = data->statcache; 3371 PL_statcache = data->statcache;
2824 3372
2825 SvREFCNT_dec (data_sv); 3373 SvREFCNT_dec_NN (data_sv);
2826 } 3374 }
2827 3375
2828 /* push result values */ 3376 /* push result values */
2829 { 3377 {
2830 dSP; 3378 dSP;
… …
2856 dSP; 3404 dSP;
2857 3405
2858 static SV *prio_cv; 3406 static SV *prio_cv;
2859 static SV *prio_sv; 3407 static SV *prio_sv;
2860 3408
2861 if (expect_false (!prio_cv)) 3409 if (ecb_expect_false (!prio_cv))
2862 { 3410 {
2863 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3411 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2864 prio_sv = newSViv (0); 3412 prio_sv = newSViv (0);
2865 } 3413 }
2866 3414
… …
2892 /* now call the AIO function - we assume our request is uncancelable */ 3440 /* now call the AIO function - we assume our request is uncancelable */
2893 PUTBACK; 3441 PUTBACK;
2894 call_sv ((SV *)req, G_VOID | G_DISCARD); 3442 call_sv ((SV *)req, G_VOID | G_DISCARD);
2895 } 3443 }
2896 3444
2897 /* now that the requets is going, we loop toll we have a result */ 3445 /* now that the request is going, we loop till we have a result */
2898 frame->data = (void *)state; 3446 frame->data = (void *)state;
2899 frame->prepare = prepare_schedule; 3447 frame->prepare = prepare_schedule;
2900 frame->check = slf_check_aio_req; 3448 frame->check = slf_check_aio_req;
2901} 3449}
2902 3450
… …
2972 } 3520 }
2973 3521
2974 return coro_sv; 3522 return coro_sv;
2975} 3523}
2976 3524
3525#ifndef __cplusplus
3526ecb_cold XS(boot_Coro__State);
3527#endif
3528
3529#if CORO_JIT
3530
3531static void ecb_noinline ecb_cold
3532pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3533{
3534 dSP;
3535 AV *av = newAV ();
3536
3537 av_store (av, 3, newSVuv (d));
3538 av_store (av, 2, newSVuv (c));
3539 av_store (av, 1, newSVuv (b));
3540 av_store (av, 0, newSVuv (a));
3541
3542 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3543
3544 PUTBACK;
3545}
3546
3547static void ecb_noinline ecb_cold
3548jit_init (pTHX)
3549{
3550 dSP;
3551 SV *load, *save;
3552 char *map_base;
3553 char *load_ptr, *save_ptr;
3554 STRLEN load_len, save_len, map_len;
3555 int count;
3556
3557 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3558
3559 PUSHMARK (SP);
3560 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3561 #include "state.h"
3562 count = call_pv ("Coro::State::_jit", G_ARRAY);
3563 SPAGAIN;
3564
3565 save = POPs; save_ptr = SvPVbyte (save, save_len);
3566 load = POPs; load_ptr = SvPVbyte (load, load_len);
3567
3568 map_len = load_len + save_len + 16;
3569
3570 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3571
3572 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3573
3574 load_perl_slots = (load_save_perl_slots_type)map_base;
3575 memcpy (map_base, load_ptr, load_len);
3576
3577 map_base += (load_len + 15) & ~15;
3578
3579 save_perl_slots = (load_save_perl_slots_type)map_base;
3580 memcpy (map_base, save_ptr, save_len);
3581
3582 /* we are good citizens and try to make the page read-only, so the evil evil */
3583 /* hackers might have it a bit more difficult */
3584 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3585
3586 PUTBACK;
3587 eval_pv ("undef &Coro::State::_jit", 1);
3588}
3589
3590#endif
3591
2977MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3592MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2978 3593
2979PROTOTYPES: DISABLE 3594PROTOTYPES: DISABLE
2980 3595
2981BOOT: 3596BOOT:
2982{ 3597{
3598#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3599#include "state.h"
2983#ifdef USE_ITHREADS 3600#ifdef USE_ITHREADS
2984# if CORO_PTHREAD 3601# if CORO_PTHREAD
2985 coro_thx = PERL_GET_CONTEXT; 3602 coro_thx = PERL_GET_CONTEXT;
2986# endif 3603# endif
2987#endif 3604#endif
2988 BOOT_PAGESIZE; 3605 /* perl defines these to check for existance first, but why it doesn't */
3606 /* just create them one at init time is not clear to me, except for */
3607 /* programs trying to delete them, but... */
3608 /* anyway, we declare this as invalid and make sure they are initialised here */
3609 DEFSV;
3610 ERRSV;
2989 3611
2990 cctx_current = cctx_new_empty (); 3612 cctx_current = cctx_new_empty ();
2991 3613
2992 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3614 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2993 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3615 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2994 3616
2995 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3617 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2996 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3618 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
2997 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3619 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
2998 3620
2999 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3000 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3621 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3001 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3622 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3002 3623
3003 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3624 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3004 3625
… …
3033 coroapi.prepare_nop = prepare_nop; 3654 coroapi.prepare_nop = prepare_nop;
3034 coroapi.prepare_schedule = prepare_schedule; 3655 coroapi.prepare_schedule = prepare_schedule;
3035 coroapi.prepare_cede = prepare_cede; 3656 coroapi.prepare_cede = prepare_cede;
3036 coroapi.prepare_cede_notself = prepare_cede_notself; 3657 coroapi.prepare_cede_notself = prepare_cede_notself;
3037 3658
3038 { 3659 time_init (aTHX);
3039 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3040
3041 if (!svp) croak ("Time::HiRes is required");
3042 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3043
3044 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3045
3046 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3047 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3048 }
3049 3660
3050 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3661 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3662#if CORO_JIT
3663 PUTBACK;
3664 jit_init (aTHX);
3665 SPAGAIN;
3666#endif
3051} 3667}
3052 3668
3053SV * 3669SV *
3054new (SV *klass, ...) 3670new (SV *klass, ...)
3055 ALIAS: 3671 ALIAS:
… …
3062void 3678void
3063transfer (...) 3679transfer (...)
3064 PROTOTYPE: $$ 3680 PROTOTYPE: $$
3065 CODE: 3681 CODE:
3066 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3682 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3067
3068bool
3069_destroy (SV *coro_sv)
3070 CODE:
3071 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3072 OUTPUT:
3073 RETVAL
3074
3075void
3076_exit (int code)
3077 PROTOTYPE: $
3078 CODE:
3079 _exit (code);
3080 3683
3081SV * 3684SV *
3082clone (Coro::State coro) 3685clone (Coro::State coro)
3083 CODE: 3686 CODE:
3084{ 3687{
… …
3139void 3742void
3140list () 3743list ()
3141 PROTOTYPE: 3744 PROTOTYPE:
3142 PPCODE: 3745 PPCODE:
3143{ 3746{
3144 struct coro *coro; 3747 struct coro *coro;
3145 for (coro = coro_first; coro; coro = coro->next) 3748 for (coro = coro_first; coro; coro = coro->next)
3146 if (coro->hv) 3749 if (coro->hv)
3147 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3750 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3148} 3751}
3149 3752
… …
3154 CODE: 3757 CODE:
3155{ 3758{
3156 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3759 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3157 { 3760 {
3158 struct coro *current = SvSTATE_current; 3761 struct coro *current = SvSTATE_current;
3762 struct CoroSLF slf_save;
3159 3763
3160 if (current != coro) 3764 if (current != coro)
3161 { 3765 {
3162 PUTBACK; 3766 PUTBACK;
3163 save_perl (aTHX_ current); 3767 save_perl (aTHX_ current);
3164 load_perl (aTHX_ coro); 3768 load_perl (aTHX_ coro);
3769 /* the coro is most likely in an active SLF call.
3770 * while not strictly required (the code we execute is
3771 * not allowed to call any SLF functions), it's cleaner
3772 * to reinitialise the slf_frame and restore it later.
3773 * This might one day allow us to actually do SLF calls
3774 * from code executed here.
3775 */
3776 slf_save = slf_frame;
3777 slf_frame.prepare = 0;
3165 SPAGAIN; 3778 SPAGAIN;
3166 } 3779 }
3167 3780
3168 PUSHSTACK; 3781 PUSHSTACK;
3169 3782
… …
3179 SPAGAIN; 3792 SPAGAIN;
3180 3793
3181 if (current != coro) 3794 if (current != coro)
3182 { 3795 {
3183 PUTBACK; 3796 PUTBACK;
3797 slf_frame = slf_save;
3184 save_perl (aTHX_ coro); 3798 save_perl (aTHX_ coro);
3185 load_perl (aTHX_ current); 3799 load_perl (aTHX_ current);
3186 SPAGAIN; 3800 SPAGAIN;
3187 } 3801 }
3188 } 3802 }
… …
3193 PROTOTYPE: $ 3807 PROTOTYPE: $
3194 ALIAS: 3808 ALIAS:
3195 is_ready = CF_READY 3809 is_ready = CF_READY
3196 is_running = CF_RUNNING 3810 is_running = CF_RUNNING
3197 is_new = CF_NEW 3811 is_new = CF_NEW
3198 is_destroyed = CF_DESTROYED 3812 is_destroyed = CF_ZOMBIE
3813 is_zombie = CF_ZOMBIE
3199 is_suspended = CF_SUSPENDED 3814 is_suspended = CF_SUSPENDED
3200 CODE: 3815 CODE:
3201 RETVAL = boolSV (coro->flags & ix); 3816 RETVAL = boolSV (coro->flags & ix);
3202 OUTPUT: 3817 OUTPUT:
3203 RETVAL 3818 RETVAL
3204 3819
3205void 3820void
3206throw (Coro::State self, SV *throw = &PL_sv_undef) 3821throw (SV *self, SV *exception = &PL_sv_undef)
3207 PROTOTYPE: $;$ 3822 PROTOTYPE: $;$
3208 CODE: 3823 CODE:
3209{ 3824{
3825 struct coro *coro = SvSTATE (self);
3210 struct coro *current = SvSTATE_current; 3826 struct coro *current = SvSTATE_current;
3211 SV **throwp = self == current ? &CORO_THROW : &self->except; 3827 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3212 SvREFCNT_dec (*throwp); 3828 SvREFCNT_dec (*exceptionp);
3213 SvGETMAGIC (throw); 3829 SvGETMAGIC (exception);
3214 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3830 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3831
3832 api_ready (aTHX_ self);
3215} 3833}
3216 3834
3217void 3835void
3218api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3836api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3219 PROTOTYPE: $;$ 3837 PROTOTYPE: $;$
… …
3274 3892
3275void 3893void
3276cancel (Coro::State self) 3894cancel (Coro::State self)
3277 CODE: 3895 CODE:
3278 coro_state_destroy (aTHX_ self); 3896 coro_state_destroy (aTHX_ self);
3279 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3280
3281 3897
3282SV * 3898SV *
3283enable_times (int enabled = enable_times) 3899enable_times (int enabled = enable_times)
3284 CODE: 3900 CODE:
3285{ 3901{
… …
3298 3914
3299void 3915void
3300times (Coro::State self) 3916times (Coro::State self)
3301 PPCODE: 3917 PPCODE:
3302{ 3918{
3303 struct coro *current = SvSTATE (coro_current); 3919 struct coro *current = SvSTATE (coro_current);
3304 3920
3305 if (expect_false (current == self)) 3921 if (ecb_expect_false (current == self))
3306 { 3922 {
3307 coro_times_update (); 3923 coro_times_update ();
3308 coro_times_add (SvSTATE (coro_current)); 3924 coro_times_add (SvSTATE (coro_current));
3309 } 3925 }
3310 3926
3311 EXTEND (SP, 2); 3927 EXTEND (SP, 2);
3312 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3928 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3313 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3929 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3314 3930
3315 if (expect_false (current == self)) 3931 if (ecb_expect_false (current == self))
3316 coro_times_sub (SvSTATE (coro_current)); 3932 coro_times_sub (SvSTATE (coro_current));
3317} 3933}
3318 3934
3935void
3936swap_sv (Coro::State coro, SV *sva, SV *svb)
3937 CODE:
3938{
3939 struct coro *current = SvSTATE_current;
3940 AV *swap_sv;
3941 int i;
3942
3943 sva = SvRV (sva);
3944 svb = SvRV (svb);
3945
3946 if (current == coro)
3947 SWAP_SVS_LEAVE (current);
3948
3949 if (!coro->swap_sv)
3950 coro->swap_sv = newAV ();
3951
3952 swap_sv = coro->swap_sv;
3953
3954 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3955 {
3956 SV *a = AvARRAY (swap_sv)[i ];
3957 SV *b = AvARRAY (swap_sv)[i + 1];
3958
3959 if (a == sva && b == svb)
3960 {
3961 SvREFCNT_dec_NN (a);
3962 SvREFCNT_dec_NN (b);
3963
3964 for (; i <= AvFILLp (swap_sv) - 2; i++)
3965 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
3966
3967 AvFILLp (swap_sv) -= 2;
3968
3969 goto removed;
3970 }
3971 }
3972
3973 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3974 av_push (swap_sv, SvREFCNT_inc_NN (svb));
3975
3976 removed:
3977
3978 if (current == coro)
3979 SWAP_SVS_ENTER (current);
3980}
3981
3982
3319MODULE = Coro::State PACKAGE = Coro 3983MODULE = Coro::State PACKAGE = Coro
3320 3984
3321BOOT: 3985BOOT:
3322{ 3986{
3987 if (SVt_LAST > 32)
3988 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3989
3323 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3990 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3324 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3991 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3325 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3992 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3326 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3327 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3993 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3328 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3994 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3329 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3995 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3330 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3996 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3331 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3997 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3332 3998
3333 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3999 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3334 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4000 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3335 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4001 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
4002 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3336 4003
3337 coro_stash = gv_stashpv ("Coro", TRUE); 4004 coro_stash = gv_stashpv ("Coro", TRUE);
3338 4005
3339 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4006 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3340 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4007 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
… …
3353 coroapi.ready = api_ready; 4020 coroapi.ready = api_ready;
3354 coroapi.is_ready = api_is_ready; 4021 coroapi.is_ready = api_is_ready;
3355 coroapi.nready = coro_nready; 4022 coroapi.nready = coro_nready;
3356 coroapi.current = coro_current; 4023 coroapi.current = coro_current;
3357 4024
4025 coroapi.enterleave_hook = api_enterleave_hook;
4026 coroapi.enterleave_unhook = api_enterleave_unhook;
4027 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4028
3358 /*GCoroAPI = &coroapi;*/ 4029 /*GCoroAPI = &coroapi;*/
3359 sv_setiv (sv, (IV)&coroapi); 4030 sv_setiv (sv, (IV)&coroapi);
3360 SvREADONLY_on (sv); 4031 SvREADONLY_on (sv);
3361 } 4032 }
3362} 4033}
… …
3364SV * 4035SV *
3365async (...) 4036async (...)
3366 PROTOTYPE: &@ 4037 PROTOTYPE: &@
3367 CODE: 4038 CODE:
3368 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1); 4039 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3369 api_ready (RETVAL); 4040 api_ready (aTHX_ RETVAL);
3370 OUTPUT: 4041 OUTPUT:
3371 RETVAL 4042 RETVAL
4043
4044void
4045_destroy (Coro::State coro)
4046 CODE:
4047 /* used by the manager thread */
4048 coro_state_destroy (aTHX_ coro);
4049
4050void
4051on_destroy (Coro::State coro, SV *cb)
4052 CODE:
4053 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4054
4055void
4056join (...)
4057 CODE:
4058 CORO_EXECUTE_SLF_XS (slf_init_join);
3372 4059
3373void 4060void
3374terminate (...) 4061terminate (...)
3375 CODE: 4062 CODE:
3376 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4063 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3377 4064
3378void 4065void
4066cancel (...)
4067 CODE:
4068 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4069
4070int
4071safe_cancel (Coro::State self, ...)
4072 C_ARGS: aTHX_ self, &ST (1), items - 1
4073
4074void
3379schedule (...) 4075schedule (...)
3380 CODE: 4076 CODE:
3381 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4077 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3382 4078
3383void 4079void
… …
3402 4098
3403void 4099void
3404_set_current (SV *current) 4100_set_current (SV *current)
3405 PROTOTYPE: $ 4101 PROTOTYPE: $
3406 CODE: 4102 CODE:
3407 SvREFCNT_dec (SvRV (coro_current)); 4103 SvREFCNT_dec_NN (SvRV (coro_current));
3408 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4104 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3409 4105
3410void 4106void
3411_set_readyhook (SV *hook) 4107_set_readyhook (SV *hook)
3412 PROTOTYPE: $ 4108 PROTOTYPE: $
… …
3496 4192
3497 if ((SV *)hv == &PL_sv_undef) 4193 if ((SV *)hv == &PL_sv_undef)
3498 { 4194 {
3499 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4195 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3500 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4196 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3501 SvREFCNT_dec (sv); 4197 SvREFCNT_dec_NN (sv);
3502 } 4198 }
3503 4199
3504 { 4200 {
3505 struct coro *coro = SvSTATE_hv (hv); 4201 struct coro *coro = SvSTATE_hv (hv);
3506 4202
… …
3513 api_ready (aTHX_ (SV *)hv); 4209 api_ready (aTHX_ (SV *)hv);
3514 4210
3515 if (GIMME_V != G_VOID) 4211 if (GIMME_V != G_VOID)
3516 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4212 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3517 else 4213 else
3518 SvREFCNT_dec (hv); 4214 SvREFCNT_dec_NN (hv);
3519} 4215}
3520 4216
3521SV * 4217SV *
3522rouse_cb () 4218rouse_cb ()
3523 PROTOTYPE: 4219 PROTOTYPE:
… …
3538 on_leave = 1 4234 on_leave = 1
3539 PROTOTYPE: & 4235 PROTOTYPE: &
3540 CODE: 4236 CODE:
3541{ 4237{
3542 struct coro *coro = SvSTATE_current; 4238 struct coro *coro = SvSTATE_current;
3543 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4239 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3544 4240
3545 block = s_get_cv_croak (block); 4241 block = s_get_cv_croak (block);
3546 4242
3547 if (!*avp) 4243 if (!*avp)
3548 *avp = newAV (); 4244 *avp = newAV ();
… …
3568 4264
3569SV * 4265SV *
3570new (SV *klass, SV *count = 0) 4266new (SV *klass, SV *count = 0)
3571 CODE: 4267 CODE:
3572{ 4268{
3573 int semcnt = 1; 4269 int semcnt = 1;
3574 4270
3575 if (count) 4271 if (count)
3576 { 4272 {
3577 SvGETMAGIC (count); 4273 SvGETMAGIC (count);
3578 4274
… …
3602 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4298 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3603 OUTPUT: 4299 OUTPUT:
3604 RETVAL 4300 RETVAL
3605 4301
3606void 4302void
3607up (SV *self, int adjust = 1) 4303up (SV *self)
3608 ALIAS:
3609 adjust = 1
3610 CODE: 4304 CODE:
4305 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4306
4307void
4308adjust (SV *self, int adjust)
4309 CODE:
3611 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4310 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3612 4311
3613void 4312void
3614down (...) 4313down (...)
3615 CODE: 4314 CODE:
3616 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4315 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3638 XSRETURN_NO; 4337 XSRETURN_NO;
3639} 4338}
3640 4339
3641void 4340void
3642waiters (SV *self) 4341waiters (SV *self)
3643 PPCODE: 4342 PPCODE:
3644{ 4343{
3645 AV *av = (AV *)SvRV (self); 4344 AV *av = (AV *)SvRV (self);
3646 int wcount = AvFILLp (av) + 1 - 1; 4345 int wcount = AvFILLp (av) + 1 - 1;
3647 4346
3648 if (GIMME_V == G_SCALAR) 4347 if (GIMME_V == G_SCALAR)
… …
3657} 4356}
3658 4357
3659MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4358MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3660 4359
3661void 4360void
3662_may_delete (SV *sem, int count, int extra_refs) 4361_may_delete (SV *sem, int count, unsigned int extra_refs)
3663 PPCODE: 4362 PPCODE:
3664{ 4363{
3665 AV *av = (AV *)SvRV (sem); 4364 AV *av = (AV *)SvRV (sem);
3666 4365
3667 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4366 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3668 && AvFILLp (av) == 0 /* no waiters, just count */ 4367 && AvFILLp (av) == 0 /* no waiters, just count */
3669 && SvIV (AvARRAY (av)[0]) == count) 4368 && SvIV (AvARRAY (av)[0]) == count)
3670 XSRETURN_YES; 4369 XSRETURN_YES;
… …
3691 4390
3692void 4391void
3693broadcast (SV *self) 4392broadcast (SV *self)
3694 CODE: 4393 CODE:
3695{ 4394{
3696 AV *av = (AV *)SvRV (self); 4395 AV *av = (AV *)SvRV (self);
3697 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4396 coro_signal_wake (aTHX_ av, AvFILLp (av));
3698} 4397}
3699 4398
3700void 4399void
3701send (SV *self) 4400send (SV *self)
… …
3709 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4408 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3710} 4409}
3711 4410
3712IV 4411IV
3713awaited (SV *self) 4412awaited (SV *self)
3714 CODE: 4413 CODE:
3715 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4414 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3716 OUTPUT: 4415 OUTPUT:
3717 RETVAL 4416 RETVAL
3718 4417
3719 4418
… …
3724 4423
3725void 4424void
3726_schedule (...) 4425_schedule (...)
3727 CODE: 4426 CODE:
3728{ 4427{
3729 static int incede; 4428 static int incede;
3730 4429
3731 api_cede_notself (aTHX); 4430 api_cede_notself (aTHX);
3732 4431
3733 ++incede; 4432 ++incede;
3734 while (coro_nready >= incede && api_cede (aTHX)) 4433 while (coro_nready >= incede && api_cede (aTHX))
… …
3778 { 4477 {
3779 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4478 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3780 coro_old_pp_sselect = 0; 4479 coro_old_pp_sselect = 0;
3781 } 4480 }
3782 4481
4482MODULE = Coro::State PACKAGE = Coro::Util
3783 4483
4484void
4485_exit (int code)
4486 CODE:
4487 _exit (code);
4488
4489NV
4490time ()
4491 CODE:
4492 RETVAL = nvtime (aTHX);
4493 OUTPUT:
4494 RETVAL
4495
4496NV
4497gettimeofday ()
4498 PPCODE:
4499{
4500 UV tv [2];
4501 u2time (aTHX_ tv);
4502 EXTEND (SP, 2);
4503 PUSHs (sv_2mortal (newSVuv (tv [0])));
4504 PUSHs (sv_2mortal (newSVuv (tv [1])));
4505}
4506

Diff Legend

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