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.388 by root, Wed Feb 23 07:14:22 2011 UTC vs.
Revision 1.461 by root, Fri Jun 17 16:29:50 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
24#endif 37#endif
25 38
26#ifdef WIN32 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
66#endif
67
68#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY 69# undef HAS_GETTIMEOFDAY
28# undef setjmp 70# undef setjmp
29# undef longjmp 71# undef longjmp
30# undef _exit 72# undef _exit
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
196 int valgrind_id; 194 int valgrind_id;
197#endif 195#endif
198 unsigned char flags; 196 unsigned char flags;
199} coro_cctx; 197} coro_cctx;
200 198
201coro_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 */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
211}; 213};
212 214
213/* 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 */
214typedef struct 216typedef struct
215{ 217{
216 SV *defsv;
217 AV *defav;
218 SV *errsv;
219 SV *irsgv;
220 HV *hinthv;
221#define VAR(name,type) type name; 218 #define VARx(name,expr,type) type name;
222# include "state.h" 219 #include "state.h"
223#undef VAR
224} perl_slots; 220} perl_slots;
225 221
222/* how many context stack entries do we need for perl_slots */
226#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))
227 224
228/* this is a structure representing a perl-level coroutine */ 225/* this is a structure representing a perl-level coroutine */
229struct coro { 226struct coro
227{
230 /* the C coroutine allocated to this perl coroutine, if any */ 228 /* the C coroutine allocated to this perl coroutine, if any */
231 coro_cctx *cctx; 229 coro_cctx *cctx;
232 230
233 /* ready queue */ 231 /* ready queue */
234 struct coro *next_ready; 232 struct coro *next_ready;
… …
236 /* state data */ 234 /* state data */
237 struct CoroSLF slf_frame; /* saved slf frame */ 235 struct CoroSLF slf_frame; /* saved slf frame */
238 AV *mainstack; 236 AV *mainstack;
239 perl_slots *slot; /* basically the saved sp */ 237 perl_slots *slot; /* basically the saved sp */
240 238
241 CV *startcv; /* the CV to execute */ 239 CV *startcv; /* the CV to execute */
242 AV *args; /* data associated with this coroutine (initial args) */ 240 AV *args; /* data associated with this coroutine (initial args) */
243 int refcnt; /* coroutines are refcounted, yes */
244 int flags; /* CF_ flags */ 241 int flags; /* CF_ flags */
245 HV *hv; /* the perl hash associated with this coro, if any */ 242 HV *hv; /* the perl hash associated with this coro, if any */
246 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
247 243
248 /* statistics */ 244 /* statistics */
249 int usecount; /* number of transfers to this coro */ 245 int usecount; /* number of transfers to this coro */
250 246
251 /* coro process data */ 247 /* coro process data */
252 int prio; 248 int prio;
253 SV *except; /* exception to be thrown */ 249 SV *except; /* exception to be thrown */
254 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 */
255 253
256 /* async_pool */ 254 /* async_pool */
257 SV *saved_deffh; 255 SV *saved_deffh;
258 SV *invoke_cb; 256 SV *invoke_cb;
259 AV *invoke_av; 257 AV *invoke_av;
260 258
261 /* on_enter/on_leave */ 259 /* on_enter/on_leave */
262 AV *on_enter; 260 AV *on_enter; AV *on_enter_xs;
263 AV *on_leave; 261 AV *on_leave; AV *on_leave_xs;
264 262
265 /* swap_sv */ 263 /* swap_sv */
266 AV *swap_sv; 264 AV *swap_sv;
267 265
268 /* times */ 266 /* times */
… …
275typedef struct coro *Coro__State; 273typedef struct coro *Coro__State;
276typedef struct coro *Coro__State_or_hashref; 274typedef struct coro *Coro__State_or_hashref;
277 275
278/* the following variables are effectively part of the perl context */ 276/* the following variables are effectively part of the perl context */
279/* and get copied between struct coro and these variables */ 277/* and get copied between struct coro and these variables */
280/* the mainr easonw e don't support windows process emulation */ 278/* the main reason we don't support windows process emulation */
281static struct CoroSLF slf_frame; /* the current slf frame */ 279static struct CoroSLF slf_frame; /* the current slf frame */
282 280
283/** Coro ********************************************************************/ 281/** Coro ********************************************************************/
284 282
285#define CORO_PRIO_MAX 3 283#define CORO_PRIO_MAX 3
… …
291 289
292/* for Coro.pm */ 290/* for Coro.pm */
293static SV *coro_current; 291static SV *coro_current;
294static SV *coro_readyhook; 292static SV *coro_readyhook;
295static 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 */
296static CV *cv_coro_run, *cv_coro_terminate; 294static CV *cv_coro_run;
297static struct coro *coro_first; 295static struct coro *coro_first;
298#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
299 320
300/** Coro::Select ************************************************************/ 321/** Coro::Select ************************************************************/
301 322
302static OP *(*coro_old_pp_sselect) (pTHX); 323static OP *(*coro_old_pp_sselect) (pTHX);
303static SV *coro_select_select; 324static SV *coro_select_select;
… …
319 340
320/** time stuff **************************************************************/ 341/** time stuff **************************************************************/
321 342
322#ifdef HAS_GETTIMEOFDAY 343#ifdef HAS_GETTIMEOFDAY
323 344
324static void 345ecb_inline void
325coro_u2time (pTHX_ UV ret[2]) 346coro_u2time (pTHX_ UV ret[2])
326{ 347{
327 struct timeval tv; 348 struct timeval tv;
328 gettimeofday (&tv, 0); 349 gettimeofday (&tv, 0);
329 350
330 ret [0] = tv.tv_sec; 351 ret [0] = tv.tv_sec;
331 ret [1] = tv.tv_usec; 352 ret [1] = tv.tv_usec;
332} 353}
333 354
334static double 355ecb_inline double
335coro_nvtime () 356coro_nvtime (void)
336{ 357{
337 struct timeval tv; 358 struct timeval tv;
338 gettimeofday (&tv, 0); 359 gettimeofday (&tv, 0);
339 360
340 return tv.tv_sec + tv.tv_usec * 1e-6; 361 return tv.tv_sec + tv.tv_usec * 1e-6;
341} 362}
342 363
343static void 364ecb_inline void
344time_init (pTHX) 365time_init (pTHX)
345{ 366{
346 nvtime = coro_nvtime; 367 nvtime = coro_nvtime;
347 u2time = coro_u2time; 368 u2time = coro_u2time;
348} 369}
349 370
350#else 371#else
351 372
352static void 373ecb_inline void
353time_init (pTHX) 374time_init (pTHX)
354{ 375{
355 SV **svp; 376 SV **svp;
356 377
357 require_pv ("Time/HiRes.pm"); 378 require_pv ("Time/HiRes.pm");
358 379
359 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 380 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
360 381
361 if (!svp) croak ("Time::HiRes is required, but missing."); 382 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
362 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 383 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
363 384
364 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 385 nvtime = INT2PTR (double (*)(), SvIV (*svp));
365 386
366 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0); 387 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
367 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp)); 388 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
… …
369 390
370#endif 391#endif
371 392
372/** lowlevel stuff **********************************************************/ 393/** lowlevel stuff **********************************************************/
373 394
374static SV * 395static SV * ecb_noinline
375coro_get_sv (pTHX_ const char *name, int create) 396coro_get_sv (pTHX_ const char *name, int create)
376{ 397{
377#if PERL_VERSION_ATLEAST (5,10,0) 398#if PERL_VERSION_ATLEAST (5,10,0)
378 /* 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 */
379 get_sv (name, create); 400 get_sv (name, create);
380#endif 401#endif
381 return get_sv (name, create); 402 return get_sv (name, create);
382} 403}
383 404
384static AV * 405static AV * ecb_noinline
385coro_get_av (pTHX_ const char *name, int create) 406coro_get_av (pTHX_ const char *name, int create)
386{ 407{
387#if PERL_VERSION_ATLEAST (5,10,0) 408#if PERL_VERSION_ATLEAST (5,10,0)
388 /* 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 */
389 get_av (name, create); 410 get_av (name, create);
390#endif 411#endif
391 return get_av (name, create); 412 return get_av (name, create);
392} 413}
393 414
394static HV * 415static HV * ecb_noinline
395coro_get_hv (pTHX_ const char *name, int create) 416coro_get_hv (pTHX_ const char *name, int create)
396{ 417{
397#if PERL_VERSION_ATLEAST (5,10,0) 418#if PERL_VERSION_ATLEAST (5,10,0)
398 /* 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 */
399 get_hv (name, create); 420 get_hv (name, create);
400#endif 421#endif
401 return get_hv (name, create); 422 return get_hv (name, create);
402} 423}
403 424
404INLINE void 425ecb_inline void
405coro_times_update () 426coro_times_update (void)
406{ 427{
407#ifdef coro_clock_gettime 428#ifdef coro_clock_gettime
408 struct timespec ts; 429 struct timespec ts;
409 430
410 ts.tv_sec = ts.tv_nsec = 0; 431 ts.tv_sec = ts.tv_nsec = 0;
… …
422 time_real [0] = tv [0]; 443 time_real [0] = tv [0];
423 time_real [1] = tv [1] * 1000; 444 time_real [1] = tv [1] * 1000;
424#endif 445#endif
425} 446}
426 447
427INLINE void 448ecb_inline void
428coro_times_add (struct coro *c) 449coro_times_add (struct coro *c)
429{ 450{
430 c->t_real [1] += time_real [1]; 451 c->t_real [1] += time_real [1];
431 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]; }
432 c->t_real [0] += time_real [0]; 453 c->t_real [0] += time_real [0];
… …
434 c->t_cpu [1] += time_cpu [1]; 455 c->t_cpu [1] += time_cpu [1];
435 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]; }
436 c->t_cpu [0] += time_cpu [0]; 457 c->t_cpu [0] += time_cpu [0];
437} 458}
438 459
439INLINE void 460ecb_inline void
440coro_times_sub (struct coro *c) 461coro_times_sub (struct coro *c)
441{ 462{
442 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]; }
443 c->t_real [1] -= time_real [1]; 464 c->t_real [1] -= time_real [1];
444 c->t_real [0] -= time_real [0]; 465 c->t_real [0] -= time_real [0];
… …
452/* magic glue */ 473/* magic glue */
453 474
454#define CORO_MAGIC_type_cv 26 475#define CORO_MAGIC_type_cv 26
455#define CORO_MAGIC_type_state PERL_MAGIC_ext 476#define CORO_MAGIC_type_state PERL_MAGIC_ext
456 477
457#define CORO_MAGIC_NN(sv, type) \ 478#define CORO_MAGIC_NN(sv, type) \
458 (expect_true (SvMAGIC (sv)->mg_type == type) \ 479 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
459 ? SvMAGIC (sv) \ 480 ? SvMAGIC (sv) \
460 : mg_find (sv, type)) 481 : mg_find (sv, type))
461 482
462#define CORO_MAGIC(sv, type) \ 483#define CORO_MAGIC(sv, type) \
463 (expect_true (SvMAGIC (sv)) \ 484 (ecb_expect_true (SvMAGIC (sv)) \
464 ? CORO_MAGIC_NN (sv, type) \ 485 ? CORO_MAGIC_NN (sv, type) \
465 : 0) 486 : 0)
466 487
467#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)
468#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)
469 490
470INLINE struct coro * 491ecb_inline MAGIC *
471SvSTATE_ (pTHX_ SV *coro) 492SvSTATEhv_p (pTHX_ SV *coro)
472{ 493{
473 HV *stash;
474 MAGIC *mg; 494 MAGIC *mg;
475 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
476 if (SvROK (coro)) 511 if (SvROK (coro_sv))
477 coro = SvRV (coro); 512 coro_sv = SvRV (coro_sv);
478 513
479 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 514 mg = SvSTATEhv_p (aTHX_ coro_sv);
515 if (!mg)
480 croak ("Coro::State object required"); 516 croak ("Coro::State object required");
481 517
482 stash = SvSTASH (coro);
483 if (expect_false (stash != coro_stash && stash != coro_state_stash))
484 {
485 /* very slow, but rare, check */
486 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
487 croak ("Coro::State object required");
488 }
489
490 mg = CORO_MAGIC_state (coro);
491 return (struct coro *)mg->mg_ptr; 518 return (struct coro *)mg->mg_ptr;
492} 519}
493 520
494#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 521#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
495 522
… …
498#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 525#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
499 526
500/*****************************************************************************/ 527/*****************************************************************************/
501/* padlist management and caching */ 528/* padlist management and caching */
502 529
503static AV * 530ecb_inline PADLIST *
504coro_derive_padlist (pTHX_ CV *cv) 531coro_derive_padlist (pTHX_ CV *cv)
505{ 532{
506 AV *padlist = CvPADLIST (cv); 533 PADLIST *padlist = CvPADLIST (cv);
507 AV *newpadlist, *newpad; 534 PADLIST *newpadlist;
535 PADNAMELIST *padnames;
536 PAD *newpad;
537 PADOFFSET off = PadlistMAX (padlist) + 1;
508 538
509 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. */
510 AvREAL_off (newpadlist); 567 AvREAL_off (newpadlist);
511#if PERL_VERSION_ATLEAST (5,10,0)
512 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
513#else
514 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
515#endif 568#endif
516 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
517 --AvFILLp (padlist);
518 569
519 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 570 /* Already extended to 2 elements by newPADLIST. */
520 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;
521 578
522 return newpadlist; 579 return newpadlist;
523} 580}
524 581
525static void 582ecb_inline void
526free_padlist (pTHX_ AV *padlist) 583free_padlist (pTHX_ PADLIST *padlist)
527{ 584{
528 /* may be during global destruction */ 585 /* may be during global destruction */
529 if (!IN_DESTRUCT) 586 if (!IN_DESTRUCT)
530 { 587 {
531 I32 i = AvFILLp (padlist); 588 I32 i = PadlistMAX (padlist);
532 589
533 while (i > 0) /* special-case index 0 */ 590 while (i > 0) /* special-case index 0 */
534 { 591 {
535 /* we try to be extra-careful here */ 592 /* we try to be extra-careful here */
536 AV *av = (AV *)AvARRAY (padlist)[i--]; 593 PAD *pad = PadlistARRAY (padlist)[i--];
537 I32 j = AvFILLp (av);
538 594
595 if (pad)
596 {
597 I32 j = PadMAX (pad);
598
539 while (j >= 0) 599 while (j >= 0)
540 SvREFCNT_dec (AvARRAY (av)[j--]); 600 SvREFCNT_dec (PadARRAY (pad)[j--]);
541 601
542 AvFILLp (av) = -1; 602 PadMAX (pad) = -1;
543 SvREFCNT_dec (av); 603 SvREFCNT_dec (pad);
604 }
544 } 605 }
545 606
546 SvREFCNT_dec (AvARRAY (padlist)[0]); 607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
547 608
609#if NEWPADAPI
610 Safefree (PadlistARRAY (padlist));
611 Safefree (padlist);
612#else
548 AvFILLp (padlist) = -1; 613 AvFILLp (padlist) = -1;
614 AvREAL_off (padlist);
549 SvREFCNT_dec ((SV*)padlist); 615 SvREFCNT_dec ((SV*)padlist);
616#endif
550 } 617 }
551} 618}
552 619
553static int 620static int
554coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 621coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
555{ 622{
556 AV *padlist; 623 PADLIST *padlist;
557 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;
558 626
559 /* perl manages to free our internal AV and _then_ call us */ 627 /* perl manages to free our internal AV and _then_ call us */
560 if (IN_DESTRUCT) 628 if (IN_DESTRUCT)
561 return 0; 629 return 0;
562 630
563 /* casting is fun. */ 631 while (len--)
564 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
565 free_padlist (aTHX_ padlist); 632 free_padlist (aTHX_ padlists[len]);
566
567 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
568 633
569 return 0; 634 return 0;
570} 635}
571 636
572static MGVTBL coro_cv_vtbl = { 637static MGVTBL coro_cv_vtbl = {
573 0, 0, 0, 0, 638 0, 0, 0, 0,
574 coro_cv_free 639 coro_cv_free
575}; 640};
576 641
577/* the next two functions merely cache the padlists */ 642/* the next two functions merely cache the padlists */
578static void 643ecb_inline void
579get_padlist (pTHX_ CV *cv) 644get_padlist (pTHX_ CV *cv)
580{ 645{
581 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
582 AV *av; 647 size_t *lenp;
583 648
584 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 649 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
585 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 650 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
586 else 651 else
587 { 652 {
588#if CORO_PREFER_PERL_FUNCTIONS 653#if CORO_PREFER_PERL_FUNCTIONS
589 /* this is probably cleaner? but also slower! */ 654 /* this is probably cleaner? but also slower! */
590 /* in practise, it seems to be less stable */ 655 /* in practise, it seems to be less stable */
… …
596 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 661 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
597#endif 662#endif
598 } 663 }
599} 664}
600 665
601static void 666ecb_inline void
602put_padlist (pTHX_ CV *cv) 667put_padlist (pTHX_ CV *cv)
603{ 668{
604 MAGIC *mg = CORO_MAGIC_cv (cv); 669 MAGIC *mg = CORO_MAGIC_cv (cv);
605 AV *av;
606 670
607 if (expect_false (!mg)) 671 if (ecb_expect_false (!mg))
672 {
608 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);
609 681
610 av = (AV *)mg->mg_obj; 682 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
611
612 if (expect_false (AvFILLp (av) >= AvMAX (av)))
613 av_extend (av, AvFILLp (av) + 1);
614
615 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
616} 683}
617 684
618/** load & save, init *******************************************************/ 685/** load & save, init *******************************************************/
619 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
620/* swap sv heads, at least logically */ 729/* swap sv heads, at least logically */
621static void 730static void
622swap_svs (pTHX_ Coro__State c) 731swap_svs_enter (pTHX_ Coro__State c)
623{ 732{
624 int i; 733 int i;
625 734
626 for (i = 0; i <= AvFILLp (c->swap_sv); ) 735 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
627 { 736 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
628 SV *a = AvARRAY (c->swap_sv)[i++];
629 SV *b = AvARRAY (c->swap_sv)[i++];
630
631 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
632 SV tmp;
633
634 /* swap sv_any */
635 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
636
637 /* swap sv_flags */
638 SvFLAGS (&tmp) = SvFLAGS (a);
639 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
640 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
641
642#if PERL_VERSION_ATLEAST (5,10,0)
643 /* perl 5.10 complicates this _quite_ a bit, but it also is
644 * much faster, so no quarrels here. alternatively, we could
645 * sv_upgrade to avoid this.
646 */
647 {
648 /* swap sv_u */
649 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
650
651 /* if SvANY points to the head, we need to adjust the pointers,
652 * as the pointer for a still points to b, and maybe vice versa.
653 */
654 #define svany_in_head(type) \
655 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
656
657 if (svany_in_head (SvTYPE (a)))
658 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
659
660 if (svany_in_head (SvTYPE (b)))
661 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
662 }
663#endif
664 }
665} 737}
666 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
667#define SWAP_SVS(coro) \ 748#define SWAP_SVS_ENTER(coro) \
668 if (expect_false ((coro)->swap_sv)) \ 749 if (ecb_expect_false ((coro)->swap_sv)) \
669 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))
670 755
671static void 756static void
672on_enterleave_call (pTHX_ SV *cb); 757on_enterleave_call (pTHX_ SV *cb);
673 758
674static void 759static void
… …
677 perl_slots *slot = c->slot; 762 perl_slots *slot = c->slot;
678 c->slot = 0; 763 c->slot = 0;
679 764
680 PL_mainstack = c->mainstack; 765 PL_mainstack = c->mainstack;
681 766
682 GvSV (PL_defgv) = slot->defsv; 767#if CORO_JIT
683 GvAV (PL_defgv) = slot->defav; 768 load_perl_slots (slot);
684 GvSV (PL_errgv) = slot->errsv; 769#else
685 GvSV (irsgv) = slot->irsgv;
686 GvHV (PL_hintgv) = slot->hinthv;
687
688 #define VAR(name,type) PL_ ## name = slot->name; 770 #define VARx(name,expr,type) expr = slot->name;
689 # include "state.h" 771 #include "state.h"
690 #undef VAR 772#endif
691 773
692 { 774 {
693 dSP; 775 dSP;
694 776
695 CV *cv; 777 CV *cv;
696 778
697 /* now do the ugly restore mess */ 779 /* now do the ugly restore mess */
698 while (expect_true (cv = (CV *)POPs)) 780 while (ecb_expect_true (cv = (CV *)POPs))
699 { 781 {
700 put_padlist (aTHX_ cv); /* mark this padlist as available */ 782 put_padlist (aTHX_ cv); /* mark this padlist as available */
701 CvDEPTH (cv) = PTR2IV (POPs); 783 CvDEPTH (cv) = PTR2IV (POPs);
702 CvPADLIST (cv) = (AV *)POPs; 784 CvPADLIST (cv) = (PADLIST *)POPs;
703 } 785 }
704 786
705 PUTBACK; 787 PUTBACK;
706 } 788 }
707 789
708 slf_frame = c->slf_frame; 790 slf_frame = c->slf_frame;
709 CORO_THROW = c->except; 791 CORO_THROW = c->except;
710 792
711 if (expect_false (enable_times)) 793 if (ecb_expect_false (enable_times))
712 { 794 {
713 if (expect_false (!times_valid)) 795 if (ecb_expect_false (!times_valid))
714 coro_times_update (); 796 coro_times_update ();
715 797
716 coro_times_sub (c); 798 coro_times_sub (c);
717 } 799 }
718 800
719 if (expect_false (c->on_enter)) 801 if (ecb_expect_false (c->on_enter))
720 { 802 {
721 int i; 803 int i;
722 804
723 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 805 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
724 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 806 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
725 } 807 }
726 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
727 SWAP_SVS (c); 817 SWAP_SVS_ENTER (c);
728} 818}
729 819
730static void 820static void
731save_perl (pTHX_ Coro__State c) 821save_perl (pTHX_ Coro__State c)
732{ 822{
733 SWAP_SVS (c); 823 SWAP_SVS_LEAVE (c);
734 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
735 if (expect_false (c->on_leave)) 833 if (ecb_expect_false (c->on_leave))
736 { 834 {
737 int i; 835 int i;
738 836
739 for (i = AvFILLp (c->on_leave); i >= 0; --i) 837 for (i = AvFILLp (c->on_leave); i >= 0; --i)
740 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 838 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
741 } 839 }
742 840
743 times_valid = 0; 841 times_valid = 0;
744 842
745 if (expect_false (enable_times)) 843 if (ecb_expect_false (enable_times))
746 { 844 {
747 coro_times_update (); times_valid = 1; 845 coro_times_update (); times_valid = 1;
748 coro_times_add (c); 846 coro_times_add (c);
749 } 847 }
750 848
… …
764 862
765 XPUSHs (Nullsv); 863 XPUSHs (Nullsv);
766 /* this loop was inspired by pp_caller */ 864 /* this loop was inspired by pp_caller */
767 for (;;) 865 for (;;)
768 { 866 {
769 while (expect_true (cxix >= 0)) 867 while (ecb_expect_true (cxix >= 0))
770 { 868 {
771 PERL_CONTEXT *cx = &ccstk[cxix--]; 869 PERL_CONTEXT *cx = &ccstk[cxix--];
772 870
773 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))
774 { 872 {
775 CV *cv = cx->blk_sub.cv; 873 CV *cv = cx->blk_sub.cv;
776 874
777 if (expect_true (CvDEPTH (cv))) 875 if (ecb_expect_true (CvDEPTH (cv)))
778 { 876 {
779 EXTEND (SP, 3); 877 EXTEND (SP, 3);
780 PUSHs ((SV *)CvPADLIST (cv)); 878 PUSHs ((SV *)CvPADLIST (cv));
781 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 879 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
782 PUSHs ((SV *)cv); 880 PUSHs ((SV *)cv);
… …
785 get_padlist (aTHX_ cv); 883 get_padlist (aTHX_ cv);
786 } 884 }
787 } 885 }
788 } 886 }
789 887
790 if (expect_true (top_si->si_type == PERLSI_MAIN)) 888 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
791 break; 889 break;
792 890
793 top_si = top_si->si_prev; 891 top_si = top_si->si_prev;
794 ccstk = top_si->si_cxstack; 892 ccstk = top_si->si_cxstack;
795 cxix = top_si->si_cxix; 893 cxix = top_si->si_cxix;
… …
797 895
798 PUTBACK; 896 PUTBACK;
799 } 897 }
800 898
801 /* allocate some space on the context stack for our purposes */ 899 /* allocate some space on the context stack for our purposes */
802 /* we manually unroll here, as usually 2 slots is enough */ 900 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
803 if (SLOT_COUNT >= 1) CXINC;
804 if (SLOT_COUNT >= 2) CXINC;
805 if (SLOT_COUNT >= 3) CXINC;
806 { 901 {
807 unsigned int i; 902 unsigned int i;
903
808 for (i = 3; i < SLOT_COUNT; ++i) 904 for (i = 0; i < SLOT_COUNT; ++i)
809 CXINC; 905 CXINC;
810 } 906
811 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 907 cxstack_ix -= SLOT_COUNT; /* undo allocation */
908 }
812 909
813 c->mainstack = PL_mainstack; 910 c->mainstack = PL_mainstack;
814 911
815 { 912 {
816 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 913 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
817 914
818 slot->defav = GvAV (PL_defgv); 915#if CORO_JIT
819 slot->defsv = DEFSV; 916 save_perl_slots (slot);
820 slot->errsv = ERRSV; 917#else
821 slot->irsgv = GvSV (irsgv);
822 slot->hinthv = GvHV (PL_hintgv);
823
824 #define VAR(name,type) slot->name = PL_ ## name; 918 #define VARx(name,expr,type) slot->name = expr;
825 # include "state.h" 919 #include "state.h"
826 #undef VAR 920#endif
827 } 921 }
828} 922}
829 923
830/* 924/*
831 * allocate various perl stacks. This is almost an exact copy 925 * allocate various perl stacks. This is almost an exact copy
… …
837# define coro_init_stacks(thx) init_stacks () 931# define coro_init_stacks(thx) init_stacks ()
838#else 932#else
839static void 933static void
840coro_init_stacks (pTHX) 934coro_init_stacks (pTHX)
841{ 935{
842 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() */
843 PL_curstackinfo->si_type = PERLSI_MAIN; 937 PL_curstackinfo->si_type = PERLSI_MAIN;
844 PL_curstack = PL_curstackinfo->si_stack; 938 PL_curstack = PL_curstackinfo->si_stack;
845 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 939 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
846 940
847 PL_stack_base = AvARRAY(PL_curstack); 941 PL_stack_base = AvARRAY(PL_curstack);
… …
862#endif 956#endif
863 957
864 New(54,PL_scopestack,8,I32); 958 New(54,PL_scopestack,8,I32);
865 PL_scopestack_ix = 0; 959 PL_scopestack_ix = 0;
866 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
867 964
868 New(54,PL_savestack,24,ANY); 965 New(54,PL_savestack,24,ANY);
869 PL_savestack_ix = 0; 966 PL_savestack_ix = 0;
870 PL_savestack_max = 24; 967 PL_savestack_max = 24;
871 968
… …
899 } 996 }
900 997
901 Safefree (PL_tmps_stack); 998 Safefree (PL_tmps_stack);
902 Safefree (PL_markstack); 999 Safefree (PL_markstack);
903 Safefree (PL_scopestack); 1000 Safefree (PL_scopestack);
1001#if HAS_SCOPESTACK_NAME
1002 Safefree (PL_scopestack_name);
1003#endif
904 Safefree (PL_savestack); 1004 Safefree (PL_savestack);
905#if !PERL_VERSION_ATLEAST (5,10,0) 1005#if !PERL_VERSION_ATLEAST (5,10,0)
906 Safefree (PL_retstack); 1006 Safefree (PL_retstack);
907#endif 1007#endif
908} 1008}
… …
954#endif 1054#endif
955 1055
956/* 1056/*
957 * This overrides the default magic get method of %SIG elements. 1057 * This overrides the default magic get method of %SIG elements.
958 * 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
959 * 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),
960 * readback here. 1060 * we just provide our own readback here.
961 */ 1061 */
962static int 1062static int ecb_cold
963coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1063coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
964{ 1064{
965 const char *s = MgPV_nolen_const (mg); 1065 const char *s = MgPV_nolen_const (mg);
966 1066
967 if (*s == '_') 1067 if (*s == '_')
968 { 1068 {
969 SV **svp = 0; 1069 SV **svp = 0;
970 1070
971 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1071 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
972 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1072 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
973 1073
974 if (svp) 1074 if (svp)
975 { 1075 {
976 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);
977 return 0; 1086 return 0;
978 } 1087 }
979 } 1088 }
980 1089
981 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1090 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
982} 1091}
983 1092
984static int 1093static int ecb_cold
985coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1094coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
986{ 1095{
987 const char *s = MgPV_nolen_const (mg); 1096 const char *s = MgPV_nolen_const (mg);
988 1097
989 if (*s == '_') 1098 if (*s == '_')
… …
1003 } 1112 }
1004 1113
1005 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1114 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1006} 1115}
1007 1116
1008static int 1117static int ecb_cold
1009coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1118coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1010{ 1119{
1011 const char *s = MgPV_nolen_const (mg); 1120 const char *s = MgPV_nolen_const (mg);
1012 1121
1013 if (*s == '_') 1122 if (*s == '_')
… …
1048 return 1; 1157 return 1;
1049} 1158}
1050 1159
1051static UNOP init_perl_op; 1160static UNOP init_perl_op;
1052 1161
1053static 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 */
1054init_perl (pTHX_ struct coro *coro) 1163init_perl (pTHX_ struct coro *coro)
1055{ 1164{
1056 /* 1165 /*
1057 * emulate part of the perl startup here. 1166 * emulate part of the perl startup here.
1058 */ 1167 */
… …
1073 PL_parser = 0; 1182 PL_parser = 0;
1074#endif 1183#endif
1075 PL_hints = 0; 1184 PL_hints = 0;
1076 1185
1077 /* recreate the die/warn hooks */ 1186 /* recreate the die/warn hooks */
1078 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1187 PL_diehook = SvREFCNT_inc (rv_diehook);
1079 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1188 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1080 1189
1081 GvSV (PL_defgv) = newSV (0); 1190 GvSV (PL_defgv) = newSV (0);
1082 GvAV (PL_defgv) = coro->args; coro->args = 0; 1191 GvAV (PL_defgv) = coro->args; coro->args = 0;
1083 GvSV (PL_errgv) = newSV (0); 1192 GvSV (PL_errgv) = newSV (0);
1084 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);
1085 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
1086 PL_rs = newSVsv (GvSV (irsgv)); 1198 PL_rs = newSVsv (GvSV (irsgv));
1087 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1199 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1088 1200
1089 { 1201 {
1090 dSP; 1202 dSP;
… …
1105 /* 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
1106 * 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.
1107 */ 1219 */
1108 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 */
1109 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;
1110 1223
1111 /* 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 */
1112 init_perl_op.op_next = PL_op; 1225 init_perl_op.op_next = PL_op;
1113 init_perl_op.op_type = OP_ENTERSUB; 1226 init_perl_op.op_type = OP_ENTERSUB;
1114 init_perl_op.op_ppaddr = pp_slf; 1227 init_perl_op.op_ppaddr = pp_slf;
… …
1117 PL_op = (OP *)&init_perl_op; 1230 PL_op = (OP *)&init_perl_op;
1118 1231
1119 /* copy throw, in case it was set before init_perl */ 1232 /* copy throw, in case it was set before init_perl */
1120 CORO_THROW = coro->except; 1233 CORO_THROW = coro->except;
1121 1234
1122 SWAP_SVS (coro); 1235 SWAP_SVS_ENTER (coro);
1123 1236
1124 if (expect_false (enable_times)) 1237 if (ecb_expect_false (enable_times))
1125 { 1238 {
1126 coro_times_update (); 1239 coro_times_update ();
1127 coro_times_sub (coro); 1240 coro_times_sub (coro);
1128 } 1241 }
1129} 1242}
… …
1153destroy_perl (pTHX_ struct coro *coro) 1266destroy_perl (pTHX_ struct coro *coro)
1154{ 1267{
1155 SV *svf [9]; 1268 SV *svf [9];
1156 1269
1157 { 1270 {
1271 SV *old_current = SvRV (coro_current);
1158 struct coro *current = SvSTATE_current; 1272 struct coro *current = SvSTATE (old_current);
1159 1273
1160 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));
1161 1275
1162 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
1163 load_perl (aTHX_ coro); 1281 load_perl (aTHX_ coro);
1164 1282
1283 /* restore swapped sv's */
1284 SWAP_SVS_LEAVE (coro);
1285
1165 coro_unwind_stacks (aTHX); 1286 coro_unwind_stacks (aTHX);
1287
1166 coro_destruct_stacks (aTHX); 1288 coro_destruct_stacks (aTHX);
1167 1289
1168 /* restore swapped sv's */
1169 SWAP_SVS (coro);
1170
1171 // now save some sv's to be free'd later 1290 /* now save some sv's to be free'd later */
1172 svf [0] = GvSV (PL_defgv); 1291 svf [0] = GvSV (PL_defgv);
1173 svf [1] = (SV *)GvAV (PL_defgv); 1292 svf [1] = (SV *)GvAV (PL_defgv);
1174 svf [2] = GvSV (PL_errgv); 1293 svf [2] = GvSV (PL_errgv);
1175 svf [3] = (SV *)PL_defoutgv; 1294 svf [3] = (SV *)PL_defoutgv;
1176 svf [4] = PL_rs; 1295 svf [4] = PL_rs;
… …
1178 svf [6] = (SV *)GvHV (PL_hintgv); 1297 svf [6] = (SV *)GvHV (PL_hintgv);
1179 svf [7] = PL_diehook; 1298 svf [7] = PL_diehook;
1180 svf [8] = PL_warnhook; 1299 svf [8] = PL_warnhook;
1181 assert (9 == sizeof (svf) / sizeof (*svf)); 1300 assert (9 == sizeof (svf) / sizeof (*svf));
1182 1301
1302 SvRV_set (coro_current, old_current);
1303
1183 load_perl (aTHX_ current); 1304 load_perl (aTHX_ current);
1184 } 1305 }
1185 1306
1186 { 1307 {
1187 unsigned int i; 1308 unsigned int i;
… …
1191 1312
1192 SvREFCNT_dec (coro->saved_deffh); 1313 SvREFCNT_dec (coro->saved_deffh);
1193 SvREFCNT_dec (coro->rouse_cb); 1314 SvREFCNT_dec (coro->rouse_cb);
1194 SvREFCNT_dec (coro->invoke_cb); 1315 SvREFCNT_dec (coro->invoke_cb);
1195 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);
1196 } 1319 }
1197} 1320}
1198 1321
1199INLINE void 1322ecb_inline void
1200free_coro_mortal (pTHX) 1323free_coro_mortal (pTHX)
1201{ 1324{
1202 if (expect_true (coro_mortal)) 1325 if (ecb_expect_true (coro_mortal))
1203 { 1326 {
1204 SvREFCNT_dec (coro_mortal); 1327 SvREFCNT_dec ((SV *)coro_mortal);
1205 coro_mortal = 0; 1328 coro_mortal = 0;
1206 } 1329 }
1207} 1330}
1208 1331
1209static int 1332static int
… …
1263 1386
1264 if (PL_curcop != &PL_compiling) 1387 if (PL_curcop != &PL_compiling)
1265 { 1388 {
1266 SV **cb; 1389 SV **cb;
1267 1390
1268 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1391 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1269 { 1392 {
1270 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1393 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1271 1394
1272 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1395 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1273 { 1396 {
… …
1342 1465
1343 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 */
1344} 1467}
1345 1468
1346/* 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 */
1347static void NOINLINE 1470static void ecb_noinline
1348cctx_prepare (pTHX) 1471cctx_prepare (pTHX)
1349{ 1472{
1350 PL_top_env = &PL_start_env; 1473 PL_top_env = &PL_start_env;
1351 1474
1352 if (cctx_current->flags & CC_TRACE) 1475 if (cctx_current->flags & CC_TRACE)
… …
1363 slf_frame.prepare = slf_prepare_set_stacklevel; 1486 slf_frame.prepare = slf_prepare_set_stacklevel;
1364 slf_frame.check = slf_check_set_stacklevel; 1487 slf_frame.check = slf_check_set_stacklevel;
1365} 1488}
1366 1489
1367/* 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 */
1368INLINE void 1491ecb_inline void
1369transfer_tail (pTHX) 1492transfer_tail (pTHX)
1370{ 1493{
1371 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);
1372} 1507}
1373 1508
1374/* 1509/*
1375 * this is a _very_ stripped down perl interpreter ;) 1510 * this is a _very_ stripped down perl interpreter ;)
1376 */ 1511 */
… …
1405 */ 1540 */
1406 1541
1407 /* 1542 /*
1408 * 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
1409 * 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)
1410 * 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
1411 * bootstrap-time "top" top_env, as we cannot restore the "main" 1546 * doing in that case. YMMV.
1412 * coroutine as Coro has no such concept.
1413 * This actually isn't valid with the pthread backend, but OSes requiring
1414 * that backend are too broken to do it in a standards-compliant way.
1415 */ 1547 */
1416 PL_top_env = main_top_env; 1548 perlish_exit (aTHX);
1417 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1418 } 1549 }
1419} 1550}
1420 1551
1421static coro_cctx * 1552static coro_cctx *
1422cctx_new () 1553cctx_new (void)
1423{ 1554{
1424 coro_cctx *cctx; 1555 coro_cctx *cctx;
1425 1556
1426 ++cctx_count; 1557 ++cctx_count;
1427 New (0, cctx, 1, coro_cctx); 1558 New (0, cctx, 1, coro_cctx);
… …
1433 return cctx; 1564 return cctx;
1434} 1565}
1435 1566
1436/* create a new cctx only suitable as source */ 1567/* create a new cctx only suitable as source */
1437static coro_cctx * 1568static coro_cctx *
1438cctx_new_empty () 1569cctx_new_empty (void)
1439{ 1570{
1440 coro_cctx *cctx = cctx_new (); 1571 coro_cctx *cctx = cctx_new ();
1441 1572
1442 cctx->sptr = 0; 1573 cctx->stack.sptr = 0;
1443 coro_create (&cctx->cctx, 0, 0, 0, 0); 1574 coro_create (&cctx->cctx, 0, 0, 0, 0);
1444 1575
1445 return cctx; 1576 return cctx;
1446} 1577}
1447 1578
1448/* create a new cctx suitable as destination/running a perl interpreter */ 1579/* create a new cctx suitable as destination/running a perl interpreter */
1449static coro_cctx * 1580static coro_cctx *
1450cctx_new_run () 1581cctx_new_run (void)
1451{ 1582{
1452 coro_cctx *cctx = cctx_new (); 1583 coro_cctx *cctx = cctx_new ();
1453 void *stack_start;
1454 size_t stack_size;
1455 1584
1456#if HAVE_MMAP 1585 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1457 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1458 /* mmap supposedly does allocate-on-write for us */
1459 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1460
1461 if (cctx->sptr != (void *)-1)
1462 {
1463 #if CORO_STACKGUARD
1464 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1465 #endif
1466 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1467 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1468 cctx->flags |= CC_MAPPED;
1469 } 1586 {
1470 else
1471#endif
1472 {
1473 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1474 New (0, cctx->sptr, cctx_stacksize, long);
1475
1476 if (!cctx->sptr)
1477 {
1478 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1587 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1479 _exit (EXIT_FAILURE); 1588 _exit (EXIT_FAILURE);
1480 }
1481
1482 stack_start = cctx->sptr;
1483 stack_size = cctx->ssize;
1484 } 1589 }
1485 1590
1486 #if CORO_USE_VALGRIND
1487 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1488 #endif
1489
1490 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);
1491 1592
1492 return cctx; 1593 return cctx;
1493} 1594}
1494 1595
1495static void 1596static void
1496cctx_destroy (coro_cctx *cctx) 1597cctx_destroy (coro_cctx *cctx)
1497{ 1598{
1498 if (!cctx) 1599 if (!cctx)
1499 return; 1600 return;
1500 1601
1501 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1602 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1502 1603
1503 --cctx_count; 1604 --cctx_count;
1504 coro_destroy (&cctx->cctx); 1605 coro_destroy (&cctx->cctx);
1505 1606
1506 /* coro_transfer creates new, empty cctx's */ 1607 coro_stack_free (&cctx->stack);
1507 if (cctx->sptr)
1508 {
1509 #if CORO_USE_VALGRIND
1510 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1511 #endif
1512
1513#if HAVE_MMAP
1514 if (cctx->flags & CC_MAPPED)
1515 munmap (cctx->sptr, cctx->ssize);
1516 else
1517#endif
1518 Safefree (cctx->sptr);
1519 }
1520 1608
1521 Safefree (cctx); 1609 Safefree (cctx);
1522} 1610}
1523 1611
1524/* wether this cctx should be destructed */ 1612/* wether this cctx should be destructed */
1525#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))
1526 1614
1527static coro_cctx * 1615static coro_cctx *
1528cctx_get (pTHX) 1616cctx_get (pTHX)
1529{ 1617{
1530 while (expect_true (cctx_first)) 1618 while (ecb_expect_true (cctx_first))
1531 { 1619 {
1532 coro_cctx *cctx = cctx_first; 1620 coro_cctx *cctx = cctx_first;
1533 cctx_first = cctx->next; 1621 cctx_first = cctx->next;
1534 --cctx_idle; 1622 --cctx_idle;
1535 1623
1536 if (expect_true (!CCTX_EXPIRED (cctx))) 1624 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1537 return cctx; 1625 return cctx;
1538 1626
1539 cctx_destroy (cctx); 1627 cctx_destroy (cctx);
1540 } 1628 }
1541 1629
… …
1543} 1631}
1544 1632
1545static void 1633static void
1546cctx_put (coro_cctx *cctx) 1634cctx_put (coro_cctx *cctx)
1547{ 1635{
1548 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));
1549 1637
1550 /* free another cctx if overlimit */ 1638 /* free another cctx if overlimit */
1551 if (expect_false (cctx_idle >= cctx_max_idle)) 1639 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1552 { 1640 {
1553 coro_cctx *first = cctx_first; 1641 coro_cctx *first = cctx_first;
1554 cctx_first = first->next; 1642 cctx_first = first->next;
1555 --cctx_idle; 1643 --cctx_idle;
1556 1644
… …
1567static void 1655static void
1568transfer_check (pTHX_ struct coro *prev, struct coro *next) 1656transfer_check (pTHX_ struct coro *prev, struct coro *next)
1569{ 1657{
1570 /* TODO: throwing up here is considered harmful */ 1658 /* TODO: throwing up here is considered harmful */
1571 1659
1572 if (expect_true (prev != next)) 1660 if (ecb_expect_true (prev != next))
1573 { 1661 {
1574 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1662 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1575 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,");
1576 1664
1577 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1665 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1578 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,");
1579 1667
1580#if !PERL_VERSION_ATLEAST (5,10,0) 1668#if !PERL_VERSION_ATLEAST (5,10,0)
1581 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1669 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1582 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,");
1583#endif 1671#endif
1584 } 1672 }
1585} 1673}
1586 1674
1587/* always use the TRANSFER macro */ 1675/* always use the TRANSFER macro */
1588static void NOINLINE /* noinline so we have a fixed stackframe */ 1676static void ecb_noinline /* noinline so we have a fixed stackframe */
1589transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1677transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1590{ 1678{
1591 dSTACKLEVEL; 1679 dSTACKLEVEL;
1592 1680
1593 /* sometimes transfer is only called to set idle_sp */ 1681 /* sometimes transfer is only called to set idle_sp */
1594 if (expect_false (!prev)) 1682 if (ecb_expect_false (!prev))
1595 { 1683 {
1596 cctx_current->idle_sp = STACKLEVEL; 1684 cctx_current->idle_sp = STACKLEVEL;
1597 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 */
1598 } 1686 }
1599 else if (expect_true (prev != next)) 1687 else if (ecb_expect_true (prev != next))
1600 { 1688 {
1601 coro_cctx *cctx_prev; 1689 coro_cctx *cctx_prev;
1602 1690
1603 if (expect_false (prev->flags & CF_NEW)) 1691 if (ecb_expect_false (prev->flags & CF_NEW))
1604 { 1692 {
1605 /* create a new empty/source context */ 1693 /* create a new empty/source context */
1606 prev->flags &= ~CF_NEW; 1694 prev->flags &= ~CF_NEW;
1607 prev->flags |= CF_RUNNING; 1695 prev->flags |= CF_RUNNING;
1608 } 1696 }
… …
1611 next->flags |= CF_RUNNING; 1699 next->flags |= CF_RUNNING;
1612 1700
1613 /* first get rid of the old state */ 1701 /* first get rid of the old state */
1614 save_perl (aTHX_ prev); 1702 save_perl (aTHX_ prev);
1615 1703
1616 if (expect_false (next->flags & CF_NEW)) 1704 if (ecb_expect_false (next->flags & CF_NEW))
1617 { 1705 {
1618 /* need to start coroutine */ 1706 /* need to start coroutine */
1619 next->flags &= ~CF_NEW; 1707 next->flags &= ~CF_NEW;
1620 /* setup coroutine call */ 1708 /* setup coroutine call */
1621 init_perl (aTHX_ next); 1709 init_perl (aTHX_ next);
1622 } 1710 }
1623 else 1711 else
1624 load_perl (aTHX_ next); 1712 load_perl (aTHX_ next);
1625 1713
1626 /* possibly untie and reuse the cctx */ 1714 /* possibly untie and reuse the cctx */
1627 if (expect_true ( 1715 if (ecb_expect_true (
1628 cctx_current->idle_sp == STACKLEVEL 1716 cctx_current->idle_sp == STACKLEVEL
1629 && !(cctx_current->flags & CC_TRACE) 1717 && !(cctx_current->flags & CC_TRACE)
1630 && !force_cctx 1718 && !force_cctx
1631 )) 1719 ))
1632 { 1720 {
1633 /* 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 */
1634 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));
1635 1723
1636 /* 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. */
1637 /* 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 */
1638 if (expect_false (CCTX_EXPIRED (cctx_current))) 1726 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1639 if (expect_true (!next->cctx)) 1727 if (ecb_expect_true (!next->cctx))
1640 next->cctx = cctx_get (aTHX); 1728 next->cctx = cctx_get (aTHX);
1641 1729
1642 cctx_put (cctx_current); 1730 cctx_put (cctx_current);
1643 } 1731 }
1644 else 1732 else
1645 prev->cctx = cctx_current; 1733 prev->cctx = cctx_current;
1646 1734
1647 ++next->usecount; 1735 ++next->usecount;
1648 1736
1649 cctx_prev = cctx_current; 1737 cctx_prev = cctx_current;
1650 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1738 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1651 1739
1652 next->cctx = 0; 1740 next->cctx = 0;
1653 1741
1654 if (expect_false (cctx_prev != cctx_current)) 1742 if (ecb_expect_false (cctx_prev != cctx_current))
1655 { 1743 {
1656 cctx_prev->top_env = PL_top_env; 1744 cctx_prev->top_env = PL_top_env;
1657 PL_top_env = cctx_current->top_env; 1745 PL_top_env = cctx_current->top_env;
1658 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1746 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1659 } 1747 }
… …
1665#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))
1666#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1754#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1667 1755
1668/** high level stuff ********************************************************/ 1756/** high level stuff ********************************************************/
1669 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 */
1670static int 1760static void
1761coro_call_on_destroy (pTHX_ struct coro *coro);
1762
1763static void
1671coro_state_destroy (pTHX_ struct coro *coro) 1764coro_state_destroy (pTHX_ struct coro *coro)
1672{ 1765{
1673 if (coro->flags & CF_DESTROYED) 1766 if (coro->flags & CF_ZOMBIE)
1674 return 0; 1767 return;
1675 1768
1676 if (coro->on_destroy && !PL_dirty)
1677 coro->on_destroy (aTHX_ coro); 1769 slf_destroy (aTHX_ coro);
1678 1770
1679 coro->flags |= CF_DESTROYED; 1771 coro->flags |= CF_ZOMBIE;
1680 1772
1681 if (coro->flags & CF_READY) 1773 if (coro->flags & CF_READY)
1682 { 1774 {
1683 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1775 /* reduce nready, as destroying a ready coro effectively unreadies it */
1684 /* alternative: look through all ready queues and remove the coro */ 1776 /* alternative: look through all ready queues and remove the coro */
1685 --coro_nready; 1777 --coro_nready;
1686 } 1778 }
1687 else 1779 else
1688 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;
1689 1785
1690 if (coro->mainstack 1786 if (coro->mainstack
1691 && coro->mainstack != main_mainstack 1787 && coro->mainstack != main_mainstack
1692 && coro->slot 1788 && coro->slot
1693 && !PL_dirty) 1789 && !PL_dirty)
1694 destroy_perl (aTHX_ coro); 1790 destroy_perl (aTHX_ coro);
1695 1791
1696 if (coro->next) coro->next->prev = coro->prev;
1697 if (coro->prev) coro->prev->next = coro->next;
1698 if (coro == coro_first) coro_first = coro->next;
1699
1700 cctx_destroy (coro->cctx); 1792 cctx_destroy (coro->cctx);
1701 SvREFCNT_dec (coro->startcv); 1793 SvREFCNT_dec (coro->startcv);
1702 SvREFCNT_dec (coro->args); 1794 SvREFCNT_dec (coro->args);
1703 SvREFCNT_dec (coro->swap_sv); 1795 SvREFCNT_dec (coro->swap_sv);
1704 SvREFCNT_dec (CORO_THROW); 1796 SvREFCNT_dec (CORO_THROW);
1705 1797
1706 return 1; 1798 coro_call_on_destroy (aTHX_ coro);
1799
1800 /* more destruction mayhem in coro_state_free */
1707} 1801}
1708 1802
1709static int 1803static int
1710coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1804coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1711{ 1805{
1712 struct coro *coro = (struct coro *)mg->mg_ptr; 1806 struct coro *coro = (struct coro *)mg->mg_ptr;
1713 mg->mg_ptr = 0; 1807 mg->mg_ptr = 0;
1714 1808
1715 coro->hv = 0;
1716
1717 if (--coro->refcnt < 0)
1718 {
1719 coro_state_destroy (aTHX_ coro); 1809 coro_state_destroy (aTHX_ coro);
1810 SvREFCNT_dec (coro->on_destroy);
1811 SvREFCNT_dec (coro->status);
1812
1720 Safefree (coro); 1813 Safefree (coro);
1721 }
1722 1814
1723 return 0; 1815 return 0;
1724} 1816}
1725 1817
1726static int 1818static int ecb_cold
1727coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1819coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1728{ 1820{
1729 struct coro *coro = (struct coro *)mg->mg_ptr; 1821 /* called when perl clones the current process the slow way (windows process emulation) */
1730 1822 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1731 ++coro->refcnt; 1823 mg->mg_ptr = 0;
1824 mg->mg_virtual = 0;
1732 1825
1733 return 0; 1826 return 0;
1734} 1827}
1735 1828
1736static MGVTBL coro_state_vtbl = { 1829static MGVTBL coro_state_vtbl = {
… …
1761 TRANSFER (ta, 1); 1854 TRANSFER (ta, 1);
1762} 1855}
1763 1856
1764/** Coro ********************************************************************/ 1857/** Coro ********************************************************************/
1765 1858
1766INLINE void 1859ecb_inline void
1767coro_enq (pTHX_ struct coro *coro) 1860coro_enq (pTHX_ struct coro *coro)
1768{ 1861{
1769 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1862 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1770 1863
1771 SvREFCNT_inc_NN (coro->hv); 1864 SvREFCNT_inc_NN (coro->hv);
… …
1773 coro->next_ready = 0; 1866 coro->next_ready = 0;
1774 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1867 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1775 ready [1] = coro; 1868 ready [1] = coro;
1776} 1869}
1777 1870
1778INLINE struct coro * 1871ecb_inline struct coro *
1779coro_deq (pTHX) 1872coro_deq (pTHX)
1780{ 1873{
1781 int prio; 1874 int prio;
1782 1875
1783 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1876 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1836{ 1929{
1837 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1930 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1838} 1931}
1839 1932
1840/* expects to own a reference to next->hv */ 1933/* expects to own a reference to next->hv */
1841INLINE void 1934ecb_inline void
1842prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1935prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1843{ 1936{
1844 SV *prev_sv = SvRV (coro_current); 1937 SV *prev_sv = SvRV (coro_current);
1845 1938
1846 ta->prev = SvSTATE_hv (prev_sv); 1939 ta->prev = SvSTATE_hv (prev_sv);
… …
1859{ 1952{
1860 for (;;) 1953 for (;;)
1861 { 1954 {
1862 struct coro *next = coro_deq (aTHX); 1955 struct coro *next = coro_deq (aTHX);
1863 1956
1864 if (expect_true (next)) 1957 if (ecb_expect_true (next))
1865 { 1958 {
1866 /* cannot transfer to destroyed coros, skip and look for next */ 1959 /* cannot transfer to destroyed coros, skip and look for next */
1867 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1960 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1868 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 */
1869 else 1962 else
1870 { 1963 {
1871 next->flags &= ~CF_READY; 1964 next->flags &= ~CF_READY;
1872 --coro_nready; 1965 --coro_nready;
… …
1880 /* nothing to schedule: call the idle handler */ 1973 /* nothing to schedule: call the idle handler */
1881 if (SvROK (sv_idle) 1974 if (SvROK (sv_idle)
1882 && SvOBJECT (SvRV (sv_idle))) 1975 && SvOBJECT (SvRV (sv_idle)))
1883 { 1976 {
1884 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);
1885 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 }
1886 1996
1887 ++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 */
1888 api_ready (aTHX_ SvRV (sv_idle)); 1998 api_ready (aTHX_ SvRV (sv_idle));
1889 --coro_nready; 1999 --coro_nready;
1890 } 2000 }
… …
1905 } 2015 }
1906 } 2016 }
1907 } 2017 }
1908} 2018}
1909 2019
1910INLINE void 2020ecb_inline void
1911prepare_cede (pTHX_ struct coro_transfer_args *ta) 2021prepare_cede (pTHX_ struct coro_transfer_args *ta)
1912{ 2022{
1913 api_ready (aTHX_ coro_current); 2023 api_ready (aTHX_ coro_current);
1914 prepare_schedule (aTHX_ ta); 2024 prepare_schedule (aTHX_ ta);
1915} 2025}
1916 2026
1917INLINE void 2027ecb_inline void
1918prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2028prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1919{ 2029{
1920 SV *prev = SvRV (coro_current); 2030 SV *prev = SvRV (coro_current);
1921 2031
1922 if (coro_nready) 2032 if (coro_nready)
… …
1952{ 2062{
1953 struct coro_transfer_args ta; 2063 struct coro_transfer_args ta;
1954 2064
1955 prepare_cede (aTHX_ &ta); 2065 prepare_cede (aTHX_ &ta);
1956 2066
1957 if (expect_true (ta.prev != ta.next)) 2067 if (ecb_expect_true (ta.prev != ta.next))
1958 { 2068 {
1959 TRANSFER (ta, 1); 2069 TRANSFER (ta, 1);
1960 return 1; 2070 return 1;
1961 } 2071 }
1962 else 2072 else
… …
2005 coro->slot->runops = RUNOPS_DEFAULT; 2115 coro->slot->runops = RUNOPS_DEFAULT;
2006 } 2116 }
2007} 2117}
2008 2118
2009static 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
2010coro_call_on_destroy (pTHX_ struct coro *coro) 2196coro_call_on_destroy (pTHX_ struct coro *coro)
2011{ 2197{
2012 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2198 AV *od = coro->on_destroy;
2013 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2014 2199
2015 if (on_destroyp) 2200 if (!od)
2016 { 2201 return;
2017 AV *on_destroy = (AV *)SvRV (*on_destroyp);
2018 2202
2203 coro->on_destroy = 0;
2204 sv_2mortal ((SV *)od);
2205
2019 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
2020 { 2214 {
2021 dSP; /* don't disturb outer sp */ 2215 dSP; /* don't disturb outer sp */
2022 SV *cb = av_pop (on_destroy);
2023
2024 PUSHMARK (SP); 2216 PUSHMARK (SP);
2025 2217
2026 if (statusp) 2218 if (coro->status)
2027 { 2219 {
2028 int i; 2220 PUTBACK;
2029 AV *status = (AV *)SvRV (*statusp); 2221 coro_push_av (aTHX_ coro->status, G_ARRAY);
2030 EXTEND (SP, AvFILLp (status) + 1); 2222 SPAGAIN;
2031
2032 for (i = 0; i <= AvFILLp (status); ++i)
2033 PUSHs (AvARRAY (status)[i]);
2034 } 2223 }
2035 2224
2036 PUTBACK; 2225 PUTBACK;
2037 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2226 call_sv (cb, G_VOID | G_DISCARD);
2038 } 2227 }
2039 } 2228 }
2040} 2229}
2041 2230
2042static void 2231static void
2043slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2232coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2044{ 2233{
2045 int i; 2234 AV *av;
2046 HV *hv = (HV *)SvRV (coro_current); 2235
2047 AV *av = newAV (); 2236 if (coro->status)
2237 {
2238 av = coro->status;
2239 av_clear (av);
2240 }
2241 else
2242 av = coro->status = newAV ();
2048 2243
2049 /* items are actually not so common, so optimise for this case */ 2244 /* items are actually not so common, so optimise for this case */
2050 if (items) 2245 if (items)
2051 { 2246 {
2247 int i;
2248
2052 av_extend (av, items - 1); 2249 av_extend (av, items - 1);
2053 2250
2054 for (i = 0; i < items; ++i) 2251 for (i = 0; i < items; ++i)
2055 av_push (av, SvREFCNT_inc_NN (arg [i])); 2252 av_push (av, SvREFCNT_inc_NN (arg [i]));
2056 } 2253 }
2254}
2057 2255
2058 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2256static void
2059 2257slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2258{
2060 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2259 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2061 api_ready (aTHX_ sv_manager); 2260 api_ready (aTHX_ sv_manager);
2062 2261
2063 frame->prepare = prepare_schedule; 2262 frame->prepare = prepare_schedule;
2064 frame->check = slf_check_repeat; 2263 frame->check = slf_check_repeat;
2065 2264
2066 /* as a minor optimisation, we could unwind all stacks here */ 2265 /* as a minor optimisation, we could unwind all stacks here */
2067 /* but that puts extra pressure on pp_slf, and is not worth much */ 2266 /* but that puts extra pressure on pp_slf, and is not worth much */
2068 /*coro_unwind_stacks (aTHX);*/ 2267 /*coro_unwind_stacks (aTHX);*/
2268}
2269
2270static void
2271slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2272{
2273 HV *coro_hv = (HV *)SvRV (coro_current);
2274
2275 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2276 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2277}
2278
2279static void
2280slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2281{
2282 HV *coro_hv;
2283 struct coro *coro;
2284
2285 if (items <= 0)
2286 croak ("Coro::cancel called without coro object,");
2287
2288 coro = SvSTATE (arg [0]);
2289 coro_hv = coro->hv;
2290
2291 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2292
2293 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2294 {
2295 /* coro currently busy cancelling something, so just notify it */
2296 coro->slf_frame.data = (void *)coro;
2297
2298 frame->prepare = prepare_nop;
2299 frame->check = slf_check_nop;
2300 }
2301 else if (coro_hv == (HV *)SvRV (coro_current))
2302 {
2303 /* cancelling the current coro is allowed, and equals terminate */
2304 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2305 }
2306 else
2307 {
2308 struct coro *self = SvSTATE_current;
2309
2310 if (!self)
2311 croak ("Coro::cancel called outside of thread content,");
2312
2313 /* otherwise we cancel directly, purely for speed reasons
2314 * unfortunately, this requires some magic trickery, as
2315 * somebody else could cancel us, so we have to fight the cancellation.
2316 * this is ugly, and hopefully fully worth the extra speed.
2317 * besides, I can't get the slow-but-safe version working...
2318 */
2319 slf_frame.data = 0;
2320 self->flags |= CF_NOCANCEL;
2321 coro_state_destroy (aTHX_ coro);
2322 self->flags &= ~CF_NOCANCEL;
2323
2324 if (slf_frame.data)
2325 {
2326 /* while we were busy we have been cancelled, so terminate */
2327 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2328 }
2329 else
2330 {
2331 frame->prepare = prepare_nop;
2332 frame->check = slf_check_nop;
2333 }
2334 }
2335}
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;
2069} 2374}
2070 2375
2071/*****************************************************************************/ 2376/*****************************************************************************/
2072/* async pool handler */ 2377/* async pool handler */
2073 2378
… …
2104slf_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)
2105{ 2410{
2106 HV *hv = (HV *)SvRV (coro_current); 2411 HV *hv = (HV *)SvRV (coro_current);
2107 struct coro *coro = SvSTATE_hv ((SV *)hv); 2412 struct coro *coro = SvSTATE_hv ((SV *)hv);
2108 2413
2109 if (expect_true (coro->saved_deffh)) 2414 if (ecb_expect_true (coro->saved_deffh))
2110 { 2415 {
2111 /* subsequent iteration */ 2416 /* subsequent iteration */
2112 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2417 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2113 coro->saved_deffh = 0; 2418 coro->saved_deffh = 0;
2114 2419
2115 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2420 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2116 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2421 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2117 { 2422 {
2118 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2423 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2119 coro->invoke_av = newAV (); 2424 return;
2120
2121 frame->prepare = prepare_nop;
2122 } 2425 }
2123 else 2426 else
2124 { 2427 {
2125 av_clear (GvAV (PL_defgv)); 2428 av_clear (GvAV (PL_defgv));
2126 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);
2127 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
2128 coro->prio = 0; 2438 coro->prio = 0;
2129 2439
2130 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2440 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2131 api_trace (aTHX_ coro_current, 0); 2441 api_trace (aTHX_ coro_current, 0);
2132 2442
2133 frame->prepare = prepare_schedule; 2443 frame->prepare = prepare_schedule;
2134 av_push (av_async_pool, SvREFCNT_inc (hv)); 2444 av_push (av_async_pool, SvREFCNT_inc (hv));
2135 } 2445 }
… …
2176 2486
2177static int 2487static int
2178slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2488slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2179{ 2489{
2180 SV *data = (SV *)frame->data; 2490 SV *data = (SV *)frame->data;
2181 2491
2182 if (CORO_THROW) 2492 if (CORO_THROW)
2183 return 0; 2493 return 0;
2184 2494
2185 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2495 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2186 return 1; 2496 return 1;
… …
2222 cb = sv_2mortal (coro->rouse_cb); 2532 cb = sv_2mortal (coro->rouse_cb);
2223 coro->rouse_cb = 0; 2533 coro->rouse_cb = 0;
2224 } 2534 }
2225 2535
2226 if (!SvROK (cb) 2536 if (!SvROK (cb)
2227 || SvTYPE (SvRV (cb)) != SVt_PVCV 2537 || SvTYPE (SvRV (cb)) != SVt_PVCV
2228 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2538 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2229 croak ("Coro::rouse_wait called with illegal callback argument,"); 2539 croak ("Coro::rouse_wait called with illegal callback argument,");
2230 2540
2231 { 2541 {
2232 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2542 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2349static void 2659static void
2350slf_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)
2351{ 2661{
2352 frame->prepare = prepare_cede_notself; 2662 frame->prepare = prepare_cede_notself;
2353 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);
2354} 2683}
2355 2684
2356/* 2685/*
2357 * these not obviously related functions are all rolled into one 2686 * these not obviously related functions are all rolled into one
2358 * 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
… …
2365 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 */
2366 2695
2367 /* 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 */
2368 /* the latter happens when a new coro has been started */ 2697 /* the latter happens when a new coro has been started */
2369 /* or when a new cctx was attached to an existing coroutine */ 2698 /* or when a new cctx was attached to an existing coroutine */
2370 if (expect_true (!slf_frame.prepare)) 2699 if (ecb_expect_true (!slf_frame.prepare))
2371 { 2700 {
2372 /* first iteration */ 2701 /* first iteration */
2373 dSP; 2702 dSP;
2374 SV **arg = PL_stack_base + TOPMARK + 1; 2703 SV **arg = PL_stack_base + TOPMARK + 1;
2375 int items = SP - arg; /* args without function object */ 2704 int items = SP - arg; /* args without function object */
… …
2416 while (slf_frame.check (aTHX_ &slf_frame)); 2745 while (slf_frame.check (aTHX_ &slf_frame));
2417 2746
2418 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 */
2419 2748
2420 /* exception handling */ 2749 /* exception handling */
2421 if (expect_false (CORO_THROW)) 2750 if (ecb_expect_false (CORO_THROW))
2422 { 2751 {
2423 SV *exception = sv_2mortal (CORO_THROW); 2752 SV *exception = sv_2mortal (CORO_THROW);
2424 2753
2425 CORO_THROW = 0; 2754 CORO_THROW = 0;
2426 sv_setsv (ERRSV, exception); 2755 sv_setsv (ERRSV, exception);
2427 croak (0); 2756 croak (0);
2428 } 2757 }
2429 2758
2430 /* return value handling - mostly like entersub */ 2759 /* return value handling - mostly like entersub */
2431 /* make sure we put something on the stack in scalar context */ 2760 /* make sure we put something on the stack in scalar context */
2432 if (GIMME_V == G_SCALAR) 2761 if (GIMME_V == G_SCALAR
2762 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2433 { 2763 {
2434 dSP; 2764 dSP;
2435 SV **bot = PL_stack_base + checkmark; 2765 SV **bot = PL_stack_base + checkmark;
2436 2766
2437 if (sp == bot) /* too few, push undef */ 2767 if (sp == bot) /* too few, push undef */
2438 bot [1] = &PL_sv_undef; 2768 bot [1] = &PL_sv_undef;
2439 else if (sp != bot + 1) /* too many, take last one */ 2769 else /* too many, take last one */
2440 bot [1] = *sp; 2770 bot [1] = *sp;
2441 2771
2442 SP = bot + 1; 2772 SP = bot + 1;
2443 2773
2444 PUTBACK; 2774 PUTBACK;
… …
2542{ 2872{
2543 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);
2544 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2874 on_enterleave_call (aTHX_ sv_2mortal (cb));
2545} 2875}
2546 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
2547/*****************************************************************************/ 2969/*****************************************************************************/
2548/* PerlIO::cede */ 2970/* PerlIO::cede */
2549 2971
2550typedef struct 2972typedef struct
2551{ 2973{
2552 PerlIOBuf base; 2974 PerlIOBuf base;
2553 NV next, every; 2975 NV next, every;
2554} PerlIOCede; 2976} PerlIOCede;
2555 2977
2556static IV 2978static IV ecb_cold
2557PerlIOCede_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)
2558{ 2980{
2559 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2981 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2560 2982
2561 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2983 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2562 self->next = nvtime () + self->every; 2984 self->next = nvtime () + self->every;
2563 2985
2564 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2986 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2565} 2987}
2566 2988
2567static SV * 2989static SV * ecb_cold
2568PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2990PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2569{ 2991{
2570 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2992 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2571 2993
2572 return newSVnv (self->every); 2994 return newSVnv (self->every);
… …
2679 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3101 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2680 PUTBACK; 3102 PUTBACK;
2681 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3103 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2682 } 3104 }
2683 3105
2684 SvREFCNT_dec (cb); 3106 SvREFCNT_dec_NN (cb);
2685 } 3107 }
2686} 3108}
2687 3109
2688static void 3110static void
2689coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3111coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2690{ 3112{
2691 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3113 /* call $sem->adjust (0) to possibly wake up some other waiters */
2692 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3114 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2693} 3115}
2694 3116
2695static int 3117static int
2696slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3118slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2697{ 3119{
2698 AV *av = (AV *)frame->data; 3120 AV *av = (AV *)frame->data;
2699 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;
2700 3125
2701 /* 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 */
2702 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
2703 return 0; 3132 return 0;
3133 }
2704 else if (SvIVX (count_sv) > 0) 3134 else if (SvIVX (count_sv) > 0)
2705 { 3135 {
2706 SvSTATE_current->on_destroy = 0;
2707
2708 if (acquire) 3136 if (acquire)
2709 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3137 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2710 else 3138 else
2711 coro_semaphore_adjust (aTHX_ av, 0); 3139 coro_semaphore_adjust (aTHX_ av, 0);
2712 3140
… …
2716 { 3144 {
2717 int i; 3145 int i;
2718 /* 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 */
2719 /* 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 */
2720 /* this avoids some degenerate memory usage cases */ 3148 /* this avoids some degenerate memory usage cases */
2721 3149 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2722 for (i = 1; i <= AvFILLp (av); ++i)
2723 if (AvARRAY (av)[i] == SvRV (coro_current)) 3150 if (AvARRAY (av)[i] == coro_hv)
2724 return 1; 3151 return 1;
2725 3152
2726 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3153 av_push (av, SvREFCNT_inc (coro_hv));
2727 return 1; 3154 return 1;
2728 } 3155 }
2729} 3156}
2730 3157
2731static int 3158static int
… …
2754 { 3181 {
2755 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3182 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2756 3183
2757 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3184 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2758 frame->prepare = prepare_schedule; 3185 frame->prepare = prepare_schedule;
2759
2760 /* to avoid race conditions when a woken-up coro gets terminated */ 3186 /* to avoid race conditions when a woken-up coro gets terminated */
2761 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3187 /* we arrange for a temporary on_destroy that calls adjust (0) */
2762 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3188 frame->destroy = coro_semaphore_destroy;
2763 } 3189 }
2764} 3190}
2765 3191
2766static void 3192static void
2767slf_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)
… …
2825 { 3251 {
2826 api_ready (aTHX_ cb); 3252 api_ready (aTHX_ cb);
2827 sv_setiv (cb, 0); /* signal waiter */ 3253 sv_setiv (cb, 0); /* signal waiter */
2828 } 3254 }
2829 3255
2830 SvREFCNT_dec (cb); 3256 SvREFCNT_dec_NN (cb);
2831 3257
2832 --count; 3258 --count;
2833 } 3259 }
2834} 3260}
2835 3261
… …
2920 } 3346 }
2921 3347
2922 av_push (state, data_sv); 3348 av_push (state, data_sv);
2923 3349
2924 api_ready (aTHX_ coro); 3350 api_ready (aTHX_ coro);
2925 SvREFCNT_dec (coro); 3351 SvREFCNT_dec_NN (coro);
2926 SvREFCNT_dec ((AV *)state); 3352 SvREFCNT_dec_NN ((AV *)state);
2927} 3353}
2928 3354
2929static int 3355static int
2930slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3356slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2931{ 3357{
… …
2936 /* it quickly returns */ 3362 /* it quickly returns */
2937 if (CORO_THROW) 3363 if (CORO_THROW)
2938 return 0; 3364 return 0;
2939 3365
2940 /* one element that is an RV? repeat! */ 3366 /* one element that is an RV? repeat! */
2941 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3367 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2942 return 1; 3368 return 1;
2943 3369
2944 /* restore status */ 3370 /* restore status */
2945 { 3371 {
2946 SV *data_sv = av_pop (state); 3372 SV *data_sv = av_pop (state);
… …
2949 errno = data->errorno; 3375 errno = data->errorno;
2950 PL_laststype = data->laststype; 3376 PL_laststype = data->laststype;
2951 PL_laststatval = data->laststatval; 3377 PL_laststatval = data->laststatval;
2952 PL_statcache = data->statcache; 3378 PL_statcache = data->statcache;
2953 3379
2954 SvREFCNT_dec (data_sv); 3380 SvREFCNT_dec_NN (data_sv);
2955 } 3381 }
2956 3382
2957 /* push result values */ 3383 /* push result values */
2958 { 3384 {
2959 dSP; 3385 dSP;
… …
2985 dSP; 3411 dSP;
2986 3412
2987 static SV *prio_cv; 3413 static SV *prio_cv;
2988 static SV *prio_sv; 3414 static SV *prio_sv;
2989 3415
2990 if (expect_false (!prio_cv)) 3416 if (ecb_expect_false (!prio_cv))
2991 { 3417 {
2992 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3418 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2993 prio_sv = newSViv (0); 3419 prio_sv = newSViv (0);
2994 } 3420 }
2995 3421
… …
3101 } 3527 }
3102 3528
3103 return coro_sv; 3529 return coro_sv;
3104} 3530}
3105 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
3106MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3599MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3107 3600
3108PROTOTYPES: DISABLE 3601PROTOTYPES: DISABLE
3109 3602
3110BOOT: 3603BOOT:
3111{ 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"
3112#ifdef USE_ITHREADS 3607#ifdef USE_ITHREADS
3113# if CORO_PTHREAD 3608# if CORO_PTHREAD
3114 coro_thx = PERL_GET_CONTEXT; 3609 coro_thx = PERL_GET_CONTEXT;
3115# endif 3610# endif
3116#endif 3611#endif
3117 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;
3118 3618
3119 cctx_current = cctx_new_empty (); 3619 cctx_current = cctx_new_empty ();
3120 3620
3121 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3621 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3122 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3622 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3123 3623
3124 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;
3125 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;
3126 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;
3127 3627
3128 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3129 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));
3130 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));
3131 3630
3132 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3631 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3133 3632
… …
3165 coroapi.prepare_cede_notself = prepare_cede_notself; 3664 coroapi.prepare_cede_notself = prepare_cede_notself;
3166 3665
3167 time_init (aTHX); 3666 time_init (aTHX);
3168 3667
3169 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
3170} 3674}
3171 3675
3172SV * 3676SV *
3173new (SV *klass, ...) 3677new (SV *klass, ...)
3174 ALIAS: 3678 ALIAS:
… …
3181void 3685void
3182transfer (...) 3686transfer (...)
3183 PROTOTYPE: $$ 3687 PROTOTYPE: $$
3184 CODE: 3688 CODE:
3185 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3689 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3186
3187bool
3188_destroy (SV *coro_sv)
3189 CODE:
3190 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3191 OUTPUT:
3192 RETVAL
3193
3194void
3195_exit (int code)
3196 PROTOTYPE: $
3197 CODE:
3198 _exit (code);
3199 3690
3200SV * 3691SV *
3201clone (Coro::State coro) 3692clone (Coro::State coro)
3202 CODE: 3693 CODE:
3203{ 3694{
… …
3258void 3749void
3259list () 3750list ()
3260 PROTOTYPE: 3751 PROTOTYPE:
3261 PPCODE: 3752 PPCODE:
3262{ 3753{
3263 struct coro *coro; 3754 struct coro *coro;
3264 for (coro = coro_first; coro; coro = coro->next) 3755 for (coro = coro_first; coro; coro = coro->next)
3265 if (coro->hv) 3756 if (coro->hv)
3266 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3757 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3267} 3758}
3268 3759
… …
3273 CODE: 3764 CODE:
3274{ 3765{
3275 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3766 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3276 { 3767 {
3277 struct coro *current = SvSTATE_current; 3768 struct coro *current = SvSTATE_current;
3769 struct CoroSLF slf_save;
3278 3770
3279 if (current != coro) 3771 if (current != coro)
3280 { 3772 {
3281 PUTBACK; 3773 PUTBACK;
3282 save_perl (aTHX_ current); 3774 save_perl (aTHX_ current);
3283 load_perl (aTHX_ coro); 3775 load_perl (aTHX_ coro);
3776 /* the coro is most likely in an active SLF call.
3777 * while not strictly required (the code we execute is
3778 * not allowed to call any SLF functions), it's cleaner
3779 * to reinitialise the slf_frame and restore it later.
3780 * This might one day allow us to actually do SLF calls
3781 * from code executed here.
3782 */
3783 slf_save = slf_frame;
3784 slf_frame.prepare = 0;
3284 SPAGAIN; 3785 SPAGAIN;
3285 } 3786 }
3286 3787
3287 PUSHSTACK; 3788 PUSHSTACK;
3288 3789
… …
3298 SPAGAIN; 3799 SPAGAIN;
3299 3800
3300 if (current != coro) 3801 if (current != coro)
3301 { 3802 {
3302 PUTBACK; 3803 PUTBACK;
3804 slf_frame = slf_save;
3303 save_perl (aTHX_ coro); 3805 save_perl (aTHX_ coro);
3304 load_perl (aTHX_ current); 3806 load_perl (aTHX_ current);
3305 SPAGAIN; 3807 SPAGAIN;
3306 } 3808 }
3307 } 3809 }
… …
3312 PROTOTYPE: $ 3814 PROTOTYPE: $
3313 ALIAS: 3815 ALIAS:
3314 is_ready = CF_READY 3816 is_ready = CF_READY
3315 is_running = CF_RUNNING 3817 is_running = CF_RUNNING
3316 is_new = CF_NEW 3818 is_new = CF_NEW
3317 is_destroyed = CF_DESTROYED 3819 is_destroyed = CF_ZOMBIE
3820 is_zombie = CF_ZOMBIE
3318 is_suspended = CF_SUSPENDED 3821 is_suspended = CF_SUSPENDED
3319 CODE: 3822 CODE:
3320 RETVAL = boolSV (coro->flags & ix); 3823 RETVAL = boolSV (coro->flags & ix);
3321 OUTPUT: 3824 OUTPUT:
3322 RETVAL 3825 RETVAL
3323 3826
3324void 3827void
3325throw (Coro::State self, SV *exception = &PL_sv_undef) 3828throw (SV *self, SV *exception = &PL_sv_undef)
3326 PROTOTYPE: $;$ 3829 PROTOTYPE: $;$
3327 CODE: 3830 CODE:
3328{ 3831{
3832 struct coro *coro = SvSTATE (self);
3329 struct coro *current = SvSTATE_current; 3833 struct coro *current = SvSTATE_current;
3330 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3834 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3331 SvREFCNT_dec (*exceptionp); 3835 SvREFCNT_dec (*exceptionp);
3332 SvGETMAGIC (exception); 3836 SvGETMAGIC (exception);
3333 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3837 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3838
3839 api_ready (aTHX_ self);
3334} 3840}
3335 3841
3336void 3842void
3337api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3843api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3338 PROTOTYPE: $;$ 3844 PROTOTYPE: $;$
… …
3393 3899
3394void 3900void
3395cancel (Coro::State self) 3901cancel (Coro::State self)
3396 CODE: 3902 CODE:
3397 coro_state_destroy (aTHX_ self); 3903 coro_state_destroy (aTHX_ self);
3398 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3399
3400 3904
3401SV * 3905SV *
3402enable_times (int enabled = enable_times) 3906enable_times (int enabled = enable_times)
3403 CODE: 3907 CODE:
3404{ 3908{
… …
3417 3921
3418void 3922void
3419times (Coro::State self) 3923times (Coro::State self)
3420 PPCODE: 3924 PPCODE:
3421{ 3925{
3422 struct coro *current = SvSTATE (coro_current); 3926 struct coro *current = SvSTATE (coro_current);
3423 3927
3424 if (expect_false (current == self)) 3928 if (ecb_expect_false (current == self))
3425 { 3929 {
3426 coro_times_update (); 3930 coro_times_update ();
3427 coro_times_add (SvSTATE (coro_current)); 3931 coro_times_add (SvSTATE (coro_current));
3428 } 3932 }
3429 3933
3430 EXTEND (SP, 2); 3934 EXTEND (SP, 2);
3431 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)));
3432 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)));
3433 3937
3434 if (expect_false (current == self)) 3938 if (ecb_expect_false (current == self))
3435 coro_times_sub (SvSTATE (coro_current)); 3939 coro_times_sub (SvSTATE (coro_current));
3436} 3940}
3437 3941
3438void 3942void
3439swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3943swap_sv (Coro::State coro, SV *sva, SV *svb)
3440 CODE: 3944 CODE:
3441{ 3945{
3442 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);
3443 3952
3444 if (current == coro) 3953 if (current == coro)
3445 SWAP_SVS (current); 3954 SWAP_SVS_LEAVE (current);
3446 3955
3447 if (!coro->swap_sv) 3956 if (!coro->swap_sv)
3448 coro->swap_sv = newAV (); 3957 coro->swap_sv = newAV ();
3449 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
3450 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 3980 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3451 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 3981 av_push (swap_sv, SvREFCNT_inc_NN (svb));
3982
3983 removed:
3452 3984
3453 if (current == coro) 3985 if (current == coro)
3454 SWAP_SVS (current); 3986 SWAP_SVS_ENTER (current);
3455} 3987}
3456 3988
3457 3989
3458MODULE = Coro::State PACKAGE = Coro 3990MODULE = Coro::State PACKAGE = Coro
3459 3991
3460BOOT: 3992BOOT:
3461{ 3993{
3994 if (SVt_LAST > 32)
3995 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3996
3462 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3997 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3463 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3998 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3464 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3999 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3465 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3466 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);
3467 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4001 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3468 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4002 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3469 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4003 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3470 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4004 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3471 4005
3472 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);
3473 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4007 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3474 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);
3475 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 */
3476 4010
3477 coro_stash = gv_stashpv ("Coro", TRUE); 4011 coro_stash = gv_stashpv ("Coro", TRUE);
3478 4012
3479 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4013 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3480 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4014 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3481 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4015 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3493 coroapi.ready = api_ready; 4027 coroapi.ready = api_ready;
3494 coroapi.is_ready = api_is_ready; 4028 coroapi.is_ready = api_is_ready;
3495 coroapi.nready = coro_nready; 4029 coroapi.nready = coro_nready;
3496 coroapi.current = coro_current; 4030 coroapi.current = coro_current;
3497 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
3498 /*GCoroAPI = &coroapi;*/ 4036 /*GCoroAPI = &coroapi;*/
3499 sv_setiv (sv, (IV)&coroapi); 4037 sv_setiv (sv, (IV)&coroapi);
3500 SvREADONLY_on (sv); 4038 SvREADONLY_on (sv);
3501 } 4039 }
3502} 4040}
… …
3509 api_ready (aTHX_ RETVAL); 4047 api_ready (aTHX_ RETVAL);
3510 OUTPUT: 4048 OUTPUT:
3511 RETVAL 4049 RETVAL
3512 4050
3513void 4051void
4052_destroy (Coro::State coro)
4053 CODE:
4054 /* used by the manager thread */
4055 coro_state_destroy (aTHX_ coro);
4056
4057void
4058on_destroy (Coro::State coro, SV *cb)
4059 CODE:
4060 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4061
4062void
4063join (...)
4064 CODE:
4065 CORO_EXECUTE_SLF_XS (slf_init_join);
4066
4067void
3514terminate (...) 4068terminate (...)
3515 CODE: 4069 CODE:
3516 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4070 CORO_EXECUTE_SLF_XS (slf_init_terminate);
4071
4072void
4073cancel (...)
4074 CODE:
4075 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4076
4077int
4078safe_cancel (Coro::State self, ...)
4079 C_ARGS: aTHX_ self, &ST (1), items - 1
3517 4080
3518void 4081void
3519schedule (...) 4082schedule (...)
3520 CODE: 4083 CODE:
3521 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4084 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3542 4105
3543void 4106void
3544_set_current (SV *current) 4107_set_current (SV *current)
3545 PROTOTYPE: $ 4108 PROTOTYPE: $
3546 CODE: 4109 CODE:
3547 SvREFCNT_dec (SvRV (coro_current)); 4110 SvREFCNT_dec_NN (SvRV (coro_current));
3548 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4111 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3549 4112
3550void 4113void
3551_set_readyhook (SV *hook) 4114_set_readyhook (SV *hook)
3552 PROTOTYPE: $ 4115 PROTOTYPE: $
… …
3636 4199
3637 if ((SV *)hv == &PL_sv_undef) 4200 if ((SV *)hv == &PL_sv_undef)
3638 { 4201 {
3639 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);
3640 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4203 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3641 SvREFCNT_dec (sv); 4204 SvREFCNT_dec_NN (sv);
3642 } 4205 }
3643 4206
3644 { 4207 {
3645 struct coro *coro = SvSTATE_hv (hv); 4208 struct coro *coro = SvSTATE_hv (hv);
3646 4209
… …
3653 api_ready (aTHX_ (SV *)hv); 4216 api_ready (aTHX_ (SV *)hv);
3654 4217
3655 if (GIMME_V != G_VOID) 4218 if (GIMME_V != G_VOID)
3656 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4219 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3657 else 4220 else
3658 SvREFCNT_dec (hv); 4221 SvREFCNT_dec_NN (hv);
3659} 4222}
3660 4223
3661SV * 4224SV *
3662rouse_cb () 4225rouse_cb ()
3663 PROTOTYPE: 4226 PROTOTYPE:
… …
3678 on_leave = 1 4241 on_leave = 1
3679 PROTOTYPE: & 4242 PROTOTYPE: &
3680 CODE: 4243 CODE:
3681{ 4244{
3682 struct coro *coro = SvSTATE_current; 4245 struct coro *coro = SvSTATE_current;
3683 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4246 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3684 4247
3685 block = s_get_cv_croak (block); 4248 block = s_get_cv_croak (block);
3686 4249
3687 if (!*avp) 4250 if (!*avp)
3688 *avp = newAV (); 4251 *avp = newAV ();
… …
3708 4271
3709SV * 4272SV *
3710new (SV *klass, SV *count = 0) 4273new (SV *klass, SV *count = 0)
3711 CODE: 4274 CODE:
3712{ 4275{
3713 int semcnt = 1; 4276 int semcnt = 1;
3714 4277
3715 if (count) 4278 if (count)
3716 { 4279 {
3717 SvGETMAGIC (count); 4280 SvGETMAGIC (count);
3718 4281
… …
3742 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4305 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3743 OUTPUT: 4306 OUTPUT:
3744 RETVAL 4307 RETVAL
3745 4308
3746void 4309void
3747up (SV *self, int adjust = 1) 4310up (SV *self)
3748 ALIAS:
3749 adjust = 1
3750 CODE: 4311 CODE:
4312 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4313
4314void
4315adjust (SV *self, int adjust)
4316 CODE:
3751 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4317 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3752 4318
3753void 4319void
3754down (...) 4320down (...)
3755 CODE: 4321 CODE:
3756 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4322 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3778 XSRETURN_NO; 4344 XSRETURN_NO;
3779} 4345}
3780 4346
3781void 4347void
3782waiters (SV *self) 4348waiters (SV *self)
3783 PPCODE: 4349 PPCODE:
3784{ 4350{
3785 AV *av = (AV *)SvRV (self); 4351 AV *av = (AV *)SvRV (self);
3786 int wcount = AvFILLp (av) + 1 - 1; 4352 int wcount = AvFILLp (av) + 1 - 1;
3787 4353
3788 if (GIMME_V == G_SCALAR) 4354 if (GIMME_V == G_SCALAR)
… …
3797} 4363}
3798 4364
3799MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4365MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3800 4366
3801void 4367void
3802_may_delete (SV *sem, int count, int extra_refs) 4368_may_delete (SV *sem, int count, unsigned int extra_refs)
3803 PPCODE: 4369 PPCODE:
3804{ 4370{
3805 AV *av = (AV *)SvRV (sem); 4371 AV *av = (AV *)SvRV (sem);
3806 4372
3807 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4373 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3808 && AvFILLp (av) == 0 /* no waiters, just count */ 4374 && AvFILLp (av) == 0 /* no waiters, just count */
3809 && SvIV (AvARRAY (av)[0]) == count) 4375 && SvIV (AvARRAY (av)[0]) == count)
3810 XSRETURN_YES; 4376 XSRETURN_YES;
… …
3831 4397
3832void 4398void
3833broadcast (SV *self) 4399broadcast (SV *self)
3834 CODE: 4400 CODE:
3835{ 4401{
3836 AV *av = (AV *)SvRV (self); 4402 AV *av = (AV *)SvRV (self);
3837 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4403 coro_signal_wake (aTHX_ av, AvFILLp (av));
3838} 4404}
3839 4405
3840void 4406void
3841send (SV *self) 4407send (SV *self)
… …
3849 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4415 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3850} 4416}
3851 4417
3852IV 4418IV
3853awaited (SV *self) 4419awaited (SV *self)
3854 CODE: 4420 CODE:
3855 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4421 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3856 OUTPUT: 4422 OUTPUT:
3857 RETVAL 4423 RETVAL
3858 4424
3859 4425
… …
3864 4430
3865void 4431void
3866_schedule (...) 4432_schedule (...)
3867 CODE: 4433 CODE:
3868{ 4434{
3869 static int incede; 4435 static int incede;
3870 4436
3871 api_cede_notself (aTHX); 4437 api_cede_notself (aTHX);
3872 4438
3873 ++incede; 4439 ++incede;
3874 while (coro_nready >= incede && api_cede (aTHX)) 4440 while (coro_nready >= incede && api_cede (aTHX))
… …
3918 { 4484 {
3919 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4485 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3920 coro_old_pp_sselect = 0; 4486 coro_old_pp_sselect = 0;
3921 } 4487 }
3922 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