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.394 by root, Sat Apr 30 05:17:43 2011 UTC vs.
Revision 1.455 by root, Sun Oct 4 13:07:55 2015 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7 7
8#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 9#define PERL_EXT
… …
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17 17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
18#include <stdio.h> 23#include <stdio.h>
19#include <errno.h> 24#include <errno.h>
20#include <assert.h> 25#include <assert.h>
21 26
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
22#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0 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
24#endif 66#endif
25 67
26#if defined(_WIN32) 68#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY 69# undef HAS_GETTIMEOFDAY
28# undef setjmp 70# undef setjmp
… …
31# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
32#else 74#else
33# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
34#endif 76#endif
35 77
36#ifdef HAVE_MMAP
37# include <unistd.h>
38# include <sys/mman.h>
39# ifndef MAP_ANONYMOUS
40# ifdef MAP_ANON
41# define MAP_ANONYMOUS MAP_ANON
42# else
43# undef HAVE_MMAP
44# endif
45# endif
46# include <limits.h>
47# ifndef PAGESIZE
48# define PAGESIZE pagesize
49# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
50static long pagesize;
51# else
52# define BOOT_PAGESIZE (void)0
53# endif
54#else
55# define PAGESIZE 0
56# define BOOT_PAGESIZE (void)0
57#endif
58
59#if CORO_USE_VALGRIND
60# include <valgrind/valgrind.h>
61#endif
62
63/* the maximum number of idle cctx that will be pooled */ 78/* the maximum number of idle cctx that will be pooled */
64static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
65 80
66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
67# undef CORO_STACKGUARD 82# define HAS_SCOPESTACK_NAME 1
68#endif
69
70#ifndef CORO_STACKGUARD
71# define CORO_STACKGUARD 0
72#endif 83#endif
73 84
74/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
75#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
76# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
86# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
87#endif 98#endif
88 99
89#define IN_DESTRUCT PL_dirty 100#define IN_DESTRUCT PL_dirty
90 101
91#if __GNUC__ >= 3
92# define attribute(x) __attribute__(x)
93# define expect(expr,value) __builtin_expect ((expr), (value))
94# define INLINE static inline
95#else
96# define attribute(x)
97# define expect(expr,value) (expr)
98# define INLINE static
99#endif
100
101#define expect_false(expr) expect ((expr) != 0, 0)
102#define expect_true(expr) expect ((expr) != 0, 1)
103
104#define NOINLINE attribute ((noinline))
105
106#include "CoroAPI.h" 102#include "CoroAPI.h"
107#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
108 104
109#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
110# if CORO_PTHREAD 106# if CORO_PTHREAD
… …
126static void (*u2time)(pTHX_ UV ret[2]); 122static void (*u2time)(pTHX_ UV ret[2]);
127 123
128/* we hijack an hopefully unused CV flag for our purposes */ 124/* we hijack an hopefully unused CV flag for our purposes */
129#define CVf_SLF 0x4000 125#define CVf_SLF 0x4000
130static OP *pp_slf (pTHX); 126static OP *pp_slf (pTHX);
127static void slf_destroy (pTHX_ struct coro *coro);
131 128
132static U32 cctx_gen; 129static U32 cctx_gen;
133static size_t cctx_stacksize = CORO_STACKSIZE; 130static size_t cctx_stacksize = CORO_STACKSIZE;
134static struct CoroAPI coroapi; 131static struct CoroAPI coroapi;
135static AV *main_mainstack; /* used to differentiate between $main and others */ 132static AV *main_mainstack; /* used to differentiate between $main and others */
… …
143 140
144static GV *irsgv; /* $/ */ 141static GV *irsgv; /* $/ */
145static GV *stdoutgv; /* *STDOUT */ 142static GV *stdoutgv; /* *STDOUT */
146static SV *rv_diehook; 143static SV *rv_diehook;
147static SV *rv_warnhook; 144static SV *rv_warnhook;
148static HV *hv_sig; /* %SIG */
149 145
150/* async_pool helper stuff */ 146/* async_pool helper stuff */
151static SV *sv_pool_rss; 147static SV *sv_pool_rss;
152static SV *sv_pool_size; 148static SV *sv_pool_size;
153static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
… …
165static char times_valid; 161static char times_valid;
166 162
167static struct coro_cctx *cctx_first; 163static struct coro_cctx *cctx_first;
168static int cctx_count, cctx_idle; 164static int cctx_count, cctx_idle;
169 165
170enum { 166enum
167{
171 CC_MAPPED = 0x01, 168 CC_MAPPED = 0x01,
172 CC_NOREUSE = 0x02, /* throw this away after tracing */ 169 CC_NOREUSE = 0x02, /* throw this away after tracing */
173 CC_TRACE = 0x04, 170 CC_TRACE = 0x04,
174 CC_TRACE_SUB = 0x08, /* trace sub calls */ 171 CC_TRACE_SUB = 0x08, /* trace sub calls */
175 CC_TRACE_LINE = 0x10, /* trace each statement */ 172 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
180typedef struct coro_cctx 177typedef struct coro_cctx
181{ 178{
182 struct coro_cctx *next; 179 struct coro_cctx *next;
183 180
184 /* the stack */ 181 /* the stack */
185 void *sptr; 182 struct coro_stack stack;
186 size_t ssize;
187 183
188 /* cpu state */ 184 /* cpu state */
189 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
190 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
191 JMPENV *top_env; 189 JMPENV *top_env;
192 coro_context cctx; 190 coro_context cctx;
193 191
194 U32 gen; 192 U32 gen;
195#if CORO_USE_VALGRIND 193#if CORO_USE_VALGRIND
… …
200 198
201static coro_cctx *cctx_current; /* the currently running cctx */ 199static coro_cctx *cctx_current; /* the currently running cctx */
202 200
203/*****************************************************************************/ 201/*****************************************************************************/
204 202
203static MGVTBL coro_state_vtbl;
204
205enum { 205enum
206{
206 CF_RUNNING = 0x0001, /* coroutine is running */ 207 CF_RUNNING = 0x0001, /* coroutine is running */
207 CF_READY = 0x0002, /* coroutine is ready */ 208 CF_READY = 0x0002, /* coroutine is ready */
208 CF_NEW = 0x0004, /* has never been switched to */ 209 CF_NEW = 0x0004, /* has never been switched to */
209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 210 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
211 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */ 212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
212}; 213};
213 214
214/* 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 */
215typedef struct 216typedef struct
216{ 217{
217 SV *defsv;
218 AV *defav;
219 SV *errsv;
220 SV *irsgv;
221 HV *hinthv;
222#define VAR(name,type) type name; 218 #define VARx(name,expr,type) type name;
223# include "state.h" 219 #include "state.h"
224#undef VAR
225} perl_slots; 220} perl_slots;
226 221
222/* how many context stack entries do we need for perl_slots */
227#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))
228 224
229/* this is a structure representing a perl-level coroutine */ 225/* this is a structure representing a perl-level coroutine */
230struct coro { 226struct coro
227{
231 /* the C coroutine allocated to this perl coroutine, if any */ 228 /* the C coroutine allocated to this perl coroutine, if any */
232 coro_cctx *cctx; 229 coro_cctx *cctx;
233 230
234 /* ready queue */ 231 /* ready queue */
235 struct coro *next_ready; 232 struct coro *next_ready;
… …
237 /* state data */ 234 /* state data */
238 struct CoroSLF slf_frame; /* saved slf frame */ 235 struct CoroSLF slf_frame; /* saved slf frame */
239 AV *mainstack; 236 AV *mainstack;
240 perl_slots *slot; /* basically the saved sp */ 237 perl_slots *slot; /* basically the saved sp */
241 238
242 CV *startcv; /* the CV to execute */ 239 CV *startcv; /* the CV to execute */
243 AV *args; /* data associated with this coroutine (initial args) */ 240 AV *args; /* data associated with this coroutine (initial args) */
244 int refcnt; /* coroutines are refcounted, yes */
245 int flags; /* CF_ flags */ 241 int flags; /* CF_ flags */
246 HV *hv; /* the perl hash associated with this coro, if any */ 242 HV *hv; /* the perl hash associated with this coro, if any */
247 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
248 243
249 /* statistics */ 244 /* statistics */
250 int usecount; /* number of transfers to this coro */ 245 int usecount; /* number of transfers to this coro */
251 246
252 /* coro process data */ 247 /* coro process data */
253 int prio; 248 int prio;
254 SV *except; /* exception to be thrown */ 249 SV *except; /* exception to be thrown */
255 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 */
256 253
257 /* async_pool */ 254 /* async_pool */
258 SV *saved_deffh; 255 SV *saved_deffh;
259 SV *invoke_cb; 256 SV *invoke_cb;
260 AV *invoke_av; 257 AV *invoke_av;
261 258
262 /* on_enter/on_leave */ 259 /* on_enter/on_leave */
263 AV *on_enter; 260 AV *on_enter; AV *on_enter_xs;
264 AV *on_leave; 261 AV *on_leave; AV *on_leave_xs;
265 262
266 /* swap_sv */ 263 /* swap_sv */
267 AV *swap_sv; 264 AV *swap_sv;
268 265
269 /* times */ 266 /* times */
… …
292 289
293/* for Coro.pm */ 290/* for Coro.pm */
294static SV *coro_current; 291static SV *coro_current;
295static SV *coro_readyhook; 292static SV *coro_readyhook;
296static 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 */
297static CV *cv_coro_run, *cv_coro_terminate; 294static CV *cv_coro_run;
298static struct coro *coro_first; 295static struct coro *coro_first;
299#define coro_nready coroapi.nready 296#define coro_nready coroapi.nready
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
300 320
301/** Coro::Select ************************************************************/ 321/** Coro::Select ************************************************************/
302 322
303static OP *(*coro_old_pp_sselect) (pTHX); 323static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select; 324static SV *coro_select_select;
… …
320 340
321/** time stuff **************************************************************/ 341/** time stuff **************************************************************/
322 342
323#ifdef HAS_GETTIMEOFDAY 343#ifdef HAS_GETTIMEOFDAY
324 344
325static void 345ecb_inline void
326coro_u2time (pTHX_ UV ret[2]) 346coro_u2time (pTHX_ UV ret[2])
327{ 347{
328 struct timeval tv; 348 struct timeval tv;
329 gettimeofday (&tv, 0); 349 gettimeofday (&tv, 0);
330 350
331 ret [0] = tv.tv_sec; 351 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec; 352 ret [1] = tv.tv_usec;
333} 353}
334 354
335static double 355ecb_inline double
336coro_nvtime () 356coro_nvtime (void)
337{ 357{
338 struct timeval tv; 358 struct timeval tv;
339 gettimeofday (&tv, 0); 359 gettimeofday (&tv, 0);
340 360
341 return tv.tv_sec + tv.tv_usec * 1e-6; 361 return tv.tv_sec + tv.tv_usec * 1e-6;
342} 362}
343 363
344static void 364ecb_inline void
345time_init (pTHX) 365time_init (pTHX)
346{ 366{
347 nvtime = coro_nvtime; 367 nvtime = coro_nvtime;
348 u2time = coro_u2time; 368 u2time = coro_u2time;
349} 369}
350 370
351#else 371#else
352 372
353static void 373ecb_inline void
354time_init (pTHX) 374time_init (pTHX)
355{ 375{
356 SV **svp; 376 SV **svp;
357 377
358 require_pv ("Time/HiRes.pm"); 378 require_pv ("Time/HiRes.pm");
359 379
360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 380 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
361 381
362 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 382 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 383 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
364 384
… …
370 390
371#endif 391#endif
372 392
373/** lowlevel stuff **********************************************************/ 393/** lowlevel stuff **********************************************************/
374 394
375static SV * 395static SV * ecb_noinline
376coro_get_sv (pTHX_ const char *name, int create) 396coro_get_sv (pTHX_ const char *name, int create)
377{ 397{
378#if PERL_VERSION_ATLEAST (5,10,0) 398#if PERL_VERSION_ATLEAST (5,10,0)
379 /* 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 */
380 get_sv (name, create); 400 get_sv (name, create);
381#endif 401#endif
382 return get_sv (name, create); 402 return get_sv (name, create);
383} 403}
384 404
385static AV * 405static AV * ecb_noinline
386coro_get_av (pTHX_ const char *name, int create) 406coro_get_av (pTHX_ const char *name, int create)
387{ 407{
388#if PERL_VERSION_ATLEAST (5,10,0) 408#if PERL_VERSION_ATLEAST (5,10,0)
389 /* 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 */
390 get_av (name, create); 410 get_av (name, create);
391#endif 411#endif
392 return get_av (name, create); 412 return get_av (name, create);
393} 413}
394 414
395static HV * 415static HV * ecb_noinline
396coro_get_hv (pTHX_ const char *name, int create) 416coro_get_hv (pTHX_ const char *name, int create)
397{ 417{
398#if PERL_VERSION_ATLEAST (5,10,0) 418#if PERL_VERSION_ATLEAST (5,10,0)
399 /* 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 */
400 get_hv (name, create); 420 get_hv (name, create);
401#endif 421#endif
402 return get_hv (name, create); 422 return get_hv (name, create);
403} 423}
404 424
405INLINE void 425ecb_inline void
406coro_times_update () 426coro_times_update (void)
407{ 427{
408#ifdef coro_clock_gettime 428#ifdef coro_clock_gettime
409 struct timespec ts; 429 struct timespec ts;
410 430
411 ts.tv_sec = ts.tv_nsec = 0; 431 ts.tv_sec = ts.tv_nsec = 0;
… …
423 time_real [0] = tv [0]; 443 time_real [0] = tv [0];
424 time_real [1] = tv [1] * 1000; 444 time_real [1] = tv [1] * 1000;
425#endif 445#endif
426} 446}
427 447
428INLINE void 448ecb_inline void
429coro_times_add (struct coro *c) 449coro_times_add (struct coro *c)
430{ 450{
431 c->t_real [1] += time_real [1]; 451 c->t_real [1] += time_real [1];
432 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]; }
433 c->t_real [0] += time_real [0]; 453 c->t_real [0] += time_real [0];
… …
435 c->t_cpu [1] += time_cpu [1]; 455 c->t_cpu [1] += time_cpu [1];
436 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]; }
437 c->t_cpu [0] += time_cpu [0]; 457 c->t_cpu [0] += time_cpu [0];
438} 458}
439 459
440INLINE void 460ecb_inline void
441coro_times_sub (struct coro *c) 461coro_times_sub (struct coro *c)
442{ 462{
443 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]; }
444 c->t_real [1] -= time_real [1]; 464 c->t_real [1] -= time_real [1];
445 c->t_real [0] -= time_real [0]; 465 c->t_real [0] -= time_real [0];
… …
453/* magic glue */ 473/* magic glue */
454 474
455#define CORO_MAGIC_type_cv 26 475#define CORO_MAGIC_type_cv 26
456#define CORO_MAGIC_type_state PERL_MAGIC_ext 476#define CORO_MAGIC_type_state PERL_MAGIC_ext
457 477
458#define CORO_MAGIC_NN(sv, type) \ 478#define CORO_MAGIC_NN(sv, type) \
459 (expect_true (SvMAGIC (sv)->mg_type == type) \ 479 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
460 ? SvMAGIC (sv) \ 480 ? SvMAGIC (sv) \
461 : mg_find (sv, type)) 481 : mg_find (sv, type))
462 482
463#define CORO_MAGIC(sv, type) \ 483#define CORO_MAGIC(sv, type) \
464 (expect_true (SvMAGIC (sv)) \ 484 (ecb_expect_true (SvMAGIC (sv)) \
465 ? CORO_MAGIC_NN (sv, type) \ 485 ? CORO_MAGIC_NN (sv, type) \
466 : 0) 486 : 0)
467 487
468#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)
469#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)
470 490
471INLINE struct coro * 491ecb_inline MAGIC *
472SvSTATE_ (pTHX_ SV *coro) 492SvSTATEhv_p (pTHX_ SV *coro)
473{ 493{
474 HV *stash;
475 MAGIC *mg; 494 MAGIC *mg;
476 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
477 if (SvROK (coro)) 511 if (SvROK (coro_sv))
478 coro = SvRV (coro); 512 coro_sv = SvRV (coro_sv);
479 513
480 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 514 mg = SvSTATEhv_p (aTHX_ coro_sv);
515 if (!mg)
481 croak ("Coro::State object required"); 516 croak ("Coro::State object required");
482 517
483 stash = SvSTASH (coro);
484 if (expect_false (stash != coro_stash && stash != coro_state_stash))
485 {
486 /* very slow, but rare, check */
487 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
488 croak ("Coro::State object required");
489 }
490
491 mg = CORO_MAGIC_state (coro);
492 return (struct coro *)mg->mg_ptr; 518 return (struct coro *)mg->mg_ptr;
493} 519}
494 520
495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 521#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
496 522
… …
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 525#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500 526
501/*****************************************************************************/ 527/*****************************************************************************/
502/* padlist management and caching */ 528/* padlist management and caching */
503 529
504static AV * 530ecb_inline PADLIST *
505coro_derive_padlist (pTHX_ CV *cv) 531coro_derive_padlist (pTHX_ CV *cv)
506{ 532{
507 AV *padlist = CvPADLIST (cv); 533 PADLIST *padlist = CvPADLIST (cv);
508 AV *newpadlist, *newpad; 534 PADLIST *newpadlist;
535 PADNAMELIST *padnames;
536 PAD *newpad;
537 PADOFFSET off = PadlistMAX (padlist) + 1;
509 538
510 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. */
511 AvREAL_off (newpadlist); 567 AvREAL_off (newpadlist);
512#if PERL_VERSION_ATLEAST (5,10,0)
513 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
514#else
515 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
516#endif 568#endif
517 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
518 --AvFILLp (padlist);
519 569
520 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 570 /* Already extended to 2 elements by newPADLIST. */
521 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;
522 578
523 return newpadlist; 579 return newpadlist;
524} 580}
525 581
526static void 582ecb_inline void
527free_padlist (pTHX_ AV *padlist) 583free_padlist (pTHX_ PADLIST *padlist)
528{ 584{
529 /* may be during global destruction */ 585 /* may be during global destruction */
530 if (!IN_DESTRUCT) 586 if (!IN_DESTRUCT)
531 { 587 {
532 I32 i = AvFILLp (padlist); 588 I32 i = PadlistMAX (padlist);
533 589
534 while (i > 0) /* special-case index 0 */ 590 while (i > 0) /* special-case index 0 */
535 { 591 {
536 /* we try to be extra-careful here */ 592 /* we try to be extra-careful here */
537 AV *av = (AV *)AvARRAY (padlist)[i--]; 593 PAD *pad = PadlistARRAY (padlist)[i--];
538 I32 j = AvFILLp (av);
539 594
595 if (pad)
596 {
597 I32 j = PadMAX (pad);
598
540 while (j >= 0) 599 while (j >= 0)
541 SvREFCNT_dec (AvARRAY (av)[j--]); 600 SvREFCNT_dec (PadARRAY (pad)[j--]);
542 601
543 AvFILLp (av) = -1; 602 PadMAX (pad) = -1;
544 SvREFCNT_dec (av); 603 SvREFCNT_dec (pad);
604 }
545 } 605 }
546 606
547 SvREFCNT_dec (AvARRAY (padlist)[0]); 607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
548 608
609#if NEWPADAPI
610 Safefree (PadlistARRAY (padlist));
611 Safefree (padlist);
612#else
549 AvFILLp (padlist) = -1; 613 AvFILLp (padlist) = -1;
614 AvREAL_off (padlist);
550 SvREFCNT_dec ((SV*)padlist); 615 SvREFCNT_dec ((SV*)padlist);
616#endif
551 } 617 }
552} 618}
553 619
554static int 620static int
555coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 621coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
556{ 622{
557 AV *padlist; 623 PADLIST *padlist;
558 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;
559 626
560 /* perl manages to free our internal AV and _then_ call us */ 627 /* perl manages to free our internal AV and _then_ call us */
561 if (IN_DESTRUCT) 628 if (IN_DESTRUCT)
562 return 0; 629 return 0;
563 630
564 /* casting is fun. */ 631 while (len--)
565 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
566 free_padlist (aTHX_ padlist); 632 free_padlist (aTHX_ padlists[len]);
567
568 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
569 633
570 return 0; 634 return 0;
571} 635}
572 636
573static MGVTBL coro_cv_vtbl = { 637static MGVTBL coro_cv_vtbl = {
574 0, 0, 0, 0, 638 0, 0, 0, 0,
575 coro_cv_free 639 coro_cv_free
576}; 640};
577 641
578/* the next two functions merely cache the padlists */ 642/* the next two functions merely cache the padlists */
579static void 643ecb_inline void
580get_padlist (pTHX_ CV *cv) 644get_padlist (pTHX_ CV *cv)
581{ 645{
582 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
583 AV *av; 647 size_t *lenp;
584 648
585 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 649 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 650 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
587 else 651 else
588 { 652 {
589#if CORO_PREFER_PERL_FUNCTIONS 653#if CORO_PREFER_PERL_FUNCTIONS
590 /* this is probably cleaner? but also slower! */ 654 /* this is probably cleaner? but also slower! */
591 /* in practise, it seems to be less stable */ 655 /* in practise, it seems to be less stable */
… …
597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 661 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
598#endif 662#endif
599 } 663 }
600} 664}
601 665
602static void 666ecb_inline void
603put_padlist (pTHX_ CV *cv) 667put_padlist (pTHX_ CV *cv)
604{ 668{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 669 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av;
607 670
608 if (expect_false (!mg)) 671 if (ecb_expect_false (!mg))
672 {
609 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);
610 681
611 av = (AV *)mg->mg_obj; 682 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
612
613 if (expect_false (AvFILLp (av) >= AvMAX (av)))
614 av_extend (av, AvFILLp (av) + 1);
615
616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
617} 683}
618 684
619/** load & save, init *******************************************************/ 685/** load & save, init *******************************************************/
620 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
621/* swap sv heads, at least logically */ 729/* swap sv heads, at least logically */
622static void 730static void
623swap_svs (pTHX_ Coro__State c) 731swap_svs (pTHX_ Coro__State c)
624{ 732{
625 int i; 733 int i;
626 734
627 for (i = 0; i <= AvFILLp (c->swap_sv); ) 735 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
628 { 736 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
629 SV *a = AvARRAY (c->swap_sv)[i++];
630 SV *b = AvARRAY (c->swap_sv)[i++];
631
632 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
633 SV tmp;
634
635 /* swap sv_any */
636 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
637
638 /* swap sv_flags */
639 SvFLAGS (&tmp) = SvFLAGS (a);
640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
642
643#if PERL_VERSION_ATLEAST (5,10,0)
644 /* perl 5.10 complicates this _quite_ a bit, but it also is
645 * much faster, so no quarrels here. alternatively, we could
646 * sv_upgrade to avoid this.
647 */
648 {
649 /* swap sv_u */
650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
651
652 /* if SvANY points to the head, we need to adjust the pointers,
653 * as the pointer for a still points to b, and maybe vice versa.
654 */
655 #define svany_in_head(type) \
656 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
657
658 if (svany_in_head (SvTYPE (a)))
659 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
660
661 if (svany_in_head (SvTYPE (b)))
662 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
663 }
664#endif
665 }
666} 737}
667 738
668#define SWAP_SVS(coro) \ 739#define SWAP_SVS(coro) \
669 if (expect_false ((coro)->swap_sv)) \ 740 if (ecb_expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro)) 741 swap_svs (aTHX_ (coro))
671 742
672static void 743static void
673on_enterleave_call (pTHX_ SV *cb); 744on_enterleave_call (pTHX_ SV *cb);
674 745
… …
678 perl_slots *slot = c->slot; 749 perl_slots *slot = c->slot;
679 c->slot = 0; 750 c->slot = 0;
680 751
681 PL_mainstack = c->mainstack; 752 PL_mainstack = c->mainstack;
682 753
683 GvSV (PL_defgv) = slot->defsv; 754#if CORO_JIT
684 GvAV (PL_defgv) = slot->defav; 755 load_perl_slots (slot);
685 GvSV (PL_errgv) = slot->errsv; 756#else
686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
688
689 #define VAR(name,type) PL_ ## name = slot->name; 757 #define VARx(name,expr,type) expr = slot->name;
690 # include "state.h" 758 #include "state.h"
691 #undef VAR 759#endif
692 760
693 { 761 {
694 dSP; 762 dSP;
695 763
696 CV *cv; 764 CV *cv;
697 765
698 /* now do the ugly restore mess */ 766 /* now do the ugly restore mess */
699 while (expect_true (cv = (CV *)POPs)) 767 while (ecb_expect_true (cv = (CV *)POPs))
700 { 768 {
701 put_padlist (aTHX_ cv); /* mark this padlist as available */ 769 put_padlist (aTHX_ cv); /* mark this padlist as available */
702 CvDEPTH (cv) = PTR2IV (POPs); 770 CvDEPTH (cv) = PTR2IV (POPs);
703 CvPADLIST (cv) = (AV *)POPs; 771 CvPADLIST (cv) = (PADLIST *)POPs;
704 } 772 }
705 773
706 PUTBACK; 774 PUTBACK;
707 } 775 }
708 776
709 slf_frame = c->slf_frame; 777 slf_frame = c->slf_frame;
710 CORO_THROW = c->except; 778 CORO_THROW = c->except;
711 779
712 if (expect_false (enable_times)) 780 if (ecb_expect_false (enable_times))
713 { 781 {
714 if (expect_false (!times_valid)) 782 if (ecb_expect_false (!times_valid))
715 coro_times_update (); 783 coro_times_update ();
716 784
717 coro_times_sub (c); 785 coro_times_sub (c);
718 } 786 }
719 787
720 if (expect_false (c->on_enter)) 788 if (ecb_expect_false (c->on_enter))
721 { 789 {
722 int i; 790 int i;
723 791
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 792 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 793 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
726 } 794 }
727 795
796 if (ecb_expect_false (c->on_enter_xs))
797 {
798 int i;
799
800 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
801 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
802 }
803
728 SWAP_SVS (c); 804 SWAP_SVS (c);
729} 805}
730 806
731static void 807static void
732save_perl (pTHX_ Coro__State c) 808save_perl (pTHX_ Coro__State c)
733{ 809{
734 SWAP_SVS (c); 810 SWAP_SVS (c);
735 811
812 if (ecb_expect_false (c->on_leave_xs))
813 {
814 int i;
815
816 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
817 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
818 }
819
736 if (expect_false (c->on_leave)) 820 if (ecb_expect_false (c->on_leave))
737 { 821 {
738 int i; 822 int i;
739 823
740 for (i = AvFILLp (c->on_leave); i >= 0; --i) 824 for (i = AvFILLp (c->on_leave); i >= 0; --i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 825 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 } 826 }
743 827
744 times_valid = 0; 828 times_valid = 0;
745 829
746 if (expect_false (enable_times)) 830 if (ecb_expect_false (enable_times))
747 { 831 {
748 coro_times_update (); times_valid = 1; 832 coro_times_update (); times_valid = 1;
749 coro_times_add (c); 833 coro_times_add (c);
750 } 834 }
751 835
… …
765 849
766 XPUSHs (Nullsv); 850 XPUSHs (Nullsv);
767 /* this loop was inspired by pp_caller */ 851 /* this loop was inspired by pp_caller */
768 for (;;) 852 for (;;)
769 { 853 {
770 while (expect_true (cxix >= 0)) 854 while (ecb_expect_true (cxix >= 0))
771 { 855 {
772 PERL_CONTEXT *cx = &ccstk[cxix--]; 856 PERL_CONTEXT *cx = &ccstk[cxix--];
773 857
774 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 858 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
775 { 859 {
776 CV *cv = cx->blk_sub.cv; 860 CV *cv = cx->blk_sub.cv;
777 861
778 if (expect_true (CvDEPTH (cv))) 862 if (ecb_expect_true (CvDEPTH (cv)))
779 { 863 {
780 EXTEND (SP, 3); 864 EXTEND (SP, 3);
781 PUSHs ((SV *)CvPADLIST (cv)); 865 PUSHs ((SV *)CvPADLIST (cv));
782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 866 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
783 PUSHs ((SV *)cv); 867 PUSHs ((SV *)cv);
… …
786 get_padlist (aTHX_ cv); 870 get_padlist (aTHX_ cv);
787 } 871 }
788 } 872 }
789 } 873 }
790 874
791 if (expect_true (top_si->si_type == PERLSI_MAIN)) 875 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
792 break; 876 break;
793 877
794 top_si = top_si->si_prev; 878 top_si = top_si->si_prev;
795 ccstk = top_si->si_cxstack; 879 ccstk = top_si->si_cxstack;
796 cxix = top_si->si_cxix; 880 cxix = top_si->si_cxix;
… …
798 882
799 PUTBACK; 883 PUTBACK;
800 } 884 }
801 885
802 /* allocate some space on the context stack for our purposes */ 886 /* allocate some space on the context stack for our purposes */
803 /* we manually unroll here, as usually 2 slots is enough */ 887 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
804 if (SLOT_COUNT >= 1) CXINC;
805 if (SLOT_COUNT >= 2) CXINC;
806 if (SLOT_COUNT >= 3) CXINC;
807 { 888 {
808 unsigned int i; 889 unsigned int i;
890
809 for (i = 3; i < SLOT_COUNT; ++i) 891 for (i = 0; i < SLOT_COUNT; ++i)
810 CXINC; 892 CXINC;
811 } 893
812 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 894 cxstack_ix -= SLOT_COUNT; /* undo allocation */
895 }
813 896
814 c->mainstack = PL_mainstack; 897 c->mainstack = PL_mainstack;
815 898
816 { 899 {
817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 900 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
818 901
819 slot->defav = GvAV (PL_defgv); 902#if CORO_JIT
820 slot->defsv = DEFSV; 903 save_perl_slots (slot);
821 slot->errsv = ERRSV; 904#else
822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
824
825 #define VAR(name,type) slot->name = PL_ ## name; 905 #define VARx(name,expr,type) slot->name = expr;
826 # include "state.h" 906 #include "state.h"
827 #undef VAR 907#endif
828 } 908 }
829} 909}
830 910
831/* 911/*
832 * allocate various perl stacks. This is almost an exact copy 912 * allocate various perl stacks. This is almost an exact copy
… …
838# define coro_init_stacks(thx) init_stacks () 918# define coro_init_stacks(thx) init_stacks ()
839#else 919#else
840static void 920static void
841coro_init_stacks (pTHX) 921coro_init_stacks (pTHX)
842{ 922{
843 PL_curstackinfo = new_stackinfo(32, 8); 923 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
844 PL_curstackinfo->si_type = PERLSI_MAIN; 924 PL_curstackinfo->si_type = PERLSI_MAIN;
845 PL_curstack = PL_curstackinfo->si_stack; 925 PL_curstack = PL_curstackinfo->si_stack;
846 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 926 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
847 927
848 PL_stack_base = AvARRAY(PL_curstack); 928 PL_stack_base = AvARRAY(PL_curstack);
… …
863#endif 943#endif
864 944
865 New(54,PL_scopestack,8,I32); 945 New(54,PL_scopestack,8,I32);
866 PL_scopestack_ix = 0; 946 PL_scopestack_ix = 0;
867 PL_scopestack_max = 8; 947 PL_scopestack_max = 8;
948#if HAS_SCOPESTACK_NAME
949 New(54,PL_scopestack_name,8,const char*);
950#endif
868 951
869 New(54,PL_savestack,24,ANY); 952 New(54,PL_savestack,24,ANY);
870 PL_savestack_ix = 0; 953 PL_savestack_ix = 0;
871 PL_savestack_max = 24; 954 PL_savestack_max = 24;
872 955
… …
900 } 983 }
901 984
902 Safefree (PL_tmps_stack); 985 Safefree (PL_tmps_stack);
903 Safefree (PL_markstack); 986 Safefree (PL_markstack);
904 Safefree (PL_scopestack); 987 Safefree (PL_scopestack);
988#if HAS_SCOPESTACK_NAME
989 Safefree (PL_scopestack_name);
990#endif
905 Safefree (PL_savestack); 991 Safefree (PL_savestack);
906#if !PERL_VERSION_ATLEAST (5,10,0) 992#if !PERL_VERSION_ATLEAST (5,10,0)
907 Safefree (PL_retstack); 993 Safefree (PL_retstack);
908#endif 994#endif
909} 995}
… …
955#endif 1041#endif
956 1042
957/* 1043/*
958 * This overrides the default magic get method of %SIG elements. 1044 * This overrides the default magic get method of %SIG elements.
959 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1045 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
960 * and instead of trying to save and restore the hash elements, we just provide 1046 * and instead of trying to save and restore the hash elements (extremely slow),
961 * readback here. 1047 * we just provide our own readback here.
962 */ 1048 */
963static int 1049static int ecb_cold
964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1050coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
965{ 1051{
966 const char *s = MgPV_nolen_const (mg); 1052 const char *s = MgPV_nolen_const (mg);
967 1053
968 if (*s == '_') 1054 if (*s == '_')
969 { 1055 {
970 SV **svp = 0; 1056 SV **svp = 0;
971 1057
972 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1058 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
973 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1059 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
974 1060
975 if (svp) 1061 if (svp)
976 { 1062 {
977 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1063 SV *ssv;
1064
1065 if (!*svp)
1066 ssv = &PL_sv_undef;
1067 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1068 ssv = sv_2mortal (newRV_inc (*svp));
1069 else
1070 ssv = *svp;
1071
1072 sv_setsv (sv, ssv);
978 return 0; 1073 return 0;
979 } 1074 }
980 } 1075 }
981 1076
982 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1077 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
983} 1078}
984 1079
985static int 1080static int ecb_cold
986coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1081coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
987{ 1082{
988 const char *s = MgPV_nolen_const (mg); 1083 const char *s = MgPV_nolen_const (mg);
989 1084
990 if (*s == '_') 1085 if (*s == '_')
… …
1004 } 1099 }
1005 1100
1006 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1101 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1007} 1102}
1008 1103
1009static int 1104static int ecb_cold
1010coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1105coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1011{ 1106{
1012 const char *s = MgPV_nolen_const (mg); 1107 const char *s = MgPV_nolen_const (mg);
1013 1108
1014 if (*s == '_') 1109 if (*s == '_')
… …
1049 return 1; 1144 return 1;
1050} 1145}
1051 1146
1052static UNOP init_perl_op; 1147static UNOP init_perl_op;
1053 1148
1054static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1149ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1055init_perl (pTHX_ struct coro *coro) 1150init_perl (pTHX_ struct coro *coro)
1056{ 1151{
1057 /* 1152 /*
1058 * emulate part of the perl startup here. 1153 * emulate part of the perl startup here.
1059 */ 1154 */
… …
1074 PL_parser = 0; 1169 PL_parser = 0;
1075#endif 1170#endif
1076 PL_hints = 0; 1171 PL_hints = 0;
1077 1172
1078 /* recreate the die/warn hooks */ 1173 /* recreate the die/warn hooks */
1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1174 PL_diehook = SvREFCNT_inc (rv_diehook);
1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1175 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1081 1176
1082 GvSV (PL_defgv) = newSV (0); 1177 GvSV (PL_defgv) = newSV (0);
1083 GvAV (PL_defgv) = coro->args; coro->args = 0; 1178 GvAV (PL_defgv) = coro->args; coro->args = 0;
1084 GvSV (PL_errgv) = newSV (0); 1179 GvSV (PL_errgv) = newSV (0);
1085 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1180 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1086 GvHV (PL_hintgv) = 0; 1181 GvHV (PL_hintgv) = newHV ();
1182#if PERL_VERSION_ATLEAST (5,10,0)
1183 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1184#endif
1087 PL_rs = newSVsv (GvSV (irsgv)); 1185 PL_rs = newSVsv (GvSV (irsgv));
1088 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1186 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1089 1187
1090 { 1188 {
1091 dSP; 1189 dSP;
… …
1106 /* this newly created coroutine might be run on an existing cctx which most 1204 /* this newly created coroutine might be run on an existing cctx which most
1107 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1205 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1108 */ 1206 */
1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1207 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1110 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1208 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1209 slf_frame.destroy = 0;
1111 1210
1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1211 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1113 init_perl_op.op_next = PL_op; 1212 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1213 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1214 init_perl_op.op_ppaddr = pp_slf;
… …
1120 /* copy throw, in case it was set before init_perl */ 1219 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1220 CORO_THROW = coro->except;
1122 1221
1123 SWAP_SVS (coro); 1222 SWAP_SVS (coro);
1124 1223
1125 if (expect_false (enable_times)) 1224 if (ecb_expect_false (enable_times))
1126 { 1225 {
1127 coro_times_update (); 1226 coro_times_update ();
1128 coro_times_sub (coro); 1227 coro_times_sub (coro);
1129 } 1228 }
1130} 1229}
… …
1154destroy_perl (pTHX_ struct coro *coro) 1253destroy_perl (pTHX_ struct coro *coro)
1155{ 1254{
1156 SV *svf [9]; 1255 SV *svf [9];
1157 1256
1158 { 1257 {
1258 SV *old_current = SvRV (coro_current);
1159 struct coro *current = SvSTATE_current; 1259 struct coro *current = SvSTATE (old_current);
1160 1260
1161 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1261 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1162 1262
1163 save_perl (aTHX_ current); 1263 save_perl (aTHX_ current);
1264
1265 /* this will cause transfer_check to croak on block*/
1266 SvRV_set (coro_current, (SV *)coro->hv);
1267
1164 load_perl (aTHX_ coro); 1268 load_perl (aTHX_ coro);
1165 1269
1166 coro_unwind_stacks (aTHX); 1270 coro_unwind_stacks (aTHX);
1167 coro_destruct_stacks (aTHX);
1168 1271
1169 /* restore swapped sv's */ 1272 /* restore swapped sv's */
1170 SWAP_SVS (coro); 1273 SWAP_SVS (coro);
1171 1274
1275 coro_destruct_stacks (aTHX);
1276
1172 // now save some sv's to be free'd later 1277 /* now save some sv's to be free'd later */
1173 svf [0] = GvSV (PL_defgv); 1278 svf [0] = GvSV (PL_defgv);
1174 svf [1] = (SV *)GvAV (PL_defgv); 1279 svf [1] = (SV *)GvAV (PL_defgv);
1175 svf [2] = GvSV (PL_errgv); 1280 svf [2] = GvSV (PL_errgv);
1176 svf [3] = (SV *)PL_defoutgv; 1281 svf [3] = (SV *)PL_defoutgv;
1177 svf [4] = PL_rs; 1282 svf [4] = PL_rs;
… …
1179 svf [6] = (SV *)GvHV (PL_hintgv); 1284 svf [6] = (SV *)GvHV (PL_hintgv);
1180 svf [7] = PL_diehook; 1285 svf [7] = PL_diehook;
1181 svf [8] = PL_warnhook; 1286 svf [8] = PL_warnhook;
1182 assert (9 == sizeof (svf) / sizeof (*svf)); 1287 assert (9 == sizeof (svf) / sizeof (*svf));
1183 1288
1289 SvRV_set (coro_current, old_current);
1290
1184 load_perl (aTHX_ current); 1291 load_perl (aTHX_ current);
1185 } 1292 }
1186 1293
1187 { 1294 {
1188 unsigned int i; 1295 unsigned int i;
… …
1192 1299
1193 SvREFCNT_dec (coro->saved_deffh); 1300 SvREFCNT_dec (coro->saved_deffh);
1194 SvREFCNT_dec (coro->rouse_cb); 1301 SvREFCNT_dec (coro->rouse_cb);
1195 SvREFCNT_dec (coro->invoke_cb); 1302 SvREFCNT_dec (coro->invoke_cb);
1196 SvREFCNT_dec (coro->invoke_av); 1303 SvREFCNT_dec (coro->invoke_av);
1304 SvREFCNT_dec (coro->on_enter_xs);
1305 SvREFCNT_dec (coro->on_leave_xs);
1197 } 1306 }
1198} 1307}
1199 1308
1200INLINE void 1309ecb_inline void
1201free_coro_mortal (pTHX) 1310free_coro_mortal (pTHX)
1202{ 1311{
1203 if (expect_true (coro_mortal)) 1312 if (ecb_expect_true (coro_mortal))
1204 { 1313 {
1205 SvREFCNT_dec (coro_mortal); 1314 SvREFCNT_dec ((SV *)coro_mortal);
1206 coro_mortal = 0; 1315 coro_mortal = 0;
1207 } 1316 }
1208} 1317}
1209 1318
1210static int 1319static int
… …
1264 1373
1265 if (PL_curcop != &PL_compiling) 1374 if (PL_curcop != &PL_compiling)
1266 { 1375 {
1267 SV **cb; 1376 SV **cb;
1268 1377
1269 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1378 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1270 { 1379 {
1271 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1380 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1272 1381
1273 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1382 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1274 { 1383 {
… …
1343 1452
1344 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1453 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1345} 1454}
1346 1455
1347/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1456/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1348static void NOINLINE 1457static void ecb_noinline
1349cctx_prepare (pTHX) 1458cctx_prepare (pTHX)
1350{ 1459{
1351 PL_top_env = &PL_start_env; 1460 PL_top_env = &PL_start_env;
1352 1461
1353 if (cctx_current->flags & CC_TRACE) 1462 if (cctx_current->flags & CC_TRACE)
… …
1364 slf_frame.prepare = slf_prepare_set_stacklevel; 1473 slf_frame.prepare = slf_prepare_set_stacklevel;
1365 slf_frame.check = slf_check_set_stacklevel; 1474 slf_frame.check = slf_check_set_stacklevel;
1366} 1475}
1367 1476
1368/* the tail of transfer: execute stuff we can only do after a transfer */ 1477/* the tail of transfer: execute stuff we can only do after a transfer */
1369INLINE void 1478ecb_inline void
1370transfer_tail (pTHX) 1479transfer_tail (pTHX)
1371{ 1480{
1372 free_coro_mortal (aTHX); 1481 free_coro_mortal (aTHX);
1482}
1483
1484/* try to exit the same way perl's main function would do */
1485/* we do not bother resetting the environment or other things *7
1486/* that are not, uhm, essential */
1487/* this obviously also doesn't work when perl is embedded */
1488static void ecb_noinline ecb_cold
1489perlish_exit (pTHX)
1490{
1491 int exitstatus = perl_destruct (PL_curinterp);
1492 perl_free (PL_curinterp);
1493 exit (exitstatus);
1373} 1494}
1374 1495
1375/* 1496/*
1376 * this is a _very_ stripped down perl interpreter ;) 1497 * this is a _very_ stripped down perl interpreter ;)
1377 */ 1498 */
… …
1406 */ 1527 */
1407 1528
1408 /* 1529 /*
1409 * If perl-run returns we assume exit() was being called or the coro 1530 * If perl-run returns we assume exit() was being called or the coro
1410 * fell off the end, which seems to be the only valid (non-bug) 1531 * fell off the end, which seems to be the only valid (non-bug)
1411 * reason for perl_run to return. We try to exit by jumping to the 1532 * reason for perl_run to return. We try to mimic whatever perl is normally
1412 * bootstrap-time "top" top_env, as we cannot restore the "main" 1533 * doing in that case. YMMV.
1413 * coroutine as Coro has no such concept.
1414 * This actually isn't valid with the pthread backend, but OSes requiring
1415 * that backend are too broken to do it in a standards-compliant way.
1416 */ 1534 */
1417 PL_top_env = main_top_env; 1535 perlish_exit (aTHX);
1418 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1419 } 1536 }
1420} 1537}
1421 1538
1422static coro_cctx * 1539static coro_cctx *
1423cctx_new () 1540cctx_new (void)
1424{ 1541{
1425 coro_cctx *cctx; 1542 coro_cctx *cctx;
1426 1543
1427 ++cctx_count; 1544 ++cctx_count;
1428 New (0, cctx, 1, coro_cctx); 1545 New (0, cctx, 1, coro_cctx);
… …
1434 return cctx; 1551 return cctx;
1435} 1552}
1436 1553
1437/* create a new cctx only suitable as source */ 1554/* create a new cctx only suitable as source */
1438static coro_cctx * 1555static coro_cctx *
1439cctx_new_empty () 1556cctx_new_empty (void)
1440{ 1557{
1441 coro_cctx *cctx = cctx_new (); 1558 coro_cctx *cctx = cctx_new ();
1442 1559
1443 cctx->sptr = 0; 1560 cctx->stack.sptr = 0;
1444 coro_create (&cctx->cctx, 0, 0, 0, 0); 1561 coro_create (&cctx->cctx, 0, 0, 0, 0);
1445 1562
1446 return cctx; 1563 return cctx;
1447} 1564}
1448 1565
1449/* create a new cctx suitable as destination/running a perl interpreter */ 1566/* create a new cctx suitable as destination/running a perl interpreter */
1450static coro_cctx * 1567static coro_cctx *
1451cctx_new_run () 1568cctx_new_run (void)
1452{ 1569{
1453 coro_cctx *cctx = cctx_new (); 1570 coro_cctx *cctx = cctx_new ();
1454 void *stack_start;
1455 size_t stack_size;
1456 1571
1457#if HAVE_MMAP 1572 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1458 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1459 /* mmap supposedly does allocate-on-write for us */
1460 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1461
1462 if (cctx->sptr != (void *)-1)
1463 {
1464 #if CORO_STACKGUARD
1465 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1466 #endif
1467 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1468 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1469 cctx->flags |= CC_MAPPED;
1470 } 1573 {
1471 else
1472#endif
1473 {
1474 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1475 New (0, cctx->sptr, cctx_stacksize, long);
1476
1477 if (!cctx->sptr)
1478 {
1479 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1574 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1480 _exit (EXIT_FAILURE); 1575 _exit (EXIT_FAILURE);
1481 }
1482
1483 stack_start = cctx->sptr;
1484 stack_size = cctx->ssize;
1485 } 1576 }
1486 1577
1487 #if CORO_USE_VALGRIND
1488 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1489 #endif
1490
1491 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1578 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1492 1579
1493 return cctx; 1580 return cctx;
1494} 1581}
1495 1582
1496static void 1583static void
… …
1502 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1589 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1503 1590
1504 --cctx_count; 1591 --cctx_count;
1505 coro_destroy (&cctx->cctx); 1592 coro_destroy (&cctx->cctx);
1506 1593
1507 /* coro_transfer creates new, empty cctx's */ 1594 coro_stack_free (&cctx->stack);
1508 if (cctx->sptr)
1509 {
1510 #if CORO_USE_VALGRIND
1511 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1512 #endif
1513
1514#if HAVE_MMAP
1515 if (cctx->flags & CC_MAPPED)
1516 munmap (cctx->sptr, cctx->ssize);
1517 else
1518#endif
1519 Safefree (cctx->sptr);
1520 }
1521 1595
1522 Safefree (cctx); 1596 Safefree (cctx);
1523} 1597}
1524 1598
1525/* wether this cctx should be destructed */ 1599/* wether this cctx should be destructed */
1526#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1600#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1527 1601
1528static coro_cctx * 1602static coro_cctx *
1529cctx_get (pTHX) 1603cctx_get (pTHX)
1530{ 1604{
1531 while (expect_true (cctx_first)) 1605 while (ecb_expect_true (cctx_first))
1532 { 1606 {
1533 coro_cctx *cctx = cctx_first; 1607 coro_cctx *cctx = cctx_first;
1534 cctx_first = cctx->next; 1608 cctx_first = cctx->next;
1535 --cctx_idle; 1609 --cctx_idle;
1536 1610
1537 if (expect_true (!CCTX_EXPIRED (cctx))) 1611 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1538 return cctx; 1612 return cctx;
1539 1613
1540 cctx_destroy (cctx); 1614 cctx_destroy (cctx);
1541 } 1615 }
1542 1616
… …
1544} 1618}
1545 1619
1546static void 1620static void
1547cctx_put (coro_cctx *cctx) 1621cctx_put (coro_cctx *cctx)
1548{ 1622{
1549 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1623 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1550 1624
1551 /* free another cctx if overlimit */ 1625 /* free another cctx if overlimit */
1552 if (expect_false (cctx_idle >= cctx_max_idle)) 1626 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1553 { 1627 {
1554 coro_cctx *first = cctx_first; 1628 coro_cctx *first = cctx_first;
1555 cctx_first = first->next; 1629 cctx_first = first->next;
1556 --cctx_idle; 1630 --cctx_idle;
1557 1631
… …
1568static void 1642static void
1569transfer_check (pTHX_ struct coro *prev, struct coro *next) 1643transfer_check (pTHX_ struct coro *prev, struct coro *next)
1570{ 1644{
1571 /* TODO: throwing up here is considered harmful */ 1645 /* TODO: throwing up here is considered harmful */
1572 1646
1573 if (expect_true (prev != next)) 1647 if (ecb_expect_true (prev != next))
1574 { 1648 {
1575 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1649 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1576 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1650 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1577 1651
1578 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1652 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1579 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1653 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1580 1654
1581#if !PERL_VERSION_ATLEAST (5,10,0) 1655#if !PERL_VERSION_ATLEAST (5,10,0)
1582 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1656 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1583 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1657 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1584#endif 1658#endif
1585 } 1659 }
1586} 1660}
1587 1661
1588/* always use the TRANSFER macro */ 1662/* always use the TRANSFER macro */
1589static void NOINLINE /* noinline so we have a fixed stackframe */ 1663static void ecb_noinline /* noinline so we have a fixed stackframe */
1590transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1664transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1591{ 1665{
1592 dSTACKLEVEL; 1666 dSTACKLEVEL;
1593 1667
1594 /* sometimes transfer is only called to set idle_sp */ 1668 /* sometimes transfer is only called to set idle_sp */
1595 if (expect_false (!prev)) 1669 if (ecb_expect_false (!prev))
1596 { 1670 {
1597 cctx_current->idle_sp = STACKLEVEL; 1671 cctx_current->idle_sp = STACKLEVEL;
1598 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1672 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1599 } 1673 }
1600 else if (expect_true (prev != next)) 1674 else if (ecb_expect_true (prev != next))
1601 { 1675 {
1602 coro_cctx *cctx_prev; 1676 coro_cctx *cctx_prev;
1603 1677
1604 if (expect_false (prev->flags & CF_NEW)) 1678 if (ecb_expect_false (prev->flags & CF_NEW))
1605 { 1679 {
1606 /* create a new empty/source context */ 1680 /* create a new empty/source context */
1607 prev->flags &= ~CF_NEW; 1681 prev->flags &= ~CF_NEW;
1608 prev->flags |= CF_RUNNING; 1682 prev->flags |= CF_RUNNING;
1609 } 1683 }
… …
1612 next->flags |= CF_RUNNING; 1686 next->flags |= CF_RUNNING;
1613 1687
1614 /* first get rid of the old state */ 1688 /* first get rid of the old state */
1615 save_perl (aTHX_ prev); 1689 save_perl (aTHX_ prev);
1616 1690
1617 if (expect_false (next->flags & CF_NEW)) 1691 if (ecb_expect_false (next->flags & CF_NEW))
1618 { 1692 {
1619 /* need to start coroutine */ 1693 /* need to start coroutine */
1620 next->flags &= ~CF_NEW; 1694 next->flags &= ~CF_NEW;
1621 /* setup coroutine call */ 1695 /* setup coroutine call */
1622 init_perl (aTHX_ next); 1696 init_perl (aTHX_ next);
1623 } 1697 }
1624 else 1698 else
1625 load_perl (aTHX_ next); 1699 load_perl (aTHX_ next);
1626 1700
1627 /* possibly untie and reuse the cctx */ 1701 /* possibly untie and reuse the cctx */
1628 if (expect_true ( 1702 if (ecb_expect_true (
1629 cctx_current->idle_sp == STACKLEVEL 1703 cctx_current->idle_sp == STACKLEVEL
1630 && !(cctx_current->flags & CC_TRACE) 1704 && !(cctx_current->flags & CC_TRACE)
1631 && !force_cctx 1705 && !force_cctx
1632 )) 1706 ))
1633 { 1707 {
1634 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1708 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1635 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1709 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1636 1710
1637 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1711 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1638 /* without this the next cctx_get might destroy the running cctx while still in use */ 1712 /* without this the next cctx_get might destroy the running cctx while still in use */
1639 if (expect_false (CCTX_EXPIRED (cctx_current))) 1713 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1640 if (expect_true (!next->cctx)) 1714 if (ecb_expect_true (!next->cctx))
1641 next->cctx = cctx_get (aTHX); 1715 next->cctx = cctx_get (aTHX);
1642 1716
1643 cctx_put (cctx_current); 1717 cctx_put (cctx_current);
1644 } 1718 }
1645 else 1719 else
1646 prev->cctx = cctx_current; 1720 prev->cctx = cctx_current;
1647 1721
1648 ++next->usecount; 1722 ++next->usecount;
1649 1723
1650 cctx_prev = cctx_current; 1724 cctx_prev = cctx_current;
1651 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1725 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1652 1726
1653 next->cctx = 0; 1727 next->cctx = 0;
1654 1728
1655 if (expect_false (cctx_prev != cctx_current)) 1729 if (ecb_expect_false (cctx_prev != cctx_current))
1656 { 1730 {
1657 cctx_prev->top_env = PL_top_env; 1731 cctx_prev->top_env = PL_top_env;
1658 PL_top_env = cctx_current->top_env; 1732 PL_top_env = cctx_current->top_env;
1659 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1733 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1660 } 1734 }
… …
1666#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1740#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1667#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1741#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1668 1742
1669/** high level stuff ********************************************************/ 1743/** high level stuff ********************************************************/
1670 1744
1745/* this function is actually Coro, not Coro::State, but we call it from here */
1746/* because it is convenient - but it hasn't been declared yet for that reason */
1747static void
1748coro_call_on_destroy (pTHX_ struct coro *coro);
1749
1671static void 1750static void
1672coro_state_destroy (pTHX_ struct coro *coro) 1751coro_state_destroy (pTHX_ struct coro *coro)
1673{ 1752{
1674 if (coro->flags & CF_DESTROYED) 1753 if (coro->flags & CF_ZOMBIE)
1675 return; 1754 return;
1676 1755
1677 /* this callback is reserved for slf functions needing to do cleanup */
1678 if (coro->on_destroy && !PL_dirty)
1679 coro->on_destroy (aTHX_ coro); 1756 slf_destroy (aTHX_ coro);
1680 1757
1681 /*
1682 * The on_destroy above most likely is from an SLF call.
1683 * Since by definition the SLF call will not finish when we destroy
1684 * the coro, we will have to force-finish it here, otherwise
1685 * cleanup functions cannot call SLF functions.
1686 */
1687 coro->slf_frame.prepare = 0;
1688
1689 coro->flags |= CF_DESTROYED; 1758 coro->flags |= CF_ZOMBIE;
1690 1759
1691 if (coro->flags & CF_READY) 1760 if (coro->flags & CF_READY)
1692 { 1761 {
1693 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1762 /* reduce nready, as destroying a ready coro effectively unreadies it */
1694 /* alternative: look through all ready queues and remove the coro */ 1763 /* alternative: look through all ready queues and remove the coro */
1695 --coro_nready; 1764 --coro_nready;
1696 } 1765 }
1697 else 1766 else
1698 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1767 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1768
1769 if (coro->next) coro->next->prev = coro->prev;
1770 if (coro->prev) coro->prev->next = coro->next;
1771 if (coro == coro_first) coro_first = coro->next;
1699 1772
1700 if (coro->mainstack 1773 if (coro->mainstack
1701 && coro->mainstack != main_mainstack 1774 && coro->mainstack != main_mainstack
1702 && coro->slot 1775 && coro->slot
1703 && !PL_dirty) 1776 && !PL_dirty)
1704 destroy_perl (aTHX_ coro); 1777 destroy_perl (aTHX_ coro);
1705 1778
1706 if (coro->next) coro->next->prev = coro->prev;
1707 if (coro->prev) coro->prev->next = coro->next;
1708 if (coro == coro_first) coro_first = coro->next;
1709
1710 cctx_destroy (coro->cctx); 1779 cctx_destroy (coro->cctx);
1711 SvREFCNT_dec (coro->startcv); 1780 SvREFCNT_dec (coro->startcv);
1712 SvREFCNT_dec (coro->args); 1781 SvREFCNT_dec (coro->args);
1713 SvREFCNT_dec (coro->swap_sv); 1782 SvREFCNT_dec (coro->swap_sv);
1714 SvREFCNT_dec (CORO_THROW); 1783 SvREFCNT_dec (CORO_THROW);
1784
1785 coro_call_on_destroy (aTHX_ coro);
1786
1787 /* more destruction mayhem in coro_state_free */
1715} 1788}
1716 1789
1717static int 1790static int
1718coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1791coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1719{ 1792{
1720 struct coro *coro = (struct coro *)mg->mg_ptr; 1793 struct coro *coro = (struct coro *)mg->mg_ptr;
1721 mg->mg_ptr = 0; 1794 mg->mg_ptr = 0;
1722 1795
1723 coro->hv = 0;
1724
1725 if (--coro->refcnt < 0)
1726 {
1727 coro_state_destroy (aTHX_ coro); 1796 coro_state_destroy (aTHX_ coro);
1797 SvREFCNT_dec (coro->on_destroy);
1798 SvREFCNT_dec (coro->status);
1799
1728 Safefree (coro); 1800 Safefree (coro);
1729 }
1730 1801
1731 return 0; 1802 return 0;
1732} 1803}
1733 1804
1734static int 1805static int ecb_cold
1735coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1806coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1736{ 1807{
1737 struct coro *coro = (struct coro *)mg->mg_ptr; 1808 /* called when perl clones the current process the slow way (windows process emulation) */
1738 1809 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1739 ++coro->refcnt; 1810 mg->mg_ptr = 0;
1811 mg->mg_virtual = 0;
1740 1812
1741 return 0; 1813 return 0;
1742} 1814}
1743 1815
1744static MGVTBL coro_state_vtbl = { 1816static MGVTBL coro_state_vtbl = {
… …
1769 TRANSFER (ta, 1); 1841 TRANSFER (ta, 1);
1770} 1842}
1771 1843
1772/** Coro ********************************************************************/ 1844/** Coro ********************************************************************/
1773 1845
1774INLINE void 1846ecb_inline void
1775coro_enq (pTHX_ struct coro *coro) 1847coro_enq (pTHX_ struct coro *coro)
1776{ 1848{
1777 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1849 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1778 1850
1779 SvREFCNT_inc_NN (coro->hv); 1851 SvREFCNT_inc_NN (coro->hv);
… …
1781 coro->next_ready = 0; 1853 coro->next_ready = 0;
1782 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1854 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1783 ready [1] = coro; 1855 ready [1] = coro;
1784} 1856}
1785 1857
1786INLINE struct coro * 1858ecb_inline struct coro *
1787coro_deq (pTHX) 1859coro_deq (pTHX)
1788{ 1860{
1789 int prio; 1861 int prio;
1790 1862
1791 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1863 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1844{ 1916{
1845 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1917 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1846} 1918}
1847 1919
1848/* expects to own a reference to next->hv */ 1920/* expects to own a reference to next->hv */
1849INLINE void 1921ecb_inline void
1850prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1922prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1851{ 1923{
1852 SV *prev_sv = SvRV (coro_current); 1924 SV *prev_sv = SvRV (coro_current);
1853 1925
1854 ta->prev = SvSTATE_hv (prev_sv); 1926 ta->prev = SvSTATE_hv (prev_sv);
… …
1867{ 1939{
1868 for (;;) 1940 for (;;)
1869 { 1941 {
1870 struct coro *next = coro_deq (aTHX); 1942 struct coro *next = coro_deq (aTHX);
1871 1943
1872 if (expect_true (next)) 1944 if (ecb_expect_true (next))
1873 { 1945 {
1874 /* cannot transfer to destroyed coros, skip and look for next */ 1946 /* cannot transfer to destroyed coros, skip and look for next */
1875 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1947 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1876 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1948 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1877 else 1949 else
1878 { 1950 {
1879 next->flags &= ~CF_READY; 1951 next->flags &= ~CF_READY;
1880 --coro_nready; 1952 --coro_nready;
… …
1888 /* nothing to schedule: call the idle handler */ 1960 /* nothing to schedule: call the idle handler */
1889 if (SvROK (sv_idle) 1961 if (SvROK (sv_idle)
1890 && SvOBJECT (SvRV (sv_idle))) 1962 && SvOBJECT (SvRV (sv_idle)))
1891 { 1963 {
1892 if (SvRV (sv_idle) == SvRV (coro_current)) 1964 if (SvRV (sv_idle) == SvRV (coro_current))
1965 {
1966 require_pv ("Carp");
1967
1968 {
1969 dSP;
1970
1971 ENTER;
1972 SAVETMPS;
1973
1974 PUSHMARK (SP);
1893 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1975 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1976 PUTBACK;
1977 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1978
1979 FREETMPS;
1980 LEAVE;
1981 }
1982 }
1894 1983
1895 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1984 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1896 api_ready (aTHX_ SvRV (sv_idle)); 1985 api_ready (aTHX_ SvRV (sv_idle));
1897 --coro_nready; 1986 --coro_nready;
1898 } 1987 }
… …
1913 } 2002 }
1914 } 2003 }
1915 } 2004 }
1916} 2005}
1917 2006
1918INLINE void 2007ecb_inline void
1919prepare_cede (pTHX_ struct coro_transfer_args *ta) 2008prepare_cede (pTHX_ struct coro_transfer_args *ta)
1920{ 2009{
1921 api_ready (aTHX_ coro_current); 2010 api_ready (aTHX_ coro_current);
1922 prepare_schedule (aTHX_ ta); 2011 prepare_schedule (aTHX_ ta);
1923} 2012}
1924 2013
1925INLINE void 2014ecb_inline void
1926prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2015prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1927{ 2016{
1928 SV *prev = SvRV (coro_current); 2017 SV *prev = SvRV (coro_current);
1929 2018
1930 if (coro_nready) 2019 if (coro_nready)
… …
1960{ 2049{
1961 struct coro_transfer_args ta; 2050 struct coro_transfer_args ta;
1962 2051
1963 prepare_cede (aTHX_ &ta); 2052 prepare_cede (aTHX_ &ta);
1964 2053
1965 if (expect_true (ta.prev != ta.next)) 2054 if (ecb_expect_true (ta.prev != ta.next))
1966 { 2055 {
1967 TRANSFER (ta, 1); 2056 TRANSFER (ta, 1);
1968 return 1; 2057 return 1;
1969 } 2058 }
1970 else 2059 else
… …
2013 coro->slot->runops = RUNOPS_DEFAULT; 2102 coro->slot->runops = RUNOPS_DEFAULT;
2014 } 2103 }
2015} 2104}
2016 2105
2017static void 2106static void
2107coro_push_av (pTHX_ AV *av, I32 gimme_v)
2108{
2109 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2110 {
2111 dSP;
2112
2113 if (gimme_v == G_SCALAR)
2114 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2115 else
2116 {
2117 int i;
2118 EXTEND (SP, AvFILLp (av) + 1);
2119
2120 for (i = 0; i <= AvFILLp (av); ++i)
2121 PUSHs (AvARRAY (av)[i]);
2122 }
2123
2124 PUTBACK;
2125 }
2126}
2127
2128static void
2129coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2130{
2131 if (!coro->on_destroy)
2132 coro->on_destroy = newAV ();
2133
2134 av_push (coro->on_destroy, cb);
2135}
2136
2137static void
2138slf_destroy_join (pTHX_ struct CoroSLF *frame)
2139{
2140 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2141}
2142
2143static int
2144slf_check_join (pTHX_ struct CoroSLF *frame)
2145{
2146 struct coro *coro = (struct coro *)frame->data;
2147
2148 if (!coro->status)
2149 return 1;
2150
2151 frame->destroy = 0;
2152
2153 coro_push_av (aTHX_ coro->status, GIMME_V);
2154
2155 SvREFCNT_dec ((SV *)coro->hv);
2156
2157 return 0;
2158}
2159
2160static void
2161slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2162{
2163 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2164
2165 if (items > 1)
2166 croak ("join called with too many arguments");
2167
2168 if (coro->status)
2169 frame->prepare = prepare_nop;
2170 else
2171 {
2172 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2173 frame->prepare = prepare_schedule;
2174 }
2175
2176 frame->check = slf_check_join;
2177 frame->destroy = slf_destroy_join;
2178 frame->data = (void *)coro;
2179 SvREFCNT_inc (coro->hv);
2180}
2181
2182static void
2018coro_call_on_destroy (pTHX_ struct coro *coro) 2183coro_call_on_destroy (pTHX_ struct coro *coro)
2019{ 2184{
2020 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2185 AV *od = coro->on_destroy;
2021 2186
2022 if (on_destroyp) 2187 if (!od)
2023 { 2188 return;
2024 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2025 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2026 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2027 2189
2190 coro->on_destroy = 0;
2191 sv_2mortal ((SV *)od);
2192
2028 while (AvFILLp (on_destroy) >= 0) 2193 while (AvFILLp (od) >= 0)
2194 {
2195 SV *cb = sv_2mortal (av_pop (od));
2196
2197 /* coro hv's (and only hv's at the moment) are supported as well */
2198 if (SvSTATEhv_p (aTHX_ cb))
2199 api_ready (aTHX_ cb);
2200 else
2029 { 2201 {
2030 dSP; /* don't disturb outer sp */ 2202 dSP; /* don't disturb outer sp */
2031 SV *cb = av_pop (on_destroy);
2032
2033 PUSHMARK (SP); 2203 PUSHMARK (SP);
2034 2204
2035 if (statusp) 2205 if (coro->status)
2036 { 2206 {
2037 int i; 2207 PUTBACK;
2038 EXTEND (SP, AvFILLp (status) + 1); 2208 coro_push_av (aTHX_ coro->status, G_ARRAY);
2039 2209 SPAGAIN;
2040 for (i = 0; i <= AvFILLp (status); ++i)
2041 PUSHs (AvARRAY (status)[i]);
2042 } 2210 }
2043 2211
2044 PUTBACK; 2212 PUTBACK;
2045 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2213 call_sv (cb, G_VOID | G_DISCARD);
2046 } 2214 }
2047 } 2215 }
2048} 2216}
2049 2217
2050static void 2218static void
2051coro_set_status (HV *coro_hv, SV **arg, int items) 2219coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2052{ 2220{
2053 AV *av = newAV (); 2221 AV *av;
2222
2223 if (coro->status)
2224 {
2225 av = coro->status;
2226 av_clear (av);
2227 }
2228 else
2229 av = coro->status = newAV ();
2054 2230
2055 /* items are actually not so common, so optimise for this case */ 2231 /* items are actually not so common, so optimise for this case */
2056 if (items) 2232 if (items)
2057 { 2233 {
2058 int i; 2234 int i;
… …
2060 av_extend (av, items - 1); 2236 av_extend (av, items - 1);
2061 2237
2062 for (i = 0; i < items; ++i) 2238 for (i = 0; i < items; ++i)
2063 av_push (av, SvREFCNT_inc_NN (arg [i])); 2239 av_push (av, SvREFCNT_inc_NN (arg [i]));
2064 } 2240 }
2065
2066 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2067} 2241}
2068 2242
2069static void 2243static void
2070slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2244slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2071{ 2245{
… …
2083static void 2257static void
2084slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2258slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2085{ 2259{
2086 HV *coro_hv = (HV *)SvRV (coro_current); 2260 HV *coro_hv = (HV *)SvRV (coro_current);
2087 2261
2088 coro_set_status (coro_hv, arg, items); 2262 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2089 slf_init_terminate_cancel_common (frame, coro_hv); 2263 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2090} 2264}
2091 2265
2092static void 2266static void
2093slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2267slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2094{ 2268{
… …
2099 croak ("Coro::cancel called without coro object,"); 2273 croak ("Coro::cancel called without coro object,");
2100 2274
2101 coro = SvSTATE (arg [0]); 2275 coro = SvSTATE (arg [0]);
2102 coro_hv = coro->hv; 2276 coro_hv = coro->hv;
2103 2277
2104 coro_set_status (coro_hv, arg + 1, items - 1); 2278 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2105 2279
2106 if (expect_false (coro->flags & CF_NOCANCEL)) 2280 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2107 { 2281 {
2108 /* coro currently busy cancelling something, so just notify it */ 2282 /* coro currently busy cancelling something, so just notify it */
2109 coro->slf_frame.data = (void *)coro; 2283 coro->slf_frame.data = (void *)coro;
2110 2284
2111 frame->prepare = prepare_nop; 2285 frame->prepare = prepare_nop;
2112 frame->check = slf_check_nop; 2286 frame->check = slf_check_nop;
2113 } 2287 }
2114 else if (coro_hv == (HV *)SvRV (coro_current)) 2288 else if (coro_hv == (HV *)SvRV (coro_current))
2115 { 2289 {
2116 /* cancelling the current coro is allowed, and equals terminate */ 2290 /* cancelling the current coro is allowed, and equals terminate */
2117 slf_init_terminate_cancel_common (frame, coro_hv); 2291 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2118 } 2292 }
2119 else 2293 else
2120 { 2294 {
2121 struct coro *self = SvSTATE_current; 2295 struct coro *self = SvSTATE_current;
2296
2297 if (!self)
2298 croak ("Coro::cancel called outside of thread content,");
2122 2299
2123 /* otherwise we cancel directly, purely for speed reasons 2300 /* otherwise we cancel directly, purely for speed reasons
2124 * unfortunately, this requires some magic trickery, as 2301 * unfortunately, this requires some magic trickery, as
2125 * somebody else could cancel us, so we have to fight the cancellation. 2302 * somebody else could cancel us, so we have to fight the cancellation.
2126 * this is ugly, and hopefully fully worth the extra speed. 2303 * this is ugly, and hopefully fully worth the extra speed.
2127 * besides, I can't get the slow-but-safe version working... 2304 * besides, I can't get the slow-but-safe version working...
2128 */ 2305 */
2129 slf_frame.data = 0; 2306 slf_frame.data = 0;
2130 self->flags |= CF_NOCANCEL; 2307 self->flags |= CF_NOCANCEL;
2131
2132 coro_state_destroy (aTHX_ coro); 2308 coro_state_destroy (aTHX_ coro);
2133 coro_call_on_destroy (aTHX_ coro);
2134
2135 self->flags &= ~CF_NOCANCEL; 2309 self->flags &= ~CF_NOCANCEL;
2136 2310
2137 if (slf_frame.data) 2311 if (slf_frame.data)
2138 { 2312 {
2139 /* while we were busy we have been cancelled, so terminate */ 2313 /* while we were busy we have been cancelled, so terminate */
2140 slf_init_terminate_cancel_common (frame, self->hv); 2314 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2141 } 2315 }
2142 else 2316 else
2143 { 2317 {
2144 frame->prepare = prepare_nop; 2318 frame->prepare = prepare_nop;
2145 frame->check = slf_check_nop; 2319 frame->check = slf_check_nop;
2146 } 2320 }
2147 } 2321 }
2148} 2322}
2149 2323
2324static int
2325slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2326{
2327 frame->prepare = 0;
2328 coro_unwind_stacks (aTHX);
2329
2330 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2331
2332 return 1;
2333}
2334
2335static int
2336safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2337{
2338 if (coro->cctx)
2339 croak ("coro inside C callback, unable to cancel at this time, caught");
2340
2341 if (coro->flags & CF_NEW)
2342 {
2343 coro_set_status (aTHX_ coro, arg, items);
2344 coro_state_destroy (aTHX_ coro);
2345 }
2346 else
2347 {
2348 if (!coro->slf_frame.prepare)
2349 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2350
2351 slf_destroy (aTHX_ coro);
2352
2353 coro_set_status (aTHX_ coro, arg, items);
2354 coro->slf_frame.prepare = prepare_nop;
2355 coro->slf_frame.check = slf_check_safe_cancel;
2356
2357 api_ready (aTHX_ (SV *)coro->hv);
2358 }
2359
2360 return 1;
2361}
2362
2150/*****************************************************************************/ 2363/*****************************************************************************/
2151/* async pool handler */ 2364/* async pool handler */
2152 2365
2153static int 2366static int
2154slf_check_pool_handler (pTHX_ struct CoroSLF *frame) 2367slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
… …
2183slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2396slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2184{ 2397{
2185 HV *hv = (HV *)SvRV (coro_current); 2398 HV *hv = (HV *)SvRV (coro_current);
2186 struct coro *coro = SvSTATE_hv ((SV *)hv); 2399 struct coro *coro = SvSTATE_hv ((SV *)hv);
2187 2400
2188 if (expect_true (coro->saved_deffh)) 2401 if (ecb_expect_true (coro->saved_deffh))
2189 { 2402 {
2190 /* subsequent iteration */ 2403 /* subsequent iteration */
2191 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2404 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2192 coro->saved_deffh = 0; 2405 coro->saved_deffh = 0;
2193 2406
2194 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2407 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2195 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2408 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2196 { 2409 {
2197 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2410 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2198 coro->invoke_av = newAV (); 2411 return;
2199
2200 frame->prepare = prepare_nop;
2201 } 2412 }
2202 else 2413 else
2203 { 2414 {
2204 av_clear (GvAV (PL_defgv)); 2415 av_clear (GvAV (PL_defgv));
2205 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2416 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2255 2466
2256static int 2467static int
2257slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2468slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2258{ 2469{
2259 SV *data = (SV *)frame->data; 2470 SV *data = (SV *)frame->data;
2260 2471
2261 if (CORO_THROW) 2472 if (CORO_THROW)
2262 return 0; 2473 return 0;
2263 2474
2264 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2475 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2265 return 1; 2476 return 1;
… …
2301 cb = sv_2mortal (coro->rouse_cb); 2512 cb = sv_2mortal (coro->rouse_cb);
2302 coro->rouse_cb = 0; 2513 coro->rouse_cb = 0;
2303 } 2514 }
2304 2515
2305 if (!SvROK (cb) 2516 if (!SvROK (cb)
2306 || SvTYPE (SvRV (cb)) != SVt_PVCV 2517 || SvTYPE (SvRV (cb)) != SVt_PVCV
2307 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2518 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2308 croak ("Coro::rouse_wait called with illegal callback argument,"); 2519 croak ("Coro::rouse_wait called with illegal callback argument,");
2309 2520
2310 { 2521 {
2311 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2522 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2428static void 2639static void
2429slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2640slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2430{ 2641{
2431 frame->prepare = prepare_cede_notself; 2642 frame->prepare = prepare_cede_notself;
2432 frame->check = slf_check_nop; 2643 frame->check = slf_check_nop;
2644}
2645
2646/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2647static void
2648slf_destroy (pTHX_ struct coro *coro)
2649{
2650 struct CoroSLF frame = coro->slf_frame;
2651
2652 /*
2653 * The on_destroy below most likely is from an SLF call.
2654 * Since by definition the SLF call will not finish when we destroy
2655 * the coro, we will have to force-finish it here, otherwise
2656 * cleanup functions cannot call SLF functions.
2657 */
2658 coro->slf_frame.prepare = 0;
2659
2660 /* this callback is reserved for slf functions needing to do cleanup */
2661 if (frame.destroy && frame.prepare && !PL_dirty)
2662 frame.destroy (aTHX_ &frame);
2433} 2663}
2434 2664
2435/* 2665/*
2436 * these not obviously related functions are all rolled into one 2666 * these not obviously related functions are all rolled into one
2437 * function to increase chances that they all will call transfer with the same 2667 * function to increase chances that they all will call transfer with the same
… …
2444 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2674 I32 checkmark; /* mark SP to see how many elements check has pushed */
2445 2675
2446 /* set up the slf frame, unless it has already been set-up */ 2676 /* set up the slf frame, unless it has already been set-up */
2447 /* the latter happens when a new coro has been started */ 2677 /* the latter happens when a new coro has been started */
2448 /* or when a new cctx was attached to an existing coroutine */ 2678 /* or when a new cctx was attached to an existing coroutine */
2449 if (expect_true (!slf_frame.prepare)) 2679 if (ecb_expect_true (!slf_frame.prepare))
2450 { 2680 {
2451 /* first iteration */ 2681 /* first iteration */
2452 dSP; 2682 dSP;
2453 SV **arg = PL_stack_base + TOPMARK + 1; 2683 SV **arg = PL_stack_base + TOPMARK + 1;
2454 int items = SP - arg; /* args without function object */ 2684 int items = SP - arg; /* args without function object */
… …
2495 while (slf_frame.check (aTHX_ &slf_frame)); 2725 while (slf_frame.check (aTHX_ &slf_frame));
2496 2726
2497 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2727 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2498 2728
2499 /* exception handling */ 2729 /* exception handling */
2500 if (expect_false (CORO_THROW)) 2730 if (ecb_expect_false (CORO_THROW))
2501 { 2731 {
2502 SV *exception = sv_2mortal (CORO_THROW); 2732 SV *exception = sv_2mortal (CORO_THROW);
2503 2733
2504 CORO_THROW = 0; 2734 CORO_THROW = 0;
2505 sv_setsv (ERRSV, exception); 2735 sv_setsv (ERRSV, exception);
2506 croak (0); 2736 croak (0);
2507 } 2737 }
2508 2738
2509 /* return value handling - mostly like entersub */ 2739 /* return value handling - mostly like entersub */
2510 /* make sure we put something on the stack in scalar context */ 2740 /* make sure we put something on the stack in scalar context */
2511 if (GIMME_V == G_SCALAR) 2741 if (GIMME_V == G_SCALAR
2742 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2512 { 2743 {
2513 dSP; 2744 dSP;
2514 SV **bot = PL_stack_base + checkmark; 2745 SV **bot = PL_stack_base + checkmark;
2515 2746
2516 if (sp == bot) /* too few, push undef */ 2747 if (sp == bot) /* too few, push undef */
2517 bot [1] = &PL_sv_undef; 2748 bot [1] = &PL_sv_undef;
2518 else if (sp != bot + 1) /* too many, take last one */ 2749 else /* too many, take last one */
2519 bot [1] = *sp; 2750 bot [1] = *sp;
2520 2751
2521 SP = bot + 1; 2752 SP = bot + 1;
2522 2753
2523 PUTBACK; 2754 PUTBACK;
… …
2621{ 2852{
2622 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2853 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2623 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2854 on_enterleave_call (aTHX_ sv_2mortal (cb));
2624} 2855}
2625 2856
2857static void
2858enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2859{
2860 if (!hook)
2861 return;
2862
2863 if (!*avp)
2864 {
2865 *avp = newAV ();
2866 AvREAL_off (*avp);
2867 }
2868
2869 av_push (*avp, (SV *)hook);
2870 av_push (*avp, (SV *)arg);
2871}
2872
2873static void
2874enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2875{
2876 AV *av = *avp;
2877 int i;
2878
2879 if (!av)
2880 return;
2881
2882 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2883 if (AvARRAY (av)[i] == (SV *)hook)
2884 {
2885 if (execute)
2886 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2887
2888 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2889 av_pop (av);
2890 av_pop (av);
2891 break;
2892 }
2893
2894 if (AvFILLp (av) >= 0)
2895 {
2896 *avp = 0;
2897 SvREFCNT_dec_NN (av);
2898 }
2899}
2900
2901static void
2902api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2903{
2904 struct coro *coro = SvSTATE (coro_sv);
2905
2906 if (SvSTATE_current == coro)
2907 if (enter)
2908 enter (aTHX_ enter_arg);
2909
2910 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2911 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2912}
2913
2914static void
2915api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2916{
2917 struct coro *coro = SvSTATE (coro_sv);
2918
2919 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2920 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2921}
2922
2923static void
2924savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2925{
2926 struct coro *coro = SvSTATE_current;
2927
2928 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2929}
2930
2931static void
2932savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2933{
2934 struct coro *coro = SvSTATE_current;
2935
2936 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2937}
2938
2939static void
2940api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2941{
2942 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2943
2944 /* this ought to be much cheaper than malloc + a single destructor call */
2945 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2946 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2947}
2948
2626/*****************************************************************************/ 2949/*****************************************************************************/
2627/* PerlIO::cede */ 2950/* PerlIO::cede */
2628 2951
2629typedef struct 2952typedef struct
2630{ 2953{
2631 PerlIOBuf base; 2954 PerlIOBuf base;
2632 NV next, every; 2955 NV next, every;
2633} PerlIOCede; 2956} PerlIOCede;
2634 2957
2635static IV 2958static IV ecb_cold
2636PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2959PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2637{ 2960{
2638 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2961 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2639 2962
2640 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2963 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2641 self->next = nvtime () + self->every; 2964 self->next = nvtime () + self->every;
2642 2965
2643 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2966 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2644} 2967}
2645 2968
2646static SV * 2969static SV * ecb_cold
2647PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2970PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2648{ 2971{
2649 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2972 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2650 2973
2651 return newSVnv (self->every); 2974 return newSVnv (self->every);
… …
2758 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3081 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2759 PUTBACK; 3082 PUTBACK;
2760 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3083 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2761 } 3084 }
2762 3085
2763 SvREFCNT_dec (cb); 3086 SvREFCNT_dec_NN (cb);
2764 } 3087 }
2765} 3088}
2766 3089
2767static void 3090static void
2768coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3091coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2769{ 3092{
2770 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3093 /* call $sem->adjust (0) to possibly wake up some other waiters */
2771 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3094 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2772} 3095}
2773 3096
2774static int 3097static int
2775slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3098slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2776{ 3099{
2777 AV *av = (AV *)frame->data; 3100 AV *av = (AV *)frame->data;
2778 SV *count_sv = AvARRAY (av)[0]; 3101 SV *count_sv = AvARRAY (av)[0];
3102 SV *coro_hv = SvRV (coro_current);
3103
3104 frame->destroy = 0;
2779 3105
2780 /* if we are about to throw, don't actually acquire the lock, just throw */ 3106 /* if we are about to throw, don't actually acquire the lock, just throw */
2781 if (CORO_THROW) 3107 if (ecb_expect_false (CORO_THROW))
3108 {
3109 /* we still might be responsible for the semaphore, so wake up others */
3110 coro_semaphore_adjust (aTHX_ av, 0);
3111
2782 return 0; 3112 return 0;
3113 }
2783 else if (SvIVX (count_sv) > 0) 3114 else if (SvIVX (count_sv) > 0)
2784 { 3115 {
2785 SvSTATE_current->on_destroy = 0;
2786
2787 if (acquire) 3116 if (acquire)
2788 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3117 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2789 else 3118 else
2790 coro_semaphore_adjust (aTHX_ av, 0); 3119 coro_semaphore_adjust (aTHX_ av, 0);
2791 3120
… …
2795 { 3124 {
2796 int i; 3125 int i;
2797 /* if we were woken up but can't down, we look through the whole */ 3126 /* if we were woken up but can't down, we look through the whole */
2798 /* waiters list and only add us if we aren't in there already */ 3127 /* waiters list and only add us if we aren't in there already */
2799 /* this avoids some degenerate memory usage cases */ 3128 /* this avoids some degenerate memory usage cases */
2800 3129 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2801 for (i = 1; i <= AvFILLp (av); ++i)
2802 if (AvARRAY (av)[i] == SvRV (coro_current)) 3130 if (AvARRAY (av)[i] == coro_hv)
2803 return 1; 3131 return 1;
2804 3132
2805 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3133 av_push (av, SvREFCNT_inc (coro_hv));
2806 return 1; 3134 return 1;
2807 } 3135 }
2808} 3136}
2809 3137
2810static int 3138static int
… …
2833 { 3161 {
2834 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3162 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2835 3163
2836 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3164 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2837 frame->prepare = prepare_schedule; 3165 frame->prepare = prepare_schedule;
2838
2839 /* to avoid race conditions when a woken-up coro gets terminated */ 3166 /* to avoid race conditions when a woken-up coro gets terminated */
2840 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3167 /* we arrange for a temporary on_destroy that calls adjust (0) */
2841 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3168 frame->destroy = coro_semaphore_destroy;
2842 } 3169 }
2843} 3170}
2844 3171
2845static void 3172static void
2846slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3173slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2904 { 3231 {
2905 api_ready (aTHX_ cb); 3232 api_ready (aTHX_ cb);
2906 sv_setiv (cb, 0); /* signal waiter */ 3233 sv_setiv (cb, 0); /* signal waiter */
2907 } 3234 }
2908 3235
2909 SvREFCNT_dec (cb); 3236 SvREFCNT_dec_NN (cb);
2910 3237
2911 --count; 3238 --count;
2912 } 3239 }
2913} 3240}
2914 3241
… …
2999 } 3326 }
3000 3327
3001 av_push (state, data_sv); 3328 av_push (state, data_sv);
3002 3329
3003 api_ready (aTHX_ coro); 3330 api_ready (aTHX_ coro);
3004 SvREFCNT_dec (coro); 3331 SvREFCNT_dec_NN (coro);
3005 SvREFCNT_dec ((AV *)state); 3332 SvREFCNT_dec_NN ((AV *)state);
3006} 3333}
3007 3334
3008static int 3335static int
3009slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3336slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3010{ 3337{
… …
3015 /* it quickly returns */ 3342 /* it quickly returns */
3016 if (CORO_THROW) 3343 if (CORO_THROW)
3017 return 0; 3344 return 0;
3018 3345
3019 /* one element that is an RV? repeat! */ 3346 /* one element that is an RV? repeat! */
3020 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3347 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3021 return 1; 3348 return 1;
3022 3349
3023 /* restore status */ 3350 /* restore status */
3024 { 3351 {
3025 SV *data_sv = av_pop (state); 3352 SV *data_sv = av_pop (state);
… …
3028 errno = data->errorno; 3355 errno = data->errorno;
3029 PL_laststype = data->laststype; 3356 PL_laststype = data->laststype;
3030 PL_laststatval = data->laststatval; 3357 PL_laststatval = data->laststatval;
3031 PL_statcache = data->statcache; 3358 PL_statcache = data->statcache;
3032 3359
3033 SvREFCNT_dec (data_sv); 3360 SvREFCNT_dec_NN (data_sv);
3034 } 3361 }
3035 3362
3036 /* push result values */ 3363 /* push result values */
3037 { 3364 {
3038 dSP; 3365 dSP;
… …
3064 dSP; 3391 dSP;
3065 3392
3066 static SV *prio_cv; 3393 static SV *prio_cv;
3067 static SV *prio_sv; 3394 static SV *prio_sv;
3068 3395
3069 if (expect_false (!prio_cv)) 3396 if (ecb_expect_false (!prio_cv))
3070 { 3397 {
3071 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3398 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3072 prio_sv = newSViv (0); 3399 prio_sv = newSViv (0);
3073 } 3400 }
3074 3401
… …
3180 } 3507 }
3181 3508
3182 return coro_sv; 3509 return coro_sv;
3183} 3510}
3184 3511
3512#ifndef __cplusplus
3513ecb_cold XS(boot_Coro__State);
3514#endif
3515
3516#if CORO_JIT
3517
3518static void ecb_noinline ecb_cold
3519pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3520{
3521 dSP;
3522 AV *av = newAV ();
3523
3524 av_store (av, 3, newSVuv (d));
3525 av_store (av, 2, newSVuv (c));
3526 av_store (av, 1, newSVuv (b));
3527 av_store (av, 0, newSVuv (a));
3528
3529 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3530
3531 PUTBACK;
3532}
3533
3534static void ecb_noinline ecb_cold
3535jit_init (pTHX)
3536{
3537 dSP;
3538 SV *load, *save;
3539 char *map_base;
3540 char *load_ptr, *save_ptr;
3541 STRLEN load_len, save_len, map_len;
3542 int count;
3543
3544 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3545
3546 PUSHMARK (SP);
3547 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3548 #include "state.h"
3549 count = call_pv ("Coro::State::_jit", G_ARRAY);
3550 SPAGAIN;
3551
3552 save = POPs; save_ptr = SvPVbyte (save, save_len);
3553 load = POPs; load_ptr = SvPVbyte (load, load_len);
3554
3555 map_len = load_len + save_len + 16;
3556
3557 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3558
3559 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3560
3561 load_perl_slots = (load_save_perl_slots_type)map_base;
3562 memcpy (map_base, load_ptr, load_len);
3563
3564 map_base += (load_len + 15) & ~15;
3565
3566 save_perl_slots = (load_save_perl_slots_type)map_base;
3567 memcpy (map_base, save_ptr, save_len);
3568
3569 /* we are good citizens and try to make the page read-only, so the evil evil */
3570 /* hackers might have it a bit more difficult */
3571 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3572
3573 PUTBACK;
3574 eval_pv ("undef &Coro::State::_jit", 1);
3575}
3576
3577#endif
3578
3185MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3579MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3186 3580
3187PROTOTYPES: DISABLE 3581PROTOTYPES: DISABLE
3188 3582
3189BOOT: 3583BOOT:
3190{ 3584{
3585#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3586#include "state.h"
3191#ifdef USE_ITHREADS 3587#ifdef USE_ITHREADS
3192# if CORO_PTHREAD 3588# if CORO_PTHREAD
3193 coro_thx = PERL_GET_CONTEXT; 3589 coro_thx = PERL_GET_CONTEXT;
3194# endif 3590# endif
3195#endif 3591#endif
3196 BOOT_PAGESIZE; 3592 /* perl defines these to check for existance first, but why it doesn't */
3593 /* just create them one at init time is not clear to me, except for */
3594 /* programs trying to delete them, but... */
3595 /* anyway, we declare this as invalid and make sure they are initialised here */
3596 DEFSV;
3597 ERRSV;
3197 3598
3198 cctx_current = cctx_new_empty (); 3599 cctx_current = cctx_new_empty ();
3199 3600
3200 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3601 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3201 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3602 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3202 3603
3203 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3604 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
3204 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3605 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
3205 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3606 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3206 3607
3207 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3208 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3608 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3209 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3609 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3210 3610
3211 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3611 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3212 3612
… …
3244 coroapi.prepare_cede_notself = prepare_cede_notself; 3644 coroapi.prepare_cede_notself = prepare_cede_notself;
3245 3645
3246 time_init (aTHX); 3646 time_init (aTHX);
3247 3647
3248 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3648 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3649#if CORO_JIT
3650 PUTBACK;
3651 jit_init (aTHX);
3652 SPAGAIN;
3653#endif
3249} 3654}
3250 3655
3251SV * 3656SV *
3252new (SV *klass, ...) 3657new (SV *klass, ...)
3253 ALIAS: 3658 ALIAS:
… …
3260void 3665void
3261transfer (...) 3666transfer (...)
3262 PROTOTYPE: $$ 3667 PROTOTYPE: $$
3263 CODE: 3668 CODE:
3264 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3669 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3265
3266void
3267_exit (int code)
3268 PROTOTYPE: $
3269 CODE:
3270 _exit (code);
3271 3670
3272SV * 3671SV *
3273clone (Coro::State coro) 3672clone (Coro::State coro)
3274 CODE: 3673 CODE:
3275{ 3674{
… …
3330void 3729void
3331list () 3730list ()
3332 PROTOTYPE: 3731 PROTOTYPE:
3333 PPCODE: 3732 PPCODE:
3334{ 3733{
3335 struct coro *coro; 3734 struct coro *coro;
3336 for (coro = coro_first; coro; coro = coro->next) 3735 for (coro = coro_first; coro; coro = coro->next)
3337 if (coro->hv) 3736 if (coro->hv)
3338 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3737 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3339} 3738}
3340 3739
… …
3395 PROTOTYPE: $ 3794 PROTOTYPE: $
3396 ALIAS: 3795 ALIAS:
3397 is_ready = CF_READY 3796 is_ready = CF_READY
3398 is_running = CF_RUNNING 3797 is_running = CF_RUNNING
3399 is_new = CF_NEW 3798 is_new = CF_NEW
3400 is_destroyed = CF_DESTROYED 3799 is_destroyed = CF_ZOMBIE
3800 is_zombie = CF_ZOMBIE
3401 is_suspended = CF_SUSPENDED 3801 is_suspended = CF_SUSPENDED
3402 CODE: 3802 CODE:
3403 RETVAL = boolSV (coro->flags & ix); 3803 RETVAL = boolSV (coro->flags & ix);
3404 OUTPUT: 3804 OUTPUT:
3405 RETVAL 3805 RETVAL
3406 3806
3407void 3807void
3408throw (Coro::State self, SV *exception = &PL_sv_undef) 3808throw (SV *self, SV *exception = &PL_sv_undef)
3409 PROTOTYPE: $;$ 3809 PROTOTYPE: $;$
3410 CODE: 3810 CODE:
3411{ 3811{
3812 struct coro *coro = SvSTATE (self);
3412 struct coro *current = SvSTATE_current; 3813 struct coro *current = SvSTATE_current;
3413 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3814 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3414 SvREFCNT_dec (*exceptionp); 3815 SvREFCNT_dec (*exceptionp);
3415 SvGETMAGIC (exception); 3816 SvGETMAGIC (exception);
3416 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3817 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3818
3819 api_ready (aTHX_ self);
3417} 3820}
3418 3821
3419void 3822void
3420api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3823api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3421 PROTOTYPE: $;$ 3824 PROTOTYPE: $;$
… …
3498 3901
3499void 3902void
3500times (Coro::State self) 3903times (Coro::State self)
3501 PPCODE: 3904 PPCODE:
3502{ 3905{
3503 struct coro *current = SvSTATE (coro_current); 3906 struct coro *current = SvSTATE (coro_current);
3504 3907
3505 if (expect_false (current == self)) 3908 if (ecb_expect_false (current == self))
3506 { 3909 {
3507 coro_times_update (); 3910 coro_times_update ();
3508 coro_times_add (SvSTATE (coro_current)); 3911 coro_times_add (SvSTATE (coro_current));
3509 } 3912 }
3510 3913
3511 EXTEND (SP, 2); 3914 EXTEND (SP, 2);
3512 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3915 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3513 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3916 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3514 3917
3515 if (expect_false (current == self)) 3918 if (ecb_expect_false (current == self))
3516 coro_times_sub (SvSTATE (coro_current)); 3919 coro_times_sub (SvSTATE (coro_current));
3517} 3920}
3518 3921
3519void 3922void
3520swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3923swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3538 3941
3539MODULE = Coro::State PACKAGE = Coro 3942MODULE = Coro::State PACKAGE = Coro
3540 3943
3541BOOT: 3944BOOT:
3542{ 3945{
3946 if (SVt_LAST > 32)
3947 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3948
3543 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3949 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3544 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3950 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3545 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3951 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3546 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3547 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3952 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3548 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3953 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3549 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3954 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3550 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3955 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3551 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3956 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3552 3957
3553 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3958 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3554 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3959 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3555 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3960 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3556 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3961 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3557 3962
3558 coro_stash = gv_stashpv ("Coro", TRUE); 3963 coro_stash = gv_stashpv ("Coro", TRUE);
3559 3964
3560 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3965 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3561 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3966 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3562 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3967 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3574 coroapi.ready = api_ready; 3979 coroapi.ready = api_ready;
3575 coroapi.is_ready = api_is_ready; 3980 coroapi.is_ready = api_is_ready;
3576 coroapi.nready = coro_nready; 3981 coroapi.nready = coro_nready;
3577 coroapi.current = coro_current; 3982 coroapi.current = coro_current;
3578 3983
3984 coroapi.enterleave_hook = api_enterleave_hook;
3985 coroapi.enterleave_unhook = api_enterleave_unhook;
3986 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3987
3579 /*GCoroAPI = &coroapi;*/ 3988 /*GCoroAPI = &coroapi;*/
3580 sv_setiv (sv, (IV)&coroapi); 3989 sv_setiv (sv, (IV)&coroapi);
3581 SvREADONLY_on (sv); 3990 SvREADONLY_on (sv);
3582 } 3991 }
3583} 3992}
… …
3594void 4003void
3595_destroy (Coro::State coro) 4004_destroy (Coro::State coro)
3596 CODE: 4005 CODE:
3597 /* used by the manager thread */ 4006 /* used by the manager thread */
3598 coro_state_destroy (aTHX_ coro); 4007 coro_state_destroy (aTHX_ coro);
4008
4009void
4010on_destroy (Coro::State coro, SV *cb)
4011 CODE:
3599 coro_call_on_destroy (aTHX_ coro); 4012 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4013
4014void
4015join (...)
4016 CODE:
4017 CORO_EXECUTE_SLF_XS (slf_init_join);
3600 4018
3601void 4019void
3602terminate (...) 4020terminate (...)
3603 CODE: 4021 CODE:
3604 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4022 CORO_EXECUTE_SLF_XS (slf_init_terminate);
… …
3606void 4024void
3607cancel (...) 4025cancel (...)
3608 CODE: 4026 CODE:
3609 CORO_EXECUTE_SLF_XS (slf_init_cancel); 4027 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3610 4028
4029int
4030safe_cancel (Coro::State self, ...)
4031 C_ARGS: aTHX_ self, &ST (1), items - 1
4032
3611void 4033void
3612schedule (...) 4034schedule (...)
3613 CODE: 4035 CODE:
3614 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4036 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3615 4037
… …
3635 4057
3636void 4058void
3637_set_current (SV *current) 4059_set_current (SV *current)
3638 PROTOTYPE: $ 4060 PROTOTYPE: $
3639 CODE: 4061 CODE:
3640 SvREFCNT_dec (SvRV (coro_current)); 4062 SvREFCNT_dec_NN (SvRV (coro_current));
3641 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4063 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3642 4064
3643void 4065void
3644_set_readyhook (SV *hook) 4066_set_readyhook (SV *hook)
3645 PROTOTYPE: $ 4067 PROTOTYPE: $
… …
3729 4151
3730 if ((SV *)hv == &PL_sv_undef) 4152 if ((SV *)hv == &PL_sv_undef)
3731 { 4153 {
3732 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4154 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3733 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4155 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3734 SvREFCNT_dec (sv); 4156 SvREFCNT_dec_NN (sv);
3735 } 4157 }
3736 4158
3737 { 4159 {
3738 struct coro *coro = SvSTATE_hv (hv); 4160 struct coro *coro = SvSTATE_hv (hv);
3739 4161
… …
3746 api_ready (aTHX_ (SV *)hv); 4168 api_ready (aTHX_ (SV *)hv);
3747 4169
3748 if (GIMME_V != G_VOID) 4170 if (GIMME_V != G_VOID)
3749 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4171 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3750 else 4172 else
3751 SvREFCNT_dec (hv); 4173 SvREFCNT_dec_NN (hv);
3752} 4174}
3753 4175
3754SV * 4176SV *
3755rouse_cb () 4177rouse_cb ()
3756 PROTOTYPE: 4178 PROTOTYPE:
… …
3771 on_leave = 1 4193 on_leave = 1
3772 PROTOTYPE: & 4194 PROTOTYPE: &
3773 CODE: 4195 CODE:
3774{ 4196{
3775 struct coro *coro = SvSTATE_current; 4197 struct coro *coro = SvSTATE_current;
3776 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4198 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3777 4199
3778 block = s_get_cv_croak (block); 4200 block = s_get_cv_croak (block);
3779 4201
3780 if (!*avp) 4202 if (!*avp)
3781 *avp = newAV (); 4203 *avp = newAV ();
… …
3801 4223
3802SV * 4224SV *
3803new (SV *klass, SV *count = 0) 4225new (SV *klass, SV *count = 0)
3804 CODE: 4226 CODE:
3805{ 4227{
3806 int semcnt = 1; 4228 int semcnt = 1;
3807 4229
3808 if (count) 4230 if (count)
3809 { 4231 {
3810 SvGETMAGIC (count); 4232 SvGETMAGIC (count);
3811 4233
… …
3871 XSRETURN_NO; 4293 XSRETURN_NO;
3872} 4294}
3873 4295
3874void 4296void
3875waiters (SV *self) 4297waiters (SV *self)
3876 PPCODE: 4298 PPCODE:
3877{ 4299{
3878 AV *av = (AV *)SvRV (self); 4300 AV *av = (AV *)SvRV (self);
3879 int wcount = AvFILLp (av) + 1 - 1; 4301 int wcount = AvFILLp (av) + 1 - 1;
3880 4302
3881 if (GIMME_V == G_SCALAR) 4303 if (GIMME_V == G_SCALAR)
… …
3890} 4312}
3891 4313
3892MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4314MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3893 4315
3894void 4316void
3895_may_delete (SV *sem, int count, int extra_refs) 4317_may_delete (SV *sem, int count, unsigned int extra_refs)
3896 PPCODE: 4318 PPCODE:
3897{ 4319{
3898 AV *av = (AV *)SvRV (sem); 4320 AV *av = (AV *)SvRV (sem);
3899 4321
3900 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4322 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3901 && AvFILLp (av) == 0 /* no waiters, just count */ 4323 && AvFILLp (av) == 0 /* no waiters, just count */
3902 && SvIV (AvARRAY (av)[0]) == count) 4324 && SvIV (AvARRAY (av)[0]) == count)
3903 XSRETURN_YES; 4325 XSRETURN_YES;
… …
3924 4346
3925void 4347void
3926broadcast (SV *self) 4348broadcast (SV *self)
3927 CODE: 4349 CODE:
3928{ 4350{
3929 AV *av = (AV *)SvRV (self); 4351 AV *av = (AV *)SvRV (self);
3930 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4352 coro_signal_wake (aTHX_ av, AvFILLp (av));
3931} 4353}
3932 4354
3933void 4355void
3934send (SV *self) 4356send (SV *self)
… …
3942 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4364 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3943} 4365}
3944 4366
3945IV 4367IV
3946awaited (SV *self) 4368awaited (SV *self)
3947 CODE: 4369 CODE:
3948 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4370 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3949 OUTPUT: 4371 OUTPUT:
3950 RETVAL 4372 RETVAL
3951 4373
3952 4374
… …
3957 4379
3958void 4380void
3959_schedule (...) 4381_schedule (...)
3960 CODE: 4382 CODE:
3961{ 4383{
3962 static int incede; 4384 static int incede;
3963 4385
3964 api_cede_notself (aTHX); 4386 api_cede_notself (aTHX);
3965 4387
3966 ++incede; 4388 ++incede;
3967 while (coro_nready >= incede && api_cede (aTHX)) 4389 while (coro_nready >= incede && api_cede (aTHX))
… …
4011 { 4433 {
4012 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4434 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4013 coro_old_pp_sselect = 0; 4435 coro_old_pp_sselect = 0;
4014 } 4436 }
4015 4437
4438MODULE = Coro::State PACKAGE = Coro::Util
4439
4440void
4441_exit (int code)
4442 CODE:
4443 _exit (code);
4444
4445NV
4446time ()
4447 CODE:
4448 RETVAL = nvtime (aTHX);
4449 OUTPUT:
4450 RETVAL
4451
4452NV
4453gettimeofday ()
4454 PPCODE:
4455{
4456 UV tv [2];
4457 u2time (aTHX_ tv);
4458 EXTEND (SP, 2);
4459 PUSHs (sv_2mortal (newSVuv (tv [0])));
4460 PUSHs (sv_2mortal (newSVuv (tv [1])));
4461}
4462

Diff Legend

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