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.384 by root, Thu Feb 17 01:32:18 2011 UTC vs.
Revision 1.448 by root, Thu Jun 4 22:58:28 2015 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7 7
8#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 9#define PERL_EXT
… …
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17 17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
18#include <stdio.h> 23#include <stdio.h>
19#include <errno.h> 24#include <errno.h>
20#include <assert.h> 25#include <assert.h>
21 26
22#ifndef SVs_PADSTALE 27#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0 28# define SVs_PADSTALE 0
24#endif 29#endif
25 30
26#ifdef WIN32 31#ifdef PadARRAY
32# define NEWPADAPI 1
33# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
34#else
35typedef AV PADNAMELIST;
36# if !PERL_VERSION_ATLEAST(5,8,0)
37typedef AV PADLIST;
38typedef AV PAD;
39# endif
40# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
41# define PadlistMAX(pl) AvFILLp (pl)
42# define PadlistNAMES(pl) (*PadlistARRAY (pl))
43# define PadARRAY AvARRAY
44# define PadMAX AvFILLp
45# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
46#endif
47#ifndef PadnamelistREFCNT
48# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
49#endif
50#ifndef PadnamelistREFCNT_dec
51# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
52#endif
53
54/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
55/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
56#if PERL_VERSION_ATLEAST(5,19,0)
57# define SVt_BIND SVt_IV
58#endif
59
60#if defined(_WIN32)
61# undef HAS_GETTIMEOFDAY
27# undef setjmp 62# undef setjmp
28# undef longjmp 63# undef longjmp
29# undef _exit 64# undef _exit
30# define setjmp _setjmp /* deep magic */ 65# define setjmp _setjmp /* deep magic */
31#else 66#else
32# include <inttypes.h> /* most portable stdint.h */ 67# include <inttypes.h> /* most portable stdint.h */
33#endif 68#endif
34 69
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 */ 70/* the maximum number of idle cctx that will be pooled */
63static int cctx_max_idle = 4; 71static int cctx_max_idle = 4;
64 72
65#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 73#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
66# undef CORO_STACKGUARD 74# define HAS_SCOPESTACK_NAME 1
67#endif
68
69#ifndef CORO_STACKGUARD
70# define CORO_STACKGUARD 0
71#endif 75#endif
72 76
73/* prefer perl internal functions over our own? */ 77/* prefer perl internal functions over our own? */
74#ifndef CORO_PREFER_PERL_FUNCTIONS 78#ifndef CORO_PREFER_PERL_FUNCTIONS
75# define CORO_PREFER_PERL_FUNCTIONS 0 79# define CORO_PREFER_PERL_FUNCTIONS 0
… …
85# define STACKLEVEL ((void *)&stacklevel) 89# define STACKLEVEL ((void *)&stacklevel)
86#endif 90#endif
87 91
88#define IN_DESTRUCT PL_dirty 92#define IN_DESTRUCT PL_dirty
89 93
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" 94#include "CoroAPI.h"
106#define GCoroAPI (&coroapi) /* very sneaky */ 95#define GCoroAPI (&coroapi) /* very sneaky */
107 96
108#ifdef USE_ITHREADS 97#ifdef USE_ITHREADS
109# if CORO_PTHREAD 98# if CORO_PTHREAD
… …
125static void (*u2time)(pTHX_ UV ret[2]); 114static void (*u2time)(pTHX_ UV ret[2]);
126 115
127/* we hijack an hopefully unused CV flag for our purposes */ 116/* we hijack an hopefully unused CV flag for our purposes */
128#define CVf_SLF 0x4000 117#define CVf_SLF 0x4000
129static OP *pp_slf (pTHX); 118static OP *pp_slf (pTHX);
119static void slf_destroy (pTHX_ struct coro *coro);
130 120
131static U32 cctx_gen; 121static U32 cctx_gen;
132static size_t cctx_stacksize = CORO_STACKSIZE; 122static size_t cctx_stacksize = CORO_STACKSIZE;
133static struct CoroAPI coroapi; 123static struct CoroAPI coroapi;
134static AV *main_mainstack; /* used to differentiate between $main and others */ 124static AV *main_mainstack; /* used to differentiate between $main and others */
… …
164static char times_valid; 154static char times_valid;
165 155
166static struct coro_cctx *cctx_first; 156static struct coro_cctx *cctx_first;
167static int cctx_count, cctx_idle; 157static int cctx_count, cctx_idle;
168 158
169enum { 159enum
160{
170 CC_MAPPED = 0x01, 161 CC_MAPPED = 0x01,
171 CC_NOREUSE = 0x02, /* throw this away after tracing */ 162 CC_NOREUSE = 0x02, /* throw this away after tracing */
172 CC_TRACE = 0x04, 163 CC_TRACE = 0x04,
173 CC_TRACE_SUB = 0x08, /* trace sub calls */ 164 CC_TRACE_SUB = 0x08, /* trace sub calls */
174 CC_TRACE_LINE = 0x10, /* trace each statement */ 165 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
179typedef struct coro_cctx 170typedef struct coro_cctx
180{ 171{
181 struct coro_cctx *next; 172 struct coro_cctx *next;
182 173
183 /* the stack */ 174 /* the stack */
184 void *sptr; 175 struct coro_stack stack;
185 size_t ssize;
186 176
187 /* cpu state */ 177 /* cpu state */
188 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 178 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
179#ifndef NDEBUG
189 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 180 JMPENV *idle_te; /* same as idle_sp, but for top_env */
181#endif
190 JMPENV *top_env; 182 JMPENV *top_env;
191 coro_context cctx; 183 coro_context cctx;
192 184
193 U32 gen; 185 U32 gen;
194#if CORO_USE_VALGRIND 186#if CORO_USE_VALGRIND
195 int valgrind_id; 187 int valgrind_id;
196#endif 188#endif
197 unsigned char flags; 189 unsigned char flags;
198} coro_cctx; 190} coro_cctx;
199 191
200coro_cctx *cctx_current; /* the currently running cctx */ 192static coro_cctx *cctx_current; /* the currently running cctx */
201 193
202/*****************************************************************************/ 194/*****************************************************************************/
203 195
196static MGVTBL coro_state_vtbl;
197
204enum { 198enum
199{
205 CF_RUNNING = 0x0001, /* coroutine is running */ 200 CF_RUNNING = 0x0001, /* coroutine is running */
206 CF_READY = 0x0002, /* coroutine is ready */ 201 CF_READY = 0x0002, /* coroutine is ready */
207 CF_NEW = 0x0004, /* has never been switched to */ 202 CF_NEW = 0x0004, /* has never been switched to */
208 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 203 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
209 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 204 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
205 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
210}; 206};
211 207
212/* the structure where most of the perl state is stored, overlaid on the cxstack */ 208/* the structure where most of the perl state is stored, overlaid on the cxstack */
213typedef struct 209typedef struct
214{ 210{
215 SV *defsv;
216 AV *defav;
217 SV *errsv;
218 SV *irsgv;
219 HV *hinthv;
220#define VAR(name,type) type name; 211 #define VARx(name,expr,type) type name;
221# include "state.h" 212 #include "state.h"
222#undef VAR
223} perl_slots; 213} perl_slots;
224 214
215/* 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)) 216#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
226 217
227/* this is a structure representing a perl-level coroutine */ 218/* this is a structure representing a perl-level coroutine */
228struct coro { 219struct coro
220{
229 /* the C coroutine allocated to this perl coroutine, if any */ 221 /* the C coroutine allocated to this perl coroutine, if any */
230 coro_cctx *cctx; 222 coro_cctx *cctx;
231 223
232 /* ready queue */ 224 /* ready queue */
233 struct coro *next_ready; 225 struct coro *next_ready;
… …
235 /* state data */ 227 /* state data */
236 struct CoroSLF slf_frame; /* saved slf frame */ 228 struct CoroSLF slf_frame; /* saved slf frame */
237 AV *mainstack; 229 AV *mainstack;
238 perl_slots *slot; /* basically the saved sp */ 230 perl_slots *slot; /* basically the saved sp */
239 231
240 CV *startcv; /* the CV to execute */ 232 CV *startcv; /* the CV to execute */
241 AV *args; /* data associated with this coroutine (initial args) */ 233 AV *args; /* data associated with this coroutine (initial args) */
242 int refcnt; /* coroutines are refcounted, yes */
243 int flags; /* CF_ flags */ 234 int flags; /* CF_ flags */
244 HV *hv; /* the perl hash associated with this coro, if any */ 235 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 236
247 /* statistics */ 237 /* statistics */
248 int usecount; /* number of transfers to this coro */ 238 int usecount; /* number of transfers to this coro */
249 239
250 /* coro process data */ 240 /* coro process data */
251 int prio; 241 int prio;
252 SV *except; /* exception to be thrown */ 242 SV *except; /* exception to be thrown */
253 SV *rouse_cb; 243 SV *rouse_cb; /* last rouse callback */
244 AV *on_destroy; /* callbacks or coros to notify on destroy */
245 AV *status; /* the exit status list */
254 246
255 /* async_pool */ 247 /* async_pool */
256 SV *saved_deffh; 248 SV *saved_deffh;
257 SV *invoke_cb; 249 SV *invoke_cb;
258 AV *invoke_av; 250 AV *invoke_av;
… …
274typedef struct coro *Coro__State; 266typedef struct coro *Coro__State;
275typedef struct coro *Coro__State_or_hashref; 267typedef struct coro *Coro__State_or_hashref;
276 268
277/* the following variables are effectively part of the perl context */ 269/* the following variables are effectively part of the perl context */
278/* and get copied between struct coro and these variables */ 270/* and get copied between struct coro and these variables */
279/* the mainr easonw e don't support windows process emulation */ 271/* the main reason we don't support windows process emulation */
280static struct CoroSLF slf_frame; /* the current slf frame */ 272static struct CoroSLF slf_frame; /* the current slf frame */
281 273
282/** Coro ********************************************************************/ 274/** Coro ********************************************************************/
283 275
284#define CORO_PRIO_MAX 3 276#define CORO_PRIO_MAX 3
… …
290 282
291/* for Coro.pm */ 283/* for Coro.pm */
292static SV *coro_current; 284static SV *coro_current;
293static SV *coro_readyhook; 285static SV *coro_readyhook;
294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 286static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
295static CV *cv_coro_run, *cv_coro_terminate; 287static CV *cv_coro_run;
296static struct coro *coro_first; 288static struct coro *coro_first;
297#define coro_nready coroapi.nready 289#define coro_nready coroapi.nready
290
291/** JIT *********************************************************************/
292
293#if CORO_JIT
294 /* APPLE doesn't have mmap though */
295 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
296 #ifndef CORO_JIT_TYPE
297 #if ECB_AMD64 && CORO_JIT_UNIXY
298 #define CORO_JIT_TYPE "amd64-unix"
299 #elif __i386 && CORO_JIT_UNIXY
300 #define CORO_JIT_TYPE "x86-unix"
301 #endif
302 #endif
303#endif
304
305#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
306 #undef CORO_JIT
307#endif
308
309#if CORO_JIT
310 typedef void (*load_save_perl_slots_type)(perl_slots *);
311 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
312#endif
298 313
299/** Coro::Select ************************************************************/ 314/** Coro::Select ************************************************************/
300 315
301static OP *(*coro_old_pp_sselect) (pTHX); 316static OP *(*coro_old_pp_sselect) (pTHX);
302static SV *coro_select_select; 317static SV *coro_select_select;
… …
314 PL_op->op_flags |= OPf_STACKED; 329 PL_op->op_flags |= OPf_STACKED;
315 PL_op->op_private = 0; 330 PL_op->op_private = 0;
316 return PL_ppaddr [OP_ENTERSUB](aTHX); 331 return PL_ppaddr [OP_ENTERSUB](aTHX);
317} 332}
318 333
334/** time stuff **************************************************************/
335
336#ifdef HAS_GETTIMEOFDAY
337
338ecb_inline void
339coro_u2time (pTHX_ UV ret[2])
340{
341 struct timeval tv;
342 gettimeofday (&tv, 0);
343
344 ret [0] = tv.tv_sec;
345 ret [1] = tv.tv_usec;
346}
347
348ecb_inline double
349coro_nvtime (void)
350{
351 struct timeval tv;
352 gettimeofday (&tv, 0);
353
354 return tv.tv_sec + tv.tv_usec * 1e-6;
355}
356
357ecb_inline void
358time_init (pTHX)
359{
360 nvtime = coro_nvtime;
361 u2time = coro_u2time;
362}
363
364#else
365
366ecb_inline void
367time_init (pTHX)
368{
369 SV **svp;
370
371 require_pv ("Time/HiRes.pm");
372
373 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
374
375 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
376 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
377
378 nvtime = INT2PTR (double (*)(), SvIV (*svp));
379
380 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
381 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
382}
383
384#endif
385
319/** lowlevel stuff **********************************************************/ 386/** lowlevel stuff **********************************************************/
320 387
321static SV * 388static SV * ecb_noinline
322coro_get_sv (pTHX_ const char *name, int create) 389coro_get_sv (pTHX_ const char *name, int create)
323{ 390{
324#if PERL_VERSION_ATLEAST (5,10,0) 391#if PERL_VERSION_ATLEAST (5,10,0)
325 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 392 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
326 get_sv (name, create); 393 get_sv (name, create);
327#endif 394#endif
328 return get_sv (name, create); 395 return get_sv (name, create);
329} 396}
330 397
331static AV * 398static AV * ecb_noinline
332coro_get_av (pTHX_ const char *name, int create) 399coro_get_av (pTHX_ const char *name, int create)
333{ 400{
334#if PERL_VERSION_ATLEAST (5,10,0) 401#if PERL_VERSION_ATLEAST (5,10,0)
335 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 402 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
336 get_av (name, create); 403 get_av (name, create);
337#endif 404#endif
338 return get_av (name, create); 405 return get_av (name, create);
339} 406}
340 407
341static HV * 408static HV * ecb_noinline
342coro_get_hv (pTHX_ const char *name, int create) 409coro_get_hv (pTHX_ const char *name, int create)
343{ 410{
344#if PERL_VERSION_ATLEAST (5,10,0) 411#if PERL_VERSION_ATLEAST (5,10,0)
345 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 412 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
346 get_hv (name, create); 413 get_hv (name, create);
347#endif 414#endif
348 return get_hv (name, create); 415 return get_hv (name, create);
349} 416}
350 417
351INLINE void 418ecb_inline void
352coro_times_update () 419coro_times_update (void)
353{ 420{
354#ifdef coro_clock_gettime 421#ifdef coro_clock_gettime
355 struct timespec ts; 422 struct timespec ts;
356 423
357 ts.tv_sec = ts.tv_nsec = 0; 424 ts.tv_sec = ts.tv_nsec = 0;
… …
369 time_real [0] = tv [0]; 436 time_real [0] = tv [0];
370 time_real [1] = tv [1] * 1000; 437 time_real [1] = tv [1] * 1000;
371#endif 438#endif
372} 439}
373 440
374INLINE void 441ecb_inline void
375coro_times_add (struct coro *c) 442coro_times_add (struct coro *c)
376{ 443{
377 c->t_real [1] += time_real [1]; 444 c->t_real [1] += time_real [1];
378 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 445 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
379 c->t_real [0] += time_real [0]; 446 c->t_real [0] += time_real [0];
… …
381 c->t_cpu [1] += time_cpu [1]; 448 c->t_cpu [1] += time_cpu [1];
382 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 449 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
383 c->t_cpu [0] += time_cpu [0]; 450 c->t_cpu [0] += time_cpu [0];
384} 451}
385 452
386INLINE void 453ecb_inline void
387coro_times_sub (struct coro *c) 454coro_times_sub (struct coro *c)
388{ 455{
389 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 456 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
390 c->t_real [1] -= time_real [1]; 457 c->t_real [1] -= time_real [1];
391 c->t_real [0] -= time_real [0]; 458 c->t_real [0] -= time_real [0];
… …
399/* magic glue */ 466/* magic glue */
400 467
401#define CORO_MAGIC_type_cv 26 468#define CORO_MAGIC_type_cv 26
402#define CORO_MAGIC_type_state PERL_MAGIC_ext 469#define CORO_MAGIC_type_state PERL_MAGIC_ext
403 470
404#define CORO_MAGIC_NN(sv, type) \ 471#define CORO_MAGIC_NN(sv, type) \
405 (expect_true (SvMAGIC (sv)->mg_type == type) \ 472 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
406 ? SvMAGIC (sv) \ 473 ? SvMAGIC (sv) \
407 : mg_find (sv, type)) 474 : mg_find (sv, type))
408 475
409#define CORO_MAGIC(sv, type) \ 476#define CORO_MAGIC(sv, type) \
410 (expect_true (SvMAGIC (sv)) \ 477 (ecb_expect_true (SvMAGIC (sv)) \
411 ? CORO_MAGIC_NN (sv, type) \ 478 ? CORO_MAGIC_NN (sv, type) \
412 : 0) 479 : 0)
413 480
414#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 481#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
415#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 482#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
416 483
417INLINE struct coro * 484ecb_inline MAGIC *
485SvSTATEhv_p (pTHX_ SV *coro)
486{
487 MAGIC *mg;
488
489 if (ecb_expect_true (
490 SvTYPE (coro) == SVt_PVHV
491 && (mg = CORO_MAGIC_state (coro))
492 && mg->mg_virtual == &coro_state_vtbl
493 ))
494 return mg;
495
496 return 0;
497}
498
499ecb_inline struct coro *
418SvSTATE_ (pTHX_ SV *coro) 500SvSTATE_ (pTHX_ SV *coro)
419{ 501{
420 HV *stash;
421 MAGIC *mg; 502 MAGIC *mg;
422 503
423 if (SvROK (coro)) 504 if (SvROK (coro))
424 coro = SvRV (coro); 505 coro = SvRV (coro);
425 506
426 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 507 mg = SvSTATEhv_p (aTHX_ coro);
508 if (!mg)
427 croak ("Coro::State object required"); 509 croak ("Coro::State object required");
428 510
429 stash = SvSTASH (coro);
430 if (expect_false (stash != coro_stash && stash != coro_state_stash))
431 {
432 /* very slow, but rare, check */
433 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
434 croak ("Coro::State object required");
435 }
436
437 mg = CORO_MAGIC_state (coro);
438 return (struct coro *)mg->mg_ptr; 511 return (struct coro *)mg->mg_ptr;
439} 512}
440 513
441#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 514#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
442 515
… …
445#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 518#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
446 519
447/*****************************************************************************/ 520/*****************************************************************************/
448/* padlist management and caching */ 521/* padlist management and caching */
449 522
450static AV * 523ecb_inline PADLIST *
451coro_derive_padlist (pTHX_ CV *cv) 524coro_derive_padlist (pTHX_ CV *cv)
452{ 525{
453 AV *padlist = CvPADLIST (cv); 526 PADLIST *padlist = CvPADLIST (cv);
454 AV *newpadlist, *newpad; 527 PADLIST *newpadlist;
528 PADNAMELIST *padnames;
529 PAD *newpad;
530 PADOFFSET off = PadlistMAX (padlist) + 1;
455 531
456 newpadlist = newAV (); 532#if NEWPADAPI
533
534 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
535 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
536 while (!PadlistARRAY (padlist)[off - 1])
537 --off;
538
539 Perl_pad_push (aTHX_ padlist, off);
540
541 newpad = PadlistARRAY (padlist)[off];
542 PadlistARRAY (padlist)[off] = 0;
543
544#else
545
546#if PERL_VERSION_ATLEAST (5,10,0)
547 Perl_pad_push (aTHX_ padlist, off);
548#else
549 Perl_pad_push (aTHX_ padlist, off, 1);
550#endif
551
552 newpad = PadlistARRAY (padlist)[off];
553 PadlistMAX (padlist) = off - 1;
554
555#endif
556
557 newPADLIST (newpadlist);
558#if !PERL_VERSION_ATLEAST(5,15,3)
559 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
457 AvREAL_off (newpadlist); 560 AvREAL_off (newpadlist);
458#if PERL_VERSION_ATLEAST (5,10,0)
459 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
460#else
461 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
462#endif 561#endif
463 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
464 --AvFILLp (padlist);
465 562
466 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 563 /* Already extended to 2 elements by newPADLIST. */
467 av_store (newpadlist, 1, (SV *)newpad); 564 PadlistMAX (newpadlist) = 1;
565
566 padnames = PadlistNAMES (padlist);
567 ++PadnamelistREFCNT (padnames);
568 PadlistNAMES (newpadlist) = padnames;
569
570 PadlistARRAY (newpadlist)[1] = newpad;
468 571
469 return newpadlist; 572 return newpadlist;
470} 573}
471 574
472static void 575ecb_inline void
473free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
474{ 577{
475 /* may be during global destruction */ 578 /* may be during global destruction */
476 if (!IN_DESTRUCT) 579 if (!IN_DESTRUCT)
477 { 580 {
478 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
479 582
480 while (i > 0) /* special-case index 0 */ 583 while (i > 0) /* special-case index 0 */
481 { 584 {
482 /* we try to be extra-careful here */ 585 /* we try to be extra-careful here */
483 AV *av = (AV *)AvARRAY (padlist)[i--]; 586 PAD *pad = PadlistARRAY (padlist)[i--];
484 I32 j = AvFILLp (av);
485 587
588 if (pad)
589 {
590 I32 j = PadMAX (pad);
591
486 while (j >= 0) 592 while (j >= 0)
487 SvREFCNT_dec (AvARRAY (av)[j--]); 593 SvREFCNT_dec (PadARRAY (pad)[j--]);
488 594
489 AvFILLp (av) = -1; 595 PadMAX (pad) = -1;
490 SvREFCNT_dec (av); 596 SvREFCNT_dec (pad);
597 }
491 } 598 }
492 599
493 SvREFCNT_dec (AvARRAY (padlist)[0]); 600 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
494 601
602#if NEWPADAPI
603 Safefree (PadlistARRAY (padlist));
604 Safefree (padlist);
605#else
495 AvFILLp (padlist) = -1; 606 AvFILLp (padlist) = -1;
607 AvREAL_off (padlist);
496 SvREFCNT_dec ((SV*)padlist); 608 SvREFCNT_dec ((SV*)padlist);
609#endif
497 } 610 }
498} 611}
499 612
500static int 613static int
501coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 614coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
502{ 615{
503 AV *padlist; 616 PADLIST *padlist;
504 AV *av = (AV *)mg->mg_obj; 617 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
618 size_t len = *(size_t *)mg->mg_ptr;
505 619
506 /* perl manages to free our internal AV and _then_ call us */ 620 /* perl manages to free our internal AV and _then_ call us */
507 if (IN_DESTRUCT) 621 if (IN_DESTRUCT)
508 return 0; 622 return 0;
509 623
510 /* casting is fun. */ 624 while (len--)
511 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
512 free_padlist (aTHX_ padlist); 625 free_padlist (aTHX_ padlists[len]);
513
514 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
515 626
516 return 0; 627 return 0;
517} 628}
518 629
519static MGVTBL coro_cv_vtbl = { 630static MGVTBL coro_cv_vtbl = {
520 0, 0, 0, 0, 631 0, 0, 0, 0,
521 coro_cv_free 632 coro_cv_free
522}; 633};
523 634
524/* the next two functions merely cache the padlists */ 635/* the next two functions merely cache the padlists */
525static void 636ecb_inline void
526get_padlist (pTHX_ CV *cv) 637get_padlist (pTHX_ CV *cv)
527{ 638{
528 MAGIC *mg = CORO_MAGIC_cv (cv); 639 MAGIC *mg = CORO_MAGIC_cv (cv);
529 AV *av; 640 size_t *lenp;
530 641
531 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 642 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
532 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 643 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
533 else 644 else
534 { 645 {
535#if CORO_PREFER_PERL_FUNCTIONS 646#if CORO_PREFER_PERL_FUNCTIONS
536 /* this is probably cleaner? but also slower! */ 647 /* this is probably cleaner? but also slower! */
537 /* in practise, it seems to be less stable */ 648 /* in practise, it seems to be less stable */
… …
543 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 654 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
544#endif 655#endif
545 } 656 }
546} 657}
547 658
548static void 659ecb_inline void
549put_padlist (pTHX_ CV *cv) 660put_padlist (pTHX_ CV *cv)
550{ 661{
551 MAGIC *mg = CORO_MAGIC_cv (cv); 662 MAGIC *mg = CORO_MAGIC_cv (cv);
552 AV *av;
553 663
554 if (expect_false (!mg)) 664 if (ecb_expect_false (!mg))
665 {
555 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 666 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
667 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
668 mg->mg_len = 1; /* so mg_free frees mg_ptr */
669 }
670 else
671 Renew (mg->mg_ptr,
672 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
673 char);
556 674
557 av = (AV *)mg->mg_obj; 675 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
558
559 if (expect_false (AvFILLp (av) >= AvMAX (av)))
560 av_extend (av, AvFILLp (av) + 1);
561
562 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
563} 676}
564 677
565/** load & save, init *******************************************************/ 678/** load & save, init *******************************************************/
566 679
680ecb_inline void
681swap_sv (SV *a, SV *b)
682{
683 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
684 SV tmp;
685
686 /* swap sv_any */
687 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
688
689 /* swap sv_flags */
690 SvFLAGS (&tmp) = SvFLAGS (a);
691 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
692 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
693
694#if PERL_VERSION_ATLEAST (5,10,0)
695 /* perl 5.10 and later complicates this _quite_ a bit, but it also
696 * is much faster, so no quarrels here. alternatively, we could
697 * sv_upgrade to avoid this.
698 */
699 {
700 /* swap sv_u */
701 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
702
703 /* if SvANY points to the head, we need to adjust the pointers,
704 * as the pointer for a still points to b, and maybe vice versa.
705 */
706 #define svany_in_head(type) \
707 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
708
709 if (svany_in_head (SvTYPE (a)))
710 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
711
712 if (svany_in_head (SvTYPE (b)))
713 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
714 }
715#endif
716}
717
567/* swap sv heads, at least logically */ 718/* swap sv heads, at least logically */
568static void 719static void
569swap_svs (pTHX_ Coro__State c) 720swap_svs (pTHX_ Coro__State c)
570{ 721{
571 int i; 722 int i;
572 723
573 for (i = 0; i <= AvFILLp (c->swap_sv); ) 724 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
574 { 725 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
575 SV *a = AvARRAY (c->swap_sv)[i++];
576 SV *b = AvARRAY (c->swap_sv)[i++];
577
578 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
579 SV tmp;
580
581 /* swap sv_any */
582 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
583
584 /* swap sv_flags */
585 SvFLAGS (&tmp) = SvFLAGS (a);
586 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
587 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
588
589#if PERL_VERSION_ATLEAST (5,10,0)
590 /* perl 5.10 complicates this _quite_ a bit, but it also is
591 * is much faster, so no quarrels here. alternatively, we could
592 * sv_upgrade to avoid this.
593 */
594 {
595 /* swap sv_u */
596 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
597
598 /* if SvANY points to the head, we need to adjust the pointers,
599 * as the pointer for a still points to b, and maybe vice versa.
600 */
601 #define svany_in_head(type) \
602 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
603
604 if (svany_in_head (SvTYPE (a)))
605 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
606
607 if (svany_in_head (SvTYPE (b)))
608 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
609 }
610#endif
611 }
612} 726}
613 727
614#define SWAP_SVS(coro) \ 728#define SWAP_SVS(coro) \
615 if (expect_false ((coro)->swap_sv)) \ 729 if (ecb_expect_false ((coro)->swap_sv)) \
616 swap_svs (aTHX_ (coro)) 730 swap_svs (aTHX_ (coro))
617 731
618static void 732static void
619on_enterleave_call (pTHX_ SV *cb); 733on_enterleave_call (pTHX_ SV *cb);
620 734
… …
624 perl_slots *slot = c->slot; 738 perl_slots *slot = c->slot;
625 c->slot = 0; 739 c->slot = 0;
626 740
627 PL_mainstack = c->mainstack; 741 PL_mainstack = c->mainstack;
628 742
629 GvSV (PL_defgv) = slot->defsv; 743#if CORO_JIT
630 GvAV (PL_defgv) = slot->defav; 744 load_perl_slots (slot);
631 GvSV (PL_errgv) = slot->errsv; 745#else
632 GvSV (irsgv) = slot->irsgv;
633 GvHV (PL_hintgv) = slot->hinthv;
634
635 #define VAR(name,type) PL_ ## name = slot->name; 746 #define VARx(name,expr,type) expr = slot->name;
636 # include "state.h" 747 #include "state.h"
637 #undef VAR 748#endif
638 749
639 { 750 {
640 dSP; 751 dSP;
641 752
642 CV *cv; 753 CV *cv;
643 754
644 /* now do the ugly restore mess */ 755 /* now do the ugly restore mess */
645 while (expect_true (cv = (CV *)POPs)) 756 while (ecb_expect_true (cv = (CV *)POPs))
646 { 757 {
647 put_padlist (aTHX_ cv); /* mark this padlist as available */ 758 put_padlist (aTHX_ cv); /* mark this padlist as available */
648 CvDEPTH (cv) = PTR2IV (POPs); 759 CvDEPTH (cv) = PTR2IV (POPs);
649 CvPADLIST (cv) = (AV *)POPs; 760 CvPADLIST (cv) = (PADLIST *)POPs;
650 } 761 }
651 762
652 PUTBACK; 763 PUTBACK;
653 } 764 }
654 765
655 slf_frame = c->slf_frame; 766 slf_frame = c->slf_frame;
656 CORO_THROW = c->except; 767 CORO_THROW = c->except;
657 768
658 if (expect_false (enable_times)) 769 if (ecb_expect_false (enable_times))
659 { 770 {
660 if (expect_false (!times_valid)) 771 if (ecb_expect_false (!times_valid))
661 coro_times_update (); 772 coro_times_update ();
662 773
663 coro_times_sub (c); 774 coro_times_sub (c);
664 } 775 }
665 776
666 if (expect_false (c->on_enter)) 777 if (ecb_expect_false (c->on_enter))
667 { 778 {
668 int i; 779 int i;
669 780
670 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 781 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
671 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 782 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
677static void 788static void
678save_perl (pTHX_ Coro__State c) 789save_perl (pTHX_ Coro__State c)
679{ 790{
680 SWAP_SVS (c); 791 SWAP_SVS (c);
681 792
682 if (expect_false (c->on_leave)) 793 if (ecb_expect_false (c->on_leave))
683 { 794 {
684 int i; 795 int i;
685 796
686 for (i = AvFILLp (c->on_leave); i >= 0; --i) 797 for (i = AvFILLp (c->on_leave); i >= 0; --i)
687 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 798 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
688 } 799 }
689 800
690 times_valid = 0; 801 times_valid = 0;
691 802
692 if (expect_false (enable_times)) 803 if (ecb_expect_false (enable_times))
693 { 804 {
694 coro_times_update (); times_valid = 1; 805 coro_times_update (); times_valid = 1;
695 coro_times_add (c); 806 coro_times_add (c);
696 } 807 }
697 808
… …
711 822
712 XPUSHs (Nullsv); 823 XPUSHs (Nullsv);
713 /* this loop was inspired by pp_caller */ 824 /* this loop was inspired by pp_caller */
714 for (;;) 825 for (;;)
715 { 826 {
716 while (expect_true (cxix >= 0)) 827 while (ecb_expect_true (cxix >= 0))
717 { 828 {
718 PERL_CONTEXT *cx = &ccstk[cxix--]; 829 PERL_CONTEXT *cx = &ccstk[cxix--];
719 830
720 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 831 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
721 { 832 {
722 CV *cv = cx->blk_sub.cv; 833 CV *cv = cx->blk_sub.cv;
723 834
724 if (expect_true (CvDEPTH (cv))) 835 if (ecb_expect_true (CvDEPTH (cv)))
725 { 836 {
726 EXTEND (SP, 3); 837 EXTEND (SP, 3);
727 PUSHs ((SV *)CvPADLIST (cv)); 838 PUSHs ((SV *)CvPADLIST (cv));
728 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 839 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
729 PUSHs ((SV *)cv); 840 PUSHs ((SV *)cv);
… …
732 get_padlist (aTHX_ cv); 843 get_padlist (aTHX_ cv);
733 } 844 }
734 } 845 }
735 } 846 }
736 847
737 if (expect_true (top_si->si_type == PERLSI_MAIN)) 848 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
738 break; 849 break;
739 850
740 top_si = top_si->si_prev; 851 top_si = top_si->si_prev;
741 ccstk = top_si->si_cxstack; 852 ccstk = top_si->si_cxstack;
742 cxix = top_si->si_cxix; 853 cxix = top_si->si_cxix;
… …
744 855
745 PUTBACK; 856 PUTBACK;
746 } 857 }
747 858
748 /* allocate some space on the context stack for our purposes */ 859 /* allocate some space on the context stack for our purposes */
749 /* we manually unroll here, as usually 2 slots is enough */ 860 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
750 if (SLOT_COUNT >= 1) CXINC;
751 if (SLOT_COUNT >= 2) CXINC;
752 if (SLOT_COUNT >= 3) CXINC;
753 { 861 {
754 unsigned int i; 862 unsigned int i;
863
755 for (i = 3; i < SLOT_COUNT; ++i) 864 for (i = 0; i < SLOT_COUNT; ++i)
756 CXINC; 865 CXINC;
757 } 866
758 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 867 cxstack_ix -= SLOT_COUNT; /* undo allocation */
868 }
759 869
760 c->mainstack = PL_mainstack; 870 c->mainstack = PL_mainstack;
761 871
762 { 872 {
763 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 873 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
764 874
765 slot->defav = GvAV (PL_defgv); 875#if CORO_JIT
766 slot->defsv = DEFSV; 876 save_perl_slots (slot);
767 slot->errsv = ERRSV; 877#else
768 slot->irsgv = GvSV (irsgv);
769 slot->hinthv = GvHV (PL_hintgv);
770
771 #define VAR(name,type) slot->name = PL_ ## name; 878 #define VARx(name,expr,type) slot->name = expr;
772 # include "state.h" 879 #include "state.h"
773 #undef VAR 880#endif
774 } 881 }
775} 882}
776 883
777/* 884/*
778 * allocate various perl stacks. This is almost an exact copy 885 * allocate various perl stacks. This is almost an exact copy
… …
784# define coro_init_stacks(thx) init_stacks () 891# define coro_init_stacks(thx) init_stacks ()
785#else 892#else
786static void 893static void
787coro_init_stacks (pTHX) 894coro_init_stacks (pTHX)
788{ 895{
789 PL_curstackinfo = new_stackinfo(32, 8); 896 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
790 PL_curstackinfo->si_type = PERLSI_MAIN; 897 PL_curstackinfo->si_type = PERLSI_MAIN;
791 PL_curstack = PL_curstackinfo->si_stack; 898 PL_curstack = PL_curstackinfo->si_stack;
792 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 899 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
793 900
794 PL_stack_base = AvARRAY(PL_curstack); 901 PL_stack_base = AvARRAY(PL_curstack);
… …
809#endif 916#endif
810 917
811 New(54,PL_scopestack,8,I32); 918 New(54,PL_scopestack,8,I32);
812 PL_scopestack_ix = 0; 919 PL_scopestack_ix = 0;
813 PL_scopestack_max = 8; 920 PL_scopestack_max = 8;
921#if HAS_SCOPESTACK_NAME
922 New(54,PL_scopestack_name,8,const char*);
923#endif
814 924
815 New(54,PL_savestack,24,ANY); 925 New(54,PL_savestack,24,ANY);
816 PL_savestack_ix = 0; 926 PL_savestack_ix = 0;
817 PL_savestack_max = 24; 927 PL_savestack_max = 24;
818 928
… …
846 } 956 }
847 957
848 Safefree (PL_tmps_stack); 958 Safefree (PL_tmps_stack);
849 Safefree (PL_markstack); 959 Safefree (PL_markstack);
850 Safefree (PL_scopestack); 960 Safefree (PL_scopestack);
961#if HAS_SCOPESTACK_NAME
962 Safefree (PL_scopestack_name);
963#endif
851 Safefree (PL_savestack); 964 Safefree (PL_savestack);
852#if !PERL_VERSION_ATLEAST (5,10,0) 965#if !PERL_VERSION_ATLEAST (5,10,0)
853 Safefree (PL_retstack); 966 Safefree (PL_retstack);
854#endif 967#endif
855} 968}
… …
901#endif 1014#endif
902 1015
903/* 1016/*
904 * This overrides the default magic get method of %SIG elements. 1017 * This overrides the default magic get method of %SIG elements.
905 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1018 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
906 * and instead of trying to save and restore the hash elements, we just provide 1019 * and instead of trying to save and restore the hash elements (extremely slow),
907 * readback here. 1020 * we just provide our own readback here.
908 */ 1021 */
909static int 1022static int ecb_cold
910coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1023coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
911{ 1024{
912 const char *s = MgPV_nolen_const (mg); 1025 const char *s = MgPV_nolen_const (mg);
913 1026
914 if (*s == '_') 1027 if (*s == '_')
915 { 1028 {
916 SV **svp = 0; 1029 SV **svp = 0;
917 1030
918 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1031 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
919 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1032 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
920 1033
921 if (svp) 1034 if (svp)
922 { 1035 {
923 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1036 SV *ssv;
1037
1038 if (!*svp)
1039 ssv = &PL_sv_undef;
1040 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1041 ssv = sv_2mortal (newRV_inc (*svp));
1042 else
1043 ssv = *svp;
1044
1045 sv_setsv (sv, ssv);
924 return 0; 1046 return 0;
925 } 1047 }
926 } 1048 }
927 1049
928 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1050 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
929} 1051}
930 1052
931static int 1053static int ecb_cold
932coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1054coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
933{ 1055{
934 const char *s = MgPV_nolen_const (mg); 1056 const char *s = MgPV_nolen_const (mg);
935 1057
936 if (*s == '_') 1058 if (*s == '_')
… …
950 } 1072 }
951 1073
952 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1074 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
953} 1075}
954 1076
955static int 1077static int ecb_cold
956coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1078coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
957{ 1079{
958 const char *s = MgPV_nolen_const (mg); 1080 const char *s = MgPV_nolen_const (mg);
959 1081
960 if (*s == '_') 1082 if (*s == '_')
… …
995 return 1; 1117 return 1;
996} 1118}
997 1119
998static UNOP init_perl_op; 1120static UNOP init_perl_op;
999 1121
1000static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1122ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1001init_perl (pTHX_ struct coro *coro) 1123init_perl (pTHX_ struct coro *coro)
1002{ 1124{
1003 /* 1125 /*
1004 * emulate part of the perl startup here. 1126 * emulate part of the perl startup here.
1005 */ 1127 */
… …
1020 PL_parser = 0; 1142 PL_parser = 0;
1021#endif 1143#endif
1022 PL_hints = 0; 1144 PL_hints = 0;
1023 1145
1024 /* recreate the die/warn hooks */ 1146 /* recreate the die/warn hooks */
1025 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1147 PL_diehook = SvREFCNT_inc (rv_diehook);
1026 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1148 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1027 1149
1028 GvSV (PL_defgv) = newSV (0); 1150 GvSV (PL_defgv) = newSV (0);
1029 GvAV (PL_defgv) = coro->args; coro->args = 0; 1151 GvAV (PL_defgv) = coro->args; coro->args = 0;
1030 GvSV (PL_errgv) = newSV (0); 1152 GvSV (PL_errgv) = newSV (0);
1031 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1153 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1032 GvHV (PL_hintgv) = 0; 1154 GvHV (PL_hintgv) = newHV ();
1155#if PERL_VERSION_ATLEAST (5,10,0)
1156 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1157#endif
1033 PL_rs = newSVsv (GvSV (irsgv)); 1158 PL_rs = newSVsv (GvSV (irsgv));
1034 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1159 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1035 1160
1036 { 1161 {
1037 dSP; 1162 dSP;
… …
1052 /* this newly created coroutine might be run on an existing cctx which most 1177 /* this newly created coroutine might be run on an existing cctx which most
1053 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1178 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1054 */ 1179 */
1055 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1180 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1056 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1181 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1182 slf_frame.destroy = 0;
1057 1183
1058 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1184 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1059 init_perl_op.op_next = PL_op; 1185 init_perl_op.op_next = PL_op;
1060 init_perl_op.op_type = OP_ENTERSUB; 1186 init_perl_op.op_type = OP_ENTERSUB;
1061 init_perl_op.op_ppaddr = pp_slf; 1187 init_perl_op.op_ppaddr = pp_slf;
… …
1066 /* copy throw, in case it was set before init_perl */ 1192 /* copy throw, in case it was set before init_perl */
1067 CORO_THROW = coro->except; 1193 CORO_THROW = coro->except;
1068 1194
1069 SWAP_SVS (coro); 1195 SWAP_SVS (coro);
1070 1196
1071 if (expect_false (enable_times)) 1197 if (ecb_expect_false (enable_times))
1072 { 1198 {
1073 coro_times_update (); 1199 coro_times_update ();
1074 coro_times_sub (coro); 1200 coro_times_sub (coro);
1075 } 1201 }
1076} 1202}
… …
1100destroy_perl (pTHX_ struct coro *coro) 1226destroy_perl (pTHX_ struct coro *coro)
1101{ 1227{
1102 SV *svf [9]; 1228 SV *svf [9];
1103 1229
1104 { 1230 {
1231 SV *old_current = SvRV (coro_current);
1105 struct coro *current = SvSTATE_current; 1232 struct coro *current = SvSTATE (old_current);
1106 1233
1107 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1234 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1108 1235
1109 save_perl (aTHX_ current); 1236 save_perl (aTHX_ current);
1237
1238 /* this will cause transfer_check to croak on block*/
1239 SvRV_set (coro_current, (SV *)coro->hv);
1240
1110 load_perl (aTHX_ coro); 1241 load_perl (aTHX_ coro);
1111 1242
1112 coro_unwind_stacks (aTHX); 1243 coro_unwind_stacks (aTHX);
1113 coro_destruct_stacks (aTHX);
1114 1244
1115 /* restore swapped sv's */ 1245 /* restore swapped sv's */
1116 SWAP_SVS (coro); 1246 SWAP_SVS (coro);
1117 1247
1248 coro_destruct_stacks (aTHX);
1249
1118 // now save some sv's to be free'd later 1250 /* now save some sv's to be free'd later */
1119 svf [0] = GvSV (PL_defgv); 1251 svf [0] = GvSV (PL_defgv);
1120 svf [1] = (SV *)GvAV (PL_defgv); 1252 svf [1] = (SV *)GvAV (PL_defgv);
1121 svf [2] = GvSV (PL_errgv); 1253 svf [2] = GvSV (PL_errgv);
1122 svf [3] = (SV *)PL_defoutgv; 1254 svf [3] = (SV *)PL_defoutgv;
1123 svf [4] = PL_rs; 1255 svf [4] = PL_rs;
… …
1125 svf [6] = (SV *)GvHV (PL_hintgv); 1257 svf [6] = (SV *)GvHV (PL_hintgv);
1126 svf [7] = PL_diehook; 1258 svf [7] = PL_diehook;
1127 svf [8] = PL_warnhook; 1259 svf [8] = PL_warnhook;
1128 assert (9 == sizeof (svf) / sizeof (*svf)); 1260 assert (9 == sizeof (svf) / sizeof (*svf));
1129 1261
1262 SvRV_set (coro_current, old_current);
1263
1130 load_perl (aTHX_ current); 1264 load_perl (aTHX_ current);
1131 } 1265 }
1132 1266
1133 { 1267 {
1134 unsigned int i; 1268 unsigned int i;
… …
1141 SvREFCNT_dec (coro->invoke_cb); 1275 SvREFCNT_dec (coro->invoke_cb);
1142 SvREFCNT_dec (coro->invoke_av); 1276 SvREFCNT_dec (coro->invoke_av);
1143 } 1277 }
1144} 1278}
1145 1279
1146INLINE void 1280ecb_inline void
1147free_coro_mortal (pTHX) 1281free_coro_mortal (pTHX)
1148{ 1282{
1149 if (expect_true (coro_mortal)) 1283 if (ecb_expect_true (coro_mortal))
1150 { 1284 {
1151 SvREFCNT_dec (coro_mortal); 1285 SvREFCNT_dec ((SV *)coro_mortal);
1152 coro_mortal = 0; 1286 coro_mortal = 0;
1153 } 1287 }
1154} 1288}
1155 1289
1156static int 1290static int
… …
1289 1423
1290 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1424 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1291} 1425}
1292 1426
1293/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1427/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1294static void NOINLINE 1428static void ecb_noinline
1295cctx_prepare (pTHX) 1429cctx_prepare (pTHX)
1296{ 1430{
1297 PL_top_env = &PL_start_env; 1431 PL_top_env = &PL_start_env;
1298 1432
1299 if (cctx_current->flags & CC_TRACE) 1433 if (cctx_current->flags & CC_TRACE)
… …
1310 slf_frame.prepare = slf_prepare_set_stacklevel; 1444 slf_frame.prepare = slf_prepare_set_stacklevel;
1311 slf_frame.check = slf_check_set_stacklevel; 1445 slf_frame.check = slf_check_set_stacklevel;
1312} 1446}
1313 1447
1314/* the tail of transfer: execute stuff we can only do after a transfer */ 1448/* the tail of transfer: execute stuff we can only do after a transfer */
1315INLINE void 1449ecb_inline void
1316transfer_tail (pTHX) 1450transfer_tail (pTHX)
1317{ 1451{
1318 free_coro_mortal (aTHX); 1452 free_coro_mortal (aTHX);
1453}
1454
1455/* try to exit the same way perl's main function would do */
1456/* we do not bother resetting the environment or other things *7
1457/* that are not, uhm, essential */
1458/* this obviously also doesn't work when perl is embedded */
1459static void ecb_noinline ecb_cold
1460perlish_exit (pTHX)
1461{
1462 int exitstatus = perl_destruct (PL_curinterp);
1463 perl_free (PL_curinterp);
1464 exit (exitstatus);
1319} 1465}
1320 1466
1321/* 1467/*
1322 * this is a _very_ stripped down perl interpreter ;) 1468 * this is a _very_ stripped down perl interpreter ;)
1323 */ 1469 */
… …
1352 */ 1498 */
1353 1499
1354 /* 1500 /*
1355 * If perl-run returns we assume exit() was being called or the coro 1501 * If perl-run returns we assume exit() was being called or the coro
1356 * fell off the end, which seems to be the only valid (non-bug) 1502 * fell off the end, which seems to be the only valid (non-bug)
1357 * reason for perl_run to return. We try to exit by jumping to the 1503 * reason for perl_run to return. We try to mimic whatever perl is normally
1358 * bootstrap-time "top" top_env, as we cannot restore the "main" 1504 * doing in that case. YMMV.
1359 * coroutine as Coro has no such concept.
1360 * This actually isn't valid with the pthread backend, but OSes requiring
1361 * that backend are too broken to do it in a standards-compliant way.
1362 */ 1505 */
1363 PL_top_env = main_top_env; 1506 perlish_exit (aTHX);
1364 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1365 } 1507 }
1366} 1508}
1367 1509
1368static coro_cctx * 1510static coro_cctx *
1369cctx_new () 1511cctx_new (void)
1370{ 1512{
1371 coro_cctx *cctx; 1513 coro_cctx *cctx;
1372 1514
1373 ++cctx_count; 1515 ++cctx_count;
1374 New (0, cctx, 1, coro_cctx); 1516 New (0, cctx, 1, coro_cctx);
… …
1380 return cctx; 1522 return cctx;
1381} 1523}
1382 1524
1383/* create a new cctx only suitable as source */ 1525/* create a new cctx only suitable as source */
1384static coro_cctx * 1526static coro_cctx *
1385cctx_new_empty () 1527cctx_new_empty (void)
1386{ 1528{
1387 coro_cctx *cctx = cctx_new (); 1529 coro_cctx *cctx = cctx_new ();
1388 1530
1389 cctx->sptr = 0; 1531 cctx->stack.sptr = 0;
1390 coro_create (&cctx->cctx, 0, 0, 0, 0); 1532 coro_create (&cctx->cctx, 0, 0, 0, 0);
1391 1533
1392 return cctx; 1534 return cctx;
1393} 1535}
1394 1536
1395/* create a new cctx suitable as destination/running a perl interpreter */ 1537/* create a new cctx suitable as destination/running a perl interpreter */
1396static coro_cctx * 1538static coro_cctx *
1397cctx_new_run () 1539cctx_new_run (void)
1398{ 1540{
1399 coro_cctx *cctx = cctx_new (); 1541 coro_cctx *cctx = cctx_new ();
1400 void *stack_start;
1401 size_t stack_size;
1402 1542
1403#if HAVE_MMAP 1543 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1404 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1405 /* mmap supposedly does allocate-on-write for us */
1406 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1407
1408 if (cctx->sptr != (void *)-1)
1409 {
1410 #if CORO_STACKGUARD
1411 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1412 #endif
1413 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1414 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1415 cctx->flags |= CC_MAPPED;
1416 } 1544 {
1417 else
1418#endif
1419 {
1420 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1421 New (0, cctx->sptr, cctx_stacksize, long);
1422
1423 if (!cctx->sptr)
1424 {
1425 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1545 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1426 _exit (EXIT_FAILURE); 1546 _exit (EXIT_FAILURE);
1427 }
1428
1429 stack_start = cctx->sptr;
1430 stack_size = cctx->ssize;
1431 } 1547 }
1432 1548
1433 #if CORO_USE_VALGRIND
1434 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1435 #endif
1436
1437 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1549 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1438 1550
1439 return cctx; 1551 return cctx;
1440} 1552}
1441 1553
1442static void 1554static void
1443cctx_destroy (coro_cctx *cctx) 1555cctx_destroy (coro_cctx *cctx)
1444{ 1556{
1445 if (!cctx) 1557 if (!cctx)
1446 return; 1558 return;
1447 1559
1448 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1560 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1449 1561
1450 --cctx_count; 1562 --cctx_count;
1451 coro_destroy (&cctx->cctx); 1563 coro_destroy (&cctx->cctx);
1452 1564
1453 /* coro_transfer creates new, empty cctx's */ 1565 coro_stack_free (&cctx->stack);
1454 if (cctx->sptr)
1455 {
1456 #if CORO_USE_VALGRIND
1457 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1458 #endif
1459
1460#if HAVE_MMAP
1461 if (cctx->flags & CC_MAPPED)
1462 munmap (cctx->sptr, cctx->ssize);
1463 else
1464#endif
1465 Safefree (cctx->sptr);
1466 }
1467 1566
1468 Safefree (cctx); 1567 Safefree (cctx);
1469} 1568}
1470 1569
1471/* wether this cctx should be destructed */ 1570/* wether this cctx should be destructed */
1472#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1571#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1473 1572
1474static coro_cctx * 1573static coro_cctx *
1475cctx_get (pTHX) 1574cctx_get (pTHX)
1476{ 1575{
1477 while (expect_true (cctx_first)) 1576 while (ecb_expect_true (cctx_first))
1478 { 1577 {
1479 coro_cctx *cctx = cctx_first; 1578 coro_cctx *cctx = cctx_first;
1480 cctx_first = cctx->next; 1579 cctx_first = cctx->next;
1481 --cctx_idle; 1580 --cctx_idle;
1482 1581
1483 if (expect_true (!CCTX_EXPIRED (cctx))) 1582 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1484 return cctx; 1583 return cctx;
1485 1584
1486 cctx_destroy (cctx); 1585 cctx_destroy (cctx);
1487 } 1586 }
1488 1587
… …
1490} 1589}
1491 1590
1492static void 1591static void
1493cctx_put (coro_cctx *cctx) 1592cctx_put (coro_cctx *cctx)
1494{ 1593{
1495 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1594 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1496 1595
1497 /* free another cctx if overlimit */ 1596 /* free another cctx if overlimit */
1498 if (expect_false (cctx_idle >= cctx_max_idle)) 1597 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1499 { 1598 {
1500 coro_cctx *first = cctx_first; 1599 coro_cctx *first = cctx_first;
1501 cctx_first = first->next; 1600 cctx_first = first->next;
1502 --cctx_idle; 1601 --cctx_idle;
1503 1602
… …
1514static void 1613static void
1515transfer_check (pTHX_ struct coro *prev, struct coro *next) 1614transfer_check (pTHX_ struct coro *prev, struct coro *next)
1516{ 1615{
1517 /* TODO: throwing up here is considered harmful */ 1616 /* TODO: throwing up here is considered harmful */
1518 1617
1519 if (expect_true (prev != next)) 1618 if (ecb_expect_true (prev != next))
1520 { 1619 {
1521 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1620 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1522 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1621 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1523 1622
1524 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1623 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1525 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1624 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1526 1625
1527#if !PERL_VERSION_ATLEAST (5,10,0) 1626#if !PERL_VERSION_ATLEAST (5,10,0)
1528 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1627 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1529 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1628 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1530#endif 1629#endif
1531 } 1630 }
1532} 1631}
1533 1632
1534/* always use the TRANSFER macro */ 1633/* always use the TRANSFER macro */
1535static void NOINLINE /* noinline so we have a fixed stackframe */ 1634static void ecb_noinline /* noinline so we have a fixed stackframe */
1536transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1635transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1537{ 1636{
1538 dSTACKLEVEL; 1637 dSTACKLEVEL;
1539 1638
1540 /* sometimes transfer is only called to set idle_sp */ 1639 /* sometimes transfer is only called to set idle_sp */
1541 if (expect_false (!prev)) 1640 if (ecb_expect_false (!prev))
1542 { 1641 {
1543 cctx_current->idle_sp = STACKLEVEL; 1642 cctx_current->idle_sp = STACKLEVEL;
1544 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1643 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1545 } 1644 }
1546 else if (expect_true (prev != next)) 1645 else if (ecb_expect_true (prev != next))
1547 { 1646 {
1548 coro_cctx *cctx_prev; 1647 coro_cctx *cctx_prev;
1549 1648
1550 if (expect_false (prev->flags & CF_NEW)) 1649 if (ecb_expect_false (prev->flags & CF_NEW))
1551 { 1650 {
1552 /* create a new empty/source context */ 1651 /* create a new empty/source context */
1553 prev->flags &= ~CF_NEW; 1652 prev->flags &= ~CF_NEW;
1554 prev->flags |= CF_RUNNING; 1653 prev->flags |= CF_RUNNING;
1555 } 1654 }
… …
1558 next->flags |= CF_RUNNING; 1657 next->flags |= CF_RUNNING;
1559 1658
1560 /* first get rid of the old state */ 1659 /* first get rid of the old state */
1561 save_perl (aTHX_ prev); 1660 save_perl (aTHX_ prev);
1562 1661
1563 if (expect_false (next->flags & CF_NEW)) 1662 if (ecb_expect_false (next->flags & CF_NEW))
1564 { 1663 {
1565 /* need to start coroutine */ 1664 /* need to start coroutine */
1566 next->flags &= ~CF_NEW; 1665 next->flags &= ~CF_NEW;
1567 /* setup coroutine call */ 1666 /* setup coroutine call */
1568 init_perl (aTHX_ next); 1667 init_perl (aTHX_ next);
1569 } 1668 }
1570 else 1669 else
1571 load_perl (aTHX_ next); 1670 load_perl (aTHX_ next);
1572 1671
1573 /* possibly untie and reuse the cctx */ 1672 /* possibly untie and reuse the cctx */
1574 if (expect_true ( 1673 if (ecb_expect_true (
1575 cctx_current->idle_sp == STACKLEVEL 1674 cctx_current->idle_sp == STACKLEVEL
1576 && !(cctx_current->flags & CC_TRACE) 1675 && !(cctx_current->flags & CC_TRACE)
1577 && !force_cctx 1676 && !force_cctx
1578 )) 1677 ))
1579 { 1678 {
1580 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1679 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1581 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1680 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1582 1681
1583 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1682 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1584 /* without this the next cctx_get might destroy the running cctx while still in use */ 1683 /* without this the next cctx_get might destroy the running cctx while still in use */
1585 if (expect_false (CCTX_EXPIRED (cctx_current))) 1684 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1586 if (expect_true (!next->cctx)) 1685 if (ecb_expect_true (!next->cctx))
1587 next->cctx = cctx_get (aTHX); 1686 next->cctx = cctx_get (aTHX);
1588 1687
1589 cctx_put (cctx_current); 1688 cctx_put (cctx_current);
1590 } 1689 }
1591 else 1690 else
1592 prev->cctx = cctx_current; 1691 prev->cctx = cctx_current;
1593 1692
1594 ++next->usecount; 1693 ++next->usecount;
1595 1694
1596 cctx_prev = cctx_current; 1695 cctx_prev = cctx_current;
1597 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1696 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1598 1697
1599 next->cctx = 0; 1698 next->cctx = 0;
1600 1699
1601 if (expect_false (cctx_prev != cctx_current)) 1700 if (ecb_expect_false (cctx_prev != cctx_current))
1602 { 1701 {
1603 cctx_prev->top_env = PL_top_env; 1702 cctx_prev->top_env = PL_top_env;
1604 PL_top_env = cctx_current->top_env; 1703 PL_top_env = cctx_current->top_env;
1605 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1704 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1606 } 1705 }
… …
1612#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1711#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1613#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1712#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1614 1713
1615/** high level stuff ********************************************************/ 1714/** high level stuff ********************************************************/
1616 1715
1716/* this function is actually Coro, not Coro::State, but we call it from here */
1717/* because it is convenient - but it hasn't been declared yet for that reason */
1617static int 1718static void
1719coro_call_on_destroy (pTHX_ struct coro *coro);
1720
1721static void
1618coro_state_destroy (pTHX_ struct coro *coro) 1722coro_state_destroy (pTHX_ struct coro *coro)
1619{ 1723{
1620 if (coro->flags & CF_DESTROYED) 1724 if (coro->flags & CF_ZOMBIE)
1621 return 0; 1725 return;
1622 1726
1623 if (coro->on_destroy && !PL_dirty)
1624 coro->on_destroy (aTHX_ coro); 1727 slf_destroy (aTHX_ coro);
1625 1728
1626 coro->flags |= CF_DESTROYED; 1729 coro->flags |= CF_ZOMBIE;
1627 1730
1628 if (coro->flags & CF_READY) 1731 if (coro->flags & CF_READY)
1629 { 1732 {
1630 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1733 /* reduce nready, as destroying a ready coro effectively unreadies it */
1631 /* alternative: look through all ready queues and remove the coro */ 1734 /* alternative: look through all ready queues and remove the coro */
1632 --coro_nready; 1735 --coro_nready;
1633 } 1736 }
1634 else 1737 else
1635 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1738 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1739
1740 if (coro->next) coro->next->prev = coro->prev;
1741 if (coro->prev) coro->prev->next = coro->next;
1742 if (coro == coro_first) coro_first = coro->next;
1636 1743
1637 if (coro->mainstack 1744 if (coro->mainstack
1638 && coro->mainstack != main_mainstack 1745 && coro->mainstack != main_mainstack
1639 && coro->slot 1746 && coro->slot
1640 && !PL_dirty) 1747 && !PL_dirty)
1641 destroy_perl (aTHX_ coro); 1748 destroy_perl (aTHX_ coro);
1642 1749
1643 if (coro->next) coro->next->prev = coro->prev;
1644 if (coro->prev) coro->prev->next = coro->next;
1645 if (coro == coro_first) coro_first = coro->next;
1646
1647 cctx_destroy (coro->cctx); 1750 cctx_destroy (coro->cctx);
1648 SvREFCNT_dec (coro->startcv); 1751 SvREFCNT_dec (coro->startcv);
1649 SvREFCNT_dec (coro->args); 1752 SvREFCNT_dec (coro->args);
1650 SvREFCNT_dec (coro->swap_sv); 1753 SvREFCNT_dec (coro->swap_sv);
1651 SvREFCNT_dec (CORO_THROW); 1754 SvREFCNT_dec (CORO_THROW);
1652 1755
1653 return 1; 1756 coro_call_on_destroy (aTHX_ coro);
1757
1758 /* more destruction mayhem in coro_state_free */
1654} 1759}
1655 1760
1656static int 1761static int
1657coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1762coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1658{ 1763{
1659 struct coro *coro = (struct coro *)mg->mg_ptr; 1764 struct coro *coro = (struct coro *)mg->mg_ptr;
1660 mg->mg_ptr = 0; 1765 mg->mg_ptr = 0;
1661 1766
1662 coro->hv = 0;
1663
1664 if (--coro->refcnt < 0)
1665 {
1666 coro_state_destroy (aTHX_ coro); 1767 coro_state_destroy (aTHX_ coro);
1768 SvREFCNT_dec (coro->on_destroy);
1769 SvREFCNT_dec (coro->status);
1770
1667 Safefree (coro); 1771 Safefree (coro);
1668 }
1669 1772
1670 return 0; 1773 return 0;
1671} 1774}
1672 1775
1673static int 1776static int ecb_cold
1674coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1777coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1675{ 1778{
1676 struct coro *coro = (struct coro *)mg->mg_ptr; 1779 /* called when perl clones the current process the slow way (windows process emulation) */
1677 1780 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1678 ++coro->refcnt; 1781 mg->mg_ptr = 0;
1782 mg->mg_virtual = 0;
1679 1783
1680 return 0; 1784 return 0;
1681} 1785}
1682 1786
1683static MGVTBL coro_state_vtbl = { 1787static MGVTBL coro_state_vtbl = {
… …
1708 TRANSFER (ta, 1); 1812 TRANSFER (ta, 1);
1709} 1813}
1710 1814
1711/** Coro ********************************************************************/ 1815/** Coro ********************************************************************/
1712 1816
1713INLINE void 1817ecb_inline void
1714coro_enq (pTHX_ struct coro *coro) 1818coro_enq (pTHX_ struct coro *coro)
1715{ 1819{
1716 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1820 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1717 1821
1718 SvREFCNT_inc_NN (coro->hv); 1822 SvREFCNT_inc_NN (coro->hv);
… …
1720 coro->next_ready = 0; 1824 coro->next_ready = 0;
1721 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1825 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1722 ready [1] = coro; 1826 ready [1] = coro;
1723} 1827}
1724 1828
1725INLINE struct coro * 1829ecb_inline struct coro *
1726coro_deq (pTHX) 1830coro_deq (pTHX)
1727{ 1831{
1728 int prio; 1832 int prio;
1729 1833
1730 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1834 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1783{ 1887{
1784 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1888 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1785} 1889}
1786 1890
1787/* expects to own a reference to next->hv */ 1891/* expects to own a reference to next->hv */
1788INLINE void 1892ecb_inline void
1789prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1893prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1790{ 1894{
1791 SV *prev_sv = SvRV (coro_current); 1895 SV *prev_sv = SvRV (coro_current);
1792 1896
1793 ta->prev = SvSTATE_hv (prev_sv); 1897 ta->prev = SvSTATE_hv (prev_sv);
… …
1806{ 1910{
1807 for (;;) 1911 for (;;)
1808 { 1912 {
1809 struct coro *next = coro_deq (aTHX); 1913 struct coro *next = coro_deq (aTHX);
1810 1914
1811 if (expect_true (next)) 1915 if (ecb_expect_true (next))
1812 { 1916 {
1813 /* cannot transfer to destroyed coros, skip and look for next */ 1917 /* cannot transfer to destroyed coros, skip and look for next */
1814 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1918 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1815 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1919 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1816 else 1920 else
1817 { 1921 {
1818 next->flags &= ~CF_READY; 1922 next->flags &= ~CF_READY;
1819 --coro_nready; 1923 --coro_nready;
… …
1827 /* nothing to schedule: call the idle handler */ 1931 /* nothing to schedule: call the idle handler */
1828 if (SvROK (sv_idle) 1932 if (SvROK (sv_idle)
1829 && SvOBJECT (SvRV (sv_idle))) 1933 && SvOBJECT (SvRV (sv_idle)))
1830 { 1934 {
1831 if (SvRV (sv_idle) == SvRV (coro_current)) 1935 if (SvRV (sv_idle) == SvRV (coro_current))
1936 {
1937 require_pv ("Carp");
1938
1939 {
1940 dSP;
1941
1942 ENTER;
1943 SAVETMPS;
1944
1945 PUSHMARK (SP);
1832 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1946 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1947 PUTBACK;
1948 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1949
1950 FREETMPS;
1951 LEAVE;
1952 }
1953 }
1833 1954
1834 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1955 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1835 api_ready (aTHX_ SvRV (sv_idle)); 1956 api_ready (aTHX_ SvRV (sv_idle));
1836 --coro_nready; 1957 --coro_nready;
1837 } 1958 }
… …
1852 } 1973 }
1853 } 1974 }
1854 } 1975 }
1855} 1976}
1856 1977
1857INLINE void 1978ecb_inline void
1858prepare_cede (pTHX_ struct coro_transfer_args *ta) 1979prepare_cede (pTHX_ struct coro_transfer_args *ta)
1859{ 1980{
1860 api_ready (aTHX_ coro_current); 1981 api_ready (aTHX_ coro_current);
1861 prepare_schedule (aTHX_ ta); 1982 prepare_schedule (aTHX_ ta);
1862} 1983}
1863 1984
1864INLINE void 1985ecb_inline void
1865prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1986prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1866{ 1987{
1867 SV *prev = SvRV (coro_current); 1988 SV *prev = SvRV (coro_current);
1868 1989
1869 if (coro_nready) 1990 if (coro_nready)
… …
1899{ 2020{
1900 struct coro_transfer_args ta; 2021 struct coro_transfer_args ta;
1901 2022
1902 prepare_cede (aTHX_ &ta); 2023 prepare_cede (aTHX_ &ta);
1903 2024
1904 if (expect_true (ta.prev != ta.next)) 2025 if (ecb_expect_true (ta.prev != ta.next))
1905 { 2026 {
1906 TRANSFER (ta, 1); 2027 TRANSFER (ta, 1);
1907 return 1; 2028 return 1;
1908 } 2029 }
1909 else 2030 else
… …
1952 coro->slot->runops = RUNOPS_DEFAULT; 2073 coro->slot->runops = RUNOPS_DEFAULT;
1953 } 2074 }
1954} 2075}
1955 2076
1956static void 2077static void
2078coro_push_av (pTHX_ AV *av, I32 gimme_v)
2079{
2080 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2081 {
2082 dSP;
2083
2084 if (gimme_v == G_SCALAR)
2085 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2086 else
2087 {
2088 int i;
2089 EXTEND (SP, AvFILLp (av) + 1);
2090
2091 for (i = 0; i <= AvFILLp (av); ++i)
2092 PUSHs (AvARRAY (av)[i]);
2093 }
2094
2095 PUTBACK;
2096 }
2097}
2098
2099static void
2100coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2101{
2102 if (!coro->on_destroy)
2103 coro->on_destroy = newAV ();
2104
2105 av_push (coro->on_destroy, cb);
2106}
2107
2108static void
2109slf_destroy_join (pTHX_ struct CoroSLF *frame)
2110{
2111 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2112}
2113
2114static int
2115slf_check_join (pTHX_ struct CoroSLF *frame)
2116{
2117 struct coro *coro = (struct coro *)frame->data;
2118
2119 if (!coro->status)
2120 return 1;
2121
2122 frame->destroy = 0;
2123
2124 coro_push_av (aTHX_ coro->status, GIMME_V);
2125
2126 SvREFCNT_dec ((SV *)coro->hv);
2127
2128 return 0;
2129}
2130
2131static void
2132slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2133{
2134 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2135
2136 if (items > 1)
2137 croak ("join called with too many arguments");
2138
2139 if (coro->status)
2140 frame->prepare = prepare_nop;
2141 else
2142 {
2143 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2144 frame->prepare = prepare_schedule;
2145 }
2146
2147 frame->check = slf_check_join;
2148 frame->destroy = slf_destroy_join;
2149 frame->data = (void *)coro;
2150 SvREFCNT_inc (coro->hv);
2151}
2152
2153static void
1957coro_call_on_destroy (pTHX_ struct coro *coro) 2154coro_call_on_destroy (pTHX_ struct coro *coro)
1958{ 2155{
1959 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2156 AV *od = coro->on_destroy;
1960 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1961 2157
1962 if (on_destroyp) 2158 if (!od)
1963 { 2159 return;
1964 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1965 2160
2161 coro->on_destroy = 0;
2162 sv_2mortal ((SV *)od);
2163
1966 while (AvFILLp (on_destroy) >= 0) 2164 while (AvFILLp (od) >= 0)
2165 {
2166 SV *cb = sv_2mortal (av_pop (od));
2167
2168 /* coro hv's (and only hv's at the moment) are supported as well */
2169 if (SvSTATEhv_p (aTHX_ cb))
2170 api_ready (aTHX_ cb);
2171 else
1967 { 2172 {
1968 dSP; /* don't disturb outer sp */ 2173 dSP; /* don't disturb outer sp */
1969 SV *cb = av_pop (on_destroy);
1970
1971 PUSHMARK (SP); 2174 PUSHMARK (SP);
1972 2175
1973 if (statusp) 2176 if (coro->status)
1974 { 2177 {
1975 int i; 2178 PUTBACK;
1976 AV *status = (AV *)SvRV (*statusp); 2179 coro_push_av (aTHX_ coro->status, G_ARRAY);
1977 EXTEND (SP, AvFILLp (status) + 1); 2180 SPAGAIN;
1978
1979 for (i = 0; i <= AvFILLp (status); ++i)
1980 PUSHs (AvARRAY (status)[i]);
1981 } 2181 }
1982 2182
1983 PUTBACK; 2183 PUTBACK;
1984 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2184 call_sv (cb, G_VOID | G_DISCARD);
1985 } 2185 }
1986 } 2186 }
1987} 2187}
1988 2188
1989static void 2189static void
1990slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2190coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1991{ 2191{
1992 int i; 2192 AV *av;
1993 HV *hv = (HV *)SvRV (coro_current); 2193
1994 AV *av = newAV (); 2194 if (coro->status)
2195 {
2196 av = coro->status;
2197 av_clear (av);
2198 }
2199 else
2200 av = coro->status = newAV ();
1995 2201
1996 /* items are actually not so common, so optimise for this case */ 2202 /* items are actually not so common, so optimise for this case */
1997 if (items) 2203 if (items)
1998 { 2204 {
2205 int i;
2206
1999 av_extend (av, items - 1); 2207 av_extend (av, items - 1);
2000 2208
2001 for (i = 0; i < items; ++i) 2209 for (i = 0; i < items; ++i)
2002 av_push (av, SvREFCNT_inc_NN (arg [i])); 2210 av_push (av, SvREFCNT_inc_NN (arg [i]));
2003 } 2211 }
2212}
2004 2213
2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2214static void
2006 2215slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2216{
2007 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2217 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2008 api_ready (aTHX_ sv_manager); 2218 api_ready (aTHX_ sv_manager);
2009 2219
2010 frame->prepare = prepare_schedule; 2220 frame->prepare = prepare_schedule;
2011 frame->check = slf_check_repeat; 2221 frame->check = slf_check_repeat;
2012 2222
2013 /* as a minor optimisation, we could unwind all stacks here */ 2223 /* as a minor optimisation, we could unwind all stacks here */
2014 /* but that puts extra pressure on pp_slf, and is not worth much */ 2224 /* but that puts extra pressure on pp_slf, and is not worth much */
2015 /*coro_unwind_stacks (aTHX);*/ 2225 /*coro_unwind_stacks (aTHX);*/
2226}
2227
2228static void
2229slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2230{
2231 HV *coro_hv = (HV *)SvRV (coro_current);
2232
2233 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2234 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2235}
2236
2237static void
2238slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2239{
2240 HV *coro_hv;
2241 struct coro *coro;
2242
2243 if (items <= 0)
2244 croak ("Coro::cancel called without coro object,");
2245
2246 coro = SvSTATE (arg [0]);
2247 coro_hv = coro->hv;
2248
2249 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2250
2251 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2252 {
2253 /* coro currently busy cancelling something, so just notify it */
2254 coro->slf_frame.data = (void *)coro;
2255
2256 frame->prepare = prepare_nop;
2257 frame->check = slf_check_nop;
2258 }
2259 else if (coro_hv == (HV *)SvRV (coro_current))
2260 {
2261 /* cancelling the current coro is allowed, and equals terminate */
2262 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2263 }
2264 else
2265 {
2266 struct coro *self = SvSTATE_current;
2267
2268 if (!self)
2269 croak ("Coro::cancel called outside of thread content,");
2270
2271 /* otherwise we cancel directly, purely for speed reasons
2272 * unfortunately, this requires some magic trickery, as
2273 * somebody else could cancel us, so we have to fight the cancellation.
2274 * this is ugly, and hopefully fully worth the extra speed.
2275 * besides, I can't get the slow-but-safe version working...
2276 */
2277 slf_frame.data = 0;
2278 self->flags |= CF_NOCANCEL;
2279 coro_state_destroy (aTHX_ coro);
2280 self->flags &= ~CF_NOCANCEL;
2281
2282 if (slf_frame.data)
2283 {
2284 /* while we were busy we have been cancelled, so terminate */
2285 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2286 }
2287 else
2288 {
2289 frame->prepare = prepare_nop;
2290 frame->check = slf_check_nop;
2291 }
2292 }
2293}
2294
2295static int
2296slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2297{
2298 frame->prepare = 0;
2299 coro_unwind_stacks (aTHX);
2300
2301 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2302
2303 return 1;
2304}
2305
2306static int
2307safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2308{
2309 if (coro->cctx)
2310 croak ("coro inside C callback, unable to cancel at this time, caught");
2311
2312 if (coro->flags & CF_NEW)
2313 {
2314 coro_set_status (aTHX_ coro, arg, items);
2315 coro_state_destroy (aTHX_ coro);
2316 }
2317 else
2318 {
2319 if (!coro->slf_frame.prepare)
2320 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2321
2322 slf_destroy (aTHX_ coro);
2323
2324 coro_set_status (aTHX_ coro, arg, items);
2325 coro->slf_frame.prepare = prepare_nop;
2326 coro->slf_frame.check = slf_check_safe_cancel;
2327
2328 api_ready (aTHX_ (SV *)coro->hv);
2329 }
2330
2331 return 1;
2016} 2332}
2017 2333
2018/*****************************************************************************/ 2334/*****************************************************************************/
2019/* async pool handler */ 2335/* async pool handler */
2020 2336
… …
2051slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2367slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2052{ 2368{
2053 HV *hv = (HV *)SvRV (coro_current); 2369 HV *hv = (HV *)SvRV (coro_current);
2054 struct coro *coro = SvSTATE_hv ((SV *)hv); 2370 struct coro *coro = SvSTATE_hv ((SV *)hv);
2055 2371
2056 if (expect_true (coro->saved_deffh)) 2372 if (ecb_expect_true (coro->saved_deffh))
2057 { 2373 {
2058 /* subsequent iteration */ 2374 /* subsequent iteration */
2059 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2375 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2060 coro->saved_deffh = 0; 2376 coro->saved_deffh = 0;
2061 2377
2062 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2378 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2063 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2379 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2064 { 2380 {
2065 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2381 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2066 coro->invoke_av = newAV (); 2382 return;
2067
2068 frame->prepare = prepare_nop;
2069 } 2383 }
2070 else 2384 else
2071 { 2385 {
2072 av_clear (GvAV (PL_defgv)); 2386 av_clear (GvAV (PL_defgv));
2073 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2387 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2123 2437
2124static int 2438static int
2125slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2439slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2126{ 2440{
2127 SV *data = (SV *)frame->data; 2441 SV *data = (SV *)frame->data;
2128 2442
2129 if (CORO_THROW) 2443 if (CORO_THROW)
2130 return 0; 2444 return 0;
2131 2445
2132 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2446 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2133 return 1; 2447 return 1;
… …
2169 cb = sv_2mortal (coro->rouse_cb); 2483 cb = sv_2mortal (coro->rouse_cb);
2170 coro->rouse_cb = 0; 2484 coro->rouse_cb = 0;
2171 } 2485 }
2172 2486
2173 if (!SvROK (cb) 2487 if (!SvROK (cb)
2174 || SvTYPE (SvRV (cb)) != SVt_PVCV 2488 || SvTYPE (SvRV (cb)) != SVt_PVCV
2175 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2489 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2176 croak ("Coro::rouse_wait called with illegal callback argument,"); 2490 croak ("Coro::rouse_wait called with illegal callback argument,");
2177 2491
2178 { 2492 {
2179 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2493 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2296static void 2610static void
2297slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2611slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2298{ 2612{
2299 frame->prepare = prepare_cede_notself; 2613 frame->prepare = prepare_cede_notself;
2300 frame->check = slf_check_nop; 2614 frame->check = slf_check_nop;
2615}
2616
2617/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2618static void
2619slf_destroy (pTHX_ struct coro *coro)
2620{
2621 struct CoroSLF frame = coro->slf_frame;
2622
2623 /*
2624 * The on_destroy below most likely is from an SLF call.
2625 * Since by definition the SLF call will not finish when we destroy
2626 * the coro, we will have to force-finish it here, otherwise
2627 * cleanup functions cannot call SLF functions.
2628 */
2629 coro->slf_frame.prepare = 0;
2630
2631 /* this callback is reserved for slf functions needing to do cleanup */
2632 if (frame.destroy && frame.prepare && !PL_dirty)
2633 frame.destroy (aTHX_ &frame);
2301} 2634}
2302 2635
2303/* 2636/*
2304 * these not obviously related functions are all rolled into one 2637 * these not obviously related functions are all rolled into one
2305 * function to increase chances that they all will call transfer with the same 2638 * function to increase chances that they all will call transfer with the same
… …
2312 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2645 I32 checkmark; /* mark SP to see how many elements check has pushed */
2313 2646
2314 /* set up the slf frame, unless it has already been set-up */ 2647 /* set up the slf frame, unless it has already been set-up */
2315 /* the latter happens when a new coro has been started */ 2648 /* the latter happens when a new coro has been started */
2316 /* or when a new cctx was attached to an existing coroutine */ 2649 /* or when a new cctx was attached to an existing coroutine */
2317 if (expect_true (!slf_frame.prepare)) 2650 if (ecb_expect_true (!slf_frame.prepare))
2318 { 2651 {
2319 /* first iteration */ 2652 /* first iteration */
2320 dSP; 2653 dSP;
2321 SV **arg = PL_stack_base + TOPMARK + 1; 2654 SV **arg = PL_stack_base + TOPMARK + 1;
2322 int items = SP - arg; /* args without function object */ 2655 int items = SP - arg; /* args without function object */
… …
2363 while (slf_frame.check (aTHX_ &slf_frame)); 2696 while (slf_frame.check (aTHX_ &slf_frame));
2364 2697
2365 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2698 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2366 2699
2367 /* exception handling */ 2700 /* exception handling */
2368 if (expect_false (CORO_THROW)) 2701 if (ecb_expect_false (CORO_THROW))
2369 { 2702 {
2370 SV *exception = sv_2mortal (CORO_THROW); 2703 SV *exception = sv_2mortal (CORO_THROW);
2371 2704
2372 CORO_THROW = 0; 2705 CORO_THROW = 0;
2373 sv_setsv (ERRSV, exception); 2706 sv_setsv (ERRSV, exception);
2374 croak (0); 2707 croak (0);
2375 } 2708 }
2376 2709
2377 /* return value handling - mostly like entersub */ 2710 /* return value handling - mostly like entersub */
2378 /* make sure we put something on the stack in scalar context */ 2711 /* make sure we put something on the stack in scalar context */
2379 if (GIMME_V == G_SCALAR) 2712 if (GIMME_V == G_SCALAR
2713 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2380 { 2714 {
2381 dSP; 2715 dSP;
2382 SV **bot = PL_stack_base + checkmark; 2716 SV **bot = PL_stack_base + checkmark;
2383 2717
2384 if (sp == bot) /* too few, push undef */ 2718 if (sp == bot) /* too few, push undef */
2385 bot [1] = &PL_sv_undef; 2719 bot [1] = &PL_sv_undef;
2386 else if (sp != bot + 1) /* too many, take last one */ 2720 else /* too many, take last one */
2387 bot [1] = *sp; 2721 bot [1] = *sp;
2388 2722
2389 SP = bot + 1; 2723 SP = bot + 1;
2390 2724
2391 PUTBACK; 2725 PUTBACK;
… …
2498{ 2832{
2499 PerlIOBuf base; 2833 PerlIOBuf base;
2500 NV next, every; 2834 NV next, every;
2501} PerlIOCede; 2835} PerlIOCede;
2502 2836
2503static IV 2837static IV ecb_cold
2504PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2838PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2505{ 2839{
2506 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2840 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2507 2841
2508 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2842 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2509 self->next = nvtime () + self->every; 2843 self->next = nvtime () + self->every;
2510 2844
2511 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2845 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2512} 2846}
2513 2847
2514static SV * 2848static SV * ecb_cold
2515PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2849PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2516{ 2850{
2517 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2851 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2518 2852
2519 return newSVnv (self->every); 2853 return newSVnv (self->every);
… …
2631 SvREFCNT_dec (cb); 2965 SvREFCNT_dec (cb);
2632 } 2966 }
2633} 2967}
2634 2968
2635static void 2969static void
2636coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2970coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2637{ 2971{
2638 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2972 /* call $sem->adjust (0) to possibly wake up some other waiters */
2639 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2973 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2640} 2974}
2641 2975
2642static int 2976static int
2643slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2977slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2644{ 2978{
2645 AV *av = (AV *)frame->data; 2979 AV *av = (AV *)frame->data;
2646 SV *count_sv = AvARRAY (av)[0]; 2980 SV *count_sv = AvARRAY (av)[0];
2981 SV *coro_hv = SvRV (coro_current);
2982
2983 frame->destroy = 0;
2647 2984
2648 /* if we are about to throw, don't actually acquire the lock, just throw */ 2985 /* if we are about to throw, don't actually acquire the lock, just throw */
2649 if (CORO_THROW) 2986 if (ecb_expect_false (CORO_THROW))
2987 {
2988 /* we still might be responsible for the semaphore, so wake up others */
2989 coro_semaphore_adjust (aTHX_ av, 0);
2990
2650 return 0; 2991 return 0;
2992 }
2651 else if (SvIVX (count_sv) > 0) 2993 else if (SvIVX (count_sv) > 0)
2652 { 2994 {
2653 SvSTATE_current->on_destroy = 0;
2654
2655 if (acquire) 2995 if (acquire)
2656 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2996 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2657 else 2997 else
2658 coro_semaphore_adjust (aTHX_ av, 0); 2998 coro_semaphore_adjust (aTHX_ av, 0);
2659 2999
… …
2663 { 3003 {
2664 int i; 3004 int i;
2665 /* if we were woken up but can't down, we look through the whole */ 3005 /* if we were woken up but can't down, we look through the whole */
2666 /* waiters list and only add us if we aren't in there already */ 3006 /* waiters list and only add us if we aren't in there already */
2667 /* this avoids some degenerate memory usage cases */ 3007 /* this avoids some degenerate memory usage cases */
2668 3008 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2669 for (i = 1; i <= AvFILLp (av); ++i)
2670 if (AvARRAY (av)[i] == SvRV (coro_current)) 3009 if (AvARRAY (av)[i] == coro_hv)
2671 return 1; 3010 return 1;
2672 3011
2673 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3012 av_push (av, SvREFCNT_inc (coro_hv));
2674 return 1; 3013 return 1;
2675 } 3014 }
2676} 3015}
2677 3016
2678static int 3017static int
… …
2701 { 3040 {
2702 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3041 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2703 3042
2704 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3043 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2705 frame->prepare = prepare_schedule; 3044 frame->prepare = prepare_schedule;
2706
2707 /* to avoid race conditions when a woken-up coro gets terminated */ 3045 /* to avoid race conditions when a woken-up coro gets terminated */
2708 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3046 /* we arrange for a temporary on_destroy that calls adjust (0) */
2709 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3047 frame->destroy = coro_semaphore_destroy;
2710 } 3048 }
2711} 3049}
2712 3050
2713static void 3051static void
2714slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3052slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2883 /* it quickly returns */ 3221 /* it quickly returns */
2884 if (CORO_THROW) 3222 if (CORO_THROW)
2885 return 0; 3223 return 0;
2886 3224
2887 /* one element that is an RV? repeat! */ 3225 /* one element that is an RV? repeat! */
2888 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3226 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2889 return 1; 3227 return 1;
2890 3228
2891 /* restore status */ 3229 /* restore status */
2892 { 3230 {
2893 SV *data_sv = av_pop (state); 3231 SV *data_sv = av_pop (state);
… …
2932 dSP; 3270 dSP;
2933 3271
2934 static SV *prio_cv; 3272 static SV *prio_cv;
2935 static SV *prio_sv; 3273 static SV *prio_sv;
2936 3274
2937 if (expect_false (!prio_cv)) 3275 if (ecb_expect_false (!prio_cv))
2938 { 3276 {
2939 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3277 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2940 prio_sv = newSViv (0); 3278 prio_sv = newSViv (0);
2941 } 3279 }
2942 3280
… …
3048 } 3386 }
3049 3387
3050 return coro_sv; 3388 return coro_sv;
3051} 3389}
3052 3390
3391#ifndef __cplusplus
3392ecb_cold XS(boot_Coro__State);
3393#endif
3394
3395#if CORO_JIT
3396
3397static void ecb_noinline ecb_cold
3398pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3399{
3400 dSP;
3401 AV *av = newAV ();
3402
3403 av_store (av, 3, newSVuv (d));
3404 av_store (av, 2, newSVuv (c));
3405 av_store (av, 1, newSVuv (b));
3406 av_store (av, 0, newSVuv (a));
3407
3408 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3409
3410 PUTBACK;
3411}
3412
3413static void ecb_noinline ecb_cold
3414jit_init (pTHX)
3415{
3416 dSP;
3417 SV *load, *save;
3418 char *map_base;
3419 char *load_ptr, *save_ptr;
3420 STRLEN load_len, save_len, map_len;
3421 int count;
3422
3423 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3424
3425 PUSHMARK (SP);
3426 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3427 #include "state.h"
3428 count = call_pv ("Coro::State::_jit", G_ARRAY);
3429 SPAGAIN;
3430
3431 save = POPs; save_ptr = SvPVbyte (save, save_len);
3432 load = POPs; load_ptr = SvPVbyte (load, load_len);
3433
3434 map_len = load_len + save_len + 16;
3435
3436 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3437
3438 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3439
3440 load_perl_slots = (load_save_perl_slots_type)map_base;
3441 memcpy (map_base, load_ptr, load_len);
3442
3443 map_base += (load_len + 15) & ~15;
3444
3445 save_perl_slots = (load_save_perl_slots_type)map_base;
3446 memcpy (map_base, save_ptr, save_len);
3447
3448 /* we are good citizens and try to make the page read-only, so the evil evil */
3449 /* hackers might have it a bit more difficult */
3450 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3451
3452 PUTBACK;
3453 eval_pv ("undef &Coro::State::_jit", 1);
3454}
3455
3456#endif
3457
3053MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3458MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3054 3459
3055PROTOTYPES: DISABLE 3460PROTOTYPES: DISABLE
3056 3461
3057BOOT: 3462BOOT:
3058{ 3463{
3464#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3465#include "state.h"
3059#ifdef USE_ITHREADS 3466#ifdef USE_ITHREADS
3060# if CORO_PTHREAD 3467# if CORO_PTHREAD
3061 coro_thx = PERL_GET_CONTEXT; 3468 coro_thx = PERL_GET_CONTEXT;
3062# endif 3469# endif
3063#endif 3470#endif
3064 BOOT_PAGESIZE; 3471 /* perl defines these to check for existance first, but why it doesn't */
3472 /* just create them one at init time is not clear to me, except for */
3473 /* programs trying to delete them, but... */
3474 /* anyway, we declare this as invalid and make sure they are initialised here */
3475 DEFSV;
3476 ERRSV;
3065 3477
3066 cctx_current = cctx_new_empty (); 3478 cctx_current = cctx_new_empty ();
3067 3479
3068 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3480 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3069 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3481 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3109 coroapi.prepare_nop = prepare_nop; 3521 coroapi.prepare_nop = prepare_nop;
3110 coroapi.prepare_schedule = prepare_schedule; 3522 coroapi.prepare_schedule = prepare_schedule;
3111 coroapi.prepare_cede = prepare_cede; 3523 coroapi.prepare_cede = prepare_cede;
3112 coroapi.prepare_cede_notself = prepare_cede_notself; 3524 coroapi.prepare_cede_notself = prepare_cede_notself;
3113 3525
3114 { 3526 time_init (aTHX);
3115 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3116
3117 if (!svp) croak ("Time::HiRes is required");
3118 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3119
3120 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3121
3122 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3123 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3124 }
3125 3527
3126 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3528 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3529#if CORO_JIT
3530 PUTBACK;
3531 jit_init (aTHX);
3532 SPAGAIN;
3533#endif
3127} 3534}
3128 3535
3129SV * 3536SV *
3130new (SV *klass, ...) 3537new (SV *klass, ...)
3131 ALIAS: 3538 ALIAS:
… …
3138void 3545void
3139transfer (...) 3546transfer (...)
3140 PROTOTYPE: $$ 3547 PROTOTYPE: $$
3141 CODE: 3548 CODE:
3142 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3549 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3143
3144bool
3145_destroy (SV *coro_sv)
3146 CODE:
3147 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3148 OUTPUT:
3149 RETVAL
3150
3151void
3152_exit (int code)
3153 PROTOTYPE: $
3154 CODE:
3155 _exit (code);
3156 3550
3157SV * 3551SV *
3158clone (Coro::State coro) 3552clone (Coro::State coro)
3159 CODE: 3553 CODE:
3160{ 3554{
… …
3215void 3609void
3216list () 3610list ()
3217 PROTOTYPE: 3611 PROTOTYPE:
3218 PPCODE: 3612 PPCODE:
3219{ 3613{
3220 struct coro *coro; 3614 struct coro *coro;
3221 for (coro = coro_first; coro; coro = coro->next) 3615 for (coro = coro_first; coro; coro = coro->next)
3222 if (coro->hv) 3616 if (coro->hv)
3223 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3617 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3224} 3618}
3225 3619
… …
3230 CODE: 3624 CODE:
3231{ 3625{
3232 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3626 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3233 { 3627 {
3234 struct coro *current = SvSTATE_current; 3628 struct coro *current = SvSTATE_current;
3629 struct CoroSLF slf_save;
3235 3630
3236 if (current != coro) 3631 if (current != coro)
3237 { 3632 {
3238 PUTBACK; 3633 PUTBACK;
3239 save_perl (aTHX_ current); 3634 save_perl (aTHX_ current);
3240 load_perl (aTHX_ coro); 3635 load_perl (aTHX_ coro);
3636 /* the coro is most likely in an active SLF call.
3637 * while not strictly required (the code we execute is
3638 * not allowed to call any SLF functions), it's cleaner
3639 * to reinitialise the slf_frame and restore it later.
3640 * This might one day allow us to actually do SLF calls
3641 * from code executed here.
3642 */
3643 slf_save = slf_frame;
3644 slf_frame.prepare = 0;
3241 SPAGAIN; 3645 SPAGAIN;
3242 } 3646 }
3243 3647
3244 PUSHSTACK; 3648 PUSHSTACK;
3245 3649
… …
3255 SPAGAIN; 3659 SPAGAIN;
3256 3660
3257 if (current != coro) 3661 if (current != coro)
3258 { 3662 {
3259 PUTBACK; 3663 PUTBACK;
3664 slf_frame = slf_save;
3260 save_perl (aTHX_ coro); 3665 save_perl (aTHX_ coro);
3261 load_perl (aTHX_ current); 3666 load_perl (aTHX_ current);
3262 SPAGAIN; 3667 SPAGAIN;
3263 } 3668 }
3264 } 3669 }
… …
3269 PROTOTYPE: $ 3674 PROTOTYPE: $
3270 ALIAS: 3675 ALIAS:
3271 is_ready = CF_READY 3676 is_ready = CF_READY
3272 is_running = CF_RUNNING 3677 is_running = CF_RUNNING
3273 is_new = CF_NEW 3678 is_new = CF_NEW
3274 is_destroyed = CF_DESTROYED 3679 is_destroyed = CF_ZOMBIE
3680 is_zombie = CF_ZOMBIE
3275 is_suspended = CF_SUSPENDED 3681 is_suspended = CF_SUSPENDED
3276 CODE: 3682 CODE:
3277 RETVAL = boolSV (coro->flags & ix); 3683 RETVAL = boolSV (coro->flags & ix);
3278 OUTPUT: 3684 OUTPUT:
3279 RETVAL 3685 RETVAL
3280 3686
3281void 3687void
3282throw (Coro::State self, SV *exception = &PL_sv_undef) 3688throw (SV *self, SV *exception = &PL_sv_undef)
3283 PROTOTYPE: $;$ 3689 PROTOTYPE: $;$
3284 CODE: 3690 CODE:
3285{ 3691{
3692 struct coro *coro = SvSTATE (self);
3286 struct coro *current = SvSTATE_current; 3693 struct coro *current = SvSTATE_current;
3287 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3694 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3288 SvREFCNT_dec (*exceptionp); 3695 SvREFCNT_dec (*exceptionp);
3289 SvGETMAGIC (exception); 3696 SvGETMAGIC (exception);
3290 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3697 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3698
3699 api_ready (aTHX_ self);
3291} 3700}
3292 3701
3293void 3702void
3294api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3703api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3295 PROTOTYPE: $;$ 3704 PROTOTYPE: $;$
… …
3350 3759
3351void 3760void
3352cancel (Coro::State self) 3761cancel (Coro::State self)
3353 CODE: 3762 CODE:
3354 coro_state_destroy (aTHX_ self); 3763 coro_state_destroy (aTHX_ self);
3355 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3356
3357 3764
3358SV * 3765SV *
3359enable_times (int enabled = enable_times) 3766enable_times (int enabled = enable_times)
3360 CODE: 3767 CODE:
3361{ 3768{
… …
3374 3781
3375void 3782void
3376times (Coro::State self) 3783times (Coro::State self)
3377 PPCODE: 3784 PPCODE:
3378{ 3785{
3379 struct coro *current = SvSTATE (coro_current); 3786 struct coro *current = SvSTATE (coro_current);
3380 3787
3381 if (expect_false (current == self)) 3788 if (ecb_expect_false (current == self))
3382 { 3789 {
3383 coro_times_update (); 3790 coro_times_update ();
3384 coro_times_add (SvSTATE (coro_current)); 3791 coro_times_add (SvSTATE (coro_current));
3385 } 3792 }
3386 3793
3387 EXTEND (SP, 2); 3794 EXTEND (SP, 2);
3388 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3795 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3389 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3796 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3390 3797
3391 if (expect_false (current == self)) 3798 if (ecb_expect_false (current == self))
3392 coro_times_sub (SvSTATE (coro_current)); 3799 coro_times_sub (SvSTATE (coro_current));
3393} 3800}
3394 3801
3395void 3802void
3396swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3803swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3417BOOT: 3824BOOT:
3418{ 3825{
3419 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3826 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3420 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3827 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3421 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3828 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3422 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3423 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3829 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3424 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3830 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3425 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3831 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3426 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3832 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3427 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3833 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3428 3834
3429 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3835 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3430 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3836 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3431 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3837 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3432 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3838 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3433 3839
3434 coro_stash = gv_stashpv ("Coro", TRUE); 3840 coro_stash = gv_stashpv ("Coro", TRUE);
3435 3841
3436 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3842 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3437 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3843 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3438 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3844 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3466 api_ready (aTHX_ RETVAL); 3872 api_ready (aTHX_ RETVAL);
3467 OUTPUT: 3873 OUTPUT:
3468 RETVAL 3874 RETVAL
3469 3875
3470void 3876void
3877_destroy (Coro::State coro)
3878 CODE:
3879 /* used by the manager thread */
3880 coro_state_destroy (aTHX_ coro);
3881
3882void
3883on_destroy (Coro::State coro, SV *cb)
3884 CODE:
3885 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3886
3887void
3888join (...)
3889 CODE:
3890 CORO_EXECUTE_SLF_XS (slf_init_join);
3891
3892void
3471terminate (...) 3893terminate (...)
3472 CODE: 3894 CODE:
3473 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3895 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3896
3897void
3898cancel (...)
3899 CODE:
3900 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3901
3902int
3903safe_cancel (Coro::State self, ...)
3904 C_ARGS: aTHX_ self, &ST (1), items - 1
3474 3905
3475void 3906void
3476schedule (...) 3907schedule (...)
3477 CODE: 3908 CODE:
3478 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3909 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3635 on_leave = 1 4066 on_leave = 1
3636 PROTOTYPE: & 4067 PROTOTYPE: &
3637 CODE: 4068 CODE:
3638{ 4069{
3639 struct coro *coro = SvSTATE_current; 4070 struct coro *coro = SvSTATE_current;
3640 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4071 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3641 4072
3642 block = s_get_cv_croak (block); 4073 block = s_get_cv_croak (block);
3643 4074
3644 if (!*avp) 4075 if (!*avp)
3645 *avp = newAV (); 4076 *avp = newAV ();
… …
3665 4096
3666SV * 4097SV *
3667new (SV *klass, SV *count = 0) 4098new (SV *klass, SV *count = 0)
3668 CODE: 4099 CODE:
3669{ 4100{
3670 int semcnt = 1; 4101 int semcnt = 1;
3671 4102
3672 if (count) 4103 if (count)
3673 { 4104 {
3674 SvGETMAGIC (count); 4105 SvGETMAGIC (count);
3675 4106
… …
3735 XSRETURN_NO; 4166 XSRETURN_NO;
3736} 4167}
3737 4168
3738void 4169void
3739waiters (SV *self) 4170waiters (SV *self)
3740 PPCODE: 4171 PPCODE:
3741{ 4172{
3742 AV *av = (AV *)SvRV (self); 4173 AV *av = (AV *)SvRV (self);
3743 int wcount = AvFILLp (av) + 1 - 1; 4174 int wcount = AvFILLp (av) + 1 - 1;
3744 4175
3745 if (GIMME_V == G_SCALAR) 4176 if (GIMME_V == G_SCALAR)
… …
3754} 4185}
3755 4186
3756MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4187MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3757 4188
3758void 4189void
3759_may_delete (SV *sem, int count, int extra_refs) 4190_may_delete (SV *sem, int count, unsigned int extra_refs)
3760 PPCODE: 4191 PPCODE:
3761{ 4192{
3762 AV *av = (AV *)SvRV (sem); 4193 AV *av = (AV *)SvRV (sem);
3763 4194
3764 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4195 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3765 && AvFILLp (av) == 0 /* no waiters, just count */ 4196 && AvFILLp (av) == 0 /* no waiters, just count */
3766 && SvIV (AvARRAY (av)[0]) == count) 4197 && SvIV (AvARRAY (av)[0]) == count)
3767 XSRETURN_YES; 4198 XSRETURN_YES;
… …
3788 4219
3789void 4220void
3790broadcast (SV *self) 4221broadcast (SV *self)
3791 CODE: 4222 CODE:
3792{ 4223{
3793 AV *av = (AV *)SvRV (self); 4224 AV *av = (AV *)SvRV (self);
3794 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4225 coro_signal_wake (aTHX_ av, AvFILLp (av));
3795} 4226}
3796 4227
3797void 4228void
3798send (SV *self) 4229send (SV *self)
… …
3806 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4237 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3807} 4238}
3808 4239
3809IV 4240IV
3810awaited (SV *self) 4241awaited (SV *self)
3811 CODE: 4242 CODE:
3812 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4243 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3813 OUTPUT: 4244 OUTPUT:
3814 RETVAL 4245 RETVAL
3815 4246
3816 4247
… …
3821 4252
3822void 4253void
3823_schedule (...) 4254_schedule (...)
3824 CODE: 4255 CODE:
3825{ 4256{
3826 static int incede; 4257 static int incede;
3827 4258
3828 api_cede_notself (aTHX); 4259 api_cede_notself (aTHX);
3829 4260
3830 ++incede; 4261 ++incede;
3831 while (coro_nready >= incede && api_cede (aTHX)) 4262 while (coro_nready >= incede && api_cede (aTHX))
… …
3875 { 4306 {
3876 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4307 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3877 coro_old_pp_sselect = 0; 4308 coro_old_pp_sselect = 0;
3878 } 4309 }
3879 4310
4311MODULE = Coro::State PACKAGE = Coro::Util
4312
4313void
4314_exit (int code)
4315 CODE:
4316 _exit (code);
4317
4318NV
4319time ()
4320 CODE:
4321 RETVAL = nvtime (aTHX);
4322 OUTPUT:
4323 RETVAL
4324
4325NV
4326gettimeofday ()
4327 PPCODE:
4328{
4329 UV tv [2];
4330 u2time (aTHX_ tv);
4331 EXTEND (SP, 2);
4332 PUSHs (sv_2mortal (newSVuv (tv [0])));
4333 PUSHs (sv_2mortal (newSVuv (tv [1])));
4334}
4335

Diff Legend

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