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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.393 by root, Fri Apr 29 17:38:56 2011 UTC vs.
Revision 1.460 by root, Fri Jun 17 05:28:22 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;
872 968
… …
900 } 996 }
901 997
902 Safefree (PL_tmps_stack); 998 Safefree (PL_tmps_stack);
903 Safefree (PL_markstack); 999 Safefree (PL_markstack);
904 Safefree (PL_scopestack); 1000 Safefree (PL_scopestack);
1001#if HAS_SCOPESTACK_NAME
1002 Safefree (PL_scopestack_name);
1003#endif
905 Safefree (PL_savestack); 1004 Safefree (PL_savestack);
906#if !PERL_VERSION_ATLEAST (5,10,0) 1005#if !PERL_VERSION_ATLEAST (5,10,0)
907 Safefree (PL_retstack); 1006 Safefree (PL_retstack);
908#endif 1007#endif
909} 1008}
… …
955#endif 1054#endif
956 1055
957/* 1056/*
958 * This overrides the default magic get method of %SIG elements. 1057 * 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 1058 * 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 1059 * and instead of trying to save and restore the hash elements (extremely slow),
961 * readback here. 1060 * we just provide our own readback here.
962 */ 1061 */
963static int 1062static int ecb_cold
964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1063coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
965{ 1064{
966 const char *s = MgPV_nolen_const (mg); 1065 const char *s = MgPV_nolen_const (mg);
967 1066
968 if (*s == '_') 1067 if (*s == '_')
969 { 1068 {
970 SV **svp = 0; 1069 SV **svp = 0;
971 1070
972 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1071 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
973 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1072 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
974 1073
975 if (svp) 1074 if (svp)
976 { 1075 {
977 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1076 SV *ssv;
1077
1078 if (!*svp)
1079 ssv = &PL_sv_undef;
1080 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1081 ssv = sv_2mortal (newRV_inc (*svp));
1082 else
1083 ssv = *svp;
1084
1085 sv_setsv (sv, ssv);
978 return 0; 1086 return 0;
979 } 1087 }
980 } 1088 }
981 1089
982 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1090 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
983} 1091}
984 1092
985static int 1093static int ecb_cold
986coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1094coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
987{ 1095{
988 const char *s = MgPV_nolen_const (mg); 1096 const char *s = MgPV_nolen_const (mg);
989 1097
990 if (*s == '_') 1098 if (*s == '_')
… …
1004 } 1112 }
1005 1113
1006 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1114 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1007} 1115}
1008 1116
1009static int 1117static int ecb_cold
1010coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1118coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1011{ 1119{
1012 const char *s = MgPV_nolen_const (mg); 1120 const char *s = MgPV_nolen_const (mg);
1013 1121
1014 if (*s == '_') 1122 if (*s == '_')
… …
1049 return 1; 1157 return 1;
1050} 1158}
1051 1159
1052static UNOP init_perl_op; 1160static UNOP init_perl_op;
1053 1161
1054static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1162ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1055init_perl (pTHX_ struct coro *coro) 1163init_perl (pTHX_ struct coro *coro)
1056{ 1164{
1057 /* 1165 /*
1058 * emulate part of the perl startup here. 1166 * emulate part of the perl startup here.
1059 */ 1167 */
… …
1074 PL_parser = 0; 1182 PL_parser = 0;
1075#endif 1183#endif
1076 PL_hints = 0; 1184 PL_hints = 0;
1077 1185
1078 /* recreate the die/warn hooks */ 1186 /* recreate the die/warn hooks */
1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1187 PL_diehook = SvREFCNT_inc (rv_diehook);
1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1188 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1081 1189
1082 GvSV (PL_defgv) = newSV (0); 1190 GvSV (PL_defgv) = newSV (0);
1083 GvAV (PL_defgv) = coro->args; coro->args = 0; 1191 GvAV (PL_defgv) = coro->args; coro->args = 0;
1084 GvSV (PL_errgv) = newSV (0); 1192 GvSV (PL_errgv) = newSV (0);
1085 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1193 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1086 GvHV (PL_hintgv) = 0; 1194 GvHV (PL_hintgv) = newHV ();
1195#if PERL_VERSION_ATLEAST (5,10,0)
1196 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1197#endif
1087 PL_rs = newSVsv (GvSV (irsgv)); 1198 PL_rs = newSVsv (GvSV (irsgv));
1088 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1199 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1089 1200
1090 { 1201 {
1091 dSP; 1202 dSP;
… …
1106 /* this newly created coroutine might be run on an existing cctx which most 1217 /* this newly created coroutine might be run on an existing cctx which most
1107 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1218 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1108 */ 1219 */
1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1220 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1110 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1221 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1222 slf_frame.destroy = 0;
1111 1223
1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1224 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1113 init_perl_op.op_next = PL_op; 1225 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1226 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1227 init_perl_op.op_ppaddr = pp_slf;
… …
1118 PL_op = (OP *)&init_perl_op; 1230 PL_op = (OP *)&init_perl_op;
1119 1231
1120 /* copy throw, in case it was set before init_perl */ 1232 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1233 CORO_THROW = coro->except;
1122 1234
1123 SWAP_SVS (coro); 1235 SWAP_SVS_ENTER (coro);
1124 1236
1125 if (expect_false (enable_times)) 1237 if (ecb_expect_false (enable_times))
1126 { 1238 {
1127 coro_times_update (); 1239 coro_times_update ();
1128 coro_times_sub (coro); 1240 coro_times_sub (coro);
1129 } 1241 }
1130} 1242}
… …
1154destroy_perl (pTHX_ struct coro *coro) 1266destroy_perl (pTHX_ struct coro *coro)
1155{ 1267{
1156 SV *svf [9]; 1268 SV *svf [9];
1157 1269
1158 { 1270 {
1271 SV *old_current = SvRV (coro_current);
1159 struct coro *current = SvSTATE_current; 1272 struct coro *current = SvSTATE (old_current);
1160 1273
1161 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1274 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1162 1275
1163 save_perl (aTHX_ current); 1276 save_perl (aTHX_ current);
1277
1278 /* this will cause transfer_check to croak on block*/
1279 SvRV_set (coro_current, (SV *)coro->hv);
1280
1164 load_perl (aTHX_ coro); 1281 load_perl (aTHX_ coro);
1165 1282
1283 /* restore swapped sv's */
1284 SWAP_SVS_LEAVE (coro);
1285
1166 coro_unwind_stacks (aTHX); 1286 coro_unwind_stacks (aTHX);
1287
1167 coro_destruct_stacks (aTHX); 1288 coro_destruct_stacks (aTHX);
1168 1289
1169 /* restore swapped sv's */
1170 SWAP_SVS (coro);
1171
1172 // now save some sv's to be free'd later 1290 /* now save some sv's to be free'd later */
1173 svf [0] = GvSV (PL_defgv); 1291 svf [0] = GvSV (PL_defgv);
1174 svf [1] = (SV *)GvAV (PL_defgv); 1292 svf [1] = (SV *)GvAV (PL_defgv);
1175 svf [2] = GvSV (PL_errgv); 1293 svf [2] = GvSV (PL_errgv);
1176 svf [3] = (SV *)PL_defoutgv; 1294 svf [3] = (SV *)PL_defoutgv;
1177 svf [4] = PL_rs; 1295 svf [4] = PL_rs;
… …
1179 svf [6] = (SV *)GvHV (PL_hintgv); 1297 svf [6] = (SV *)GvHV (PL_hintgv);
1180 svf [7] = PL_diehook; 1298 svf [7] = PL_diehook;
1181 svf [8] = PL_warnhook; 1299 svf [8] = PL_warnhook;
1182 assert (9 == sizeof (svf) / sizeof (*svf)); 1300 assert (9 == sizeof (svf) / sizeof (*svf));
1183 1301
1302 SvRV_set (coro_current, old_current);
1303
1184 load_perl (aTHX_ current); 1304 load_perl (aTHX_ current);
1185 } 1305 }
1186 1306
1187 { 1307 {
1188 unsigned int i; 1308 unsigned int i;
… …
1192 1312
1193 SvREFCNT_dec (coro->saved_deffh); 1313 SvREFCNT_dec (coro->saved_deffh);
1194 SvREFCNT_dec (coro->rouse_cb); 1314 SvREFCNT_dec (coro->rouse_cb);
1195 SvREFCNT_dec (coro->invoke_cb); 1315 SvREFCNT_dec (coro->invoke_cb);
1196 SvREFCNT_dec (coro->invoke_av); 1316 SvREFCNT_dec (coro->invoke_av);
1317 SvREFCNT_dec (coro->on_enter_xs);
1318 SvREFCNT_dec (coro->on_leave_xs);
1197 } 1319 }
1198} 1320}
1199 1321
1200INLINE void 1322ecb_inline void
1201free_coro_mortal (pTHX) 1323free_coro_mortal (pTHX)
1202{ 1324{
1203 if (expect_true (coro_mortal)) 1325 if (ecb_expect_true (coro_mortal))
1204 { 1326 {
1205 SvREFCNT_dec (coro_mortal); 1327 SvREFCNT_dec ((SV *)coro_mortal);
1206 coro_mortal = 0; 1328 coro_mortal = 0;
1207 } 1329 }
1208} 1330}
1209 1331
1210static int 1332static int
… …
1264 1386
1265 if (PL_curcop != &PL_compiling) 1387 if (PL_curcop != &PL_compiling)
1266 { 1388 {
1267 SV **cb; 1389 SV **cb;
1268 1390
1269 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1391 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1270 { 1392 {
1271 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1393 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1272 1394
1273 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1395 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1274 { 1396 {
… …
1343 1465
1344 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1466 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1345} 1467}
1346 1468
1347/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1469/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1348static void NOINLINE 1470static void ecb_noinline
1349cctx_prepare (pTHX) 1471cctx_prepare (pTHX)
1350{ 1472{
1351 PL_top_env = &PL_start_env; 1473 PL_top_env = &PL_start_env;
1352 1474
1353 if (cctx_current->flags & CC_TRACE) 1475 if (cctx_current->flags & CC_TRACE)
… …
1364 slf_frame.prepare = slf_prepare_set_stacklevel; 1486 slf_frame.prepare = slf_prepare_set_stacklevel;
1365 slf_frame.check = slf_check_set_stacklevel; 1487 slf_frame.check = slf_check_set_stacklevel;
1366} 1488}
1367 1489
1368/* the tail of transfer: execute stuff we can only do after a transfer */ 1490/* the tail of transfer: execute stuff we can only do after a transfer */
1369INLINE void 1491ecb_inline void
1370transfer_tail (pTHX) 1492transfer_tail (pTHX)
1371{ 1493{
1372 free_coro_mortal (aTHX); 1494 free_coro_mortal (aTHX);
1495}
1496
1497/* try to exit the same way perl's main function would do */
1498/* we do not bother resetting the environment or other things *7
1499/* that are not, uhm, essential */
1500/* this obviously also doesn't work when perl is embedded */
1501static void ecb_noinline ecb_cold
1502perlish_exit (pTHX)
1503{
1504 int exitstatus = perl_destruct (PL_curinterp);
1505 perl_free (PL_curinterp);
1506 exit (exitstatus);
1373} 1507}
1374 1508
1375/* 1509/*
1376 * this is a _very_ stripped down perl interpreter ;) 1510 * this is a _very_ stripped down perl interpreter ;)
1377 */ 1511 */
… …
1406 */ 1540 */
1407 1541
1408 /* 1542 /*
1409 * If perl-run returns we assume exit() was being called or the coro 1543 * If perl-run returns we assume exit() was being called or the coro
1410 * fell off the end, which seems to be the only valid (non-bug) 1544 * fell off the end, which seems to be the only valid (non-bug)
1411 * reason for perl_run to return. We try to exit by jumping to the 1545 * reason for perl_run to return. We try to mimic whatever perl is normally
1412 * bootstrap-time "top" top_env, as we cannot restore the "main" 1546 * 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 */ 1547 */
1417 PL_top_env = main_top_env; 1548 perlish_exit (aTHX);
1418 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1419 } 1549 }
1420} 1550}
1421 1551
1422static coro_cctx * 1552static coro_cctx *
1423cctx_new () 1553cctx_new (void)
1424{ 1554{
1425 coro_cctx *cctx; 1555 coro_cctx *cctx;
1426 1556
1427 ++cctx_count; 1557 ++cctx_count;
1428 New (0, cctx, 1, coro_cctx); 1558 New (0, cctx, 1, coro_cctx);
… …
1434 return cctx; 1564 return cctx;
1435} 1565}
1436 1566
1437/* create a new cctx only suitable as source */ 1567/* create a new cctx only suitable as source */
1438static coro_cctx * 1568static coro_cctx *
1439cctx_new_empty () 1569cctx_new_empty (void)
1440{ 1570{
1441 coro_cctx *cctx = cctx_new (); 1571 coro_cctx *cctx = cctx_new ();
1442 1572
1443 cctx->sptr = 0; 1573 cctx->stack.sptr = 0;
1444 coro_create (&cctx->cctx, 0, 0, 0, 0); 1574 coro_create (&cctx->cctx, 0, 0, 0, 0);
1445 1575
1446 return cctx; 1576 return cctx;
1447} 1577}
1448 1578
1449/* create a new cctx suitable as destination/running a perl interpreter */ 1579/* create a new cctx suitable as destination/running a perl interpreter */
1450static coro_cctx * 1580static coro_cctx *
1451cctx_new_run () 1581cctx_new_run (void)
1452{ 1582{
1453 coro_cctx *cctx = cctx_new (); 1583 coro_cctx *cctx = cctx_new ();
1454 void *stack_start;
1455 size_t stack_size;
1456 1584
1457#if HAVE_MMAP 1585 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 } 1586 {
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."); 1587 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1480 _exit (EXIT_FAILURE); 1588 _exit (EXIT_FAILURE);
1481 }
1482
1483 stack_start = cctx->sptr;
1484 stack_size = cctx->ssize;
1485 } 1589 }
1486 1590
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); 1591 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1492 1592
1493 return cctx; 1593 return cctx;
1494} 1594}
1495 1595
1496static void 1596static void
… …
1502 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1602 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1503 1603
1504 --cctx_count; 1604 --cctx_count;
1505 coro_destroy (&cctx->cctx); 1605 coro_destroy (&cctx->cctx);
1506 1606
1507 /* coro_transfer creates new, empty cctx's */ 1607 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 1608
1522 Safefree (cctx); 1609 Safefree (cctx);
1523} 1610}
1524 1611
1525/* wether this cctx should be destructed */ 1612/* wether this cctx should be destructed */
1526#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1613#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1527 1614
1528static coro_cctx * 1615static coro_cctx *
1529cctx_get (pTHX) 1616cctx_get (pTHX)
1530{ 1617{
1531 while (expect_true (cctx_first)) 1618 while (ecb_expect_true (cctx_first))
1532 { 1619 {
1533 coro_cctx *cctx = cctx_first; 1620 coro_cctx *cctx = cctx_first;
1534 cctx_first = cctx->next; 1621 cctx_first = cctx->next;
1535 --cctx_idle; 1622 --cctx_idle;
1536 1623
1537 if (expect_true (!CCTX_EXPIRED (cctx))) 1624 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1538 return cctx; 1625 return cctx;
1539 1626
1540 cctx_destroy (cctx); 1627 cctx_destroy (cctx);
1541 } 1628 }
1542 1629
… …
1544} 1631}
1545 1632
1546static void 1633static void
1547cctx_put (coro_cctx *cctx) 1634cctx_put (coro_cctx *cctx)
1548{ 1635{
1549 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1636 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1550 1637
1551 /* free another cctx if overlimit */ 1638 /* free another cctx if overlimit */
1552 if (expect_false (cctx_idle >= cctx_max_idle)) 1639 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1553 { 1640 {
1554 coro_cctx *first = cctx_first; 1641 coro_cctx *first = cctx_first;
1555 cctx_first = first->next; 1642 cctx_first = first->next;
1556 --cctx_idle; 1643 --cctx_idle;
1557 1644
… …
1568static void 1655static void
1569transfer_check (pTHX_ struct coro *prev, struct coro *next) 1656transfer_check (pTHX_ struct coro *prev, struct coro *next)
1570{ 1657{
1571 /* TODO: throwing up here is considered harmful */ 1658 /* TODO: throwing up here is considered harmful */
1572 1659
1573 if (expect_true (prev != next)) 1660 if (ecb_expect_true (prev != next))
1574 { 1661 {
1575 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1662 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,"); 1663 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1577 1664
1578 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1665 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,"); 1666 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1580 1667
1581#if !PERL_VERSION_ATLEAST (5,10,0) 1668#if !PERL_VERSION_ATLEAST (5,10,0)
1582 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1669 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,"); 1670 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1584#endif 1671#endif
1585 } 1672 }
1586} 1673}
1587 1674
1588/* always use the TRANSFER macro */ 1675/* always use the TRANSFER macro */
1589static void NOINLINE /* noinline so we have a fixed stackframe */ 1676static void ecb_noinline /* noinline so we have a fixed stackframe */
1590transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1677transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1591{ 1678{
1592 dSTACKLEVEL; 1679 dSTACKLEVEL;
1593 1680
1594 /* sometimes transfer is only called to set idle_sp */ 1681 /* sometimes transfer is only called to set idle_sp */
1595 if (expect_false (!prev)) 1682 if (ecb_expect_false (!prev))
1596 { 1683 {
1597 cctx_current->idle_sp = STACKLEVEL; 1684 cctx_current->idle_sp = STACKLEVEL;
1598 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1685 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1599 } 1686 }
1600 else if (expect_true (prev != next)) 1687 else if (ecb_expect_true (prev != next))
1601 { 1688 {
1602 coro_cctx *cctx_prev; 1689 coro_cctx *cctx_prev;
1603 1690
1604 if (expect_false (prev->flags & CF_NEW)) 1691 if (ecb_expect_false (prev->flags & CF_NEW))
1605 { 1692 {
1606 /* create a new empty/source context */ 1693 /* create a new empty/source context */
1607 prev->flags &= ~CF_NEW; 1694 prev->flags &= ~CF_NEW;
1608 prev->flags |= CF_RUNNING; 1695 prev->flags |= CF_RUNNING;
1609 } 1696 }
… …
1612 next->flags |= CF_RUNNING; 1699 next->flags |= CF_RUNNING;
1613 1700
1614 /* first get rid of the old state */ 1701 /* first get rid of the old state */
1615 save_perl (aTHX_ prev); 1702 save_perl (aTHX_ prev);
1616 1703
1617 if (expect_false (next->flags & CF_NEW)) 1704 if (ecb_expect_false (next->flags & CF_NEW))
1618 { 1705 {
1619 /* need to start coroutine */ 1706 /* need to start coroutine */
1620 next->flags &= ~CF_NEW; 1707 next->flags &= ~CF_NEW;
1621 /* setup coroutine call */ 1708 /* setup coroutine call */
1622 init_perl (aTHX_ next); 1709 init_perl (aTHX_ next);
1623 } 1710 }
1624 else 1711 else
1625 load_perl (aTHX_ next); 1712 load_perl (aTHX_ next);
1626 1713
1627 /* possibly untie and reuse the cctx */ 1714 /* possibly untie and reuse the cctx */
1628 if (expect_true ( 1715 if (ecb_expect_true (
1629 cctx_current->idle_sp == STACKLEVEL 1716 cctx_current->idle_sp == STACKLEVEL
1630 && !(cctx_current->flags & CC_TRACE) 1717 && !(cctx_current->flags & CC_TRACE)
1631 && !force_cctx 1718 && !force_cctx
1632 )) 1719 ))
1633 { 1720 {
1634 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1721 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1635 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1722 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1636 1723
1637 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1724 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1638 /* without this the next cctx_get might destroy the running cctx while still in use */ 1725 /* without this the next cctx_get might destroy the running cctx while still in use */
1639 if (expect_false (CCTX_EXPIRED (cctx_current))) 1726 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1640 if (expect_true (!next->cctx)) 1727 if (ecb_expect_true (!next->cctx))
1641 next->cctx = cctx_get (aTHX); 1728 next->cctx = cctx_get (aTHX);
1642 1729
1643 cctx_put (cctx_current); 1730 cctx_put (cctx_current);
1644 } 1731 }
1645 else 1732 else
1646 prev->cctx = cctx_current; 1733 prev->cctx = cctx_current;
1647 1734
1648 ++next->usecount; 1735 ++next->usecount;
1649 1736
1650 cctx_prev = cctx_current; 1737 cctx_prev = cctx_current;
1651 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1738 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1652 1739
1653 next->cctx = 0; 1740 next->cctx = 0;
1654 1741
1655 if (expect_false (cctx_prev != cctx_current)) 1742 if (ecb_expect_false (cctx_prev != cctx_current))
1656 { 1743 {
1657 cctx_prev->top_env = PL_top_env; 1744 cctx_prev->top_env = PL_top_env;
1658 PL_top_env = cctx_current->top_env; 1745 PL_top_env = cctx_current->top_env;
1659 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1746 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1660 } 1747 }
… …
1666#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1753#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1667#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1754#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1668 1755
1669/** high level stuff ********************************************************/ 1756/** high level stuff ********************************************************/
1670 1757
1758/* this function is actually Coro, not Coro::State, but we call it from here */
1759/* because it is convenient - but it hasn't been declared yet for that reason */
1671static int 1760static void
1761coro_call_on_destroy (pTHX_ struct coro *coro);
1762
1763static void
1672coro_state_destroy (pTHX_ struct coro *coro) 1764coro_state_destroy (pTHX_ struct coro *coro)
1673{ 1765{
1674 if (coro->flags & CF_DESTROYED) 1766 if (coro->flags & CF_ZOMBIE)
1675 return 0; 1767 return;
1676 1768
1677 if (coro->on_destroy && !PL_dirty)
1678 coro->on_destroy (aTHX_ coro); 1769 slf_destroy (aTHX_ coro);
1679 1770
1680 /*
1681 * The on_destroy above most likely is from an SLF call.
1682 * Since by definition the SLF call will not finish when we destroy
1683 * the coro, we will have to force-finish it here, otherwise
1684 * cleanup functions cannot call SLF functions.
1685 */
1686 coro->slf_frame.prepare = 0;
1687
1688 coro->flags |= CF_DESTROYED; 1771 coro->flags |= CF_ZOMBIE;
1689 1772
1690 if (coro->flags & CF_READY) 1773 if (coro->flags & CF_READY)
1691 { 1774 {
1692 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1775 /* reduce nready, as destroying a ready coro effectively unreadies it */
1693 /* alternative: look through all ready queues and remove the coro */ 1776 /* alternative: look through all ready queues and remove the coro */
1694 --coro_nready; 1777 --coro_nready;
1695 } 1778 }
1696 else 1779 else
1697 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1780 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1781
1782 if (coro->next) coro->next->prev = coro->prev;
1783 if (coro->prev) coro->prev->next = coro->next;
1784 if (coro == coro_first) coro_first = coro->next;
1698 1785
1699 if (coro->mainstack 1786 if (coro->mainstack
1700 && coro->mainstack != main_mainstack 1787 && coro->mainstack != main_mainstack
1701 && coro->slot 1788 && coro->slot
1702 && !PL_dirty) 1789 && !PL_dirty)
1703 destroy_perl (aTHX_ coro); 1790 destroy_perl (aTHX_ coro);
1704 1791
1705 if (coro->next) coro->next->prev = coro->prev;
1706 if (coro->prev) coro->prev->next = coro->next;
1707 if (coro == coro_first) coro_first = coro->next;
1708
1709 cctx_destroy (coro->cctx); 1792 cctx_destroy (coro->cctx);
1710 SvREFCNT_dec (coro->startcv); 1793 SvREFCNT_dec (coro->startcv);
1711 SvREFCNT_dec (coro->args); 1794 SvREFCNT_dec (coro->args);
1712 SvREFCNT_dec (coro->swap_sv); 1795 SvREFCNT_dec (coro->swap_sv);
1713 SvREFCNT_dec (CORO_THROW); 1796 SvREFCNT_dec (CORO_THROW);
1714 1797
1715 return 1; 1798 coro_call_on_destroy (aTHX_ coro);
1799
1800 /* more destruction mayhem in coro_state_free */
1716} 1801}
1717 1802
1718static int 1803static int
1719coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1804coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1720{ 1805{
1721 struct coro *coro = (struct coro *)mg->mg_ptr; 1806 struct coro *coro = (struct coro *)mg->mg_ptr;
1722 mg->mg_ptr = 0; 1807 mg->mg_ptr = 0;
1723 1808
1724 coro->hv = 0;
1725
1726 if (--coro->refcnt < 0)
1727 {
1728 coro_state_destroy (aTHX_ coro); 1809 coro_state_destroy (aTHX_ coro);
1810 SvREFCNT_dec (coro->on_destroy);
1811 SvREFCNT_dec (coro->status);
1812
1729 Safefree (coro); 1813 Safefree (coro);
1730 }
1731 1814
1732 return 0; 1815 return 0;
1733} 1816}
1734 1817
1735static int 1818static int ecb_cold
1736coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1819coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1737{ 1820{
1738 struct coro *coro = (struct coro *)mg->mg_ptr; 1821 /* called when perl clones the current process the slow way (windows process emulation) */
1739 1822 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1740 ++coro->refcnt; 1823 mg->mg_ptr = 0;
1824 mg->mg_virtual = 0;
1741 1825
1742 return 0; 1826 return 0;
1743} 1827}
1744 1828
1745static MGVTBL coro_state_vtbl = { 1829static MGVTBL coro_state_vtbl = {
… …
1770 TRANSFER (ta, 1); 1854 TRANSFER (ta, 1);
1771} 1855}
1772 1856
1773/** Coro ********************************************************************/ 1857/** Coro ********************************************************************/
1774 1858
1775INLINE void 1859ecb_inline void
1776coro_enq (pTHX_ struct coro *coro) 1860coro_enq (pTHX_ struct coro *coro)
1777{ 1861{
1778 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1862 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1779 1863
1780 SvREFCNT_inc_NN (coro->hv); 1864 SvREFCNT_inc_NN (coro->hv);
… …
1782 coro->next_ready = 0; 1866 coro->next_ready = 0;
1783 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1867 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1784 ready [1] = coro; 1868 ready [1] = coro;
1785} 1869}
1786 1870
1787INLINE struct coro * 1871ecb_inline struct coro *
1788coro_deq (pTHX) 1872coro_deq (pTHX)
1789{ 1873{
1790 int prio; 1874 int prio;
1791 1875
1792 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1876 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1845{ 1929{
1846 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1930 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1847} 1931}
1848 1932
1849/* expects to own a reference to next->hv */ 1933/* expects to own a reference to next->hv */
1850INLINE void 1934ecb_inline void
1851prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1935prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1852{ 1936{
1853 SV *prev_sv = SvRV (coro_current); 1937 SV *prev_sv = SvRV (coro_current);
1854 1938
1855 ta->prev = SvSTATE_hv (prev_sv); 1939 ta->prev = SvSTATE_hv (prev_sv);
… …
1868{ 1952{
1869 for (;;) 1953 for (;;)
1870 { 1954 {
1871 struct coro *next = coro_deq (aTHX); 1955 struct coro *next = coro_deq (aTHX);
1872 1956
1873 if (expect_true (next)) 1957 if (ecb_expect_true (next))
1874 { 1958 {
1875 /* cannot transfer to destroyed coros, skip and look for next */ 1959 /* cannot transfer to destroyed coros, skip and look for next */
1876 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1960 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1877 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1961 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1878 else 1962 else
1879 { 1963 {
1880 next->flags &= ~CF_READY; 1964 next->flags &= ~CF_READY;
1881 --coro_nready; 1965 --coro_nready;
… …
1889 /* nothing to schedule: call the idle handler */ 1973 /* nothing to schedule: call the idle handler */
1890 if (SvROK (sv_idle) 1974 if (SvROK (sv_idle)
1891 && SvOBJECT (SvRV (sv_idle))) 1975 && SvOBJECT (SvRV (sv_idle)))
1892 { 1976 {
1893 if (SvRV (sv_idle) == SvRV (coro_current)) 1977 if (SvRV (sv_idle) == SvRV (coro_current))
1978 {
1979 require_pv ("Carp");
1980
1981 {
1982 dSP;
1983
1984 ENTER;
1985 SAVETMPS;
1986
1987 PUSHMARK (SP);
1894 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1988 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1989 PUTBACK;
1990 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1991
1992 FREETMPS;
1993 LEAVE;
1994 }
1995 }
1895 1996
1896 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1997 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1897 api_ready (aTHX_ SvRV (sv_idle)); 1998 api_ready (aTHX_ SvRV (sv_idle));
1898 --coro_nready; 1999 --coro_nready;
1899 } 2000 }
… …
1914 } 2015 }
1915 } 2016 }
1916 } 2017 }
1917} 2018}
1918 2019
1919INLINE void 2020ecb_inline void
1920prepare_cede (pTHX_ struct coro_transfer_args *ta) 2021prepare_cede (pTHX_ struct coro_transfer_args *ta)
1921{ 2022{
1922 api_ready (aTHX_ coro_current); 2023 api_ready (aTHX_ coro_current);
1923 prepare_schedule (aTHX_ ta); 2024 prepare_schedule (aTHX_ ta);
1924} 2025}
1925 2026
1926INLINE void 2027ecb_inline void
1927prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2028prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1928{ 2029{
1929 SV *prev = SvRV (coro_current); 2030 SV *prev = SvRV (coro_current);
1930 2031
1931 if (coro_nready) 2032 if (coro_nready)
… …
1961{ 2062{
1962 struct coro_transfer_args ta; 2063 struct coro_transfer_args ta;
1963 2064
1964 prepare_cede (aTHX_ &ta); 2065 prepare_cede (aTHX_ &ta);
1965 2066
1966 if (expect_true (ta.prev != ta.next)) 2067 if (ecb_expect_true (ta.prev != ta.next))
1967 { 2068 {
1968 TRANSFER (ta, 1); 2069 TRANSFER (ta, 1);
1969 return 1; 2070 return 1;
1970 } 2071 }
1971 else 2072 else
… …
2014 coro->slot->runops = RUNOPS_DEFAULT; 2115 coro->slot->runops = RUNOPS_DEFAULT;
2015 } 2116 }
2016} 2117}
2017 2118
2018static void 2119static void
2120coro_push_av (pTHX_ AV *av, I32 gimme_v)
2121{
2122 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2123 {
2124 dSP;
2125
2126 if (gimme_v == G_SCALAR)
2127 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2128 else
2129 {
2130 int i;
2131 EXTEND (SP, AvFILLp (av) + 1);
2132
2133 for (i = 0; i <= AvFILLp (av); ++i)
2134 PUSHs (AvARRAY (av)[i]);
2135 }
2136
2137 PUTBACK;
2138 }
2139}
2140
2141static void
2142coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2143{
2144 if (!coro->on_destroy)
2145 coro->on_destroy = newAV ();
2146
2147 av_push (coro->on_destroy, cb);
2148}
2149
2150static void
2151slf_destroy_join (pTHX_ struct CoroSLF *frame)
2152{
2153 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2154}
2155
2156static int
2157slf_check_join (pTHX_ struct CoroSLF *frame)
2158{
2159 struct coro *coro = (struct coro *)frame->data;
2160
2161 if (!coro->status)
2162 return 1;
2163
2164 frame->destroy = 0;
2165
2166 coro_push_av (aTHX_ coro->status, GIMME_V);
2167
2168 SvREFCNT_dec ((SV *)coro->hv);
2169
2170 return 0;
2171}
2172
2173static void
2174slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2175{
2176 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2177
2178 if (items > 1)
2179 croak ("join called with too many arguments");
2180
2181 if (coro->status)
2182 frame->prepare = prepare_nop;
2183 else
2184 {
2185 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2186 frame->prepare = prepare_schedule;
2187 }
2188
2189 frame->check = slf_check_join;
2190 frame->destroy = slf_destroy_join;
2191 frame->data = (void *)coro;
2192 SvREFCNT_inc (coro->hv);
2193}
2194
2195static void
2019coro_call_on_destroy (pTHX_ struct coro *coro) 2196coro_call_on_destroy (pTHX_ struct coro *coro)
2020{ 2197{
2021 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2198 AV *od = coro->on_destroy;
2022 2199
2023 if (on_destroyp) 2200 if (!od)
2024 { 2201 return;
2025 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2026 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2027 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2028 2202
2203 coro->on_destroy = 0;
2204 sv_2mortal ((SV *)od);
2205
2029 while (AvFILLp (on_destroy) >= 0) 2206 while (AvFILLp (od) >= 0)
2207 {
2208 SV *cb = sv_2mortal (av_pop (od));
2209
2210 /* coro hv's (and only hv's at the moment) are supported as well */
2211 if (SvSTATEhv_p (aTHX_ cb))
2212 api_ready (aTHX_ cb);
2213 else
2030 { 2214 {
2031 dSP; /* don't disturb outer sp */ 2215 dSP; /* don't disturb outer sp */
2032 SV *cb = av_pop (on_destroy);
2033
2034 PUSHMARK (SP); 2216 PUSHMARK (SP);
2035 2217
2036 if (statusp) 2218 if (coro->status)
2037 { 2219 {
2038 int i; 2220 PUTBACK;
2039 EXTEND (SP, AvFILLp (status) + 1); 2221 coro_push_av (aTHX_ coro->status, G_ARRAY);
2040 2222 SPAGAIN;
2041 for (i = 0; i <= AvFILLp (status); ++i)
2042 PUSHs (AvARRAY (status)[i]);
2043 } 2223 }
2044 2224
2045 PUTBACK; 2225 PUTBACK;
2046 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2226 call_sv (cb, G_VOID | G_DISCARD);
2047 } 2227 }
2048 } 2228 }
2049} 2229}
2050 2230
2051static void 2231static void
2052coro_set_status (HV *coro_hv, SV **arg, int items) 2232coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2053{ 2233{
2054 AV *av = newAV (); 2234 AV *av;
2235
2236 if (coro->status)
2237 {
2238 av = coro->status;
2239 av_clear (av);
2240 }
2241 else
2242 av = coro->status = newAV ();
2055 2243
2056 /* items are actually not so common, so optimise for this case */ 2244 /* items are actually not so common, so optimise for this case */
2057 if (items) 2245 if (items)
2058 { 2246 {
2059 int i; 2247 int i;
… …
2061 av_extend (av, items - 1); 2249 av_extend (av, items - 1);
2062 2250
2063 for (i = 0; i < items; ++i) 2251 for (i = 0; i < items; ++i)
2064 av_push (av, SvREFCNT_inc_NN (arg [i])); 2252 av_push (av, SvREFCNT_inc_NN (arg [i]));
2065 } 2253 }
2066
2067 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2068} 2254}
2069 2255
2070static void 2256static void
2071slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2257slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2072{ 2258{
… …
2084static void 2270static void
2085slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2271slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2086{ 2272{
2087 HV *coro_hv = (HV *)SvRV (coro_current); 2273 HV *coro_hv = (HV *)SvRV (coro_current);
2088 2274
2089 coro_set_status (coro_hv, arg, items); 2275 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2090 slf_init_terminate_cancel_common (frame, coro_hv); 2276 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2091} 2277}
2092 2278
2093static void 2279static void
2094slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2280slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2095{ 2281{
… …
2100 croak ("Coro::cancel called without coro object,"); 2286 croak ("Coro::cancel called without coro object,");
2101 2287
2102 coro = SvSTATE (arg [0]); 2288 coro = SvSTATE (arg [0]);
2103 coro_hv = coro->hv; 2289 coro_hv = coro->hv;
2104 2290
2105 coro_set_status (coro_hv, arg + 1, items - 1); 2291 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2106 2292
2107 if (expect_false (coro->flags & CF_NOCANCEL)) 2293 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2108 { 2294 {
2109 /* coro currently busy cancelling something, so just notify it */ 2295 /* coro currently busy cancelling something, so just notify it */
2110 coro->slf_frame.data = (void *)coro; 2296 coro->slf_frame.data = (void *)coro;
2111 2297
2112 frame->prepare = prepare_nop; 2298 frame->prepare = prepare_nop;
2113 frame->check = slf_check_nop; 2299 frame->check = slf_check_nop;
2114 } 2300 }
2115 else if (coro_hv == (HV *)SvRV (coro_current)) 2301 else if (coro_hv == (HV *)SvRV (coro_current))
2116 { 2302 {
2117 /* cancelling the current coro is allowed, and equals terminate */ 2303 /* cancelling the current coro is allowed, and equals terminate */
2118 slf_init_terminate_cancel_common (frame, coro_hv); 2304 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2119 } 2305 }
2120 else 2306 else
2121 { 2307 {
2122 struct coro *self = SvSTATE_current; 2308 struct coro *self = SvSTATE_current;
2309
2310 if (!self)
2311 croak ("Coro::cancel called outside of thread content,");
2123 2312
2124 /* otherwise we cancel directly, purely for speed reasons 2313 /* otherwise we cancel directly, purely for speed reasons
2125 * unfortunately, this requires some magic trickery, as 2314 * unfortunately, this requires some magic trickery, as
2126 * somebody else could cancel us, so we have to fight the cancellation. 2315 * somebody else could cancel us, so we have to fight the cancellation.
2127 * this is ugly, and hopefully fully worth the extra speed. 2316 * this is ugly, and hopefully fully worth the extra speed.
2128 * besides, I can't get the slow-but-safe version working... 2317 * besides, I can't get the slow-but-safe version working...
2129 */ 2318 */
2130 slf_frame.data = 0; 2319 slf_frame.data = 0;
2131 self->flags |= CF_NOCANCEL; 2320 self->flags |= CF_NOCANCEL;
2132
2133 coro_state_destroy (aTHX_ coro); 2321 coro_state_destroy (aTHX_ coro);
2134 coro_call_on_destroy (aTHX_ coro);
2135
2136 self->flags &= ~CF_NOCANCEL; 2322 self->flags &= ~CF_NOCANCEL;
2137 2323
2138 if (slf_frame.data) 2324 if (slf_frame.data)
2139 { 2325 {
2140 /* while we were busy we have been cancelled, so terminate */ 2326 /* while we were busy we have been cancelled, so terminate */
2141 slf_init_terminate_cancel_common (frame, self->hv); 2327 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2142 } 2328 }
2143 else 2329 else
2144 { 2330 {
2145 frame->prepare = prepare_nop; 2331 frame->prepare = prepare_nop;
2146 frame->check = slf_check_nop; 2332 frame->check = slf_check_nop;
2147 } 2333 }
2148 } 2334 }
2149} 2335}
2150 2336
2337static int
2338slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2339{
2340 frame->prepare = 0;
2341 coro_unwind_stacks (aTHX);
2342
2343 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2344
2345 return 1;
2346}
2347
2348static int
2349safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2350{
2351 if (coro->cctx)
2352 croak ("coro inside C callback, unable to cancel at this time, caught");
2353
2354 if (coro->flags & CF_NEW)
2355 {
2356 coro_set_status (aTHX_ coro, arg, items);
2357 coro_state_destroy (aTHX_ coro);
2358 }
2359 else
2360 {
2361 if (!coro->slf_frame.prepare)
2362 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2363
2364 slf_destroy (aTHX_ coro);
2365
2366 coro_set_status (aTHX_ coro, arg, items);
2367 coro->slf_frame.prepare = prepare_nop;
2368 coro->slf_frame.check = slf_check_safe_cancel;
2369
2370 api_ready (aTHX_ (SV *)coro->hv);
2371 }
2372
2373 return 1;
2374}
2375
2151/*****************************************************************************/ 2376/*****************************************************************************/
2152/* async pool handler */ 2377/* async pool handler */
2153 2378
2154static int 2379static int
2155slf_check_pool_handler (pTHX_ struct CoroSLF *frame) 2380slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
… …
2184slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2409slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2185{ 2410{
2186 HV *hv = (HV *)SvRV (coro_current); 2411 HV *hv = (HV *)SvRV (coro_current);
2187 struct coro *coro = SvSTATE_hv ((SV *)hv); 2412 struct coro *coro = SvSTATE_hv ((SV *)hv);
2188 2413
2189 if (expect_true (coro->saved_deffh)) 2414 if (ecb_expect_true (coro->saved_deffh))
2190 { 2415 {
2191 /* subsequent iteration */ 2416 /* subsequent iteration */
2192 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2417 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2193 coro->saved_deffh = 0; 2418 coro->saved_deffh = 0;
2194 2419
2195 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2420 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2196 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2421 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2197 { 2422 {
2198 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2423 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2199 coro->invoke_av = newAV (); 2424 return;
2200
2201 frame->prepare = prepare_nop;
2202 } 2425 }
2203 else 2426 else
2204 { 2427 {
2205 av_clear (GvAV (PL_defgv)); 2428 av_clear (GvAV (PL_defgv));
2206 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2429 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2207 2430
2431 if (ecb_expect_false (coro->swap_sv))
2432 {
2433 swap_svs_leave (coro);
2434 SvREFCNT_dec_NN (coro->swap_sv);
2435 coro->swap_sv = 0;
2436 }
2437
2208 coro->prio = 0; 2438 coro->prio = 0;
2209 2439
2210 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2440 if (coro->cctx && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2211 api_trace (aTHX_ coro_current, 0); 2441 api_trace (aTHX_ coro_current, 0);
2212 2442
2213 frame->prepare = prepare_schedule; 2443 frame->prepare = prepare_schedule;
2214 av_push (av_async_pool, SvREFCNT_inc (hv)); 2444 av_push (av_async_pool, SvREFCNT_inc (hv));
2215 } 2445 }
… …
2256 2486
2257static int 2487static int
2258slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2488slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2259{ 2489{
2260 SV *data = (SV *)frame->data; 2490 SV *data = (SV *)frame->data;
2261 2491
2262 if (CORO_THROW) 2492 if (CORO_THROW)
2263 return 0; 2493 return 0;
2264 2494
2265 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2495 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2266 return 1; 2496 return 1;
… …
2302 cb = sv_2mortal (coro->rouse_cb); 2532 cb = sv_2mortal (coro->rouse_cb);
2303 coro->rouse_cb = 0; 2533 coro->rouse_cb = 0;
2304 } 2534 }
2305 2535
2306 if (!SvROK (cb) 2536 if (!SvROK (cb)
2307 || SvTYPE (SvRV (cb)) != SVt_PVCV 2537 || SvTYPE (SvRV (cb)) != SVt_PVCV
2308 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2538 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2309 croak ("Coro::rouse_wait called with illegal callback argument,"); 2539 croak ("Coro::rouse_wait called with illegal callback argument,");
2310 2540
2311 { 2541 {
2312 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2542 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2429static void 2659static void
2430slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2660slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2431{ 2661{
2432 frame->prepare = prepare_cede_notself; 2662 frame->prepare = prepare_cede_notself;
2433 frame->check = slf_check_nop; 2663 frame->check = slf_check_nop;
2664}
2665
2666/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2667static void
2668slf_destroy (pTHX_ struct coro *coro)
2669{
2670 struct CoroSLF frame = coro->slf_frame;
2671
2672 /*
2673 * The on_destroy below most likely is from an SLF call.
2674 * Since by definition the SLF call will not finish when we destroy
2675 * the coro, we will have to force-finish it here, otherwise
2676 * cleanup functions cannot call SLF functions.
2677 */
2678 coro->slf_frame.prepare = 0;
2679
2680 /* this callback is reserved for slf functions needing to do cleanup */
2681 if (frame.destroy && frame.prepare && !PL_dirty)
2682 frame.destroy (aTHX_ &frame);
2434} 2683}
2435 2684
2436/* 2685/*
2437 * these not obviously related functions are all rolled into one 2686 * these not obviously related functions are all rolled into one
2438 * function to increase chances that they all will call transfer with the same 2687 * function to increase chances that they all will call transfer with the same
… …
2445 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2694 I32 checkmark; /* mark SP to see how many elements check has pushed */
2446 2695
2447 /* set up the slf frame, unless it has already been set-up */ 2696 /* set up the slf frame, unless it has already been set-up */
2448 /* the latter happens when a new coro has been started */ 2697 /* the latter happens when a new coro has been started */
2449 /* or when a new cctx was attached to an existing coroutine */ 2698 /* or when a new cctx was attached to an existing coroutine */
2450 if (expect_true (!slf_frame.prepare)) 2699 if (ecb_expect_true (!slf_frame.prepare))
2451 { 2700 {
2452 /* first iteration */ 2701 /* first iteration */
2453 dSP; 2702 dSP;
2454 SV **arg = PL_stack_base + TOPMARK + 1; 2703 SV **arg = PL_stack_base + TOPMARK + 1;
2455 int items = SP - arg; /* args without function object */ 2704 int items = SP - arg; /* args without function object */
… …
2496 while (slf_frame.check (aTHX_ &slf_frame)); 2745 while (slf_frame.check (aTHX_ &slf_frame));
2497 2746
2498 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2747 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2499 2748
2500 /* exception handling */ 2749 /* exception handling */
2501 if (expect_false (CORO_THROW)) 2750 if (ecb_expect_false (CORO_THROW))
2502 { 2751 {
2503 SV *exception = sv_2mortal (CORO_THROW); 2752 SV *exception = sv_2mortal (CORO_THROW);
2504 2753
2505 CORO_THROW = 0; 2754 CORO_THROW = 0;
2506 sv_setsv (ERRSV, exception); 2755 sv_setsv (ERRSV, exception);
2507 croak (0); 2756 croak (0);
2508 } 2757 }
2509 2758
2510 /* return value handling - mostly like entersub */ 2759 /* return value handling - mostly like entersub */
2511 /* make sure we put something on the stack in scalar context */ 2760 /* make sure we put something on the stack in scalar context */
2512 if (GIMME_V == G_SCALAR) 2761 if (GIMME_V == G_SCALAR
2762 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2513 { 2763 {
2514 dSP; 2764 dSP;
2515 SV **bot = PL_stack_base + checkmark; 2765 SV **bot = PL_stack_base + checkmark;
2516 2766
2517 if (sp == bot) /* too few, push undef */ 2767 if (sp == bot) /* too few, push undef */
2518 bot [1] = &PL_sv_undef; 2768 bot [1] = &PL_sv_undef;
2519 else if (sp != bot + 1) /* too many, take last one */ 2769 else /* too many, take last one */
2520 bot [1] = *sp; 2770 bot [1] = *sp;
2521 2771
2522 SP = bot + 1; 2772 SP = bot + 1;
2523 2773
2524 PUTBACK; 2774 PUTBACK;
… …
2622{ 2872{
2623 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2873 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2624 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2874 on_enterleave_call (aTHX_ sv_2mortal (cb));
2625} 2875}
2626 2876
2877static void
2878enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2879{
2880 if (!hook)
2881 return;
2882
2883 if (!*avp)
2884 {
2885 *avp = newAV ();
2886 AvREAL_off (*avp);
2887 }
2888
2889 av_push (*avp, (SV *)hook);
2890 av_push (*avp, (SV *)arg);
2891}
2892
2893static void
2894enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2895{
2896 AV *av = *avp;
2897 int i;
2898
2899 if (!av)
2900 return;
2901
2902 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2903 if (AvARRAY (av)[i] == (SV *)hook)
2904 {
2905 if (execute)
2906 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2907
2908 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2909 av_pop (av);
2910 av_pop (av);
2911 break;
2912 }
2913
2914 if (AvFILLp (av) >= 0)
2915 {
2916 *avp = 0;
2917 SvREFCNT_dec_NN (av);
2918 }
2919}
2920
2921static void
2922api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2923{
2924 struct coro *coro = SvSTATE (coro_sv);
2925
2926 if (SvSTATE_current == coro)
2927 if (enter)
2928 enter (aTHX_ enter_arg);
2929
2930 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2931 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2932}
2933
2934static void
2935api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2936{
2937 struct coro *coro = SvSTATE (coro_sv);
2938
2939 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2940 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2941}
2942
2943static void
2944savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2945{
2946 struct coro *coro = SvSTATE_current;
2947
2948 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2949}
2950
2951static void
2952savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2953{
2954 struct coro *coro = SvSTATE_current;
2955
2956 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2957}
2958
2959static void
2960api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2961{
2962 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2963
2964 /* this ought to be much cheaper than malloc + a single destructor call */
2965 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2966 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2967}
2968
2627/*****************************************************************************/ 2969/*****************************************************************************/
2628/* PerlIO::cede */ 2970/* PerlIO::cede */
2629 2971
2630typedef struct 2972typedef struct
2631{ 2973{
2632 PerlIOBuf base; 2974 PerlIOBuf base;
2633 NV next, every; 2975 NV next, every;
2634} PerlIOCede; 2976} PerlIOCede;
2635 2977
2636static IV 2978static IV ecb_cold
2637PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2979PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2638{ 2980{
2639 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2981 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2640 2982
2641 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2983 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2642 self->next = nvtime () + self->every; 2984 self->next = nvtime () + self->every;
2643 2985
2644 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2986 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2645} 2987}
2646 2988
2647static SV * 2989static SV * ecb_cold
2648PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2990PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2649{ 2991{
2650 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2992 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2651 2993
2652 return newSVnv (self->every); 2994 return newSVnv (self->every);
… …
2759 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3101 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2760 PUTBACK; 3102 PUTBACK;
2761 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3103 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2762 } 3104 }
2763 3105
2764 SvREFCNT_dec (cb); 3106 SvREFCNT_dec_NN (cb);
2765 } 3107 }
2766} 3108}
2767 3109
2768static void 3110static void
2769coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3111coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2770{ 3112{
2771 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3113 /* call $sem->adjust (0) to possibly wake up some other waiters */
2772 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3114 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2773} 3115}
2774 3116
2775static int 3117static int
2776slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3118slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2777{ 3119{
2778 AV *av = (AV *)frame->data; 3120 AV *av = (AV *)frame->data;
2779 SV *count_sv = AvARRAY (av)[0]; 3121 SV *count_sv = AvARRAY (av)[0];
3122 SV *coro_hv = SvRV (coro_current);
3123
3124 frame->destroy = 0;
2780 3125
2781 /* if we are about to throw, don't actually acquire the lock, just throw */ 3126 /* if we are about to throw, don't actually acquire the lock, just throw */
2782 if (CORO_THROW) 3127 if (ecb_expect_false (CORO_THROW))
3128 {
3129 /* we still might be responsible for the semaphore, so wake up others */
3130 coro_semaphore_adjust (aTHX_ av, 0);
3131
2783 return 0; 3132 return 0;
3133 }
2784 else if (SvIVX (count_sv) > 0) 3134 else if (SvIVX (count_sv) > 0)
2785 { 3135 {
2786 SvSTATE_current->on_destroy = 0;
2787
2788 if (acquire) 3136 if (acquire)
2789 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3137 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2790 else 3138 else
2791 coro_semaphore_adjust (aTHX_ av, 0); 3139 coro_semaphore_adjust (aTHX_ av, 0);
2792 3140
… …
2796 { 3144 {
2797 int i; 3145 int i;
2798 /* if we were woken up but can't down, we look through the whole */ 3146 /* if we were woken up but can't down, we look through the whole */
2799 /* waiters list and only add us if we aren't in there already */ 3147 /* waiters list and only add us if we aren't in there already */
2800 /* this avoids some degenerate memory usage cases */ 3148 /* this avoids some degenerate memory usage cases */
2801 3149 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2802 for (i = 1; i <= AvFILLp (av); ++i)
2803 if (AvARRAY (av)[i] == SvRV (coro_current)) 3150 if (AvARRAY (av)[i] == coro_hv)
2804 return 1; 3151 return 1;
2805 3152
2806 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3153 av_push (av, SvREFCNT_inc (coro_hv));
2807 return 1; 3154 return 1;
2808 } 3155 }
2809} 3156}
2810 3157
2811static int 3158static int
… …
2834 { 3181 {
2835 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3182 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2836 3183
2837 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3184 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2838 frame->prepare = prepare_schedule; 3185 frame->prepare = prepare_schedule;
2839
2840 /* to avoid race conditions when a woken-up coro gets terminated */ 3186 /* to avoid race conditions when a woken-up coro gets terminated */
2841 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3187 /* we arrange for a temporary on_destroy that calls adjust (0) */
2842 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3188 frame->destroy = coro_semaphore_destroy;
2843 } 3189 }
2844} 3190}
2845 3191
2846static void 3192static void
2847slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3193slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2905 { 3251 {
2906 api_ready (aTHX_ cb); 3252 api_ready (aTHX_ cb);
2907 sv_setiv (cb, 0); /* signal waiter */ 3253 sv_setiv (cb, 0); /* signal waiter */
2908 } 3254 }
2909 3255
2910 SvREFCNT_dec (cb); 3256 SvREFCNT_dec_NN (cb);
2911 3257
2912 --count; 3258 --count;
2913 } 3259 }
2914} 3260}
2915 3261
… …
3000 } 3346 }
3001 3347
3002 av_push (state, data_sv); 3348 av_push (state, data_sv);
3003 3349
3004 api_ready (aTHX_ coro); 3350 api_ready (aTHX_ coro);
3005 SvREFCNT_dec (coro); 3351 SvREFCNT_dec_NN (coro);
3006 SvREFCNT_dec ((AV *)state); 3352 SvREFCNT_dec_NN ((AV *)state);
3007} 3353}
3008 3354
3009static int 3355static int
3010slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3356slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3011{ 3357{
… …
3016 /* it quickly returns */ 3362 /* it quickly returns */
3017 if (CORO_THROW) 3363 if (CORO_THROW)
3018 return 0; 3364 return 0;
3019 3365
3020 /* one element that is an RV? repeat! */ 3366 /* one element that is an RV? repeat! */
3021 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3367 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3022 return 1; 3368 return 1;
3023 3369
3024 /* restore status */ 3370 /* restore status */
3025 { 3371 {
3026 SV *data_sv = av_pop (state); 3372 SV *data_sv = av_pop (state);
… …
3029 errno = data->errorno; 3375 errno = data->errorno;
3030 PL_laststype = data->laststype; 3376 PL_laststype = data->laststype;
3031 PL_laststatval = data->laststatval; 3377 PL_laststatval = data->laststatval;
3032 PL_statcache = data->statcache; 3378 PL_statcache = data->statcache;
3033 3379
3034 SvREFCNT_dec (data_sv); 3380 SvREFCNT_dec_NN (data_sv);
3035 } 3381 }
3036 3382
3037 /* push result values */ 3383 /* push result values */
3038 { 3384 {
3039 dSP; 3385 dSP;
… …
3065 dSP; 3411 dSP;
3066 3412
3067 static SV *prio_cv; 3413 static SV *prio_cv;
3068 static SV *prio_sv; 3414 static SV *prio_sv;
3069 3415
3070 if (expect_false (!prio_cv)) 3416 if (ecb_expect_false (!prio_cv))
3071 { 3417 {
3072 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3418 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3073 prio_sv = newSViv (0); 3419 prio_sv = newSViv (0);
3074 } 3420 }
3075 3421
… …
3181 } 3527 }
3182 3528
3183 return coro_sv; 3529 return coro_sv;
3184} 3530}
3185 3531
3532#ifndef __cplusplus
3533ecb_cold XS(boot_Coro__State);
3534#endif
3535
3536#if CORO_JIT
3537
3538static void ecb_noinline ecb_cold
3539pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3540{
3541 dSP;
3542 AV *av = newAV ();
3543
3544 av_store (av, 3, newSVuv (d));
3545 av_store (av, 2, newSVuv (c));
3546 av_store (av, 1, newSVuv (b));
3547 av_store (av, 0, newSVuv (a));
3548
3549 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3550
3551 PUTBACK;
3552}
3553
3554static void ecb_noinline ecb_cold
3555jit_init (pTHX)
3556{
3557 dSP;
3558 SV *load, *save;
3559 char *map_base;
3560 char *load_ptr, *save_ptr;
3561 STRLEN load_len, save_len, map_len;
3562 int count;
3563
3564 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3565
3566 PUSHMARK (SP);
3567 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3568 #include "state.h"
3569 count = call_pv ("Coro::State::_jit", G_ARRAY);
3570 SPAGAIN;
3571
3572 save = POPs; save_ptr = SvPVbyte (save, save_len);
3573 load = POPs; load_ptr = SvPVbyte (load, load_len);
3574
3575 map_len = load_len + save_len + 16;
3576
3577 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3578
3579 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3580
3581 load_perl_slots = (load_save_perl_slots_type)map_base;
3582 memcpy (map_base, load_ptr, load_len);
3583
3584 map_base += (load_len + 15) & ~15;
3585
3586 save_perl_slots = (load_save_perl_slots_type)map_base;
3587 memcpy (map_base, save_ptr, save_len);
3588
3589 /* we are good citizens and try to make the page read-only, so the evil evil */
3590 /* hackers might have it a bit more difficult */
3591 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3592
3593 PUTBACK;
3594 eval_pv ("undef &Coro::State::_jit", 1);
3595}
3596
3597#endif
3598
3186MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3599MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3187 3600
3188PROTOTYPES: DISABLE 3601PROTOTYPES: DISABLE
3189 3602
3190BOOT: 3603BOOT:
3191{ 3604{
3605#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3606#include "state.h"
3192#ifdef USE_ITHREADS 3607#ifdef USE_ITHREADS
3193# if CORO_PTHREAD 3608# if CORO_PTHREAD
3194 coro_thx = PERL_GET_CONTEXT; 3609 coro_thx = PERL_GET_CONTEXT;
3195# endif 3610# endif
3196#endif 3611#endif
3197 BOOT_PAGESIZE; 3612 /* perl defines these to check for existance first, but why it doesn't */
3613 /* just create them one at init time is not clear to me, except for */
3614 /* programs trying to delete them, but... */
3615 /* anyway, we declare this as invalid and make sure they are initialised here */
3616 DEFSV;
3617 ERRSV;
3198 3618
3199 cctx_current = cctx_new_empty (); 3619 cctx_current = cctx_new_empty ();
3200 3620
3201 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3621 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3202 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3622 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3203 3623
3204 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3624 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
3205 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3625 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
3206 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3626 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3207 3627
3208 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3209 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3628 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3210 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3629 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3211 3630
3212 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3631 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3213 3632
… …
3245 coroapi.prepare_cede_notself = prepare_cede_notself; 3664 coroapi.prepare_cede_notself = prepare_cede_notself;
3246 3665
3247 time_init (aTHX); 3666 time_init (aTHX);
3248 3667
3249 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3668 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3669#if CORO_JIT
3670 PUTBACK;
3671 jit_init (aTHX);
3672 SPAGAIN;
3673#endif
3250} 3674}
3251 3675
3252SV * 3676SV *
3253new (SV *klass, ...) 3677new (SV *klass, ...)
3254 ALIAS: 3678 ALIAS:
… …
3261void 3685void
3262transfer (...) 3686transfer (...)
3263 PROTOTYPE: $$ 3687 PROTOTYPE: $$
3264 CODE: 3688 CODE:
3265 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3689 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3266
3267void
3268_exit (int code)
3269 PROTOTYPE: $
3270 CODE:
3271 _exit (code);
3272 3690
3273SV * 3691SV *
3274clone (Coro::State coro) 3692clone (Coro::State coro)
3275 CODE: 3693 CODE:
3276{ 3694{
… …
3331void 3749void
3332list () 3750list ()
3333 PROTOTYPE: 3751 PROTOTYPE:
3334 PPCODE: 3752 PPCODE:
3335{ 3753{
3336 struct coro *coro; 3754 struct coro *coro;
3337 for (coro = coro_first; coro; coro = coro->next) 3755 for (coro = coro_first; coro; coro = coro->next)
3338 if (coro->hv) 3756 if (coro->hv)
3339 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3757 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3340} 3758}
3341 3759
… …
3396 PROTOTYPE: $ 3814 PROTOTYPE: $
3397 ALIAS: 3815 ALIAS:
3398 is_ready = CF_READY 3816 is_ready = CF_READY
3399 is_running = CF_RUNNING 3817 is_running = CF_RUNNING
3400 is_new = CF_NEW 3818 is_new = CF_NEW
3401 is_destroyed = CF_DESTROYED 3819 is_destroyed = CF_ZOMBIE
3820 is_zombie = CF_ZOMBIE
3402 is_suspended = CF_SUSPENDED 3821 is_suspended = CF_SUSPENDED
3403 CODE: 3822 CODE:
3404 RETVAL = boolSV (coro->flags & ix); 3823 RETVAL = boolSV (coro->flags & ix);
3405 OUTPUT: 3824 OUTPUT:
3406 RETVAL 3825 RETVAL
3407 3826
3408void 3827void
3409throw (Coro::State self, SV *exception = &PL_sv_undef) 3828throw (SV *self, SV *exception = &PL_sv_undef)
3410 PROTOTYPE: $;$ 3829 PROTOTYPE: $;$
3411 CODE: 3830 CODE:
3412{ 3831{
3832 struct coro *coro = SvSTATE (self);
3413 struct coro *current = SvSTATE_current; 3833 struct coro *current = SvSTATE_current;
3414 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3834 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3415 SvREFCNT_dec (*exceptionp); 3835 SvREFCNT_dec (*exceptionp);
3416 SvGETMAGIC (exception); 3836 SvGETMAGIC (exception);
3417 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3837 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3838
3839 api_ready (aTHX_ self);
3418} 3840}
3419 3841
3420void 3842void
3421api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3843api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3422 PROTOTYPE: $;$ 3844 PROTOTYPE: $;$
… …
3499 3921
3500void 3922void
3501times (Coro::State self) 3923times (Coro::State self)
3502 PPCODE: 3924 PPCODE:
3503{ 3925{
3504 struct coro *current = SvSTATE (coro_current); 3926 struct coro *current = SvSTATE (coro_current);
3505 3927
3506 if (expect_false (current == self)) 3928 if (ecb_expect_false (current == self))
3507 { 3929 {
3508 coro_times_update (); 3930 coro_times_update ();
3509 coro_times_add (SvSTATE (coro_current)); 3931 coro_times_add (SvSTATE (coro_current));
3510 } 3932 }
3511 3933
3512 EXTEND (SP, 2); 3934 EXTEND (SP, 2);
3513 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3935 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3514 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3936 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3515 3937
3516 if (expect_false (current == self)) 3938 if (ecb_expect_false (current == self))
3517 coro_times_sub (SvSTATE (coro_current)); 3939 coro_times_sub (SvSTATE (coro_current));
3518} 3940}
3519 3941
3520void 3942void
3521swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3943swap_sv (Coro::State coro, SV *sva, SV *svb)
3522 CODE: 3944 CODE:
3523{ 3945{
3524 struct coro *current = SvSTATE_current; 3946 struct coro *current = SvSTATE_current;
3947 AV *swap_sv;
3948 int i;
3949
3950 sva = SvRV (sva);
3951 svb = SvRV (svb);
3525 3952
3526 if (current == coro) 3953 if (current == coro)
3527 SWAP_SVS (current); 3954 SWAP_SVS_LEAVE (current);
3528 3955
3529 if (!coro->swap_sv) 3956 if (!coro->swap_sv)
3530 coro->swap_sv = newAV (); 3957 coro->swap_sv = newAV ();
3531 3958
3959 swap_sv = coro->swap_sv;
3960
3961 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3962 {
3963 SV *a = AvARRAY (swap_sv)[i ];
3964 SV *b = AvARRAY (swap_sv)[i + 1];
3965
3966 if (a == sva && b == svb)
3967 {
3968 SvREFCNT_dec_NN (a);
3969 SvREFCNT_dec_NN (b);
3970
3971 for (; i <= AvFILLp (swap_sv) - 2; i++)
3972 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
3973
3974 AvFILLp (swap_sv) -= 2;
3975
3976 goto removed;
3977 }
3978 }
3979
3532 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 3980 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3533 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 3981 av_push (swap_sv, SvREFCNT_inc_NN (svb));
3982
3983 removed:
3534 3984
3535 if (current == coro) 3985 if (current == coro)
3536 SWAP_SVS (current); 3986 SWAP_SVS_ENTER (current);
3537} 3987}
3538 3988
3539 3989
3540MODULE = Coro::State PACKAGE = Coro 3990MODULE = Coro::State PACKAGE = Coro
3541 3991
3542BOOT: 3992BOOT:
3543{ 3993{
3994 if (SVt_LAST > 32)
3995 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3996
3544 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3997 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3545 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3998 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3546 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3999 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3547 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3548 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4000 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3549 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4001 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3550 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4002 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3551 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4003 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3552 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4004 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3553 4005
3554 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4006 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3555 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4007 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3556 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4008 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3557 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 4009 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3558 4010
3559 coro_stash = gv_stashpv ("Coro", TRUE); 4011 coro_stash = gv_stashpv ("Coro", TRUE);
3560 4012
3561 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4013 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3562 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4014 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3563 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4015 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3575 coroapi.ready = api_ready; 4027 coroapi.ready = api_ready;
3576 coroapi.is_ready = api_is_ready; 4028 coroapi.is_ready = api_is_ready;
3577 coroapi.nready = coro_nready; 4029 coroapi.nready = coro_nready;
3578 coroapi.current = coro_current; 4030 coroapi.current = coro_current;
3579 4031
4032 coroapi.enterleave_hook = api_enterleave_hook;
4033 coroapi.enterleave_unhook = api_enterleave_unhook;
4034 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4035
3580 /*GCoroAPI = &coroapi;*/ 4036 /*GCoroAPI = &coroapi;*/
3581 sv_setiv (sv, (IV)&coroapi); 4037 sv_setiv (sv, (IV)&coroapi);
3582 SvREADONLY_on (sv); 4038 SvREADONLY_on (sv);
3583 } 4039 }
3584} 4040}
… …
3595void 4051void
3596_destroy (Coro::State coro) 4052_destroy (Coro::State coro)
3597 CODE: 4053 CODE:
3598 /* used by the manager thread */ 4054 /* used by the manager thread */
3599 coro_state_destroy (aTHX_ coro); 4055 coro_state_destroy (aTHX_ coro);
4056
4057void
4058on_destroy (Coro::State coro, SV *cb)
4059 CODE:
3600 coro_call_on_destroy (aTHX_ coro); 4060 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4061
4062void
4063join (...)
4064 CODE:
4065 CORO_EXECUTE_SLF_XS (slf_init_join);
3601 4066
3602void 4067void
3603terminate (...) 4068terminate (...)
3604 CODE: 4069 CODE:
3605 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4070 CORO_EXECUTE_SLF_XS (slf_init_terminate);
… …
3607void 4072void
3608cancel (...) 4073cancel (...)
3609 CODE: 4074 CODE:
3610 CORO_EXECUTE_SLF_XS (slf_init_cancel); 4075 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3611 4076
4077int
4078safe_cancel (Coro::State self, ...)
4079 C_ARGS: aTHX_ self, &ST (1), items - 1
4080
3612void 4081void
3613schedule (...) 4082schedule (...)
3614 CODE: 4083 CODE:
3615 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4084 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3616 4085
… …
3636 4105
3637void 4106void
3638_set_current (SV *current) 4107_set_current (SV *current)
3639 PROTOTYPE: $ 4108 PROTOTYPE: $
3640 CODE: 4109 CODE:
3641 SvREFCNT_dec (SvRV (coro_current)); 4110 SvREFCNT_dec_NN (SvRV (coro_current));
3642 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4111 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3643 4112
3644void 4113void
3645_set_readyhook (SV *hook) 4114_set_readyhook (SV *hook)
3646 PROTOTYPE: $ 4115 PROTOTYPE: $
… …
3730 4199
3731 if ((SV *)hv == &PL_sv_undef) 4200 if ((SV *)hv == &PL_sv_undef)
3732 { 4201 {
3733 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4202 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3734 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4203 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3735 SvREFCNT_dec (sv); 4204 SvREFCNT_dec_NN (sv);
3736 } 4205 }
3737 4206
3738 { 4207 {
3739 struct coro *coro = SvSTATE_hv (hv); 4208 struct coro *coro = SvSTATE_hv (hv);
3740 4209
… …
3747 api_ready (aTHX_ (SV *)hv); 4216 api_ready (aTHX_ (SV *)hv);
3748 4217
3749 if (GIMME_V != G_VOID) 4218 if (GIMME_V != G_VOID)
3750 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4219 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3751 else 4220 else
3752 SvREFCNT_dec (hv); 4221 SvREFCNT_dec_NN (hv);
3753} 4222}
3754 4223
3755SV * 4224SV *
3756rouse_cb () 4225rouse_cb ()
3757 PROTOTYPE: 4226 PROTOTYPE:
… …
3772 on_leave = 1 4241 on_leave = 1
3773 PROTOTYPE: & 4242 PROTOTYPE: &
3774 CODE: 4243 CODE:
3775{ 4244{
3776 struct coro *coro = SvSTATE_current; 4245 struct coro *coro = SvSTATE_current;
3777 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4246 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3778 4247
3779 block = s_get_cv_croak (block); 4248 block = s_get_cv_croak (block);
3780 4249
3781 if (!*avp) 4250 if (!*avp)
3782 *avp = newAV (); 4251 *avp = newAV ();
… …
3802 4271
3803SV * 4272SV *
3804new (SV *klass, SV *count = 0) 4273new (SV *klass, SV *count = 0)
3805 CODE: 4274 CODE:
3806{ 4275{
3807 int semcnt = 1; 4276 int semcnt = 1;
3808 4277
3809 if (count) 4278 if (count)
3810 { 4279 {
3811 SvGETMAGIC (count); 4280 SvGETMAGIC (count);
3812 4281
… …
3836 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4305 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3837 OUTPUT: 4306 OUTPUT:
3838 RETVAL 4307 RETVAL
3839 4308
3840void 4309void
3841up (SV *self, int adjust = 1) 4310up (SV *self)
3842 ALIAS:
3843 adjust = 1
3844 CODE: 4311 CODE:
4312 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4313
4314void
4315adjust (SV *self, int adjust)
4316 CODE:
3845 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4317 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3846 4318
3847void 4319void
3848down (...) 4320down (...)
3849 CODE: 4321 CODE:
3850 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4322 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3872 XSRETURN_NO; 4344 XSRETURN_NO;
3873} 4345}
3874 4346
3875void 4347void
3876waiters (SV *self) 4348waiters (SV *self)
3877 PPCODE: 4349 PPCODE:
3878{ 4350{
3879 AV *av = (AV *)SvRV (self); 4351 AV *av = (AV *)SvRV (self);
3880 int wcount = AvFILLp (av) + 1 - 1; 4352 int wcount = AvFILLp (av) + 1 - 1;
3881 4353
3882 if (GIMME_V == G_SCALAR) 4354 if (GIMME_V == G_SCALAR)
… …
3891} 4363}
3892 4364
3893MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4365MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3894 4366
3895void 4367void
3896_may_delete (SV *sem, int count, int extra_refs) 4368_may_delete (SV *sem, int count, unsigned int extra_refs)
3897 PPCODE: 4369 PPCODE:
3898{ 4370{
3899 AV *av = (AV *)SvRV (sem); 4371 AV *av = (AV *)SvRV (sem);
3900 4372
3901 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4373 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3902 && AvFILLp (av) == 0 /* no waiters, just count */ 4374 && AvFILLp (av) == 0 /* no waiters, just count */
3903 && SvIV (AvARRAY (av)[0]) == count) 4375 && SvIV (AvARRAY (av)[0]) == count)
3904 XSRETURN_YES; 4376 XSRETURN_YES;
… …
3925 4397
3926void 4398void
3927broadcast (SV *self) 4399broadcast (SV *self)
3928 CODE: 4400 CODE:
3929{ 4401{
3930 AV *av = (AV *)SvRV (self); 4402 AV *av = (AV *)SvRV (self);
3931 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4403 coro_signal_wake (aTHX_ av, AvFILLp (av));
3932} 4404}
3933 4405
3934void 4406void
3935send (SV *self) 4407send (SV *self)
… …
3943 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4415 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3944} 4416}
3945 4417
3946IV 4418IV
3947awaited (SV *self) 4419awaited (SV *self)
3948 CODE: 4420 CODE:
3949 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4421 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3950 OUTPUT: 4422 OUTPUT:
3951 RETVAL 4423 RETVAL
3952 4424
3953 4425
… …
3958 4430
3959void 4431void
3960_schedule (...) 4432_schedule (...)
3961 CODE: 4433 CODE:
3962{ 4434{
3963 static int incede; 4435 static int incede;
3964 4436
3965 api_cede_notself (aTHX); 4437 api_cede_notself (aTHX);
3966 4438
3967 ++incede; 4439 ++incede;
3968 while (coro_nready >= incede && api_cede (aTHX)) 4440 while (coro_nready >= incede && api_cede (aTHX))
… …
4012 { 4484 {
4013 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4485 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4014 coro_old_pp_sselect = 0; 4486 coro_old_pp_sselect = 0;
4015 } 4487 }
4016 4488
4489MODULE = Coro::State PACKAGE = Coro::Util
4490
4491void
4492_exit (int code)
4493 CODE:
4494 _exit (code);
4495
4496NV
4497time ()
4498 CODE:
4499 RETVAL = nvtime (aTHX);
4500 OUTPUT:
4501 RETVAL
4502
4503NV
4504gettimeofday ()
4505 PPCODE:
4506{
4507 UV tv [2];
4508 u2time (aTHX_ tv);
4509 EXTEND (SP, 2);
4510 PUSHs (sv_2mortal (newSVuv (tv [0])));
4511 PUSHs (sv_2mortal (newSVuv (tv [1])));
4512}
4513

Diff Legend

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