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.393 by root, Fri Apr 29 17:38:56 2011 UTC vs.
Revision 1.452 by root, Tue Jun 30 12:42:45 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 #define svany_in_head(type) \
715 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
716
717 if (svany_in_head (SvTYPE (a)))
718 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
719
720 if (svany_in_head (SvTYPE (b)))
721 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
722 }
723#endif
724}
725
621/* swap sv heads, at least logically */ 726/* swap sv heads, at least logically */
622static void 727static void
623swap_svs (pTHX_ Coro__State c) 728swap_svs (pTHX_ Coro__State c)
624{ 729{
625 int i; 730 int i;
626 731
627 for (i = 0; i <= AvFILLp (c->swap_sv); ) 732 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
628 { 733 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} 734}
667 735
668#define SWAP_SVS(coro) \ 736#define SWAP_SVS(coro) \
669 if (expect_false ((coro)->swap_sv)) \ 737 if (ecb_expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro)) 738 swap_svs (aTHX_ (coro))
671 739
672static void 740static void
673on_enterleave_call (pTHX_ SV *cb); 741on_enterleave_call (pTHX_ SV *cb);
674 742
… …
678 perl_slots *slot = c->slot; 746 perl_slots *slot = c->slot;
679 c->slot = 0; 747 c->slot = 0;
680 748
681 PL_mainstack = c->mainstack; 749 PL_mainstack = c->mainstack;
682 750
683 GvSV (PL_defgv) = slot->defsv; 751#if CORO_JIT
684 GvAV (PL_defgv) = slot->defav; 752 load_perl_slots (slot);
685 GvSV (PL_errgv) = slot->errsv; 753#else
686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
688
689 #define VAR(name,type) PL_ ## name = slot->name; 754 #define VARx(name,expr,type) expr = slot->name;
690 # include "state.h" 755 #include "state.h"
691 #undef VAR 756#endif
692 757
693 { 758 {
694 dSP; 759 dSP;
695 760
696 CV *cv; 761 CV *cv;
697 762
698 /* now do the ugly restore mess */ 763 /* now do the ugly restore mess */
699 while (expect_true (cv = (CV *)POPs)) 764 while (ecb_expect_true (cv = (CV *)POPs))
700 { 765 {
701 put_padlist (aTHX_ cv); /* mark this padlist as available */ 766 put_padlist (aTHX_ cv); /* mark this padlist as available */
702 CvDEPTH (cv) = PTR2IV (POPs); 767 CvDEPTH (cv) = PTR2IV (POPs);
703 CvPADLIST (cv) = (AV *)POPs; 768 CvPADLIST (cv) = (PADLIST *)POPs;
704 } 769 }
705 770
706 PUTBACK; 771 PUTBACK;
707 } 772 }
708 773
709 slf_frame = c->slf_frame; 774 slf_frame = c->slf_frame;
710 CORO_THROW = c->except; 775 CORO_THROW = c->except;
711 776
712 if (expect_false (enable_times)) 777 if (ecb_expect_false (enable_times))
713 { 778 {
714 if (expect_false (!times_valid)) 779 if (ecb_expect_false (!times_valid))
715 coro_times_update (); 780 coro_times_update ();
716 781
717 coro_times_sub (c); 782 coro_times_sub (c);
718 } 783 }
719 784
720 if (expect_false (c->on_enter)) 785 if (ecb_expect_false (c->on_enter))
721 { 786 {
722 int i; 787 int i;
723 788
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 789 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 790 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
726 } 791 }
727 792
793 if (ecb_expect_false (c->on_enter_xs))
794 {
795 int i;
796
797 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
798 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
799 }
800
728 SWAP_SVS (c); 801 SWAP_SVS (c);
729} 802}
730 803
731static void 804static void
732save_perl (pTHX_ Coro__State c) 805save_perl (pTHX_ Coro__State c)
733{ 806{
734 SWAP_SVS (c); 807 SWAP_SVS (c);
735 808
809 if (ecb_expect_false (c->on_leave_xs))
810 {
811 int i;
812
813 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
814 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
815 }
816
736 if (expect_false (c->on_leave)) 817 if (ecb_expect_false (c->on_leave))
737 { 818 {
738 int i; 819 int i;
739 820
740 for (i = AvFILLp (c->on_leave); i >= 0; --i) 821 for (i = AvFILLp (c->on_leave); i >= 0; --i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 822 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 } 823 }
743 824
744 times_valid = 0; 825 times_valid = 0;
745 826
746 if (expect_false (enable_times)) 827 if (ecb_expect_false (enable_times))
747 { 828 {
748 coro_times_update (); times_valid = 1; 829 coro_times_update (); times_valid = 1;
749 coro_times_add (c); 830 coro_times_add (c);
750 } 831 }
751 832
… …
765 846
766 XPUSHs (Nullsv); 847 XPUSHs (Nullsv);
767 /* this loop was inspired by pp_caller */ 848 /* this loop was inspired by pp_caller */
768 for (;;) 849 for (;;)
769 { 850 {
770 while (expect_true (cxix >= 0)) 851 while (ecb_expect_true (cxix >= 0))
771 { 852 {
772 PERL_CONTEXT *cx = &ccstk[cxix--]; 853 PERL_CONTEXT *cx = &ccstk[cxix--];
773 854
774 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 855 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
775 { 856 {
776 CV *cv = cx->blk_sub.cv; 857 CV *cv = cx->blk_sub.cv;
777 858
778 if (expect_true (CvDEPTH (cv))) 859 if (ecb_expect_true (CvDEPTH (cv)))
779 { 860 {
780 EXTEND (SP, 3); 861 EXTEND (SP, 3);
781 PUSHs ((SV *)CvPADLIST (cv)); 862 PUSHs ((SV *)CvPADLIST (cv));
782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 863 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
783 PUSHs ((SV *)cv); 864 PUSHs ((SV *)cv);
… …
786 get_padlist (aTHX_ cv); 867 get_padlist (aTHX_ cv);
787 } 868 }
788 } 869 }
789 } 870 }
790 871
791 if (expect_true (top_si->si_type == PERLSI_MAIN)) 872 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
792 break; 873 break;
793 874
794 top_si = top_si->si_prev; 875 top_si = top_si->si_prev;
795 ccstk = top_si->si_cxstack; 876 ccstk = top_si->si_cxstack;
796 cxix = top_si->si_cxix; 877 cxix = top_si->si_cxix;
… …
798 879
799 PUTBACK; 880 PUTBACK;
800 } 881 }
801 882
802 /* allocate some space on the context stack for our purposes */ 883 /* allocate some space on the context stack for our purposes */
803 /* we manually unroll here, as usually 2 slots is enough */ 884 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 { 885 {
808 unsigned int i; 886 unsigned int i;
887
809 for (i = 3; i < SLOT_COUNT; ++i) 888 for (i = 0; i < SLOT_COUNT; ++i)
810 CXINC; 889 CXINC;
811 } 890
812 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 891 cxstack_ix -= SLOT_COUNT; /* undo allocation */
892 }
813 893
814 c->mainstack = PL_mainstack; 894 c->mainstack = PL_mainstack;
815 895
816 { 896 {
817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 897 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
818 898
819 slot->defav = GvAV (PL_defgv); 899#if CORO_JIT
820 slot->defsv = DEFSV; 900 save_perl_slots (slot);
821 slot->errsv = ERRSV; 901#else
822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
824
825 #define VAR(name,type) slot->name = PL_ ## name; 902 #define VARx(name,expr,type) slot->name = expr;
826 # include "state.h" 903 #include "state.h"
827 #undef VAR 904#endif
828 } 905 }
829} 906}
830 907
831/* 908/*
832 * allocate various perl stacks. This is almost an exact copy 909 * allocate various perl stacks. This is almost an exact copy
… …
838# define coro_init_stacks(thx) init_stacks () 915# define coro_init_stacks(thx) init_stacks ()
839#else 916#else
840static void 917static void
841coro_init_stacks (pTHX) 918coro_init_stacks (pTHX)
842{ 919{
843 PL_curstackinfo = new_stackinfo(32, 8); 920 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; 921 PL_curstackinfo->si_type = PERLSI_MAIN;
845 PL_curstack = PL_curstackinfo->si_stack; 922 PL_curstack = PL_curstackinfo->si_stack;
846 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 923 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
847 924
848 PL_stack_base = AvARRAY(PL_curstack); 925 PL_stack_base = AvARRAY(PL_curstack);
… …
863#endif 940#endif
864 941
865 New(54,PL_scopestack,8,I32); 942 New(54,PL_scopestack,8,I32);
866 PL_scopestack_ix = 0; 943 PL_scopestack_ix = 0;
867 PL_scopestack_max = 8; 944 PL_scopestack_max = 8;
945#if HAS_SCOPESTACK_NAME
946 New(54,PL_scopestack_name,8,const char*);
947#endif
868 948
869 New(54,PL_savestack,24,ANY); 949 New(54,PL_savestack,24,ANY);
870 PL_savestack_ix = 0; 950 PL_savestack_ix = 0;
871 PL_savestack_max = 24; 951 PL_savestack_max = 24;
872 952
… …
900 } 980 }
901 981
902 Safefree (PL_tmps_stack); 982 Safefree (PL_tmps_stack);
903 Safefree (PL_markstack); 983 Safefree (PL_markstack);
904 Safefree (PL_scopestack); 984 Safefree (PL_scopestack);
985#if HAS_SCOPESTACK_NAME
986 Safefree (PL_scopestack_name);
987#endif
905 Safefree (PL_savestack); 988 Safefree (PL_savestack);
906#if !PERL_VERSION_ATLEAST (5,10,0) 989#if !PERL_VERSION_ATLEAST (5,10,0)
907 Safefree (PL_retstack); 990 Safefree (PL_retstack);
908#endif 991#endif
909} 992}
… …
955#endif 1038#endif
956 1039
957/* 1040/*
958 * This overrides the default magic get method of %SIG elements. 1041 * 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 1042 * 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 1043 * and instead of trying to save and restore the hash elements (extremely slow),
961 * readback here. 1044 * we just provide our own readback here.
962 */ 1045 */
963static int 1046static int ecb_cold
964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1047coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
965{ 1048{
966 const char *s = MgPV_nolen_const (mg); 1049 const char *s = MgPV_nolen_const (mg);
967 1050
968 if (*s == '_') 1051 if (*s == '_')
969 { 1052 {
970 SV **svp = 0; 1053 SV **svp = 0;
971 1054
972 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1055 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
973 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1056 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
974 1057
975 if (svp) 1058 if (svp)
976 { 1059 {
977 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1060 SV *ssv;
1061
1062 if (!*svp)
1063 ssv = &PL_sv_undef;
1064 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1065 ssv = sv_2mortal (newRV_inc (*svp));
1066 else
1067 ssv = *svp;
1068
1069 sv_setsv (sv, ssv);
978 return 0; 1070 return 0;
979 } 1071 }
980 } 1072 }
981 1073
982 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1074 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
983} 1075}
984 1076
985static int 1077static int ecb_cold
986coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1078coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
987{ 1079{
988 const char *s = MgPV_nolen_const (mg); 1080 const char *s = MgPV_nolen_const (mg);
989 1081
990 if (*s == '_') 1082 if (*s == '_')
… …
1004 } 1096 }
1005 1097
1006 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1098 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1007} 1099}
1008 1100
1009static int 1101static int ecb_cold
1010coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1102coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1011{ 1103{
1012 const char *s = MgPV_nolen_const (mg); 1104 const char *s = MgPV_nolen_const (mg);
1013 1105
1014 if (*s == '_') 1106 if (*s == '_')
… …
1049 return 1; 1141 return 1;
1050} 1142}
1051 1143
1052static UNOP init_perl_op; 1144static UNOP init_perl_op;
1053 1145
1054static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1146ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1055init_perl (pTHX_ struct coro *coro) 1147init_perl (pTHX_ struct coro *coro)
1056{ 1148{
1057 /* 1149 /*
1058 * emulate part of the perl startup here. 1150 * emulate part of the perl startup here.
1059 */ 1151 */
… …
1074 PL_parser = 0; 1166 PL_parser = 0;
1075#endif 1167#endif
1076 PL_hints = 0; 1168 PL_hints = 0;
1077 1169
1078 /* recreate the die/warn hooks */ 1170 /* recreate the die/warn hooks */
1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1171 PL_diehook = SvREFCNT_inc (rv_diehook);
1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1172 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1081 1173
1082 GvSV (PL_defgv) = newSV (0); 1174 GvSV (PL_defgv) = newSV (0);
1083 GvAV (PL_defgv) = coro->args; coro->args = 0; 1175 GvAV (PL_defgv) = coro->args; coro->args = 0;
1084 GvSV (PL_errgv) = newSV (0); 1176 GvSV (PL_errgv) = newSV (0);
1085 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1177 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1086 GvHV (PL_hintgv) = 0; 1178 GvHV (PL_hintgv) = newHV ();
1179#if PERL_VERSION_ATLEAST (5,10,0)
1180 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1181#endif
1087 PL_rs = newSVsv (GvSV (irsgv)); 1182 PL_rs = newSVsv (GvSV (irsgv));
1088 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1183 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1089 1184
1090 { 1185 {
1091 dSP; 1186 dSP;
… …
1106 /* this newly created coroutine might be run on an existing cctx which most 1201 /* 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. 1202 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1108 */ 1203 */
1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1204 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 */ 1205 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1206 slf_frame.destroy = 0;
1111 1207
1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1208 /* 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; 1209 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1210 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1211 init_perl_op.op_ppaddr = pp_slf;
… …
1120 /* copy throw, in case it was set before init_perl */ 1216 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1217 CORO_THROW = coro->except;
1122 1218
1123 SWAP_SVS (coro); 1219 SWAP_SVS (coro);
1124 1220
1125 if (expect_false (enable_times)) 1221 if (ecb_expect_false (enable_times))
1126 { 1222 {
1127 coro_times_update (); 1223 coro_times_update ();
1128 coro_times_sub (coro); 1224 coro_times_sub (coro);
1129 } 1225 }
1130} 1226}
… …
1154destroy_perl (pTHX_ struct coro *coro) 1250destroy_perl (pTHX_ struct coro *coro)
1155{ 1251{
1156 SV *svf [9]; 1252 SV *svf [9];
1157 1253
1158 { 1254 {
1255 SV *old_current = SvRV (coro_current);
1159 struct coro *current = SvSTATE_current; 1256 struct coro *current = SvSTATE (old_current);
1160 1257
1161 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1258 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1162 1259
1163 save_perl (aTHX_ current); 1260 save_perl (aTHX_ current);
1261
1262 /* this will cause transfer_check to croak on block*/
1263 SvRV_set (coro_current, (SV *)coro->hv);
1264
1164 load_perl (aTHX_ coro); 1265 load_perl (aTHX_ coro);
1165 1266
1166 coro_unwind_stacks (aTHX); 1267 coro_unwind_stacks (aTHX);
1167 coro_destruct_stacks (aTHX);
1168 1268
1169 /* restore swapped sv's */ 1269 /* restore swapped sv's */
1170 SWAP_SVS (coro); 1270 SWAP_SVS (coro);
1171 1271
1272 coro_destruct_stacks (aTHX);
1273
1172 // now save some sv's to be free'd later 1274 /* now save some sv's to be free'd later */
1173 svf [0] = GvSV (PL_defgv); 1275 svf [0] = GvSV (PL_defgv);
1174 svf [1] = (SV *)GvAV (PL_defgv); 1276 svf [1] = (SV *)GvAV (PL_defgv);
1175 svf [2] = GvSV (PL_errgv); 1277 svf [2] = GvSV (PL_errgv);
1176 svf [3] = (SV *)PL_defoutgv; 1278 svf [3] = (SV *)PL_defoutgv;
1177 svf [4] = PL_rs; 1279 svf [4] = PL_rs;
… …
1179 svf [6] = (SV *)GvHV (PL_hintgv); 1281 svf [6] = (SV *)GvHV (PL_hintgv);
1180 svf [7] = PL_diehook; 1282 svf [7] = PL_diehook;
1181 svf [8] = PL_warnhook; 1283 svf [8] = PL_warnhook;
1182 assert (9 == sizeof (svf) / sizeof (*svf)); 1284 assert (9 == sizeof (svf) / sizeof (*svf));
1183 1285
1286 SvRV_set (coro_current, old_current);
1287
1184 load_perl (aTHX_ current); 1288 load_perl (aTHX_ current);
1185 } 1289 }
1186 1290
1187 { 1291 {
1188 unsigned int i; 1292 unsigned int i;
… …
1192 1296
1193 SvREFCNT_dec (coro->saved_deffh); 1297 SvREFCNT_dec (coro->saved_deffh);
1194 SvREFCNT_dec (coro->rouse_cb); 1298 SvREFCNT_dec (coro->rouse_cb);
1195 SvREFCNT_dec (coro->invoke_cb); 1299 SvREFCNT_dec (coro->invoke_cb);
1196 SvREFCNT_dec (coro->invoke_av); 1300 SvREFCNT_dec (coro->invoke_av);
1301 SvREFCNT_dec (coro->on_enter_xs);
1302 SvREFCNT_dec (coro->on_leave_xs);
1197 } 1303 }
1198} 1304}
1199 1305
1200INLINE void 1306ecb_inline void
1201free_coro_mortal (pTHX) 1307free_coro_mortal (pTHX)
1202{ 1308{
1203 if (expect_true (coro_mortal)) 1309 if (ecb_expect_true (coro_mortal))
1204 { 1310 {
1205 SvREFCNT_dec (coro_mortal); 1311 SvREFCNT_dec ((SV *)coro_mortal);
1206 coro_mortal = 0; 1312 coro_mortal = 0;
1207 } 1313 }
1208} 1314}
1209 1315
1210static int 1316static int
… …
1264 1370
1265 if (PL_curcop != &PL_compiling) 1371 if (PL_curcop != &PL_compiling)
1266 { 1372 {
1267 SV **cb; 1373 SV **cb;
1268 1374
1269 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1375 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1270 { 1376 {
1271 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1377 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1272 1378
1273 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1379 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1274 { 1380 {
… …
1343 1449
1344 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1450 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1345} 1451}
1346 1452
1347/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1453/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1348static void NOINLINE 1454static void ecb_noinline
1349cctx_prepare (pTHX) 1455cctx_prepare (pTHX)
1350{ 1456{
1351 PL_top_env = &PL_start_env; 1457 PL_top_env = &PL_start_env;
1352 1458
1353 if (cctx_current->flags & CC_TRACE) 1459 if (cctx_current->flags & CC_TRACE)
… …
1364 slf_frame.prepare = slf_prepare_set_stacklevel; 1470 slf_frame.prepare = slf_prepare_set_stacklevel;
1365 slf_frame.check = slf_check_set_stacklevel; 1471 slf_frame.check = slf_check_set_stacklevel;
1366} 1472}
1367 1473
1368/* the tail of transfer: execute stuff we can only do after a transfer */ 1474/* the tail of transfer: execute stuff we can only do after a transfer */
1369INLINE void 1475ecb_inline void
1370transfer_tail (pTHX) 1476transfer_tail (pTHX)
1371{ 1477{
1372 free_coro_mortal (aTHX); 1478 free_coro_mortal (aTHX);
1479}
1480
1481/* try to exit the same way perl's main function would do */
1482/* we do not bother resetting the environment or other things *7
1483/* that are not, uhm, essential */
1484/* this obviously also doesn't work when perl is embedded */
1485static void ecb_noinline ecb_cold
1486perlish_exit (pTHX)
1487{
1488 int exitstatus = perl_destruct (PL_curinterp);
1489 perl_free (PL_curinterp);
1490 exit (exitstatus);
1373} 1491}
1374 1492
1375/* 1493/*
1376 * this is a _very_ stripped down perl interpreter ;) 1494 * this is a _very_ stripped down perl interpreter ;)
1377 */ 1495 */
… …
1406 */ 1524 */
1407 1525
1408 /* 1526 /*
1409 * If perl-run returns we assume exit() was being called or the coro 1527 * If perl-run returns we assume exit() was being called or the coro
1410 * fell off the end, which seems to be the only valid (non-bug) 1528 * fell off the end, which seems to be the only valid (non-bug)
1411 * reason for perl_run to return. We try to exit by jumping to the 1529 * reason for perl_run to return. We try to mimic whatever perl is normally
1412 * bootstrap-time "top" top_env, as we cannot restore the "main" 1530 * doing in that case. YMMV.
1413 * coroutine as Coro has no such concept.
1414 * This actually isn't valid with the pthread backend, but OSes requiring
1415 * that backend are too broken to do it in a standards-compliant way.
1416 */ 1531 */
1417 PL_top_env = main_top_env; 1532 perlish_exit (aTHX);
1418 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1419 } 1533 }
1420} 1534}
1421 1535
1422static coro_cctx * 1536static coro_cctx *
1423cctx_new () 1537cctx_new (void)
1424{ 1538{
1425 coro_cctx *cctx; 1539 coro_cctx *cctx;
1426 1540
1427 ++cctx_count; 1541 ++cctx_count;
1428 New (0, cctx, 1, coro_cctx); 1542 New (0, cctx, 1, coro_cctx);
… …
1434 return cctx; 1548 return cctx;
1435} 1549}
1436 1550
1437/* create a new cctx only suitable as source */ 1551/* create a new cctx only suitable as source */
1438static coro_cctx * 1552static coro_cctx *
1439cctx_new_empty () 1553cctx_new_empty (void)
1440{ 1554{
1441 coro_cctx *cctx = cctx_new (); 1555 coro_cctx *cctx = cctx_new ();
1442 1556
1443 cctx->sptr = 0; 1557 cctx->stack.sptr = 0;
1444 coro_create (&cctx->cctx, 0, 0, 0, 0); 1558 coro_create (&cctx->cctx, 0, 0, 0, 0);
1445 1559
1446 return cctx; 1560 return cctx;
1447} 1561}
1448 1562
1449/* create a new cctx suitable as destination/running a perl interpreter */ 1563/* create a new cctx suitable as destination/running a perl interpreter */
1450static coro_cctx * 1564static coro_cctx *
1451cctx_new_run () 1565cctx_new_run (void)
1452{ 1566{
1453 coro_cctx *cctx = cctx_new (); 1567 coro_cctx *cctx = cctx_new ();
1454 void *stack_start;
1455 size_t stack_size;
1456 1568
1457#if HAVE_MMAP 1569 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1458 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1459 /* mmap supposedly does allocate-on-write for us */
1460 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1461
1462 if (cctx->sptr != (void *)-1)
1463 {
1464 #if CORO_STACKGUARD
1465 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1466 #endif
1467 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1468 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1469 cctx->flags |= CC_MAPPED;
1470 } 1570 {
1471 else
1472#endif
1473 {
1474 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1475 New (0, cctx->sptr, cctx_stacksize, long);
1476
1477 if (!cctx->sptr)
1478 {
1479 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1571 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1480 _exit (EXIT_FAILURE); 1572 _exit (EXIT_FAILURE);
1481 }
1482
1483 stack_start = cctx->sptr;
1484 stack_size = cctx->ssize;
1485 } 1573 }
1486 1574
1487 #if CORO_USE_VALGRIND
1488 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1489 #endif
1490
1491 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1575 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1492 1576
1493 return cctx; 1577 return cctx;
1494} 1578}
1495 1579
1496static void 1580static void
… …
1502 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1586 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1503 1587
1504 --cctx_count; 1588 --cctx_count;
1505 coro_destroy (&cctx->cctx); 1589 coro_destroy (&cctx->cctx);
1506 1590
1507 /* coro_transfer creates new, empty cctx's */ 1591 coro_stack_free (&cctx->stack);
1508 if (cctx->sptr)
1509 {
1510 #if CORO_USE_VALGRIND
1511 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1512 #endif
1513
1514#if HAVE_MMAP
1515 if (cctx->flags & CC_MAPPED)
1516 munmap (cctx->sptr, cctx->ssize);
1517 else
1518#endif
1519 Safefree (cctx->sptr);
1520 }
1521 1592
1522 Safefree (cctx); 1593 Safefree (cctx);
1523} 1594}
1524 1595
1525/* wether this cctx should be destructed */ 1596/* wether this cctx should be destructed */
1526#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1597#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1527 1598
1528static coro_cctx * 1599static coro_cctx *
1529cctx_get (pTHX) 1600cctx_get (pTHX)
1530{ 1601{
1531 while (expect_true (cctx_first)) 1602 while (ecb_expect_true (cctx_first))
1532 { 1603 {
1533 coro_cctx *cctx = cctx_first; 1604 coro_cctx *cctx = cctx_first;
1534 cctx_first = cctx->next; 1605 cctx_first = cctx->next;
1535 --cctx_idle; 1606 --cctx_idle;
1536 1607
1537 if (expect_true (!CCTX_EXPIRED (cctx))) 1608 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1538 return cctx; 1609 return cctx;
1539 1610
1540 cctx_destroy (cctx); 1611 cctx_destroy (cctx);
1541 } 1612 }
1542 1613
… …
1544} 1615}
1545 1616
1546static void 1617static void
1547cctx_put (coro_cctx *cctx) 1618cctx_put (coro_cctx *cctx)
1548{ 1619{
1549 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1620 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1550 1621
1551 /* free another cctx if overlimit */ 1622 /* free another cctx if overlimit */
1552 if (expect_false (cctx_idle >= cctx_max_idle)) 1623 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1553 { 1624 {
1554 coro_cctx *first = cctx_first; 1625 coro_cctx *first = cctx_first;
1555 cctx_first = first->next; 1626 cctx_first = first->next;
1556 --cctx_idle; 1627 --cctx_idle;
1557 1628
… …
1568static void 1639static void
1569transfer_check (pTHX_ struct coro *prev, struct coro *next) 1640transfer_check (pTHX_ struct coro *prev, struct coro *next)
1570{ 1641{
1571 /* TODO: throwing up here is considered harmful */ 1642 /* TODO: throwing up here is considered harmful */
1572 1643
1573 if (expect_true (prev != next)) 1644 if (ecb_expect_true (prev != next))
1574 { 1645 {
1575 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1646 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1576 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1647 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1577 1648
1578 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1649 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1579 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1650 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1580 1651
1581#if !PERL_VERSION_ATLEAST (5,10,0) 1652#if !PERL_VERSION_ATLEAST (5,10,0)
1582 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1653 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1583 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1654 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1584#endif 1655#endif
1585 } 1656 }
1586} 1657}
1587 1658
1588/* always use the TRANSFER macro */ 1659/* always use the TRANSFER macro */
1589static void NOINLINE /* noinline so we have a fixed stackframe */ 1660static void ecb_noinline /* noinline so we have a fixed stackframe */
1590transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1661transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1591{ 1662{
1592 dSTACKLEVEL; 1663 dSTACKLEVEL;
1593 1664
1594 /* sometimes transfer is only called to set idle_sp */ 1665 /* sometimes transfer is only called to set idle_sp */
1595 if (expect_false (!prev)) 1666 if (ecb_expect_false (!prev))
1596 { 1667 {
1597 cctx_current->idle_sp = STACKLEVEL; 1668 cctx_current->idle_sp = STACKLEVEL;
1598 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1669 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1599 } 1670 }
1600 else if (expect_true (prev != next)) 1671 else if (ecb_expect_true (prev != next))
1601 { 1672 {
1602 coro_cctx *cctx_prev; 1673 coro_cctx *cctx_prev;
1603 1674
1604 if (expect_false (prev->flags & CF_NEW)) 1675 if (ecb_expect_false (prev->flags & CF_NEW))
1605 { 1676 {
1606 /* create a new empty/source context */ 1677 /* create a new empty/source context */
1607 prev->flags &= ~CF_NEW; 1678 prev->flags &= ~CF_NEW;
1608 prev->flags |= CF_RUNNING; 1679 prev->flags |= CF_RUNNING;
1609 } 1680 }
… …
1612 next->flags |= CF_RUNNING; 1683 next->flags |= CF_RUNNING;
1613 1684
1614 /* first get rid of the old state */ 1685 /* first get rid of the old state */
1615 save_perl (aTHX_ prev); 1686 save_perl (aTHX_ prev);
1616 1687
1617 if (expect_false (next->flags & CF_NEW)) 1688 if (ecb_expect_false (next->flags & CF_NEW))
1618 { 1689 {
1619 /* need to start coroutine */ 1690 /* need to start coroutine */
1620 next->flags &= ~CF_NEW; 1691 next->flags &= ~CF_NEW;
1621 /* setup coroutine call */ 1692 /* setup coroutine call */
1622 init_perl (aTHX_ next); 1693 init_perl (aTHX_ next);
1623 } 1694 }
1624 else 1695 else
1625 load_perl (aTHX_ next); 1696 load_perl (aTHX_ next);
1626 1697
1627 /* possibly untie and reuse the cctx */ 1698 /* possibly untie and reuse the cctx */
1628 if (expect_true ( 1699 if (ecb_expect_true (
1629 cctx_current->idle_sp == STACKLEVEL 1700 cctx_current->idle_sp == STACKLEVEL
1630 && !(cctx_current->flags & CC_TRACE) 1701 && !(cctx_current->flags & CC_TRACE)
1631 && !force_cctx 1702 && !force_cctx
1632 )) 1703 ))
1633 { 1704 {
1634 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1705 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1635 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1706 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1636 1707
1637 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1708 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1638 /* without this the next cctx_get might destroy the running cctx while still in use */ 1709 /* without this the next cctx_get might destroy the running cctx while still in use */
1639 if (expect_false (CCTX_EXPIRED (cctx_current))) 1710 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1640 if (expect_true (!next->cctx)) 1711 if (ecb_expect_true (!next->cctx))
1641 next->cctx = cctx_get (aTHX); 1712 next->cctx = cctx_get (aTHX);
1642 1713
1643 cctx_put (cctx_current); 1714 cctx_put (cctx_current);
1644 } 1715 }
1645 else 1716 else
1646 prev->cctx = cctx_current; 1717 prev->cctx = cctx_current;
1647 1718
1648 ++next->usecount; 1719 ++next->usecount;
1649 1720
1650 cctx_prev = cctx_current; 1721 cctx_prev = cctx_current;
1651 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1722 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1652 1723
1653 next->cctx = 0; 1724 next->cctx = 0;
1654 1725
1655 if (expect_false (cctx_prev != cctx_current)) 1726 if (ecb_expect_false (cctx_prev != cctx_current))
1656 { 1727 {
1657 cctx_prev->top_env = PL_top_env; 1728 cctx_prev->top_env = PL_top_env;
1658 PL_top_env = cctx_current->top_env; 1729 PL_top_env = cctx_current->top_env;
1659 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1730 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1660 } 1731 }
… …
1666#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1737#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1667#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1738#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1668 1739
1669/** high level stuff ********************************************************/ 1740/** high level stuff ********************************************************/
1670 1741
1742/* this function is actually Coro, not Coro::State, but we call it from here */
1743/* because it is convenient - but it hasn't been declared yet for that reason */
1671static int 1744static void
1745coro_call_on_destroy (pTHX_ struct coro *coro);
1746
1747static void
1672coro_state_destroy (pTHX_ struct coro *coro) 1748coro_state_destroy (pTHX_ struct coro *coro)
1673{ 1749{
1674 if (coro->flags & CF_DESTROYED) 1750 if (coro->flags & CF_ZOMBIE)
1675 return 0; 1751 return;
1676 1752
1677 if (coro->on_destroy && !PL_dirty)
1678 coro->on_destroy (aTHX_ coro); 1753 slf_destroy (aTHX_ coro);
1679 1754
1680 /*
1681 * The on_destroy above most likely is from an SLF call.
1682 * Since by definition the SLF call will not finish when we destroy
1683 * the coro, we will have to force-finish it here, otherwise
1684 * cleanup functions cannot call SLF functions.
1685 */
1686 coro->slf_frame.prepare = 0;
1687
1688 coro->flags |= CF_DESTROYED; 1755 coro->flags |= CF_ZOMBIE;
1689 1756
1690 if (coro->flags & CF_READY) 1757 if (coro->flags & CF_READY)
1691 { 1758 {
1692 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1759 /* reduce nready, as destroying a ready coro effectively unreadies it */
1693 /* alternative: look through all ready queues and remove the coro */ 1760 /* alternative: look through all ready queues and remove the coro */
1694 --coro_nready; 1761 --coro_nready;
1695 } 1762 }
1696 else 1763 else
1697 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1764 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1765
1766 if (coro->next) coro->next->prev = coro->prev;
1767 if (coro->prev) coro->prev->next = coro->next;
1768 if (coro == coro_first) coro_first = coro->next;
1698 1769
1699 if (coro->mainstack 1770 if (coro->mainstack
1700 && coro->mainstack != main_mainstack 1771 && coro->mainstack != main_mainstack
1701 && coro->slot 1772 && coro->slot
1702 && !PL_dirty) 1773 && !PL_dirty)
1703 destroy_perl (aTHX_ coro); 1774 destroy_perl (aTHX_ coro);
1704 1775
1705 if (coro->next) coro->next->prev = coro->prev;
1706 if (coro->prev) coro->prev->next = coro->next;
1707 if (coro == coro_first) coro_first = coro->next;
1708
1709 cctx_destroy (coro->cctx); 1776 cctx_destroy (coro->cctx);
1710 SvREFCNT_dec (coro->startcv); 1777 SvREFCNT_dec (coro->startcv);
1711 SvREFCNT_dec (coro->args); 1778 SvREFCNT_dec (coro->args);
1712 SvREFCNT_dec (coro->swap_sv); 1779 SvREFCNT_dec (coro->swap_sv);
1713 SvREFCNT_dec (CORO_THROW); 1780 SvREFCNT_dec (CORO_THROW);
1714 1781
1715 return 1; 1782 coro_call_on_destroy (aTHX_ coro);
1783
1784 /* more destruction mayhem in coro_state_free */
1716} 1785}
1717 1786
1718static int 1787static int
1719coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1788coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1720{ 1789{
1721 struct coro *coro = (struct coro *)mg->mg_ptr; 1790 struct coro *coro = (struct coro *)mg->mg_ptr;
1722 mg->mg_ptr = 0; 1791 mg->mg_ptr = 0;
1723 1792
1724 coro->hv = 0;
1725
1726 if (--coro->refcnt < 0)
1727 {
1728 coro_state_destroy (aTHX_ coro); 1793 coro_state_destroy (aTHX_ coro);
1794 SvREFCNT_dec (coro->on_destroy);
1795 SvREFCNT_dec (coro->status);
1796
1729 Safefree (coro); 1797 Safefree (coro);
1730 }
1731 1798
1732 return 0; 1799 return 0;
1733} 1800}
1734 1801
1735static int 1802static int ecb_cold
1736coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1803coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1737{ 1804{
1738 struct coro *coro = (struct coro *)mg->mg_ptr; 1805 /* called when perl clones the current process the slow way (windows process emulation) */
1739 1806 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1740 ++coro->refcnt; 1807 mg->mg_ptr = 0;
1808 mg->mg_virtual = 0;
1741 1809
1742 return 0; 1810 return 0;
1743} 1811}
1744 1812
1745static MGVTBL coro_state_vtbl = { 1813static MGVTBL coro_state_vtbl = {
… …
1770 TRANSFER (ta, 1); 1838 TRANSFER (ta, 1);
1771} 1839}
1772 1840
1773/** Coro ********************************************************************/ 1841/** Coro ********************************************************************/
1774 1842
1775INLINE void 1843ecb_inline void
1776coro_enq (pTHX_ struct coro *coro) 1844coro_enq (pTHX_ struct coro *coro)
1777{ 1845{
1778 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1846 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1779 1847
1780 SvREFCNT_inc_NN (coro->hv); 1848 SvREFCNT_inc_NN (coro->hv);
… …
1782 coro->next_ready = 0; 1850 coro->next_ready = 0;
1783 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1851 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1784 ready [1] = coro; 1852 ready [1] = coro;
1785} 1853}
1786 1854
1787INLINE struct coro * 1855ecb_inline struct coro *
1788coro_deq (pTHX) 1856coro_deq (pTHX)
1789{ 1857{
1790 int prio; 1858 int prio;
1791 1859
1792 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1860 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1845{ 1913{
1846 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1914 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1847} 1915}
1848 1916
1849/* expects to own a reference to next->hv */ 1917/* expects to own a reference to next->hv */
1850INLINE void 1918ecb_inline void
1851prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1919prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1852{ 1920{
1853 SV *prev_sv = SvRV (coro_current); 1921 SV *prev_sv = SvRV (coro_current);
1854 1922
1855 ta->prev = SvSTATE_hv (prev_sv); 1923 ta->prev = SvSTATE_hv (prev_sv);
… …
1868{ 1936{
1869 for (;;) 1937 for (;;)
1870 { 1938 {
1871 struct coro *next = coro_deq (aTHX); 1939 struct coro *next = coro_deq (aTHX);
1872 1940
1873 if (expect_true (next)) 1941 if (ecb_expect_true (next))
1874 { 1942 {
1875 /* cannot transfer to destroyed coros, skip and look for next */ 1943 /* cannot transfer to destroyed coros, skip and look for next */
1876 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1944 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1877 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1945 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1878 else 1946 else
1879 { 1947 {
1880 next->flags &= ~CF_READY; 1948 next->flags &= ~CF_READY;
1881 --coro_nready; 1949 --coro_nready;
… …
1889 /* nothing to schedule: call the idle handler */ 1957 /* nothing to schedule: call the idle handler */
1890 if (SvROK (sv_idle) 1958 if (SvROK (sv_idle)
1891 && SvOBJECT (SvRV (sv_idle))) 1959 && SvOBJECT (SvRV (sv_idle)))
1892 { 1960 {
1893 if (SvRV (sv_idle) == SvRV (coro_current)) 1961 if (SvRV (sv_idle) == SvRV (coro_current))
1962 {
1963 require_pv ("Carp");
1964
1965 {
1966 dSP;
1967
1968 ENTER;
1969 SAVETMPS;
1970
1971 PUSHMARK (SP);
1894 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1972 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1973 PUTBACK;
1974 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1975
1976 FREETMPS;
1977 LEAVE;
1978 }
1979 }
1895 1980
1896 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1981 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1897 api_ready (aTHX_ SvRV (sv_idle)); 1982 api_ready (aTHX_ SvRV (sv_idle));
1898 --coro_nready; 1983 --coro_nready;
1899 } 1984 }
… …
1914 } 1999 }
1915 } 2000 }
1916 } 2001 }
1917} 2002}
1918 2003
1919INLINE void 2004ecb_inline void
1920prepare_cede (pTHX_ struct coro_transfer_args *ta) 2005prepare_cede (pTHX_ struct coro_transfer_args *ta)
1921{ 2006{
1922 api_ready (aTHX_ coro_current); 2007 api_ready (aTHX_ coro_current);
1923 prepare_schedule (aTHX_ ta); 2008 prepare_schedule (aTHX_ ta);
1924} 2009}
1925 2010
1926INLINE void 2011ecb_inline void
1927prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2012prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1928{ 2013{
1929 SV *prev = SvRV (coro_current); 2014 SV *prev = SvRV (coro_current);
1930 2015
1931 if (coro_nready) 2016 if (coro_nready)
… …
1961{ 2046{
1962 struct coro_transfer_args ta; 2047 struct coro_transfer_args ta;
1963 2048
1964 prepare_cede (aTHX_ &ta); 2049 prepare_cede (aTHX_ &ta);
1965 2050
1966 if (expect_true (ta.prev != ta.next)) 2051 if (ecb_expect_true (ta.prev != ta.next))
1967 { 2052 {
1968 TRANSFER (ta, 1); 2053 TRANSFER (ta, 1);
1969 return 1; 2054 return 1;
1970 } 2055 }
1971 else 2056 else
… …
2014 coro->slot->runops = RUNOPS_DEFAULT; 2099 coro->slot->runops = RUNOPS_DEFAULT;
2015 } 2100 }
2016} 2101}
2017 2102
2018static void 2103static void
2104coro_push_av (pTHX_ AV *av, I32 gimme_v)
2105{
2106 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2107 {
2108 dSP;
2109
2110 if (gimme_v == G_SCALAR)
2111 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2112 else
2113 {
2114 int i;
2115 EXTEND (SP, AvFILLp (av) + 1);
2116
2117 for (i = 0; i <= AvFILLp (av); ++i)
2118 PUSHs (AvARRAY (av)[i]);
2119 }
2120
2121 PUTBACK;
2122 }
2123}
2124
2125static void
2126coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2127{
2128 if (!coro->on_destroy)
2129 coro->on_destroy = newAV ();
2130
2131 av_push (coro->on_destroy, cb);
2132}
2133
2134static void
2135slf_destroy_join (pTHX_ struct CoroSLF *frame)
2136{
2137 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2138}
2139
2140static int
2141slf_check_join (pTHX_ struct CoroSLF *frame)
2142{
2143 struct coro *coro = (struct coro *)frame->data;
2144
2145 if (!coro->status)
2146 return 1;
2147
2148 frame->destroy = 0;
2149
2150 coro_push_av (aTHX_ coro->status, GIMME_V);
2151
2152 SvREFCNT_dec ((SV *)coro->hv);
2153
2154 return 0;
2155}
2156
2157static void
2158slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2159{
2160 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2161
2162 if (items > 1)
2163 croak ("join called with too many arguments");
2164
2165 if (coro->status)
2166 frame->prepare = prepare_nop;
2167 else
2168 {
2169 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2170 frame->prepare = prepare_schedule;
2171 }
2172
2173 frame->check = slf_check_join;
2174 frame->destroy = slf_destroy_join;
2175 frame->data = (void *)coro;
2176 SvREFCNT_inc (coro->hv);
2177}
2178
2179static void
2019coro_call_on_destroy (pTHX_ struct coro *coro) 2180coro_call_on_destroy (pTHX_ struct coro *coro)
2020{ 2181{
2021 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2182 AV *od = coro->on_destroy;
2022 2183
2023 if (on_destroyp) 2184 if (!od)
2024 { 2185 return;
2025 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2026 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2027 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2028 2186
2187 coro->on_destroy = 0;
2188 sv_2mortal ((SV *)od);
2189
2029 while (AvFILLp (on_destroy) >= 0) 2190 while (AvFILLp (od) >= 0)
2191 {
2192 SV *cb = sv_2mortal (av_pop (od));
2193
2194 /* coro hv's (and only hv's at the moment) are supported as well */
2195 if (SvSTATEhv_p (aTHX_ cb))
2196 api_ready (aTHX_ cb);
2197 else
2030 { 2198 {
2031 dSP; /* don't disturb outer sp */ 2199 dSP; /* don't disturb outer sp */
2032 SV *cb = av_pop (on_destroy);
2033
2034 PUSHMARK (SP); 2200 PUSHMARK (SP);
2035 2201
2036 if (statusp) 2202 if (coro->status)
2037 { 2203 {
2038 int i; 2204 PUTBACK;
2039 EXTEND (SP, AvFILLp (status) + 1); 2205 coro_push_av (aTHX_ coro->status, G_ARRAY);
2040 2206 SPAGAIN;
2041 for (i = 0; i <= AvFILLp (status); ++i)
2042 PUSHs (AvARRAY (status)[i]);
2043 } 2207 }
2044 2208
2045 PUTBACK; 2209 PUTBACK;
2046 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2210 call_sv (cb, G_VOID | G_DISCARD);
2047 } 2211 }
2048 } 2212 }
2049} 2213}
2050 2214
2051static void 2215static void
2052coro_set_status (HV *coro_hv, SV **arg, int items) 2216coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2053{ 2217{
2054 AV *av = newAV (); 2218 AV *av;
2219
2220 if (coro->status)
2221 {
2222 av = coro->status;
2223 av_clear (av);
2224 }
2225 else
2226 av = coro->status = newAV ();
2055 2227
2056 /* items are actually not so common, so optimise for this case */ 2228 /* items are actually not so common, so optimise for this case */
2057 if (items) 2229 if (items)
2058 { 2230 {
2059 int i; 2231 int i;
… …
2061 av_extend (av, items - 1); 2233 av_extend (av, items - 1);
2062 2234
2063 for (i = 0; i < items; ++i) 2235 for (i = 0; i < items; ++i)
2064 av_push (av, SvREFCNT_inc_NN (arg [i])); 2236 av_push (av, SvREFCNT_inc_NN (arg [i]));
2065 } 2237 }
2066
2067 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2068} 2238}
2069 2239
2070static void 2240static void
2071slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2241slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2072{ 2242{
… …
2084static void 2254static void
2085slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2255slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2086{ 2256{
2087 HV *coro_hv = (HV *)SvRV (coro_current); 2257 HV *coro_hv = (HV *)SvRV (coro_current);
2088 2258
2089 coro_set_status (coro_hv, arg, items); 2259 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2090 slf_init_terminate_cancel_common (frame, coro_hv); 2260 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2091} 2261}
2092 2262
2093static void 2263static void
2094slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2264slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2095{ 2265{
… …
2100 croak ("Coro::cancel called without coro object,"); 2270 croak ("Coro::cancel called without coro object,");
2101 2271
2102 coro = SvSTATE (arg [0]); 2272 coro = SvSTATE (arg [0]);
2103 coro_hv = coro->hv; 2273 coro_hv = coro->hv;
2104 2274
2105 coro_set_status (coro_hv, arg + 1, items - 1); 2275 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2106 2276
2107 if (expect_false (coro->flags & CF_NOCANCEL)) 2277 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2108 { 2278 {
2109 /* coro currently busy cancelling something, so just notify it */ 2279 /* coro currently busy cancelling something, so just notify it */
2110 coro->slf_frame.data = (void *)coro; 2280 coro->slf_frame.data = (void *)coro;
2111 2281
2112 frame->prepare = prepare_nop; 2282 frame->prepare = prepare_nop;
2113 frame->check = slf_check_nop; 2283 frame->check = slf_check_nop;
2114 } 2284 }
2115 else if (coro_hv == (HV *)SvRV (coro_current)) 2285 else if (coro_hv == (HV *)SvRV (coro_current))
2116 { 2286 {
2117 /* cancelling the current coro is allowed, and equals terminate */ 2287 /* cancelling the current coro is allowed, and equals terminate */
2118 slf_init_terminate_cancel_common (frame, coro_hv); 2288 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2119 } 2289 }
2120 else 2290 else
2121 { 2291 {
2122 struct coro *self = SvSTATE_current; 2292 struct coro *self = SvSTATE_current;
2293
2294 if (!self)
2295 croak ("Coro::cancel called outside of thread content,");
2123 2296
2124 /* otherwise we cancel directly, purely for speed reasons 2297 /* otherwise we cancel directly, purely for speed reasons
2125 * unfortunately, this requires some magic trickery, as 2298 * unfortunately, this requires some magic trickery, as
2126 * somebody else could cancel us, so we have to fight the cancellation. 2299 * somebody else could cancel us, so we have to fight the cancellation.
2127 * this is ugly, and hopefully fully worth the extra speed. 2300 * this is ugly, and hopefully fully worth the extra speed.
2128 * besides, I can't get the slow-but-safe version working... 2301 * besides, I can't get the slow-but-safe version working...
2129 */ 2302 */
2130 slf_frame.data = 0; 2303 slf_frame.data = 0;
2131 self->flags |= CF_NOCANCEL; 2304 self->flags |= CF_NOCANCEL;
2132
2133 coro_state_destroy (aTHX_ coro); 2305 coro_state_destroy (aTHX_ coro);
2134 coro_call_on_destroy (aTHX_ coro);
2135
2136 self->flags &= ~CF_NOCANCEL; 2306 self->flags &= ~CF_NOCANCEL;
2137 2307
2138 if (slf_frame.data) 2308 if (slf_frame.data)
2139 { 2309 {
2140 /* while we were busy we have been cancelled, so terminate */ 2310 /* while we were busy we have been cancelled, so terminate */
2141 slf_init_terminate_cancel_common (frame, self->hv); 2311 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2142 } 2312 }
2143 else 2313 else
2144 { 2314 {
2145 frame->prepare = prepare_nop; 2315 frame->prepare = prepare_nop;
2146 frame->check = slf_check_nop; 2316 frame->check = slf_check_nop;
2147 } 2317 }
2148 } 2318 }
2149} 2319}
2150 2320
2321static int
2322slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2323{
2324 frame->prepare = 0;
2325 coro_unwind_stacks (aTHX);
2326
2327 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2328
2329 return 1;
2330}
2331
2332static int
2333safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2334{
2335 if (coro->cctx)
2336 croak ("coro inside C callback, unable to cancel at this time, caught");
2337
2338 if (coro->flags & CF_NEW)
2339 {
2340 coro_set_status (aTHX_ coro, arg, items);
2341 coro_state_destroy (aTHX_ coro);
2342 }
2343 else
2344 {
2345 if (!coro->slf_frame.prepare)
2346 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2347
2348 slf_destroy (aTHX_ coro);
2349
2350 coro_set_status (aTHX_ coro, arg, items);
2351 coro->slf_frame.prepare = prepare_nop;
2352 coro->slf_frame.check = slf_check_safe_cancel;
2353
2354 api_ready (aTHX_ (SV *)coro->hv);
2355 }
2356
2357 return 1;
2358}
2359
2151/*****************************************************************************/ 2360/*****************************************************************************/
2152/* async pool handler */ 2361/* async pool handler */
2153 2362
2154static int 2363static int
2155slf_check_pool_handler (pTHX_ struct CoroSLF *frame) 2364slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
… …
2184slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2393slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2185{ 2394{
2186 HV *hv = (HV *)SvRV (coro_current); 2395 HV *hv = (HV *)SvRV (coro_current);
2187 struct coro *coro = SvSTATE_hv ((SV *)hv); 2396 struct coro *coro = SvSTATE_hv ((SV *)hv);
2188 2397
2189 if (expect_true (coro->saved_deffh)) 2398 if (ecb_expect_true (coro->saved_deffh))
2190 { 2399 {
2191 /* subsequent iteration */ 2400 /* subsequent iteration */
2192 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2401 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2193 coro->saved_deffh = 0; 2402 coro->saved_deffh = 0;
2194 2403
2195 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2404 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2196 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2405 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2197 { 2406 {
2198 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2407 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2199 coro->invoke_av = newAV (); 2408 return;
2200
2201 frame->prepare = prepare_nop;
2202 } 2409 }
2203 else 2410 else
2204 { 2411 {
2205 av_clear (GvAV (PL_defgv)); 2412 av_clear (GvAV (PL_defgv));
2206 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2413 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2256 2463
2257static int 2464static int
2258slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2465slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2259{ 2466{
2260 SV *data = (SV *)frame->data; 2467 SV *data = (SV *)frame->data;
2261 2468
2262 if (CORO_THROW) 2469 if (CORO_THROW)
2263 return 0; 2470 return 0;
2264 2471
2265 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2472 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2266 return 1; 2473 return 1;
… …
2302 cb = sv_2mortal (coro->rouse_cb); 2509 cb = sv_2mortal (coro->rouse_cb);
2303 coro->rouse_cb = 0; 2510 coro->rouse_cb = 0;
2304 } 2511 }
2305 2512
2306 if (!SvROK (cb) 2513 if (!SvROK (cb)
2307 || SvTYPE (SvRV (cb)) != SVt_PVCV 2514 || SvTYPE (SvRV (cb)) != SVt_PVCV
2308 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2515 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2309 croak ("Coro::rouse_wait called with illegal callback argument,"); 2516 croak ("Coro::rouse_wait called with illegal callback argument,");
2310 2517
2311 { 2518 {
2312 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2519 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2429static void 2636static void
2430slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2637slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2431{ 2638{
2432 frame->prepare = prepare_cede_notself; 2639 frame->prepare = prepare_cede_notself;
2433 frame->check = slf_check_nop; 2640 frame->check = slf_check_nop;
2641}
2642
2643/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2644static void
2645slf_destroy (pTHX_ struct coro *coro)
2646{
2647 struct CoroSLF frame = coro->slf_frame;
2648
2649 /*
2650 * The on_destroy below most likely is from an SLF call.
2651 * Since by definition the SLF call will not finish when we destroy
2652 * the coro, we will have to force-finish it here, otherwise
2653 * cleanup functions cannot call SLF functions.
2654 */
2655 coro->slf_frame.prepare = 0;
2656
2657 /* this callback is reserved for slf functions needing to do cleanup */
2658 if (frame.destroy && frame.prepare && !PL_dirty)
2659 frame.destroy (aTHX_ &frame);
2434} 2660}
2435 2661
2436/* 2662/*
2437 * these not obviously related functions are all rolled into one 2663 * these not obviously related functions are all rolled into one
2438 * function to increase chances that they all will call transfer with the same 2664 * function to increase chances that they all will call transfer with the same
… …
2445 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2671 I32 checkmark; /* mark SP to see how many elements check has pushed */
2446 2672
2447 /* set up the slf frame, unless it has already been set-up */ 2673 /* set up the slf frame, unless it has already been set-up */
2448 /* the latter happens when a new coro has been started */ 2674 /* the latter happens when a new coro has been started */
2449 /* or when a new cctx was attached to an existing coroutine */ 2675 /* or when a new cctx was attached to an existing coroutine */
2450 if (expect_true (!slf_frame.prepare)) 2676 if (ecb_expect_true (!slf_frame.prepare))
2451 { 2677 {
2452 /* first iteration */ 2678 /* first iteration */
2453 dSP; 2679 dSP;
2454 SV **arg = PL_stack_base + TOPMARK + 1; 2680 SV **arg = PL_stack_base + TOPMARK + 1;
2455 int items = SP - arg; /* args without function object */ 2681 int items = SP - arg; /* args without function object */
… …
2496 while (slf_frame.check (aTHX_ &slf_frame)); 2722 while (slf_frame.check (aTHX_ &slf_frame));
2497 2723
2498 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2724 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2499 2725
2500 /* exception handling */ 2726 /* exception handling */
2501 if (expect_false (CORO_THROW)) 2727 if (ecb_expect_false (CORO_THROW))
2502 { 2728 {
2503 SV *exception = sv_2mortal (CORO_THROW); 2729 SV *exception = sv_2mortal (CORO_THROW);
2504 2730
2505 CORO_THROW = 0; 2731 CORO_THROW = 0;
2506 sv_setsv (ERRSV, exception); 2732 sv_setsv (ERRSV, exception);
2507 croak (0); 2733 croak (0);
2508 } 2734 }
2509 2735
2510 /* return value handling - mostly like entersub */ 2736 /* return value handling - mostly like entersub */
2511 /* make sure we put something on the stack in scalar context */ 2737 /* make sure we put something on the stack in scalar context */
2512 if (GIMME_V == G_SCALAR) 2738 if (GIMME_V == G_SCALAR
2739 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2513 { 2740 {
2514 dSP; 2741 dSP;
2515 SV **bot = PL_stack_base + checkmark; 2742 SV **bot = PL_stack_base + checkmark;
2516 2743
2517 if (sp == bot) /* too few, push undef */ 2744 if (sp == bot) /* too few, push undef */
2518 bot [1] = &PL_sv_undef; 2745 bot [1] = &PL_sv_undef;
2519 else if (sp != bot + 1) /* too many, take last one */ 2746 else /* too many, take last one */
2520 bot [1] = *sp; 2747 bot [1] = *sp;
2521 2748
2522 SP = bot + 1; 2749 SP = bot + 1;
2523 2750
2524 PUTBACK; 2751 PUTBACK;
… …
2622{ 2849{
2623 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2850 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2624 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2851 on_enterleave_call (aTHX_ sv_2mortal (cb));
2625} 2852}
2626 2853
2854static void
2855enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2856{
2857 if (!hook)
2858 return;
2859
2860 if (!*avp)
2861 {
2862 *avp = newAV ();
2863 AvREAL_off (*avp);
2864 }
2865
2866 av_push (*avp, (SV *)hook);
2867 av_push (*avp, (SV *)arg);
2868}
2869
2870static void
2871enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2872{
2873 AV *av = *avp;
2874 int i;
2875
2876 if (!av)
2877 return;
2878
2879 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2880 if (AvARRAY (av)[i] == (SV *)hook)
2881 {
2882 if (execute)
2883 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2884
2885 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2886 av_pop (av);
2887 av_pop (av);
2888 break;
2889 }
2890
2891 if (AvFILLp (av) >= 0)
2892 {
2893 *avp = 0;
2894 SvREFCNT_dec_NN (av);
2895 }
2896}
2897
2898static void
2899api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2900{
2901 struct coro *coro = SvSTATE (coro_sv);
2902
2903 if (SvSTATE_current == coro)
2904 if (enter)
2905 enter (aTHX_ enter_arg);
2906
2907 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2908 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2909}
2910
2911static void
2912api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2913{
2914 struct coro *coro = SvSTATE (coro_sv);
2915
2916 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2917 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2918}
2919
2920static void
2921savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2922{
2923 struct coro *coro = SvSTATE_current;
2924
2925 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2926}
2927
2928static void
2929savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2930{
2931 struct coro *coro = SvSTATE_current;
2932
2933 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2934}
2935
2936static void
2937api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2938{
2939 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2940
2941 /* this ought to be much cheaper than malloc + a single destructor call */
2942 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2943 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2944}
2945
2627/*****************************************************************************/ 2946/*****************************************************************************/
2628/* PerlIO::cede */ 2947/* PerlIO::cede */
2629 2948
2630typedef struct 2949typedef struct
2631{ 2950{
2632 PerlIOBuf base; 2951 PerlIOBuf base;
2633 NV next, every; 2952 NV next, every;
2634} PerlIOCede; 2953} PerlIOCede;
2635 2954
2636static IV 2955static IV ecb_cold
2637PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2956PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2638{ 2957{
2639 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2958 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2640 2959
2641 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2960 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2642 self->next = nvtime () + self->every; 2961 self->next = nvtime () + self->every;
2643 2962
2644 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2963 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2645} 2964}
2646 2965
2647static SV * 2966static SV * ecb_cold
2648PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2967PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2649{ 2968{
2650 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2969 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2651 2970
2652 return newSVnv (self->every); 2971 return newSVnv (self->every);
… …
2759 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3078 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2760 PUTBACK; 3079 PUTBACK;
2761 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3080 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2762 } 3081 }
2763 3082
2764 SvREFCNT_dec (cb); 3083 SvREFCNT_dec_NN (cb);
2765 } 3084 }
2766} 3085}
2767 3086
2768static void 3087static void
2769coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3088coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2770{ 3089{
2771 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3090 /* call $sem->adjust (0) to possibly wake up some other waiters */
2772 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3091 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2773} 3092}
2774 3093
2775static int 3094static int
2776slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3095slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2777{ 3096{
2778 AV *av = (AV *)frame->data; 3097 AV *av = (AV *)frame->data;
2779 SV *count_sv = AvARRAY (av)[0]; 3098 SV *count_sv = AvARRAY (av)[0];
3099 SV *coro_hv = SvRV (coro_current);
3100
3101 frame->destroy = 0;
2780 3102
2781 /* if we are about to throw, don't actually acquire the lock, just throw */ 3103 /* if we are about to throw, don't actually acquire the lock, just throw */
2782 if (CORO_THROW) 3104 if (ecb_expect_false (CORO_THROW))
3105 {
3106 /* we still might be responsible for the semaphore, so wake up others */
3107 coro_semaphore_adjust (aTHX_ av, 0);
3108
2783 return 0; 3109 return 0;
3110 }
2784 else if (SvIVX (count_sv) > 0) 3111 else if (SvIVX (count_sv) > 0)
2785 { 3112 {
2786 SvSTATE_current->on_destroy = 0;
2787
2788 if (acquire) 3113 if (acquire)
2789 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3114 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2790 else 3115 else
2791 coro_semaphore_adjust (aTHX_ av, 0); 3116 coro_semaphore_adjust (aTHX_ av, 0);
2792 3117
… …
2796 { 3121 {
2797 int i; 3122 int i;
2798 /* if we were woken up but can't down, we look through the whole */ 3123 /* if we were woken up but can't down, we look through the whole */
2799 /* waiters list and only add us if we aren't in there already */ 3124 /* waiters list and only add us if we aren't in there already */
2800 /* this avoids some degenerate memory usage cases */ 3125 /* this avoids some degenerate memory usage cases */
2801 3126 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2802 for (i = 1; i <= AvFILLp (av); ++i)
2803 if (AvARRAY (av)[i] == SvRV (coro_current)) 3127 if (AvARRAY (av)[i] == coro_hv)
2804 return 1; 3128 return 1;
2805 3129
2806 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3130 av_push (av, SvREFCNT_inc (coro_hv));
2807 return 1; 3131 return 1;
2808 } 3132 }
2809} 3133}
2810 3134
2811static int 3135static int
… …
2834 { 3158 {
2835 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3159 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2836 3160
2837 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3161 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2838 frame->prepare = prepare_schedule; 3162 frame->prepare = prepare_schedule;
2839
2840 /* to avoid race conditions when a woken-up coro gets terminated */ 3163 /* to avoid race conditions when a woken-up coro gets terminated */
2841 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3164 /* we arrange for a temporary on_destroy that calls adjust (0) */
2842 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3165 frame->destroy = coro_semaphore_destroy;
2843 } 3166 }
2844} 3167}
2845 3168
2846static void 3169static void
2847slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3170slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2905 { 3228 {
2906 api_ready (aTHX_ cb); 3229 api_ready (aTHX_ cb);
2907 sv_setiv (cb, 0); /* signal waiter */ 3230 sv_setiv (cb, 0); /* signal waiter */
2908 } 3231 }
2909 3232
2910 SvREFCNT_dec (cb); 3233 SvREFCNT_dec_NN (cb);
2911 3234
2912 --count; 3235 --count;
2913 } 3236 }
2914} 3237}
2915 3238
… …
3000 } 3323 }
3001 3324
3002 av_push (state, data_sv); 3325 av_push (state, data_sv);
3003 3326
3004 api_ready (aTHX_ coro); 3327 api_ready (aTHX_ coro);
3005 SvREFCNT_dec (coro); 3328 SvREFCNT_dec_NN (coro);
3006 SvREFCNT_dec ((AV *)state); 3329 SvREFCNT_dec_NN ((AV *)state);
3007} 3330}
3008 3331
3009static int 3332static int
3010slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3333slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3011{ 3334{
… …
3016 /* it quickly returns */ 3339 /* it quickly returns */
3017 if (CORO_THROW) 3340 if (CORO_THROW)
3018 return 0; 3341 return 0;
3019 3342
3020 /* one element that is an RV? repeat! */ 3343 /* one element that is an RV? repeat! */
3021 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3344 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3022 return 1; 3345 return 1;
3023 3346
3024 /* restore status */ 3347 /* restore status */
3025 { 3348 {
3026 SV *data_sv = av_pop (state); 3349 SV *data_sv = av_pop (state);
… …
3029 errno = data->errorno; 3352 errno = data->errorno;
3030 PL_laststype = data->laststype; 3353 PL_laststype = data->laststype;
3031 PL_laststatval = data->laststatval; 3354 PL_laststatval = data->laststatval;
3032 PL_statcache = data->statcache; 3355 PL_statcache = data->statcache;
3033 3356
3034 SvREFCNT_dec (data_sv); 3357 SvREFCNT_dec_NN (data_sv);
3035 } 3358 }
3036 3359
3037 /* push result values */ 3360 /* push result values */
3038 { 3361 {
3039 dSP; 3362 dSP;
… …
3065 dSP; 3388 dSP;
3066 3389
3067 static SV *prio_cv; 3390 static SV *prio_cv;
3068 static SV *prio_sv; 3391 static SV *prio_sv;
3069 3392
3070 if (expect_false (!prio_cv)) 3393 if (ecb_expect_false (!prio_cv))
3071 { 3394 {
3072 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3395 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3073 prio_sv = newSViv (0); 3396 prio_sv = newSViv (0);
3074 } 3397 }
3075 3398
… …
3181 } 3504 }
3182 3505
3183 return coro_sv; 3506 return coro_sv;
3184} 3507}
3185 3508
3509#ifndef __cplusplus
3510ecb_cold XS(boot_Coro__State);
3511#endif
3512
3513#if CORO_JIT
3514
3515static void ecb_noinline ecb_cold
3516pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3517{
3518 dSP;
3519 AV *av = newAV ();
3520
3521 av_store (av, 3, newSVuv (d));
3522 av_store (av, 2, newSVuv (c));
3523 av_store (av, 1, newSVuv (b));
3524 av_store (av, 0, newSVuv (a));
3525
3526 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3527
3528 PUTBACK;
3529}
3530
3531static void ecb_noinline ecb_cold
3532jit_init (pTHX)
3533{
3534 dSP;
3535 SV *load, *save;
3536 char *map_base;
3537 char *load_ptr, *save_ptr;
3538 STRLEN load_len, save_len, map_len;
3539 int count;
3540
3541 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3542
3543 PUSHMARK (SP);
3544 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3545 #include "state.h"
3546 count = call_pv ("Coro::State::_jit", G_ARRAY);
3547 SPAGAIN;
3548
3549 save = POPs; save_ptr = SvPVbyte (save, save_len);
3550 load = POPs; load_ptr = SvPVbyte (load, load_len);
3551
3552 map_len = load_len + save_len + 16;
3553
3554 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3555
3556 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3557
3558 load_perl_slots = (load_save_perl_slots_type)map_base;
3559 memcpy (map_base, load_ptr, load_len);
3560
3561 map_base += (load_len + 15) & ~15;
3562
3563 save_perl_slots = (load_save_perl_slots_type)map_base;
3564 memcpy (map_base, save_ptr, save_len);
3565
3566 /* we are good citizens and try to make the page read-only, so the evil evil */
3567 /* hackers might have it a bit more difficult */
3568 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3569
3570 PUTBACK;
3571 eval_pv ("undef &Coro::State::_jit", 1);
3572}
3573
3574#endif
3575
3186MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3576MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3187 3577
3188PROTOTYPES: DISABLE 3578PROTOTYPES: DISABLE
3189 3579
3190BOOT: 3580BOOT:
3191{ 3581{
3582#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3583#include "state.h"
3192#ifdef USE_ITHREADS 3584#ifdef USE_ITHREADS
3193# if CORO_PTHREAD 3585# if CORO_PTHREAD
3194 coro_thx = PERL_GET_CONTEXT; 3586 coro_thx = PERL_GET_CONTEXT;
3195# endif 3587# endif
3196#endif 3588#endif
3197 BOOT_PAGESIZE; 3589 /* perl defines these to check for existance first, but why it doesn't */
3590 /* just create them one at init time is not clear to me, except for */
3591 /* programs trying to delete them, but... */
3592 /* anyway, we declare this as invalid and make sure they are initialised here */
3593 DEFSV;
3594 ERRSV;
3198 3595
3199 cctx_current = cctx_new_empty (); 3596 cctx_current = cctx_new_empty ();
3200 3597
3201 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3598 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3202 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3599 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3245 coroapi.prepare_cede_notself = prepare_cede_notself; 3642 coroapi.prepare_cede_notself = prepare_cede_notself;
3246 3643
3247 time_init (aTHX); 3644 time_init (aTHX);
3248 3645
3249 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3646 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3647#if CORO_JIT
3648 PUTBACK;
3649 jit_init (aTHX);
3650 SPAGAIN;
3651#endif
3250} 3652}
3251 3653
3252SV * 3654SV *
3253new (SV *klass, ...) 3655new (SV *klass, ...)
3254 ALIAS: 3656 ALIAS:
… …
3261void 3663void
3262transfer (...) 3664transfer (...)
3263 PROTOTYPE: $$ 3665 PROTOTYPE: $$
3264 CODE: 3666 CODE:
3265 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3667 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3266
3267void
3268_exit (int code)
3269 PROTOTYPE: $
3270 CODE:
3271 _exit (code);
3272 3668
3273SV * 3669SV *
3274clone (Coro::State coro) 3670clone (Coro::State coro)
3275 CODE: 3671 CODE:
3276{ 3672{
… …
3331void 3727void
3332list () 3728list ()
3333 PROTOTYPE: 3729 PROTOTYPE:
3334 PPCODE: 3730 PPCODE:
3335{ 3731{
3336 struct coro *coro; 3732 struct coro *coro;
3337 for (coro = coro_first; coro; coro = coro->next) 3733 for (coro = coro_first; coro; coro = coro->next)
3338 if (coro->hv) 3734 if (coro->hv)
3339 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3735 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3340} 3736}
3341 3737
… …
3396 PROTOTYPE: $ 3792 PROTOTYPE: $
3397 ALIAS: 3793 ALIAS:
3398 is_ready = CF_READY 3794 is_ready = CF_READY
3399 is_running = CF_RUNNING 3795 is_running = CF_RUNNING
3400 is_new = CF_NEW 3796 is_new = CF_NEW
3401 is_destroyed = CF_DESTROYED 3797 is_destroyed = CF_ZOMBIE
3798 is_zombie = CF_ZOMBIE
3402 is_suspended = CF_SUSPENDED 3799 is_suspended = CF_SUSPENDED
3403 CODE: 3800 CODE:
3404 RETVAL = boolSV (coro->flags & ix); 3801 RETVAL = boolSV (coro->flags & ix);
3405 OUTPUT: 3802 OUTPUT:
3406 RETVAL 3803 RETVAL
3407 3804
3408void 3805void
3409throw (Coro::State self, SV *exception = &PL_sv_undef) 3806throw (SV *self, SV *exception = &PL_sv_undef)
3410 PROTOTYPE: $;$ 3807 PROTOTYPE: $;$
3411 CODE: 3808 CODE:
3412{ 3809{
3810 struct coro *coro = SvSTATE (self);
3413 struct coro *current = SvSTATE_current; 3811 struct coro *current = SvSTATE_current;
3414 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3812 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3415 SvREFCNT_dec (*exceptionp); 3813 SvREFCNT_dec (*exceptionp);
3416 SvGETMAGIC (exception); 3814 SvGETMAGIC (exception);
3417 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3815 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3816
3817 api_ready (aTHX_ self);
3418} 3818}
3419 3819
3420void 3820void
3421api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3821api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3422 PROTOTYPE: $;$ 3822 PROTOTYPE: $;$
… …
3499 3899
3500void 3900void
3501times (Coro::State self) 3901times (Coro::State self)
3502 PPCODE: 3902 PPCODE:
3503{ 3903{
3504 struct coro *current = SvSTATE (coro_current); 3904 struct coro *current = SvSTATE (coro_current);
3505 3905
3506 if (expect_false (current == self)) 3906 if (ecb_expect_false (current == self))
3507 { 3907 {
3508 coro_times_update (); 3908 coro_times_update ();
3509 coro_times_add (SvSTATE (coro_current)); 3909 coro_times_add (SvSTATE (coro_current));
3510 } 3910 }
3511 3911
3512 EXTEND (SP, 2); 3912 EXTEND (SP, 2);
3513 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3913 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3514 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3914 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3515 3915
3516 if (expect_false (current == self)) 3916 if (ecb_expect_false (current == self))
3517 coro_times_sub (SvSTATE (coro_current)); 3917 coro_times_sub (SvSTATE (coro_current));
3518} 3918}
3519 3919
3520void 3920void
3521swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3921swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3542BOOT: 3942BOOT:
3543{ 3943{
3544 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3944 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3545 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3945 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3546 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3946 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3547 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3548 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3947 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3549 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3948 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3550 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3949 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3551 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3950 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3552 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3951 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3553 3952
3554 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3953 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3555 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3954 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3556 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3955 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3557 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3956 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3558 3957
3559 coro_stash = gv_stashpv ("Coro", TRUE); 3958 coro_stash = gv_stashpv ("Coro", TRUE);
3560 3959
3561 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3960 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3562 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3961 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3563 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3962 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3575 coroapi.ready = api_ready; 3974 coroapi.ready = api_ready;
3576 coroapi.is_ready = api_is_ready; 3975 coroapi.is_ready = api_is_ready;
3577 coroapi.nready = coro_nready; 3976 coroapi.nready = coro_nready;
3578 coroapi.current = coro_current; 3977 coroapi.current = coro_current;
3579 3978
3979 coroapi.enterleave_hook = api_enterleave_hook;
3980 coroapi.enterleave_unhook = api_enterleave_unhook;
3981 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3982
3580 /*GCoroAPI = &coroapi;*/ 3983 /*GCoroAPI = &coroapi;*/
3581 sv_setiv (sv, (IV)&coroapi); 3984 sv_setiv (sv, (IV)&coroapi);
3582 SvREADONLY_on (sv); 3985 SvREADONLY_on (sv);
3583 } 3986 }
3584} 3987}
… …
3595void 3998void
3596_destroy (Coro::State coro) 3999_destroy (Coro::State coro)
3597 CODE: 4000 CODE:
3598 /* used by the manager thread */ 4001 /* used by the manager thread */
3599 coro_state_destroy (aTHX_ coro); 4002 coro_state_destroy (aTHX_ coro);
4003
4004void
4005on_destroy (Coro::State coro, SV *cb)
4006 CODE:
3600 coro_call_on_destroy (aTHX_ coro); 4007 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4008
4009void
4010join (...)
4011 CODE:
4012 CORO_EXECUTE_SLF_XS (slf_init_join);
3601 4013
3602void 4014void
3603terminate (...) 4015terminate (...)
3604 CODE: 4016 CODE:
3605 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4017 CORO_EXECUTE_SLF_XS (slf_init_terminate);
… …
3607void 4019void
3608cancel (...) 4020cancel (...)
3609 CODE: 4021 CODE:
3610 CORO_EXECUTE_SLF_XS (slf_init_cancel); 4022 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3611 4023
4024int
4025safe_cancel (Coro::State self, ...)
4026 C_ARGS: aTHX_ self, &ST (1), items - 1
4027
3612void 4028void
3613schedule (...) 4029schedule (...)
3614 CODE: 4030 CODE:
3615 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4031 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3616 4032
… …
3636 4052
3637void 4053void
3638_set_current (SV *current) 4054_set_current (SV *current)
3639 PROTOTYPE: $ 4055 PROTOTYPE: $
3640 CODE: 4056 CODE:
3641 SvREFCNT_dec (SvRV (coro_current)); 4057 SvREFCNT_dec_NN (SvRV (coro_current));
3642 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4058 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3643 4059
3644void 4060void
3645_set_readyhook (SV *hook) 4061_set_readyhook (SV *hook)
3646 PROTOTYPE: $ 4062 PROTOTYPE: $
… …
3730 4146
3731 if ((SV *)hv == &PL_sv_undef) 4147 if ((SV *)hv == &PL_sv_undef)
3732 { 4148 {
3733 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4149 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3734 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4150 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3735 SvREFCNT_dec (sv); 4151 SvREFCNT_dec_NN (sv);
3736 } 4152 }
3737 4153
3738 { 4154 {
3739 struct coro *coro = SvSTATE_hv (hv); 4155 struct coro *coro = SvSTATE_hv (hv);
3740 4156
… …
3747 api_ready (aTHX_ (SV *)hv); 4163 api_ready (aTHX_ (SV *)hv);
3748 4164
3749 if (GIMME_V != G_VOID) 4165 if (GIMME_V != G_VOID)
3750 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4166 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3751 else 4167 else
3752 SvREFCNT_dec (hv); 4168 SvREFCNT_dec_NN (hv);
3753} 4169}
3754 4170
3755SV * 4171SV *
3756rouse_cb () 4172rouse_cb ()
3757 PROTOTYPE: 4173 PROTOTYPE:
… …
3772 on_leave = 1 4188 on_leave = 1
3773 PROTOTYPE: & 4189 PROTOTYPE: &
3774 CODE: 4190 CODE:
3775{ 4191{
3776 struct coro *coro = SvSTATE_current; 4192 struct coro *coro = SvSTATE_current;
3777 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4193 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3778 4194
3779 block = s_get_cv_croak (block); 4195 block = s_get_cv_croak (block);
3780 4196
3781 if (!*avp) 4197 if (!*avp)
3782 *avp = newAV (); 4198 *avp = newAV ();
… …
3802 4218
3803SV * 4219SV *
3804new (SV *klass, SV *count = 0) 4220new (SV *klass, SV *count = 0)
3805 CODE: 4221 CODE:
3806{ 4222{
3807 int semcnt = 1; 4223 int semcnt = 1;
3808 4224
3809 if (count) 4225 if (count)
3810 { 4226 {
3811 SvGETMAGIC (count); 4227 SvGETMAGIC (count);
3812 4228
… …
3872 XSRETURN_NO; 4288 XSRETURN_NO;
3873} 4289}
3874 4290
3875void 4291void
3876waiters (SV *self) 4292waiters (SV *self)
3877 PPCODE: 4293 PPCODE:
3878{ 4294{
3879 AV *av = (AV *)SvRV (self); 4295 AV *av = (AV *)SvRV (self);
3880 int wcount = AvFILLp (av) + 1 - 1; 4296 int wcount = AvFILLp (av) + 1 - 1;
3881 4297
3882 if (GIMME_V == G_SCALAR) 4298 if (GIMME_V == G_SCALAR)
… …
3891} 4307}
3892 4308
3893MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4309MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3894 4310
3895void 4311void
3896_may_delete (SV *sem, int count, int extra_refs) 4312_may_delete (SV *sem, int count, unsigned int extra_refs)
3897 PPCODE: 4313 PPCODE:
3898{ 4314{
3899 AV *av = (AV *)SvRV (sem); 4315 AV *av = (AV *)SvRV (sem);
3900 4316
3901 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4317 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3902 && AvFILLp (av) == 0 /* no waiters, just count */ 4318 && AvFILLp (av) == 0 /* no waiters, just count */
3903 && SvIV (AvARRAY (av)[0]) == count) 4319 && SvIV (AvARRAY (av)[0]) == count)
3904 XSRETURN_YES; 4320 XSRETURN_YES;
… …
3925 4341
3926void 4342void
3927broadcast (SV *self) 4343broadcast (SV *self)
3928 CODE: 4344 CODE:
3929{ 4345{
3930 AV *av = (AV *)SvRV (self); 4346 AV *av = (AV *)SvRV (self);
3931 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4347 coro_signal_wake (aTHX_ av, AvFILLp (av));
3932} 4348}
3933 4349
3934void 4350void
3935send (SV *self) 4351send (SV *self)
… …
3943 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4359 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3944} 4360}
3945 4361
3946IV 4362IV
3947awaited (SV *self) 4363awaited (SV *self)
3948 CODE: 4364 CODE:
3949 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4365 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3950 OUTPUT: 4366 OUTPUT:
3951 RETVAL 4367 RETVAL
3952 4368
3953 4369
… …
3958 4374
3959void 4375void
3960_schedule (...) 4376_schedule (...)
3961 CODE: 4377 CODE:
3962{ 4378{
3963 static int incede; 4379 static int incede;
3964 4380
3965 api_cede_notself (aTHX); 4381 api_cede_notself (aTHX);
3966 4382
3967 ++incede; 4383 ++incede;
3968 while (coro_nready >= incede && api_cede (aTHX)) 4384 while (coro_nready >= incede && api_cede (aTHX))
… …
4012 { 4428 {
4013 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4429 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4014 coro_old_pp_sselect = 0; 4430 coro_old_pp_sselect = 0;
4015 } 4431 }
4016 4432
4433MODULE = Coro::State PACKAGE = Coro::Util
4434
4435void
4436_exit (int code)
4437 CODE:
4438 _exit (code);
4439
4440NV
4441time ()
4442 CODE:
4443 RETVAL = nvtime (aTHX);
4444 OUTPUT:
4445 RETVAL
4446
4447NV
4448gettimeofday ()
4449 PPCODE:
4450{
4451 UV tv [2];
4452 u2time (aTHX_ tv);
4453 EXTEND (SP, 2);
4454 PUSHs (sv_2mortal (newSVuv (tv [0])));
4455 PUSHs (sv_2mortal (newSVuv (tv [1])));
4456}
4457

Diff Legend

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