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.391 by root, Thu Mar 31 04:24:19 2011 UTC vs.
Revision 1.442 by root, Tue Mar 4 06:13:24 2014 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
29#endif
30
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
48/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
49/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
50#if PERL_VERSION_ATLEAST(5,19,0)
51# define SVt_BIND SVt_IV
24#endif 52#endif
25 53
26#if defined(_WIN32) 54#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY 55# undef HAS_GETTIMEOFDAY
28# undef setjmp 56# undef setjmp
… …
31# define setjmp _setjmp /* deep magic */ 59# define setjmp _setjmp /* deep magic */
32#else 60#else
33# include <inttypes.h> /* most portable stdint.h */ 61# include <inttypes.h> /* most portable stdint.h */
34#endif 62#endif
35 63
36#ifdef HAVE_MMAP
37# include <unistd.h>
38# include <sys/mman.h>
39# ifndef MAP_ANONYMOUS
40# ifdef MAP_ANON
41# define MAP_ANONYMOUS MAP_ANON
42# else
43# undef HAVE_MMAP
44# endif
45# endif
46# include <limits.h>
47# ifndef PAGESIZE
48# define PAGESIZE pagesize
49# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
50static long pagesize;
51# else
52# define BOOT_PAGESIZE (void)0
53# endif
54#else
55# define PAGESIZE 0
56# define BOOT_PAGESIZE (void)0
57#endif
58
59#if CORO_USE_VALGRIND
60# include <valgrind/valgrind.h>
61#endif
62
63/* the maximum number of idle cctx that will be pooled */ 64/* the maximum number of idle cctx that will be pooled */
64static int cctx_max_idle = 4; 65static int cctx_max_idle = 4;
65 66
66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 67#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
67# undef CORO_STACKGUARD 68# define HAS_SCOPESTACK_NAME 1
68#endif
69
70#ifndef CORO_STACKGUARD
71# define CORO_STACKGUARD 0
72#endif 69#endif
73 70
74/* prefer perl internal functions over our own? */ 71/* prefer perl internal functions over our own? */
75#ifndef CORO_PREFER_PERL_FUNCTIONS 72#ifndef CORO_PREFER_PERL_FUNCTIONS
76# define CORO_PREFER_PERL_FUNCTIONS 0 73# define CORO_PREFER_PERL_FUNCTIONS 0
… …
86# define STACKLEVEL ((void *)&stacklevel) 83# define STACKLEVEL ((void *)&stacklevel)
87#endif 84#endif
88 85
89#define IN_DESTRUCT PL_dirty 86#define IN_DESTRUCT PL_dirty
90 87
91#if __GNUC__ >= 3
92# define attribute(x) __attribute__(x)
93# define expect(expr,value) __builtin_expect ((expr), (value))
94# define INLINE static inline
95#else
96# define attribute(x)
97# define expect(expr,value) (expr)
98# define INLINE static
99#endif
100
101#define expect_false(expr) expect ((expr) != 0, 0)
102#define expect_true(expr) expect ((expr) != 0, 1)
103
104#define NOINLINE attribute ((noinline))
105
106#include "CoroAPI.h" 88#include "CoroAPI.h"
107#define GCoroAPI (&coroapi) /* very sneaky */ 89#define GCoroAPI (&coroapi) /* very sneaky */
108 90
109#ifdef USE_ITHREADS 91#ifdef USE_ITHREADS
110# if CORO_PTHREAD 92# if CORO_PTHREAD
… …
126static void (*u2time)(pTHX_ UV ret[2]); 108static void (*u2time)(pTHX_ UV ret[2]);
127 109
128/* we hijack an hopefully unused CV flag for our purposes */ 110/* we hijack an hopefully unused CV flag for our purposes */
129#define CVf_SLF 0x4000 111#define CVf_SLF 0x4000
130static OP *pp_slf (pTHX); 112static OP *pp_slf (pTHX);
113static void slf_destroy (pTHX_ struct coro *coro);
131 114
132static U32 cctx_gen; 115static U32 cctx_gen;
133static size_t cctx_stacksize = CORO_STACKSIZE; 116static size_t cctx_stacksize = CORO_STACKSIZE;
134static struct CoroAPI coroapi; 117static struct CoroAPI coroapi;
135static AV *main_mainstack; /* used to differentiate between $main and others */ 118static AV *main_mainstack; /* used to differentiate between $main and others */
… …
165static char times_valid; 148static char times_valid;
166 149
167static struct coro_cctx *cctx_first; 150static struct coro_cctx *cctx_first;
168static int cctx_count, cctx_idle; 151static int cctx_count, cctx_idle;
169 152
170enum { 153enum
154{
171 CC_MAPPED = 0x01, 155 CC_MAPPED = 0x01,
172 CC_NOREUSE = 0x02, /* throw this away after tracing */ 156 CC_NOREUSE = 0x02, /* throw this away after tracing */
173 CC_TRACE = 0x04, 157 CC_TRACE = 0x04,
174 CC_TRACE_SUB = 0x08, /* trace sub calls */ 158 CC_TRACE_SUB = 0x08, /* trace sub calls */
175 CC_TRACE_LINE = 0x10, /* trace each statement */ 159 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
180typedef struct coro_cctx 164typedef struct coro_cctx
181{ 165{
182 struct coro_cctx *next; 166 struct coro_cctx *next;
183 167
184 /* the stack */ 168 /* the stack */
185 void *sptr; 169 struct coro_stack stack;
186 size_t ssize;
187 170
188 /* cpu state */ 171 /* cpu state */
189 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 172 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
173#ifndef NDEBUG
190 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 174 JMPENV *idle_te; /* same as idle_sp, but for top_env */
175#endif
191 JMPENV *top_env; 176 JMPENV *top_env;
192 coro_context cctx; 177 coro_context cctx;
193 178
194 U32 gen; 179 U32 gen;
195#if CORO_USE_VALGRIND 180#if CORO_USE_VALGRIND
196 int valgrind_id; 181 int valgrind_id;
197#endif 182#endif
198 unsigned char flags; 183 unsigned char flags;
199} coro_cctx; 184} coro_cctx;
200 185
201coro_cctx *cctx_current; /* the currently running cctx */ 186static coro_cctx *cctx_current; /* the currently running cctx */
202 187
203/*****************************************************************************/ 188/*****************************************************************************/
204 189
190static MGVTBL coro_state_vtbl;
191
205enum { 192enum
193{
206 CF_RUNNING = 0x0001, /* coroutine is running */ 194 CF_RUNNING = 0x0001, /* coroutine is running */
207 CF_READY = 0x0002, /* coroutine is ready */ 195 CF_READY = 0x0002, /* coroutine is ready */
208 CF_NEW = 0x0004, /* has never been switched to */ 196 CF_NEW = 0x0004, /* has never been switched to */
209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 197 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 198 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
199 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
211}; 200};
212 201
213/* the structure where most of the perl state is stored, overlaid on the cxstack */ 202/* the structure where most of the perl state is stored, overlaid on the cxstack */
214typedef struct 203typedef struct
215{ 204{
216 SV *defsv;
217 AV *defav;
218 SV *errsv;
219 SV *irsgv;
220 HV *hinthv;
221#define VAR(name,type) type name; 205 #define VARx(name,expr,type) type name;
222# include "state.h" 206 #include "state.h"
223#undef VAR
224} perl_slots; 207} perl_slots;
225 208
209/* how many context stack entries do we need for perl_slots */
226#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 210#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
227 211
228/* this is a structure representing a perl-level coroutine */ 212/* this is a structure representing a perl-level coroutine */
229struct coro { 213struct coro
214{
230 /* the C coroutine allocated to this perl coroutine, if any */ 215 /* the C coroutine allocated to this perl coroutine, if any */
231 coro_cctx *cctx; 216 coro_cctx *cctx;
232 217
233 /* ready queue */ 218 /* ready queue */
234 struct coro *next_ready; 219 struct coro *next_ready;
… …
236 /* state data */ 221 /* state data */
237 struct CoroSLF slf_frame; /* saved slf frame */ 222 struct CoroSLF slf_frame; /* saved slf frame */
238 AV *mainstack; 223 AV *mainstack;
239 perl_slots *slot; /* basically the saved sp */ 224 perl_slots *slot; /* basically the saved sp */
240 225
241 CV *startcv; /* the CV to execute */ 226 CV *startcv; /* the CV to execute */
242 AV *args; /* data associated with this coroutine (initial args) */ 227 AV *args; /* data associated with this coroutine (initial args) */
243 int refcnt; /* coroutines are refcounted, yes */
244 int flags; /* CF_ flags */ 228 int flags; /* CF_ flags */
245 HV *hv; /* the perl hash associated with this coro, if any */ 229 HV *hv; /* the perl hash associated with this coro, if any */
246 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
247 230
248 /* statistics */ 231 /* statistics */
249 int usecount; /* number of transfers to this coro */ 232 int usecount; /* number of transfers to this coro */
250 233
251 /* coro process data */ 234 /* coro process data */
252 int prio; 235 int prio;
253 SV *except; /* exception to be thrown */ 236 SV *except; /* exception to be thrown */
254 SV *rouse_cb; 237 SV *rouse_cb; /* last rouse callback */
238 AV *on_destroy; /* callbacks or coros to notify on destroy */
239 AV *status; /* the exit status list */
255 240
256 /* async_pool */ 241 /* async_pool */
257 SV *saved_deffh; 242 SV *saved_deffh;
258 SV *invoke_cb; 243 SV *invoke_cb;
259 AV *invoke_av; 244 AV *invoke_av;
… …
275typedef struct coro *Coro__State; 260typedef struct coro *Coro__State;
276typedef struct coro *Coro__State_or_hashref; 261typedef struct coro *Coro__State_or_hashref;
277 262
278/* the following variables are effectively part of the perl context */ 263/* the following variables are effectively part of the perl context */
279/* and get copied between struct coro and these variables */ 264/* and get copied between struct coro and these variables */
280/* the mainr easonw e don't support windows process emulation */ 265/* the main reason we don't support windows process emulation */
281static struct CoroSLF slf_frame; /* the current slf frame */ 266static struct CoroSLF slf_frame; /* the current slf frame */
282 267
283/** Coro ********************************************************************/ 268/** Coro ********************************************************************/
284 269
285#define CORO_PRIO_MAX 3 270#define CORO_PRIO_MAX 3
… …
291 276
292/* for Coro.pm */ 277/* for Coro.pm */
293static SV *coro_current; 278static SV *coro_current;
294static SV *coro_readyhook; 279static SV *coro_readyhook;
295static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 280static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
296static CV *cv_coro_run, *cv_coro_terminate; 281static CV *cv_coro_run;
297static struct coro *coro_first; 282static struct coro *coro_first;
298#define coro_nready coroapi.nready 283#define coro_nready coroapi.nready
284
285/** JIT *********************************************************************/
286
287#if CORO_JIT
288 /* APPLE doesn't have mmap though */
289 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
290 #ifndef CORO_JIT_TYPE
291 #if ECB_AMD64 && CORO_JIT_UNIXY
292 #define CORO_JIT_TYPE "amd64-unix"
293 #elif __i386 && CORO_JIT_UNIXY
294 #define CORO_JIT_TYPE "x86-unix"
295 #endif
296 #endif
297#endif
298
299#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
300 #undef CORO_JIT
301#endif
302
303#if CORO_JIT
304 typedef void (*load_save_perl_slots_type)(perl_slots *);
305 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
306#endif
299 307
300/** Coro::Select ************************************************************/ 308/** Coro::Select ************************************************************/
301 309
302static OP *(*coro_old_pp_sselect) (pTHX); 310static OP *(*coro_old_pp_sselect) (pTHX);
303static SV *coro_select_select; 311static SV *coro_select_select;
… …
319 327
320/** time stuff **************************************************************/ 328/** time stuff **************************************************************/
321 329
322#ifdef HAS_GETTIMEOFDAY 330#ifdef HAS_GETTIMEOFDAY
323 331
324static void 332ecb_inline void
325coro_u2time (pTHX_ UV ret[2]) 333coro_u2time (pTHX_ UV ret[2])
326{ 334{
327 struct timeval tv; 335 struct timeval tv;
328 gettimeofday (&tv, 0); 336 gettimeofday (&tv, 0);
329 337
330 ret [0] = tv.tv_sec; 338 ret [0] = tv.tv_sec;
331 ret [1] = tv.tv_usec; 339 ret [1] = tv.tv_usec;
332} 340}
333 341
334static double 342ecb_inline double
335coro_nvtime () 343coro_nvtime (void)
336{ 344{
337 struct timeval tv; 345 struct timeval tv;
338 gettimeofday (&tv, 0); 346 gettimeofday (&tv, 0);
339 347
340 return tv.tv_sec + tv.tv_usec * 1e-6; 348 return tv.tv_sec + tv.tv_usec * 1e-6;
341} 349}
342 350
343static void 351ecb_inline void
344time_init (pTHX) 352time_init (pTHX)
345{ 353{
346 nvtime = coro_nvtime; 354 nvtime = coro_nvtime;
347 u2time = coro_u2time; 355 u2time = coro_u2time;
348} 356}
349 357
350#else 358#else
351 359
352static void 360ecb_inline void
353time_init (pTHX) 361time_init (pTHX)
354{ 362{
355 SV **svp; 363 SV **svp;
356 364
357 require_pv ("Time/HiRes.pm"); 365 require_pv ("Time/HiRes.pm");
358 366
359 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 367 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
360 368
361 if (!svp) croak ("Time::HiRes is required, but missing."); 369 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
362 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 370 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
363 371
364 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 372 nvtime = INT2PTR (double (*)(), SvIV (*svp));
365 373
366 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0); 374 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
367 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp)); 375 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
… …
369 377
370#endif 378#endif
371 379
372/** lowlevel stuff **********************************************************/ 380/** lowlevel stuff **********************************************************/
373 381
374static SV * 382static SV * ecb_noinline
375coro_get_sv (pTHX_ const char *name, int create) 383coro_get_sv (pTHX_ const char *name, int create)
376{ 384{
377#if PERL_VERSION_ATLEAST (5,10,0) 385#if PERL_VERSION_ATLEAST (5,10,0)
378 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 386 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
379 get_sv (name, create); 387 get_sv (name, create);
380#endif 388#endif
381 return get_sv (name, create); 389 return get_sv (name, create);
382} 390}
383 391
384static AV * 392static AV * ecb_noinline
385coro_get_av (pTHX_ const char *name, int create) 393coro_get_av (pTHX_ const char *name, int create)
386{ 394{
387#if PERL_VERSION_ATLEAST (5,10,0) 395#if PERL_VERSION_ATLEAST (5,10,0)
388 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 396 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
389 get_av (name, create); 397 get_av (name, create);
390#endif 398#endif
391 return get_av (name, create); 399 return get_av (name, create);
392} 400}
393 401
394static HV * 402static HV * ecb_noinline
395coro_get_hv (pTHX_ const char *name, int create) 403coro_get_hv (pTHX_ const char *name, int create)
396{ 404{
397#if PERL_VERSION_ATLEAST (5,10,0) 405#if PERL_VERSION_ATLEAST (5,10,0)
398 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 406 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
399 get_hv (name, create); 407 get_hv (name, create);
400#endif 408#endif
401 return get_hv (name, create); 409 return get_hv (name, create);
402} 410}
403 411
404INLINE void 412ecb_inline void
405coro_times_update () 413coro_times_update (void)
406{ 414{
407#ifdef coro_clock_gettime 415#ifdef coro_clock_gettime
408 struct timespec ts; 416 struct timespec ts;
409 417
410 ts.tv_sec = ts.tv_nsec = 0; 418 ts.tv_sec = ts.tv_nsec = 0;
… …
422 time_real [0] = tv [0]; 430 time_real [0] = tv [0];
423 time_real [1] = tv [1] * 1000; 431 time_real [1] = tv [1] * 1000;
424#endif 432#endif
425} 433}
426 434
427INLINE void 435ecb_inline void
428coro_times_add (struct coro *c) 436coro_times_add (struct coro *c)
429{ 437{
430 c->t_real [1] += time_real [1]; 438 c->t_real [1] += time_real [1];
431 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 439 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
432 c->t_real [0] += time_real [0]; 440 c->t_real [0] += time_real [0];
… …
434 c->t_cpu [1] += time_cpu [1]; 442 c->t_cpu [1] += time_cpu [1];
435 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 443 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
436 c->t_cpu [0] += time_cpu [0]; 444 c->t_cpu [0] += time_cpu [0];
437} 445}
438 446
439INLINE void 447ecb_inline void
440coro_times_sub (struct coro *c) 448coro_times_sub (struct coro *c)
441{ 449{
442 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 450 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
443 c->t_real [1] -= time_real [1]; 451 c->t_real [1] -= time_real [1];
444 c->t_real [0] -= time_real [0]; 452 c->t_real [0] -= time_real [0];
… …
452/* magic glue */ 460/* magic glue */
453 461
454#define CORO_MAGIC_type_cv 26 462#define CORO_MAGIC_type_cv 26
455#define CORO_MAGIC_type_state PERL_MAGIC_ext 463#define CORO_MAGIC_type_state PERL_MAGIC_ext
456 464
457#define CORO_MAGIC_NN(sv, type) \ 465#define CORO_MAGIC_NN(sv, type) \
458 (expect_true (SvMAGIC (sv)->mg_type == type) \ 466 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
459 ? SvMAGIC (sv) \ 467 ? SvMAGIC (sv) \
460 : mg_find (sv, type)) 468 : mg_find (sv, type))
461 469
462#define CORO_MAGIC(sv, type) \ 470#define CORO_MAGIC(sv, type) \
463 (expect_true (SvMAGIC (sv)) \ 471 (ecb_expect_true (SvMAGIC (sv)) \
464 ? CORO_MAGIC_NN (sv, type) \ 472 ? CORO_MAGIC_NN (sv, type) \
465 : 0) 473 : 0)
466 474
467#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 475#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
468#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 476#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
469 477
470INLINE struct coro * 478ecb_inline MAGIC *
479SvSTATEhv_p (pTHX_ SV *coro)
480{
481 MAGIC *mg;
482
483 if (ecb_expect_true (
484 SvTYPE (coro) == SVt_PVHV
485 && (mg = CORO_MAGIC_state (coro))
486 && mg->mg_virtual == &coro_state_vtbl
487 ))
488 return mg;
489
490 return 0;
491}
492
493ecb_inline struct coro *
471SvSTATE_ (pTHX_ SV *coro) 494SvSTATE_ (pTHX_ SV *coro)
472{ 495{
473 HV *stash;
474 MAGIC *mg; 496 MAGIC *mg;
475 497
476 if (SvROK (coro)) 498 if (SvROK (coro))
477 coro = SvRV (coro); 499 coro = SvRV (coro);
478 500
479 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 501 mg = SvSTATEhv_p (aTHX_ coro);
502 if (!mg)
480 croak ("Coro::State object required"); 503 croak ("Coro::State object required");
481 504
482 stash = SvSTASH (coro);
483 if (expect_false (stash != coro_stash && stash != coro_state_stash))
484 {
485 /* very slow, but rare, check */
486 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
487 croak ("Coro::State object required");
488 }
489
490 mg = CORO_MAGIC_state (coro);
491 return (struct coro *)mg->mg_ptr; 505 return (struct coro *)mg->mg_ptr;
492} 506}
493 507
494#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 508#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
495 509
… …
498#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 512#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
499 513
500/*****************************************************************************/ 514/*****************************************************************************/
501/* padlist management and caching */ 515/* padlist management and caching */
502 516
503static AV * 517ecb_inline PADLIST *
504coro_derive_padlist (pTHX_ CV *cv) 518coro_derive_padlist (pTHX_ CV *cv)
505{ 519{
506 AV *padlist = CvPADLIST (cv); 520 PADLIST *padlist = CvPADLIST (cv);
507 AV *newpadlist, *newpad; 521 PADLIST *newpadlist;
522 PAD *newpad;
523 PADOFFSET off = PadlistMAX (padlist) + 1;
508 524
509 newpadlist = newAV (); 525#if NEWPADAPI
526
527 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
528 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
529 while (!PadlistARRAY (padlist)[off - 1])
530 --off;
531
532 Perl_pad_push (aTHX_ padlist, off);
533
534 newpad = PadlistARRAY (padlist)[off];
535 PadlistARRAY (padlist)[off] = 0;
536
537#else
538
539#if PERL_VERSION_ATLEAST (5,10,0)
540 Perl_pad_push (aTHX_ padlist, off);
541#else
542 Perl_pad_push (aTHX_ padlist, off, 1);
543#endif
544
545 newpad = PadlistARRAY (padlist)[off];
546 PadlistMAX (padlist) = off - 1;
547
548#endif
549
550 newPADLIST (newpadlist);
551#if !PERL_VERSION_ATLEAST(5,15,3)
552 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
510 AvREAL_off (newpadlist); 553 AvREAL_off (newpadlist);
511#if PERL_VERSION_ATLEAST (5,10,0)
512 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
513#else
514 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
515#endif 554#endif
516 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
517 --AvFILLp (padlist);
518 555
519 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 556 /* Already extended to 2 elements by newPADLIST. */
520 av_store (newpadlist, 1, (SV *)newpad); 557 PadlistMAX (newpadlist) = 1;
558 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
559 PadlistARRAY (newpadlist)[1] = newpad;
521 560
522 return newpadlist; 561 return newpadlist;
523} 562}
524 563
525static void 564ecb_inline void
526free_padlist (pTHX_ AV *padlist) 565free_padlist (pTHX_ PADLIST *padlist)
527{ 566{
528 /* may be during global destruction */ 567 /* may be during global destruction */
529 if (!IN_DESTRUCT) 568 if (!IN_DESTRUCT)
530 { 569 {
531 I32 i = AvFILLp (padlist); 570 I32 i = PadlistMAX (padlist);
532 571
533 while (i > 0) /* special-case index 0 */ 572 while (i > 0) /* special-case index 0 */
534 { 573 {
535 /* we try to be extra-careful here */ 574 /* we try to be extra-careful here */
536 AV *av = (AV *)AvARRAY (padlist)[i--]; 575 PAD *pad = PadlistARRAY (padlist)[i--];
537 I32 j = AvFILLp (av);
538 576
577 if (pad)
578 {
579 I32 j = PadMAX (pad);
580
539 while (j >= 0) 581 while (j >= 0)
540 SvREFCNT_dec (AvARRAY (av)[j--]); 582 SvREFCNT_dec (PadARRAY (pad)[j--]);
541 583
542 AvFILLp (av) = -1; 584 PadMAX (pad) = -1;
543 SvREFCNT_dec (av); 585 SvREFCNT_dec (pad);
586 }
544 } 587 }
545 588
546 SvREFCNT_dec (AvARRAY (padlist)[0]); 589 SvREFCNT_dec (PadlistNAMES (padlist));
547 590
591#if NEWPADAPI
592 Safefree (PadlistARRAY (padlist));
593 Safefree (padlist);
594#else
548 AvFILLp (padlist) = -1; 595 AvFILLp (padlist) = -1;
596 AvREAL_off (padlist);
549 SvREFCNT_dec ((SV*)padlist); 597 SvREFCNT_dec ((SV*)padlist);
598#endif
550 } 599 }
551} 600}
552 601
553static int 602static int
554coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 603coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
555{ 604{
556 AV *padlist; 605 PADLIST *padlist;
557 AV *av = (AV *)mg->mg_obj; 606 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
607 size_t len = *(size_t *)mg->mg_ptr;
558 608
559 /* perl manages to free our internal AV and _then_ call us */ 609 /* perl manages to free our internal AV and _then_ call us */
560 if (IN_DESTRUCT) 610 if (IN_DESTRUCT)
561 return 0; 611 return 0;
562 612
563 /* casting is fun. */ 613 while (len--)
564 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
565 free_padlist (aTHX_ padlist); 614 free_padlist (aTHX_ padlists[len]);
566
567 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
568 615
569 return 0; 616 return 0;
570} 617}
571 618
572static MGVTBL coro_cv_vtbl = { 619static MGVTBL coro_cv_vtbl = {
573 0, 0, 0, 0, 620 0, 0, 0, 0,
574 coro_cv_free 621 coro_cv_free
575}; 622};
576 623
577/* the next two functions merely cache the padlists */ 624/* the next two functions merely cache the padlists */
578static void 625ecb_inline void
579get_padlist (pTHX_ CV *cv) 626get_padlist (pTHX_ CV *cv)
580{ 627{
581 MAGIC *mg = CORO_MAGIC_cv (cv); 628 MAGIC *mg = CORO_MAGIC_cv (cv);
582 AV *av; 629 size_t *lenp;
583 630
584 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 631 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
585 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 632 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
586 else 633 else
587 { 634 {
588#if CORO_PREFER_PERL_FUNCTIONS 635#if CORO_PREFER_PERL_FUNCTIONS
589 /* this is probably cleaner? but also slower! */ 636 /* this is probably cleaner? but also slower! */
590 /* in practise, it seems to be less stable */ 637 /* in practise, it seems to be less stable */
… …
596 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 643 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
597#endif 644#endif
598 } 645 }
599} 646}
600 647
601static void 648ecb_inline void
602put_padlist (pTHX_ CV *cv) 649put_padlist (pTHX_ CV *cv)
603{ 650{
604 MAGIC *mg = CORO_MAGIC_cv (cv); 651 MAGIC *mg = CORO_MAGIC_cv (cv);
605 AV *av;
606 652
607 if (expect_false (!mg)) 653 if (ecb_expect_false (!mg))
654 {
608 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 655 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
656 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
657 mg->mg_len = 1; /* so mg_free frees mg_ptr */
658 }
659 else
660 Renew (mg->mg_ptr,
661 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
662 char);
609 663
610 av = (AV *)mg->mg_obj; 664 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
611
612 if (expect_false (AvFILLp (av) >= AvMAX (av)))
613 av_extend (av, AvFILLp (av) + 1);
614
615 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
616} 665}
617 666
618/** load & save, init *******************************************************/ 667/** load & save, init *******************************************************/
619 668
669ecb_inline void
670swap_sv (SV *a, SV *b)
671{
672 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
673 SV tmp;
674
675 /* swap sv_any */
676 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
677
678 /* swap sv_flags */
679 SvFLAGS (&tmp) = SvFLAGS (a);
680 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
681 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
682
683#if PERL_VERSION_ATLEAST (5,10,0)
684 /* perl 5.10 and later complicates this _quite_ a bit, but it also
685 * is much faster, so no quarrels here. alternatively, we could
686 * sv_upgrade to avoid this.
687 */
688 {
689 /* swap sv_u */
690 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
691
692 /* if SvANY points to the head, we need to adjust the pointers,
693 * as the pointer for a still points to b, and maybe vice versa.
694 */
695 #define svany_in_head(type) \
696 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
697
698 if (svany_in_head (SvTYPE (a)))
699 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
700
701 if (svany_in_head (SvTYPE (b)))
702 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
703 }
704#endif
705}
706
620/* swap sv heads, at least logically */ 707/* swap sv heads, at least logically */
621static void 708static void
622swap_svs (pTHX_ Coro__State c) 709swap_svs (pTHX_ Coro__State c)
623{ 710{
624 int i; 711 int i;
625 712
626 for (i = 0; i <= AvFILLp (c->swap_sv); ) 713 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
627 { 714 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
628 SV *a = AvARRAY (c->swap_sv)[i++];
629 SV *b = AvARRAY (c->swap_sv)[i++];
630
631 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
632 SV tmp;
633
634 /* swap sv_any */
635 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
636
637 /* swap sv_flags */
638 SvFLAGS (&tmp) = SvFLAGS (a);
639 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
640 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
641
642#if PERL_VERSION_ATLEAST (5,10,0)
643 /* perl 5.10 complicates this _quite_ a bit, but it also is
644 * much faster, so no quarrels here. alternatively, we could
645 * sv_upgrade to avoid this.
646 */
647 {
648 /* swap sv_u */
649 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
650
651 /* if SvANY points to the head, we need to adjust the pointers,
652 * as the pointer for a still points to b, and maybe vice versa.
653 */
654 #define svany_in_head(type) \
655 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
656
657 if (svany_in_head (SvTYPE (a)))
658 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
659
660 if (svany_in_head (SvTYPE (b)))
661 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
662 }
663#endif
664 }
665} 715}
666 716
667#define SWAP_SVS(coro) \ 717#define SWAP_SVS(coro) \
668 if (expect_false ((coro)->swap_sv)) \ 718 if (ecb_expect_false ((coro)->swap_sv)) \
669 swap_svs (aTHX_ (coro)) 719 swap_svs (aTHX_ (coro))
670 720
671static void 721static void
672on_enterleave_call (pTHX_ SV *cb); 722on_enterleave_call (pTHX_ SV *cb);
673 723
… …
677 perl_slots *slot = c->slot; 727 perl_slots *slot = c->slot;
678 c->slot = 0; 728 c->slot = 0;
679 729
680 PL_mainstack = c->mainstack; 730 PL_mainstack = c->mainstack;
681 731
682 GvSV (PL_defgv) = slot->defsv; 732#if CORO_JIT
683 GvAV (PL_defgv) = slot->defav; 733 load_perl_slots (slot);
684 GvSV (PL_errgv) = slot->errsv; 734#else
685 GvSV (irsgv) = slot->irsgv;
686 GvHV (PL_hintgv) = slot->hinthv;
687
688 #define VAR(name,type) PL_ ## name = slot->name; 735 #define VARx(name,expr,type) expr = slot->name;
689 # include "state.h" 736 #include "state.h"
690 #undef VAR 737#endif
691 738
692 { 739 {
693 dSP; 740 dSP;
694 741
695 CV *cv; 742 CV *cv;
696 743
697 /* now do the ugly restore mess */ 744 /* now do the ugly restore mess */
698 while (expect_true (cv = (CV *)POPs)) 745 while (ecb_expect_true (cv = (CV *)POPs))
699 { 746 {
700 put_padlist (aTHX_ cv); /* mark this padlist as available */ 747 put_padlist (aTHX_ cv); /* mark this padlist as available */
701 CvDEPTH (cv) = PTR2IV (POPs); 748 CvDEPTH (cv) = PTR2IV (POPs);
702 CvPADLIST (cv) = (AV *)POPs; 749 CvPADLIST (cv) = (PADLIST *)POPs;
703 } 750 }
704 751
705 PUTBACK; 752 PUTBACK;
706 } 753 }
707 754
708 slf_frame = c->slf_frame; 755 slf_frame = c->slf_frame;
709 CORO_THROW = c->except; 756 CORO_THROW = c->except;
710 757
711 if (expect_false (enable_times)) 758 if (ecb_expect_false (enable_times))
712 { 759 {
713 if (expect_false (!times_valid)) 760 if (ecb_expect_false (!times_valid))
714 coro_times_update (); 761 coro_times_update ();
715 762
716 coro_times_sub (c); 763 coro_times_sub (c);
717 } 764 }
718 765
719 if (expect_false (c->on_enter)) 766 if (ecb_expect_false (c->on_enter))
720 { 767 {
721 int i; 768 int i;
722 769
723 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 770 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
724 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 771 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
730static void 777static void
731save_perl (pTHX_ Coro__State c) 778save_perl (pTHX_ Coro__State c)
732{ 779{
733 SWAP_SVS (c); 780 SWAP_SVS (c);
734 781
735 if (expect_false (c->on_leave)) 782 if (ecb_expect_false (c->on_leave))
736 { 783 {
737 int i; 784 int i;
738 785
739 for (i = AvFILLp (c->on_leave); i >= 0; --i) 786 for (i = AvFILLp (c->on_leave); i >= 0; --i)
740 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 787 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
741 } 788 }
742 789
743 times_valid = 0; 790 times_valid = 0;
744 791
745 if (expect_false (enable_times)) 792 if (ecb_expect_false (enable_times))
746 { 793 {
747 coro_times_update (); times_valid = 1; 794 coro_times_update (); times_valid = 1;
748 coro_times_add (c); 795 coro_times_add (c);
749 } 796 }
750 797
… …
764 811
765 XPUSHs (Nullsv); 812 XPUSHs (Nullsv);
766 /* this loop was inspired by pp_caller */ 813 /* this loop was inspired by pp_caller */
767 for (;;) 814 for (;;)
768 { 815 {
769 while (expect_true (cxix >= 0)) 816 while (ecb_expect_true (cxix >= 0))
770 { 817 {
771 PERL_CONTEXT *cx = &ccstk[cxix--]; 818 PERL_CONTEXT *cx = &ccstk[cxix--];
772 819
773 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 820 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
774 { 821 {
775 CV *cv = cx->blk_sub.cv; 822 CV *cv = cx->blk_sub.cv;
776 823
777 if (expect_true (CvDEPTH (cv))) 824 if (ecb_expect_true (CvDEPTH (cv)))
778 { 825 {
779 EXTEND (SP, 3); 826 EXTEND (SP, 3);
780 PUSHs ((SV *)CvPADLIST (cv)); 827 PUSHs ((SV *)CvPADLIST (cv));
781 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 828 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
782 PUSHs ((SV *)cv); 829 PUSHs ((SV *)cv);
… …
785 get_padlist (aTHX_ cv); 832 get_padlist (aTHX_ cv);
786 } 833 }
787 } 834 }
788 } 835 }
789 836
790 if (expect_true (top_si->si_type == PERLSI_MAIN)) 837 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
791 break; 838 break;
792 839
793 top_si = top_si->si_prev; 840 top_si = top_si->si_prev;
794 ccstk = top_si->si_cxstack; 841 ccstk = top_si->si_cxstack;
795 cxix = top_si->si_cxix; 842 cxix = top_si->si_cxix;
… …
797 844
798 PUTBACK; 845 PUTBACK;
799 } 846 }
800 847
801 /* allocate some space on the context stack for our purposes */ 848 /* allocate some space on the context stack for our purposes */
802 /* we manually unroll here, as usually 2 slots is enough */ 849 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
803 if (SLOT_COUNT >= 1) CXINC;
804 if (SLOT_COUNT >= 2) CXINC;
805 if (SLOT_COUNT >= 3) CXINC;
806 { 850 {
807 unsigned int i; 851 unsigned int i;
852
808 for (i = 3; i < SLOT_COUNT; ++i) 853 for (i = 0; i < SLOT_COUNT; ++i)
809 CXINC; 854 CXINC;
810 } 855
811 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 856 cxstack_ix -= SLOT_COUNT; /* undo allocation */
857 }
812 858
813 c->mainstack = PL_mainstack; 859 c->mainstack = PL_mainstack;
814 860
815 { 861 {
816 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 862 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
817 863
818 slot->defav = GvAV (PL_defgv); 864#if CORO_JIT
819 slot->defsv = DEFSV; 865 save_perl_slots (slot);
820 slot->errsv = ERRSV; 866#else
821 slot->irsgv = GvSV (irsgv);
822 slot->hinthv = GvHV (PL_hintgv);
823
824 #define VAR(name,type) slot->name = PL_ ## name; 867 #define VARx(name,expr,type) slot->name = expr;
825 # include "state.h" 868 #include "state.h"
826 #undef VAR 869#endif
827 } 870 }
828} 871}
829 872
830/* 873/*
831 * allocate various perl stacks. This is almost an exact copy 874 * allocate various perl stacks. This is almost an exact copy
… …
837# define coro_init_stacks(thx) init_stacks () 880# define coro_init_stacks(thx) init_stacks ()
838#else 881#else
839static void 882static void
840coro_init_stacks (pTHX) 883coro_init_stacks (pTHX)
841{ 884{
842 PL_curstackinfo = new_stackinfo(32, 8); 885 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
843 PL_curstackinfo->si_type = PERLSI_MAIN; 886 PL_curstackinfo->si_type = PERLSI_MAIN;
844 PL_curstack = PL_curstackinfo->si_stack; 887 PL_curstack = PL_curstackinfo->si_stack;
845 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 888 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
846 889
847 PL_stack_base = AvARRAY(PL_curstack); 890 PL_stack_base = AvARRAY(PL_curstack);
… …
862#endif 905#endif
863 906
864 New(54,PL_scopestack,8,I32); 907 New(54,PL_scopestack,8,I32);
865 PL_scopestack_ix = 0; 908 PL_scopestack_ix = 0;
866 PL_scopestack_max = 8; 909 PL_scopestack_max = 8;
910#if HAS_SCOPESTACK_NAME
911 New(54,PL_scopestack_name,8,const char*);
912#endif
867 913
868 New(54,PL_savestack,24,ANY); 914 New(54,PL_savestack,24,ANY);
869 PL_savestack_ix = 0; 915 PL_savestack_ix = 0;
870 PL_savestack_max = 24; 916 PL_savestack_max = 24;
871 917
… …
899 } 945 }
900 946
901 Safefree (PL_tmps_stack); 947 Safefree (PL_tmps_stack);
902 Safefree (PL_markstack); 948 Safefree (PL_markstack);
903 Safefree (PL_scopestack); 949 Safefree (PL_scopestack);
950#if HAS_SCOPESTACK_NAME
951 Safefree (PL_scopestack_name);
952#endif
904 Safefree (PL_savestack); 953 Safefree (PL_savestack);
905#if !PERL_VERSION_ATLEAST (5,10,0) 954#if !PERL_VERSION_ATLEAST (5,10,0)
906 Safefree (PL_retstack); 955 Safefree (PL_retstack);
907#endif 956#endif
908} 957}
… …
954#endif 1003#endif
955 1004
956/* 1005/*
957 * This overrides the default magic get method of %SIG elements. 1006 * This overrides the default magic get method of %SIG elements.
958 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1007 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
959 * and instead of trying to save and restore the hash elements, we just provide 1008 * and instead of trying to save and restore the hash elements (extremely slow),
960 * readback here. 1009 * we just provide our own readback here.
961 */ 1010 */
962static int 1011static int ecb_cold
963coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1012coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
964{ 1013{
965 const char *s = MgPV_nolen_const (mg); 1014 const char *s = MgPV_nolen_const (mg);
966 1015
967 if (*s == '_') 1016 if (*s == '_')
968 { 1017 {
969 SV **svp = 0; 1018 SV **svp = 0;
970 1019
971 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1020 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
972 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1021 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
973 1022
974 if (svp) 1023 if (svp)
975 { 1024 {
976 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1025 SV *ssv;
1026
1027 if (!*svp)
1028 ssv = &PL_sv_undef;
1029 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1030 ssv = sv_2mortal (newRV_inc (*svp));
1031 else
1032 ssv = *svp;
1033
1034 sv_setsv (sv, ssv);
977 return 0; 1035 return 0;
978 } 1036 }
979 } 1037 }
980 1038
981 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1039 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
982} 1040}
983 1041
984static int 1042static int ecb_cold
985coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1043coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
986{ 1044{
987 const char *s = MgPV_nolen_const (mg); 1045 const char *s = MgPV_nolen_const (mg);
988 1046
989 if (*s == '_') 1047 if (*s == '_')
… …
1003 } 1061 }
1004 1062
1005 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1063 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1006} 1064}
1007 1065
1008static int 1066static int ecb_cold
1009coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1067coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1010{ 1068{
1011 const char *s = MgPV_nolen_const (mg); 1069 const char *s = MgPV_nolen_const (mg);
1012 1070
1013 if (*s == '_') 1071 if (*s == '_')
… …
1048 return 1; 1106 return 1;
1049} 1107}
1050 1108
1051static UNOP init_perl_op; 1109static UNOP init_perl_op;
1052 1110
1053static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1111ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1054init_perl (pTHX_ struct coro *coro) 1112init_perl (pTHX_ struct coro *coro)
1055{ 1113{
1056 /* 1114 /*
1057 * emulate part of the perl startup here. 1115 * emulate part of the perl startup here.
1058 */ 1116 */
… …
1073 PL_parser = 0; 1131 PL_parser = 0;
1074#endif 1132#endif
1075 PL_hints = 0; 1133 PL_hints = 0;
1076 1134
1077 /* recreate the die/warn hooks */ 1135 /* recreate the die/warn hooks */
1078 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1136 PL_diehook = SvREFCNT_inc (rv_diehook);
1079 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1137 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1080 1138
1081 GvSV (PL_defgv) = newSV (0); 1139 GvSV (PL_defgv) = newSV (0);
1082 GvAV (PL_defgv) = coro->args; coro->args = 0; 1140 GvAV (PL_defgv) = coro->args; coro->args = 0;
1083 GvSV (PL_errgv) = newSV (0); 1141 GvSV (PL_errgv) = newSV (0);
1084 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1142 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1085 GvHV (PL_hintgv) = 0; 1143 GvHV (PL_hintgv) = 0;
… …
1105 /* this newly created coroutine might be run on an existing cctx which most 1163 /* this newly created coroutine might be run on an existing cctx which most
1106 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1164 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1107 */ 1165 */
1108 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1166 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1109 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1167 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1168 slf_frame.destroy = 0;
1110 1169
1111 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1170 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1112 init_perl_op.op_next = PL_op; 1171 init_perl_op.op_next = PL_op;
1113 init_perl_op.op_type = OP_ENTERSUB; 1172 init_perl_op.op_type = OP_ENTERSUB;
1114 init_perl_op.op_ppaddr = pp_slf; 1173 init_perl_op.op_ppaddr = pp_slf;
… …
1119 /* copy throw, in case it was set before init_perl */ 1178 /* copy throw, in case it was set before init_perl */
1120 CORO_THROW = coro->except; 1179 CORO_THROW = coro->except;
1121 1180
1122 SWAP_SVS (coro); 1181 SWAP_SVS (coro);
1123 1182
1124 if (expect_false (enable_times)) 1183 if (ecb_expect_false (enable_times))
1125 { 1184 {
1126 coro_times_update (); 1185 coro_times_update ();
1127 coro_times_sub (coro); 1186 coro_times_sub (coro);
1128 } 1187 }
1129} 1188}
… …
1153destroy_perl (pTHX_ struct coro *coro) 1212destroy_perl (pTHX_ struct coro *coro)
1154{ 1213{
1155 SV *svf [9]; 1214 SV *svf [9];
1156 1215
1157 { 1216 {
1217 SV *old_current = SvRV (coro_current);
1158 struct coro *current = SvSTATE_current; 1218 struct coro *current = SvSTATE (old_current);
1159 1219
1160 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1220 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1161 1221
1162 save_perl (aTHX_ current); 1222 save_perl (aTHX_ current);
1223
1224 /* this will cause transfer_check to croak on block*/
1225 SvRV_set (coro_current, (SV *)coro->hv);
1226
1163 load_perl (aTHX_ coro); 1227 load_perl (aTHX_ coro);
1164 1228
1165 coro_unwind_stacks (aTHX); 1229 coro_unwind_stacks (aTHX);
1166 coro_destruct_stacks (aTHX);
1167 1230
1168 /* restore swapped sv's */ 1231 /* restore swapped sv's */
1169 SWAP_SVS (coro); 1232 SWAP_SVS (coro);
1170 1233
1234 coro_destruct_stacks (aTHX);
1235
1171 // now save some sv's to be free'd later 1236 /* now save some sv's to be free'd later */
1172 svf [0] = GvSV (PL_defgv); 1237 svf [0] = GvSV (PL_defgv);
1173 svf [1] = (SV *)GvAV (PL_defgv); 1238 svf [1] = (SV *)GvAV (PL_defgv);
1174 svf [2] = GvSV (PL_errgv); 1239 svf [2] = GvSV (PL_errgv);
1175 svf [3] = (SV *)PL_defoutgv; 1240 svf [3] = (SV *)PL_defoutgv;
1176 svf [4] = PL_rs; 1241 svf [4] = PL_rs;
… …
1178 svf [6] = (SV *)GvHV (PL_hintgv); 1243 svf [6] = (SV *)GvHV (PL_hintgv);
1179 svf [7] = PL_diehook; 1244 svf [7] = PL_diehook;
1180 svf [8] = PL_warnhook; 1245 svf [8] = PL_warnhook;
1181 assert (9 == sizeof (svf) / sizeof (*svf)); 1246 assert (9 == sizeof (svf) / sizeof (*svf));
1182 1247
1248 SvRV_set (coro_current, old_current);
1249
1183 load_perl (aTHX_ current); 1250 load_perl (aTHX_ current);
1184 } 1251 }
1185 1252
1186 { 1253 {
1187 unsigned int i; 1254 unsigned int i;
… …
1194 SvREFCNT_dec (coro->invoke_cb); 1261 SvREFCNT_dec (coro->invoke_cb);
1195 SvREFCNT_dec (coro->invoke_av); 1262 SvREFCNT_dec (coro->invoke_av);
1196 } 1263 }
1197} 1264}
1198 1265
1199INLINE void 1266ecb_inline void
1200free_coro_mortal (pTHX) 1267free_coro_mortal (pTHX)
1201{ 1268{
1202 if (expect_true (coro_mortal)) 1269 if (ecb_expect_true (coro_mortal))
1203 { 1270 {
1204 SvREFCNT_dec (coro_mortal); 1271 SvREFCNT_dec ((SV *)coro_mortal);
1205 coro_mortal = 0; 1272 coro_mortal = 0;
1206 } 1273 }
1207} 1274}
1208 1275
1209static int 1276static int
… …
1342 1409
1343 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1410 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1344} 1411}
1345 1412
1346/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1413/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1347static void NOINLINE 1414static void ecb_noinline
1348cctx_prepare (pTHX) 1415cctx_prepare (pTHX)
1349{ 1416{
1350 PL_top_env = &PL_start_env; 1417 PL_top_env = &PL_start_env;
1351 1418
1352 if (cctx_current->flags & CC_TRACE) 1419 if (cctx_current->flags & CC_TRACE)
… …
1363 slf_frame.prepare = slf_prepare_set_stacklevel; 1430 slf_frame.prepare = slf_prepare_set_stacklevel;
1364 slf_frame.check = slf_check_set_stacklevel; 1431 slf_frame.check = slf_check_set_stacklevel;
1365} 1432}
1366 1433
1367/* the tail of transfer: execute stuff we can only do after a transfer */ 1434/* the tail of transfer: execute stuff we can only do after a transfer */
1368INLINE void 1435ecb_inline void
1369transfer_tail (pTHX) 1436transfer_tail (pTHX)
1370{ 1437{
1371 free_coro_mortal (aTHX); 1438 free_coro_mortal (aTHX);
1439}
1440
1441/* try to exit the same way perl's main function would do */
1442/* we do not bother resetting the environment or other things *7
1443/* that are not, uhm, essential */
1444/* this obviously also doesn't work when perl is embedded */
1445static void ecb_noinline ecb_cold
1446perlish_exit (pTHX)
1447{
1448 int exitstatus = perl_destruct (PL_curinterp);
1449 perl_free (PL_curinterp);
1450 exit (exitstatus);
1372} 1451}
1373 1452
1374/* 1453/*
1375 * this is a _very_ stripped down perl interpreter ;) 1454 * this is a _very_ stripped down perl interpreter ;)
1376 */ 1455 */
… …
1405 */ 1484 */
1406 1485
1407 /* 1486 /*
1408 * If perl-run returns we assume exit() was being called or the coro 1487 * If perl-run returns we assume exit() was being called or the coro
1409 * fell off the end, which seems to be the only valid (non-bug) 1488 * fell off the end, which seems to be the only valid (non-bug)
1410 * reason for perl_run to return. We try to exit by jumping to the 1489 * reason for perl_run to return. We try to mimic whatever perl is normally
1411 * bootstrap-time "top" top_env, as we cannot restore the "main" 1490 * doing in that case. YMMV.
1412 * coroutine as Coro has no such concept.
1413 * This actually isn't valid with the pthread backend, but OSes requiring
1414 * that backend are too broken to do it in a standards-compliant way.
1415 */ 1491 */
1416 PL_top_env = main_top_env; 1492 perlish_exit (aTHX);
1417 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1418 } 1493 }
1419} 1494}
1420 1495
1421static coro_cctx * 1496static coro_cctx *
1422cctx_new () 1497cctx_new (void)
1423{ 1498{
1424 coro_cctx *cctx; 1499 coro_cctx *cctx;
1425 1500
1426 ++cctx_count; 1501 ++cctx_count;
1427 New (0, cctx, 1, coro_cctx); 1502 New (0, cctx, 1, coro_cctx);
… …
1433 return cctx; 1508 return cctx;
1434} 1509}
1435 1510
1436/* create a new cctx only suitable as source */ 1511/* create a new cctx only suitable as source */
1437static coro_cctx * 1512static coro_cctx *
1438cctx_new_empty () 1513cctx_new_empty (void)
1439{ 1514{
1440 coro_cctx *cctx = cctx_new (); 1515 coro_cctx *cctx = cctx_new ();
1441 1516
1442 cctx->sptr = 0; 1517 cctx->stack.sptr = 0;
1443 coro_create (&cctx->cctx, 0, 0, 0, 0); 1518 coro_create (&cctx->cctx, 0, 0, 0, 0);
1444 1519
1445 return cctx; 1520 return cctx;
1446} 1521}
1447 1522
1448/* create a new cctx suitable as destination/running a perl interpreter */ 1523/* create a new cctx suitable as destination/running a perl interpreter */
1449static coro_cctx * 1524static coro_cctx *
1450cctx_new_run () 1525cctx_new_run (void)
1451{ 1526{
1452 coro_cctx *cctx = cctx_new (); 1527 coro_cctx *cctx = cctx_new ();
1453 void *stack_start;
1454 size_t stack_size;
1455 1528
1456#if HAVE_MMAP 1529 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1457 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1458 /* mmap supposedly does allocate-on-write for us */
1459 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1460
1461 if (cctx->sptr != (void *)-1)
1462 {
1463 #if CORO_STACKGUARD
1464 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1465 #endif
1466 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1467 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1468 cctx->flags |= CC_MAPPED;
1469 } 1530 {
1470 else
1471#endif
1472 {
1473 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1474 New (0, cctx->sptr, cctx_stacksize, long);
1475
1476 if (!cctx->sptr)
1477 {
1478 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1531 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1479 _exit (EXIT_FAILURE); 1532 _exit (EXIT_FAILURE);
1480 }
1481
1482 stack_start = cctx->sptr;
1483 stack_size = cctx->ssize;
1484 } 1533 }
1485 1534
1486 #if CORO_USE_VALGRIND
1487 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1488 #endif
1489
1490 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1535 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1491 1536
1492 return cctx; 1537 return cctx;
1493} 1538}
1494 1539
1495static void 1540static void
1496cctx_destroy (coro_cctx *cctx) 1541cctx_destroy (coro_cctx *cctx)
1497{ 1542{
1498 if (!cctx) 1543 if (!cctx)
1499 return; 1544 return;
1500 1545
1501 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1546 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1502 1547
1503 --cctx_count; 1548 --cctx_count;
1504 coro_destroy (&cctx->cctx); 1549 coro_destroy (&cctx->cctx);
1505 1550
1506 /* coro_transfer creates new, empty cctx's */ 1551 coro_stack_free (&cctx->stack);
1507 if (cctx->sptr)
1508 {
1509 #if CORO_USE_VALGRIND
1510 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1511 #endif
1512
1513#if HAVE_MMAP
1514 if (cctx->flags & CC_MAPPED)
1515 munmap (cctx->sptr, cctx->ssize);
1516 else
1517#endif
1518 Safefree (cctx->sptr);
1519 }
1520 1552
1521 Safefree (cctx); 1553 Safefree (cctx);
1522} 1554}
1523 1555
1524/* wether this cctx should be destructed */ 1556/* wether this cctx should be destructed */
1525#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1557#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1526 1558
1527static coro_cctx * 1559static coro_cctx *
1528cctx_get (pTHX) 1560cctx_get (pTHX)
1529{ 1561{
1530 while (expect_true (cctx_first)) 1562 while (ecb_expect_true (cctx_first))
1531 { 1563 {
1532 coro_cctx *cctx = cctx_first; 1564 coro_cctx *cctx = cctx_first;
1533 cctx_first = cctx->next; 1565 cctx_first = cctx->next;
1534 --cctx_idle; 1566 --cctx_idle;
1535 1567
1536 if (expect_true (!CCTX_EXPIRED (cctx))) 1568 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1537 return cctx; 1569 return cctx;
1538 1570
1539 cctx_destroy (cctx); 1571 cctx_destroy (cctx);
1540 } 1572 }
1541 1573
… …
1543} 1575}
1544 1576
1545static void 1577static void
1546cctx_put (coro_cctx *cctx) 1578cctx_put (coro_cctx *cctx)
1547{ 1579{
1548 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1580 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1549 1581
1550 /* free another cctx if overlimit */ 1582 /* free another cctx if overlimit */
1551 if (expect_false (cctx_idle >= cctx_max_idle)) 1583 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1552 { 1584 {
1553 coro_cctx *first = cctx_first; 1585 coro_cctx *first = cctx_first;
1554 cctx_first = first->next; 1586 cctx_first = first->next;
1555 --cctx_idle; 1587 --cctx_idle;
1556 1588
… …
1567static void 1599static void
1568transfer_check (pTHX_ struct coro *prev, struct coro *next) 1600transfer_check (pTHX_ struct coro *prev, struct coro *next)
1569{ 1601{
1570 /* TODO: throwing up here is considered harmful */ 1602 /* TODO: throwing up here is considered harmful */
1571 1603
1572 if (expect_true (prev != next)) 1604 if (ecb_expect_true (prev != next))
1573 { 1605 {
1574 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1606 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1575 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1607 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1576 1608
1577 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1609 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1578 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1610 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1579 1611
1580#if !PERL_VERSION_ATLEAST (5,10,0) 1612#if !PERL_VERSION_ATLEAST (5,10,0)
1581 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1613 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1582 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1614 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1583#endif 1615#endif
1584 } 1616 }
1585} 1617}
1586 1618
1587/* always use the TRANSFER macro */ 1619/* always use the TRANSFER macro */
1588static void NOINLINE /* noinline so we have a fixed stackframe */ 1620static void ecb_noinline /* noinline so we have a fixed stackframe */
1589transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1621transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1590{ 1622{
1591 dSTACKLEVEL; 1623 dSTACKLEVEL;
1592 1624
1593 /* sometimes transfer is only called to set idle_sp */ 1625 /* sometimes transfer is only called to set idle_sp */
1594 if (expect_false (!prev)) 1626 if (ecb_expect_false (!prev))
1595 { 1627 {
1596 cctx_current->idle_sp = STACKLEVEL; 1628 cctx_current->idle_sp = STACKLEVEL;
1597 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1629 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1598 } 1630 }
1599 else if (expect_true (prev != next)) 1631 else if (ecb_expect_true (prev != next))
1600 { 1632 {
1601 coro_cctx *cctx_prev; 1633 coro_cctx *cctx_prev;
1602 1634
1603 if (expect_false (prev->flags & CF_NEW)) 1635 if (ecb_expect_false (prev->flags & CF_NEW))
1604 { 1636 {
1605 /* create a new empty/source context */ 1637 /* create a new empty/source context */
1606 prev->flags &= ~CF_NEW; 1638 prev->flags &= ~CF_NEW;
1607 prev->flags |= CF_RUNNING; 1639 prev->flags |= CF_RUNNING;
1608 } 1640 }
… …
1611 next->flags |= CF_RUNNING; 1643 next->flags |= CF_RUNNING;
1612 1644
1613 /* first get rid of the old state */ 1645 /* first get rid of the old state */
1614 save_perl (aTHX_ prev); 1646 save_perl (aTHX_ prev);
1615 1647
1616 if (expect_false (next->flags & CF_NEW)) 1648 if (ecb_expect_false (next->flags & CF_NEW))
1617 { 1649 {
1618 /* need to start coroutine */ 1650 /* need to start coroutine */
1619 next->flags &= ~CF_NEW; 1651 next->flags &= ~CF_NEW;
1620 /* setup coroutine call */ 1652 /* setup coroutine call */
1621 init_perl (aTHX_ next); 1653 init_perl (aTHX_ next);
1622 } 1654 }
1623 else 1655 else
1624 load_perl (aTHX_ next); 1656 load_perl (aTHX_ next);
1625 1657
1626 /* possibly untie and reuse the cctx */ 1658 /* possibly untie and reuse the cctx */
1627 if (expect_true ( 1659 if (ecb_expect_true (
1628 cctx_current->idle_sp == STACKLEVEL 1660 cctx_current->idle_sp == STACKLEVEL
1629 && !(cctx_current->flags & CC_TRACE) 1661 && !(cctx_current->flags & CC_TRACE)
1630 && !force_cctx 1662 && !force_cctx
1631 )) 1663 ))
1632 { 1664 {
1633 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1665 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1634 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1666 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1635 1667
1636 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1668 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1637 /* without this the next cctx_get might destroy the running cctx while still in use */ 1669 /* without this the next cctx_get might destroy the running cctx while still in use */
1638 if (expect_false (CCTX_EXPIRED (cctx_current))) 1670 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1639 if (expect_true (!next->cctx)) 1671 if (ecb_expect_true (!next->cctx))
1640 next->cctx = cctx_get (aTHX); 1672 next->cctx = cctx_get (aTHX);
1641 1673
1642 cctx_put (cctx_current); 1674 cctx_put (cctx_current);
1643 } 1675 }
1644 else 1676 else
1645 prev->cctx = cctx_current; 1677 prev->cctx = cctx_current;
1646 1678
1647 ++next->usecount; 1679 ++next->usecount;
1648 1680
1649 cctx_prev = cctx_current; 1681 cctx_prev = cctx_current;
1650 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1682 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1651 1683
1652 next->cctx = 0; 1684 next->cctx = 0;
1653 1685
1654 if (expect_false (cctx_prev != cctx_current)) 1686 if (ecb_expect_false (cctx_prev != cctx_current))
1655 { 1687 {
1656 cctx_prev->top_env = PL_top_env; 1688 cctx_prev->top_env = PL_top_env;
1657 PL_top_env = cctx_current->top_env; 1689 PL_top_env = cctx_current->top_env;
1658 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1690 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1659 } 1691 }
… …
1665#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1697#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1666#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1698#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1667 1699
1668/** high level stuff ********************************************************/ 1700/** high level stuff ********************************************************/
1669 1701
1702/* this function is actually Coro, not Coro::State, but we call it from here */
1703/* because it is convenient - but it hasn't been declared yet for that reason */
1670static int 1704static void
1705coro_call_on_destroy (pTHX_ struct coro *coro);
1706
1707static void
1671coro_state_destroy (pTHX_ struct coro *coro) 1708coro_state_destroy (pTHX_ struct coro *coro)
1672{ 1709{
1673 if (coro->flags & CF_DESTROYED) 1710 if (coro->flags & CF_ZOMBIE)
1674 return 0; 1711 return;
1675 1712
1676 if (coro->on_destroy && !PL_dirty)
1677 coro->on_destroy (aTHX_ coro); 1713 slf_destroy (aTHX_ coro);
1678 1714
1679 coro->flags |= CF_DESTROYED; 1715 coro->flags |= CF_ZOMBIE;
1680 1716
1681 if (coro->flags & CF_READY) 1717 if (coro->flags & CF_READY)
1682 { 1718 {
1683 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1719 /* reduce nready, as destroying a ready coro effectively unreadies it */
1684 /* alternative: look through all ready queues and remove the coro */ 1720 /* alternative: look through all ready queues and remove the coro */
1685 --coro_nready; 1721 --coro_nready;
1686 } 1722 }
1687 else 1723 else
1688 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1724 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1725
1726 if (coro->next) coro->next->prev = coro->prev;
1727 if (coro->prev) coro->prev->next = coro->next;
1728 if (coro == coro_first) coro_first = coro->next;
1689 1729
1690 if (coro->mainstack 1730 if (coro->mainstack
1691 && coro->mainstack != main_mainstack 1731 && coro->mainstack != main_mainstack
1692 && coro->slot 1732 && coro->slot
1693 && !PL_dirty) 1733 && !PL_dirty)
1694 destroy_perl (aTHX_ coro); 1734 destroy_perl (aTHX_ coro);
1695 1735
1696 if (coro->next) coro->next->prev = coro->prev;
1697 if (coro->prev) coro->prev->next = coro->next;
1698 if (coro == coro_first) coro_first = coro->next;
1699
1700 cctx_destroy (coro->cctx); 1736 cctx_destroy (coro->cctx);
1701 SvREFCNT_dec (coro->startcv); 1737 SvREFCNT_dec (coro->startcv);
1702 SvREFCNT_dec (coro->args); 1738 SvREFCNT_dec (coro->args);
1703 SvREFCNT_dec (coro->swap_sv); 1739 SvREFCNT_dec (coro->swap_sv);
1704 SvREFCNT_dec (CORO_THROW); 1740 SvREFCNT_dec (CORO_THROW);
1705 1741
1706 return 1; 1742 coro_call_on_destroy (aTHX_ coro);
1743
1744 /* more destruction mayhem in coro_state_free */
1707} 1745}
1708 1746
1709static int 1747static int
1710coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1748coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1711{ 1749{
1712 struct coro *coro = (struct coro *)mg->mg_ptr; 1750 struct coro *coro = (struct coro *)mg->mg_ptr;
1713 mg->mg_ptr = 0; 1751 mg->mg_ptr = 0;
1714 1752
1715 coro->hv = 0;
1716
1717 if (--coro->refcnt < 0)
1718 {
1719 coro_state_destroy (aTHX_ coro); 1753 coro_state_destroy (aTHX_ coro);
1754 SvREFCNT_dec (coro->on_destroy);
1755 SvREFCNT_dec (coro->status);
1756
1720 Safefree (coro); 1757 Safefree (coro);
1721 }
1722 1758
1723 return 0; 1759 return 0;
1724} 1760}
1725 1761
1726static int 1762static int ecb_cold
1727coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1763coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1728{ 1764{
1729 struct coro *coro = (struct coro *)mg->mg_ptr; 1765 /* called when perl clones the current process the slow way (windows process emulation) */
1730 1766 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1731 ++coro->refcnt; 1767 mg->mg_ptr = 0;
1768 mg->mg_virtual = 0;
1732 1769
1733 return 0; 1770 return 0;
1734} 1771}
1735 1772
1736static MGVTBL coro_state_vtbl = { 1773static MGVTBL coro_state_vtbl = {
… …
1761 TRANSFER (ta, 1); 1798 TRANSFER (ta, 1);
1762} 1799}
1763 1800
1764/** Coro ********************************************************************/ 1801/** Coro ********************************************************************/
1765 1802
1766INLINE void 1803ecb_inline void
1767coro_enq (pTHX_ struct coro *coro) 1804coro_enq (pTHX_ struct coro *coro)
1768{ 1805{
1769 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1806 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1770 1807
1771 SvREFCNT_inc_NN (coro->hv); 1808 SvREFCNT_inc_NN (coro->hv);
… …
1773 coro->next_ready = 0; 1810 coro->next_ready = 0;
1774 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1811 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1775 ready [1] = coro; 1812 ready [1] = coro;
1776} 1813}
1777 1814
1778INLINE struct coro * 1815ecb_inline struct coro *
1779coro_deq (pTHX) 1816coro_deq (pTHX)
1780{ 1817{
1781 int prio; 1818 int prio;
1782 1819
1783 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1820 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1836{ 1873{
1837 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1874 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1838} 1875}
1839 1876
1840/* expects to own a reference to next->hv */ 1877/* expects to own a reference to next->hv */
1841INLINE void 1878ecb_inline void
1842prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1879prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1843{ 1880{
1844 SV *prev_sv = SvRV (coro_current); 1881 SV *prev_sv = SvRV (coro_current);
1845 1882
1846 ta->prev = SvSTATE_hv (prev_sv); 1883 ta->prev = SvSTATE_hv (prev_sv);
… …
1859{ 1896{
1860 for (;;) 1897 for (;;)
1861 { 1898 {
1862 struct coro *next = coro_deq (aTHX); 1899 struct coro *next = coro_deq (aTHX);
1863 1900
1864 if (expect_true (next)) 1901 if (ecb_expect_true (next))
1865 { 1902 {
1866 /* cannot transfer to destroyed coros, skip and look for next */ 1903 /* cannot transfer to destroyed coros, skip and look for next */
1867 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1904 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1868 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1905 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1869 else 1906 else
1870 { 1907 {
1871 next->flags &= ~CF_READY; 1908 next->flags &= ~CF_READY;
1872 --coro_nready; 1909 --coro_nready;
… …
1880 /* nothing to schedule: call the idle handler */ 1917 /* nothing to schedule: call the idle handler */
1881 if (SvROK (sv_idle) 1918 if (SvROK (sv_idle)
1882 && SvOBJECT (SvRV (sv_idle))) 1919 && SvOBJECT (SvRV (sv_idle)))
1883 { 1920 {
1884 if (SvRV (sv_idle) == SvRV (coro_current)) 1921 if (SvRV (sv_idle) == SvRV (coro_current))
1922 {
1923 require_pv ("Carp");
1924
1925 {
1926 dSP;
1927
1928 ENTER;
1929 SAVETMPS;
1930
1931 PUSHMARK (SP);
1885 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1932 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1933 PUTBACK;
1934 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1935
1936 FREETMPS;
1937 LEAVE;
1938 }
1939 }
1886 1940
1887 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1941 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1888 api_ready (aTHX_ SvRV (sv_idle)); 1942 api_ready (aTHX_ SvRV (sv_idle));
1889 --coro_nready; 1943 --coro_nready;
1890 } 1944 }
… …
1905 } 1959 }
1906 } 1960 }
1907 } 1961 }
1908} 1962}
1909 1963
1910INLINE void 1964ecb_inline void
1911prepare_cede (pTHX_ struct coro_transfer_args *ta) 1965prepare_cede (pTHX_ struct coro_transfer_args *ta)
1912{ 1966{
1913 api_ready (aTHX_ coro_current); 1967 api_ready (aTHX_ coro_current);
1914 prepare_schedule (aTHX_ ta); 1968 prepare_schedule (aTHX_ ta);
1915} 1969}
1916 1970
1917INLINE void 1971ecb_inline void
1918prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1972prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1919{ 1973{
1920 SV *prev = SvRV (coro_current); 1974 SV *prev = SvRV (coro_current);
1921 1975
1922 if (coro_nready) 1976 if (coro_nready)
… …
1952{ 2006{
1953 struct coro_transfer_args ta; 2007 struct coro_transfer_args ta;
1954 2008
1955 prepare_cede (aTHX_ &ta); 2009 prepare_cede (aTHX_ &ta);
1956 2010
1957 if (expect_true (ta.prev != ta.next)) 2011 if (ecb_expect_true (ta.prev != ta.next))
1958 { 2012 {
1959 TRANSFER (ta, 1); 2013 TRANSFER (ta, 1);
1960 return 1; 2014 return 1;
1961 } 2015 }
1962 else 2016 else
… …
2005 coro->slot->runops = RUNOPS_DEFAULT; 2059 coro->slot->runops = RUNOPS_DEFAULT;
2006 } 2060 }
2007} 2061}
2008 2062
2009static void 2063static void
2064coro_push_av (pTHX_ AV *av, I32 gimme_v)
2065{
2066 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2067 {
2068 dSP;
2069
2070 if (gimme_v == G_SCALAR)
2071 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2072 else
2073 {
2074 int i;
2075 EXTEND (SP, AvFILLp (av) + 1);
2076
2077 for (i = 0; i <= AvFILLp (av); ++i)
2078 PUSHs (AvARRAY (av)[i]);
2079 }
2080
2081 PUTBACK;
2082 }
2083}
2084
2085static void
2086coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2087{
2088 if (!coro->on_destroy)
2089 coro->on_destroy = newAV ();
2090
2091 av_push (coro->on_destroy, cb);
2092}
2093
2094static void
2095slf_destroy_join (pTHX_ struct CoroSLF *frame)
2096{
2097 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2098}
2099
2100static int
2101slf_check_join (pTHX_ struct CoroSLF *frame)
2102{
2103 struct coro *coro = (struct coro *)frame->data;
2104
2105 if (!coro->status)
2106 return 1;
2107
2108 frame->destroy = 0;
2109
2110 coro_push_av (aTHX_ coro->status, GIMME_V);
2111
2112 SvREFCNT_dec ((SV *)coro->hv);
2113
2114 return 0;
2115}
2116
2117static void
2118slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2119{
2120 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2121
2122 if (items > 1)
2123 croak ("join called with too many arguments");
2124
2125 if (coro->status)
2126 frame->prepare = prepare_nop;
2127 else
2128 {
2129 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2130 frame->prepare = prepare_schedule;
2131 }
2132
2133 frame->check = slf_check_join;
2134 frame->destroy = slf_destroy_join;
2135 frame->data = (void *)coro;
2136 SvREFCNT_inc (coro->hv);
2137}
2138
2139static void
2010coro_call_on_destroy (pTHX_ struct coro *coro) 2140coro_call_on_destroy (pTHX_ struct coro *coro)
2011{ 2141{
2012 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2142 AV *od = coro->on_destroy;
2013 2143
2014 if (on_destroyp) 2144 if (!od)
2015 { 2145 return;
2016 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2017 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2018 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2019 2146
2147 coro->on_destroy = 0;
2148 sv_2mortal ((SV *)od);
2149
2020 while (AvFILLp (on_destroy) >= 0) 2150 while (AvFILLp (od) >= 0)
2151 {
2152 SV *cb = sv_2mortal (av_pop (od));
2153
2154 /* coro hv's (and only hv's at the moment) are supported as well */
2155 if (SvSTATEhv_p (aTHX_ cb))
2156 api_ready (aTHX_ cb);
2157 else
2021 { 2158 {
2022 dSP; /* don't disturb outer sp */ 2159 dSP; /* don't disturb outer sp */
2023 SV *cb = av_pop (on_destroy);
2024
2025 PUSHMARK (SP); 2160 PUSHMARK (SP);
2026 2161
2027 if (statusp) 2162 if (coro->status)
2028 { 2163 {
2029 int i; 2164 PUTBACK;
2030 EXTEND (SP, AvFILLp (status) + 1); 2165 coro_push_av (aTHX_ coro->status, G_ARRAY);
2031 2166 SPAGAIN;
2032 for (i = 0; i <= AvFILLp (status); ++i)
2033 PUSHs (AvARRAY (status)[i]);
2034 } 2167 }
2035 2168
2036 PUTBACK; 2169 PUTBACK;
2037 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2170 call_sv (cb, G_VOID | G_DISCARD);
2038 } 2171 }
2039 } 2172 }
2040} 2173}
2041 2174
2042static void 2175static void
2043slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2176coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2044{ 2177{
2045 int i; 2178 AV *av;
2046 HV *hv = (HV *)SvRV (coro_current); 2179
2047 AV *av = newAV (); 2180 if (coro->status)
2181 {
2182 av = coro->status;
2183 av_clear (av);
2184 }
2185 else
2186 av = coro->status = newAV ();
2048 2187
2049 /* items are actually not so common, so optimise for this case */ 2188 /* items are actually not so common, so optimise for this case */
2050 if (items) 2189 if (items)
2051 { 2190 {
2191 int i;
2192
2052 av_extend (av, items - 1); 2193 av_extend (av, items - 1);
2053 2194
2054 for (i = 0; i < items; ++i) 2195 for (i = 0; i < items; ++i)
2055 av_push (av, SvREFCNT_inc_NN (arg [i])); 2196 av_push (av, SvREFCNT_inc_NN (arg [i]));
2056 } 2197 }
2198}
2057 2199
2058 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2200static void
2059 2201slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2202{
2060 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2203 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2061 api_ready (aTHX_ sv_manager); 2204 api_ready (aTHX_ sv_manager);
2062 2205
2063 frame->prepare = prepare_schedule; 2206 frame->prepare = prepare_schedule;
2064 frame->check = slf_check_repeat; 2207 frame->check = slf_check_repeat;
2065 2208
2066 /* as a minor optimisation, we could unwind all stacks here */ 2209 /* as a minor optimisation, we could unwind all stacks here */
2067 /* but that puts extra pressure on pp_slf, and is not worth much */ 2210 /* but that puts extra pressure on pp_slf, and is not worth much */
2068 /*coro_unwind_stacks (aTHX);*/ 2211 /*coro_unwind_stacks (aTHX);*/
2212}
2213
2214static void
2215slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2216{
2217 HV *coro_hv = (HV *)SvRV (coro_current);
2218
2219 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2220 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2221}
2222
2223static void
2224slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2225{
2226 HV *coro_hv;
2227 struct coro *coro;
2228
2229 if (items <= 0)
2230 croak ("Coro::cancel called without coro object,");
2231
2232 coro = SvSTATE (arg [0]);
2233 coro_hv = coro->hv;
2234
2235 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2236
2237 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2238 {
2239 /* coro currently busy cancelling something, so just notify it */
2240 coro->slf_frame.data = (void *)coro;
2241
2242 frame->prepare = prepare_nop;
2243 frame->check = slf_check_nop;
2244 }
2245 else if (coro_hv == (HV *)SvRV (coro_current))
2246 {
2247 /* cancelling the current coro is allowed, and equals terminate */
2248 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2249 }
2250 else
2251 {
2252 struct coro *self = SvSTATE_current;
2253
2254 /* otherwise we cancel directly, purely for speed reasons
2255 * unfortunately, this requires some magic trickery, as
2256 * somebody else could cancel us, so we have to fight the cancellation.
2257 * this is ugly, and hopefully fully worth the extra speed.
2258 * besides, I can't get the slow-but-safe version working...
2259 */
2260 slf_frame.data = 0;
2261 self->flags |= CF_NOCANCEL;
2262 coro_state_destroy (aTHX_ coro);
2263 self->flags &= ~CF_NOCANCEL;
2264
2265 if (slf_frame.data)
2266 {
2267 /* while we were busy we have been cancelled, so terminate */
2268 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2269 }
2270 else
2271 {
2272 frame->prepare = prepare_nop;
2273 frame->check = slf_check_nop;
2274 }
2275 }
2276}
2277
2278static int
2279slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2280{
2281 frame->prepare = 0;
2282 coro_unwind_stacks (aTHX);
2283
2284 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2285
2286 return 1;
2287}
2288
2289static int
2290safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2291{
2292 if (coro->cctx)
2293 croak ("coro inside C callback, unable to cancel at this time, caught");
2294
2295 if (coro->flags & CF_NEW)
2296 {
2297 coro_set_status (aTHX_ coro, arg, items);
2298 coro_state_destroy (aTHX_ coro);
2299 }
2300 else
2301 {
2302 if (!coro->slf_frame.prepare)
2303 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2304
2305 slf_destroy (aTHX_ coro);
2306
2307 coro_set_status (aTHX_ coro, arg, items);
2308 coro->slf_frame.prepare = prepare_nop;
2309 coro->slf_frame.check = slf_check_safe_cancel;
2310
2311 api_ready (aTHX_ (SV *)coro->hv);
2312 }
2313
2314 return 1;
2069} 2315}
2070 2316
2071/*****************************************************************************/ 2317/*****************************************************************************/
2072/* async pool handler */ 2318/* async pool handler */
2073 2319
… …
2104slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2350slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2105{ 2351{
2106 HV *hv = (HV *)SvRV (coro_current); 2352 HV *hv = (HV *)SvRV (coro_current);
2107 struct coro *coro = SvSTATE_hv ((SV *)hv); 2353 struct coro *coro = SvSTATE_hv ((SV *)hv);
2108 2354
2109 if (expect_true (coro->saved_deffh)) 2355 if (ecb_expect_true (coro->saved_deffh))
2110 { 2356 {
2111 /* subsequent iteration */ 2357 /* subsequent iteration */
2112 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2358 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2113 coro->saved_deffh = 0; 2359 coro->saved_deffh = 0;
2114 2360
2115 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2361 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2116 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2362 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2117 { 2363 {
2118 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2364 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2119 coro->invoke_av = newAV (); 2365 return;
2120
2121 frame->prepare = prepare_nop;
2122 } 2366 }
2123 else 2367 else
2124 { 2368 {
2125 av_clear (GvAV (PL_defgv)); 2369 av_clear (GvAV (PL_defgv));
2126 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2370 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2176 2420
2177static int 2421static int
2178slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2422slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2179{ 2423{
2180 SV *data = (SV *)frame->data; 2424 SV *data = (SV *)frame->data;
2181 2425
2182 if (CORO_THROW) 2426 if (CORO_THROW)
2183 return 0; 2427 return 0;
2184 2428
2185 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2429 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2186 return 1; 2430 return 1;
… …
2222 cb = sv_2mortal (coro->rouse_cb); 2466 cb = sv_2mortal (coro->rouse_cb);
2223 coro->rouse_cb = 0; 2467 coro->rouse_cb = 0;
2224 } 2468 }
2225 2469
2226 if (!SvROK (cb) 2470 if (!SvROK (cb)
2227 || SvTYPE (SvRV (cb)) != SVt_PVCV 2471 || SvTYPE (SvRV (cb)) != SVt_PVCV
2228 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2472 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2229 croak ("Coro::rouse_wait called with illegal callback argument,"); 2473 croak ("Coro::rouse_wait called with illegal callback argument,");
2230 2474
2231 { 2475 {
2232 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2476 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2349static void 2593static void
2350slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2594slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2351{ 2595{
2352 frame->prepare = prepare_cede_notself; 2596 frame->prepare = prepare_cede_notself;
2353 frame->check = slf_check_nop; 2597 frame->check = slf_check_nop;
2598}
2599
2600/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2601static void
2602slf_destroy (pTHX_ struct coro *coro)
2603{
2604 struct CoroSLF frame = coro->slf_frame;
2605
2606 /*
2607 * The on_destroy below most likely is from an SLF call.
2608 * Since by definition the SLF call will not finish when we destroy
2609 * the coro, we will have to force-finish it here, otherwise
2610 * cleanup functions cannot call SLF functions.
2611 */
2612 coro->slf_frame.prepare = 0;
2613
2614 /* this callback is reserved for slf functions needing to do cleanup */
2615 if (frame.destroy && frame.prepare && !PL_dirty)
2616 frame.destroy (aTHX_ &frame);
2354} 2617}
2355 2618
2356/* 2619/*
2357 * these not obviously related functions are all rolled into one 2620 * these not obviously related functions are all rolled into one
2358 * function to increase chances that they all will call transfer with the same 2621 * function to increase chances that they all will call transfer with the same
… …
2365 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2628 I32 checkmark; /* mark SP to see how many elements check has pushed */
2366 2629
2367 /* set up the slf frame, unless it has already been set-up */ 2630 /* set up the slf frame, unless it has already been set-up */
2368 /* the latter happens when a new coro has been started */ 2631 /* the latter happens when a new coro has been started */
2369 /* or when a new cctx was attached to an existing coroutine */ 2632 /* or when a new cctx was attached to an existing coroutine */
2370 if (expect_true (!slf_frame.prepare)) 2633 if (ecb_expect_true (!slf_frame.prepare))
2371 { 2634 {
2372 /* first iteration */ 2635 /* first iteration */
2373 dSP; 2636 dSP;
2374 SV **arg = PL_stack_base + TOPMARK + 1; 2637 SV **arg = PL_stack_base + TOPMARK + 1;
2375 int items = SP - arg; /* args without function object */ 2638 int items = SP - arg; /* args without function object */
… …
2416 while (slf_frame.check (aTHX_ &slf_frame)); 2679 while (slf_frame.check (aTHX_ &slf_frame));
2417 2680
2418 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2681 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2419 2682
2420 /* exception handling */ 2683 /* exception handling */
2421 if (expect_false (CORO_THROW)) 2684 if (ecb_expect_false (CORO_THROW))
2422 { 2685 {
2423 SV *exception = sv_2mortal (CORO_THROW); 2686 SV *exception = sv_2mortal (CORO_THROW);
2424 2687
2425 CORO_THROW = 0; 2688 CORO_THROW = 0;
2426 sv_setsv (ERRSV, exception); 2689 sv_setsv (ERRSV, exception);
2427 croak (0); 2690 croak (0);
2428 } 2691 }
2429 2692
2430 /* return value handling - mostly like entersub */ 2693 /* return value handling - mostly like entersub */
2431 /* make sure we put something on the stack in scalar context */ 2694 /* make sure we put something on the stack in scalar context */
2432 if (GIMME_V == G_SCALAR) 2695 if (GIMME_V == G_SCALAR
2696 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2433 { 2697 {
2434 dSP; 2698 dSP;
2435 SV **bot = PL_stack_base + checkmark; 2699 SV **bot = PL_stack_base + checkmark;
2436 2700
2437 if (sp == bot) /* too few, push undef */ 2701 if (sp == bot) /* too few, push undef */
2438 bot [1] = &PL_sv_undef; 2702 bot [1] = &PL_sv_undef;
2439 else if (sp != bot + 1) /* too many, take last one */ 2703 else /* too many, take last one */
2440 bot [1] = *sp; 2704 bot [1] = *sp;
2441 2705
2442 SP = bot + 1; 2706 SP = bot + 1;
2443 2707
2444 PUTBACK; 2708 PUTBACK;
… …
2551{ 2815{
2552 PerlIOBuf base; 2816 PerlIOBuf base;
2553 NV next, every; 2817 NV next, every;
2554} PerlIOCede; 2818} PerlIOCede;
2555 2819
2556static IV 2820static IV ecb_cold
2557PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2821PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2558{ 2822{
2559 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2823 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2560 2824
2561 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2825 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2562 self->next = nvtime () + self->every; 2826 self->next = nvtime () + self->every;
2563 2827
2564 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2828 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2565} 2829}
2566 2830
2567static SV * 2831static SV * ecb_cold
2568PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2832PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2569{ 2833{
2570 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2834 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2571 2835
2572 return newSVnv (self->every); 2836 return newSVnv (self->every);
… …
2684 SvREFCNT_dec (cb); 2948 SvREFCNT_dec (cb);
2685 } 2949 }
2686} 2950}
2687 2951
2688static void 2952static void
2689coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2953coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2690{ 2954{
2691 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2955 /* call $sem->adjust (0) to possibly wake up some other waiters */
2692 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2956 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2693} 2957}
2694 2958
2695static int 2959static int
2696slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2960slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2697{ 2961{
2698 AV *av = (AV *)frame->data; 2962 AV *av = (AV *)frame->data;
2699 SV *count_sv = AvARRAY (av)[0]; 2963 SV *count_sv = AvARRAY (av)[0];
2964 SV *coro_hv = SvRV (coro_current);
2965
2966 frame->destroy = 0;
2700 2967
2701 /* if we are about to throw, don't actually acquire the lock, just throw */ 2968 /* if we are about to throw, don't actually acquire the lock, just throw */
2702 if (CORO_THROW) 2969 if (ecb_expect_false (CORO_THROW))
2970 {
2971 /* we still might be responsible for the semaphore, so wake up others */
2972 coro_semaphore_adjust (aTHX_ av, 0);
2973
2703 return 0; 2974 return 0;
2975 }
2704 else if (SvIVX (count_sv) > 0) 2976 else if (SvIVX (count_sv) > 0)
2705 { 2977 {
2706 SvSTATE_current->on_destroy = 0;
2707
2708 if (acquire) 2978 if (acquire)
2709 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2979 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2710 else 2980 else
2711 coro_semaphore_adjust (aTHX_ av, 0); 2981 coro_semaphore_adjust (aTHX_ av, 0);
2712 2982
… …
2716 { 2986 {
2717 int i; 2987 int i;
2718 /* if we were woken up but can't down, we look through the whole */ 2988 /* if we were woken up but can't down, we look through the whole */
2719 /* waiters list and only add us if we aren't in there already */ 2989 /* waiters list and only add us if we aren't in there already */
2720 /* this avoids some degenerate memory usage cases */ 2990 /* this avoids some degenerate memory usage cases */
2721 2991 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2722 for (i = 1; i <= AvFILLp (av); ++i)
2723 if (AvARRAY (av)[i] == SvRV (coro_current)) 2992 if (AvARRAY (av)[i] == coro_hv)
2724 return 1; 2993 return 1;
2725 2994
2726 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2995 av_push (av, SvREFCNT_inc (coro_hv));
2727 return 1; 2996 return 1;
2728 } 2997 }
2729} 2998}
2730 2999
2731static int 3000static int
… …
2754 { 3023 {
2755 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3024 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2756 3025
2757 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3026 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2758 frame->prepare = prepare_schedule; 3027 frame->prepare = prepare_schedule;
2759
2760 /* to avoid race conditions when a woken-up coro gets terminated */ 3028 /* to avoid race conditions when a woken-up coro gets terminated */
2761 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3029 /* we arrange for a temporary on_destroy that calls adjust (0) */
2762 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3030 frame->destroy = coro_semaphore_destroy;
2763 } 3031 }
2764} 3032}
2765 3033
2766static void 3034static void
2767slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3035slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2936 /* it quickly returns */ 3204 /* it quickly returns */
2937 if (CORO_THROW) 3205 if (CORO_THROW)
2938 return 0; 3206 return 0;
2939 3207
2940 /* one element that is an RV? repeat! */ 3208 /* one element that is an RV? repeat! */
2941 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3209 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2942 return 1; 3210 return 1;
2943 3211
2944 /* restore status */ 3212 /* restore status */
2945 { 3213 {
2946 SV *data_sv = av_pop (state); 3214 SV *data_sv = av_pop (state);
… …
2985 dSP; 3253 dSP;
2986 3254
2987 static SV *prio_cv; 3255 static SV *prio_cv;
2988 static SV *prio_sv; 3256 static SV *prio_sv;
2989 3257
2990 if (expect_false (!prio_cv)) 3258 if (ecb_expect_false (!prio_cv))
2991 { 3259 {
2992 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3260 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2993 prio_sv = newSViv (0); 3261 prio_sv = newSViv (0);
2994 } 3262 }
2995 3263
… …
3101 } 3369 }
3102 3370
3103 return coro_sv; 3371 return coro_sv;
3104} 3372}
3105 3373
3374#ifndef __cplusplus
3375ecb_cold XS(boot_Coro__State);
3376#endif
3377
3378#if CORO_JIT
3379
3380static void ecb_noinline ecb_cold
3381pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3382{
3383 dSP;
3384 AV *av = newAV ();
3385
3386 av_store (av, 3, newSVuv (d));
3387 av_store (av, 2, newSVuv (c));
3388 av_store (av, 1, newSVuv (b));
3389 av_store (av, 0, newSVuv (a));
3390
3391 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3392
3393 PUTBACK;
3394}
3395
3396static void ecb_noinline ecb_cold
3397jit_init (pTHX)
3398{
3399 dSP;
3400 SV *load, *save;
3401 char *map_base;
3402 char *load_ptr, *save_ptr;
3403 STRLEN load_len, save_len, map_len;
3404 int count;
3405
3406 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3407
3408 PUSHMARK (SP);
3409 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3410 #include "state.h"
3411 count = call_pv ("Coro::State::_jit", G_ARRAY);
3412 SPAGAIN;
3413
3414 save = POPs; save_ptr = SvPVbyte (save, save_len);
3415 load = POPs; load_ptr = SvPVbyte (load, load_len);
3416
3417 map_len = load_len + save_len + 16;
3418
3419 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3420
3421 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3422
3423 load_perl_slots = (load_save_perl_slots_type)map_base;
3424 memcpy (map_base, load_ptr, load_len);
3425
3426 map_base += (load_len + 15) & ~15;
3427
3428 save_perl_slots = (load_save_perl_slots_type)map_base;
3429 memcpy (map_base, save_ptr, save_len);
3430
3431 /* we are good citizens and try to make the page read-only, so the evil evil */
3432 /* hackers might have it a bit more difficult */
3433 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3434
3435 PUTBACK;
3436 eval_pv ("undef &Coro::State::_jit", 1);
3437}
3438
3439#endif
3440
3106MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3441MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3107 3442
3108PROTOTYPES: DISABLE 3443PROTOTYPES: DISABLE
3109 3444
3110BOOT: 3445BOOT:
… …
3112#ifdef USE_ITHREADS 3447#ifdef USE_ITHREADS
3113# if CORO_PTHREAD 3448# if CORO_PTHREAD
3114 coro_thx = PERL_GET_CONTEXT; 3449 coro_thx = PERL_GET_CONTEXT;
3115# endif 3450# endif
3116#endif 3451#endif
3117 BOOT_PAGESIZE; 3452 /* perl defines these to check for existance first, but why it doesn't */
3453 /* just create them one at init time is not clear to me, except for */
3454 /* programs trying to delete them, but... */
3455 /* anyway, we declare this as invalid and make sure they are initialised here */
3456 DEFSV;
3457 ERRSV;
3118 3458
3119 cctx_current = cctx_new_empty (); 3459 cctx_current = cctx_new_empty ();
3120 3460
3121 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3461 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3122 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3462 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3165 coroapi.prepare_cede_notself = prepare_cede_notself; 3505 coroapi.prepare_cede_notself = prepare_cede_notself;
3166 3506
3167 time_init (aTHX); 3507 time_init (aTHX);
3168 3508
3169 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3509 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3510#if CORO_JIT
3511 PUTBACK;
3512 jit_init (aTHX);
3513 SPAGAIN;
3514#endif
3170} 3515}
3171 3516
3172SV * 3517SV *
3173new (SV *klass, ...) 3518new (SV *klass, ...)
3174 ALIAS: 3519 ALIAS:
… …
3181void 3526void
3182transfer (...) 3527transfer (...)
3183 PROTOTYPE: $$ 3528 PROTOTYPE: $$
3184 CODE: 3529 CODE:
3185 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3530 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3186
3187bool
3188_destroy (SV *coro_sv)
3189 CODE:
3190 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3191 OUTPUT:
3192 RETVAL
3193
3194void
3195_exit (int code)
3196 PROTOTYPE: $
3197 CODE:
3198 _exit (code);
3199 3531
3200SV * 3532SV *
3201clone (Coro::State coro) 3533clone (Coro::State coro)
3202 CODE: 3534 CODE:
3203{ 3535{
… …
3258void 3590void
3259list () 3591list ()
3260 PROTOTYPE: 3592 PROTOTYPE:
3261 PPCODE: 3593 PPCODE:
3262{ 3594{
3263 struct coro *coro; 3595 struct coro *coro;
3264 for (coro = coro_first; coro; coro = coro->next) 3596 for (coro = coro_first; coro; coro = coro->next)
3265 if (coro->hv) 3597 if (coro->hv)
3266 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3598 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3267} 3599}
3268 3600
… …
3273 CODE: 3605 CODE:
3274{ 3606{
3275 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3607 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3276 { 3608 {
3277 struct coro *current = SvSTATE_current; 3609 struct coro *current = SvSTATE_current;
3610 struct CoroSLF slf_save;
3278 3611
3279 if (current != coro) 3612 if (current != coro)
3280 { 3613 {
3281 PUTBACK; 3614 PUTBACK;
3282 save_perl (aTHX_ current); 3615 save_perl (aTHX_ current);
3283 load_perl (aTHX_ coro); 3616 load_perl (aTHX_ coro);
3617 /* the coro is most likely in an active SLF call.
3618 * while not strictly required (the code we execute is
3619 * not allowed to call any SLF functions), it's cleaner
3620 * to reinitialise the slf_frame and restore it later.
3621 * This might one day allow us to actually do SLF calls
3622 * from code executed here.
3623 */
3624 slf_save = slf_frame;
3625 slf_frame.prepare = 0;
3284 SPAGAIN; 3626 SPAGAIN;
3285 } 3627 }
3286 3628
3287 PUSHSTACK; 3629 PUSHSTACK;
3288 3630
… …
3298 SPAGAIN; 3640 SPAGAIN;
3299 3641
3300 if (current != coro) 3642 if (current != coro)
3301 { 3643 {
3302 PUTBACK; 3644 PUTBACK;
3645 slf_frame = slf_save;
3303 save_perl (aTHX_ coro); 3646 save_perl (aTHX_ coro);
3304 load_perl (aTHX_ current); 3647 load_perl (aTHX_ current);
3305 SPAGAIN; 3648 SPAGAIN;
3306 } 3649 }
3307 } 3650 }
… …
3312 PROTOTYPE: $ 3655 PROTOTYPE: $
3313 ALIAS: 3656 ALIAS:
3314 is_ready = CF_READY 3657 is_ready = CF_READY
3315 is_running = CF_RUNNING 3658 is_running = CF_RUNNING
3316 is_new = CF_NEW 3659 is_new = CF_NEW
3317 is_destroyed = CF_DESTROYED 3660 is_destroyed = CF_ZOMBIE
3661 is_zombie = CF_ZOMBIE
3318 is_suspended = CF_SUSPENDED 3662 is_suspended = CF_SUSPENDED
3319 CODE: 3663 CODE:
3320 RETVAL = boolSV (coro->flags & ix); 3664 RETVAL = boolSV (coro->flags & ix);
3321 OUTPUT: 3665 OUTPUT:
3322 RETVAL 3666 RETVAL
3323 3667
3324void 3668void
3325throw (Coro::State self, SV *exception = &PL_sv_undef) 3669throw (SV *self, SV *exception = &PL_sv_undef)
3326 PROTOTYPE: $;$ 3670 PROTOTYPE: $;$
3327 CODE: 3671 CODE:
3328{ 3672{
3673 struct coro *coro = SvSTATE (self);
3329 struct coro *current = SvSTATE_current; 3674 struct coro *current = SvSTATE_current;
3330 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3675 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3331 SvREFCNT_dec (*exceptionp); 3676 SvREFCNT_dec (*exceptionp);
3332 SvGETMAGIC (exception); 3677 SvGETMAGIC (exception);
3333 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3678 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3679
3680 api_ready (aTHX_ self);
3334} 3681}
3335 3682
3336void 3683void
3337api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3684api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3338 PROTOTYPE: $;$ 3685 PROTOTYPE: $;$
… …
3393 3740
3394void 3741void
3395cancel (Coro::State self) 3742cancel (Coro::State self)
3396 CODE: 3743 CODE:
3397 coro_state_destroy (aTHX_ self); 3744 coro_state_destroy (aTHX_ self);
3398 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3399 3745
3400SV * 3746SV *
3401enable_times (int enabled = enable_times) 3747enable_times (int enabled = enable_times)
3402 CODE: 3748 CODE:
3403{ 3749{
… …
3416 3762
3417void 3763void
3418times (Coro::State self) 3764times (Coro::State self)
3419 PPCODE: 3765 PPCODE:
3420{ 3766{
3421 struct coro *current = SvSTATE (coro_current); 3767 struct coro *current = SvSTATE (coro_current);
3422 3768
3423 if (expect_false (current == self)) 3769 if (ecb_expect_false (current == self))
3424 { 3770 {
3425 coro_times_update (); 3771 coro_times_update ();
3426 coro_times_add (SvSTATE (coro_current)); 3772 coro_times_add (SvSTATE (coro_current));
3427 } 3773 }
3428 3774
3429 EXTEND (SP, 2); 3775 EXTEND (SP, 2);
3430 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3776 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3431 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3777 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3432 3778
3433 if (expect_false (current == self)) 3779 if (ecb_expect_false (current == self))
3434 coro_times_sub (SvSTATE (coro_current)); 3780 coro_times_sub (SvSTATE (coro_current));
3435} 3781}
3436 3782
3437void 3783void
3438swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3784swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3459BOOT: 3805BOOT:
3460{ 3806{
3461 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3807 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3462 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3808 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3463 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3809 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3464 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3465 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3810 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3466 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3811 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3467 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3812 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3468 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3813 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3469 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3814 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3470 3815
3471 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3816 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3472 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3817 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3473 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3818 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3474 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3819 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3475 3820
3476 coro_stash = gv_stashpv ("Coro", TRUE); 3821 coro_stash = gv_stashpv ("Coro", TRUE);
3477 3822
3478 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3823 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3479 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3824 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3480 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3825 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3508 api_ready (aTHX_ RETVAL); 3853 api_ready (aTHX_ RETVAL);
3509 OUTPUT: 3854 OUTPUT:
3510 RETVAL 3855 RETVAL
3511 3856
3512void 3857void
3858_destroy (Coro::State coro)
3859 CODE:
3860 /* used by the manager thread */
3861 coro_state_destroy (aTHX_ coro);
3862
3863void
3864on_destroy (Coro::State coro, SV *cb)
3865 CODE:
3866 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3867
3868void
3869join (...)
3870 CODE:
3871 CORO_EXECUTE_SLF_XS (slf_init_join);
3872
3873void
3513terminate (...) 3874terminate (...)
3514 CODE: 3875 CODE:
3515 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3876 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3877
3878void
3879cancel (...)
3880 CODE:
3881 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3882
3883int
3884safe_cancel (Coro::State self, ...)
3885 C_ARGS: aTHX_ self, &ST (1), items - 1
3516 3886
3517void 3887void
3518schedule (...) 3888schedule (...)
3519 CODE: 3889 CODE:
3520 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3890 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3677 on_leave = 1 4047 on_leave = 1
3678 PROTOTYPE: & 4048 PROTOTYPE: &
3679 CODE: 4049 CODE:
3680{ 4050{
3681 struct coro *coro = SvSTATE_current; 4051 struct coro *coro = SvSTATE_current;
3682 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4052 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3683 4053
3684 block = s_get_cv_croak (block); 4054 block = s_get_cv_croak (block);
3685 4055
3686 if (!*avp) 4056 if (!*avp)
3687 *avp = newAV (); 4057 *avp = newAV ();
… …
3707 4077
3708SV * 4078SV *
3709new (SV *klass, SV *count = 0) 4079new (SV *klass, SV *count = 0)
3710 CODE: 4080 CODE:
3711{ 4081{
3712 int semcnt = 1; 4082 int semcnt = 1;
3713 4083
3714 if (count) 4084 if (count)
3715 { 4085 {
3716 SvGETMAGIC (count); 4086 SvGETMAGIC (count);
3717 4087
… …
3777 XSRETURN_NO; 4147 XSRETURN_NO;
3778} 4148}
3779 4149
3780void 4150void
3781waiters (SV *self) 4151waiters (SV *self)
3782 PPCODE: 4152 PPCODE:
3783{ 4153{
3784 AV *av = (AV *)SvRV (self); 4154 AV *av = (AV *)SvRV (self);
3785 int wcount = AvFILLp (av) + 1 - 1; 4155 int wcount = AvFILLp (av) + 1 - 1;
3786 4156
3787 if (GIMME_V == G_SCALAR) 4157 if (GIMME_V == G_SCALAR)
… …
3796} 4166}
3797 4167
3798MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4168MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3799 4169
3800void 4170void
3801_may_delete (SV *sem, int count, int extra_refs) 4171_may_delete (SV *sem, int count, unsigned int extra_refs)
3802 PPCODE: 4172 PPCODE:
3803{ 4173{
3804 AV *av = (AV *)SvRV (sem); 4174 AV *av = (AV *)SvRV (sem);
3805 4175
3806 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4176 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3807 && AvFILLp (av) == 0 /* no waiters, just count */ 4177 && AvFILLp (av) == 0 /* no waiters, just count */
3808 && SvIV (AvARRAY (av)[0]) == count) 4178 && SvIV (AvARRAY (av)[0]) == count)
3809 XSRETURN_YES; 4179 XSRETURN_YES;
… …
3830 4200
3831void 4201void
3832broadcast (SV *self) 4202broadcast (SV *self)
3833 CODE: 4203 CODE:
3834{ 4204{
3835 AV *av = (AV *)SvRV (self); 4205 AV *av = (AV *)SvRV (self);
3836 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4206 coro_signal_wake (aTHX_ av, AvFILLp (av));
3837} 4207}
3838 4208
3839void 4209void
3840send (SV *self) 4210send (SV *self)
… …
3848 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4218 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3849} 4219}
3850 4220
3851IV 4221IV
3852awaited (SV *self) 4222awaited (SV *self)
3853 CODE: 4223 CODE:
3854 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4224 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3855 OUTPUT: 4225 OUTPUT:
3856 RETVAL 4226 RETVAL
3857 4227
3858 4228
… …
3863 4233
3864void 4234void
3865_schedule (...) 4235_schedule (...)
3866 CODE: 4236 CODE:
3867{ 4237{
3868 static int incede; 4238 static int incede;
3869 4239
3870 api_cede_notself (aTHX); 4240 api_cede_notself (aTHX);
3871 4241
3872 ++incede; 4242 ++incede;
3873 while (coro_nready >= incede && api_cede (aTHX)) 4243 while (coro_nready >= incede && api_cede (aTHX))
… …
3917 { 4287 {
3918 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4288 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3919 coro_old_pp_sselect = 0; 4289 coro_old_pp_sselect = 0;
3920 } 4290 }
3921 4291
4292MODULE = Coro::State PACKAGE = Coro::Util
4293
4294void
4295_exit (int code)
4296 CODE:
4297 _exit (code);
4298
4299NV
4300time ()
4301 CODE:
4302 RETVAL = nvtime (aTHX);
4303 OUTPUT:
4304 RETVAL
4305
4306NV
4307gettimeofday ()
4308 PPCODE:
4309{
4310 UV tv [2];
4311 u2time (aTHX_ tv);
4312 EXTEND (SP, 2);
4313 PUSHs (sv_2mortal (newSVuv (tv [0])));
4314 PUSHs (sv_2mortal (newSVuv (tv [1])));
4315}
4316

Diff Legend

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