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

Diff Legend

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