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.387 by root, Mon Feb 21 13:38:04 2011 UTC vs.
Revision 1.470 by root, Fri Jul 14 13:14:32 2017 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)
69# undef HAS_GETTIMEOFDAY
27# undef setjmp 70# undef setjmp
28# undef longjmp 71# undef longjmp
29# undef _exit 72# undef _exit
30# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
31#else 74#else
32# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
33#endif 76#endif
34 77
35#ifdef HAVE_MMAP
36# include <unistd.h>
37# include <sys/mman.h>
38# ifndef MAP_ANONYMOUS
39# ifdef MAP_ANON
40# define MAP_ANONYMOUS MAP_ANON
41# else
42# undef HAVE_MMAP
43# endif
44# endif
45# include <limits.h>
46# ifndef PAGESIZE
47# define PAGESIZE pagesize
48# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
49static long pagesize;
50# else
51# define BOOT_PAGESIZE (void)0
52# endif
53#else
54# define PAGESIZE 0
55# define BOOT_PAGESIZE (void)0
56#endif
57
58#if CORO_USE_VALGRIND
59# include <valgrind/valgrind.h>
60#endif
61
62/* the maximum number of idle cctx that will be pooled */ 78/* the maximum number of idle cctx that will be pooled */
63static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
64 80
65#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
66# undef CORO_STACKGUARD 82# define HAS_SCOPESTACK_NAME 1
67#endif
68
69#ifndef CORO_STACKGUARD
70# define CORO_STACKGUARD 0
71#endif 83#endif
72 84
73/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
74#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
75# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
85# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
86#endif 98#endif
87 99
88#define IN_DESTRUCT PL_dirty 100#define IN_DESTRUCT PL_dirty
89 101
90#if __GNUC__ >= 3
91# define attribute(x) __attribute__(x)
92# define expect(expr,value) __builtin_expect ((expr), (value))
93# define INLINE static inline
94#else
95# define attribute(x)
96# define expect(expr,value) (expr)
97# define INLINE static
98#endif
99
100#define expect_false(expr) expect ((expr) != 0, 0)
101#define expect_true(expr) expect ((expr) != 0, 1)
102
103#define NOINLINE attribute ((noinline))
104
105#include "CoroAPI.h" 102#include "CoroAPI.h"
106#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
107 104
108#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
109# if CORO_PTHREAD 106# if CORO_PTHREAD
… …
119# define CORO_CLOCK_MONOTONIC 1 116# define CORO_CLOCK_MONOTONIC 1
120# define CORO_CLOCK_THREAD_CPUTIME_ID 3 117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
121# endif 118# endif
122#endif 119#endif
123 120
121#if PERL_VERSION_ATLEAST(5,24,0)
122# define SUB_ARGARRAY PL_curpad[0]
123#else
124# define SUB_ARGARRAY (SV *)cx->blk_sub.argarray
125#endif
126
127/* perl usually suppresses asserts. for debugging, we sometimes force it to be on */
128#if 0
129# undef NDEBUG
130# include <assert.h>
131#endif
132
124static double (*nvtime)(); /* so why doesn't it take void? */ 133static double (*nvtime)(); /* so why doesn't it take void? */
125static void (*u2time)(pTHX_ UV ret[2]); 134static void (*u2time)(pTHX_ UV ret[2]);
126 135
127/* we hijack an hopefully unused CV flag for our purposes */ 136/* we hijack an hopefully unused CV flag for our purposes */
128#define CVf_SLF 0x4000 137#define CVf_SLF 0x4000
129static OP *pp_slf (pTHX); 138static OP *pp_slf (pTHX);
139static void slf_destroy (pTHX_ struct coro *coro);
130 140
131static U32 cctx_gen; 141static U32 cctx_gen;
132static size_t cctx_stacksize = CORO_STACKSIZE; 142static size_t cctx_stacksize = CORO_STACKSIZE;
133static struct CoroAPI coroapi; 143static struct CoroAPI coroapi;
134static AV *main_mainstack; /* used to differentiate between $main and others */ 144static AV *main_mainstack; /* used to differentiate between $main and others */
… …
142 152
143static GV *irsgv; /* $/ */ 153static GV *irsgv; /* $/ */
144static GV *stdoutgv; /* *STDOUT */ 154static GV *stdoutgv; /* *STDOUT */
145static SV *rv_diehook; 155static SV *rv_diehook;
146static SV *rv_warnhook; 156static SV *rv_warnhook;
147static HV *hv_sig; /* %SIG */
148 157
149/* async_pool helper stuff */ 158/* async_pool helper stuff */
150static SV *sv_pool_rss; 159static SV *sv_pool_rss;
151static SV *sv_pool_size; 160static SV *sv_pool_size;
152static SV *sv_async_pool_idle; /* description string */ 161static SV *sv_async_pool_idle; /* description string */
… …
164static char times_valid; 173static char times_valid;
165 174
166static struct coro_cctx *cctx_first; 175static struct coro_cctx *cctx_first;
167static int cctx_count, cctx_idle; 176static int cctx_count, cctx_idle;
168 177
169enum { 178enum
179{
170 CC_MAPPED = 0x01, 180 CC_MAPPED = 0x01,
171 CC_NOREUSE = 0x02, /* throw this away after tracing */ 181 CC_NOREUSE = 0x02, /* throw this away after tracing */
172 CC_TRACE = 0x04, 182 CC_TRACE = 0x04,
173 CC_TRACE_SUB = 0x08, /* trace sub calls */ 183 CC_TRACE_SUB = 0x08, /* trace sub calls */
174 CC_TRACE_LINE = 0x10, /* trace each statement */ 184 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
179typedef struct coro_cctx 189typedef struct coro_cctx
180{ 190{
181 struct coro_cctx *next; 191 struct coro_cctx *next;
182 192
183 /* the stack */ 193 /* the stack */
184 void *sptr; 194 struct coro_stack stack;
185 size_t ssize;
186 195
187 /* cpu state */ 196 /* cpu state */
188 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 197 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
198#ifndef NDEBUG
189 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 199 JMPENV *idle_te; /* same as idle_sp, but for top_env */
200#endif
190 JMPENV *top_env; 201 JMPENV *top_env;
191 coro_context cctx; 202 coro_context cctx;
192 203
193 U32 gen; 204 U32 gen;
194#if CORO_USE_VALGRIND 205#if CORO_USE_VALGRIND
195 int valgrind_id; 206 int valgrind_id;
196#endif 207#endif
197 unsigned char flags; 208 unsigned char flags;
198} coro_cctx; 209} coro_cctx;
199 210
200coro_cctx *cctx_current; /* the currently running cctx */ 211static coro_cctx *cctx_current; /* the currently running cctx */
201 212
202/*****************************************************************************/ 213/*****************************************************************************/
203 214
215static MGVTBL coro_state_vtbl;
216
204enum { 217enum
218{
205 CF_RUNNING = 0x0001, /* coroutine is running */ 219 CF_RUNNING = 0x0001, /* coroutine is running */
206 CF_READY = 0x0002, /* coroutine is ready */ 220 CF_READY = 0x0002, /* coroutine is ready */
207 CF_NEW = 0x0004, /* has never been switched to */ 221 CF_NEW = 0x0004, /* has never been switched to */
208 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 222 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
209 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 223 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
224 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
210}; 225};
211 226
212/* the structure where most of the perl state is stored, overlaid on the cxstack */ 227/* the structure where most of the perl state is stored, overlaid on the cxstack */
213typedef struct 228typedef struct
214{ 229{
215 SV *defsv;
216 AV *defav;
217 SV *errsv;
218 SV *irsgv;
219 HV *hinthv;
220#define VAR(name,type) type name; 230 #define VARx(name,expr,type) type name;
221# include "state.h" 231 #include "state.h"
222#undef VAR
223} perl_slots; 232} perl_slots;
224 233
234/* how many context stack entries do we need for perl_slots */
225#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 235#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
226 236
227/* this is a structure representing a perl-level coroutine */ 237/* this is a structure representing a perl-level coroutine */
228struct coro { 238struct coro
239{
229 /* the C coroutine allocated to this perl coroutine, if any */ 240 /* the C coroutine allocated to this perl coroutine, if any */
230 coro_cctx *cctx; 241 coro_cctx *cctx;
231 242
232 /* ready queue */ 243 /* ready queue */
233 struct coro *next_ready; 244 struct coro *next_ready;
… …
235 /* state data */ 246 /* state data */
236 struct CoroSLF slf_frame; /* saved slf frame */ 247 struct CoroSLF slf_frame; /* saved slf frame */
237 AV *mainstack; 248 AV *mainstack;
238 perl_slots *slot; /* basically the saved sp */ 249 perl_slots *slot; /* basically the saved sp */
239 250
240 CV *startcv; /* the CV to execute */ 251 CV *startcv; /* the CV to execute */
241 AV *args; /* data associated with this coroutine (initial args) */ 252 AV *args; /* data associated with this coroutine (initial args) */
242 int refcnt; /* coroutines are refcounted, yes */
243 int flags; /* CF_ flags */ 253 int flags; /* CF_ flags */
244 HV *hv; /* the perl hash associated with this coro, if any */ 254 HV *hv; /* the perl hash associated with this coro, if any */
245 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
246 255
247 /* statistics */ 256 /* statistics */
248 int usecount; /* number of transfers to this coro */ 257 int usecount; /* number of transfers to this coro */
249 258
250 /* coro process data */ 259 /* coro process data */
251 int prio; 260 int prio;
252 SV *except; /* exception to be thrown */ 261 SV *except; /* exception to be thrown */
253 SV *rouse_cb; 262 SV *rouse_cb; /* last rouse callback */
263 AV *on_destroy; /* callbacks or coros to notify on destroy */
264 AV *status; /* the exit status list */
254 265
255 /* async_pool */ 266 /* async_pool */
256 SV *saved_deffh; 267 SV *saved_deffh;
257 SV *invoke_cb; 268 SV *invoke_cb;
258 AV *invoke_av; 269 AV *invoke_av;
259 270
260 /* on_enter/on_leave */ 271 /* on_enter/on_leave */
261 AV *on_enter; 272 AV *on_enter; AV *on_enter_xs;
262 AV *on_leave; 273 AV *on_leave; AV *on_leave_xs;
263 274
264 /* swap_sv */ 275 /* swap_sv */
265 AV *swap_sv; 276 AV *swap_sv;
266 277
267 /* times */ 278 /* times */
… …
274typedef struct coro *Coro__State; 285typedef struct coro *Coro__State;
275typedef struct coro *Coro__State_or_hashref; 286typedef struct coro *Coro__State_or_hashref;
276 287
277/* the following variables are effectively part of the perl context */ 288/* the following variables are effectively part of the perl context */
278/* and get copied between struct coro and these variables */ 289/* and get copied between struct coro and these variables */
279/* the mainr easonw e don't support windows process emulation */ 290/* the main reason we don't support windows process emulation */
280static struct CoroSLF slf_frame; /* the current slf frame */ 291static struct CoroSLF slf_frame; /* the current slf frame */
281 292
282/** Coro ********************************************************************/ 293/** Coro ********************************************************************/
283 294
284#define CORO_PRIO_MAX 3 295#define CORO_PRIO_MAX 3
… …
290 301
291/* for Coro.pm */ 302/* for Coro.pm */
292static SV *coro_current; 303static SV *coro_current;
293static SV *coro_readyhook; 304static SV *coro_readyhook;
294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 305static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
295static CV *cv_coro_run, *cv_coro_terminate; 306static CV *cv_coro_run;
296static struct coro *coro_first; 307static struct coro *coro_first;
297#define coro_nready coroapi.nready 308#define coro_nready coroapi.nready
309
310/** JIT *********************************************************************/
311
312#if CORO_JIT
313 /* APPLE doesn't have mmap though */
314 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
315 #ifndef CORO_JIT_TYPE
316 #if ECB_AMD64 && CORO_JIT_UNIXY
317 #define CORO_JIT_TYPE "amd64-unix"
318 #elif __i386 && CORO_JIT_UNIXY
319 #define CORO_JIT_TYPE "x86-unix"
320 #endif
321 #endif
322#endif
323
324#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
325 #undef CORO_JIT
326#endif
327
328#if CORO_JIT
329 typedef void (*load_save_perl_slots_type)(perl_slots *);
330 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
331#endif
298 332
299/** Coro::Select ************************************************************/ 333/** Coro::Select ************************************************************/
300 334
301static OP *(*coro_old_pp_sselect) (pTHX); 335static OP *(*coro_old_pp_sselect) (pTHX);
302static SV *coro_select_select; 336static SV *coro_select_select;
… …
318 352
319/** time stuff **************************************************************/ 353/** time stuff **************************************************************/
320 354
321#ifdef HAS_GETTIMEOFDAY 355#ifdef HAS_GETTIMEOFDAY
322 356
323static void 357ecb_inline void
324coro_u2time (pTHX_ UV ret[2]) 358coro_u2time (pTHX_ UV ret[2])
325{ 359{
326 struct timeval tv; 360 struct timeval tv;
327 gettimeofday (&tv, 0); 361 gettimeofday (&tv, 0);
328 362
329 ret [0] = tv.tv_sec; 363 ret [0] = tv.tv_sec;
330 ret [1] = tv.tv_usec; 364 ret [1] = tv.tv_usec;
331} 365}
332 366
333static double 367ecb_inline double
334coro_nvtime () 368coro_nvtime (void)
335{ 369{
336 struct timeval tv; 370 struct timeval tv;
337 gettimeofday (&tv, 0); 371 gettimeofday (&tv, 0);
338 372
339 return tv.tv_sec + tv.tv_usec * 1e-6; 373 return tv.tv_sec + tv.tv_usec * 1e-6;
340} 374}
341 375
342static void 376ecb_inline void
343time_init (void) 377time_init (pTHX)
344{ 378{
345 nvtime = coro_nvtime; 379 nvtime = coro_nvtime;
346 u2time = coro_u2time; 380 u2time = coro_u2time;
347} 381}
348 382
349#else 383#else
350 384
351static void 385ecb_inline void
352time_init (void) 386time_init (pTHX)
353{ 387{
354 SV **svp; 388 SV **svp;
355 389
356 require_pv ("Time::HiRes"); 390 require_pv ("Time/HiRes.pm");
357 391
358 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 392 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
359 393
360 if (!svp) croak ("Time::HiRes is required"); 394 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
361 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 395 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
362 396
363 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 397 nvtime = INT2PTR (double (*)(), SvIV (*svp));
364 398
365 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0); 399 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
366 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp)); 400 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
… …
368 402
369#endif 403#endif
370 404
371/** lowlevel stuff **********************************************************/ 405/** lowlevel stuff **********************************************************/
372 406
373static SV * 407static SV * ecb_noinline
374coro_get_sv (pTHX_ const char *name, int create) 408coro_get_sv (pTHX_ const char *name, int create)
375{ 409{
376#if PERL_VERSION_ATLEAST (5,10,0) 410#if PERL_VERSION_ATLEAST (5,10,0)
377 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 411 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
378 get_sv (name, create); 412 get_sv (name, create);
379#endif 413#endif
380 return get_sv (name, create); 414 return get_sv (name, create);
381} 415}
382 416
383static AV * 417static AV * ecb_noinline
384coro_get_av (pTHX_ const char *name, int create) 418coro_get_av (pTHX_ const char *name, int create)
385{ 419{
386#if PERL_VERSION_ATLEAST (5,10,0) 420#if PERL_VERSION_ATLEAST (5,10,0)
387 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 421 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
388 get_av (name, create); 422 get_av (name, create);
389#endif 423#endif
390 return get_av (name, create); 424 return get_av (name, create);
391} 425}
392 426
393static HV * 427static HV * ecb_noinline
394coro_get_hv (pTHX_ const char *name, int create) 428coro_get_hv (pTHX_ const char *name, int create)
395{ 429{
396#if PERL_VERSION_ATLEAST (5,10,0) 430#if PERL_VERSION_ATLEAST (5,10,0)
397 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 431 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
398 get_hv (name, create); 432 get_hv (name, create);
399#endif 433#endif
400 return get_hv (name, create); 434 return get_hv (name, create);
401} 435}
402 436
403INLINE void 437ecb_inline void
404coro_times_update () 438coro_times_update (void)
405{ 439{
406#ifdef coro_clock_gettime 440#ifdef coro_clock_gettime
407 struct timespec ts; 441 struct timespec ts;
408 442
409 ts.tv_sec = ts.tv_nsec = 0; 443 ts.tv_sec = ts.tv_nsec = 0;
… …
421 time_real [0] = tv [0]; 455 time_real [0] = tv [0];
422 time_real [1] = tv [1] * 1000; 456 time_real [1] = tv [1] * 1000;
423#endif 457#endif
424} 458}
425 459
426INLINE void 460ecb_inline void
427coro_times_add (struct coro *c) 461coro_times_add (struct coro *c)
428{ 462{
429 c->t_real [1] += time_real [1]; 463 c->t_real [1] += time_real [1];
430 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 464 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
431 c->t_real [0] += time_real [0]; 465 c->t_real [0] += time_real [0];
… …
433 c->t_cpu [1] += time_cpu [1]; 467 c->t_cpu [1] += time_cpu [1];
434 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 468 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
435 c->t_cpu [0] += time_cpu [0]; 469 c->t_cpu [0] += time_cpu [0];
436} 470}
437 471
438INLINE void 472ecb_inline void
439coro_times_sub (struct coro *c) 473coro_times_sub (struct coro *c)
440{ 474{
441 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 475 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
442 c->t_real [1] -= time_real [1]; 476 c->t_real [1] -= time_real [1];
443 c->t_real [0] -= time_real [0]; 477 c->t_real [0] -= time_real [0];
… …
451/* magic glue */ 485/* magic glue */
452 486
453#define CORO_MAGIC_type_cv 26 487#define CORO_MAGIC_type_cv 26
454#define CORO_MAGIC_type_state PERL_MAGIC_ext 488#define CORO_MAGIC_type_state PERL_MAGIC_ext
455 489
456#define CORO_MAGIC_NN(sv, type) \ 490#define CORO_MAGIC_NN(sv, type) \
457 (expect_true (SvMAGIC (sv)->mg_type == type) \ 491 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
458 ? SvMAGIC (sv) \ 492 ? SvMAGIC (sv) \
459 : mg_find (sv, type)) 493 : mg_find (sv, type))
460 494
461#define CORO_MAGIC(sv, type) \ 495#define CORO_MAGIC(sv, type) \
462 (expect_true (SvMAGIC (sv)) \ 496 (ecb_expect_true (SvMAGIC (sv)) \
463 ? CORO_MAGIC_NN (sv, type) \ 497 ? CORO_MAGIC_NN (sv, type) \
464 : 0) 498 : 0)
465 499
466#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 500#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
467#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 501#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
468 502
469INLINE struct coro * 503ecb_inline MAGIC *
470SvSTATE_ (pTHX_ SV *coro) 504SvSTATEhv_p (pTHX_ SV *coro)
471{ 505{
472 HV *stash;
473 MAGIC *mg; 506 MAGIC *mg;
474 507
508 if (ecb_expect_true (
509 SvTYPE (coro) == SVt_PVHV
510 && (mg = CORO_MAGIC_state (coro))
511 && mg->mg_virtual == &coro_state_vtbl
512 ))
513 return mg;
514
515 return 0;
516}
517
518ecb_inline struct coro *
519SvSTATE_ (pTHX_ SV *coro_sv)
520{
521 MAGIC *mg;
522
475 if (SvROK (coro)) 523 if (SvROK (coro_sv))
476 coro = SvRV (coro); 524 coro_sv = SvRV (coro_sv);
477 525
478 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 526 mg = SvSTATEhv_p (aTHX_ coro_sv);
527 if (!mg)
479 croak ("Coro::State object required"); 528 croak ("Coro::State object required");
480 529
481 stash = SvSTASH (coro);
482 if (expect_false (stash != coro_stash && stash != coro_state_stash))
483 {
484 /* very slow, but rare, check */
485 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
486 croak ("Coro::State object required");
487 }
488
489 mg = CORO_MAGIC_state (coro);
490 return (struct coro *)mg->mg_ptr; 530 return (struct coro *)mg->mg_ptr;
491} 531}
492 532
493#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 533#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
494 534
… …
497#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 537#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
498 538
499/*****************************************************************************/ 539/*****************************************************************************/
500/* padlist management and caching */ 540/* padlist management and caching */
501 541
502static AV * 542ecb_inline PADLIST *
503coro_derive_padlist (pTHX_ CV *cv) 543coro_derive_padlist (pTHX_ CV *cv)
504{ 544{
505 AV *padlist = CvPADLIST (cv); 545 PADLIST *padlist = CvPADLIST (cv);
506 AV *newpadlist, *newpad; 546 PADLIST *newpadlist;
547 PADNAMELIST *padnames;
548 PAD *newpad;
549 PADOFFSET off = PadlistMAX (padlist) + 1;
507 550
508 newpadlist = newAV (); 551#if NEWPADAPI
552
553 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
554 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
555 while (!PadlistARRAY (padlist)[off - 1])
556 --off;
557
558 Perl_pad_push (aTHX_ padlist, off);
559
560 newpad = PadlistARRAY (padlist)[off];
561 PadlistARRAY (padlist)[off] = 0;
562
563#else
564
565#if PERL_VERSION_ATLEAST (5,10,0)
566 Perl_pad_push (aTHX_ padlist, off);
567#else
568 Perl_pad_push (aTHX_ padlist, off, 1);
569#endif
570
571 newpad = PadlistARRAY (padlist)[off];
572 PadlistMAX (padlist) = off - 1;
573
574#endif
575
576 newPADLIST (newpadlist);
577#if !PERL_VERSION_ATLEAST(5,15,3)
578 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
509 AvREAL_off (newpadlist); 579 AvREAL_off (newpadlist);
510#if PERL_VERSION_ATLEAST (5,10,0)
511 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
512#else
513 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
514#endif 580#endif
515 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
516 --AvFILLp (padlist);
517 581
518 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 582 /* Already extended to 2 elements by newPADLIST. */
519 av_store (newpadlist, 1, (SV *)newpad); 583 PadlistMAX (newpadlist) = 1;
584
585 padnames = PadlistNAMES (padlist);
586 ++PadnamelistREFCNT (padnames);
587 PadlistNAMES (newpadlist) = padnames;
588
589 PadlistARRAY (newpadlist)[1] = newpad;
520 590
521 return newpadlist; 591 return newpadlist;
522} 592}
523 593
524static void 594ecb_inline void
525free_padlist (pTHX_ AV *padlist) 595free_padlist (pTHX_ PADLIST *padlist)
526{ 596{
527 /* may be during global destruction */ 597 /* may be during global destruction */
528 if (!IN_DESTRUCT) 598 if (!IN_DESTRUCT)
529 { 599 {
530 I32 i = AvFILLp (padlist); 600 I32 i = PadlistMAX (padlist);
531 601
532 while (i > 0) /* special-case index 0 */ 602 while (i > 0) /* special-case index 0 */
533 { 603 {
534 /* we try to be extra-careful here */ 604 /* we try to be extra-careful here */
535 AV *av = (AV *)AvARRAY (padlist)[i--]; 605 PAD *pad = PadlistARRAY (padlist)[i--];
536 I32 j = AvFILLp (av);
537 606
607 if (pad)
608 {
609 I32 j = PadMAX (pad);
610
538 while (j >= 0) 611 while (j >= 0)
539 SvREFCNT_dec (AvARRAY (av)[j--]); 612 SvREFCNT_dec (PadARRAY (pad)[j--]);
540 613
541 AvFILLp (av) = -1; 614 PadMAX (pad) = -1;
542 SvREFCNT_dec (av); 615 SvREFCNT_dec (pad);
616 }
543 } 617 }
544 618
545 SvREFCNT_dec (AvARRAY (padlist)[0]); 619 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
546 620
621#if NEWPADAPI
622 Safefree (PadlistARRAY (padlist));
623 Safefree (padlist);
624#else
547 AvFILLp (padlist) = -1; 625 AvFILLp (padlist) = -1;
626 AvREAL_off (padlist);
548 SvREFCNT_dec ((SV*)padlist); 627 SvREFCNT_dec ((SV*)padlist);
628#endif
549 } 629 }
550} 630}
551 631
552static int 632static int
553coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 633coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
554{ 634{
555 AV *padlist; 635 PADLIST *padlist;
556 AV *av = (AV *)mg->mg_obj; 636 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
637 size_t len = *(size_t *)mg->mg_ptr;
557 638
558 /* perl manages to free our internal AV and _then_ call us */ 639 /* perl manages to free our internal AV and _then_ call us */
559 if (IN_DESTRUCT) 640 if (IN_DESTRUCT)
560 return 0; 641 return 0;
561 642
562 /* casting is fun. */ 643 while (len--)
563 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
564 free_padlist (aTHX_ padlist); 644 free_padlist (aTHX_ padlists[len]);
565
566 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
567 645
568 return 0; 646 return 0;
569} 647}
570 648
571static MGVTBL coro_cv_vtbl = { 649static MGVTBL coro_cv_vtbl = {
572 0, 0, 0, 0, 650 0, 0, 0, 0,
573 coro_cv_free 651 coro_cv_free
574}; 652};
575 653
576/* the next two functions merely cache the padlists */ 654/* the next two functions merely cache the padlists */
577static void 655ecb_inline void
578get_padlist (pTHX_ CV *cv) 656get_padlist (pTHX_ CV *cv)
579{ 657{
580 MAGIC *mg = CORO_MAGIC_cv (cv); 658 MAGIC *mg = CORO_MAGIC_cv (cv);
581 AV *av; 659 size_t *lenp;
582 660
583 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 661 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
584 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 662 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
585 else 663 else
586 { 664 {
587#if CORO_PREFER_PERL_FUNCTIONS 665#if CORO_PREFER_PERL_FUNCTIONS
588 /* this is probably cleaner? but also slower! */ 666 /* this is probably cleaner? but also slower! */
589 /* in practise, it seems to be less stable */ 667 /* in practise, it seems to be less stable */
… …
595 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 673 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
596#endif 674#endif
597 } 675 }
598} 676}
599 677
600static void 678ecb_inline void
601put_padlist (pTHX_ CV *cv) 679put_padlist (pTHX_ CV *cv)
602{ 680{
603 MAGIC *mg = CORO_MAGIC_cv (cv); 681 MAGIC *mg = CORO_MAGIC_cv (cv);
604 AV *av;
605 682
606 if (expect_false (!mg)) 683 if (ecb_expect_false (!mg))
684 {
607 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 685 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
686 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
687 mg->mg_len = 1; /* so mg_free frees mg_ptr */
688 }
689 else
690 Renew (mg->mg_ptr,
691 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
692 char);
608 693
609 av = (AV *)mg->mg_obj; 694 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
610
611 if (expect_false (AvFILLp (av) >= AvMAX (av)))
612 av_extend (av, AvFILLp (av) + 1);
613
614 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
615} 695}
616 696
617/** load & save, init *******************************************************/ 697/** load & save, init *******************************************************/
618 698
699ecb_inline void
700swap_sv (SV *a, SV *b)
701{
702 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
703 SV tmp;
704
705 /* swap sv_any */
706 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
707
708 /* swap sv_flags */
709 SvFLAGS (&tmp) = SvFLAGS (a);
710 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
711 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
712
713#if PERL_VERSION_ATLEAST (5,10,0)
714 /* perl 5.10 and later complicates this _quite_ a bit, but it also
715 * is much faster, so no quarrels here. alternatively, we could
716 * sv_upgrade to avoid this.
717 */
718 {
719 /* swap sv_u */
720 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
721
722 /* if SvANY points to the head, we need to adjust the pointers,
723 * as the pointer for a still points to b, and maybe vice versa.
724 */
725 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
726 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
727 svany_in_head_set |= 1 << SVt_NV;
728 #endif
729
730 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
731
732 if (svany_in_head (SvTYPE (a)))
733 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
734
735 if (svany_in_head (SvTYPE (b)))
736 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
737 }
738#endif
739}
740
619/* swap sv heads, at least logically */ 741/* swap sv heads, at least logically */
620static void 742static void
621swap_svs (pTHX_ Coro__State c) 743swap_svs_enter (pTHX_ Coro__State c)
622{ 744{
623 int i; 745 int i;
624 746
625 for (i = 0; i <= AvFILLp (c->swap_sv); ) 747 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
626 { 748 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
627 SV *a = AvARRAY (c->swap_sv)[i++];
628 SV *b = AvARRAY (c->swap_sv)[i++];
629
630 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
631 SV tmp;
632
633 /* swap sv_any */
634 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
635
636 /* swap sv_flags */
637 SvFLAGS (&tmp) = SvFLAGS (a);
638 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
639 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
640
641#if PERL_VERSION_ATLEAST (5,10,0)
642 /* perl 5.10 complicates this _quite_ a bit, but it also is
643 * much faster, so no quarrels here. alternatively, we could
644 * sv_upgrade to avoid this.
645 */
646 {
647 /* swap sv_u */
648 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
649
650 /* if SvANY points to the head, we need to adjust the pointers,
651 * as the pointer for a still points to b, and maybe vice versa.
652 */
653 #define svany_in_head(type) \
654 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
655
656 if (svany_in_head (SvTYPE (a)))
657 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
658
659 if (svany_in_head (SvTYPE (b)))
660 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
661 }
662#endif
663 }
664} 749}
665 750
751static void
752swap_svs_leave (pTHX_ Coro__State c)
753{
754 int i;
755
756 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
757 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
758}
759
666#define SWAP_SVS(coro) \ 760#define SWAP_SVS_ENTER(coro) \
667 if (expect_false ((coro)->swap_sv)) \ 761 if (ecb_expect_false ((coro)->swap_sv)) \
668 swap_svs (aTHX_ (coro)) 762 swap_svs_enter (aTHX_ (coro))
763
764#define SWAP_SVS_LEAVE(coro) \
765 if (ecb_expect_false ((coro)->swap_sv)) \
766 swap_svs_leave (aTHX_ (coro))
669 767
670static void 768static void
671on_enterleave_call (pTHX_ SV *cb); 769on_enterleave_call (pTHX_ SV *cb);
672 770
673static void 771static void
… …
676 perl_slots *slot = c->slot; 774 perl_slots *slot = c->slot;
677 c->slot = 0; 775 c->slot = 0;
678 776
679 PL_mainstack = c->mainstack; 777 PL_mainstack = c->mainstack;
680 778
681 GvSV (PL_defgv) = slot->defsv; 779#if CORO_JIT
682 GvAV (PL_defgv) = slot->defav; 780 load_perl_slots (slot);
683 GvSV (PL_errgv) = slot->errsv; 781#else
684 GvSV (irsgv) = slot->irsgv;
685 GvHV (PL_hintgv) = slot->hinthv;
686
687 #define VAR(name,type) PL_ ## name = slot->name; 782 #define VARx(name,expr,type) expr = slot->name;
688 # include "state.h" 783 #include "state.h"
689 #undef VAR 784#endif
690 785
691 { 786 {
692 dSP; 787 dSP;
693 788
694 CV *cv; 789 CV *cv;
695 790
696 /* now do the ugly restore mess */ 791 /* now do the ugly restore mess */
697 while (expect_true (cv = (CV *)POPs)) 792 while (ecb_expect_true (cv = (CV *)POPs))
698 { 793 {
699 put_padlist (aTHX_ cv); /* mark this padlist as available */ 794 put_padlist (aTHX_ cv); /* mark this padlist as available */
700 CvDEPTH (cv) = PTR2IV (POPs); 795 CvDEPTH (cv) = PTR2IV (POPs);
701 CvPADLIST (cv) = (AV *)POPs; 796 CvPADLIST (cv) = (PADLIST *)POPs;
702 } 797 }
703 798
704 PUTBACK; 799 PUTBACK;
705 } 800 }
706 801
707 slf_frame = c->slf_frame; 802 slf_frame = c->slf_frame;
708 CORO_THROW = c->except; 803 CORO_THROW = c->except;
709 804
710 if (expect_false (enable_times)) 805 if (ecb_expect_false (enable_times))
711 { 806 {
712 if (expect_false (!times_valid)) 807 if (ecb_expect_false (!times_valid))
713 coro_times_update (); 808 coro_times_update ();
714 809
715 coro_times_sub (c); 810 coro_times_sub (c);
716 } 811 }
717 812
718 if (expect_false (c->on_enter)) 813 if (ecb_expect_false (c->on_enter))
719 { 814 {
720 int i; 815 int i;
721 816
722 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 817 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
723 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 818 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
724 } 819 }
725 820
821 if (ecb_expect_false (c->on_enter_xs))
822 {
823 int i;
824
825 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
826 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
827 }
828
726 SWAP_SVS (c); 829 SWAP_SVS_ENTER (c);
727} 830}
728 831
729static void 832static void
730save_perl (pTHX_ Coro__State c) 833save_perl (pTHX_ Coro__State c)
731{ 834{
732 SWAP_SVS (c); 835 SWAP_SVS_LEAVE (c);
733 836
837 if (ecb_expect_false (c->on_leave_xs))
838 {
839 int i;
840
841 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
842 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
843 }
844
734 if (expect_false (c->on_leave)) 845 if (ecb_expect_false (c->on_leave))
735 { 846 {
736 int i; 847 int i;
737 848
738 for (i = AvFILLp (c->on_leave); i >= 0; --i) 849 for (i = AvFILLp (c->on_leave); i >= 0; --i)
739 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 850 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
740 } 851 }
741 852
742 times_valid = 0; 853 times_valid = 0;
743 854
744 if (expect_false (enable_times)) 855 if (ecb_expect_false (enable_times))
745 { 856 {
746 coro_times_update (); times_valid = 1; 857 coro_times_update (); times_valid = 1;
747 coro_times_add (c); 858 coro_times_add (c);
748 } 859 }
749 860
… …
763 874
764 XPUSHs (Nullsv); 875 XPUSHs (Nullsv);
765 /* this loop was inspired by pp_caller */ 876 /* this loop was inspired by pp_caller */
766 for (;;) 877 for (;;)
767 { 878 {
768 while (expect_true (cxix >= 0)) 879 while (ecb_expect_true (cxix >= 0))
769 { 880 {
770 PERL_CONTEXT *cx = &ccstk[cxix--]; 881 PERL_CONTEXT *cx = &ccstk[cxix--];
771 882
772 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 883 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
773 { 884 {
774 CV *cv = cx->blk_sub.cv; 885 CV *cv = cx->blk_sub.cv;
775 886
776 if (expect_true (CvDEPTH (cv))) 887 if (ecb_expect_true (CvDEPTH (cv)))
777 { 888 {
778 EXTEND (SP, 3); 889 EXTEND (SP, 3);
779 PUSHs ((SV *)CvPADLIST (cv)); 890 PUSHs ((SV *)CvPADLIST (cv));
780 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 891 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
781 PUSHs ((SV *)cv); 892 PUSHs ((SV *)cv);
… …
784 get_padlist (aTHX_ cv); 895 get_padlist (aTHX_ cv);
785 } 896 }
786 } 897 }
787 } 898 }
788 899
789 if (expect_true (top_si->si_type == PERLSI_MAIN)) 900 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
790 break; 901 break;
791 902
792 top_si = top_si->si_prev; 903 top_si = top_si->si_prev;
793 ccstk = top_si->si_cxstack; 904 ccstk = top_si->si_cxstack;
794 cxix = top_si->si_cxix; 905 cxix = top_si->si_cxix;
… …
796 907
797 PUTBACK; 908 PUTBACK;
798 } 909 }
799 910
800 /* allocate some space on the context stack for our purposes */ 911 /* allocate some space on the context stack for our purposes */
801 /* we manually unroll here, as usually 2 slots is enough */ 912 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
802 if (SLOT_COUNT >= 1) CXINC;
803 if (SLOT_COUNT >= 2) CXINC;
804 if (SLOT_COUNT >= 3) CXINC;
805 { 913 {
806 unsigned int i; 914 unsigned int i;
915
807 for (i = 3; i < SLOT_COUNT; ++i) 916 for (i = 0; i < SLOT_COUNT; ++i)
808 CXINC; 917 CXINC;
809 } 918
810 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 919 cxstack_ix -= SLOT_COUNT; /* undo allocation */
920 }
811 921
812 c->mainstack = PL_mainstack; 922 c->mainstack = PL_mainstack;
813 923
814 { 924 {
815 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 925 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
816 926
817 slot->defav = GvAV (PL_defgv); 927#if CORO_JIT
818 slot->defsv = DEFSV; 928 save_perl_slots (slot);
819 slot->errsv = ERRSV; 929#else
820 slot->irsgv = GvSV (irsgv);
821 slot->hinthv = GvHV (PL_hintgv);
822
823 #define VAR(name,type) slot->name = PL_ ## name; 930 #define VARx(name,expr,type) slot->name = expr;
824 # include "state.h" 931 #include "state.h"
825 #undef VAR 932#endif
826 } 933 }
827} 934}
828 935
829/* 936/*
830 * allocate various perl stacks. This is almost an exact copy 937 * allocate various perl stacks. This is almost an exact copy
… …
836# define coro_init_stacks(thx) init_stacks () 943# define coro_init_stacks(thx) init_stacks ()
837#else 944#else
838static void 945static void
839coro_init_stacks (pTHX) 946coro_init_stacks (pTHX)
840{ 947{
841 PL_curstackinfo = new_stackinfo(32, 8); 948 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
842 PL_curstackinfo->si_type = PERLSI_MAIN; 949 PL_curstackinfo->si_type = PERLSI_MAIN;
843 PL_curstack = PL_curstackinfo->si_stack; 950 PL_curstack = PL_curstackinfo->si_stack;
844 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 951 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
845 952
846 PL_stack_base = AvARRAY(PL_curstack); 953 PL_stack_base = AvARRAY(PL_curstack);
… …
861#endif 968#endif
862 969
863 New(54,PL_scopestack,8,I32); 970 New(54,PL_scopestack,8,I32);
864 PL_scopestack_ix = 0; 971 PL_scopestack_ix = 0;
865 PL_scopestack_max = 8; 972 PL_scopestack_max = 8;
973#if HAS_SCOPESTACK_NAME
974 New(54,PL_scopestack_name,8,const char*);
975#endif
866 976
867 New(54,PL_savestack,24,ANY); 977 New(54,PL_savestack,24,ANY);
868 PL_savestack_ix = 0; 978 PL_savestack_ix = 0;
869 PL_savestack_max = 24; 979 PL_savestack_max = 24;
980#if PERL_VERSION_ATLEAST (5,24,0)
981 /* perl 5.24 moves SS_MAXPUSH optimisation from */
982 /* the header macros to PL_savestack_max */
983 PL_savestack_max -= SS_MAXPUSH;
984#endif
870 985
871#if !PERL_VERSION_ATLEAST (5,10,0) 986#if !PERL_VERSION_ATLEAST (5,10,0)
872 New(54,PL_retstack,4,OP*); 987 New(54,PL_retstack,4,OP*);
873 PL_retstack_ix = 0; 988 PL_retstack_ix = 0;
874 PL_retstack_max = 4; 989 PL_retstack_max = 4;
… …
898 } 1013 }
899 1014
900 Safefree (PL_tmps_stack); 1015 Safefree (PL_tmps_stack);
901 Safefree (PL_markstack); 1016 Safefree (PL_markstack);
902 Safefree (PL_scopestack); 1017 Safefree (PL_scopestack);
1018#if HAS_SCOPESTACK_NAME
1019 Safefree (PL_scopestack_name);
1020#endif
903 Safefree (PL_savestack); 1021 Safefree (PL_savestack);
904#if !PERL_VERSION_ATLEAST (5,10,0) 1022#if !PERL_VERSION_ATLEAST (5,10,0)
905 Safefree (PL_retstack); 1023 Safefree (PL_retstack);
906#endif 1024#endif
907} 1025}
… …
937 } 1055 }
938 1056
939 return rss; 1057 return rss;
940} 1058}
941 1059
942/** coroutine stack handling ************************************************/ 1060/** provide custom get/set/clear methods for %SIG elements ******************/
943
944static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
945static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
946static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
947 1061
948/* apparently < 5.8.8 */ 1062/* apparently < 5.8.8 */
949#ifndef MgPV_nolen_const 1063#ifndef MgPV_nolen_const
950#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1064#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
951 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1065 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
952 (const char*)(mg)->mg_ptr) 1066 (const char*)(mg)->mg_ptr)
953#endif 1067#endif
954 1068
1069/* this will be a patched copy of PL_vtbl_sigelem */
1070static MGVTBL coro_sigelem_vtbl;
1071
1072static int ecb_cold
1073coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1074{
1075 char *key = SvPV_nolen ((SV *)name);
1076
1077 /* do what mg_copy normally does */
1078 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1079 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1080
1081 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1082 if (*key == '_'
1083 && (strEQ (key, "__DIE__")
1084 || strEQ (key, "__WARN__")))
1085 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1086
1087 return 1;
1088}
1089
1090/* perl does not have a %SIG vtbl, we provide one so we can override */
1091/* the magic vtbl for the __DIE__ and __WARN__ members */
1092static const MGVTBL coro_sig_vtbl = {
1093 0, 0, 0, 0, 0,
1094 coro_sig_copy
1095};
1096
955/* 1097/*
956 * This overrides the default magic get method of %SIG elements. 1098 * This overrides the default magic get method of %SIG elements.
957 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1099 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
958 * and instead of trying to save and restore the hash elements, we just provide 1100 * and instead of trying to save and restore the hash elements (extremely slow),
959 * readback here. 1101 * we just provide our own readback here.
960 */ 1102 */
961static int 1103static int ecb_cold
962coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1104coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
963{ 1105{
964 const char *s = MgPV_nolen_const (mg); 1106 const char *s = MgPV_nolen_const (mg);
1107 /* the key must be either __DIE__ or __WARN__ here */
1108 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
965 1109
966 if (*s == '_') 1110 SV *ssv;
967 {
968 SV **svp = 0;
969 1111
970 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
971 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
972
973 if (svp) 1112 if (!*svp)
974 { 1113 ssv = &PL_sv_undef;
975 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1114 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
976 return 0; 1115 ssv = sv_2mortal (newRV_inc (*svp));
977 } 1116 else
978 } 1117 ssv = *svp;
979 1118
980 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1119 sv_setsv (sv, ssv);
1120 return 0;
981} 1121}
982 1122
983static int 1123static int ecb_cold
984coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1124coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
985{ 1125{
986 const char *s = MgPV_nolen_const (mg); 1126 const char *s = MgPV_nolen_const (mg);
1127 /* the key must be either __DIE__ or __WARN__ here */
1128 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
987 1129
988 if (*s == '_')
989 {
990 SV **svp = 0;
991
992 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
993 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
994
995 if (svp)
996 {
997 SV *old = *svp; 1130 SV *old = *svp;
998 *svp = 0; 1131 *svp = 0;
999 SvREFCNT_dec (old); 1132 SvREFCNT_dec (old);
1000 return 0; 1133 return 0;
1001 }
1002 }
1003
1004 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1005} 1134}
1006 1135
1007static int 1136static int ecb_cold
1008coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1137coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1009{ 1138{
1010 const char *s = MgPV_nolen_const (mg); 1139 const char *s = MgPV_nolen_const (mg);
1140 /* the key must be either __DIE__ or __WARN__ here */
1141 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1011 1142
1012 if (*s == '_')
1013 {
1014 SV **svp = 0;
1015
1016 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1017 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1018
1019 if (svp)
1020 {
1021 SV *old = *svp; 1143 SV *old = *svp;
1022 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1144 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1023 SvREFCNT_dec (old); 1145 SvREFCNT_dec (old);
1024 return 0; 1146 return 0;
1025 }
1026 }
1027
1028 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1029} 1147}
1030 1148
1031static void 1149static void
1032prepare_nop (pTHX_ struct coro_transfer_args *ta) 1150prepare_nop (pTHX_ struct coro_transfer_args *ta)
1033{ 1151{
… …
1045slf_check_repeat (pTHX_ struct CoroSLF *frame) 1163slf_check_repeat (pTHX_ struct CoroSLF *frame)
1046{ 1164{
1047 return 1; 1165 return 1;
1048} 1166}
1049 1167
1168/** coroutine stack handling ************************************************/
1169
1050static UNOP init_perl_op; 1170static UNOP init_perl_op;
1051 1171
1052static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1172ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1053init_perl (pTHX_ struct coro *coro) 1173init_perl (pTHX_ struct coro *coro)
1054{ 1174{
1055 /* 1175 /*
1056 * emulate part of the perl startup here. 1176 * emulate part of the perl startup here.
1057 */ 1177 */
… …
1072 PL_parser = 0; 1192 PL_parser = 0;
1073#endif 1193#endif
1074 PL_hints = 0; 1194 PL_hints = 0;
1075 1195
1076 /* recreate the die/warn hooks */ 1196 /* recreate the die/warn hooks */
1077 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1197 PL_diehook = SvREFCNT_inc (rv_diehook);
1078 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1198 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1079 1199
1080 GvSV (PL_defgv) = newSV (0); 1200 GvSV (PL_defgv) = newSV (0);
1081 GvAV (PL_defgv) = coro->args; coro->args = 0; 1201 GvAV (PL_defgv) = coro->args; coro->args = 0;
1082 GvSV (PL_errgv) = newSV (0); 1202 GvSV (PL_errgv) = newSV (0);
1083 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1203 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1084 GvHV (PL_hintgv) = 0; 1204 GvHV (PL_hintgv) = newHV ();
1205#if PERL_VERSION_ATLEAST (5,10,0)
1206 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1207#endif
1085 PL_rs = newSVsv (GvSV (irsgv)); 1208 PL_rs = newSVsv (GvSV (irsgv));
1086 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1209 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1087 1210
1088 { 1211 {
1089 dSP; 1212 dSP;
… …
1104 /* this newly created coroutine might be run on an existing cctx which most 1227 /* this newly created coroutine might be run on an existing cctx which most
1105 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1228 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1106 */ 1229 */
1107 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1230 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1108 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1231 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1232 slf_frame.destroy = 0;
1109 1233
1110 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1234 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1111 init_perl_op.op_next = PL_op; 1235 init_perl_op.op_next = PL_op;
1112 init_perl_op.op_type = OP_ENTERSUB; 1236 init_perl_op.op_type = OP_ENTERSUB;
1113 init_perl_op.op_ppaddr = pp_slf; 1237 init_perl_op.op_ppaddr = pp_slf;
… …
1116 PL_op = (OP *)&init_perl_op; 1240 PL_op = (OP *)&init_perl_op;
1117 1241
1118 /* copy throw, in case it was set before init_perl */ 1242 /* copy throw, in case it was set before init_perl */
1119 CORO_THROW = coro->except; 1243 CORO_THROW = coro->except;
1120 1244
1121 SWAP_SVS (coro); 1245 SWAP_SVS_ENTER (coro);
1122 1246
1123 if (expect_false (enable_times)) 1247 if (ecb_expect_false (enable_times))
1124 { 1248 {
1125 coro_times_update (); 1249 coro_times_update ();
1126 coro_times_sub (coro); 1250 coro_times_sub (coro);
1127 } 1251 }
1128} 1252}
… …
1152destroy_perl (pTHX_ struct coro *coro) 1276destroy_perl (pTHX_ struct coro *coro)
1153{ 1277{
1154 SV *svf [9]; 1278 SV *svf [9];
1155 1279
1156 { 1280 {
1281 SV *old_current = SvRV (coro_current);
1157 struct coro *current = SvSTATE_current; 1282 struct coro *current = SvSTATE (old_current);
1158 1283
1159 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1284 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1160 1285
1161 save_perl (aTHX_ current); 1286 save_perl (aTHX_ current);
1287
1288 /* this will cause transfer_check to croak on block*/
1289 SvRV_set (coro_current, (SV *)coro->hv);
1290
1162 load_perl (aTHX_ coro); 1291 load_perl (aTHX_ coro);
1163 1292
1293 /* restore swapped sv's */
1294 SWAP_SVS_LEAVE (coro);
1295
1164 coro_unwind_stacks (aTHX); 1296 coro_unwind_stacks (aTHX);
1297
1165 coro_destruct_stacks (aTHX); 1298 coro_destruct_stacks (aTHX);
1166 1299
1167 /* restore swapped sv's */
1168 SWAP_SVS (coro);
1169
1170 // now save some sv's to be free'd later 1300 /* now save some sv's to be free'd later */
1171 svf [0] = GvSV (PL_defgv); 1301 svf [0] = GvSV (PL_defgv);
1172 svf [1] = (SV *)GvAV (PL_defgv); 1302 svf [1] = (SV *)GvAV (PL_defgv);
1173 svf [2] = GvSV (PL_errgv); 1303 svf [2] = GvSV (PL_errgv);
1174 svf [3] = (SV *)PL_defoutgv; 1304 svf [3] = (SV *)PL_defoutgv;
1175 svf [4] = PL_rs; 1305 svf [4] = PL_rs;
… …
1177 svf [6] = (SV *)GvHV (PL_hintgv); 1307 svf [6] = (SV *)GvHV (PL_hintgv);
1178 svf [7] = PL_diehook; 1308 svf [7] = PL_diehook;
1179 svf [8] = PL_warnhook; 1309 svf [8] = PL_warnhook;
1180 assert (9 == sizeof (svf) / sizeof (*svf)); 1310 assert (9 == sizeof (svf) / sizeof (*svf));
1181 1311
1312 SvRV_set (coro_current, old_current);
1313
1182 load_perl (aTHX_ current); 1314 load_perl (aTHX_ current);
1183 } 1315 }
1184 1316
1185 { 1317 {
1186 unsigned int i; 1318 unsigned int i;
… …
1190 1322
1191 SvREFCNT_dec (coro->saved_deffh); 1323 SvREFCNT_dec (coro->saved_deffh);
1192 SvREFCNT_dec (coro->rouse_cb); 1324 SvREFCNT_dec (coro->rouse_cb);
1193 SvREFCNT_dec (coro->invoke_cb); 1325 SvREFCNT_dec (coro->invoke_cb);
1194 SvREFCNT_dec (coro->invoke_av); 1326 SvREFCNT_dec (coro->invoke_av);
1327 SvREFCNT_dec (coro->on_enter_xs);
1328 SvREFCNT_dec (coro->on_leave_xs);
1195 } 1329 }
1196} 1330}
1197 1331
1198INLINE void 1332ecb_inline void
1199free_coro_mortal (pTHX) 1333free_coro_mortal (pTHX)
1200{ 1334{
1201 if (expect_true (coro_mortal)) 1335 if (ecb_expect_true (coro_mortal))
1202 { 1336 {
1203 SvREFCNT_dec (coro_mortal); 1337 SvREFCNT_dec ((SV *)coro_mortal);
1204 coro_mortal = 0; 1338 coro_mortal = 0;
1205 } 1339 }
1206} 1340}
1207 1341
1208static int 1342static int
… …
1262 1396
1263 if (PL_curcop != &PL_compiling) 1397 if (PL_curcop != &PL_compiling)
1264 { 1398 {
1265 SV **cb; 1399 SV **cb;
1266 1400
1267 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1401 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1268 { 1402 {
1269 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1403 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1270 1404
1271 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1405 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1272 { 1406 {
… …
1282 SAVETMPS; 1416 SAVETMPS;
1283 EXTEND (SP, 3); 1417 EXTEND (SP, 3);
1284 PUSHMARK (SP); 1418 PUSHMARK (SP);
1285 PUSHs (&PL_sv_yes); 1419 PUSHs (&PL_sv_yes);
1286 PUSHs (fullname); 1420 PUSHs (fullname);
1287 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1421 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (SUB_ARGARRAY)) : &PL_sv_undef);
1288 PUTBACK; 1422 PUTBACK;
1289 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1423 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1290 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1424 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1291 SPAGAIN; 1425 SPAGAIN;
1292 FREETMPS; 1426 FREETMPS;
… …
1341 1475
1342 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1476 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1343} 1477}
1344 1478
1345/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1479/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1346static void NOINLINE 1480static void ecb_noinline
1347cctx_prepare (pTHX) 1481cctx_prepare (pTHX)
1348{ 1482{
1349 PL_top_env = &PL_start_env; 1483 PL_top_env = &PL_start_env;
1350 1484
1351 if (cctx_current->flags & CC_TRACE) 1485 if (cctx_current->flags & CC_TRACE)
… …
1362 slf_frame.prepare = slf_prepare_set_stacklevel; 1496 slf_frame.prepare = slf_prepare_set_stacklevel;
1363 slf_frame.check = slf_check_set_stacklevel; 1497 slf_frame.check = slf_check_set_stacklevel;
1364} 1498}
1365 1499
1366/* the tail of transfer: execute stuff we can only do after a transfer */ 1500/* the tail of transfer: execute stuff we can only do after a transfer */
1367INLINE void 1501ecb_inline void
1368transfer_tail (pTHX) 1502transfer_tail (pTHX)
1369{ 1503{
1370 free_coro_mortal (aTHX); 1504 free_coro_mortal (aTHX);
1505}
1506
1507/* try to exit the same way perl's main function would do */
1508/* we do not bother resetting the environment or other things *7
1509/* that are not, uhm, essential */
1510/* this obviously also doesn't work when perl is embedded */
1511static void ecb_noinline ecb_cold
1512perlish_exit (pTHX)
1513{
1514 int exitstatus = perl_destruct (PL_curinterp);
1515 perl_free (PL_curinterp);
1516 exit (exitstatus);
1371} 1517}
1372 1518
1373/* 1519/*
1374 * this is a _very_ stripped down perl interpreter ;) 1520 * this is a _very_ stripped down perl interpreter ;)
1375 */ 1521 */
… …
1402 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1548 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1403 * runtime errors here, as this is just a random interpreter, not a thread. 1549 * runtime errors here, as this is just a random interpreter, not a thread.
1404 */ 1550 */
1405 1551
1406 /* 1552 /*
1553 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1554 * requires PL_scopestack_ix, so do it here if required.
1555 */
1556 if (!PL_scopestack_ix)
1557 ENTER;
1558
1559 /*
1407 * If perl-run returns we assume exit() was being called or the coro 1560 * If perl-run returns we assume exit() was being called or the coro
1408 * fell off the end, which seems to be the only valid (non-bug) 1561 * fell off the end, which seems to be the only valid (non-bug)
1409 * reason for perl_run to return. We try to exit by jumping to the 1562 * reason for perl_run to return. We try to mimic whatever perl is normally
1410 * bootstrap-time "top" top_env, as we cannot restore the "main" 1563 * doing in that case. YMMV.
1411 * coroutine as Coro has no such concept.
1412 * This actually isn't valid with the pthread backend, but OSes requiring
1413 * that backend are too broken to do it in a standards-compliant way.
1414 */ 1564 */
1415 PL_top_env = main_top_env; 1565 perlish_exit (aTHX);
1416 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1417 } 1566 }
1418} 1567}
1419 1568
1420static coro_cctx * 1569static coro_cctx *
1421cctx_new () 1570cctx_new (void)
1422{ 1571{
1423 coro_cctx *cctx; 1572 coro_cctx *cctx;
1424 1573
1425 ++cctx_count; 1574 ++cctx_count;
1426 New (0, cctx, 1, coro_cctx); 1575 New (0, cctx, 1, coro_cctx);
… …
1432 return cctx; 1581 return cctx;
1433} 1582}
1434 1583
1435/* create a new cctx only suitable as source */ 1584/* create a new cctx only suitable as source */
1436static coro_cctx * 1585static coro_cctx *
1437cctx_new_empty () 1586cctx_new_empty (void)
1438{ 1587{
1439 coro_cctx *cctx = cctx_new (); 1588 coro_cctx *cctx = cctx_new ();
1440 1589
1441 cctx->sptr = 0; 1590 cctx->stack.sptr = 0;
1442 coro_create (&cctx->cctx, 0, 0, 0, 0); 1591 coro_create (&cctx->cctx, 0, 0, 0, 0);
1443 1592
1444 return cctx; 1593 return cctx;
1445} 1594}
1446 1595
1447/* create a new cctx suitable as destination/running a perl interpreter */ 1596/* create a new cctx suitable as destination/running a perl interpreter */
1448static coro_cctx * 1597static coro_cctx *
1449cctx_new_run () 1598cctx_new_run (void)
1450{ 1599{
1451 coro_cctx *cctx = cctx_new (); 1600 coro_cctx *cctx = cctx_new ();
1452 void *stack_start;
1453 size_t stack_size;
1454 1601
1455#if HAVE_MMAP 1602 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1456 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1457 /* mmap supposedly does allocate-on-write for us */
1458 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1459
1460 if (cctx->sptr != (void *)-1)
1461 {
1462 #if CORO_STACKGUARD
1463 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1464 #endif
1465 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1466 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1467 cctx->flags |= CC_MAPPED;
1468 } 1603 {
1469 else
1470#endif
1471 {
1472 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1473 New (0, cctx->sptr, cctx_stacksize, long);
1474
1475 if (!cctx->sptr)
1476 {
1477 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1604 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1478 _exit (EXIT_FAILURE); 1605 _exit (EXIT_FAILURE);
1479 }
1480
1481 stack_start = cctx->sptr;
1482 stack_size = cctx->ssize;
1483 } 1606 }
1484 1607
1485 #if CORO_USE_VALGRIND
1486 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1487 #endif
1488
1489 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1608 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1490 1609
1491 return cctx; 1610 return cctx;
1492} 1611}
1493 1612
1494static void 1613static void
1495cctx_destroy (coro_cctx *cctx) 1614cctx_destroy (coro_cctx *cctx)
1496{ 1615{
1497 if (!cctx) 1616 if (!cctx)
1498 return; 1617 return;
1499 1618
1500 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1619 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1501 1620
1502 --cctx_count; 1621 --cctx_count;
1503 coro_destroy (&cctx->cctx); 1622 coro_destroy (&cctx->cctx);
1504 1623
1505 /* coro_transfer creates new, empty cctx's */ 1624 coro_stack_free (&cctx->stack);
1506 if (cctx->sptr)
1507 {
1508 #if CORO_USE_VALGRIND
1509 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1510 #endif
1511
1512#if HAVE_MMAP
1513 if (cctx->flags & CC_MAPPED)
1514 munmap (cctx->sptr, cctx->ssize);
1515 else
1516#endif
1517 Safefree (cctx->sptr);
1518 }
1519 1625
1520 Safefree (cctx); 1626 Safefree (cctx);
1521} 1627}
1522 1628
1523/* wether this cctx should be destructed */ 1629/* wether this cctx should be destructed */
1524#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1630#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1525 1631
1526static coro_cctx * 1632static coro_cctx *
1527cctx_get (pTHX) 1633cctx_get (pTHX)
1528{ 1634{
1529 while (expect_true (cctx_first)) 1635 while (ecb_expect_true (cctx_first))
1530 { 1636 {
1531 coro_cctx *cctx = cctx_first; 1637 coro_cctx *cctx = cctx_first;
1532 cctx_first = cctx->next; 1638 cctx_first = cctx->next;
1533 --cctx_idle; 1639 --cctx_idle;
1534 1640
1535 if (expect_true (!CCTX_EXPIRED (cctx))) 1641 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1536 return cctx; 1642 return cctx;
1537 1643
1538 cctx_destroy (cctx); 1644 cctx_destroy (cctx);
1539 } 1645 }
1540 1646
… …
1542} 1648}
1543 1649
1544static void 1650static void
1545cctx_put (coro_cctx *cctx) 1651cctx_put (coro_cctx *cctx)
1546{ 1652{
1547 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1653 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1548 1654
1549 /* free another cctx if overlimit */ 1655 /* free another cctx if overlimit */
1550 if (expect_false (cctx_idle >= cctx_max_idle)) 1656 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1551 { 1657 {
1552 coro_cctx *first = cctx_first; 1658 coro_cctx *first = cctx_first;
1553 cctx_first = first->next; 1659 cctx_first = first->next;
1554 --cctx_idle; 1660 --cctx_idle;
1555 1661
… …
1566static void 1672static void
1567transfer_check (pTHX_ struct coro *prev, struct coro *next) 1673transfer_check (pTHX_ struct coro *prev, struct coro *next)
1568{ 1674{
1569 /* TODO: throwing up here is considered harmful */ 1675 /* TODO: throwing up here is considered harmful */
1570 1676
1571 if (expect_true (prev != next)) 1677 if (ecb_expect_true (prev != next))
1572 { 1678 {
1573 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1679 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1574 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1680 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1575 1681
1576 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1682 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1577 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1683 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1578 1684
1579#if !PERL_VERSION_ATLEAST (5,10,0) 1685#if !PERL_VERSION_ATLEAST (5,10,0)
1580 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1686 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1581 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1687 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1582#endif 1688#endif
1583 } 1689 }
1584} 1690}
1585 1691
1586/* always use the TRANSFER macro */ 1692/* always use the TRANSFER macro */
1587static void NOINLINE /* noinline so we have a fixed stackframe */ 1693static void ecb_noinline /* noinline so we have a fixed stackframe */
1588transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1694transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1589{ 1695{
1590 dSTACKLEVEL; 1696 dSTACKLEVEL;
1591 1697
1592 /* sometimes transfer is only called to set idle_sp */ 1698 /* sometimes transfer is only called to set idle_sp */
1593 if (expect_false (!prev)) 1699 if (ecb_expect_false (!prev))
1594 { 1700 {
1595 cctx_current->idle_sp = STACKLEVEL; 1701 cctx_current->idle_sp = STACKLEVEL;
1596 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1702 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1597 } 1703 }
1598 else if (expect_true (prev != next)) 1704 else if (ecb_expect_true (prev != next))
1599 { 1705 {
1600 coro_cctx *cctx_prev; 1706 coro_cctx *cctx_prev;
1601 1707
1602 if (expect_false (prev->flags & CF_NEW)) 1708 if (ecb_expect_false (prev->flags & CF_NEW))
1603 { 1709 {
1604 /* create a new empty/source context */ 1710 /* create a new empty/source context */
1605 prev->flags &= ~CF_NEW; 1711 prev->flags &= ~CF_NEW;
1606 prev->flags |= CF_RUNNING; 1712 prev->flags |= CF_RUNNING;
1607 } 1713 }
… …
1610 next->flags |= CF_RUNNING; 1716 next->flags |= CF_RUNNING;
1611 1717
1612 /* first get rid of the old state */ 1718 /* first get rid of the old state */
1613 save_perl (aTHX_ prev); 1719 save_perl (aTHX_ prev);
1614 1720
1615 if (expect_false (next->flags & CF_NEW)) 1721 if (ecb_expect_false (next->flags & CF_NEW))
1616 { 1722 {
1617 /* need to start coroutine */ 1723 /* need to start coroutine */
1618 next->flags &= ~CF_NEW; 1724 next->flags &= ~CF_NEW;
1619 /* setup coroutine call */ 1725 /* setup coroutine call */
1620 init_perl (aTHX_ next); 1726 init_perl (aTHX_ next);
1621 } 1727 }
1622 else 1728 else
1623 load_perl (aTHX_ next); 1729 load_perl (aTHX_ next);
1624 1730
1625 /* possibly untie and reuse the cctx */ 1731 /* possibly untie and reuse the cctx */
1626 if (expect_true ( 1732 if (ecb_expect_true (
1627 cctx_current->idle_sp == STACKLEVEL 1733 cctx_current->idle_sp == STACKLEVEL
1628 && !(cctx_current->flags & CC_TRACE) 1734 && !(cctx_current->flags & CC_TRACE)
1629 && !force_cctx 1735 && !force_cctx
1630 )) 1736 ))
1631 { 1737 {
1632 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1738 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1633 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1739 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1634 1740
1635 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1741 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1636 /* without this the next cctx_get might destroy the running cctx while still in use */ 1742 /* without this the next cctx_get might destroy the running cctx while still in use */
1637 if (expect_false (CCTX_EXPIRED (cctx_current))) 1743 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1638 if (expect_true (!next->cctx)) 1744 if (ecb_expect_true (!next->cctx))
1639 next->cctx = cctx_get (aTHX); 1745 next->cctx = cctx_get (aTHX);
1640 1746
1641 cctx_put (cctx_current); 1747 cctx_put (cctx_current);
1642 } 1748 }
1643 else 1749 else
1644 prev->cctx = cctx_current; 1750 prev->cctx = cctx_current;
1645 1751
1646 ++next->usecount; 1752 ++next->usecount;
1647 1753
1648 cctx_prev = cctx_current; 1754 cctx_prev = cctx_current;
1649 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1755 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1650 1756
1651 next->cctx = 0; 1757 next->cctx = 0;
1652 1758
1653 if (expect_false (cctx_prev != cctx_current)) 1759 if (ecb_expect_false (cctx_prev != cctx_current))
1654 { 1760 {
1655 cctx_prev->top_env = PL_top_env; 1761 cctx_prev->top_env = PL_top_env;
1656 PL_top_env = cctx_current->top_env; 1762 PL_top_env = cctx_current->top_env;
1657 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1763 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1658 } 1764 }
… …
1664#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1770#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1665#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1771#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1666 1772
1667/** high level stuff ********************************************************/ 1773/** high level stuff ********************************************************/
1668 1774
1775/* this function is actually Coro, not Coro::State, but we call it from here */
1776/* because it is convenient - but it hasn't been declared yet for that reason */
1669static int 1777static void
1778coro_call_on_destroy (pTHX_ struct coro *coro);
1779
1780static void
1670coro_state_destroy (pTHX_ struct coro *coro) 1781coro_state_destroy (pTHX_ struct coro *coro)
1671{ 1782{
1672 if (coro->flags & CF_DESTROYED) 1783 if (coro->flags & CF_ZOMBIE)
1673 return 0; 1784 return;
1674 1785
1675 if (coro->on_destroy && !PL_dirty)
1676 coro->on_destroy (aTHX_ coro); 1786 slf_destroy (aTHX_ coro);
1677 1787
1678 coro->flags |= CF_DESTROYED; 1788 coro->flags |= CF_ZOMBIE;
1679 1789
1680 if (coro->flags & CF_READY) 1790 if (coro->flags & CF_READY)
1681 { 1791 {
1682 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1792 /* reduce nready, as destroying a ready coro effectively unreadies it */
1683 /* alternative: look through all ready queues and remove the coro */ 1793 /* alternative: look through all ready queues and remove the coro */
1684 --coro_nready; 1794 --coro_nready;
1685 } 1795 }
1686 else 1796 else
1687 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1797 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1798
1799 if (coro->next) coro->next->prev = coro->prev;
1800 if (coro->prev) coro->prev->next = coro->next;
1801 if (coro == coro_first) coro_first = coro->next;
1688 1802
1689 if (coro->mainstack 1803 if (coro->mainstack
1690 && coro->mainstack != main_mainstack 1804 && coro->mainstack != main_mainstack
1691 && coro->slot 1805 && coro->slot
1692 && !PL_dirty) 1806 && !PL_dirty)
1693 destroy_perl (aTHX_ coro); 1807 destroy_perl (aTHX_ coro);
1694 1808
1695 if (coro->next) coro->next->prev = coro->prev;
1696 if (coro->prev) coro->prev->next = coro->next;
1697 if (coro == coro_first) coro_first = coro->next;
1698
1699 cctx_destroy (coro->cctx); 1809 cctx_destroy (coro->cctx);
1700 SvREFCNT_dec (coro->startcv); 1810 SvREFCNT_dec (coro->startcv);
1701 SvREFCNT_dec (coro->args); 1811 SvREFCNT_dec (coro->args);
1702 SvREFCNT_dec (coro->swap_sv); 1812 SvREFCNT_dec (coro->swap_sv);
1703 SvREFCNT_dec (CORO_THROW); 1813 SvREFCNT_dec (CORO_THROW);
1704 1814
1705 return 1; 1815 coro_call_on_destroy (aTHX_ coro);
1816
1817 /* more destruction mayhem in coro_state_free */
1706} 1818}
1707 1819
1708static int 1820static int
1709coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1821coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1710{ 1822{
1711 struct coro *coro = (struct coro *)mg->mg_ptr; 1823 struct coro *coro = (struct coro *)mg->mg_ptr;
1712 mg->mg_ptr = 0; 1824 mg->mg_ptr = 0;
1713 1825
1714 coro->hv = 0;
1715
1716 if (--coro->refcnt < 0)
1717 {
1718 coro_state_destroy (aTHX_ coro); 1826 coro_state_destroy (aTHX_ coro);
1827 SvREFCNT_dec (coro->on_destroy);
1828 SvREFCNT_dec (coro->status);
1829
1719 Safefree (coro); 1830 Safefree (coro);
1720 }
1721 1831
1722 return 0; 1832 return 0;
1723} 1833}
1724 1834
1725static int 1835static int ecb_cold
1726coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1836coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1727{ 1837{
1728 struct coro *coro = (struct coro *)mg->mg_ptr; 1838 /* called when perl clones the current process the slow way (windows process emulation) */
1729 1839 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1730 ++coro->refcnt; 1840 mg->mg_ptr = 0;
1841 mg->mg_virtual = 0;
1731 1842
1732 return 0; 1843 return 0;
1733} 1844}
1734 1845
1735static MGVTBL coro_state_vtbl = { 1846static MGVTBL coro_state_vtbl = {
… …
1760 TRANSFER (ta, 1); 1871 TRANSFER (ta, 1);
1761} 1872}
1762 1873
1763/** Coro ********************************************************************/ 1874/** Coro ********************************************************************/
1764 1875
1765INLINE void 1876ecb_inline void
1766coro_enq (pTHX_ struct coro *coro) 1877coro_enq (pTHX_ struct coro *coro)
1767{ 1878{
1768 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1879 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1769 1880
1770 SvREFCNT_inc_NN (coro->hv); 1881 SvREFCNT_inc_NN (coro->hv);
… …
1772 coro->next_ready = 0; 1883 coro->next_ready = 0;
1773 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1884 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1774 ready [1] = coro; 1885 ready [1] = coro;
1775} 1886}
1776 1887
1777INLINE struct coro * 1888ecb_inline struct coro *
1778coro_deq (pTHX) 1889coro_deq (pTHX)
1779{ 1890{
1780 int prio; 1891 int prio;
1781 1892
1782 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1893 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1835{ 1946{
1836 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1947 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1837} 1948}
1838 1949
1839/* expects to own a reference to next->hv */ 1950/* expects to own a reference to next->hv */
1840INLINE void 1951ecb_inline void
1841prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1952prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1842{ 1953{
1843 SV *prev_sv = SvRV (coro_current); 1954 SV *prev_sv = SvRV (coro_current);
1844 1955
1845 ta->prev = SvSTATE_hv (prev_sv); 1956 ta->prev = SvSTATE_hv (prev_sv);
… …
1858{ 1969{
1859 for (;;) 1970 for (;;)
1860 { 1971 {
1861 struct coro *next = coro_deq (aTHX); 1972 struct coro *next = coro_deq (aTHX);
1862 1973
1863 if (expect_true (next)) 1974 if (ecb_expect_true (next))
1864 { 1975 {
1865 /* cannot transfer to destroyed coros, skip and look for next */ 1976 /* cannot transfer to destroyed coros, skip and look for next */
1866 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1977 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1867 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1978 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1868 else 1979 else
1869 { 1980 {
1870 next->flags &= ~CF_READY; 1981 next->flags &= ~CF_READY;
1871 --coro_nready; 1982 --coro_nready;
… …
1879 /* nothing to schedule: call the idle handler */ 1990 /* nothing to schedule: call the idle handler */
1880 if (SvROK (sv_idle) 1991 if (SvROK (sv_idle)
1881 && SvOBJECT (SvRV (sv_idle))) 1992 && SvOBJECT (SvRV (sv_idle)))
1882 { 1993 {
1883 if (SvRV (sv_idle) == SvRV (coro_current)) 1994 if (SvRV (sv_idle) == SvRV (coro_current))
1995 {
1996 require_pv ("Carp");
1997
1998 {
1999 dSP;
2000
2001 ENTER;
2002 SAVETMPS;
2003
2004 PUSHMARK (SP);
1884 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2005 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2006 PUTBACK;
2007 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2008
2009 FREETMPS;
2010 LEAVE;
2011 }
2012 }
1885 2013
1886 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2014 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1887 api_ready (aTHX_ SvRV (sv_idle)); 2015 api_ready (aTHX_ SvRV (sv_idle));
1888 --coro_nready; 2016 --coro_nready;
1889 } 2017 }
… …
1904 } 2032 }
1905 } 2033 }
1906 } 2034 }
1907} 2035}
1908 2036
1909INLINE void 2037ecb_inline void
1910prepare_cede (pTHX_ struct coro_transfer_args *ta) 2038prepare_cede (pTHX_ struct coro_transfer_args *ta)
1911{ 2039{
1912 api_ready (aTHX_ coro_current); 2040 api_ready (aTHX_ coro_current);
1913 prepare_schedule (aTHX_ ta); 2041 prepare_schedule (aTHX_ ta);
1914} 2042}
1915 2043
1916INLINE void 2044ecb_inline void
1917prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2045prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1918{ 2046{
1919 SV *prev = SvRV (coro_current); 2047 SV *prev = SvRV (coro_current);
1920 2048
1921 if (coro_nready) 2049 if (coro_nready)
… …
1951{ 2079{
1952 struct coro_transfer_args ta; 2080 struct coro_transfer_args ta;
1953 2081
1954 prepare_cede (aTHX_ &ta); 2082 prepare_cede (aTHX_ &ta);
1955 2083
1956 if (expect_true (ta.prev != ta.next)) 2084 if (ecb_expect_true (ta.prev != ta.next))
1957 { 2085 {
1958 TRANSFER (ta, 1); 2086 TRANSFER (ta, 1);
1959 return 1; 2087 return 1;
1960 } 2088 }
1961 else 2089 else
… …
2004 coro->slot->runops = RUNOPS_DEFAULT; 2132 coro->slot->runops = RUNOPS_DEFAULT;
2005 } 2133 }
2006} 2134}
2007 2135
2008static void 2136static void
2137coro_push_av (pTHX_ AV *av, I32 gimme_v)
2138{
2139 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2140 {
2141 dSP;
2142
2143 if (gimme_v == G_SCALAR)
2144 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2145 else
2146 {
2147 int i;
2148 EXTEND (SP, AvFILLp (av) + 1);
2149
2150 for (i = 0; i <= AvFILLp (av); ++i)
2151 PUSHs (AvARRAY (av)[i]);
2152 }
2153
2154 PUTBACK;
2155 }
2156}
2157
2158static void
2159coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2160{
2161 if (!coro->on_destroy)
2162 coro->on_destroy = newAV ();
2163
2164 av_push (coro->on_destroy, cb);
2165}
2166
2167static void
2168slf_destroy_join (pTHX_ struct CoroSLF *frame)
2169{
2170 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2171}
2172
2173static int
2174slf_check_join (pTHX_ struct CoroSLF *frame)
2175{
2176 struct coro *coro = (struct coro *)frame->data;
2177
2178 if (!coro->status)
2179 return 1;
2180
2181 frame->destroy = 0;
2182
2183 coro_push_av (aTHX_ coro->status, GIMME_V);
2184
2185 SvREFCNT_dec ((SV *)coro->hv);
2186
2187 return 0;
2188}
2189
2190static void
2191slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2192{
2193 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2194
2195 if (items > 1)
2196 croak ("join called with too many arguments");
2197
2198 if (coro->status)
2199 frame->prepare = prepare_nop;
2200 else
2201 {
2202 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2203 frame->prepare = prepare_schedule;
2204 }
2205
2206 frame->check = slf_check_join;
2207 frame->destroy = slf_destroy_join;
2208 frame->data = (void *)coro;
2209 SvREFCNT_inc (coro->hv);
2210}
2211
2212static void
2009coro_call_on_destroy (pTHX_ struct coro *coro) 2213coro_call_on_destroy (pTHX_ struct coro *coro)
2010{ 2214{
2011 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2215 AV *od = coro->on_destroy;
2012 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2013 2216
2014 if (on_destroyp) 2217 if (!od)
2015 { 2218 return;
2016 AV *on_destroy = (AV *)SvRV (*on_destroyp);
2017 2219
2220 coro->on_destroy = 0;
2221 sv_2mortal ((SV *)od);
2222
2018 while (AvFILLp (on_destroy) >= 0) 2223 while (AvFILLp (od) >= 0)
2224 {
2225 SV *cb = sv_2mortal (av_pop (od));
2226
2227 /* coro hv's (and only hv's at the moment) are supported as well */
2228 if (SvSTATEhv_p (aTHX_ cb))
2229 api_ready (aTHX_ cb);
2230 else
2019 { 2231 {
2020 dSP; /* don't disturb outer sp */ 2232 dSP; /* don't disturb outer sp */
2021 SV *cb = av_pop (on_destroy);
2022
2023 PUSHMARK (SP); 2233 PUSHMARK (SP);
2024 2234
2025 if (statusp) 2235 if (coro->status)
2026 { 2236 {
2027 int i; 2237 PUTBACK;
2028 AV *status = (AV *)SvRV (*statusp); 2238 coro_push_av (aTHX_ coro->status, G_ARRAY);
2029 EXTEND (SP, AvFILLp (status) + 1); 2239 SPAGAIN;
2030
2031 for (i = 0; i <= AvFILLp (status); ++i)
2032 PUSHs (AvARRAY (status)[i]);
2033 } 2240 }
2034 2241
2035 PUTBACK; 2242 PUTBACK;
2036 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2243 call_sv (cb, G_VOID | G_DISCARD);
2037 } 2244 }
2038 } 2245 }
2039} 2246}
2040 2247
2041static void 2248static void
2042slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2249coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2043{ 2250{
2044 int i; 2251 AV *av;
2045 HV *hv = (HV *)SvRV (coro_current); 2252
2046 AV *av = newAV (); 2253 if (coro->status)
2254 {
2255 av = coro->status;
2256 av_clear (av);
2257 }
2258 else
2259 av = coro->status = newAV ();
2047 2260
2048 /* items are actually not so common, so optimise for this case */ 2261 /* items are actually not so common, so optimise for this case */
2049 if (items) 2262 if (items)
2050 { 2263 {
2264 int i;
2265
2051 av_extend (av, items - 1); 2266 av_extend (av, items - 1);
2052 2267
2053 for (i = 0; i < items; ++i) 2268 for (i = 0; i < items; ++i)
2054 av_push (av, SvREFCNT_inc_NN (arg [i])); 2269 av_push (av, SvREFCNT_inc_NN (arg [i]));
2055 } 2270 }
2271}
2056 2272
2057 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2273static void
2058 2274slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2275{
2059 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2276 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2060 api_ready (aTHX_ sv_manager); 2277 api_ready (aTHX_ sv_manager);
2061 2278
2062 frame->prepare = prepare_schedule; 2279 frame->prepare = prepare_schedule;
2063 frame->check = slf_check_repeat; 2280 frame->check = slf_check_repeat;
2064 2281
2065 /* as a minor optimisation, we could unwind all stacks here */ 2282 /* as a minor optimisation, we could unwind all stacks here */
2066 /* but that puts extra pressure on pp_slf, and is not worth much */ 2283 /* but that puts extra pressure on pp_slf, and is not worth much */
2067 /*coro_unwind_stacks (aTHX);*/ 2284 /*coro_unwind_stacks (aTHX);*/
2285}
2286
2287static void
2288slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2289{
2290 HV *coro_hv = (HV *)SvRV (coro_current);
2291
2292 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2293 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2294}
2295
2296static void
2297slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2298{
2299 HV *coro_hv;
2300 struct coro *coro;
2301
2302 if (items <= 0)
2303 croak ("Coro::cancel called without coro object,");
2304
2305 coro = SvSTATE (arg [0]);
2306 coro_hv = coro->hv;
2307
2308 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2309
2310 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2311 {
2312 /* coro currently busy cancelling something, so just notify it */
2313 coro->slf_frame.data = (void *)coro;
2314
2315 frame->prepare = prepare_nop;
2316 frame->check = slf_check_nop;
2317 }
2318 else if (coro_hv == (HV *)SvRV (coro_current))
2319 {
2320 /* cancelling the current coro is allowed, and equals terminate */
2321 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2322 }
2323 else
2324 {
2325 struct coro *self = SvSTATE_current;
2326
2327 if (!self)
2328 croak ("Coro::cancel called outside of thread content,");
2329
2330 /* otherwise we cancel directly, purely for speed reasons
2331 * unfortunately, this requires some magic trickery, as
2332 * somebody else could cancel us, so we have to fight the cancellation.
2333 * this is ugly, and hopefully fully worth the extra speed.
2334 * besides, I can't get the slow-but-safe version working...
2335 */
2336 slf_frame.data = 0;
2337 self->flags |= CF_NOCANCEL;
2338 coro_state_destroy (aTHX_ coro);
2339 self->flags &= ~CF_NOCANCEL;
2340
2341 if (slf_frame.data)
2342 {
2343 /* while we were busy we have been cancelled, so terminate */
2344 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2345 }
2346 else
2347 {
2348 frame->prepare = prepare_nop;
2349 frame->check = slf_check_nop;
2350 }
2351 }
2352}
2353
2354static int
2355slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2356{
2357 frame->prepare = 0;
2358 coro_unwind_stacks (aTHX);
2359
2360 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2361
2362 return 1;
2363}
2364
2365static int
2366safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2367{
2368 if (coro->cctx)
2369 croak ("coro inside C callback, unable to cancel at this time, caught");
2370
2371 if (coro->flags & CF_NEW)
2372 {
2373 coro_set_status (aTHX_ coro, arg, items);
2374 coro_state_destroy (aTHX_ coro);
2375 }
2376 else
2377 {
2378 if (!coro->slf_frame.prepare)
2379 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2380
2381 slf_destroy (aTHX_ coro);
2382
2383 coro_set_status (aTHX_ coro, arg, items);
2384 coro->slf_frame.prepare = prepare_nop;
2385 coro->slf_frame.check = slf_check_safe_cancel;
2386
2387 api_ready (aTHX_ (SV *)coro->hv);
2388 }
2389
2390 return 1;
2068} 2391}
2069 2392
2070/*****************************************************************************/ 2393/*****************************************************************************/
2071/* async pool handler */ 2394/* async pool handler */
2072 2395
… …
2103slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2426slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2104{ 2427{
2105 HV *hv = (HV *)SvRV (coro_current); 2428 HV *hv = (HV *)SvRV (coro_current);
2106 struct coro *coro = SvSTATE_hv ((SV *)hv); 2429 struct coro *coro = SvSTATE_hv ((SV *)hv);
2107 2430
2108 if (expect_true (coro->saved_deffh)) 2431 if (ecb_expect_true (coro->saved_deffh))
2109 { 2432 {
2110 /* subsequent iteration */ 2433 /* subsequent iteration */
2111 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2434 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2112 coro->saved_deffh = 0; 2435 coro->saved_deffh = 0;
2113 2436
2114 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2437 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2115 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2438 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2116 { 2439 {
2117 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2440 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2118 coro->invoke_av = newAV (); 2441 return;
2119
2120 frame->prepare = prepare_nop;
2121 } 2442 }
2122 else 2443 else
2123 { 2444 {
2124 av_clear (GvAV (PL_defgv)); 2445 av_clear (GvAV (PL_defgv));
2125 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2446 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2126 2447
2448 if (ecb_expect_false (coro->swap_sv))
2449 {
2450 SWAP_SVS_LEAVE (coro);
2451 SvREFCNT_dec_NN (coro->swap_sv);
2452 coro->swap_sv = 0;
2453 }
2454
2127 coro->prio = 0; 2455 coro->prio = 0;
2128 2456
2129 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2457 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2130 api_trace (aTHX_ coro_current, 0); 2458 api_trace (aTHX_ coro_current, 0);
2131 2459
2132 frame->prepare = prepare_schedule; 2460 frame->prepare = prepare_schedule;
2133 av_push (av_async_pool, SvREFCNT_inc (hv)); 2461 av_push (av_async_pool, SvREFCNT_inc (hv));
2134 } 2462 }
… …
2175 2503
2176static int 2504static int
2177slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2505slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2178{ 2506{
2179 SV *data = (SV *)frame->data; 2507 SV *data = (SV *)frame->data;
2180 2508
2181 if (CORO_THROW) 2509 if (CORO_THROW)
2182 return 0; 2510 return 0;
2183 2511
2184 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2512 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2185 return 1; 2513 return 1;
… …
2221 cb = sv_2mortal (coro->rouse_cb); 2549 cb = sv_2mortal (coro->rouse_cb);
2222 coro->rouse_cb = 0; 2550 coro->rouse_cb = 0;
2223 } 2551 }
2224 2552
2225 if (!SvROK (cb) 2553 if (!SvROK (cb)
2226 || SvTYPE (SvRV (cb)) != SVt_PVCV 2554 || SvTYPE (SvRV (cb)) != SVt_PVCV
2227 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2555 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2228 croak ("Coro::rouse_wait called with illegal callback argument,"); 2556 croak ("Coro::rouse_wait called with illegal callback argument,");
2229 2557
2230 { 2558 {
2231 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2559 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2348static void 2676static void
2349slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2677slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2350{ 2678{
2351 frame->prepare = prepare_cede_notself; 2679 frame->prepare = prepare_cede_notself;
2352 frame->check = slf_check_nop; 2680 frame->check = slf_check_nop;
2681}
2682
2683/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2684static void
2685slf_destroy (pTHX_ struct coro *coro)
2686{
2687 struct CoroSLF frame = coro->slf_frame;
2688
2689 /*
2690 * The on_destroy below most likely is from an SLF call.
2691 * Since by definition the SLF call will not finish when we destroy
2692 * the coro, we will have to force-finish it here, otherwise
2693 * cleanup functions cannot call SLF functions.
2694 */
2695 coro->slf_frame.prepare = 0;
2696
2697 /* this callback is reserved for slf functions needing to do cleanup */
2698 if (frame.destroy && frame.prepare && !PL_dirty)
2699 frame.destroy (aTHX_ &frame);
2353} 2700}
2354 2701
2355/* 2702/*
2356 * these not obviously related functions are all rolled into one 2703 * these not obviously related functions are all rolled into one
2357 * function to increase chances that they all will call transfer with the same 2704 * function to increase chances that they all will call transfer with the same
… …
2364 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2711 I32 checkmark; /* mark SP to see how many elements check has pushed */
2365 2712
2366 /* set up the slf frame, unless it has already been set-up */ 2713 /* set up the slf frame, unless it has already been set-up */
2367 /* the latter happens when a new coro has been started */ 2714 /* the latter happens when a new coro has been started */
2368 /* or when a new cctx was attached to an existing coroutine */ 2715 /* or when a new cctx was attached to an existing coroutine */
2369 if (expect_true (!slf_frame.prepare)) 2716 if (ecb_expect_true (!slf_frame.prepare))
2370 { 2717 {
2371 /* first iteration */ 2718 /* first iteration */
2372 dSP; 2719 dSP;
2373 SV **arg = PL_stack_base + TOPMARK + 1; 2720 SV **arg = PL_stack_base + TOPMARK + 1;
2374 int items = SP - arg; /* args without function object */ 2721 int items = SP - arg; /* args without function object */
… …
2415 while (slf_frame.check (aTHX_ &slf_frame)); 2762 while (slf_frame.check (aTHX_ &slf_frame));
2416 2763
2417 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2764 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2418 2765
2419 /* exception handling */ 2766 /* exception handling */
2420 if (expect_false (CORO_THROW)) 2767 if (ecb_expect_false (CORO_THROW))
2421 { 2768 {
2422 SV *exception = sv_2mortal (CORO_THROW); 2769 SV *exception = sv_2mortal (CORO_THROW);
2423 2770
2424 CORO_THROW = 0; 2771 CORO_THROW = 0;
2425 sv_setsv (ERRSV, exception); 2772 sv_setsv (ERRSV, exception);
2426 croak (0); 2773 croak (0);
2427 } 2774 }
2428 2775
2429 /* return value handling - mostly like entersub */ 2776 /* return value handling - mostly like entersub */
2430 /* make sure we put something on the stack in scalar context */ 2777 /* make sure we put something on the stack in scalar context */
2431 if (GIMME_V == G_SCALAR) 2778 if (GIMME_V == G_SCALAR
2779 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2432 { 2780 {
2433 dSP; 2781 dSP;
2434 SV **bot = PL_stack_base + checkmark; 2782 SV **bot = PL_stack_base + checkmark;
2435 2783
2436 if (sp == bot) /* too few, push undef */ 2784 if (sp == bot) /* too few, push undef */
2437 bot [1] = &PL_sv_undef; 2785 bot [1] = &PL_sv_undef;
2438 else if (sp != bot + 1) /* too many, take last one */ 2786 else /* too many, take last one */
2439 bot [1] = *sp; 2787 bot [1] = *sp;
2440 2788
2441 SP = bot + 1; 2789 SP = bot + 1;
2442 2790
2443 PUTBACK; 2791 PUTBACK;
… …
2541{ 2889{
2542 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2890 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2543 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2891 on_enterleave_call (aTHX_ sv_2mortal (cb));
2544} 2892}
2545 2893
2894static void
2895enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2896{
2897 if (!hook)
2898 return;
2899
2900 if (!*avp)
2901 {
2902 *avp = newAV ();
2903 AvREAL_off (*avp);
2904 }
2905
2906 av_push (*avp, (SV *)hook);
2907 av_push (*avp, (SV *)arg);
2908}
2909
2910static void
2911enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2912{
2913 AV *av = *avp;
2914 int i;
2915
2916 if (!av)
2917 return;
2918
2919 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2920 if (AvARRAY (av)[i] == (SV *)hook)
2921 {
2922 if (execute)
2923 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2924
2925 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2926 av_pop (av);
2927 av_pop (av);
2928 break;
2929 }
2930
2931 if (AvFILLp (av) >= 0)
2932 {
2933 *avp = 0;
2934 SvREFCNT_dec_NN (av);
2935 }
2936}
2937
2938static void
2939api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2940{
2941 struct coro *coro = SvSTATE (coro_sv);
2942
2943 if (SvSTATE_current == coro)
2944 if (enter)
2945 enter (aTHX_ enter_arg);
2946
2947 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2948 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2949}
2950
2951static void
2952api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2953{
2954 struct coro *coro = SvSTATE (coro_sv);
2955
2956 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2957 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2958}
2959
2960static void
2961savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2962{
2963 struct coro *coro = SvSTATE_current;
2964
2965 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2966}
2967
2968static void
2969savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2970{
2971 struct coro *coro = SvSTATE_current;
2972
2973 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2974}
2975
2976static void
2977api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2978{
2979 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2980
2981 /* this ought to be much cheaper than malloc + a single destructor call */
2982 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2983 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2984}
2985
2546/*****************************************************************************/ 2986/*****************************************************************************/
2547/* PerlIO::cede */ 2987/* PerlIO::cede */
2548 2988
2549typedef struct 2989typedef struct
2550{ 2990{
2551 PerlIOBuf base; 2991 PerlIOBuf base;
2552 NV next, every; 2992 NV next, every;
2553} PerlIOCede; 2993} PerlIOCede;
2554 2994
2555static IV 2995static IV ecb_cold
2556PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2996PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2557{ 2997{
2558 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2998 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2559 2999
2560 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 3000 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2561 self->next = nvtime () + self->every; 3001 self->next = nvtime () + self->every;
2562 3002
2563 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 3003 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2564} 3004}
2565 3005
2566static SV * 3006static SV * ecb_cold
2567PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3007PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2568{ 3008{
2569 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3009 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2570 3010
2571 return newSVnv (self->every); 3011 return newSVnv (self->every);
… …
2678 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3118 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2679 PUTBACK; 3119 PUTBACK;
2680 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3120 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2681 } 3121 }
2682 3122
2683 SvREFCNT_dec (cb); 3123 SvREFCNT_dec_NN (cb);
2684 } 3124 }
2685} 3125}
2686 3126
2687static void 3127static void
2688coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3128coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2689{ 3129{
2690 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3130 /* call $sem->adjust (0) to possibly wake up some other waiters */
2691 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3131 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2692} 3132}
2693 3133
2694static int 3134static int
2695slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3135slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2696{ 3136{
2697 AV *av = (AV *)frame->data; 3137 AV *av = (AV *)frame->data;
2698 SV *count_sv = AvARRAY (av)[0]; 3138 SV *count_sv = AvARRAY (av)[0];
3139 SV *coro_hv = SvRV (coro_current);
3140
3141 frame->destroy = 0;
2699 3142
2700 /* if we are about to throw, don't actually acquire the lock, just throw */ 3143 /* if we are about to throw, don't actually acquire the lock, just throw */
2701 if (CORO_THROW) 3144 if (ecb_expect_false (CORO_THROW))
3145 {
3146 /* we still might be responsible for the semaphore, so wake up others */
3147 coro_semaphore_adjust (aTHX_ av, 0);
3148
2702 return 0; 3149 return 0;
3150 }
2703 else if (SvIVX (count_sv) > 0) 3151 else if (SvIVX (count_sv) > 0)
2704 { 3152 {
2705 SvSTATE_current->on_destroy = 0;
2706
2707 if (acquire) 3153 if (acquire)
2708 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3154 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2709 else 3155 else
2710 coro_semaphore_adjust (aTHX_ av, 0); 3156 coro_semaphore_adjust (aTHX_ av, 0);
2711 3157
… …
2715 { 3161 {
2716 int i; 3162 int i;
2717 /* if we were woken up but can't down, we look through the whole */ 3163 /* if we were woken up but can't down, we look through the whole */
2718 /* waiters list and only add us if we aren't in there already */ 3164 /* waiters list and only add us if we aren't in there already */
2719 /* this avoids some degenerate memory usage cases */ 3165 /* this avoids some degenerate memory usage cases */
2720 3166 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2721 for (i = 1; i <= AvFILLp (av); ++i)
2722 if (AvARRAY (av)[i] == SvRV (coro_current)) 3167 if (AvARRAY (av)[i] == coro_hv)
2723 return 1; 3168 return 1;
2724 3169
2725 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3170 av_push (av, SvREFCNT_inc (coro_hv));
2726 return 1; 3171 return 1;
2727 } 3172 }
2728} 3173}
2729 3174
2730static int 3175static int
… …
2753 { 3198 {
2754 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3199 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2755 3200
2756 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3201 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2757 frame->prepare = prepare_schedule; 3202 frame->prepare = prepare_schedule;
2758
2759 /* to avoid race conditions when a woken-up coro gets terminated */ 3203 /* to avoid race conditions when a woken-up coro gets terminated */
2760 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3204 /* we arrange for a temporary on_destroy that calls adjust (0) */
2761 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3205 frame->destroy = coro_semaphore_destroy;
2762 } 3206 }
2763} 3207}
2764 3208
2765static void 3209static void
2766slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3210slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2824 { 3268 {
2825 api_ready (aTHX_ cb); 3269 api_ready (aTHX_ cb);
2826 sv_setiv (cb, 0); /* signal waiter */ 3270 sv_setiv (cb, 0); /* signal waiter */
2827 } 3271 }
2828 3272
2829 SvREFCNT_dec (cb); 3273 SvREFCNT_dec_NN (cb);
2830 3274
2831 --count; 3275 --count;
2832 } 3276 }
2833} 3277}
2834 3278
… …
2919 } 3363 }
2920 3364
2921 av_push (state, data_sv); 3365 av_push (state, data_sv);
2922 3366
2923 api_ready (aTHX_ coro); 3367 api_ready (aTHX_ coro);
2924 SvREFCNT_dec (coro); 3368 SvREFCNT_dec_NN (coro);
2925 SvREFCNT_dec ((AV *)state); 3369 SvREFCNT_dec_NN ((AV *)state);
2926} 3370}
2927 3371
2928static int 3372static int
2929slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3373slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2930{ 3374{
… …
2935 /* it quickly returns */ 3379 /* it quickly returns */
2936 if (CORO_THROW) 3380 if (CORO_THROW)
2937 return 0; 3381 return 0;
2938 3382
2939 /* one element that is an RV? repeat! */ 3383 /* one element that is an RV? repeat! */
2940 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3384 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2941 return 1; 3385 return 1;
2942 3386
2943 /* restore status */ 3387 /* restore status */
2944 { 3388 {
2945 SV *data_sv = av_pop (state); 3389 SV *data_sv = av_pop (state);
… …
2948 errno = data->errorno; 3392 errno = data->errorno;
2949 PL_laststype = data->laststype; 3393 PL_laststype = data->laststype;
2950 PL_laststatval = data->laststatval; 3394 PL_laststatval = data->laststatval;
2951 PL_statcache = data->statcache; 3395 PL_statcache = data->statcache;
2952 3396
2953 SvREFCNT_dec (data_sv); 3397 SvREFCNT_dec_NN (data_sv);
2954 } 3398 }
2955 3399
2956 /* push result values */ 3400 /* push result values */
2957 { 3401 {
2958 dSP; 3402 dSP;
… …
2984 dSP; 3428 dSP;
2985 3429
2986 static SV *prio_cv; 3430 static SV *prio_cv;
2987 static SV *prio_sv; 3431 static SV *prio_sv;
2988 3432
2989 if (expect_false (!prio_cv)) 3433 if (ecb_expect_false (!prio_cv))
2990 { 3434 {
2991 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3435 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2992 prio_sv = newSViv (0); 3436 prio_sv = newSViv (0);
2993 } 3437 }
2994 3438
… …
3100 } 3544 }
3101 3545
3102 return coro_sv; 3546 return coro_sv;
3103} 3547}
3104 3548
3549#ifndef __cplusplus
3550ecb_cold XS(boot_Coro__State);
3551#endif
3552
3553#if CORO_JIT
3554
3555static void ecb_noinline ecb_cold
3556pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3557{
3558 dSP;
3559 AV *av = newAV ();
3560
3561 av_store (av, 3, newSVuv (d));
3562 av_store (av, 2, newSVuv (c));
3563 av_store (av, 1, newSVuv (b));
3564 av_store (av, 0, newSVuv (a));
3565
3566 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3567
3568 PUTBACK;
3569}
3570
3571static void ecb_noinline ecb_cold
3572jit_init (pTHX)
3573{
3574 dSP;
3575 SV *load, *save;
3576 char *map_base;
3577 char *load_ptr, *save_ptr;
3578 STRLEN load_len, save_len, map_len;
3579 int count;
3580
3581 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3582
3583 PUSHMARK (SP);
3584 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3585 #include "state.h"
3586 count = call_pv ("Coro::State::_jit", G_ARRAY);
3587 SPAGAIN;
3588
3589 save = POPs; save_ptr = SvPVbyte (save, save_len);
3590 load = POPs; load_ptr = SvPVbyte (load, load_len);
3591
3592 map_len = load_len + save_len + 16;
3593
3594 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3595
3596 if (map_base == (char *)MAP_FAILED)
3597 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3598
3599 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3600
3601 load_perl_slots = (load_save_perl_slots_type)map_base;
3602 memcpy (map_base, load_ptr, load_len);
3603
3604 map_base += (load_len + 15) & ~15;
3605
3606 save_perl_slots = (load_save_perl_slots_type)map_base;
3607 memcpy (map_base, save_ptr, save_len);
3608
3609 /* we are good citizens and try to make the page read-only, so the evil evil */
3610 /* hackers might have it a bit more difficult */
3611 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3612
3613 PUTBACK;
3614 eval_pv ("undef &Coro::State::_jit", 1);
3615}
3616
3617#endif
3618
3105MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3619MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3106 3620
3107PROTOTYPES: DISABLE 3621PROTOTYPES: DISABLE
3108 3622
3109BOOT: 3623BOOT:
3110{ 3624{
3625#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3626#include "state.h"
3111#ifdef USE_ITHREADS 3627#ifdef USE_ITHREADS
3112# if CORO_PTHREAD 3628# if CORO_PTHREAD
3113 coro_thx = PERL_GET_CONTEXT; 3629 coro_thx = PERL_GET_CONTEXT;
3114# endif 3630# endif
3115#endif 3631#endif
3116 BOOT_PAGESIZE; 3632 /* perl defines these to check for existance first, but why it doesn't */
3633 /* just create them one at init time is not clear to me, except for */
3634 /* programs trying to delete them, but... */
3635 /* anyway, we declare this as invalid and make sure they are initialised here */
3636 DEFSV;
3637 ERRSV;
3117 3638
3118 cctx_current = cctx_new_empty (); 3639 cctx_current = cctx_new_empty ();
3119 3640
3120 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3641 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3121 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3642 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3122 3643
3123 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3644 {
3124 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3645 /*
3125 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3646 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3647 * by coro_sig_vtbl in hash values.
3648 */
3649 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3650
3651 /* this only works if perl doesn't have a vtbl for %SIG */
3652 assert (!mg->mg_virtual);
3653
3654 /*
3655 * The irony is that the perl API itself asserts that mg_virtual
3656 * must be non-const, yet perl5porters insisted on marking their
3657 * vtbls as read-only, just to thwart perl modules from patching
3658 * them.
3659 */
3660 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3661 mg->mg_flags |= MGf_COPY;
3662
3663 coro_sigelem_vtbl = PL_vtbl_sigelem;
3664 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3665 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3666 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3667 }
3126 3668
3127 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3128 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3669 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3129 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3670 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3130 3671
3131 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3672 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3132 3673
… …
3161 coroapi.prepare_nop = prepare_nop; 3702 coroapi.prepare_nop = prepare_nop;
3162 coroapi.prepare_schedule = prepare_schedule; 3703 coroapi.prepare_schedule = prepare_schedule;
3163 coroapi.prepare_cede = prepare_cede; 3704 coroapi.prepare_cede = prepare_cede;
3164 coroapi.prepare_cede_notself = prepare_cede_notself; 3705 coroapi.prepare_cede_notself = prepare_cede_notself;
3165 3706
3166 time_init (); 3707 time_init (aTHX);
3167 3708
3168 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3709 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3710#if CORO_JIT
3711 PUTBACK;
3712 jit_init (aTHX);
3713 SPAGAIN;
3714#endif
3169} 3715}
3170 3716
3171SV * 3717SV *
3172new (SV *klass, ...) 3718new (SV *klass, ...)
3173 ALIAS: 3719 ALIAS:
… …
3180void 3726void
3181transfer (...) 3727transfer (...)
3182 PROTOTYPE: $$ 3728 PROTOTYPE: $$
3183 CODE: 3729 CODE:
3184 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3730 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3185
3186bool
3187_destroy (SV *coro_sv)
3188 CODE:
3189 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3190 OUTPUT:
3191 RETVAL
3192
3193void
3194_exit (int code)
3195 PROTOTYPE: $
3196 CODE:
3197 _exit (code);
3198 3731
3199SV * 3732SV *
3200clone (Coro::State coro) 3733clone (Coro::State coro)
3201 CODE: 3734 CODE:
3202{ 3735{
… …
3257void 3790void
3258list () 3791list ()
3259 PROTOTYPE: 3792 PROTOTYPE:
3260 PPCODE: 3793 PPCODE:
3261{ 3794{
3262 struct coro *coro; 3795 struct coro *coro;
3263 for (coro = coro_first; coro; coro = coro->next) 3796 for (coro = coro_first; coro; coro = coro->next)
3264 if (coro->hv) 3797 if (coro->hv)
3265 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3798 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3266} 3799}
3267 3800
… …
3272 CODE: 3805 CODE:
3273{ 3806{
3274 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3807 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3275 { 3808 {
3276 struct coro *current = SvSTATE_current; 3809 struct coro *current = SvSTATE_current;
3810 struct CoroSLF slf_save;
3277 3811
3278 if (current != coro) 3812 if (current != coro)
3279 { 3813 {
3280 PUTBACK; 3814 PUTBACK;
3281 save_perl (aTHX_ current); 3815 save_perl (aTHX_ current);
3282 load_perl (aTHX_ coro); 3816 load_perl (aTHX_ coro);
3817 /* the coro is most likely in an active SLF call.
3818 * while not strictly required (the code we execute is
3819 * not allowed to call any SLF functions), it's cleaner
3820 * to reinitialise the slf_frame and restore it later.
3821 * This might one day allow us to actually do SLF calls
3822 * from code executed here.
3823 */
3824 slf_save = slf_frame;
3825 slf_frame.prepare = 0;
3283 SPAGAIN; 3826 SPAGAIN;
3284 } 3827 }
3285 3828
3286 PUSHSTACK; 3829 PUSHSTACK;
3287 3830
… …
3297 SPAGAIN; 3840 SPAGAIN;
3298 3841
3299 if (current != coro) 3842 if (current != coro)
3300 { 3843 {
3301 PUTBACK; 3844 PUTBACK;
3845 slf_frame = slf_save;
3302 save_perl (aTHX_ coro); 3846 save_perl (aTHX_ coro);
3303 load_perl (aTHX_ current); 3847 load_perl (aTHX_ current);
3304 SPAGAIN; 3848 SPAGAIN;
3305 } 3849 }
3306 } 3850 }
… …
3311 PROTOTYPE: $ 3855 PROTOTYPE: $
3312 ALIAS: 3856 ALIAS:
3313 is_ready = CF_READY 3857 is_ready = CF_READY
3314 is_running = CF_RUNNING 3858 is_running = CF_RUNNING
3315 is_new = CF_NEW 3859 is_new = CF_NEW
3316 is_destroyed = CF_DESTROYED 3860 is_destroyed = CF_ZOMBIE
3861 is_zombie = CF_ZOMBIE
3317 is_suspended = CF_SUSPENDED 3862 is_suspended = CF_SUSPENDED
3318 CODE: 3863 CODE:
3319 RETVAL = boolSV (coro->flags & ix); 3864 RETVAL = boolSV (coro->flags & ix);
3320 OUTPUT: 3865 OUTPUT:
3321 RETVAL 3866 RETVAL
3322 3867
3323void 3868void
3324throw (Coro::State self, SV *exception = &PL_sv_undef) 3869throw (SV *self, SV *exception = &PL_sv_undef)
3325 PROTOTYPE: $;$ 3870 PROTOTYPE: $;$
3326 CODE: 3871 CODE:
3327{ 3872{
3873 struct coro *coro = SvSTATE (self);
3328 struct coro *current = SvSTATE_current; 3874 struct coro *current = SvSTATE_current;
3329 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3875 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3330 SvREFCNT_dec (*exceptionp); 3876 SvREFCNT_dec (*exceptionp);
3331 SvGETMAGIC (exception); 3877 SvGETMAGIC (exception);
3332 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3878 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3879
3880 api_ready (aTHX_ self);
3333} 3881}
3334 3882
3335void 3883void
3336api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3884api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3337 PROTOTYPE: $;$ 3885 PROTOTYPE: $;$
… …
3392 3940
3393void 3941void
3394cancel (Coro::State self) 3942cancel (Coro::State self)
3395 CODE: 3943 CODE:
3396 coro_state_destroy (aTHX_ self); 3944 coro_state_destroy (aTHX_ self);
3397 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3398
3399 3945
3400SV * 3946SV *
3401enable_times (int enabled = enable_times) 3947enable_times (int enabled = enable_times)
3402 CODE: 3948 CODE:
3403{ 3949{
… …
3416 3962
3417void 3963void
3418times (Coro::State self) 3964times (Coro::State self)
3419 PPCODE: 3965 PPCODE:
3420{ 3966{
3421 struct coro *current = SvSTATE (coro_current); 3967 struct coro *current = SvSTATE (coro_current);
3422 3968
3423 if (expect_false (current == self)) 3969 if (ecb_expect_false (current == self))
3424 { 3970 {
3425 coro_times_update (); 3971 coro_times_update ();
3426 coro_times_add (SvSTATE (coro_current)); 3972 coro_times_add (SvSTATE (coro_current));
3427 } 3973 }
3428 3974
3429 EXTEND (SP, 2); 3975 EXTEND (SP, 2);
3430 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3976 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3431 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3977 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3432 3978
3433 if (expect_false (current == self)) 3979 if (ecb_expect_false (current == self))
3434 coro_times_sub (SvSTATE (coro_current)); 3980 coro_times_sub (SvSTATE (coro_current));
3435} 3981}
3436 3982
3437void 3983void
3438swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3984swap_sv (Coro::State coro, SV *sva, SV *svb)
3439 CODE: 3985 CODE:
3440{ 3986{
3441 struct coro *current = SvSTATE_current; 3987 struct coro *current = SvSTATE_current;
3988 AV *swap_sv;
3989 int i;
3990
3991 sva = SvRV (sva);
3992 svb = SvRV (svb);
3442 3993
3443 if (current == coro) 3994 if (current == coro)
3444 SWAP_SVS (current); 3995 SWAP_SVS_LEAVE (current);
3445 3996
3446 if (!coro->swap_sv) 3997 if (!coro->swap_sv)
3447 coro->swap_sv = newAV (); 3998 coro->swap_sv = newAV ();
3448 3999
4000 swap_sv = coro->swap_sv;
4001
4002 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4003 {
4004 SV *a = AvARRAY (swap_sv)[i ];
4005 SV *b = AvARRAY (swap_sv)[i + 1];
4006
4007 if (a == sva && b == svb)
4008 {
4009 SvREFCNT_dec_NN (a);
4010 SvREFCNT_dec_NN (b);
4011
4012 for (; i <= AvFILLp (swap_sv) - 2; i++)
4013 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4014
4015 AvFILLp (swap_sv) -= 2;
4016
4017 goto removed;
4018 }
4019 }
4020
3449 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4021 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3450 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4022 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4023
4024 removed:
3451 4025
3452 if (current == coro) 4026 if (current == coro)
3453 SWAP_SVS (current); 4027 SWAP_SVS_ENTER (current);
3454} 4028}
3455 4029
3456 4030
3457MODULE = Coro::State PACKAGE = Coro 4031MODULE = Coro::State PACKAGE = Coro
3458 4032
3459BOOT: 4033BOOT:
3460{ 4034{
4035 if (SVt_LAST > 32)
4036 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4037
3461 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4038 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3462 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4039 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3463 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4040 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3464 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3465 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4041 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3466 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4042 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3467 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4043 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3468 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4044 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3469 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4045 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3470 4046
3471 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4047 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3472 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4048 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3473 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4049 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3474 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 4050 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3475 4051
3476 coro_stash = gv_stashpv ("Coro", TRUE); 4052 coro_stash = gv_stashpv ("Coro", TRUE);
3477 4053
3478 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4054 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3479 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4055 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3480 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4056 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3492 coroapi.ready = api_ready; 4068 coroapi.ready = api_ready;
3493 coroapi.is_ready = api_is_ready; 4069 coroapi.is_ready = api_is_ready;
3494 coroapi.nready = coro_nready; 4070 coroapi.nready = coro_nready;
3495 coroapi.current = coro_current; 4071 coroapi.current = coro_current;
3496 4072
4073 coroapi.enterleave_hook = api_enterleave_hook;
4074 coroapi.enterleave_unhook = api_enterleave_unhook;
4075 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4076
3497 /*GCoroAPI = &coroapi;*/ 4077 /*GCoroAPI = &coroapi;*/
3498 sv_setiv (sv, (IV)&coroapi); 4078 sv_setiv (sv, (IV)&coroapi);
3499 SvREADONLY_on (sv); 4079 SvREADONLY_on (sv);
3500 } 4080 }
3501} 4081}
… …
3508 api_ready (aTHX_ RETVAL); 4088 api_ready (aTHX_ RETVAL);
3509 OUTPUT: 4089 OUTPUT:
3510 RETVAL 4090 RETVAL
3511 4091
3512void 4092void
4093_destroy (Coro::State coro)
4094 CODE:
4095 /* used by the manager thread */
4096 coro_state_destroy (aTHX_ coro);
4097
4098void
4099on_destroy (Coro::State coro, SV *cb)
4100 CODE:
4101 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4102
4103void
4104join (...)
4105 CODE:
4106 CORO_EXECUTE_SLF_XS (slf_init_join);
4107
4108void
3513terminate (...) 4109terminate (...)
3514 CODE: 4110 CODE:
3515 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4111 CORO_EXECUTE_SLF_XS (slf_init_terminate);
4112
4113void
4114cancel (...)
4115 CODE:
4116 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4117
4118int
4119safe_cancel (Coro::State self, ...)
4120 C_ARGS: aTHX_ self, &ST (1), items - 1
3516 4121
3517void 4122void
3518schedule (...) 4123schedule (...)
3519 CODE: 4124 CODE:
3520 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4125 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3541 4146
3542void 4147void
3543_set_current (SV *current) 4148_set_current (SV *current)
3544 PROTOTYPE: $ 4149 PROTOTYPE: $
3545 CODE: 4150 CODE:
3546 SvREFCNT_dec (SvRV (coro_current)); 4151 SvREFCNT_dec_NN (SvRV (coro_current));
3547 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4152 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3548 4153
3549void 4154void
3550_set_readyhook (SV *hook) 4155_set_readyhook (SV *hook)
3551 PROTOTYPE: $ 4156 PROTOTYPE: $
… …
3635 4240
3636 if ((SV *)hv == &PL_sv_undef) 4241 if ((SV *)hv == &PL_sv_undef)
3637 { 4242 {
3638 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4243 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3639 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4244 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3640 SvREFCNT_dec (sv); 4245 SvREFCNT_dec_NN (sv);
3641 } 4246 }
3642 4247
3643 { 4248 {
3644 struct coro *coro = SvSTATE_hv (hv); 4249 struct coro *coro = SvSTATE_hv (hv);
3645 4250
… …
3652 api_ready (aTHX_ (SV *)hv); 4257 api_ready (aTHX_ (SV *)hv);
3653 4258
3654 if (GIMME_V != G_VOID) 4259 if (GIMME_V != G_VOID)
3655 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4260 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3656 else 4261 else
3657 SvREFCNT_dec (hv); 4262 SvREFCNT_dec_NN (hv);
3658} 4263}
3659 4264
3660SV * 4265SV *
3661rouse_cb () 4266rouse_cb ()
3662 PROTOTYPE: 4267 PROTOTYPE:
… …
3677 on_leave = 1 4282 on_leave = 1
3678 PROTOTYPE: & 4283 PROTOTYPE: &
3679 CODE: 4284 CODE:
3680{ 4285{
3681 struct coro *coro = SvSTATE_current; 4286 struct coro *coro = SvSTATE_current;
3682 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4287 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3683 4288
3684 block = s_get_cv_croak (block); 4289 block = s_get_cv_croak (block);
3685 4290
3686 if (!*avp) 4291 if (!*avp)
3687 *avp = newAV (); 4292 *avp = newAV ();
… …
3707 4312
3708SV * 4313SV *
3709new (SV *klass, SV *count = 0) 4314new (SV *klass, SV *count = 0)
3710 CODE: 4315 CODE:
3711{ 4316{
3712 int semcnt = 1; 4317 int semcnt = 1;
3713 4318
3714 if (count) 4319 if (count)
3715 { 4320 {
3716 SvGETMAGIC (count); 4321 SvGETMAGIC (count);
3717 4322
… …
3741 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4346 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3742 OUTPUT: 4347 OUTPUT:
3743 RETVAL 4348 RETVAL
3744 4349
3745void 4350void
3746up (SV *self, int adjust = 1) 4351up (SV *self)
3747 ALIAS:
3748 adjust = 1
3749 CODE: 4352 CODE:
4353 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4354
4355void
4356adjust (SV *self, int adjust)
4357 CODE:
3750 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4358 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3751 4359
3752void 4360void
3753down (...) 4361down (...)
3754 CODE: 4362 CODE:
3755 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4363 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3777 XSRETURN_NO; 4385 XSRETURN_NO;
3778} 4386}
3779 4387
3780void 4388void
3781waiters (SV *self) 4389waiters (SV *self)
3782 PPCODE: 4390 PPCODE:
3783{ 4391{
3784 AV *av = (AV *)SvRV (self); 4392 AV *av = (AV *)SvRV (self);
3785 int wcount = AvFILLp (av) + 1 - 1; 4393 int wcount = AvFILLp (av) + 1 - 1;
3786 4394
3787 if (GIMME_V == G_SCALAR) 4395 if (GIMME_V == G_SCALAR)
… …
3796} 4404}
3797 4405
3798MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4406MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3799 4407
3800void 4408void
3801_may_delete (SV *sem, int count, int extra_refs) 4409_may_delete (SV *sem, int count, unsigned int extra_refs)
3802 PPCODE: 4410 PPCODE:
3803{ 4411{
3804 AV *av = (AV *)SvRV (sem); 4412 AV *av = (AV *)SvRV (sem);
3805 4413
3806 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4414 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3807 && AvFILLp (av) == 0 /* no waiters, just count */ 4415 && AvFILLp (av) == 0 /* no waiters, just count */
3808 && SvIV (AvARRAY (av)[0]) == count) 4416 && SvIV (AvARRAY (av)[0]) == count)
3809 XSRETURN_YES; 4417 XSRETURN_YES;
… …
3830 4438
3831void 4439void
3832broadcast (SV *self) 4440broadcast (SV *self)
3833 CODE: 4441 CODE:
3834{ 4442{
3835 AV *av = (AV *)SvRV (self); 4443 AV *av = (AV *)SvRV (self);
3836 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4444 coro_signal_wake (aTHX_ av, AvFILLp (av));
3837} 4445}
3838 4446
3839void 4447void
3840send (SV *self) 4448send (SV *self)
… …
3848 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4456 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3849} 4457}
3850 4458
3851IV 4459IV
3852awaited (SV *self) 4460awaited (SV *self)
3853 CODE: 4461 CODE:
3854 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4462 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3855 OUTPUT: 4463 OUTPUT:
3856 RETVAL 4464 RETVAL
3857 4465
3858 4466
… …
3863 4471
3864void 4472void
3865_schedule (...) 4473_schedule (...)
3866 CODE: 4474 CODE:
3867{ 4475{
3868 static int incede; 4476 static int incede;
3869 4477
3870 api_cede_notself (aTHX); 4478 api_cede_notself (aTHX);
3871 4479
3872 ++incede; 4480 ++incede;
3873 while (coro_nready >= incede && api_cede (aTHX)) 4481 while (coro_nready >= incede && api_cede (aTHX))
… …
3917 { 4525 {
3918 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4526 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3919 coro_old_pp_sselect = 0; 4527 coro_old_pp_sselect = 0;
3920 } 4528 }
3921 4529
4530MODULE = Coro::State PACKAGE = Coro::Util
4531
4532void
4533_exit (int code)
4534 CODE:
4535 _exit (code);
4536
4537NV
4538time ()
4539 CODE:
4540 RETVAL = nvtime (aTHX);
4541 OUTPUT:
4542 RETVAL
4543
4544NV
4545gettimeofday ()
4546 PPCODE:
4547{
4548 UV tv [2];
4549 u2time (aTHX_ tv);
4550 EXTEND (SP, 2);
4551 PUSHs (sv_2mortal (newSVuv (tv [0])));
4552 PUSHs (sv_2mortal (newSVuv (tv [1])));
4553}
4554

Diff Legend

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