ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.394 by root, Sat Apr 30 05:17:43 2011 UTC vs.
Revision 1.463 by root, Wed Jun 22 20:37:27 2016 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7 7
8#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 9#define PERL_EXT
… …
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17 17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
18#include <stdio.h> 23#include <stdio.h>
19#include <errno.h> 24#include <errno.h>
20#include <assert.h> 25#include <assert.h>
21 26
27#ifndef SvREFCNT_dec_NN
28 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
29#endif
30
31#ifndef SvREFCNT_inc_NN
32 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
33#endif
34
22#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0 36# define SVs_PADSTALE 0
37#endif
38
39#ifdef PadARRAY
40# define NEWPADAPI 1
41# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
42#else
43typedef AV PADNAMELIST;
44# if !PERL_VERSION_ATLEAST(5,8,0)
45typedef AV PADLIST;
46typedef AV PAD;
47# endif
48# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
49# define PadlistMAX(pl) AvFILLp (pl)
50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
51# define PadARRAY AvARRAY
52# define PadMAX AvFILLp
53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
54#endif
55#ifndef PadnamelistREFCNT
56# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
57#endif
58#ifndef PadnamelistREFCNT_dec
59# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
60#endif
61
62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
64#if PERL_VERSION_ATLEAST(5,19,0)
65# define SVt_BIND SVt_IV
24#endif 66#endif
25 67
26#if defined(_WIN32) 68#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY 69# undef HAS_GETTIMEOFDAY
28# undef setjmp 70# undef setjmp
… …
31# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
32#else 74#else
33# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
34#endif 76#endif
35 77
36#ifdef HAVE_MMAP
37# include <unistd.h>
38# include <sys/mman.h>
39# ifndef MAP_ANONYMOUS
40# ifdef MAP_ANON
41# define MAP_ANONYMOUS MAP_ANON
42# else
43# undef HAVE_MMAP
44# endif
45# endif
46# include <limits.h>
47# ifndef PAGESIZE
48# define PAGESIZE pagesize
49# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
50static long pagesize;
51# else
52# define BOOT_PAGESIZE (void)0
53# endif
54#else
55# define PAGESIZE 0
56# define BOOT_PAGESIZE (void)0
57#endif
58
59#if CORO_USE_VALGRIND
60# include <valgrind/valgrind.h>
61#endif
62
63/* the maximum number of idle cctx that will be pooled */ 78/* the maximum number of idle cctx that will be pooled */
64static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
65 80
66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
67# undef CORO_STACKGUARD 82# define HAS_SCOPESTACK_NAME 1
68#endif
69
70#ifndef CORO_STACKGUARD
71# define CORO_STACKGUARD 0
72#endif 83#endif
73 84
74/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
75#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
76# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
86# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
87#endif 98#endif
88 99
89#define IN_DESTRUCT PL_dirty 100#define IN_DESTRUCT PL_dirty
90 101
91#if __GNUC__ >= 3
92# define attribute(x) __attribute__(x)
93# define expect(expr,value) __builtin_expect ((expr), (value))
94# define INLINE static inline
95#else
96# define attribute(x)
97# define expect(expr,value) (expr)
98# define INLINE static
99#endif
100
101#define expect_false(expr) expect ((expr) != 0, 0)
102#define expect_true(expr) expect ((expr) != 0, 1)
103
104#define NOINLINE attribute ((noinline))
105
106#include "CoroAPI.h" 102#include "CoroAPI.h"
107#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
108 104
109#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
110# if CORO_PTHREAD 106# if CORO_PTHREAD
… …
126static void (*u2time)(pTHX_ UV ret[2]); 122static void (*u2time)(pTHX_ UV ret[2]);
127 123
128/* we hijack an hopefully unused CV flag for our purposes */ 124/* we hijack an hopefully unused CV flag for our purposes */
129#define CVf_SLF 0x4000 125#define CVf_SLF 0x4000
130static OP *pp_slf (pTHX); 126static OP *pp_slf (pTHX);
127static void slf_destroy (pTHX_ struct coro *coro);
131 128
132static U32 cctx_gen; 129static U32 cctx_gen;
133static size_t cctx_stacksize = CORO_STACKSIZE; 130static size_t cctx_stacksize = CORO_STACKSIZE;
134static struct CoroAPI coroapi; 131static struct CoroAPI coroapi;
135static AV *main_mainstack; /* used to differentiate between $main and others */ 132static AV *main_mainstack; /* used to differentiate between $main and others */
… …
143 140
144static GV *irsgv; /* $/ */ 141static GV *irsgv; /* $/ */
145static GV *stdoutgv; /* *STDOUT */ 142static GV *stdoutgv; /* *STDOUT */
146static SV *rv_diehook; 143static SV *rv_diehook;
147static SV *rv_warnhook; 144static SV *rv_warnhook;
148static HV *hv_sig; /* %SIG */
149 145
150/* async_pool helper stuff */ 146/* async_pool helper stuff */
151static SV *sv_pool_rss; 147static SV *sv_pool_rss;
152static SV *sv_pool_size; 148static SV *sv_pool_size;
153static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
… …
165static char times_valid; 161static char times_valid;
166 162
167static struct coro_cctx *cctx_first; 163static struct coro_cctx *cctx_first;
168static int cctx_count, cctx_idle; 164static int cctx_count, cctx_idle;
169 165
170enum { 166enum
167{
171 CC_MAPPED = 0x01, 168 CC_MAPPED = 0x01,
172 CC_NOREUSE = 0x02, /* throw this away after tracing */ 169 CC_NOREUSE = 0x02, /* throw this away after tracing */
173 CC_TRACE = 0x04, 170 CC_TRACE = 0x04,
174 CC_TRACE_SUB = 0x08, /* trace sub calls */ 171 CC_TRACE_SUB = 0x08, /* trace sub calls */
175 CC_TRACE_LINE = 0x10, /* trace each statement */ 172 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
180typedef struct coro_cctx 177typedef struct coro_cctx
181{ 178{
182 struct coro_cctx *next; 179 struct coro_cctx *next;
183 180
184 /* the stack */ 181 /* the stack */
185 void *sptr; 182 struct coro_stack stack;
186 size_t ssize;
187 183
188 /* cpu state */ 184 /* cpu state */
189 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
186#ifndef NDEBUG
190 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 187 JMPENV *idle_te; /* same as idle_sp, but for top_env */
188#endif
191 JMPENV *top_env; 189 JMPENV *top_env;
192 coro_context cctx; 190 coro_context cctx;
193 191
194 U32 gen; 192 U32 gen;
195#if CORO_USE_VALGRIND 193#if CORO_USE_VALGRIND
… …
200 198
201static coro_cctx *cctx_current; /* the currently running cctx */ 199static coro_cctx *cctx_current; /* the currently running cctx */
202 200
203/*****************************************************************************/ 201/*****************************************************************************/
204 202
203static MGVTBL coro_state_vtbl;
204
205enum { 205enum
206{
206 CF_RUNNING = 0x0001, /* coroutine is running */ 207 CF_RUNNING = 0x0001, /* coroutine is running */
207 CF_READY = 0x0002, /* coroutine is ready */ 208 CF_READY = 0x0002, /* coroutine is ready */
208 CF_NEW = 0x0004, /* has never been switched to */ 209 CF_NEW = 0x0004, /* has never been switched to */
209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 210 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
211 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */ 212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
212}; 213};
213 214
214/* the structure where most of the perl state is stored, overlaid on the cxstack */ 215/* the structure where most of the perl state is stored, overlaid on the cxstack */
215typedef struct 216typedef struct
216{ 217{
217 SV *defsv;
218 AV *defav;
219 SV *errsv;
220 SV *irsgv;
221 HV *hinthv;
222#define VAR(name,type) type name; 218 #define VARx(name,expr,type) type name;
223# include "state.h" 219 #include "state.h"
224#undef VAR
225} perl_slots; 220} perl_slots;
226 221
222/* how many context stack entries do we need for perl_slots */
227#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 223#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
228 224
229/* this is a structure representing a perl-level coroutine */ 225/* this is a structure representing a perl-level coroutine */
230struct coro { 226struct coro
227{
231 /* the C coroutine allocated to this perl coroutine, if any */ 228 /* the C coroutine allocated to this perl coroutine, if any */
232 coro_cctx *cctx; 229 coro_cctx *cctx;
233 230
234 /* ready queue */ 231 /* ready queue */
235 struct coro *next_ready; 232 struct coro *next_ready;
… …
237 /* state data */ 234 /* state data */
238 struct CoroSLF slf_frame; /* saved slf frame */ 235 struct CoroSLF slf_frame; /* saved slf frame */
239 AV *mainstack; 236 AV *mainstack;
240 perl_slots *slot; /* basically the saved sp */ 237 perl_slots *slot; /* basically the saved sp */
241 238
242 CV *startcv; /* the CV to execute */ 239 CV *startcv; /* the CV to execute */
243 AV *args; /* data associated with this coroutine (initial args) */ 240 AV *args; /* data associated with this coroutine (initial args) */
244 int refcnt; /* coroutines are refcounted, yes */
245 int flags; /* CF_ flags */ 241 int flags; /* CF_ flags */
246 HV *hv; /* the perl hash associated with this coro, if any */ 242 HV *hv; /* the perl hash associated with this coro, if any */
247 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
248 243
249 /* statistics */ 244 /* statistics */
250 int usecount; /* number of transfers to this coro */ 245 int usecount; /* number of transfers to this coro */
251 246
252 /* coro process data */ 247 /* coro process data */
253 int prio; 248 int prio;
254 SV *except; /* exception to be thrown */ 249 SV *except; /* exception to be thrown */
255 SV *rouse_cb; 250 SV *rouse_cb; /* last rouse callback */
251 AV *on_destroy; /* callbacks or coros to notify on destroy */
252 AV *status; /* the exit status list */
256 253
257 /* async_pool */ 254 /* async_pool */
258 SV *saved_deffh; 255 SV *saved_deffh;
259 SV *invoke_cb; 256 SV *invoke_cb;
260 AV *invoke_av; 257 AV *invoke_av;
261 258
262 /* on_enter/on_leave */ 259 /* on_enter/on_leave */
263 AV *on_enter; 260 AV *on_enter; AV *on_enter_xs;
264 AV *on_leave; 261 AV *on_leave; AV *on_leave_xs;
265 262
266 /* swap_sv */ 263 /* swap_sv */
267 AV *swap_sv; 264 AV *swap_sv;
268 265
269 /* times */ 266 /* times */
… …
292 289
293/* for Coro.pm */ 290/* for Coro.pm */
294static SV *coro_current; 291static SV *coro_current;
295static SV *coro_readyhook; 292static SV *coro_readyhook;
296static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 293static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
297static CV *cv_coro_run, *cv_coro_terminate; 294static CV *cv_coro_run;
298static struct coro *coro_first; 295static struct coro *coro_first;
299#define coro_nready coroapi.nready 296#define coro_nready coroapi.nready
297
298/** JIT *********************************************************************/
299
300#if CORO_JIT
301 /* APPLE doesn't have mmap though */
302 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
303 #ifndef CORO_JIT_TYPE
304 #if ECB_AMD64 && CORO_JIT_UNIXY
305 #define CORO_JIT_TYPE "amd64-unix"
306 #elif __i386 && CORO_JIT_UNIXY
307 #define CORO_JIT_TYPE "x86-unix"
308 #endif
309 #endif
310#endif
311
312#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
313 #undef CORO_JIT
314#endif
315
316#if CORO_JIT
317 typedef void (*load_save_perl_slots_type)(perl_slots *);
318 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
319#endif
300 320
301/** Coro::Select ************************************************************/ 321/** Coro::Select ************************************************************/
302 322
303static OP *(*coro_old_pp_sselect) (pTHX); 323static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select; 324static SV *coro_select_select;
… …
320 340
321/** time stuff **************************************************************/ 341/** time stuff **************************************************************/
322 342
323#ifdef HAS_GETTIMEOFDAY 343#ifdef HAS_GETTIMEOFDAY
324 344
325static void 345ecb_inline void
326coro_u2time (pTHX_ UV ret[2]) 346coro_u2time (pTHX_ UV ret[2])
327{ 347{
328 struct timeval tv; 348 struct timeval tv;
329 gettimeofday (&tv, 0); 349 gettimeofday (&tv, 0);
330 350
331 ret [0] = tv.tv_sec; 351 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec; 352 ret [1] = tv.tv_usec;
333} 353}
334 354
335static double 355ecb_inline double
336coro_nvtime () 356coro_nvtime (void)
337{ 357{
338 struct timeval tv; 358 struct timeval tv;
339 gettimeofday (&tv, 0); 359 gettimeofday (&tv, 0);
340 360
341 return tv.tv_sec + tv.tv_usec * 1e-6; 361 return tv.tv_sec + tv.tv_usec * 1e-6;
342} 362}
343 363
344static void 364ecb_inline void
345time_init (pTHX) 365time_init (pTHX)
346{ 366{
347 nvtime = coro_nvtime; 367 nvtime = coro_nvtime;
348 u2time = coro_u2time; 368 u2time = coro_u2time;
349} 369}
350 370
351#else 371#else
352 372
353static void 373ecb_inline void
354time_init (pTHX) 374time_init (pTHX)
355{ 375{
356 SV **svp; 376 SV **svp;
357 377
358 require_pv ("Time/HiRes.pm"); 378 require_pv ("Time/HiRes.pm");
359 379
360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 380 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
361 381
362 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 382 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 383 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
364 384
… …
370 390
371#endif 391#endif
372 392
373/** lowlevel stuff **********************************************************/ 393/** lowlevel stuff **********************************************************/
374 394
375static SV * 395static SV * ecb_noinline
376coro_get_sv (pTHX_ const char *name, int create) 396coro_get_sv (pTHX_ const char *name, int create)
377{ 397{
378#if PERL_VERSION_ATLEAST (5,10,0) 398#if PERL_VERSION_ATLEAST (5,10,0)
379 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
380 get_sv (name, create); 400 get_sv (name, create);
381#endif 401#endif
382 return get_sv (name, create); 402 return get_sv (name, create);
383} 403}
384 404
385static AV * 405static AV * ecb_noinline
386coro_get_av (pTHX_ const char *name, int create) 406coro_get_av (pTHX_ const char *name, int create)
387{ 407{
388#if PERL_VERSION_ATLEAST (5,10,0) 408#if PERL_VERSION_ATLEAST (5,10,0)
389 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 409 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
390 get_av (name, create); 410 get_av (name, create);
391#endif 411#endif
392 return get_av (name, create); 412 return get_av (name, create);
393} 413}
394 414
395static HV * 415static HV * ecb_noinline
396coro_get_hv (pTHX_ const char *name, int create) 416coro_get_hv (pTHX_ const char *name, int create)
397{ 417{
398#if PERL_VERSION_ATLEAST (5,10,0) 418#if PERL_VERSION_ATLEAST (5,10,0)
399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 419 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
400 get_hv (name, create); 420 get_hv (name, create);
401#endif 421#endif
402 return get_hv (name, create); 422 return get_hv (name, create);
403} 423}
404 424
405INLINE void 425ecb_inline void
406coro_times_update () 426coro_times_update (void)
407{ 427{
408#ifdef coro_clock_gettime 428#ifdef coro_clock_gettime
409 struct timespec ts; 429 struct timespec ts;
410 430
411 ts.tv_sec = ts.tv_nsec = 0; 431 ts.tv_sec = ts.tv_nsec = 0;
… …
423 time_real [0] = tv [0]; 443 time_real [0] = tv [0];
424 time_real [1] = tv [1] * 1000; 444 time_real [1] = tv [1] * 1000;
425#endif 445#endif
426} 446}
427 447
428INLINE void 448ecb_inline void
429coro_times_add (struct coro *c) 449coro_times_add (struct coro *c)
430{ 450{
431 c->t_real [1] += time_real [1]; 451 c->t_real [1] += time_real [1];
432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 452 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
433 c->t_real [0] += time_real [0]; 453 c->t_real [0] += time_real [0];
… …
435 c->t_cpu [1] += time_cpu [1]; 455 c->t_cpu [1] += time_cpu [1];
436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 456 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
437 c->t_cpu [0] += time_cpu [0]; 457 c->t_cpu [0] += time_cpu [0];
438} 458}
439 459
440INLINE void 460ecb_inline void
441coro_times_sub (struct coro *c) 461coro_times_sub (struct coro *c)
442{ 462{
443 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 463 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
444 c->t_real [1] -= time_real [1]; 464 c->t_real [1] -= time_real [1];
445 c->t_real [0] -= time_real [0]; 465 c->t_real [0] -= time_real [0];
… …
453/* magic glue */ 473/* magic glue */
454 474
455#define CORO_MAGIC_type_cv 26 475#define CORO_MAGIC_type_cv 26
456#define CORO_MAGIC_type_state PERL_MAGIC_ext 476#define CORO_MAGIC_type_state PERL_MAGIC_ext
457 477
458#define CORO_MAGIC_NN(sv, type) \ 478#define CORO_MAGIC_NN(sv, type) \
459 (expect_true (SvMAGIC (sv)->mg_type == type) \ 479 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
460 ? SvMAGIC (sv) \ 480 ? SvMAGIC (sv) \
461 : mg_find (sv, type)) 481 : mg_find (sv, type))
462 482
463#define CORO_MAGIC(sv, type) \ 483#define CORO_MAGIC(sv, type) \
464 (expect_true (SvMAGIC (sv)) \ 484 (ecb_expect_true (SvMAGIC (sv)) \
465 ? CORO_MAGIC_NN (sv, type) \ 485 ? CORO_MAGIC_NN (sv, type) \
466 : 0) 486 : 0)
467 487
468#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 488#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
469#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 489#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
470 490
471INLINE struct coro * 491ecb_inline MAGIC *
472SvSTATE_ (pTHX_ SV *coro) 492SvSTATEhv_p (pTHX_ SV *coro)
473{ 493{
474 HV *stash;
475 MAGIC *mg; 494 MAGIC *mg;
476 495
496 if (ecb_expect_true (
497 SvTYPE (coro) == SVt_PVHV
498 && (mg = CORO_MAGIC_state (coro))
499 && mg->mg_virtual == &coro_state_vtbl
500 ))
501 return mg;
502
503 return 0;
504}
505
506ecb_inline struct coro *
507SvSTATE_ (pTHX_ SV *coro_sv)
508{
509 MAGIC *mg;
510
477 if (SvROK (coro)) 511 if (SvROK (coro_sv))
478 coro = SvRV (coro); 512 coro_sv = SvRV (coro_sv);
479 513
480 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 514 mg = SvSTATEhv_p (aTHX_ coro_sv);
515 if (!mg)
481 croak ("Coro::State object required"); 516 croak ("Coro::State object required");
482 517
483 stash = SvSTASH (coro);
484 if (expect_false (stash != coro_stash && stash != coro_state_stash))
485 {
486 /* very slow, but rare, check */
487 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
488 croak ("Coro::State object required");
489 }
490
491 mg = CORO_MAGIC_state (coro);
492 return (struct coro *)mg->mg_ptr; 518 return (struct coro *)mg->mg_ptr;
493} 519}
494 520
495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 521#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
496 522
… …
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 525#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500 526
501/*****************************************************************************/ 527/*****************************************************************************/
502/* padlist management and caching */ 528/* padlist management and caching */
503 529
504static AV * 530ecb_inline PADLIST *
505coro_derive_padlist (pTHX_ CV *cv) 531coro_derive_padlist (pTHX_ CV *cv)
506{ 532{
507 AV *padlist = CvPADLIST (cv); 533 PADLIST *padlist = CvPADLIST (cv);
508 AV *newpadlist, *newpad; 534 PADLIST *newpadlist;
535 PADNAMELIST *padnames;
536 PAD *newpad;
537 PADOFFSET off = PadlistMAX (padlist) + 1;
509 538
510 newpadlist = newAV (); 539#if NEWPADAPI
540
541 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
542 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
543 while (!PadlistARRAY (padlist)[off - 1])
544 --off;
545
546 Perl_pad_push (aTHX_ padlist, off);
547
548 newpad = PadlistARRAY (padlist)[off];
549 PadlistARRAY (padlist)[off] = 0;
550
551#else
552
553#if PERL_VERSION_ATLEAST (5,10,0)
554 Perl_pad_push (aTHX_ padlist, off);
555#else
556 Perl_pad_push (aTHX_ padlist, off, 1);
557#endif
558
559 newpad = PadlistARRAY (padlist)[off];
560 PadlistMAX (padlist) = off - 1;
561
562#endif
563
564 newPADLIST (newpadlist);
565#if !PERL_VERSION_ATLEAST(5,15,3)
566 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
511 AvREAL_off (newpadlist); 567 AvREAL_off (newpadlist);
512#if PERL_VERSION_ATLEAST (5,10,0)
513 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
514#else
515 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
516#endif 568#endif
517 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
518 --AvFILLp (padlist);
519 569
520 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 570 /* Already extended to 2 elements by newPADLIST. */
521 av_store (newpadlist, 1, (SV *)newpad); 571 PadlistMAX (newpadlist) = 1;
572
573 padnames = PadlistNAMES (padlist);
574 ++PadnamelistREFCNT (padnames);
575 PadlistNAMES (newpadlist) = padnames;
576
577 PadlistARRAY (newpadlist)[1] = newpad;
522 578
523 return newpadlist; 579 return newpadlist;
524} 580}
525 581
526static void 582ecb_inline void
527free_padlist (pTHX_ AV *padlist) 583free_padlist (pTHX_ PADLIST *padlist)
528{ 584{
529 /* may be during global destruction */ 585 /* may be during global destruction */
530 if (!IN_DESTRUCT) 586 if (!IN_DESTRUCT)
531 { 587 {
532 I32 i = AvFILLp (padlist); 588 I32 i = PadlistMAX (padlist);
533 589
534 while (i > 0) /* special-case index 0 */ 590 while (i > 0) /* special-case index 0 */
535 { 591 {
536 /* we try to be extra-careful here */ 592 /* we try to be extra-careful here */
537 AV *av = (AV *)AvARRAY (padlist)[i--]; 593 PAD *pad = PadlistARRAY (padlist)[i--];
538 I32 j = AvFILLp (av);
539 594
595 if (pad)
596 {
597 I32 j = PadMAX (pad);
598
540 while (j >= 0) 599 while (j >= 0)
541 SvREFCNT_dec (AvARRAY (av)[j--]); 600 SvREFCNT_dec (PadARRAY (pad)[j--]);
542 601
543 AvFILLp (av) = -1; 602 PadMAX (pad) = -1;
544 SvREFCNT_dec (av); 603 SvREFCNT_dec (pad);
604 }
545 } 605 }
546 606
547 SvREFCNT_dec (AvARRAY (padlist)[0]); 607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
548 608
609#if NEWPADAPI
610 Safefree (PadlistARRAY (padlist));
611 Safefree (padlist);
612#else
549 AvFILLp (padlist) = -1; 613 AvFILLp (padlist) = -1;
614 AvREAL_off (padlist);
550 SvREFCNT_dec ((SV*)padlist); 615 SvREFCNT_dec ((SV*)padlist);
616#endif
551 } 617 }
552} 618}
553 619
554static int 620static int
555coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 621coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
556{ 622{
557 AV *padlist; 623 PADLIST *padlist;
558 AV *av = (AV *)mg->mg_obj; 624 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
625 size_t len = *(size_t *)mg->mg_ptr;
559 626
560 /* perl manages to free our internal AV and _then_ call us */ 627 /* perl manages to free our internal AV and _then_ call us */
561 if (IN_DESTRUCT) 628 if (IN_DESTRUCT)
562 return 0; 629 return 0;
563 630
564 /* casting is fun. */ 631 while (len--)
565 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
566 free_padlist (aTHX_ padlist); 632 free_padlist (aTHX_ padlists[len]);
567
568 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
569 633
570 return 0; 634 return 0;
571} 635}
572 636
573static MGVTBL coro_cv_vtbl = { 637static MGVTBL coro_cv_vtbl = {
574 0, 0, 0, 0, 638 0, 0, 0, 0,
575 coro_cv_free 639 coro_cv_free
576}; 640};
577 641
578/* the next two functions merely cache the padlists */ 642/* the next two functions merely cache the padlists */
579static void 643ecb_inline void
580get_padlist (pTHX_ CV *cv) 644get_padlist (pTHX_ CV *cv)
581{ 645{
582 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
583 AV *av; 647 size_t *lenp;
584 648
585 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 649 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 650 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
587 else 651 else
588 { 652 {
589#if CORO_PREFER_PERL_FUNCTIONS 653#if CORO_PREFER_PERL_FUNCTIONS
590 /* this is probably cleaner? but also slower! */ 654 /* this is probably cleaner? but also slower! */
591 /* in practise, it seems to be less stable */ 655 /* in practise, it seems to be less stable */
… …
597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 661 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
598#endif 662#endif
599 } 663 }
600} 664}
601 665
602static void 666ecb_inline void
603put_padlist (pTHX_ CV *cv) 667put_padlist (pTHX_ CV *cv)
604{ 668{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 669 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av;
607 670
608 if (expect_false (!mg)) 671 if (ecb_expect_false (!mg))
672 {
609 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 673 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
674 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
675 mg->mg_len = 1; /* so mg_free frees mg_ptr */
676 }
677 else
678 Renew (mg->mg_ptr,
679 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
680 char);
610 681
611 av = (AV *)mg->mg_obj; 682 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
612
613 if (expect_false (AvFILLp (av) >= AvMAX (av)))
614 av_extend (av, AvFILLp (av) + 1);
615
616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
617} 683}
618 684
619/** load & save, init *******************************************************/ 685/** load & save, init *******************************************************/
620 686
687ecb_inline void
688swap_sv (SV *a, SV *b)
689{
690 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
691 SV tmp;
692
693 /* swap sv_any */
694 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
695
696 /* swap sv_flags */
697 SvFLAGS (&tmp) = SvFLAGS (a);
698 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
699 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
700
701#if PERL_VERSION_ATLEAST (5,10,0)
702 /* perl 5.10 and later complicates this _quite_ a bit, but it also
703 * is much faster, so no quarrels here. alternatively, we could
704 * sv_upgrade to avoid this.
705 */
706 {
707 /* swap sv_u */
708 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
709
710 /* if SvANY points to the head, we need to adjust the pointers,
711 * as the pointer for a still points to b, and maybe vice versa.
712 */
713 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
714 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
715 svany_in_head_set |= 1 << SVt_NV;
716 #endif
717
718 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
719
720 if (svany_in_head (SvTYPE (a)))
721 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
722
723 if (svany_in_head (SvTYPE (b)))
724 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
725 }
726#endif
727}
728
621/* swap sv heads, at least logically */ 729/* swap sv heads, at least logically */
622static void 730static void
623swap_svs (pTHX_ Coro__State c) 731swap_svs_enter (pTHX_ Coro__State c)
624{ 732{
625 int i; 733 int i;
626 734
627 for (i = 0; i <= AvFILLp (c->swap_sv); ) 735 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
628 { 736 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
629 SV *a = AvARRAY (c->swap_sv)[i++];
630 SV *b = AvARRAY (c->swap_sv)[i++];
631
632 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
633 SV tmp;
634
635 /* swap sv_any */
636 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
637
638 /* swap sv_flags */
639 SvFLAGS (&tmp) = SvFLAGS (a);
640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
642
643#if PERL_VERSION_ATLEAST (5,10,0)
644 /* perl 5.10 complicates this _quite_ a bit, but it also is
645 * much faster, so no quarrels here. alternatively, we could
646 * sv_upgrade to avoid this.
647 */
648 {
649 /* swap sv_u */
650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
651
652 /* if SvANY points to the head, we need to adjust the pointers,
653 * as the pointer for a still points to b, and maybe vice versa.
654 */
655 #define svany_in_head(type) \
656 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
657
658 if (svany_in_head (SvTYPE (a)))
659 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
660
661 if (svany_in_head (SvTYPE (b)))
662 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
663 }
664#endif
665 }
666} 737}
667 738
739static void
740swap_svs_leave (pTHX_ Coro__State c)
741{
742 int i;
743
744 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
745 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
746}
747
668#define SWAP_SVS(coro) \ 748#define SWAP_SVS_ENTER(coro) \
669 if (expect_false ((coro)->swap_sv)) \ 749 if (ecb_expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro)) 750 swap_svs_enter (aTHX_ (coro))
751
752#define SWAP_SVS_LEAVE(coro) \
753 if (ecb_expect_false ((coro)->swap_sv)) \
754 swap_svs_leave (aTHX_ (coro))
671 755
672static void 756static void
673on_enterleave_call (pTHX_ SV *cb); 757on_enterleave_call (pTHX_ SV *cb);
674 758
675static void 759static void
… …
678 perl_slots *slot = c->slot; 762 perl_slots *slot = c->slot;
679 c->slot = 0; 763 c->slot = 0;
680 764
681 PL_mainstack = c->mainstack; 765 PL_mainstack = c->mainstack;
682 766
683 GvSV (PL_defgv) = slot->defsv; 767#if CORO_JIT
684 GvAV (PL_defgv) = slot->defav; 768 load_perl_slots (slot);
685 GvSV (PL_errgv) = slot->errsv; 769#else
686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
688
689 #define VAR(name,type) PL_ ## name = slot->name; 770 #define VARx(name,expr,type) expr = slot->name;
690 # include "state.h" 771 #include "state.h"
691 #undef VAR 772#endif
692 773
693 { 774 {
694 dSP; 775 dSP;
695 776
696 CV *cv; 777 CV *cv;
697 778
698 /* now do the ugly restore mess */ 779 /* now do the ugly restore mess */
699 while (expect_true (cv = (CV *)POPs)) 780 while (ecb_expect_true (cv = (CV *)POPs))
700 { 781 {
701 put_padlist (aTHX_ cv); /* mark this padlist as available */ 782 put_padlist (aTHX_ cv); /* mark this padlist as available */
702 CvDEPTH (cv) = PTR2IV (POPs); 783 CvDEPTH (cv) = PTR2IV (POPs);
703 CvPADLIST (cv) = (AV *)POPs; 784 CvPADLIST (cv) = (PADLIST *)POPs;
704 } 785 }
705 786
706 PUTBACK; 787 PUTBACK;
707 } 788 }
708 789
709 slf_frame = c->slf_frame; 790 slf_frame = c->slf_frame;
710 CORO_THROW = c->except; 791 CORO_THROW = c->except;
711 792
712 if (expect_false (enable_times)) 793 if (ecb_expect_false (enable_times))
713 { 794 {
714 if (expect_false (!times_valid)) 795 if (ecb_expect_false (!times_valid))
715 coro_times_update (); 796 coro_times_update ();
716 797
717 coro_times_sub (c); 798 coro_times_sub (c);
718 } 799 }
719 800
720 if (expect_false (c->on_enter)) 801 if (ecb_expect_false (c->on_enter))
721 { 802 {
722 int i; 803 int i;
723 804
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 805 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 806 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
726 } 807 }
727 808
809 if (ecb_expect_false (c->on_enter_xs))
810 {
811 int i;
812
813 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
814 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
815 }
816
728 SWAP_SVS (c); 817 SWAP_SVS_ENTER (c);
729} 818}
730 819
731static void 820static void
732save_perl (pTHX_ Coro__State c) 821save_perl (pTHX_ Coro__State c)
733{ 822{
734 SWAP_SVS (c); 823 SWAP_SVS_LEAVE (c);
735 824
825 if (ecb_expect_false (c->on_leave_xs))
826 {
827 int i;
828
829 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
830 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
831 }
832
736 if (expect_false (c->on_leave)) 833 if (ecb_expect_false (c->on_leave))
737 { 834 {
738 int i; 835 int i;
739 836
740 for (i = AvFILLp (c->on_leave); i >= 0; --i) 837 for (i = AvFILLp (c->on_leave); i >= 0; --i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 838 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 } 839 }
743 840
744 times_valid = 0; 841 times_valid = 0;
745 842
746 if (expect_false (enable_times)) 843 if (ecb_expect_false (enable_times))
747 { 844 {
748 coro_times_update (); times_valid = 1; 845 coro_times_update (); times_valid = 1;
749 coro_times_add (c); 846 coro_times_add (c);
750 } 847 }
751 848
… …
765 862
766 XPUSHs (Nullsv); 863 XPUSHs (Nullsv);
767 /* this loop was inspired by pp_caller */ 864 /* this loop was inspired by pp_caller */
768 for (;;) 865 for (;;)
769 { 866 {
770 while (expect_true (cxix >= 0)) 867 while (ecb_expect_true (cxix >= 0))
771 { 868 {
772 PERL_CONTEXT *cx = &ccstk[cxix--]; 869 PERL_CONTEXT *cx = &ccstk[cxix--];
773 870
774 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 871 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
775 { 872 {
776 CV *cv = cx->blk_sub.cv; 873 CV *cv = cx->blk_sub.cv;
777 874
778 if (expect_true (CvDEPTH (cv))) 875 if (ecb_expect_true (CvDEPTH (cv)))
779 { 876 {
780 EXTEND (SP, 3); 877 EXTEND (SP, 3);
781 PUSHs ((SV *)CvPADLIST (cv)); 878 PUSHs ((SV *)CvPADLIST (cv));
782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 879 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
783 PUSHs ((SV *)cv); 880 PUSHs ((SV *)cv);
… …
786 get_padlist (aTHX_ cv); 883 get_padlist (aTHX_ cv);
787 } 884 }
788 } 885 }
789 } 886 }
790 887
791 if (expect_true (top_si->si_type == PERLSI_MAIN)) 888 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
792 break; 889 break;
793 890
794 top_si = top_si->si_prev; 891 top_si = top_si->si_prev;
795 ccstk = top_si->si_cxstack; 892 ccstk = top_si->si_cxstack;
796 cxix = top_si->si_cxix; 893 cxix = top_si->si_cxix;
… …
798 895
799 PUTBACK; 896 PUTBACK;
800 } 897 }
801 898
802 /* allocate some space on the context stack for our purposes */ 899 /* allocate some space on the context stack for our purposes */
803 /* we manually unroll here, as usually 2 slots is enough */ 900 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 { 901 {
808 unsigned int i; 902 unsigned int i;
903
809 for (i = 3; i < SLOT_COUNT; ++i) 904 for (i = 0; i < SLOT_COUNT; ++i)
810 CXINC; 905 CXINC;
811 } 906
812 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 907 cxstack_ix -= SLOT_COUNT; /* undo allocation */
908 }
813 909
814 c->mainstack = PL_mainstack; 910 c->mainstack = PL_mainstack;
815 911
816 { 912 {
817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 913 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
818 914
819 slot->defav = GvAV (PL_defgv); 915#if CORO_JIT
820 slot->defsv = DEFSV; 916 save_perl_slots (slot);
821 slot->errsv = ERRSV; 917#else
822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
824
825 #define VAR(name,type) slot->name = PL_ ## name; 918 #define VARx(name,expr,type) slot->name = expr;
826 # include "state.h" 919 #include "state.h"
827 #undef VAR 920#endif
828 } 921 }
829} 922}
830 923
831/* 924/*
832 * allocate various perl stacks. This is almost an exact copy 925 * allocate various perl stacks. This is almost an exact copy
… …
838# define coro_init_stacks(thx) init_stacks () 931# define coro_init_stacks(thx) init_stacks ()
839#else 932#else
840static void 933static void
841coro_init_stacks (pTHX) 934coro_init_stacks (pTHX)
842{ 935{
843 PL_curstackinfo = new_stackinfo(32, 8); 936 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
844 PL_curstackinfo->si_type = PERLSI_MAIN; 937 PL_curstackinfo->si_type = PERLSI_MAIN;
845 PL_curstack = PL_curstackinfo->si_stack; 938 PL_curstack = PL_curstackinfo->si_stack;
846 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 939 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
847 940
848 PL_stack_base = AvARRAY(PL_curstack); 941 PL_stack_base = AvARRAY(PL_curstack);
… …
863#endif 956#endif
864 957
865 New(54,PL_scopestack,8,I32); 958 New(54,PL_scopestack,8,I32);
866 PL_scopestack_ix = 0; 959 PL_scopestack_ix = 0;
867 PL_scopestack_max = 8; 960 PL_scopestack_max = 8;
961#if HAS_SCOPESTACK_NAME
962 New(54,PL_scopestack_name,8,const char*);
963#endif
868 964
869 New(54,PL_savestack,24,ANY); 965 New(54,PL_savestack,24,ANY);
870 PL_savestack_ix = 0; 966 PL_savestack_ix = 0;
871 PL_savestack_max = 24; 967 PL_savestack_max = 24;
968#if !PERL_VERSION_ATLEAST (5,24,0)
969 /* perl 5.24 moves SS_MAXPUSH optimisation from */
970 /* the header macros to PL_savestack_max */
971 PL_savestack_max -= SS_MAXPUSH;
972#endif
872 973
873#if !PERL_VERSION_ATLEAST (5,10,0) 974#if !PERL_VERSION_ATLEAST (5,10,0)
874 New(54,PL_retstack,4,OP*); 975 New(54,PL_retstack,4,OP*);
875 PL_retstack_ix = 0; 976 PL_retstack_ix = 0;
876 PL_retstack_max = 4; 977 PL_retstack_max = 4;
… …
900 } 1001 }
901 1002
902 Safefree (PL_tmps_stack); 1003 Safefree (PL_tmps_stack);
903 Safefree (PL_markstack); 1004 Safefree (PL_markstack);
904 Safefree (PL_scopestack); 1005 Safefree (PL_scopestack);
1006#if HAS_SCOPESTACK_NAME
1007 Safefree (PL_scopestack_name);
1008#endif
905 Safefree (PL_savestack); 1009 Safefree (PL_savestack);
906#if !PERL_VERSION_ATLEAST (5,10,0) 1010#if !PERL_VERSION_ATLEAST (5,10,0)
907 Safefree (PL_retstack); 1011 Safefree (PL_retstack);
908#endif 1012#endif
909} 1013}
… …
955#endif 1059#endif
956 1060
957/* 1061/*
958 * This overrides the default magic get method of %SIG elements. 1062 * 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 1063 * 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 1064 * and instead of trying to save and restore the hash elements (extremely slow),
961 * readback here. 1065 * we just provide our own readback here.
962 */ 1066 */
963static int 1067static int ecb_cold
964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1068coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
965{ 1069{
966 const char *s = MgPV_nolen_const (mg); 1070 const char *s = MgPV_nolen_const (mg);
967 1071
968 if (*s == '_') 1072 if (*s == '_')
969 { 1073 {
970 SV **svp = 0; 1074 SV **svp = 0;
971 1075
972 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1076 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
973 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1077 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
974 1078
975 if (svp) 1079 if (svp)
976 { 1080 {
977 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1081 SV *ssv;
1082
1083 if (!*svp)
1084 ssv = &PL_sv_undef;
1085 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1086 ssv = sv_2mortal (newRV_inc (*svp));
1087 else
1088 ssv = *svp;
1089
1090 sv_setsv (sv, ssv);
978 return 0; 1091 return 0;
979 } 1092 }
980 } 1093 }
981 1094
982 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1095 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
983} 1096}
984 1097
985static int 1098static int ecb_cold
986coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1099coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
987{ 1100{
988 const char *s = MgPV_nolen_const (mg); 1101 const char *s = MgPV_nolen_const (mg);
989 1102
990 if (*s == '_') 1103 if (*s == '_')
… …
1004 } 1117 }
1005 1118
1006 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1119 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1007} 1120}
1008 1121
1009static int 1122static int ecb_cold
1010coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1123coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1011{ 1124{
1012 const char *s = MgPV_nolen_const (mg); 1125 const char *s = MgPV_nolen_const (mg);
1013 1126
1014 if (*s == '_') 1127 if (*s == '_')
… …
1049 return 1; 1162 return 1;
1050} 1163}
1051 1164
1052static UNOP init_perl_op; 1165static UNOP init_perl_op;
1053 1166
1054static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1167ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1055init_perl (pTHX_ struct coro *coro) 1168init_perl (pTHX_ struct coro *coro)
1056{ 1169{
1057 /* 1170 /*
1058 * emulate part of the perl startup here. 1171 * emulate part of the perl startup here.
1059 */ 1172 */
… …
1074 PL_parser = 0; 1187 PL_parser = 0;
1075#endif 1188#endif
1076 PL_hints = 0; 1189 PL_hints = 0;
1077 1190
1078 /* recreate the die/warn hooks */ 1191 /* recreate the die/warn hooks */
1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1192 PL_diehook = SvREFCNT_inc (rv_diehook);
1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1193 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1081 1194
1082 GvSV (PL_defgv) = newSV (0); 1195 GvSV (PL_defgv) = newSV (0);
1083 GvAV (PL_defgv) = coro->args; coro->args = 0; 1196 GvAV (PL_defgv) = coro->args; coro->args = 0;
1084 GvSV (PL_errgv) = newSV (0); 1197 GvSV (PL_errgv) = newSV (0);
1085 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1198 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1086 GvHV (PL_hintgv) = 0; 1199 GvHV (PL_hintgv) = newHV ();
1200#if PERL_VERSION_ATLEAST (5,10,0)
1201 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1202#endif
1087 PL_rs = newSVsv (GvSV (irsgv)); 1203 PL_rs = newSVsv (GvSV (irsgv));
1088 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1204 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1089 1205
1090 { 1206 {
1091 dSP; 1207 dSP;
… …
1106 /* this newly created coroutine might be run on an existing cctx which most 1222 /* 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. 1223 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1108 */ 1224 */
1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1225 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 */ 1226 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1227 slf_frame.destroy = 0;
1111 1228
1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1229 /* 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; 1230 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1231 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1232 init_perl_op.op_ppaddr = pp_slf;
… …
1118 PL_op = (OP *)&init_perl_op; 1235 PL_op = (OP *)&init_perl_op;
1119 1236
1120 /* copy throw, in case it was set before init_perl */ 1237 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1238 CORO_THROW = coro->except;
1122 1239
1123 SWAP_SVS (coro); 1240 SWAP_SVS_ENTER (coro);
1124 1241
1125 if (expect_false (enable_times)) 1242 if (ecb_expect_false (enable_times))
1126 { 1243 {
1127 coro_times_update (); 1244 coro_times_update ();
1128 coro_times_sub (coro); 1245 coro_times_sub (coro);
1129 } 1246 }
1130} 1247}
… …
1154destroy_perl (pTHX_ struct coro *coro) 1271destroy_perl (pTHX_ struct coro *coro)
1155{ 1272{
1156 SV *svf [9]; 1273 SV *svf [9];
1157 1274
1158 { 1275 {
1276 SV *old_current = SvRV (coro_current);
1159 struct coro *current = SvSTATE_current; 1277 struct coro *current = SvSTATE (old_current);
1160 1278
1161 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1279 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1162 1280
1163 save_perl (aTHX_ current); 1281 save_perl (aTHX_ current);
1282
1283 /* this will cause transfer_check to croak on block*/
1284 SvRV_set (coro_current, (SV *)coro->hv);
1285
1164 load_perl (aTHX_ coro); 1286 load_perl (aTHX_ coro);
1165 1287
1288 /* restore swapped sv's */
1289 SWAP_SVS_LEAVE (coro);
1290
1166 coro_unwind_stacks (aTHX); 1291 coro_unwind_stacks (aTHX);
1292
1167 coro_destruct_stacks (aTHX); 1293 coro_destruct_stacks (aTHX);
1168 1294
1169 /* restore swapped sv's */
1170 SWAP_SVS (coro);
1171
1172 // now save some sv's to be free'd later 1295 /* now save some sv's to be free'd later */
1173 svf [0] = GvSV (PL_defgv); 1296 svf [0] = GvSV (PL_defgv);
1174 svf [1] = (SV *)GvAV (PL_defgv); 1297 svf [1] = (SV *)GvAV (PL_defgv);
1175 svf [2] = GvSV (PL_errgv); 1298 svf [2] = GvSV (PL_errgv);
1176 svf [3] = (SV *)PL_defoutgv; 1299 svf [3] = (SV *)PL_defoutgv;
1177 svf [4] = PL_rs; 1300 svf [4] = PL_rs;
… …
1179 svf [6] = (SV *)GvHV (PL_hintgv); 1302 svf [6] = (SV *)GvHV (PL_hintgv);
1180 svf [7] = PL_diehook; 1303 svf [7] = PL_diehook;
1181 svf [8] = PL_warnhook; 1304 svf [8] = PL_warnhook;
1182 assert (9 == sizeof (svf) / sizeof (*svf)); 1305 assert (9 == sizeof (svf) / sizeof (*svf));
1183 1306
1307 SvRV_set (coro_current, old_current);
1308
1184 load_perl (aTHX_ current); 1309 load_perl (aTHX_ current);
1185 } 1310 }
1186 1311
1187 { 1312 {
1188 unsigned int i; 1313 unsigned int i;
… …
1192 1317
1193 SvREFCNT_dec (coro->saved_deffh); 1318 SvREFCNT_dec (coro->saved_deffh);
1194 SvREFCNT_dec (coro->rouse_cb); 1319 SvREFCNT_dec (coro->rouse_cb);
1195 SvREFCNT_dec (coro->invoke_cb); 1320 SvREFCNT_dec (coro->invoke_cb);
1196 SvREFCNT_dec (coro->invoke_av); 1321 SvREFCNT_dec (coro->invoke_av);
1322 SvREFCNT_dec (coro->on_enter_xs);
1323 SvREFCNT_dec (coro->on_leave_xs);
1197 } 1324 }
1198} 1325}
1199 1326
1200INLINE void 1327ecb_inline void
1201free_coro_mortal (pTHX) 1328free_coro_mortal (pTHX)
1202{ 1329{
1203 if (expect_true (coro_mortal)) 1330 if (ecb_expect_true (coro_mortal))
1204 { 1331 {
1205 SvREFCNT_dec (coro_mortal); 1332 SvREFCNT_dec ((SV *)coro_mortal);
1206 coro_mortal = 0; 1333 coro_mortal = 0;
1207 } 1334 }
1208} 1335}
1209 1336
1210static int 1337static int
… …
1264 1391
1265 if (PL_curcop != &PL_compiling) 1392 if (PL_curcop != &PL_compiling)
1266 { 1393 {
1267 SV **cb; 1394 SV **cb;
1268 1395
1269 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1396 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1270 { 1397 {
1271 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1398 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1272 1399
1273 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1400 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1274 { 1401 {
… …
1343 1470
1344 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1471 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1345} 1472}
1346 1473
1347/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1474/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1348static void NOINLINE 1475static void ecb_noinline
1349cctx_prepare (pTHX) 1476cctx_prepare (pTHX)
1350{ 1477{
1351 PL_top_env = &PL_start_env; 1478 PL_top_env = &PL_start_env;
1352 1479
1353 if (cctx_current->flags & CC_TRACE) 1480 if (cctx_current->flags & CC_TRACE)
… …
1364 slf_frame.prepare = slf_prepare_set_stacklevel; 1491 slf_frame.prepare = slf_prepare_set_stacklevel;
1365 slf_frame.check = slf_check_set_stacklevel; 1492 slf_frame.check = slf_check_set_stacklevel;
1366} 1493}
1367 1494
1368/* the tail of transfer: execute stuff we can only do after a transfer */ 1495/* the tail of transfer: execute stuff we can only do after a transfer */
1369INLINE void 1496ecb_inline void
1370transfer_tail (pTHX) 1497transfer_tail (pTHX)
1371{ 1498{
1372 free_coro_mortal (aTHX); 1499 free_coro_mortal (aTHX);
1500}
1501
1502/* try to exit the same way perl's main function would do */
1503/* we do not bother resetting the environment or other things *7
1504/* that are not, uhm, essential */
1505/* this obviously also doesn't work when perl is embedded */
1506static void ecb_noinline ecb_cold
1507perlish_exit (pTHX)
1508{
1509 int exitstatus = perl_destruct (PL_curinterp);
1510 perl_free (PL_curinterp);
1511 exit (exitstatus);
1373} 1512}
1374 1513
1375/* 1514/*
1376 * this is a _very_ stripped down perl interpreter ;) 1515 * this is a _very_ stripped down perl interpreter ;)
1377 */ 1516 */
… …
1404 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1543 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1405 * runtime errors here, as this is just a random interpreter, not a thread. 1544 * runtime errors here, as this is just a random interpreter, not a thread.
1406 */ 1545 */
1407 1546
1408 /* 1547 /*
1548 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1549 * requires PL_scopestack_ix, so do it here if required.
1550 */
1551 if (!PL_scopestack_ix)
1552 ENTER;
1553
1554 /*
1409 * If perl-run returns we assume exit() was being called or the coro 1555 * 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) 1556 * 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 1557 * 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" 1558 * 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 */ 1559 */
1417 PL_top_env = main_top_env; 1560 perlish_exit (aTHX);
1418 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1419 } 1561 }
1420} 1562}
1421 1563
1422static coro_cctx * 1564static coro_cctx *
1423cctx_new () 1565cctx_new (void)
1424{ 1566{
1425 coro_cctx *cctx; 1567 coro_cctx *cctx;
1426 1568
1427 ++cctx_count; 1569 ++cctx_count;
1428 New (0, cctx, 1, coro_cctx); 1570 New (0, cctx, 1, coro_cctx);
… …
1434 return cctx; 1576 return cctx;
1435} 1577}
1436 1578
1437/* create a new cctx only suitable as source */ 1579/* create a new cctx only suitable as source */
1438static coro_cctx * 1580static coro_cctx *
1439cctx_new_empty () 1581cctx_new_empty (void)
1440{ 1582{
1441 coro_cctx *cctx = cctx_new (); 1583 coro_cctx *cctx = cctx_new ();
1442 1584
1443 cctx->sptr = 0; 1585 cctx->stack.sptr = 0;
1444 coro_create (&cctx->cctx, 0, 0, 0, 0); 1586 coro_create (&cctx->cctx, 0, 0, 0, 0);
1445 1587
1446 return cctx; 1588 return cctx;
1447} 1589}
1448 1590
1449/* create a new cctx suitable as destination/running a perl interpreter */ 1591/* create a new cctx suitable as destination/running a perl interpreter */
1450static coro_cctx * 1592static coro_cctx *
1451cctx_new_run () 1593cctx_new_run (void)
1452{ 1594{
1453 coro_cctx *cctx = cctx_new (); 1595 coro_cctx *cctx = cctx_new ();
1454 void *stack_start;
1455 size_t stack_size;
1456 1596
1457#if HAVE_MMAP 1597 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 } 1598 {
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."); 1599 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1480 _exit (EXIT_FAILURE); 1600 _exit (EXIT_FAILURE);
1481 }
1482
1483 stack_start = cctx->sptr;
1484 stack_size = cctx->ssize;
1485 } 1601 }
1486 1602
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); 1603 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1492 1604
1493 return cctx; 1605 return cctx;
1494} 1606}
1495 1607
1496static void 1608static void
… …
1502 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1614 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1503 1615
1504 --cctx_count; 1616 --cctx_count;
1505 coro_destroy (&cctx->cctx); 1617 coro_destroy (&cctx->cctx);
1506 1618
1507 /* coro_transfer creates new, empty cctx's */ 1619 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 1620
1522 Safefree (cctx); 1621 Safefree (cctx);
1523} 1622}
1524 1623
1525/* wether this cctx should be destructed */ 1624/* wether this cctx should be destructed */
1526#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1625#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1527 1626
1528static coro_cctx * 1627static coro_cctx *
1529cctx_get (pTHX) 1628cctx_get (pTHX)
1530{ 1629{
1531 while (expect_true (cctx_first)) 1630 while (ecb_expect_true (cctx_first))
1532 { 1631 {
1533 coro_cctx *cctx = cctx_first; 1632 coro_cctx *cctx = cctx_first;
1534 cctx_first = cctx->next; 1633 cctx_first = cctx->next;
1535 --cctx_idle; 1634 --cctx_idle;
1536 1635
1537 if (expect_true (!CCTX_EXPIRED (cctx))) 1636 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1538 return cctx; 1637 return cctx;
1539 1638
1540 cctx_destroy (cctx); 1639 cctx_destroy (cctx);
1541 } 1640 }
1542 1641
… …
1544} 1643}
1545 1644
1546static void 1645static void
1547cctx_put (coro_cctx *cctx) 1646cctx_put (coro_cctx *cctx)
1548{ 1647{
1549 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1648 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1550 1649
1551 /* free another cctx if overlimit */ 1650 /* free another cctx if overlimit */
1552 if (expect_false (cctx_idle >= cctx_max_idle)) 1651 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1553 { 1652 {
1554 coro_cctx *first = cctx_first; 1653 coro_cctx *first = cctx_first;
1555 cctx_first = first->next; 1654 cctx_first = first->next;
1556 --cctx_idle; 1655 --cctx_idle;
1557 1656
… …
1568static void 1667static void
1569transfer_check (pTHX_ struct coro *prev, struct coro *next) 1668transfer_check (pTHX_ struct coro *prev, struct coro *next)
1570{ 1669{
1571 /* TODO: throwing up here is considered harmful */ 1670 /* TODO: throwing up here is considered harmful */
1572 1671
1573 if (expect_true (prev != next)) 1672 if (ecb_expect_true (prev != next))
1574 { 1673 {
1575 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1674 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,"); 1675 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1577 1676
1578 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1677 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,"); 1678 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1580 1679
1581#if !PERL_VERSION_ATLEAST (5,10,0) 1680#if !PERL_VERSION_ATLEAST (5,10,0)
1582 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1681 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,"); 1682 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1584#endif 1683#endif
1585 } 1684 }
1586} 1685}
1587 1686
1588/* always use the TRANSFER macro */ 1687/* always use the TRANSFER macro */
1589static void NOINLINE /* noinline so we have a fixed stackframe */ 1688static void ecb_noinline /* noinline so we have a fixed stackframe */
1590transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1689transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1591{ 1690{
1592 dSTACKLEVEL; 1691 dSTACKLEVEL;
1593 1692
1594 /* sometimes transfer is only called to set idle_sp */ 1693 /* sometimes transfer is only called to set idle_sp */
1595 if (expect_false (!prev)) 1694 if (ecb_expect_false (!prev))
1596 { 1695 {
1597 cctx_current->idle_sp = STACKLEVEL; 1696 cctx_current->idle_sp = STACKLEVEL;
1598 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1697 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1599 } 1698 }
1600 else if (expect_true (prev != next)) 1699 else if (ecb_expect_true (prev != next))
1601 { 1700 {
1602 coro_cctx *cctx_prev; 1701 coro_cctx *cctx_prev;
1603 1702
1604 if (expect_false (prev->flags & CF_NEW)) 1703 if (ecb_expect_false (prev->flags & CF_NEW))
1605 { 1704 {
1606 /* create a new empty/source context */ 1705 /* create a new empty/source context */
1607 prev->flags &= ~CF_NEW; 1706 prev->flags &= ~CF_NEW;
1608 prev->flags |= CF_RUNNING; 1707 prev->flags |= CF_RUNNING;
1609 } 1708 }
… …
1612 next->flags |= CF_RUNNING; 1711 next->flags |= CF_RUNNING;
1613 1712
1614 /* first get rid of the old state */ 1713 /* first get rid of the old state */
1615 save_perl (aTHX_ prev); 1714 save_perl (aTHX_ prev);
1616 1715
1617 if (expect_false (next->flags & CF_NEW)) 1716 if (ecb_expect_false (next->flags & CF_NEW))
1618 { 1717 {
1619 /* need to start coroutine */ 1718 /* need to start coroutine */
1620 next->flags &= ~CF_NEW; 1719 next->flags &= ~CF_NEW;
1621 /* setup coroutine call */ 1720 /* setup coroutine call */
1622 init_perl (aTHX_ next); 1721 init_perl (aTHX_ next);
1623 } 1722 }
1624 else 1723 else
1625 load_perl (aTHX_ next); 1724 load_perl (aTHX_ next);
1626 1725
1627 /* possibly untie and reuse the cctx */ 1726 /* possibly untie and reuse the cctx */
1628 if (expect_true ( 1727 if (ecb_expect_true (
1629 cctx_current->idle_sp == STACKLEVEL 1728 cctx_current->idle_sp == STACKLEVEL
1630 && !(cctx_current->flags & CC_TRACE) 1729 && !(cctx_current->flags & CC_TRACE)
1631 && !force_cctx 1730 && !force_cctx
1632 )) 1731 ))
1633 { 1732 {
1634 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1733 /* 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)); 1734 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1636 1735
1637 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1736 /* 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 */ 1737 /* without this the next cctx_get might destroy the running cctx while still in use */
1639 if (expect_false (CCTX_EXPIRED (cctx_current))) 1738 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1640 if (expect_true (!next->cctx)) 1739 if (ecb_expect_true (!next->cctx))
1641 next->cctx = cctx_get (aTHX); 1740 next->cctx = cctx_get (aTHX);
1642 1741
1643 cctx_put (cctx_current); 1742 cctx_put (cctx_current);
1644 } 1743 }
1645 else 1744 else
1646 prev->cctx = cctx_current; 1745 prev->cctx = cctx_current;
1647 1746
1648 ++next->usecount; 1747 ++next->usecount;
1649 1748
1650 cctx_prev = cctx_current; 1749 cctx_prev = cctx_current;
1651 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1750 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1652 1751
1653 next->cctx = 0; 1752 next->cctx = 0;
1654 1753
1655 if (expect_false (cctx_prev != cctx_current)) 1754 if (ecb_expect_false (cctx_prev != cctx_current))
1656 { 1755 {
1657 cctx_prev->top_env = PL_top_env; 1756 cctx_prev->top_env = PL_top_env;
1658 PL_top_env = cctx_current->top_env; 1757 PL_top_env = cctx_current->top_env;
1659 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1758 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1660 } 1759 }
… …
1666#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1765#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) 1766#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1668 1767
1669/** high level stuff ********************************************************/ 1768/** high level stuff ********************************************************/
1670 1769
1770/* this function is actually Coro, not Coro::State, but we call it from here */
1771/* because it is convenient - but it hasn't been declared yet for that reason */
1772static void
1773coro_call_on_destroy (pTHX_ struct coro *coro);
1774
1671static void 1775static void
1672coro_state_destroy (pTHX_ struct coro *coro) 1776coro_state_destroy (pTHX_ struct coro *coro)
1673{ 1777{
1674 if (coro->flags & CF_DESTROYED) 1778 if (coro->flags & CF_ZOMBIE)
1675 return; 1779 return;
1676 1780
1677 /* this callback is reserved for slf functions needing to do cleanup */
1678 if (coro->on_destroy && !PL_dirty)
1679 coro->on_destroy (aTHX_ coro); 1781 slf_destroy (aTHX_ coro);
1680 1782
1681 /*
1682 * The on_destroy above most likely is from an SLF call.
1683 * Since by definition the SLF call will not finish when we destroy
1684 * the coro, we will have to force-finish it here, otherwise
1685 * cleanup functions cannot call SLF functions.
1686 */
1687 coro->slf_frame.prepare = 0;
1688
1689 coro->flags |= CF_DESTROYED; 1783 coro->flags |= CF_ZOMBIE;
1690 1784
1691 if (coro->flags & CF_READY) 1785 if (coro->flags & CF_READY)
1692 { 1786 {
1693 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1787 /* reduce nready, as destroying a ready coro effectively unreadies it */
1694 /* alternative: look through all ready queues and remove the coro */ 1788 /* alternative: look through all ready queues and remove the coro */
1695 --coro_nready; 1789 --coro_nready;
1696 } 1790 }
1697 else 1791 else
1698 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1792 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1793
1794 if (coro->next) coro->next->prev = coro->prev;
1795 if (coro->prev) coro->prev->next = coro->next;
1796 if (coro == coro_first) coro_first = coro->next;
1699 1797
1700 if (coro->mainstack 1798 if (coro->mainstack
1701 && coro->mainstack != main_mainstack 1799 && coro->mainstack != main_mainstack
1702 && coro->slot 1800 && coro->slot
1703 && !PL_dirty) 1801 && !PL_dirty)
1704 destroy_perl (aTHX_ coro); 1802 destroy_perl (aTHX_ coro);
1705 1803
1706 if (coro->next) coro->next->prev = coro->prev;
1707 if (coro->prev) coro->prev->next = coro->next;
1708 if (coro == coro_first) coro_first = coro->next;
1709
1710 cctx_destroy (coro->cctx); 1804 cctx_destroy (coro->cctx);
1711 SvREFCNT_dec (coro->startcv); 1805 SvREFCNT_dec (coro->startcv);
1712 SvREFCNT_dec (coro->args); 1806 SvREFCNT_dec (coro->args);
1713 SvREFCNT_dec (coro->swap_sv); 1807 SvREFCNT_dec (coro->swap_sv);
1714 SvREFCNT_dec (CORO_THROW); 1808 SvREFCNT_dec (CORO_THROW);
1809
1810 coro_call_on_destroy (aTHX_ coro);
1811
1812 /* more destruction mayhem in coro_state_free */
1715} 1813}
1716 1814
1717static int 1815static int
1718coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1816coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1719{ 1817{
1720 struct coro *coro = (struct coro *)mg->mg_ptr; 1818 struct coro *coro = (struct coro *)mg->mg_ptr;
1721 mg->mg_ptr = 0; 1819 mg->mg_ptr = 0;
1722 1820
1723 coro->hv = 0;
1724
1725 if (--coro->refcnt < 0)
1726 {
1727 coro_state_destroy (aTHX_ coro); 1821 coro_state_destroy (aTHX_ coro);
1822 SvREFCNT_dec (coro->on_destroy);
1823 SvREFCNT_dec (coro->status);
1824
1728 Safefree (coro); 1825 Safefree (coro);
1729 }
1730 1826
1731 return 0; 1827 return 0;
1732} 1828}
1733 1829
1734static int 1830static int ecb_cold
1735coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1831coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1736{ 1832{
1737 struct coro *coro = (struct coro *)mg->mg_ptr; 1833 /* called when perl clones the current process the slow way (windows process emulation) */
1738 1834 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1739 ++coro->refcnt; 1835 mg->mg_ptr = 0;
1836 mg->mg_virtual = 0;
1740 1837
1741 return 0; 1838 return 0;
1742} 1839}
1743 1840
1744static MGVTBL coro_state_vtbl = { 1841static MGVTBL coro_state_vtbl = {
… …
1769 TRANSFER (ta, 1); 1866 TRANSFER (ta, 1);
1770} 1867}
1771 1868
1772/** Coro ********************************************************************/ 1869/** Coro ********************************************************************/
1773 1870
1774INLINE void 1871ecb_inline void
1775coro_enq (pTHX_ struct coro *coro) 1872coro_enq (pTHX_ struct coro *coro)
1776{ 1873{
1777 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1874 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1778 1875
1779 SvREFCNT_inc_NN (coro->hv); 1876 SvREFCNT_inc_NN (coro->hv);
… …
1781 coro->next_ready = 0; 1878 coro->next_ready = 0;
1782 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1879 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1783 ready [1] = coro; 1880 ready [1] = coro;
1784} 1881}
1785 1882
1786INLINE struct coro * 1883ecb_inline struct coro *
1787coro_deq (pTHX) 1884coro_deq (pTHX)
1788{ 1885{
1789 int prio; 1886 int prio;
1790 1887
1791 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1888 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1844{ 1941{
1845 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1942 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1846} 1943}
1847 1944
1848/* expects to own a reference to next->hv */ 1945/* expects to own a reference to next->hv */
1849INLINE void 1946ecb_inline void
1850prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1947prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1851{ 1948{
1852 SV *prev_sv = SvRV (coro_current); 1949 SV *prev_sv = SvRV (coro_current);
1853 1950
1854 ta->prev = SvSTATE_hv (prev_sv); 1951 ta->prev = SvSTATE_hv (prev_sv);
… …
1867{ 1964{
1868 for (;;) 1965 for (;;)
1869 { 1966 {
1870 struct coro *next = coro_deq (aTHX); 1967 struct coro *next = coro_deq (aTHX);
1871 1968
1872 if (expect_true (next)) 1969 if (ecb_expect_true (next))
1873 { 1970 {
1874 /* cannot transfer to destroyed coros, skip and look for next */ 1971 /* cannot transfer to destroyed coros, skip and look for next */
1875 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1972 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1876 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1973 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1877 else 1974 else
1878 { 1975 {
1879 next->flags &= ~CF_READY; 1976 next->flags &= ~CF_READY;
1880 --coro_nready; 1977 --coro_nready;
… …
1888 /* nothing to schedule: call the idle handler */ 1985 /* nothing to schedule: call the idle handler */
1889 if (SvROK (sv_idle) 1986 if (SvROK (sv_idle)
1890 && SvOBJECT (SvRV (sv_idle))) 1987 && SvOBJECT (SvRV (sv_idle)))
1891 { 1988 {
1892 if (SvRV (sv_idle) == SvRV (coro_current)) 1989 if (SvRV (sv_idle) == SvRV (coro_current))
1990 {
1991 require_pv ("Carp");
1992
1993 {
1994 dSP;
1995
1996 ENTER;
1997 SAVETMPS;
1998
1999 PUSHMARK (SP);
1893 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2000 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2001 PUTBACK;
2002 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2003
2004 FREETMPS;
2005 LEAVE;
2006 }
2007 }
1894 2008
1895 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2009 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1896 api_ready (aTHX_ SvRV (sv_idle)); 2010 api_ready (aTHX_ SvRV (sv_idle));
1897 --coro_nready; 2011 --coro_nready;
1898 } 2012 }
… …
1913 } 2027 }
1914 } 2028 }
1915 } 2029 }
1916} 2030}
1917 2031
1918INLINE void 2032ecb_inline void
1919prepare_cede (pTHX_ struct coro_transfer_args *ta) 2033prepare_cede (pTHX_ struct coro_transfer_args *ta)
1920{ 2034{
1921 api_ready (aTHX_ coro_current); 2035 api_ready (aTHX_ coro_current);
1922 prepare_schedule (aTHX_ ta); 2036 prepare_schedule (aTHX_ ta);
1923} 2037}
1924 2038
1925INLINE void 2039ecb_inline void
1926prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2040prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1927{ 2041{
1928 SV *prev = SvRV (coro_current); 2042 SV *prev = SvRV (coro_current);
1929 2043
1930 if (coro_nready) 2044 if (coro_nready)
… …
1960{ 2074{
1961 struct coro_transfer_args ta; 2075 struct coro_transfer_args ta;
1962 2076
1963 prepare_cede (aTHX_ &ta); 2077 prepare_cede (aTHX_ &ta);
1964 2078
1965 if (expect_true (ta.prev != ta.next)) 2079 if (ecb_expect_true (ta.prev != ta.next))
1966 { 2080 {
1967 TRANSFER (ta, 1); 2081 TRANSFER (ta, 1);
1968 return 1; 2082 return 1;
1969 } 2083 }
1970 else 2084 else
… …
2013 coro->slot->runops = RUNOPS_DEFAULT; 2127 coro->slot->runops = RUNOPS_DEFAULT;
2014 } 2128 }
2015} 2129}
2016 2130
2017static void 2131static void
2132coro_push_av (pTHX_ AV *av, I32 gimme_v)
2133{
2134 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2135 {
2136 dSP;
2137
2138 if (gimme_v == G_SCALAR)
2139 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2140 else
2141 {
2142 int i;
2143 EXTEND (SP, AvFILLp (av) + 1);
2144
2145 for (i = 0; i <= AvFILLp (av); ++i)
2146 PUSHs (AvARRAY (av)[i]);
2147 }
2148
2149 PUTBACK;
2150 }
2151}
2152
2153static void
2154coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2155{
2156 if (!coro->on_destroy)
2157 coro->on_destroy = newAV ();
2158
2159 av_push (coro->on_destroy, cb);
2160}
2161
2162static void
2163slf_destroy_join (pTHX_ struct CoroSLF *frame)
2164{
2165 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2166}
2167
2168static int
2169slf_check_join (pTHX_ struct CoroSLF *frame)
2170{
2171 struct coro *coro = (struct coro *)frame->data;
2172
2173 if (!coro->status)
2174 return 1;
2175
2176 frame->destroy = 0;
2177
2178 coro_push_av (aTHX_ coro->status, GIMME_V);
2179
2180 SvREFCNT_dec ((SV *)coro->hv);
2181
2182 return 0;
2183}
2184
2185static void
2186slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2187{
2188 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2189
2190 if (items > 1)
2191 croak ("join called with too many arguments");
2192
2193 if (coro->status)
2194 frame->prepare = prepare_nop;
2195 else
2196 {
2197 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2198 frame->prepare = prepare_schedule;
2199 }
2200
2201 frame->check = slf_check_join;
2202 frame->destroy = slf_destroy_join;
2203 frame->data = (void *)coro;
2204 SvREFCNT_inc (coro->hv);
2205}
2206
2207static void
2018coro_call_on_destroy (pTHX_ struct coro *coro) 2208coro_call_on_destroy (pTHX_ struct coro *coro)
2019{ 2209{
2020 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2210 AV *od = coro->on_destroy;
2021 2211
2022 if (on_destroyp) 2212 if (!od)
2023 { 2213 return;
2024 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2025 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2026 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2027 2214
2215 coro->on_destroy = 0;
2216 sv_2mortal ((SV *)od);
2217
2028 while (AvFILLp (on_destroy) >= 0) 2218 while (AvFILLp (od) >= 0)
2219 {
2220 SV *cb = sv_2mortal (av_pop (od));
2221
2222 /* coro hv's (and only hv's at the moment) are supported as well */
2223 if (SvSTATEhv_p (aTHX_ cb))
2224 api_ready (aTHX_ cb);
2225 else
2029 { 2226 {
2030 dSP; /* don't disturb outer sp */ 2227 dSP; /* don't disturb outer sp */
2031 SV *cb = av_pop (on_destroy);
2032
2033 PUSHMARK (SP); 2228 PUSHMARK (SP);
2034 2229
2035 if (statusp) 2230 if (coro->status)
2036 { 2231 {
2037 int i; 2232 PUTBACK;
2038 EXTEND (SP, AvFILLp (status) + 1); 2233 coro_push_av (aTHX_ coro->status, G_ARRAY);
2039 2234 SPAGAIN;
2040 for (i = 0; i <= AvFILLp (status); ++i)
2041 PUSHs (AvARRAY (status)[i]);
2042 } 2235 }
2043 2236
2044 PUTBACK; 2237 PUTBACK;
2045 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2238 call_sv (cb, G_VOID | G_DISCARD);
2046 } 2239 }
2047 } 2240 }
2048} 2241}
2049 2242
2050static void 2243static void
2051coro_set_status (HV *coro_hv, SV **arg, int items) 2244coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2052{ 2245{
2053 AV *av = newAV (); 2246 AV *av;
2247
2248 if (coro->status)
2249 {
2250 av = coro->status;
2251 av_clear (av);
2252 }
2253 else
2254 av = coro->status = newAV ();
2054 2255
2055 /* items are actually not so common, so optimise for this case */ 2256 /* items are actually not so common, so optimise for this case */
2056 if (items) 2257 if (items)
2057 { 2258 {
2058 int i; 2259 int i;
… …
2060 av_extend (av, items - 1); 2261 av_extend (av, items - 1);
2061 2262
2062 for (i = 0; i < items; ++i) 2263 for (i = 0; i < items; ++i)
2063 av_push (av, SvREFCNT_inc_NN (arg [i])); 2264 av_push (av, SvREFCNT_inc_NN (arg [i]));
2064 } 2265 }
2065
2066 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2067} 2266}
2068 2267
2069static void 2268static void
2070slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2269slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2071{ 2270{
… …
2083static void 2282static void
2084slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2283slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2085{ 2284{
2086 HV *coro_hv = (HV *)SvRV (coro_current); 2285 HV *coro_hv = (HV *)SvRV (coro_current);
2087 2286
2088 coro_set_status (coro_hv, arg, items); 2287 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2089 slf_init_terminate_cancel_common (frame, coro_hv); 2288 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2090} 2289}
2091 2290
2092static void 2291static void
2093slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2292slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2094{ 2293{
… …
2099 croak ("Coro::cancel called without coro object,"); 2298 croak ("Coro::cancel called without coro object,");
2100 2299
2101 coro = SvSTATE (arg [0]); 2300 coro = SvSTATE (arg [0]);
2102 coro_hv = coro->hv; 2301 coro_hv = coro->hv;
2103 2302
2104 coro_set_status (coro_hv, arg + 1, items - 1); 2303 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2105 2304
2106 if (expect_false (coro->flags & CF_NOCANCEL)) 2305 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2107 { 2306 {
2108 /* coro currently busy cancelling something, so just notify it */ 2307 /* coro currently busy cancelling something, so just notify it */
2109 coro->slf_frame.data = (void *)coro; 2308 coro->slf_frame.data = (void *)coro;
2110 2309
2111 frame->prepare = prepare_nop; 2310 frame->prepare = prepare_nop;
2112 frame->check = slf_check_nop; 2311 frame->check = slf_check_nop;
2113 } 2312 }
2114 else if (coro_hv == (HV *)SvRV (coro_current)) 2313 else if (coro_hv == (HV *)SvRV (coro_current))
2115 { 2314 {
2116 /* cancelling the current coro is allowed, and equals terminate */ 2315 /* cancelling the current coro is allowed, and equals terminate */
2117 slf_init_terminate_cancel_common (frame, coro_hv); 2316 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2118 } 2317 }
2119 else 2318 else
2120 { 2319 {
2121 struct coro *self = SvSTATE_current; 2320 struct coro *self = SvSTATE_current;
2321
2322 if (!self)
2323 croak ("Coro::cancel called outside of thread content,");
2122 2324
2123 /* otherwise we cancel directly, purely for speed reasons 2325 /* otherwise we cancel directly, purely for speed reasons
2124 * unfortunately, this requires some magic trickery, as 2326 * unfortunately, this requires some magic trickery, as
2125 * somebody else could cancel us, so we have to fight the cancellation. 2327 * somebody else could cancel us, so we have to fight the cancellation.
2126 * this is ugly, and hopefully fully worth the extra speed. 2328 * this is ugly, and hopefully fully worth the extra speed.
2127 * besides, I can't get the slow-but-safe version working... 2329 * besides, I can't get the slow-but-safe version working...
2128 */ 2330 */
2129 slf_frame.data = 0; 2331 slf_frame.data = 0;
2130 self->flags |= CF_NOCANCEL; 2332 self->flags |= CF_NOCANCEL;
2131
2132 coro_state_destroy (aTHX_ coro); 2333 coro_state_destroy (aTHX_ coro);
2133 coro_call_on_destroy (aTHX_ coro);
2134
2135 self->flags &= ~CF_NOCANCEL; 2334 self->flags &= ~CF_NOCANCEL;
2136 2335
2137 if (slf_frame.data) 2336 if (slf_frame.data)
2138 { 2337 {
2139 /* while we were busy we have been cancelled, so terminate */ 2338 /* while we were busy we have been cancelled, so terminate */
2140 slf_init_terminate_cancel_common (frame, self->hv); 2339 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2141 } 2340 }
2142 else 2341 else
2143 { 2342 {
2144 frame->prepare = prepare_nop; 2343 frame->prepare = prepare_nop;
2145 frame->check = slf_check_nop; 2344 frame->check = slf_check_nop;
2146 } 2345 }
2147 } 2346 }
2148} 2347}
2149 2348
2349static int
2350slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2351{
2352 frame->prepare = 0;
2353 coro_unwind_stacks (aTHX);
2354
2355 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2356
2357 return 1;
2358}
2359
2360static int
2361safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2362{
2363 if (coro->cctx)
2364 croak ("coro inside C callback, unable to cancel at this time, caught");
2365
2366 if (coro->flags & CF_NEW)
2367 {
2368 coro_set_status (aTHX_ coro, arg, items);
2369 coro_state_destroy (aTHX_ coro);
2370 }
2371 else
2372 {
2373 if (!coro->slf_frame.prepare)
2374 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2375
2376 slf_destroy (aTHX_ coro);
2377
2378 coro_set_status (aTHX_ coro, arg, items);
2379 coro->slf_frame.prepare = prepare_nop;
2380 coro->slf_frame.check = slf_check_safe_cancel;
2381
2382 api_ready (aTHX_ (SV *)coro->hv);
2383 }
2384
2385 return 1;
2386}
2387
2150/*****************************************************************************/ 2388/*****************************************************************************/
2151/* async pool handler */ 2389/* async pool handler */
2152 2390
2153static int 2391static int
2154slf_check_pool_handler (pTHX_ struct CoroSLF *frame) 2392slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
… …
2183slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2421slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2184{ 2422{
2185 HV *hv = (HV *)SvRV (coro_current); 2423 HV *hv = (HV *)SvRV (coro_current);
2186 struct coro *coro = SvSTATE_hv ((SV *)hv); 2424 struct coro *coro = SvSTATE_hv ((SV *)hv);
2187 2425
2188 if (expect_true (coro->saved_deffh)) 2426 if (ecb_expect_true (coro->saved_deffh))
2189 { 2427 {
2190 /* subsequent iteration */ 2428 /* subsequent iteration */
2191 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2429 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2192 coro->saved_deffh = 0; 2430 coro->saved_deffh = 0;
2193 2431
2194 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2432 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2195 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2433 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2196 { 2434 {
2197 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2435 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2198 coro->invoke_av = newAV (); 2436 return;
2199
2200 frame->prepare = prepare_nop;
2201 } 2437 }
2202 else 2438 else
2203 { 2439 {
2204 av_clear (GvAV (PL_defgv)); 2440 av_clear (GvAV (PL_defgv));
2205 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2441 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2206 2442
2443 if (ecb_expect_false (coro->swap_sv))
2444 {
2445 swap_svs_leave (coro);
2446 SvREFCNT_dec_NN (coro->swap_sv);
2447 coro->swap_sv = 0;
2448 }
2449
2207 coro->prio = 0; 2450 coro->prio = 0;
2208 2451
2209 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2452 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2210 api_trace (aTHX_ coro_current, 0); 2453 api_trace (aTHX_ coro_current, 0);
2211 2454
2212 frame->prepare = prepare_schedule; 2455 frame->prepare = prepare_schedule;
2213 av_push (av_async_pool, SvREFCNT_inc (hv)); 2456 av_push (av_async_pool, SvREFCNT_inc (hv));
2214 } 2457 }
… …
2255 2498
2256static int 2499static int
2257slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2500slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2258{ 2501{
2259 SV *data = (SV *)frame->data; 2502 SV *data = (SV *)frame->data;
2260 2503
2261 if (CORO_THROW) 2504 if (CORO_THROW)
2262 return 0; 2505 return 0;
2263 2506
2264 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2507 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2265 return 1; 2508 return 1;
… …
2301 cb = sv_2mortal (coro->rouse_cb); 2544 cb = sv_2mortal (coro->rouse_cb);
2302 coro->rouse_cb = 0; 2545 coro->rouse_cb = 0;
2303 } 2546 }
2304 2547
2305 if (!SvROK (cb) 2548 if (!SvROK (cb)
2306 || SvTYPE (SvRV (cb)) != SVt_PVCV 2549 || SvTYPE (SvRV (cb)) != SVt_PVCV
2307 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2550 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2308 croak ("Coro::rouse_wait called with illegal callback argument,"); 2551 croak ("Coro::rouse_wait called with illegal callback argument,");
2309 2552
2310 { 2553 {
2311 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2554 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2428static void 2671static void
2429slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2672slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2430{ 2673{
2431 frame->prepare = prepare_cede_notself; 2674 frame->prepare = prepare_cede_notself;
2432 frame->check = slf_check_nop; 2675 frame->check = slf_check_nop;
2676}
2677
2678/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2679static void
2680slf_destroy (pTHX_ struct coro *coro)
2681{
2682 struct CoroSLF frame = coro->slf_frame;
2683
2684 /*
2685 * The on_destroy below most likely is from an SLF call.
2686 * Since by definition the SLF call will not finish when we destroy
2687 * the coro, we will have to force-finish it here, otherwise
2688 * cleanup functions cannot call SLF functions.
2689 */
2690 coro->slf_frame.prepare = 0;
2691
2692 /* this callback is reserved for slf functions needing to do cleanup */
2693 if (frame.destroy && frame.prepare && !PL_dirty)
2694 frame.destroy (aTHX_ &frame);
2433} 2695}
2434 2696
2435/* 2697/*
2436 * these not obviously related functions are all rolled into one 2698 * these not obviously related functions are all rolled into one
2437 * function to increase chances that they all will call transfer with the same 2699 * function to increase chances that they all will call transfer with the same
… …
2444 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2706 I32 checkmark; /* mark SP to see how many elements check has pushed */
2445 2707
2446 /* set up the slf frame, unless it has already been set-up */ 2708 /* set up the slf frame, unless it has already been set-up */
2447 /* the latter happens when a new coro has been started */ 2709 /* the latter happens when a new coro has been started */
2448 /* or when a new cctx was attached to an existing coroutine */ 2710 /* or when a new cctx was attached to an existing coroutine */
2449 if (expect_true (!slf_frame.prepare)) 2711 if (ecb_expect_true (!slf_frame.prepare))
2450 { 2712 {
2451 /* first iteration */ 2713 /* first iteration */
2452 dSP; 2714 dSP;
2453 SV **arg = PL_stack_base + TOPMARK + 1; 2715 SV **arg = PL_stack_base + TOPMARK + 1;
2454 int items = SP - arg; /* args without function object */ 2716 int items = SP - arg; /* args without function object */
… …
2495 while (slf_frame.check (aTHX_ &slf_frame)); 2757 while (slf_frame.check (aTHX_ &slf_frame));
2496 2758
2497 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2759 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2498 2760
2499 /* exception handling */ 2761 /* exception handling */
2500 if (expect_false (CORO_THROW)) 2762 if (ecb_expect_false (CORO_THROW))
2501 { 2763 {
2502 SV *exception = sv_2mortal (CORO_THROW); 2764 SV *exception = sv_2mortal (CORO_THROW);
2503 2765
2504 CORO_THROW = 0; 2766 CORO_THROW = 0;
2505 sv_setsv (ERRSV, exception); 2767 sv_setsv (ERRSV, exception);
2506 croak (0); 2768 croak (0);
2507 } 2769 }
2508 2770
2509 /* return value handling - mostly like entersub */ 2771 /* return value handling - mostly like entersub */
2510 /* make sure we put something on the stack in scalar context */ 2772 /* make sure we put something on the stack in scalar context */
2511 if (GIMME_V == G_SCALAR) 2773 if (GIMME_V == G_SCALAR
2774 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2512 { 2775 {
2513 dSP; 2776 dSP;
2514 SV **bot = PL_stack_base + checkmark; 2777 SV **bot = PL_stack_base + checkmark;
2515 2778
2516 if (sp == bot) /* too few, push undef */ 2779 if (sp == bot) /* too few, push undef */
2517 bot [1] = &PL_sv_undef; 2780 bot [1] = &PL_sv_undef;
2518 else if (sp != bot + 1) /* too many, take last one */ 2781 else /* too many, take last one */
2519 bot [1] = *sp; 2782 bot [1] = *sp;
2520 2783
2521 SP = bot + 1; 2784 SP = bot + 1;
2522 2785
2523 PUTBACK; 2786 PUTBACK;
… …
2621{ 2884{
2622 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2885 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2623 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2886 on_enterleave_call (aTHX_ sv_2mortal (cb));
2624} 2887}
2625 2888
2889static void
2890enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2891{
2892 if (!hook)
2893 return;
2894
2895 if (!*avp)
2896 {
2897 *avp = newAV ();
2898 AvREAL_off (*avp);
2899 }
2900
2901 av_push (*avp, (SV *)hook);
2902 av_push (*avp, (SV *)arg);
2903}
2904
2905static void
2906enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2907{
2908 AV *av = *avp;
2909 int i;
2910
2911 if (!av)
2912 return;
2913
2914 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2915 if (AvARRAY (av)[i] == (SV *)hook)
2916 {
2917 if (execute)
2918 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2919
2920 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2921 av_pop (av);
2922 av_pop (av);
2923 break;
2924 }
2925
2926 if (AvFILLp (av) >= 0)
2927 {
2928 *avp = 0;
2929 SvREFCNT_dec_NN (av);
2930 }
2931}
2932
2933static void
2934api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2935{
2936 struct coro *coro = SvSTATE (coro_sv);
2937
2938 if (SvSTATE_current == coro)
2939 if (enter)
2940 enter (aTHX_ enter_arg);
2941
2942 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2943 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2944}
2945
2946static void
2947api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2948{
2949 struct coro *coro = SvSTATE (coro_sv);
2950
2951 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2952 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2953}
2954
2955static void
2956savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2957{
2958 struct coro *coro = SvSTATE_current;
2959
2960 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2961}
2962
2963static void
2964savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2965{
2966 struct coro *coro = SvSTATE_current;
2967
2968 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2969}
2970
2971static void
2972api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2973{
2974 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2975
2976 /* this ought to be much cheaper than malloc + a single destructor call */
2977 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2978 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2979}
2980
2626/*****************************************************************************/ 2981/*****************************************************************************/
2627/* PerlIO::cede */ 2982/* PerlIO::cede */
2628 2983
2629typedef struct 2984typedef struct
2630{ 2985{
2631 PerlIOBuf base; 2986 PerlIOBuf base;
2632 NV next, every; 2987 NV next, every;
2633} PerlIOCede; 2988} PerlIOCede;
2634 2989
2635static IV 2990static IV ecb_cold
2636PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2991PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2637{ 2992{
2638 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2993 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2639 2994
2640 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2995 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2641 self->next = nvtime () + self->every; 2996 self->next = nvtime () + self->every;
2642 2997
2643 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2998 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2644} 2999}
2645 3000
2646static SV * 3001static SV * ecb_cold
2647PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3002PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2648{ 3003{
2649 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3004 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2650 3005
2651 return newSVnv (self->every); 3006 return newSVnv (self->every);
… …
2758 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3113 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2759 PUTBACK; 3114 PUTBACK;
2760 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3115 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2761 } 3116 }
2762 3117
2763 SvREFCNT_dec (cb); 3118 SvREFCNT_dec_NN (cb);
2764 } 3119 }
2765} 3120}
2766 3121
2767static void 3122static void
2768coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3123coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2769{ 3124{
2770 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3125 /* call $sem->adjust (0) to possibly wake up some other waiters */
2771 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3126 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2772} 3127}
2773 3128
2774static int 3129static int
2775slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3130slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2776{ 3131{
2777 AV *av = (AV *)frame->data; 3132 AV *av = (AV *)frame->data;
2778 SV *count_sv = AvARRAY (av)[0]; 3133 SV *count_sv = AvARRAY (av)[0];
3134 SV *coro_hv = SvRV (coro_current);
3135
3136 frame->destroy = 0;
2779 3137
2780 /* if we are about to throw, don't actually acquire the lock, just throw */ 3138 /* if we are about to throw, don't actually acquire the lock, just throw */
2781 if (CORO_THROW) 3139 if (ecb_expect_false (CORO_THROW))
3140 {
3141 /* we still might be responsible for the semaphore, so wake up others */
3142 coro_semaphore_adjust (aTHX_ av, 0);
3143
2782 return 0; 3144 return 0;
3145 }
2783 else if (SvIVX (count_sv) > 0) 3146 else if (SvIVX (count_sv) > 0)
2784 { 3147 {
2785 SvSTATE_current->on_destroy = 0;
2786
2787 if (acquire) 3148 if (acquire)
2788 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3149 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2789 else 3150 else
2790 coro_semaphore_adjust (aTHX_ av, 0); 3151 coro_semaphore_adjust (aTHX_ av, 0);
2791 3152
… …
2795 { 3156 {
2796 int i; 3157 int i;
2797 /* if we were woken up but can't down, we look through the whole */ 3158 /* if we were woken up but can't down, we look through the whole */
2798 /* waiters list and only add us if we aren't in there already */ 3159 /* waiters list and only add us if we aren't in there already */
2799 /* this avoids some degenerate memory usage cases */ 3160 /* this avoids some degenerate memory usage cases */
2800 3161 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2801 for (i = 1; i <= AvFILLp (av); ++i)
2802 if (AvARRAY (av)[i] == SvRV (coro_current)) 3162 if (AvARRAY (av)[i] == coro_hv)
2803 return 1; 3163 return 1;
2804 3164
2805 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3165 av_push (av, SvREFCNT_inc (coro_hv));
2806 return 1; 3166 return 1;
2807 } 3167 }
2808} 3168}
2809 3169
2810static int 3170static int
… …
2833 { 3193 {
2834 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3194 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2835 3195
2836 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3196 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2837 frame->prepare = prepare_schedule; 3197 frame->prepare = prepare_schedule;
2838
2839 /* to avoid race conditions when a woken-up coro gets terminated */ 3198 /* to avoid race conditions when a woken-up coro gets terminated */
2840 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3199 /* we arrange for a temporary on_destroy that calls adjust (0) */
2841 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3200 frame->destroy = coro_semaphore_destroy;
2842 } 3201 }
2843} 3202}
2844 3203
2845static void 3204static void
2846slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3205slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2904 { 3263 {
2905 api_ready (aTHX_ cb); 3264 api_ready (aTHX_ cb);
2906 sv_setiv (cb, 0); /* signal waiter */ 3265 sv_setiv (cb, 0); /* signal waiter */
2907 } 3266 }
2908 3267
2909 SvREFCNT_dec (cb); 3268 SvREFCNT_dec_NN (cb);
2910 3269
2911 --count; 3270 --count;
2912 } 3271 }
2913} 3272}
2914 3273
… …
2999 } 3358 }
3000 3359
3001 av_push (state, data_sv); 3360 av_push (state, data_sv);
3002 3361
3003 api_ready (aTHX_ coro); 3362 api_ready (aTHX_ coro);
3004 SvREFCNT_dec (coro); 3363 SvREFCNT_dec_NN (coro);
3005 SvREFCNT_dec ((AV *)state); 3364 SvREFCNT_dec_NN ((AV *)state);
3006} 3365}
3007 3366
3008static int 3367static int
3009slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3368slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3010{ 3369{
… …
3015 /* it quickly returns */ 3374 /* it quickly returns */
3016 if (CORO_THROW) 3375 if (CORO_THROW)
3017 return 0; 3376 return 0;
3018 3377
3019 /* one element that is an RV? repeat! */ 3378 /* one element that is an RV? repeat! */
3020 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3379 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3021 return 1; 3380 return 1;
3022 3381
3023 /* restore status */ 3382 /* restore status */
3024 { 3383 {
3025 SV *data_sv = av_pop (state); 3384 SV *data_sv = av_pop (state);
… …
3028 errno = data->errorno; 3387 errno = data->errorno;
3029 PL_laststype = data->laststype; 3388 PL_laststype = data->laststype;
3030 PL_laststatval = data->laststatval; 3389 PL_laststatval = data->laststatval;
3031 PL_statcache = data->statcache; 3390 PL_statcache = data->statcache;
3032 3391
3033 SvREFCNT_dec (data_sv); 3392 SvREFCNT_dec_NN (data_sv);
3034 } 3393 }
3035 3394
3036 /* push result values */ 3395 /* push result values */
3037 { 3396 {
3038 dSP; 3397 dSP;
… …
3064 dSP; 3423 dSP;
3065 3424
3066 static SV *prio_cv; 3425 static SV *prio_cv;
3067 static SV *prio_sv; 3426 static SV *prio_sv;
3068 3427
3069 if (expect_false (!prio_cv)) 3428 if (ecb_expect_false (!prio_cv))
3070 { 3429 {
3071 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3430 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3072 prio_sv = newSViv (0); 3431 prio_sv = newSViv (0);
3073 } 3432 }
3074 3433
… …
3180 } 3539 }
3181 3540
3182 return coro_sv; 3541 return coro_sv;
3183} 3542}
3184 3543
3544#ifndef __cplusplus
3545ecb_cold XS(boot_Coro__State);
3546#endif
3547
3548#if CORO_JIT
3549
3550static void ecb_noinline ecb_cold
3551pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3552{
3553 dSP;
3554 AV *av = newAV ();
3555
3556 av_store (av, 3, newSVuv (d));
3557 av_store (av, 2, newSVuv (c));
3558 av_store (av, 1, newSVuv (b));
3559 av_store (av, 0, newSVuv (a));
3560
3561 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3562
3563 PUTBACK;
3564}
3565
3566static void ecb_noinline ecb_cold
3567jit_init (pTHX)
3568{
3569 dSP;
3570 SV *load, *save;
3571 char *map_base;
3572 char *load_ptr, *save_ptr;
3573 STRLEN load_len, save_len, map_len;
3574 int count;
3575
3576 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3577
3578 PUSHMARK (SP);
3579 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3580 #include "state.h"
3581 count = call_pv ("Coro::State::_jit", G_ARRAY);
3582 SPAGAIN;
3583
3584 save = POPs; save_ptr = SvPVbyte (save, save_len);
3585 load = POPs; load_ptr = SvPVbyte (load, load_len);
3586
3587 map_len = load_len + save_len + 16;
3588
3589 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3590
3591 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3592
3593 load_perl_slots = (load_save_perl_slots_type)map_base;
3594 memcpy (map_base, load_ptr, load_len);
3595
3596 map_base += (load_len + 15) & ~15;
3597
3598 save_perl_slots = (load_save_perl_slots_type)map_base;
3599 memcpy (map_base, save_ptr, save_len);
3600
3601 /* we are good citizens and try to make the page read-only, so the evil evil */
3602 /* hackers might have it a bit more difficult */
3603 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3604
3605 PUTBACK;
3606 eval_pv ("undef &Coro::State::_jit", 1);
3607}
3608
3609#endif
3610
3185MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3611MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3186 3612
3187PROTOTYPES: DISABLE 3613PROTOTYPES: DISABLE
3188 3614
3189BOOT: 3615BOOT:
3190{ 3616{
3617#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3618#include "state.h"
3191#ifdef USE_ITHREADS 3619#ifdef USE_ITHREADS
3192# if CORO_PTHREAD 3620# if CORO_PTHREAD
3193 coro_thx = PERL_GET_CONTEXT; 3621 coro_thx = PERL_GET_CONTEXT;
3194# endif 3622# endif
3195#endif 3623#endif
3196 BOOT_PAGESIZE; 3624 /* perl defines these to check for existance first, but why it doesn't */
3625 /* just create them one at init time is not clear to me, except for */
3626 /* programs trying to delete them, but... */
3627 /* anyway, we declare this as invalid and make sure they are initialised here */
3628 DEFSV;
3629 ERRSV;
3197 3630
3198 cctx_current = cctx_new_empty (); 3631 cctx_current = cctx_new_empty ();
3199 3632
3200 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3633 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3201 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3634 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3202 3635
3203 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3636 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
3204 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3637 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
3205 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3638 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3206 3639
3207 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3208 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3640 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3209 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3641 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3210 3642
3211 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3643 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3212 3644
… …
3244 coroapi.prepare_cede_notself = prepare_cede_notself; 3676 coroapi.prepare_cede_notself = prepare_cede_notself;
3245 3677
3246 time_init (aTHX); 3678 time_init (aTHX);
3247 3679
3248 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3680 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3681#if CORO_JIT
3682 PUTBACK;
3683 jit_init (aTHX);
3684 SPAGAIN;
3685#endif
3249} 3686}
3250 3687
3251SV * 3688SV *
3252new (SV *klass, ...) 3689new (SV *klass, ...)
3253 ALIAS: 3690 ALIAS:
… …
3260void 3697void
3261transfer (...) 3698transfer (...)
3262 PROTOTYPE: $$ 3699 PROTOTYPE: $$
3263 CODE: 3700 CODE:
3264 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3701 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3265
3266void
3267_exit (int code)
3268 PROTOTYPE: $
3269 CODE:
3270 _exit (code);
3271 3702
3272SV * 3703SV *
3273clone (Coro::State coro) 3704clone (Coro::State coro)
3274 CODE: 3705 CODE:
3275{ 3706{
… …
3330void 3761void
3331list () 3762list ()
3332 PROTOTYPE: 3763 PROTOTYPE:
3333 PPCODE: 3764 PPCODE:
3334{ 3765{
3335 struct coro *coro; 3766 struct coro *coro;
3336 for (coro = coro_first; coro; coro = coro->next) 3767 for (coro = coro_first; coro; coro = coro->next)
3337 if (coro->hv) 3768 if (coro->hv)
3338 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3769 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3339} 3770}
3340 3771
… …
3395 PROTOTYPE: $ 3826 PROTOTYPE: $
3396 ALIAS: 3827 ALIAS:
3397 is_ready = CF_READY 3828 is_ready = CF_READY
3398 is_running = CF_RUNNING 3829 is_running = CF_RUNNING
3399 is_new = CF_NEW 3830 is_new = CF_NEW
3400 is_destroyed = CF_DESTROYED 3831 is_destroyed = CF_ZOMBIE
3832 is_zombie = CF_ZOMBIE
3401 is_suspended = CF_SUSPENDED 3833 is_suspended = CF_SUSPENDED
3402 CODE: 3834 CODE:
3403 RETVAL = boolSV (coro->flags & ix); 3835 RETVAL = boolSV (coro->flags & ix);
3404 OUTPUT: 3836 OUTPUT:
3405 RETVAL 3837 RETVAL
3406 3838
3407void 3839void
3408throw (Coro::State self, SV *exception = &PL_sv_undef) 3840throw (SV *self, SV *exception = &PL_sv_undef)
3409 PROTOTYPE: $;$ 3841 PROTOTYPE: $;$
3410 CODE: 3842 CODE:
3411{ 3843{
3844 struct coro *coro = SvSTATE (self);
3412 struct coro *current = SvSTATE_current; 3845 struct coro *current = SvSTATE_current;
3413 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3846 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3414 SvREFCNT_dec (*exceptionp); 3847 SvREFCNT_dec (*exceptionp);
3415 SvGETMAGIC (exception); 3848 SvGETMAGIC (exception);
3416 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3849 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3850
3851 api_ready (aTHX_ self);
3417} 3852}
3418 3853
3419void 3854void
3420api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3855api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3421 PROTOTYPE: $;$ 3856 PROTOTYPE: $;$
… …
3498 3933
3499void 3934void
3500times (Coro::State self) 3935times (Coro::State self)
3501 PPCODE: 3936 PPCODE:
3502{ 3937{
3503 struct coro *current = SvSTATE (coro_current); 3938 struct coro *current = SvSTATE (coro_current);
3504 3939
3505 if (expect_false (current == self)) 3940 if (ecb_expect_false (current == self))
3506 { 3941 {
3507 coro_times_update (); 3942 coro_times_update ();
3508 coro_times_add (SvSTATE (coro_current)); 3943 coro_times_add (SvSTATE (coro_current));
3509 } 3944 }
3510 3945
3511 EXTEND (SP, 2); 3946 EXTEND (SP, 2);
3512 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3947 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3513 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3948 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3514 3949
3515 if (expect_false (current == self)) 3950 if (ecb_expect_false (current == self))
3516 coro_times_sub (SvSTATE (coro_current)); 3951 coro_times_sub (SvSTATE (coro_current));
3517} 3952}
3518 3953
3519void 3954void
3520swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3955swap_sv (Coro::State coro, SV *sva, SV *svb)
3521 CODE: 3956 CODE:
3522{ 3957{
3523 struct coro *current = SvSTATE_current; 3958 struct coro *current = SvSTATE_current;
3959 AV *swap_sv;
3960 int i;
3961
3962 sva = SvRV (sva);
3963 svb = SvRV (svb);
3524 3964
3525 if (current == coro) 3965 if (current == coro)
3526 SWAP_SVS (current); 3966 SWAP_SVS_LEAVE (current);
3527 3967
3528 if (!coro->swap_sv) 3968 if (!coro->swap_sv)
3529 coro->swap_sv = newAV (); 3969 coro->swap_sv = newAV ();
3530 3970
3971 swap_sv = coro->swap_sv;
3972
3973 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3974 {
3975 SV *a = AvARRAY (swap_sv)[i ];
3976 SV *b = AvARRAY (swap_sv)[i + 1];
3977
3978 if (a == sva && b == svb)
3979 {
3980 SvREFCNT_dec_NN (a);
3981 SvREFCNT_dec_NN (b);
3982
3983 for (; i <= AvFILLp (swap_sv) - 2; i++)
3984 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
3985
3986 AvFILLp (swap_sv) -= 2;
3987
3988 goto removed;
3989 }
3990 }
3991
3531 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 3992 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3532 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 3993 av_push (swap_sv, SvREFCNT_inc_NN (svb));
3994
3995 removed:
3533 3996
3534 if (current == coro) 3997 if (current == coro)
3535 SWAP_SVS (current); 3998 SWAP_SVS_ENTER (current);
3536} 3999}
3537 4000
3538 4001
3539MODULE = Coro::State PACKAGE = Coro 4002MODULE = Coro::State PACKAGE = Coro
3540 4003
3541BOOT: 4004BOOT:
3542{ 4005{
4006 if (SVt_LAST > 32)
4007 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4008
3543 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4009 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3544 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4010 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3545 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4011 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3546 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3547 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4012 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3548 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4013 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3549 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4014 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3550 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4015 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3551 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4016 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3552 4017
3553 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4018 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3554 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4019 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3555 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4020 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3556 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 4021 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3557 4022
3558 coro_stash = gv_stashpv ("Coro", TRUE); 4023 coro_stash = gv_stashpv ("Coro", TRUE);
3559 4024
3560 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4025 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3561 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4026 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3562 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4027 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3574 coroapi.ready = api_ready; 4039 coroapi.ready = api_ready;
3575 coroapi.is_ready = api_is_ready; 4040 coroapi.is_ready = api_is_ready;
3576 coroapi.nready = coro_nready; 4041 coroapi.nready = coro_nready;
3577 coroapi.current = coro_current; 4042 coroapi.current = coro_current;
3578 4043
4044 coroapi.enterleave_hook = api_enterleave_hook;
4045 coroapi.enterleave_unhook = api_enterleave_unhook;
4046 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4047
3579 /*GCoroAPI = &coroapi;*/ 4048 /*GCoroAPI = &coroapi;*/
3580 sv_setiv (sv, (IV)&coroapi); 4049 sv_setiv (sv, (IV)&coroapi);
3581 SvREADONLY_on (sv); 4050 SvREADONLY_on (sv);
3582 } 4051 }
3583} 4052}
… …
3594void 4063void
3595_destroy (Coro::State coro) 4064_destroy (Coro::State coro)
3596 CODE: 4065 CODE:
3597 /* used by the manager thread */ 4066 /* used by the manager thread */
3598 coro_state_destroy (aTHX_ coro); 4067 coro_state_destroy (aTHX_ coro);
4068
4069void
4070on_destroy (Coro::State coro, SV *cb)
4071 CODE:
3599 coro_call_on_destroy (aTHX_ coro); 4072 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4073
4074void
4075join (...)
4076 CODE:
4077 CORO_EXECUTE_SLF_XS (slf_init_join);
3600 4078
3601void 4079void
3602terminate (...) 4080terminate (...)
3603 CODE: 4081 CODE:
3604 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4082 CORO_EXECUTE_SLF_XS (slf_init_terminate);
… …
3606void 4084void
3607cancel (...) 4085cancel (...)
3608 CODE: 4086 CODE:
3609 CORO_EXECUTE_SLF_XS (slf_init_cancel); 4087 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3610 4088
4089int
4090safe_cancel (Coro::State self, ...)
4091 C_ARGS: aTHX_ self, &ST (1), items - 1
4092
3611void 4093void
3612schedule (...) 4094schedule (...)
3613 CODE: 4095 CODE:
3614 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4096 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3615 4097
… …
3635 4117
3636void 4118void
3637_set_current (SV *current) 4119_set_current (SV *current)
3638 PROTOTYPE: $ 4120 PROTOTYPE: $
3639 CODE: 4121 CODE:
3640 SvREFCNT_dec (SvRV (coro_current)); 4122 SvREFCNT_dec_NN (SvRV (coro_current));
3641 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4123 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3642 4124
3643void 4125void
3644_set_readyhook (SV *hook) 4126_set_readyhook (SV *hook)
3645 PROTOTYPE: $ 4127 PROTOTYPE: $
… …
3729 4211
3730 if ((SV *)hv == &PL_sv_undef) 4212 if ((SV *)hv == &PL_sv_undef)
3731 { 4213 {
3732 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4214 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3733 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4215 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3734 SvREFCNT_dec (sv); 4216 SvREFCNT_dec_NN (sv);
3735 } 4217 }
3736 4218
3737 { 4219 {
3738 struct coro *coro = SvSTATE_hv (hv); 4220 struct coro *coro = SvSTATE_hv (hv);
3739 4221
… …
3746 api_ready (aTHX_ (SV *)hv); 4228 api_ready (aTHX_ (SV *)hv);
3747 4229
3748 if (GIMME_V != G_VOID) 4230 if (GIMME_V != G_VOID)
3749 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4231 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3750 else 4232 else
3751 SvREFCNT_dec (hv); 4233 SvREFCNT_dec_NN (hv);
3752} 4234}
3753 4235
3754SV * 4236SV *
3755rouse_cb () 4237rouse_cb ()
3756 PROTOTYPE: 4238 PROTOTYPE:
… …
3771 on_leave = 1 4253 on_leave = 1
3772 PROTOTYPE: & 4254 PROTOTYPE: &
3773 CODE: 4255 CODE:
3774{ 4256{
3775 struct coro *coro = SvSTATE_current; 4257 struct coro *coro = SvSTATE_current;
3776 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4258 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3777 4259
3778 block = s_get_cv_croak (block); 4260 block = s_get_cv_croak (block);
3779 4261
3780 if (!*avp) 4262 if (!*avp)
3781 *avp = newAV (); 4263 *avp = newAV ();
… …
3801 4283
3802SV * 4284SV *
3803new (SV *klass, SV *count = 0) 4285new (SV *klass, SV *count = 0)
3804 CODE: 4286 CODE:
3805{ 4287{
3806 int semcnt = 1; 4288 int semcnt = 1;
3807 4289
3808 if (count) 4290 if (count)
3809 { 4291 {
3810 SvGETMAGIC (count); 4292 SvGETMAGIC (count);
3811 4293
… …
3835 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4317 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3836 OUTPUT: 4318 OUTPUT:
3837 RETVAL 4319 RETVAL
3838 4320
3839void 4321void
3840up (SV *self, int adjust = 1) 4322up (SV *self)
3841 ALIAS:
3842 adjust = 1
3843 CODE: 4323 CODE:
4324 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4325
4326void
4327adjust (SV *self, int adjust)
4328 CODE:
3844 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4329 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3845 4330
3846void 4331void
3847down (...) 4332down (...)
3848 CODE: 4333 CODE:
3849 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4334 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3871 XSRETURN_NO; 4356 XSRETURN_NO;
3872} 4357}
3873 4358
3874void 4359void
3875waiters (SV *self) 4360waiters (SV *self)
3876 PPCODE: 4361 PPCODE:
3877{ 4362{
3878 AV *av = (AV *)SvRV (self); 4363 AV *av = (AV *)SvRV (self);
3879 int wcount = AvFILLp (av) + 1 - 1; 4364 int wcount = AvFILLp (av) + 1 - 1;
3880 4365
3881 if (GIMME_V == G_SCALAR) 4366 if (GIMME_V == G_SCALAR)
… …
3890} 4375}
3891 4376
3892MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4377MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3893 4378
3894void 4379void
3895_may_delete (SV *sem, int count, int extra_refs) 4380_may_delete (SV *sem, int count, unsigned int extra_refs)
3896 PPCODE: 4381 PPCODE:
3897{ 4382{
3898 AV *av = (AV *)SvRV (sem); 4383 AV *av = (AV *)SvRV (sem);
3899 4384
3900 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4385 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3901 && AvFILLp (av) == 0 /* no waiters, just count */ 4386 && AvFILLp (av) == 0 /* no waiters, just count */
3902 && SvIV (AvARRAY (av)[0]) == count) 4387 && SvIV (AvARRAY (av)[0]) == count)
3903 XSRETURN_YES; 4388 XSRETURN_YES;
… …
3924 4409
3925void 4410void
3926broadcast (SV *self) 4411broadcast (SV *self)
3927 CODE: 4412 CODE:
3928{ 4413{
3929 AV *av = (AV *)SvRV (self); 4414 AV *av = (AV *)SvRV (self);
3930 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4415 coro_signal_wake (aTHX_ av, AvFILLp (av));
3931} 4416}
3932 4417
3933void 4418void
3934send (SV *self) 4419send (SV *self)
… …
3942 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4427 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3943} 4428}
3944 4429
3945IV 4430IV
3946awaited (SV *self) 4431awaited (SV *self)
3947 CODE: 4432 CODE:
3948 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4433 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3949 OUTPUT: 4434 OUTPUT:
3950 RETVAL 4435 RETVAL
3951 4436
3952 4437
… …
3957 4442
3958void 4443void
3959_schedule (...) 4444_schedule (...)
3960 CODE: 4445 CODE:
3961{ 4446{
3962 static int incede; 4447 static int incede;
3963 4448
3964 api_cede_notself (aTHX); 4449 api_cede_notself (aTHX);
3965 4450
3966 ++incede; 4451 ++incede;
3967 while (coro_nready >= incede && api_cede (aTHX)) 4452 while (coro_nready >= incede && api_cede (aTHX))
… …
4011 { 4496 {
4012 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4497 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4013 coro_old_pp_sselect = 0; 4498 coro_old_pp_sselect = 0;
4014 } 4499 }
4015 4500
4501MODULE = Coro::State PACKAGE = Coro::Util
4502
4503void
4504_exit (int code)
4505 CODE:
4506 _exit (code);
4507
4508NV
4509time ()
4510 CODE:
4511 RETVAL = nvtime (aTHX);
4512 OUTPUT:
4513 RETVAL
4514
4515NV
4516gettimeofday ()
4517 PPCODE:
4518{
4519 UV tv [2];
4520 u2time (aTHX_ tv);
4521 EXTEND (SP, 2);
4522 PUSHs (sv_2mortal (newSVuv (tv [0])));
4523 PUSHs (sv_2mortal (newSVuv (tv [1])));
4524}
4525

Diff Legend

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