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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.393 by root, Fri Apr 29 17:38:56 2011 UTC vs.
Revision 1.447 by root, Tue Oct 14 21:53:32 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
… …
200 185
201static coro_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 */
211 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */ 199 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
212}; 200};
213 201
214/* 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 */
215typedef struct 203typedef struct
216{ 204{
217 SV *defsv;
218 AV *defav;
219 SV *errsv;
220 SV *irsgv;
221 HV *hinthv;
222#define VAR(name,type) type name; 205 #define VARx(name,expr,type) type name;
223# include "state.h" 206 #include "state.h"
224#undef VAR
225} perl_slots; 207} perl_slots;
226 208
209/* how many context stack entries do we need for perl_slots */
227#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 210#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
228 211
229/* this is a structure representing a perl-level coroutine */ 212/* this is a structure representing a perl-level coroutine */
230struct coro { 213struct coro
214{
231 /* the C coroutine allocated to this perl coroutine, if any */ 215 /* the C coroutine allocated to this perl coroutine, if any */
232 coro_cctx *cctx; 216 coro_cctx *cctx;
233 217
234 /* ready queue */ 218 /* ready queue */
235 struct coro *next_ready; 219 struct coro *next_ready;
… …
237 /* state data */ 221 /* state data */
238 struct CoroSLF slf_frame; /* saved slf frame */ 222 struct CoroSLF slf_frame; /* saved slf frame */
239 AV *mainstack; 223 AV *mainstack;
240 perl_slots *slot; /* basically the saved sp */ 224 perl_slots *slot; /* basically the saved sp */
241 225
242 CV *startcv; /* the CV to execute */ 226 CV *startcv; /* the CV to execute */
243 AV *args; /* data associated with this coroutine (initial args) */ 227 AV *args; /* data associated with this coroutine (initial args) */
244 int refcnt; /* coroutines are refcounted, yes */
245 int flags; /* CF_ flags */ 228 int flags; /* CF_ flags */
246 HV *hv; /* the perl hash associated with this coro, if any */ 229 HV *hv; /* the perl hash associated with this coro, if any */
247 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
248 230
249 /* statistics */ 231 /* statistics */
250 int usecount; /* number of transfers to this coro */ 232 int usecount; /* number of transfers to this coro */
251 233
252 /* coro process data */ 234 /* coro process data */
253 int prio; 235 int prio;
254 SV *except; /* exception to be thrown */ 236 SV *except; /* exception to be thrown */
255 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 */
256 240
257 /* async_pool */ 241 /* async_pool */
258 SV *saved_deffh; 242 SV *saved_deffh;
259 SV *invoke_cb; 243 SV *invoke_cb;
260 AV *invoke_av; 244 AV *invoke_av;
… …
292 276
293/* for Coro.pm */ 277/* for Coro.pm */
294static SV *coro_current; 278static SV *coro_current;
295static SV *coro_readyhook; 279static SV *coro_readyhook;
296static 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 */
297static CV *cv_coro_run, *cv_coro_terminate; 281static CV *cv_coro_run;
298static struct coro *coro_first; 282static struct coro *coro_first;
299#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
300 307
301/** Coro::Select ************************************************************/ 308/** Coro::Select ************************************************************/
302 309
303static OP *(*coro_old_pp_sselect) (pTHX); 310static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select; 311static SV *coro_select_select;
… …
320 327
321/** time stuff **************************************************************/ 328/** time stuff **************************************************************/
322 329
323#ifdef HAS_GETTIMEOFDAY 330#ifdef HAS_GETTIMEOFDAY
324 331
325static void 332ecb_inline void
326coro_u2time (pTHX_ UV ret[2]) 333coro_u2time (pTHX_ UV ret[2])
327{ 334{
328 struct timeval tv; 335 struct timeval tv;
329 gettimeofday (&tv, 0); 336 gettimeofday (&tv, 0);
330 337
331 ret [0] = tv.tv_sec; 338 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec; 339 ret [1] = tv.tv_usec;
333} 340}
334 341
335static double 342ecb_inline double
336coro_nvtime () 343coro_nvtime (void)
337{ 344{
338 struct timeval tv; 345 struct timeval tv;
339 gettimeofday (&tv, 0); 346 gettimeofday (&tv, 0);
340 347
341 return tv.tv_sec + tv.tv_usec * 1e-6; 348 return tv.tv_sec + tv.tv_usec * 1e-6;
342} 349}
343 350
344static void 351ecb_inline void
345time_init (pTHX) 352time_init (pTHX)
346{ 353{
347 nvtime = coro_nvtime; 354 nvtime = coro_nvtime;
348 u2time = coro_u2time; 355 u2time = coro_u2time;
349} 356}
350 357
351#else 358#else
352 359
353static void 360ecb_inline void
354time_init (pTHX) 361time_init (pTHX)
355{ 362{
356 SV **svp; 363 SV **svp;
357 364
358 require_pv ("Time/HiRes.pm"); 365 require_pv ("Time/HiRes.pm");
359 366
360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 367 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
361 368
362 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 369 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 370 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
364 371
… …
370 377
371#endif 378#endif
372 379
373/** lowlevel stuff **********************************************************/ 380/** lowlevel stuff **********************************************************/
374 381
375static SV * 382static SV * ecb_noinline
376coro_get_sv (pTHX_ const char *name, int create) 383coro_get_sv (pTHX_ const char *name, int create)
377{ 384{
378#if PERL_VERSION_ATLEAST (5,10,0) 385#if PERL_VERSION_ATLEAST (5,10,0)
379 /* 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 */
380 get_sv (name, create); 387 get_sv (name, create);
381#endif 388#endif
382 return get_sv (name, create); 389 return get_sv (name, create);
383} 390}
384 391
385static AV * 392static AV * ecb_noinline
386coro_get_av (pTHX_ const char *name, int create) 393coro_get_av (pTHX_ const char *name, int create)
387{ 394{
388#if PERL_VERSION_ATLEAST (5,10,0) 395#if PERL_VERSION_ATLEAST (5,10,0)
389 /* 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 */
390 get_av (name, create); 397 get_av (name, create);
391#endif 398#endif
392 return get_av (name, create); 399 return get_av (name, create);
393} 400}
394 401
395static HV * 402static HV * ecb_noinline
396coro_get_hv (pTHX_ const char *name, int create) 403coro_get_hv (pTHX_ const char *name, int create)
397{ 404{
398#if PERL_VERSION_ATLEAST (5,10,0) 405#if PERL_VERSION_ATLEAST (5,10,0)
399 /* 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 */
400 get_hv (name, create); 407 get_hv (name, create);
401#endif 408#endif
402 return get_hv (name, create); 409 return get_hv (name, create);
403} 410}
404 411
405INLINE void 412ecb_inline void
406coro_times_update () 413coro_times_update (void)
407{ 414{
408#ifdef coro_clock_gettime 415#ifdef coro_clock_gettime
409 struct timespec ts; 416 struct timespec ts;
410 417
411 ts.tv_sec = ts.tv_nsec = 0; 418 ts.tv_sec = ts.tv_nsec = 0;
… …
423 time_real [0] = tv [0]; 430 time_real [0] = tv [0];
424 time_real [1] = tv [1] * 1000; 431 time_real [1] = tv [1] * 1000;
425#endif 432#endif
426} 433}
427 434
428INLINE void 435ecb_inline void
429coro_times_add (struct coro *c) 436coro_times_add (struct coro *c)
430{ 437{
431 c->t_real [1] += time_real [1]; 438 c->t_real [1] += time_real [1];
432 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]; }
433 c->t_real [0] += time_real [0]; 440 c->t_real [0] += time_real [0];
… …
435 c->t_cpu [1] += time_cpu [1]; 442 c->t_cpu [1] += time_cpu [1];
436 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]; }
437 c->t_cpu [0] += time_cpu [0]; 444 c->t_cpu [0] += time_cpu [0];
438} 445}
439 446
440INLINE void 447ecb_inline void
441coro_times_sub (struct coro *c) 448coro_times_sub (struct coro *c)
442{ 449{
443 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]; }
444 c->t_real [1] -= time_real [1]; 451 c->t_real [1] -= time_real [1];
445 c->t_real [0] -= time_real [0]; 452 c->t_real [0] -= time_real [0];
… …
453/* magic glue */ 460/* magic glue */
454 461
455#define CORO_MAGIC_type_cv 26 462#define CORO_MAGIC_type_cv 26
456#define CORO_MAGIC_type_state PERL_MAGIC_ext 463#define CORO_MAGIC_type_state PERL_MAGIC_ext
457 464
458#define CORO_MAGIC_NN(sv, type) \ 465#define CORO_MAGIC_NN(sv, type) \
459 (expect_true (SvMAGIC (sv)->mg_type == type) \ 466 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
460 ? SvMAGIC (sv) \ 467 ? SvMAGIC (sv) \
461 : mg_find (sv, type)) 468 : mg_find (sv, type))
462 469
463#define CORO_MAGIC(sv, type) \ 470#define CORO_MAGIC(sv, type) \
464 (expect_true (SvMAGIC (sv)) \ 471 (ecb_expect_true (SvMAGIC (sv)) \
465 ? CORO_MAGIC_NN (sv, type) \ 472 ? CORO_MAGIC_NN (sv, type) \
466 : 0) 473 : 0)
467 474
468#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)
469#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)
470 477
471INLINE 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 *
472SvSTATE_ (pTHX_ SV *coro) 494SvSTATE_ (pTHX_ SV *coro)
473{ 495{
474 HV *stash;
475 MAGIC *mg; 496 MAGIC *mg;
476 497
477 if (SvROK (coro)) 498 if (SvROK (coro))
478 coro = SvRV (coro); 499 coro = SvRV (coro);
479 500
480 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 501 mg = SvSTATEhv_p (aTHX_ coro);
502 if (!mg)
481 croak ("Coro::State object required"); 503 croak ("Coro::State object required");
482 504
483 stash = SvSTASH (coro);
484 if (expect_false (stash != coro_stash && stash != coro_state_stash))
485 {
486 /* very slow, but rare, check */
487 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
488 croak ("Coro::State object required");
489 }
490
491 mg = CORO_MAGIC_state (coro);
492 return (struct coro *)mg->mg_ptr; 505 return (struct coro *)mg->mg_ptr;
493} 506}
494 507
495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 508#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
496 509
… …
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 512#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500 513
501/*****************************************************************************/ 514/*****************************************************************************/
502/* padlist management and caching */ 515/* padlist management and caching */
503 516
504static AV * 517ecb_inline PADLIST *
505coro_derive_padlist (pTHX_ CV *cv) 518coro_derive_padlist (pTHX_ CV *cv)
506{ 519{
507 AV *padlist = CvPADLIST (cv); 520 PADLIST *padlist = CvPADLIST (cv);
508 AV *newpadlist, *newpad; 521 PADLIST *newpadlist;
522 PAD *newpad;
523 PADOFFSET off = PadlistMAX (padlist) + 1;
509 524
510 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. */
511 AvREAL_off (newpadlist); 553 AvREAL_off (newpadlist);
512#if PERL_VERSION_ATLEAST (5,10,0)
513 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
514#else
515 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
516#endif 554#endif
517 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
518 --AvFILLp (padlist);
519 555
520 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 556 /* Already extended to 2 elements by newPADLIST. */
521 av_store (newpadlist, 1, (SV *)newpad); 557 PadlistMAX (newpadlist) = 1;
558 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
559 PadlistARRAY (newpadlist)[1] = newpad;
522 560
523 return newpadlist; 561 return newpadlist;
524} 562}
525 563
526static void 564ecb_inline void
527free_padlist (pTHX_ AV *padlist) 565free_padlist (pTHX_ PADLIST *padlist)
528{ 566{
529 /* may be during global destruction */ 567 /* may be during global destruction */
530 if (!IN_DESTRUCT) 568 if (!IN_DESTRUCT)
531 { 569 {
532 I32 i = AvFILLp (padlist); 570 I32 i = PadlistMAX (padlist);
533 571
534 while (i > 0) /* special-case index 0 */ 572 while (i > 0) /* special-case index 0 */
535 { 573 {
536 /* we try to be extra-careful here */ 574 /* we try to be extra-careful here */
537 AV *av = (AV *)AvARRAY (padlist)[i--]; 575 PAD *pad = PadlistARRAY (padlist)[i--];
538 I32 j = AvFILLp (av);
539 576
577 if (pad)
578 {
579 I32 j = PadMAX (pad);
580
540 while (j >= 0) 581 while (j >= 0)
541 SvREFCNT_dec (AvARRAY (av)[j--]); 582 SvREFCNT_dec (PadARRAY (pad)[j--]);
542 583
543 AvFILLp (av) = -1; 584 PadMAX (pad) = -1;
544 SvREFCNT_dec (av); 585 SvREFCNT_dec (pad);
586 }
545 } 587 }
546 588
547 SvREFCNT_dec (AvARRAY (padlist)[0]); 589 SvREFCNT_dec (PadlistNAMES (padlist));
548 590
591#if NEWPADAPI
592 Safefree (PadlistARRAY (padlist));
593 Safefree (padlist);
594#else
549 AvFILLp (padlist) = -1; 595 AvFILLp (padlist) = -1;
596 AvREAL_off (padlist);
550 SvREFCNT_dec ((SV*)padlist); 597 SvREFCNT_dec ((SV*)padlist);
598#endif
551 } 599 }
552} 600}
553 601
554static int 602static int
555coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 603coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
556{ 604{
557 AV *padlist; 605 PADLIST *padlist;
558 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;
559 608
560 /* perl manages to free our internal AV and _then_ call us */ 609 /* perl manages to free our internal AV and _then_ call us */
561 if (IN_DESTRUCT) 610 if (IN_DESTRUCT)
562 return 0; 611 return 0;
563 612
564 /* casting is fun. */ 613 while (len--)
565 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
566 free_padlist (aTHX_ padlist); 614 free_padlist (aTHX_ padlists[len]);
567
568 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
569 615
570 return 0; 616 return 0;
571} 617}
572 618
573static MGVTBL coro_cv_vtbl = { 619static MGVTBL coro_cv_vtbl = {
574 0, 0, 0, 0, 620 0, 0, 0, 0,
575 coro_cv_free 621 coro_cv_free
576}; 622};
577 623
578/* the next two functions merely cache the padlists */ 624/* the next two functions merely cache the padlists */
579static void 625ecb_inline void
580get_padlist (pTHX_ CV *cv) 626get_padlist (pTHX_ CV *cv)
581{ 627{
582 MAGIC *mg = CORO_MAGIC_cv (cv); 628 MAGIC *mg = CORO_MAGIC_cv (cv);
583 AV *av; 629 size_t *lenp;
584 630
585 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 631 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 632 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
587 else 633 else
588 { 634 {
589#if CORO_PREFER_PERL_FUNCTIONS 635#if CORO_PREFER_PERL_FUNCTIONS
590 /* this is probably cleaner? but also slower! */ 636 /* this is probably cleaner? but also slower! */
591 /* in practise, it seems to be less stable */ 637 /* in practise, it seems to be less stable */
… …
597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 643 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
598#endif 644#endif
599 } 645 }
600} 646}
601 647
602static void 648ecb_inline void
603put_padlist (pTHX_ CV *cv) 649put_padlist (pTHX_ CV *cv)
604{ 650{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 651 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av;
607 652
608 if (expect_false (!mg)) 653 if (ecb_expect_false (!mg))
654 {
609 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);
610 663
611 av = (AV *)mg->mg_obj; 664 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
612
613 if (expect_false (AvFILLp (av) >= AvMAX (av)))
614 av_extend (av, AvFILLp (av) + 1);
615
616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
617} 665}
618 666
619/** load & save, init *******************************************************/ 667/** load & save, init *******************************************************/
620 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
621/* swap sv heads, at least logically */ 707/* swap sv heads, at least logically */
622static void 708static void
623swap_svs (pTHX_ Coro__State c) 709swap_svs (pTHX_ Coro__State c)
624{ 710{
625 int i; 711 int i;
626 712
627 for (i = 0; i <= AvFILLp (c->swap_sv); ) 713 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
628 { 714 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
629 SV *a = AvARRAY (c->swap_sv)[i++];
630 SV *b = AvARRAY (c->swap_sv)[i++];
631
632 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
633 SV tmp;
634
635 /* swap sv_any */
636 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
637
638 /* swap sv_flags */
639 SvFLAGS (&tmp) = SvFLAGS (a);
640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
642
643#if PERL_VERSION_ATLEAST (5,10,0)
644 /* perl 5.10 complicates this _quite_ a bit, but it also is
645 * much faster, so no quarrels here. alternatively, we could
646 * sv_upgrade to avoid this.
647 */
648 {
649 /* swap sv_u */
650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
651
652 /* if SvANY points to the head, we need to adjust the pointers,
653 * as the pointer for a still points to b, and maybe vice versa.
654 */
655 #define svany_in_head(type) \
656 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
657
658 if (svany_in_head (SvTYPE (a)))
659 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
660
661 if (svany_in_head (SvTYPE (b)))
662 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
663 }
664#endif
665 }
666} 715}
667 716
668#define SWAP_SVS(coro) \ 717#define SWAP_SVS(coro) \
669 if (expect_false ((coro)->swap_sv)) \ 718 if (ecb_expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro)) 719 swap_svs (aTHX_ (coro))
671 720
672static void 721static void
673on_enterleave_call (pTHX_ SV *cb); 722on_enterleave_call (pTHX_ SV *cb);
674 723
… …
678 perl_slots *slot = c->slot; 727 perl_slots *slot = c->slot;
679 c->slot = 0; 728 c->slot = 0;
680 729
681 PL_mainstack = c->mainstack; 730 PL_mainstack = c->mainstack;
682 731
683 GvSV (PL_defgv) = slot->defsv; 732#if CORO_JIT
684 GvAV (PL_defgv) = slot->defav; 733 load_perl_slots (slot);
685 GvSV (PL_errgv) = slot->errsv; 734#else
686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
688
689 #define VAR(name,type) PL_ ## name = slot->name; 735 #define VARx(name,expr,type) expr = slot->name;
690 # include "state.h" 736 #include "state.h"
691 #undef VAR 737#endif
692 738
693 { 739 {
694 dSP; 740 dSP;
695 741
696 CV *cv; 742 CV *cv;
697 743
698 /* now do the ugly restore mess */ 744 /* now do the ugly restore mess */
699 while (expect_true (cv = (CV *)POPs)) 745 while (ecb_expect_true (cv = (CV *)POPs))
700 { 746 {
701 put_padlist (aTHX_ cv); /* mark this padlist as available */ 747 put_padlist (aTHX_ cv); /* mark this padlist as available */
702 CvDEPTH (cv) = PTR2IV (POPs); 748 CvDEPTH (cv) = PTR2IV (POPs);
703 CvPADLIST (cv) = (AV *)POPs; 749 CvPADLIST (cv) = (PADLIST *)POPs;
704 } 750 }
705 751
706 PUTBACK; 752 PUTBACK;
707 } 753 }
708 754
709 slf_frame = c->slf_frame; 755 slf_frame = c->slf_frame;
710 CORO_THROW = c->except; 756 CORO_THROW = c->except;
711 757
712 if (expect_false (enable_times)) 758 if (ecb_expect_false (enable_times))
713 { 759 {
714 if (expect_false (!times_valid)) 760 if (ecb_expect_false (!times_valid))
715 coro_times_update (); 761 coro_times_update ();
716 762
717 coro_times_sub (c); 763 coro_times_sub (c);
718 } 764 }
719 765
720 if (expect_false (c->on_enter)) 766 if (ecb_expect_false (c->on_enter))
721 { 767 {
722 int i; 768 int i;
723 769
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 770 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 771 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
731static void 777static void
732save_perl (pTHX_ Coro__State c) 778save_perl (pTHX_ Coro__State c)
733{ 779{
734 SWAP_SVS (c); 780 SWAP_SVS (c);
735 781
736 if (expect_false (c->on_leave)) 782 if (ecb_expect_false (c->on_leave))
737 { 783 {
738 int i; 784 int i;
739 785
740 for (i = AvFILLp (c->on_leave); i >= 0; --i) 786 for (i = AvFILLp (c->on_leave); i >= 0; --i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 787 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 } 788 }
743 789
744 times_valid = 0; 790 times_valid = 0;
745 791
746 if (expect_false (enable_times)) 792 if (ecb_expect_false (enable_times))
747 { 793 {
748 coro_times_update (); times_valid = 1; 794 coro_times_update (); times_valid = 1;
749 coro_times_add (c); 795 coro_times_add (c);
750 } 796 }
751 797
… …
765 811
766 XPUSHs (Nullsv); 812 XPUSHs (Nullsv);
767 /* this loop was inspired by pp_caller */ 813 /* this loop was inspired by pp_caller */
768 for (;;) 814 for (;;)
769 { 815 {
770 while (expect_true (cxix >= 0)) 816 while (ecb_expect_true (cxix >= 0))
771 { 817 {
772 PERL_CONTEXT *cx = &ccstk[cxix--]; 818 PERL_CONTEXT *cx = &ccstk[cxix--];
773 819
774 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))
775 { 821 {
776 CV *cv = cx->blk_sub.cv; 822 CV *cv = cx->blk_sub.cv;
777 823
778 if (expect_true (CvDEPTH (cv))) 824 if (ecb_expect_true (CvDEPTH (cv)))
779 { 825 {
780 EXTEND (SP, 3); 826 EXTEND (SP, 3);
781 PUSHs ((SV *)CvPADLIST (cv)); 827 PUSHs ((SV *)CvPADLIST (cv));
782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 828 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
783 PUSHs ((SV *)cv); 829 PUSHs ((SV *)cv);
… …
786 get_padlist (aTHX_ cv); 832 get_padlist (aTHX_ cv);
787 } 833 }
788 } 834 }
789 } 835 }
790 836
791 if (expect_true (top_si->si_type == PERLSI_MAIN)) 837 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
792 break; 838 break;
793 839
794 top_si = top_si->si_prev; 840 top_si = top_si->si_prev;
795 ccstk = top_si->si_cxstack; 841 ccstk = top_si->si_cxstack;
796 cxix = top_si->si_cxix; 842 cxix = top_si->si_cxix;
… …
798 844
799 PUTBACK; 845 PUTBACK;
800 } 846 }
801 847
802 /* allocate some space on the context stack for our purposes */ 848 /* allocate some space on the context stack for our purposes */
803 /* we manually unroll here, as usually 2 slots is enough */ 849 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
804 if (SLOT_COUNT >= 1) CXINC;
805 if (SLOT_COUNT >= 2) CXINC;
806 if (SLOT_COUNT >= 3) CXINC;
807 { 850 {
808 unsigned int i; 851 unsigned int i;
852
809 for (i = 3; i < SLOT_COUNT; ++i) 853 for (i = 0; i < SLOT_COUNT; ++i)
810 CXINC; 854 CXINC;
811 } 855
812 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 856 cxstack_ix -= SLOT_COUNT; /* undo allocation */
857 }
813 858
814 c->mainstack = PL_mainstack; 859 c->mainstack = PL_mainstack;
815 860
816 { 861 {
817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 862 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
818 863
819 slot->defav = GvAV (PL_defgv); 864#if CORO_JIT
820 slot->defsv = DEFSV; 865 save_perl_slots (slot);
821 slot->errsv = ERRSV; 866#else
822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
824
825 #define VAR(name,type) slot->name = PL_ ## name; 867 #define VARx(name,expr,type) slot->name = expr;
826 # include "state.h" 868 #include "state.h"
827 #undef VAR 869#endif
828 } 870 }
829} 871}
830 872
831/* 873/*
832 * allocate various perl stacks. This is almost an exact copy 874 * allocate various perl stacks. This is almost an exact copy
… …
838# define coro_init_stacks(thx) init_stacks () 880# define coro_init_stacks(thx) init_stacks ()
839#else 881#else
840static void 882static void
841coro_init_stacks (pTHX) 883coro_init_stacks (pTHX)
842{ 884{
843 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() */
844 PL_curstackinfo->si_type = PERLSI_MAIN; 886 PL_curstackinfo->si_type = PERLSI_MAIN;
845 PL_curstack = PL_curstackinfo->si_stack; 887 PL_curstack = PL_curstackinfo->si_stack;
846 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 888 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
847 889
848 PL_stack_base = AvARRAY(PL_curstack); 890 PL_stack_base = AvARRAY(PL_curstack);
… …
863#endif 905#endif
864 906
865 New(54,PL_scopestack,8,I32); 907 New(54,PL_scopestack,8,I32);
866 PL_scopestack_ix = 0; 908 PL_scopestack_ix = 0;
867 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
868 913
869 New(54,PL_savestack,24,ANY); 914 New(54,PL_savestack,24,ANY);
870 PL_savestack_ix = 0; 915 PL_savestack_ix = 0;
871 PL_savestack_max = 24; 916 PL_savestack_max = 24;
872 917
… …
900 } 945 }
901 946
902 Safefree (PL_tmps_stack); 947 Safefree (PL_tmps_stack);
903 Safefree (PL_markstack); 948 Safefree (PL_markstack);
904 Safefree (PL_scopestack); 949 Safefree (PL_scopestack);
950#if HAS_SCOPESTACK_NAME
951 Safefree (PL_scopestack_name);
952#endif
905 Safefree (PL_savestack); 953 Safefree (PL_savestack);
906#if !PERL_VERSION_ATLEAST (5,10,0) 954#if !PERL_VERSION_ATLEAST (5,10,0)
907 Safefree (PL_retstack); 955 Safefree (PL_retstack);
908#endif 956#endif
909} 957}
… …
955#endif 1003#endif
956 1004
957/* 1005/*
958 * This overrides the default magic get method of %SIG elements. 1006 * This overrides the default magic get method of %SIG elements.
959 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1007 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
960 * and instead of trying to save and restore the hash elements, we just provide 1008 * and instead of trying to save and restore the hash elements (extremely slow),
961 * readback here. 1009 * we just provide our own readback here.
962 */ 1010 */
963static int 1011static int ecb_cold
964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1012coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
965{ 1013{
966 const char *s = MgPV_nolen_const (mg); 1014 const char *s = MgPV_nolen_const (mg);
967 1015
968 if (*s == '_') 1016 if (*s == '_')
969 { 1017 {
970 SV **svp = 0; 1018 SV **svp = 0;
971 1019
972 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1020 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
973 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1021 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
974 1022
975 if (svp) 1023 if (svp)
976 { 1024 {
977 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);
978 return 0; 1035 return 0;
979 } 1036 }
980 } 1037 }
981 1038
982 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1039 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
983} 1040}
984 1041
985static int 1042static int ecb_cold
986coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1043coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
987{ 1044{
988 const char *s = MgPV_nolen_const (mg); 1045 const char *s = MgPV_nolen_const (mg);
989 1046
990 if (*s == '_') 1047 if (*s == '_')
… …
1004 } 1061 }
1005 1062
1006 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1063 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1007} 1064}
1008 1065
1009static int 1066static int ecb_cold
1010coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1067coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1011{ 1068{
1012 const char *s = MgPV_nolen_const (mg); 1069 const char *s = MgPV_nolen_const (mg);
1013 1070
1014 if (*s == '_') 1071 if (*s == '_')
… …
1049 return 1; 1106 return 1;
1050} 1107}
1051 1108
1052static UNOP init_perl_op; 1109static UNOP init_perl_op;
1053 1110
1054static 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 */
1055init_perl (pTHX_ struct coro *coro) 1112init_perl (pTHX_ struct coro *coro)
1056{ 1113{
1057 /* 1114 /*
1058 * emulate part of the perl startup here. 1115 * emulate part of the perl startup here.
1059 */ 1116 */
… …
1074 PL_parser = 0; 1131 PL_parser = 0;
1075#endif 1132#endif
1076 PL_hints = 0; 1133 PL_hints = 0;
1077 1134
1078 /* recreate the die/warn hooks */ 1135 /* recreate the die/warn hooks */
1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1136 PL_diehook = SvREFCNT_inc (rv_diehook);
1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1137 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1081 1138
1082 GvSV (PL_defgv) = newSV (0); 1139 GvSV (PL_defgv) = newSV (0);
1083 GvAV (PL_defgv) = coro->args; coro->args = 0; 1140 GvAV (PL_defgv) = coro->args; coro->args = 0;
1084 GvSV (PL_errgv) = newSV (0); 1141 GvSV (PL_errgv) = newSV (0);
1085 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);
1086 GvHV (PL_hintgv) = 0; 1143 GvHV (PL_hintgv) = newHV ();
1144#if PERL_VERSION_ATLEAST (5,10,0)
1145 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1146#endif
1087 PL_rs = newSVsv (GvSV (irsgv)); 1147 PL_rs = newSVsv (GvSV (irsgv));
1088 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1148 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1089 1149
1090 { 1150 {
1091 dSP; 1151 dSP;
… …
1106 /* this newly created coroutine might be run on an existing cctx which most 1166 /* this newly created coroutine might be run on an existing cctx which most
1107 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1167 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1108 */ 1168 */
1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1169 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1110 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1170 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1171 slf_frame.destroy = 0;
1111 1172
1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1173 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1113 init_perl_op.op_next = PL_op; 1174 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1175 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1176 init_perl_op.op_ppaddr = pp_slf;
… …
1120 /* copy throw, in case it was set before init_perl */ 1181 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1182 CORO_THROW = coro->except;
1122 1183
1123 SWAP_SVS (coro); 1184 SWAP_SVS (coro);
1124 1185
1125 if (expect_false (enable_times)) 1186 if (ecb_expect_false (enable_times))
1126 { 1187 {
1127 coro_times_update (); 1188 coro_times_update ();
1128 coro_times_sub (coro); 1189 coro_times_sub (coro);
1129 } 1190 }
1130} 1191}
… …
1154destroy_perl (pTHX_ struct coro *coro) 1215destroy_perl (pTHX_ struct coro *coro)
1155{ 1216{
1156 SV *svf [9]; 1217 SV *svf [9];
1157 1218
1158 { 1219 {
1220 SV *old_current = SvRV (coro_current);
1159 struct coro *current = SvSTATE_current; 1221 struct coro *current = SvSTATE (old_current);
1160 1222
1161 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1223 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1162 1224
1163 save_perl (aTHX_ current); 1225 save_perl (aTHX_ current);
1226
1227 /* this will cause transfer_check to croak on block*/
1228 SvRV_set (coro_current, (SV *)coro->hv);
1229
1164 load_perl (aTHX_ coro); 1230 load_perl (aTHX_ coro);
1165 1231
1166 coro_unwind_stacks (aTHX); 1232 coro_unwind_stacks (aTHX);
1167 coro_destruct_stacks (aTHX);
1168 1233
1169 /* restore swapped sv's */ 1234 /* restore swapped sv's */
1170 SWAP_SVS (coro); 1235 SWAP_SVS (coro);
1171 1236
1237 coro_destruct_stacks (aTHX);
1238
1172 // now save some sv's to be free'd later 1239 /* now save some sv's to be free'd later */
1173 svf [0] = GvSV (PL_defgv); 1240 svf [0] = GvSV (PL_defgv);
1174 svf [1] = (SV *)GvAV (PL_defgv); 1241 svf [1] = (SV *)GvAV (PL_defgv);
1175 svf [2] = GvSV (PL_errgv); 1242 svf [2] = GvSV (PL_errgv);
1176 svf [3] = (SV *)PL_defoutgv; 1243 svf [3] = (SV *)PL_defoutgv;
1177 svf [4] = PL_rs; 1244 svf [4] = PL_rs;
… …
1179 svf [6] = (SV *)GvHV (PL_hintgv); 1246 svf [6] = (SV *)GvHV (PL_hintgv);
1180 svf [7] = PL_diehook; 1247 svf [7] = PL_diehook;
1181 svf [8] = PL_warnhook; 1248 svf [8] = PL_warnhook;
1182 assert (9 == sizeof (svf) / sizeof (*svf)); 1249 assert (9 == sizeof (svf) / sizeof (*svf));
1183 1250
1251 SvRV_set (coro_current, old_current);
1252
1184 load_perl (aTHX_ current); 1253 load_perl (aTHX_ current);
1185 } 1254 }
1186 1255
1187 { 1256 {
1188 unsigned int i; 1257 unsigned int i;
… …
1195 SvREFCNT_dec (coro->invoke_cb); 1264 SvREFCNT_dec (coro->invoke_cb);
1196 SvREFCNT_dec (coro->invoke_av); 1265 SvREFCNT_dec (coro->invoke_av);
1197 } 1266 }
1198} 1267}
1199 1268
1200INLINE void 1269ecb_inline void
1201free_coro_mortal (pTHX) 1270free_coro_mortal (pTHX)
1202{ 1271{
1203 if (expect_true (coro_mortal)) 1272 if (ecb_expect_true (coro_mortal))
1204 { 1273 {
1205 SvREFCNT_dec (coro_mortal); 1274 SvREFCNT_dec ((SV *)coro_mortal);
1206 coro_mortal = 0; 1275 coro_mortal = 0;
1207 } 1276 }
1208} 1277}
1209 1278
1210static int 1279static int
… …
1343 1412
1344 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1413 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1345} 1414}
1346 1415
1347/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1416/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1348static void NOINLINE 1417static void ecb_noinline
1349cctx_prepare (pTHX) 1418cctx_prepare (pTHX)
1350{ 1419{
1351 PL_top_env = &PL_start_env; 1420 PL_top_env = &PL_start_env;
1352 1421
1353 if (cctx_current->flags & CC_TRACE) 1422 if (cctx_current->flags & CC_TRACE)
… …
1364 slf_frame.prepare = slf_prepare_set_stacklevel; 1433 slf_frame.prepare = slf_prepare_set_stacklevel;
1365 slf_frame.check = slf_check_set_stacklevel; 1434 slf_frame.check = slf_check_set_stacklevel;
1366} 1435}
1367 1436
1368/* the tail of transfer: execute stuff we can only do after a transfer */ 1437/* the tail of transfer: execute stuff we can only do after a transfer */
1369INLINE void 1438ecb_inline void
1370transfer_tail (pTHX) 1439transfer_tail (pTHX)
1371{ 1440{
1372 free_coro_mortal (aTHX); 1441 free_coro_mortal (aTHX);
1442}
1443
1444/* try to exit the same way perl's main function would do */
1445/* we do not bother resetting the environment or other things *7
1446/* that are not, uhm, essential */
1447/* this obviously also doesn't work when perl is embedded */
1448static void ecb_noinline ecb_cold
1449perlish_exit (pTHX)
1450{
1451 int exitstatus = perl_destruct (PL_curinterp);
1452 perl_free (PL_curinterp);
1453 exit (exitstatus);
1373} 1454}
1374 1455
1375/* 1456/*
1376 * this is a _very_ stripped down perl interpreter ;) 1457 * this is a _very_ stripped down perl interpreter ;)
1377 */ 1458 */
… …
1406 */ 1487 */
1407 1488
1408 /* 1489 /*
1409 * If perl-run returns we assume exit() was being called or the coro 1490 * If perl-run returns we assume exit() was being called or the coro
1410 * fell off the end, which seems to be the only valid (non-bug) 1491 * fell off the end, which seems to be the only valid (non-bug)
1411 * reason for perl_run to return. We try to exit by jumping to the 1492 * reason for perl_run to return. We try to mimic whatever perl is normally
1412 * bootstrap-time "top" top_env, as we cannot restore the "main" 1493 * doing in that case. YMMV.
1413 * coroutine as Coro has no such concept.
1414 * This actually isn't valid with the pthread backend, but OSes requiring
1415 * that backend are too broken to do it in a standards-compliant way.
1416 */ 1494 */
1417 PL_top_env = main_top_env; 1495 perlish_exit (aTHX);
1418 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1419 } 1496 }
1420} 1497}
1421 1498
1422static coro_cctx * 1499static coro_cctx *
1423cctx_new () 1500cctx_new (void)
1424{ 1501{
1425 coro_cctx *cctx; 1502 coro_cctx *cctx;
1426 1503
1427 ++cctx_count; 1504 ++cctx_count;
1428 New (0, cctx, 1, coro_cctx); 1505 New (0, cctx, 1, coro_cctx);
… …
1434 return cctx; 1511 return cctx;
1435} 1512}
1436 1513
1437/* create a new cctx only suitable as source */ 1514/* create a new cctx only suitable as source */
1438static coro_cctx * 1515static coro_cctx *
1439cctx_new_empty () 1516cctx_new_empty (void)
1440{ 1517{
1441 coro_cctx *cctx = cctx_new (); 1518 coro_cctx *cctx = cctx_new ();
1442 1519
1443 cctx->sptr = 0; 1520 cctx->stack.sptr = 0;
1444 coro_create (&cctx->cctx, 0, 0, 0, 0); 1521 coro_create (&cctx->cctx, 0, 0, 0, 0);
1445 1522
1446 return cctx; 1523 return cctx;
1447} 1524}
1448 1525
1449/* create a new cctx suitable as destination/running a perl interpreter */ 1526/* create a new cctx suitable as destination/running a perl interpreter */
1450static coro_cctx * 1527static coro_cctx *
1451cctx_new_run () 1528cctx_new_run (void)
1452{ 1529{
1453 coro_cctx *cctx = cctx_new (); 1530 coro_cctx *cctx = cctx_new ();
1454 void *stack_start;
1455 size_t stack_size;
1456 1531
1457#if HAVE_MMAP 1532 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1458 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1459 /* mmap supposedly does allocate-on-write for us */
1460 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1461
1462 if (cctx->sptr != (void *)-1)
1463 {
1464 #if CORO_STACKGUARD
1465 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1466 #endif
1467 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1468 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1469 cctx->flags |= CC_MAPPED;
1470 } 1533 {
1471 else
1472#endif
1473 {
1474 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1475 New (0, cctx->sptr, cctx_stacksize, long);
1476
1477 if (!cctx->sptr)
1478 {
1479 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1534 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1480 _exit (EXIT_FAILURE); 1535 _exit (EXIT_FAILURE);
1481 }
1482
1483 stack_start = cctx->sptr;
1484 stack_size = cctx->ssize;
1485 } 1536 }
1486 1537
1487 #if CORO_USE_VALGRIND
1488 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1489 #endif
1490
1491 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1538 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1492 1539
1493 return cctx; 1540 return cctx;
1494} 1541}
1495 1542
1496static void 1543static void
… …
1502 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1549 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1503 1550
1504 --cctx_count; 1551 --cctx_count;
1505 coro_destroy (&cctx->cctx); 1552 coro_destroy (&cctx->cctx);
1506 1553
1507 /* coro_transfer creates new, empty cctx's */ 1554 coro_stack_free (&cctx->stack);
1508 if (cctx->sptr)
1509 {
1510 #if CORO_USE_VALGRIND
1511 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1512 #endif
1513
1514#if HAVE_MMAP
1515 if (cctx->flags & CC_MAPPED)
1516 munmap (cctx->sptr, cctx->ssize);
1517 else
1518#endif
1519 Safefree (cctx->sptr);
1520 }
1521 1555
1522 Safefree (cctx); 1556 Safefree (cctx);
1523} 1557}
1524 1558
1525/* wether this cctx should be destructed */ 1559/* wether this cctx should be destructed */
1526#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1560#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1527 1561
1528static coro_cctx * 1562static coro_cctx *
1529cctx_get (pTHX) 1563cctx_get (pTHX)
1530{ 1564{
1531 while (expect_true (cctx_first)) 1565 while (ecb_expect_true (cctx_first))
1532 { 1566 {
1533 coro_cctx *cctx = cctx_first; 1567 coro_cctx *cctx = cctx_first;
1534 cctx_first = cctx->next; 1568 cctx_first = cctx->next;
1535 --cctx_idle; 1569 --cctx_idle;
1536 1570
1537 if (expect_true (!CCTX_EXPIRED (cctx))) 1571 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1538 return cctx; 1572 return cctx;
1539 1573
1540 cctx_destroy (cctx); 1574 cctx_destroy (cctx);
1541 } 1575 }
1542 1576
… …
1544} 1578}
1545 1579
1546static void 1580static void
1547cctx_put (coro_cctx *cctx) 1581cctx_put (coro_cctx *cctx)
1548{ 1582{
1549 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1583 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1550 1584
1551 /* free another cctx if overlimit */ 1585 /* free another cctx if overlimit */
1552 if (expect_false (cctx_idle >= cctx_max_idle)) 1586 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1553 { 1587 {
1554 coro_cctx *first = cctx_first; 1588 coro_cctx *first = cctx_first;
1555 cctx_first = first->next; 1589 cctx_first = first->next;
1556 --cctx_idle; 1590 --cctx_idle;
1557 1591
… …
1568static void 1602static void
1569transfer_check (pTHX_ struct coro *prev, struct coro *next) 1603transfer_check (pTHX_ struct coro *prev, struct coro *next)
1570{ 1604{
1571 /* TODO: throwing up here is considered harmful */ 1605 /* TODO: throwing up here is considered harmful */
1572 1606
1573 if (expect_true (prev != next)) 1607 if (ecb_expect_true (prev != next))
1574 { 1608 {
1575 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1609 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1576 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1610 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1577 1611
1578 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1612 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1579 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1613 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1580 1614
1581#if !PERL_VERSION_ATLEAST (5,10,0) 1615#if !PERL_VERSION_ATLEAST (5,10,0)
1582 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1616 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1583 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1617 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1584#endif 1618#endif
1585 } 1619 }
1586} 1620}
1587 1621
1588/* always use the TRANSFER macro */ 1622/* always use the TRANSFER macro */
1589static void NOINLINE /* noinline so we have a fixed stackframe */ 1623static void ecb_noinline /* noinline so we have a fixed stackframe */
1590transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1624transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1591{ 1625{
1592 dSTACKLEVEL; 1626 dSTACKLEVEL;
1593 1627
1594 /* sometimes transfer is only called to set idle_sp */ 1628 /* sometimes transfer is only called to set idle_sp */
1595 if (expect_false (!prev)) 1629 if (ecb_expect_false (!prev))
1596 { 1630 {
1597 cctx_current->idle_sp = STACKLEVEL; 1631 cctx_current->idle_sp = STACKLEVEL;
1598 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1632 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1599 } 1633 }
1600 else if (expect_true (prev != next)) 1634 else if (ecb_expect_true (prev != next))
1601 { 1635 {
1602 coro_cctx *cctx_prev; 1636 coro_cctx *cctx_prev;
1603 1637
1604 if (expect_false (prev->flags & CF_NEW)) 1638 if (ecb_expect_false (prev->flags & CF_NEW))
1605 { 1639 {
1606 /* create a new empty/source context */ 1640 /* create a new empty/source context */
1607 prev->flags &= ~CF_NEW; 1641 prev->flags &= ~CF_NEW;
1608 prev->flags |= CF_RUNNING; 1642 prev->flags |= CF_RUNNING;
1609 } 1643 }
… …
1612 next->flags |= CF_RUNNING; 1646 next->flags |= CF_RUNNING;
1613 1647
1614 /* first get rid of the old state */ 1648 /* first get rid of the old state */
1615 save_perl (aTHX_ prev); 1649 save_perl (aTHX_ prev);
1616 1650
1617 if (expect_false (next->flags & CF_NEW)) 1651 if (ecb_expect_false (next->flags & CF_NEW))
1618 { 1652 {
1619 /* need to start coroutine */ 1653 /* need to start coroutine */
1620 next->flags &= ~CF_NEW; 1654 next->flags &= ~CF_NEW;
1621 /* setup coroutine call */ 1655 /* setup coroutine call */
1622 init_perl (aTHX_ next); 1656 init_perl (aTHX_ next);
1623 } 1657 }
1624 else 1658 else
1625 load_perl (aTHX_ next); 1659 load_perl (aTHX_ next);
1626 1660
1627 /* possibly untie and reuse the cctx */ 1661 /* possibly untie and reuse the cctx */
1628 if (expect_true ( 1662 if (ecb_expect_true (
1629 cctx_current->idle_sp == STACKLEVEL 1663 cctx_current->idle_sp == STACKLEVEL
1630 && !(cctx_current->flags & CC_TRACE) 1664 && !(cctx_current->flags & CC_TRACE)
1631 && !force_cctx 1665 && !force_cctx
1632 )) 1666 ))
1633 { 1667 {
1634 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1668 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1635 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1669 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1636 1670
1637 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1671 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1638 /* without this the next cctx_get might destroy the running cctx while still in use */ 1672 /* without this the next cctx_get might destroy the running cctx while still in use */
1639 if (expect_false (CCTX_EXPIRED (cctx_current))) 1673 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1640 if (expect_true (!next->cctx)) 1674 if (ecb_expect_true (!next->cctx))
1641 next->cctx = cctx_get (aTHX); 1675 next->cctx = cctx_get (aTHX);
1642 1676
1643 cctx_put (cctx_current); 1677 cctx_put (cctx_current);
1644 } 1678 }
1645 else 1679 else
1646 prev->cctx = cctx_current; 1680 prev->cctx = cctx_current;
1647 1681
1648 ++next->usecount; 1682 ++next->usecount;
1649 1683
1650 cctx_prev = cctx_current; 1684 cctx_prev = cctx_current;
1651 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1685 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1652 1686
1653 next->cctx = 0; 1687 next->cctx = 0;
1654 1688
1655 if (expect_false (cctx_prev != cctx_current)) 1689 if (ecb_expect_false (cctx_prev != cctx_current))
1656 { 1690 {
1657 cctx_prev->top_env = PL_top_env; 1691 cctx_prev->top_env = PL_top_env;
1658 PL_top_env = cctx_current->top_env; 1692 PL_top_env = cctx_current->top_env;
1659 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1693 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1660 } 1694 }
… …
1666#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1700#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1667#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1701#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1668 1702
1669/** high level stuff ********************************************************/ 1703/** high level stuff ********************************************************/
1670 1704
1705/* this function is actually Coro, not Coro::State, but we call it from here */
1706/* because it is convenient - but it hasn't been declared yet for that reason */
1671static int 1707static void
1708coro_call_on_destroy (pTHX_ struct coro *coro);
1709
1710static void
1672coro_state_destroy (pTHX_ struct coro *coro) 1711coro_state_destroy (pTHX_ struct coro *coro)
1673{ 1712{
1674 if (coro->flags & CF_DESTROYED) 1713 if (coro->flags & CF_ZOMBIE)
1675 return 0; 1714 return;
1676 1715
1677 if (coro->on_destroy && !PL_dirty)
1678 coro->on_destroy (aTHX_ coro); 1716 slf_destroy (aTHX_ coro);
1679 1717
1680 /*
1681 * The on_destroy above most likely is from an SLF call.
1682 * Since by definition the SLF call will not finish when we destroy
1683 * the coro, we will have to force-finish it here, otherwise
1684 * cleanup functions cannot call SLF functions.
1685 */
1686 coro->slf_frame.prepare = 0;
1687
1688 coro->flags |= CF_DESTROYED; 1718 coro->flags |= CF_ZOMBIE;
1689 1719
1690 if (coro->flags & CF_READY) 1720 if (coro->flags & CF_READY)
1691 { 1721 {
1692 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1722 /* reduce nready, as destroying a ready coro effectively unreadies it */
1693 /* alternative: look through all ready queues and remove the coro */ 1723 /* alternative: look through all ready queues and remove the coro */
1694 --coro_nready; 1724 --coro_nready;
1695 } 1725 }
1696 else 1726 else
1697 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1727 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1728
1729 if (coro->next) coro->next->prev = coro->prev;
1730 if (coro->prev) coro->prev->next = coro->next;
1731 if (coro == coro_first) coro_first = coro->next;
1698 1732
1699 if (coro->mainstack 1733 if (coro->mainstack
1700 && coro->mainstack != main_mainstack 1734 && coro->mainstack != main_mainstack
1701 && coro->slot 1735 && coro->slot
1702 && !PL_dirty) 1736 && !PL_dirty)
1703 destroy_perl (aTHX_ coro); 1737 destroy_perl (aTHX_ coro);
1704 1738
1705 if (coro->next) coro->next->prev = coro->prev;
1706 if (coro->prev) coro->prev->next = coro->next;
1707 if (coro == coro_first) coro_first = coro->next;
1708
1709 cctx_destroy (coro->cctx); 1739 cctx_destroy (coro->cctx);
1710 SvREFCNT_dec (coro->startcv); 1740 SvREFCNT_dec (coro->startcv);
1711 SvREFCNT_dec (coro->args); 1741 SvREFCNT_dec (coro->args);
1712 SvREFCNT_dec (coro->swap_sv); 1742 SvREFCNT_dec (coro->swap_sv);
1713 SvREFCNT_dec (CORO_THROW); 1743 SvREFCNT_dec (CORO_THROW);
1714 1744
1715 return 1; 1745 coro_call_on_destroy (aTHX_ coro);
1746
1747 /* more destruction mayhem in coro_state_free */
1716} 1748}
1717 1749
1718static int 1750static int
1719coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1751coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1720{ 1752{
1721 struct coro *coro = (struct coro *)mg->mg_ptr; 1753 struct coro *coro = (struct coro *)mg->mg_ptr;
1722 mg->mg_ptr = 0; 1754 mg->mg_ptr = 0;
1723 1755
1724 coro->hv = 0;
1725
1726 if (--coro->refcnt < 0)
1727 {
1728 coro_state_destroy (aTHX_ coro); 1756 coro_state_destroy (aTHX_ coro);
1757 SvREFCNT_dec (coro->on_destroy);
1758 SvREFCNT_dec (coro->status);
1759
1729 Safefree (coro); 1760 Safefree (coro);
1730 }
1731 1761
1732 return 0; 1762 return 0;
1733} 1763}
1734 1764
1735static int 1765static int ecb_cold
1736coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1766coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1737{ 1767{
1738 struct coro *coro = (struct coro *)mg->mg_ptr; 1768 /* called when perl clones the current process the slow way (windows process emulation) */
1739 1769 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1740 ++coro->refcnt; 1770 mg->mg_ptr = 0;
1771 mg->mg_virtual = 0;
1741 1772
1742 return 0; 1773 return 0;
1743} 1774}
1744 1775
1745static MGVTBL coro_state_vtbl = { 1776static MGVTBL coro_state_vtbl = {
… …
1770 TRANSFER (ta, 1); 1801 TRANSFER (ta, 1);
1771} 1802}
1772 1803
1773/** Coro ********************************************************************/ 1804/** Coro ********************************************************************/
1774 1805
1775INLINE void 1806ecb_inline void
1776coro_enq (pTHX_ struct coro *coro) 1807coro_enq (pTHX_ struct coro *coro)
1777{ 1808{
1778 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1809 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1779 1810
1780 SvREFCNT_inc_NN (coro->hv); 1811 SvREFCNT_inc_NN (coro->hv);
… …
1782 coro->next_ready = 0; 1813 coro->next_ready = 0;
1783 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1814 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1784 ready [1] = coro; 1815 ready [1] = coro;
1785} 1816}
1786 1817
1787INLINE struct coro * 1818ecb_inline struct coro *
1788coro_deq (pTHX) 1819coro_deq (pTHX)
1789{ 1820{
1790 int prio; 1821 int prio;
1791 1822
1792 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1823 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1845{ 1876{
1846 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1877 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1847} 1878}
1848 1879
1849/* expects to own a reference to next->hv */ 1880/* expects to own a reference to next->hv */
1850INLINE void 1881ecb_inline void
1851prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1882prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1852{ 1883{
1853 SV *prev_sv = SvRV (coro_current); 1884 SV *prev_sv = SvRV (coro_current);
1854 1885
1855 ta->prev = SvSTATE_hv (prev_sv); 1886 ta->prev = SvSTATE_hv (prev_sv);
… …
1868{ 1899{
1869 for (;;) 1900 for (;;)
1870 { 1901 {
1871 struct coro *next = coro_deq (aTHX); 1902 struct coro *next = coro_deq (aTHX);
1872 1903
1873 if (expect_true (next)) 1904 if (ecb_expect_true (next))
1874 { 1905 {
1875 /* cannot transfer to destroyed coros, skip and look for next */ 1906 /* cannot transfer to destroyed coros, skip and look for next */
1876 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1907 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1877 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1908 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1878 else 1909 else
1879 { 1910 {
1880 next->flags &= ~CF_READY; 1911 next->flags &= ~CF_READY;
1881 --coro_nready; 1912 --coro_nready;
… …
1889 /* nothing to schedule: call the idle handler */ 1920 /* nothing to schedule: call the idle handler */
1890 if (SvROK (sv_idle) 1921 if (SvROK (sv_idle)
1891 && SvOBJECT (SvRV (sv_idle))) 1922 && SvOBJECT (SvRV (sv_idle)))
1892 { 1923 {
1893 if (SvRV (sv_idle) == SvRV (coro_current)) 1924 if (SvRV (sv_idle) == SvRV (coro_current))
1925 {
1926 require_pv ("Carp");
1927
1928 {
1929 dSP;
1930
1931 ENTER;
1932 SAVETMPS;
1933
1934 PUSHMARK (SP);
1894 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1935 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1936 PUTBACK;
1937 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1938
1939 FREETMPS;
1940 LEAVE;
1941 }
1942 }
1895 1943
1896 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1944 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1897 api_ready (aTHX_ SvRV (sv_idle)); 1945 api_ready (aTHX_ SvRV (sv_idle));
1898 --coro_nready; 1946 --coro_nready;
1899 } 1947 }
… …
1914 } 1962 }
1915 } 1963 }
1916 } 1964 }
1917} 1965}
1918 1966
1919INLINE void 1967ecb_inline void
1920prepare_cede (pTHX_ struct coro_transfer_args *ta) 1968prepare_cede (pTHX_ struct coro_transfer_args *ta)
1921{ 1969{
1922 api_ready (aTHX_ coro_current); 1970 api_ready (aTHX_ coro_current);
1923 prepare_schedule (aTHX_ ta); 1971 prepare_schedule (aTHX_ ta);
1924} 1972}
1925 1973
1926INLINE void 1974ecb_inline void
1927prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1975prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1928{ 1976{
1929 SV *prev = SvRV (coro_current); 1977 SV *prev = SvRV (coro_current);
1930 1978
1931 if (coro_nready) 1979 if (coro_nready)
… …
1961{ 2009{
1962 struct coro_transfer_args ta; 2010 struct coro_transfer_args ta;
1963 2011
1964 prepare_cede (aTHX_ &ta); 2012 prepare_cede (aTHX_ &ta);
1965 2013
1966 if (expect_true (ta.prev != ta.next)) 2014 if (ecb_expect_true (ta.prev != ta.next))
1967 { 2015 {
1968 TRANSFER (ta, 1); 2016 TRANSFER (ta, 1);
1969 return 1; 2017 return 1;
1970 } 2018 }
1971 else 2019 else
… …
2014 coro->slot->runops = RUNOPS_DEFAULT; 2062 coro->slot->runops = RUNOPS_DEFAULT;
2015 } 2063 }
2016} 2064}
2017 2065
2018static void 2066static void
2067coro_push_av (pTHX_ AV *av, I32 gimme_v)
2068{
2069 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2070 {
2071 dSP;
2072
2073 if (gimme_v == G_SCALAR)
2074 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2075 else
2076 {
2077 int i;
2078 EXTEND (SP, AvFILLp (av) + 1);
2079
2080 for (i = 0; i <= AvFILLp (av); ++i)
2081 PUSHs (AvARRAY (av)[i]);
2082 }
2083
2084 PUTBACK;
2085 }
2086}
2087
2088static void
2089coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2090{
2091 if (!coro->on_destroy)
2092 coro->on_destroy = newAV ();
2093
2094 av_push (coro->on_destroy, cb);
2095}
2096
2097static void
2098slf_destroy_join (pTHX_ struct CoroSLF *frame)
2099{
2100 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2101}
2102
2103static int
2104slf_check_join (pTHX_ struct CoroSLF *frame)
2105{
2106 struct coro *coro = (struct coro *)frame->data;
2107
2108 if (!coro->status)
2109 return 1;
2110
2111 frame->destroy = 0;
2112
2113 coro_push_av (aTHX_ coro->status, GIMME_V);
2114
2115 SvREFCNT_dec ((SV *)coro->hv);
2116
2117 return 0;
2118}
2119
2120static void
2121slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2122{
2123 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2124
2125 if (items > 1)
2126 croak ("join called with too many arguments");
2127
2128 if (coro->status)
2129 frame->prepare = prepare_nop;
2130 else
2131 {
2132 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2133 frame->prepare = prepare_schedule;
2134 }
2135
2136 frame->check = slf_check_join;
2137 frame->destroy = slf_destroy_join;
2138 frame->data = (void *)coro;
2139 SvREFCNT_inc (coro->hv);
2140}
2141
2142static void
2019coro_call_on_destroy (pTHX_ struct coro *coro) 2143coro_call_on_destroy (pTHX_ struct coro *coro)
2020{ 2144{
2021 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2145 AV *od = coro->on_destroy;
2022 2146
2023 if (on_destroyp) 2147 if (!od)
2024 { 2148 return;
2025 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2026 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2027 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2028 2149
2150 coro->on_destroy = 0;
2151 sv_2mortal ((SV *)od);
2152
2029 while (AvFILLp (on_destroy) >= 0) 2153 while (AvFILLp (od) >= 0)
2154 {
2155 SV *cb = sv_2mortal (av_pop (od));
2156
2157 /* coro hv's (and only hv's at the moment) are supported as well */
2158 if (SvSTATEhv_p (aTHX_ cb))
2159 api_ready (aTHX_ cb);
2160 else
2030 { 2161 {
2031 dSP; /* don't disturb outer sp */ 2162 dSP; /* don't disturb outer sp */
2032 SV *cb = av_pop (on_destroy);
2033
2034 PUSHMARK (SP); 2163 PUSHMARK (SP);
2035 2164
2036 if (statusp) 2165 if (coro->status)
2037 { 2166 {
2038 int i; 2167 PUTBACK;
2039 EXTEND (SP, AvFILLp (status) + 1); 2168 coro_push_av (aTHX_ coro->status, G_ARRAY);
2040 2169 SPAGAIN;
2041 for (i = 0; i <= AvFILLp (status); ++i)
2042 PUSHs (AvARRAY (status)[i]);
2043 } 2170 }
2044 2171
2045 PUTBACK; 2172 PUTBACK;
2046 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2173 call_sv (cb, G_VOID | G_DISCARD);
2047 } 2174 }
2048 } 2175 }
2049} 2176}
2050 2177
2051static void 2178static void
2052coro_set_status (HV *coro_hv, SV **arg, int items) 2179coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2053{ 2180{
2054 AV *av = newAV (); 2181 AV *av;
2182
2183 if (coro->status)
2184 {
2185 av = coro->status;
2186 av_clear (av);
2187 }
2188 else
2189 av = coro->status = newAV ();
2055 2190
2056 /* items are actually not so common, so optimise for this case */ 2191 /* items are actually not so common, so optimise for this case */
2057 if (items) 2192 if (items)
2058 { 2193 {
2059 int i; 2194 int i;
… …
2061 av_extend (av, items - 1); 2196 av_extend (av, items - 1);
2062 2197
2063 for (i = 0; i < items; ++i) 2198 for (i = 0; i < items; ++i)
2064 av_push (av, SvREFCNT_inc_NN (arg [i])); 2199 av_push (av, SvREFCNT_inc_NN (arg [i]));
2065 } 2200 }
2066
2067 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2068} 2201}
2069 2202
2070static void 2203static void
2071slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2204slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2072{ 2205{
… …
2084static void 2217static void
2085slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2218slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2086{ 2219{
2087 HV *coro_hv = (HV *)SvRV (coro_current); 2220 HV *coro_hv = (HV *)SvRV (coro_current);
2088 2221
2089 coro_set_status (coro_hv, arg, items); 2222 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2090 slf_init_terminate_cancel_common (frame, coro_hv); 2223 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2091} 2224}
2092 2225
2093static void 2226static void
2094slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2227slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2095{ 2228{
… …
2100 croak ("Coro::cancel called without coro object,"); 2233 croak ("Coro::cancel called without coro object,");
2101 2234
2102 coro = SvSTATE (arg [0]); 2235 coro = SvSTATE (arg [0]);
2103 coro_hv = coro->hv; 2236 coro_hv = coro->hv;
2104 2237
2105 coro_set_status (coro_hv, arg + 1, items - 1); 2238 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2106 2239
2107 if (expect_false (coro->flags & CF_NOCANCEL)) 2240 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2108 { 2241 {
2109 /* coro currently busy cancelling something, so just notify it */ 2242 /* coro currently busy cancelling something, so just notify it */
2110 coro->slf_frame.data = (void *)coro; 2243 coro->slf_frame.data = (void *)coro;
2111 2244
2112 frame->prepare = prepare_nop; 2245 frame->prepare = prepare_nop;
2113 frame->check = slf_check_nop; 2246 frame->check = slf_check_nop;
2114 } 2247 }
2115 else if (coro_hv == (HV *)SvRV (coro_current)) 2248 else if (coro_hv == (HV *)SvRV (coro_current))
2116 { 2249 {
2117 /* cancelling the current coro is allowed, and equals terminate */ 2250 /* cancelling the current coro is allowed, and equals terminate */
2118 slf_init_terminate_cancel_common (frame, coro_hv); 2251 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2119 } 2252 }
2120 else 2253 else
2121 { 2254 {
2122 struct coro *self = SvSTATE_current; 2255 struct coro *self = SvSTATE_current;
2256
2257 if (!self)
2258 croak ("Coro::cancel called outside of thread content,");
2123 2259
2124 /* otherwise we cancel directly, purely for speed reasons 2260 /* otherwise we cancel directly, purely for speed reasons
2125 * unfortunately, this requires some magic trickery, as 2261 * unfortunately, this requires some magic trickery, as
2126 * somebody else could cancel us, so we have to fight the cancellation. 2262 * somebody else could cancel us, so we have to fight the cancellation.
2127 * this is ugly, and hopefully fully worth the extra speed. 2263 * this is ugly, and hopefully fully worth the extra speed.
2128 * besides, I can't get the slow-but-safe version working... 2264 * besides, I can't get the slow-but-safe version working...
2129 */ 2265 */
2130 slf_frame.data = 0; 2266 slf_frame.data = 0;
2131 self->flags |= CF_NOCANCEL; 2267 self->flags |= CF_NOCANCEL;
2132
2133 coro_state_destroy (aTHX_ coro); 2268 coro_state_destroy (aTHX_ coro);
2134 coro_call_on_destroy (aTHX_ coro);
2135
2136 self->flags &= ~CF_NOCANCEL; 2269 self->flags &= ~CF_NOCANCEL;
2137 2270
2138 if (slf_frame.data) 2271 if (slf_frame.data)
2139 { 2272 {
2140 /* while we were busy we have been cancelled, so terminate */ 2273 /* while we were busy we have been cancelled, so terminate */
2141 slf_init_terminate_cancel_common (frame, self->hv); 2274 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2142 } 2275 }
2143 else 2276 else
2144 { 2277 {
2145 frame->prepare = prepare_nop; 2278 frame->prepare = prepare_nop;
2146 frame->check = slf_check_nop; 2279 frame->check = slf_check_nop;
2147 } 2280 }
2148 } 2281 }
2149} 2282}
2150 2283
2284static int
2285slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2286{
2287 frame->prepare = 0;
2288 coro_unwind_stacks (aTHX);
2289
2290 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2291
2292 return 1;
2293}
2294
2295static int
2296safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2297{
2298 if (coro->cctx)
2299 croak ("coro inside C callback, unable to cancel at this time, caught");
2300
2301 if (coro->flags & CF_NEW)
2302 {
2303 coro_set_status (aTHX_ coro, arg, items);
2304 coro_state_destroy (aTHX_ coro);
2305 }
2306 else
2307 {
2308 if (!coro->slf_frame.prepare)
2309 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2310
2311 slf_destroy (aTHX_ coro);
2312
2313 coro_set_status (aTHX_ coro, arg, items);
2314 coro->slf_frame.prepare = prepare_nop;
2315 coro->slf_frame.check = slf_check_safe_cancel;
2316
2317 api_ready (aTHX_ (SV *)coro->hv);
2318 }
2319
2320 return 1;
2321}
2322
2151/*****************************************************************************/ 2323/*****************************************************************************/
2152/* async pool handler */ 2324/* async pool handler */
2153 2325
2154static int 2326static int
2155slf_check_pool_handler (pTHX_ struct CoroSLF *frame) 2327slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
… …
2184slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2356slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2185{ 2357{
2186 HV *hv = (HV *)SvRV (coro_current); 2358 HV *hv = (HV *)SvRV (coro_current);
2187 struct coro *coro = SvSTATE_hv ((SV *)hv); 2359 struct coro *coro = SvSTATE_hv ((SV *)hv);
2188 2360
2189 if (expect_true (coro->saved_deffh)) 2361 if (ecb_expect_true (coro->saved_deffh))
2190 { 2362 {
2191 /* subsequent iteration */ 2363 /* subsequent iteration */
2192 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2364 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2193 coro->saved_deffh = 0; 2365 coro->saved_deffh = 0;
2194 2366
2195 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2367 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2196 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2368 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2197 { 2369 {
2198 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2370 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2199 coro->invoke_av = newAV (); 2371 return;
2200
2201 frame->prepare = prepare_nop;
2202 } 2372 }
2203 else 2373 else
2204 { 2374 {
2205 av_clear (GvAV (PL_defgv)); 2375 av_clear (GvAV (PL_defgv));
2206 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2376 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2256 2426
2257static int 2427static int
2258slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2428slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2259{ 2429{
2260 SV *data = (SV *)frame->data; 2430 SV *data = (SV *)frame->data;
2261 2431
2262 if (CORO_THROW) 2432 if (CORO_THROW)
2263 return 0; 2433 return 0;
2264 2434
2265 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2435 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2266 return 1; 2436 return 1;
… …
2302 cb = sv_2mortal (coro->rouse_cb); 2472 cb = sv_2mortal (coro->rouse_cb);
2303 coro->rouse_cb = 0; 2473 coro->rouse_cb = 0;
2304 } 2474 }
2305 2475
2306 if (!SvROK (cb) 2476 if (!SvROK (cb)
2307 || SvTYPE (SvRV (cb)) != SVt_PVCV 2477 || SvTYPE (SvRV (cb)) != SVt_PVCV
2308 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2478 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2309 croak ("Coro::rouse_wait called with illegal callback argument,"); 2479 croak ("Coro::rouse_wait called with illegal callback argument,");
2310 2480
2311 { 2481 {
2312 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2482 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2429static void 2599static void
2430slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2600slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2431{ 2601{
2432 frame->prepare = prepare_cede_notself; 2602 frame->prepare = prepare_cede_notself;
2433 frame->check = slf_check_nop; 2603 frame->check = slf_check_nop;
2604}
2605
2606/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2607static void
2608slf_destroy (pTHX_ struct coro *coro)
2609{
2610 struct CoroSLF frame = coro->slf_frame;
2611
2612 /*
2613 * The on_destroy below most likely is from an SLF call.
2614 * Since by definition the SLF call will not finish when we destroy
2615 * the coro, we will have to force-finish it here, otherwise
2616 * cleanup functions cannot call SLF functions.
2617 */
2618 coro->slf_frame.prepare = 0;
2619
2620 /* this callback is reserved for slf functions needing to do cleanup */
2621 if (frame.destroy && frame.prepare && !PL_dirty)
2622 frame.destroy (aTHX_ &frame);
2434} 2623}
2435 2624
2436/* 2625/*
2437 * these not obviously related functions are all rolled into one 2626 * these not obviously related functions are all rolled into one
2438 * function to increase chances that they all will call transfer with the same 2627 * function to increase chances that they all will call transfer with the same
… …
2445 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2634 I32 checkmark; /* mark SP to see how many elements check has pushed */
2446 2635
2447 /* set up the slf frame, unless it has already been set-up */ 2636 /* set up the slf frame, unless it has already been set-up */
2448 /* the latter happens when a new coro has been started */ 2637 /* the latter happens when a new coro has been started */
2449 /* or when a new cctx was attached to an existing coroutine */ 2638 /* or when a new cctx was attached to an existing coroutine */
2450 if (expect_true (!slf_frame.prepare)) 2639 if (ecb_expect_true (!slf_frame.prepare))
2451 { 2640 {
2452 /* first iteration */ 2641 /* first iteration */
2453 dSP; 2642 dSP;
2454 SV **arg = PL_stack_base + TOPMARK + 1; 2643 SV **arg = PL_stack_base + TOPMARK + 1;
2455 int items = SP - arg; /* args without function object */ 2644 int items = SP - arg; /* args without function object */
… …
2496 while (slf_frame.check (aTHX_ &slf_frame)); 2685 while (slf_frame.check (aTHX_ &slf_frame));
2497 2686
2498 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2687 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2499 2688
2500 /* exception handling */ 2689 /* exception handling */
2501 if (expect_false (CORO_THROW)) 2690 if (ecb_expect_false (CORO_THROW))
2502 { 2691 {
2503 SV *exception = sv_2mortal (CORO_THROW); 2692 SV *exception = sv_2mortal (CORO_THROW);
2504 2693
2505 CORO_THROW = 0; 2694 CORO_THROW = 0;
2506 sv_setsv (ERRSV, exception); 2695 sv_setsv (ERRSV, exception);
2507 croak (0); 2696 croak (0);
2508 } 2697 }
2509 2698
2510 /* return value handling - mostly like entersub */ 2699 /* return value handling - mostly like entersub */
2511 /* make sure we put something on the stack in scalar context */ 2700 /* make sure we put something on the stack in scalar context */
2512 if (GIMME_V == G_SCALAR) 2701 if (GIMME_V == G_SCALAR
2702 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2513 { 2703 {
2514 dSP; 2704 dSP;
2515 SV **bot = PL_stack_base + checkmark; 2705 SV **bot = PL_stack_base + checkmark;
2516 2706
2517 if (sp == bot) /* too few, push undef */ 2707 if (sp == bot) /* too few, push undef */
2518 bot [1] = &PL_sv_undef; 2708 bot [1] = &PL_sv_undef;
2519 else if (sp != bot + 1) /* too many, take last one */ 2709 else /* too many, take last one */
2520 bot [1] = *sp; 2710 bot [1] = *sp;
2521 2711
2522 SP = bot + 1; 2712 SP = bot + 1;
2523 2713
2524 PUTBACK; 2714 PUTBACK;
… …
2631{ 2821{
2632 PerlIOBuf base; 2822 PerlIOBuf base;
2633 NV next, every; 2823 NV next, every;
2634} PerlIOCede; 2824} PerlIOCede;
2635 2825
2636static IV 2826static IV ecb_cold
2637PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2827PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2638{ 2828{
2639 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2829 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2640 2830
2641 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2831 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2642 self->next = nvtime () + self->every; 2832 self->next = nvtime () + self->every;
2643 2833
2644 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2834 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2645} 2835}
2646 2836
2647static SV * 2837static SV * ecb_cold
2648PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2838PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2649{ 2839{
2650 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2840 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2651 2841
2652 return newSVnv (self->every); 2842 return newSVnv (self->every);
… …
2764 SvREFCNT_dec (cb); 2954 SvREFCNT_dec (cb);
2765 } 2955 }
2766} 2956}
2767 2957
2768static void 2958static void
2769coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2959coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2770{ 2960{
2771 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2961 /* call $sem->adjust (0) to possibly wake up some other waiters */
2772 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2962 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2773} 2963}
2774 2964
2775static int 2965static int
2776slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2966slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2777{ 2967{
2778 AV *av = (AV *)frame->data; 2968 AV *av = (AV *)frame->data;
2779 SV *count_sv = AvARRAY (av)[0]; 2969 SV *count_sv = AvARRAY (av)[0];
2970 SV *coro_hv = SvRV (coro_current);
2971
2972 frame->destroy = 0;
2780 2973
2781 /* if we are about to throw, don't actually acquire the lock, just throw */ 2974 /* if we are about to throw, don't actually acquire the lock, just throw */
2782 if (CORO_THROW) 2975 if (ecb_expect_false (CORO_THROW))
2976 {
2977 /* we still might be responsible for the semaphore, so wake up others */
2978 coro_semaphore_adjust (aTHX_ av, 0);
2979
2783 return 0; 2980 return 0;
2981 }
2784 else if (SvIVX (count_sv) > 0) 2982 else if (SvIVX (count_sv) > 0)
2785 { 2983 {
2786 SvSTATE_current->on_destroy = 0;
2787
2788 if (acquire) 2984 if (acquire)
2789 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2985 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2790 else 2986 else
2791 coro_semaphore_adjust (aTHX_ av, 0); 2987 coro_semaphore_adjust (aTHX_ av, 0);
2792 2988
… …
2796 { 2992 {
2797 int i; 2993 int i;
2798 /* if we were woken up but can't down, we look through the whole */ 2994 /* if we were woken up but can't down, we look through the whole */
2799 /* waiters list and only add us if we aren't in there already */ 2995 /* waiters list and only add us if we aren't in there already */
2800 /* this avoids some degenerate memory usage cases */ 2996 /* this avoids some degenerate memory usage cases */
2801 2997 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2802 for (i = 1; i <= AvFILLp (av); ++i)
2803 if (AvARRAY (av)[i] == SvRV (coro_current)) 2998 if (AvARRAY (av)[i] == coro_hv)
2804 return 1; 2999 return 1;
2805 3000
2806 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3001 av_push (av, SvREFCNT_inc (coro_hv));
2807 return 1; 3002 return 1;
2808 } 3003 }
2809} 3004}
2810 3005
2811static int 3006static int
… …
2834 { 3029 {
2835 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3030 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2836 3031
2837 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3032 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2838 frame->prepare = prepare_schedule; 3033 frame->prepare = prepare_schedule;
2839
2840 /* to avoid race conditions when a woken-up coro gets terminated */ 3034 /* to avoid race conditions when a woken-up coro gets terminated */
2841 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3035 /* we arrange for a temporary on_destroy that calls adjust (0) */
2842 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3036 frame->destroy = coro_semaphore_destroy;
2843 } 3037 }
2844} 3038}
2845 3039
2846static void 3040static void
2847slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3041slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
3016 /* it quickly returns */ 3210 /* it quickly returns */
3017 if (CORO_THROW) 3211 if (CORO_THROW)
3018 return 0; 3212 return 0;
3019 3213
3020 /* one element that is an RV? repeat! */ 3214 /* one element that is an RV? repeat! */
3021 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3215 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3022 return 1; 3216 return 1;
3023 3217
3024 /* restore status */ 3218 /* restore status */
3025 { 3219 {
3026 SV *data_sv = av_pop (state); 3220 SV *data_sv = av_pop (state);
… …
3065 dSP; 3259 dSP;
3066 3260
3067 static SV *prio_cv; 3261 static SV *prio_cv;
3068 static SV *prio_sv; 3262 static SV *prio_sv;
3069 3263
3070 if (expect_false (!prio_cv)) 3264 if (ecb_expect_false (!prio_cv))
3071 { 3265 {
3072 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3266 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3073 prio_sv = newSViv (0); 3267 prio_sv = newSViv (0);
3074 } 3268 }
3075 3269
… …
3181 } 3375 }
3182 3376
3183 return coro_sv; 3377 return coro_sv;
3184} 3378}
3185 3379
3380#ifndef __cplusplus
3381ecb_cold XS(boot_Coro__State);
3382#endif
3383
3384#if CORO_JIT
3385
3386static void ecb_noinline ecb_cold
3387pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3388{
3389 dSP;
3390 AV *av = newAV ();
3391
3392 av_store (av, 3, newSVuv (d));
3393 av_store (av, 2, newSVuv (c));
3394 av_store (av, 1, newSVuv (b));
3395 av_store (av, 0, newSVuv (a));
3396
3397 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3398
3399 PUTBACK;
3400}
3401
3402static void ecb_noinline ecb_cold
3403jit_init (pTHX)
3404{
3405 dSP;
3406 SV *load, *save;
3407 char *map_base;
3408 char *load_ptr, *save_ptr;
3409 STRLEN load_len, save_len, map_len;
3410 int count;
3411
3412 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3413
3414 PUSHMARK (SP);
3415 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3416 #include "state.h"
3417 count = call_pv ("Coro::State::_jit", G_ARRAY);
3418 SPAGAIN;
3419
3420 save = POPs; save_ptr = SvPVbyte (save, save_len);
3421 load = POPs; load_ptr = SvPVbyte (load, load_len);
3422
3423 map_len = load_len + save_len + 16;
3424
3425 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3426
3427 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3428
3429 load_perl_slots = (load_save_perl_slots_type)map_base;
3430 memcpy (map_base, load_ptr, load_len);
3431
3432 map_base += (load_len + 15) & ~15;
3433
3434 save_perl_slots = (load_save_perl_slots_type)map_base;
3435 memcpy (map_base, save_ptr, save_len);
3436
3437 /* we are good citizens and try to make the page read-only, so the evil evil */
3438 /* hackers might have it a bit more difficult */
3439 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3440
3441 PUTBACK;
3442 eval_pv ("undef &Coro::State::_jit", 1);
3443}
3444
3445#endif
3446
3186MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3447MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3187 3448
3188PROTOTYPES: DISABLE 3449PROTOTYPES: DISABLE
3189 3450
3190BOOT: 3451BOOT:
3191{ 3452{
3453#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3454#include "state.h"
3192#ifdef USE_ITHREADS 3455#ifdef USE_ITHREADS
3193# if CORO_PTHREAD 3456# if CORO_PTHREAD
3194 coro_thx = PERL_GET_CONTEXT; 3457 coro_thx = PERL_GET_CONTEXT;
3195# endif 3458# endif
3196#endif 3459#endif
3197 BOOT_PAGESIZE; 3460 /* perl defines these to check for existance first, but why it doesn't */
3461 /* just create them one at init time is not clear to me, except for */
3462 /* programs trying to delete them, but... */
3463 /* anyway, we declare this as invalid and make sure they are initialised here */
3464 DEFSV;
3465 ERRSV;
3198 3466
3199 cctx_current = cctx_new_empty (); 3467 cctx_current = cctx_new_empty ();
3200 3468
3201 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3469 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3202 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3470 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3245 coroapi.prepare_cede_notself = prepare_cede_notself; 3513 coroapi.prepare_cede_notself = prepare_cede_notself;
3246 3514
3247 time_init (aTHX); 3515 time_init (aTHX);
3248 3516
3249 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3517 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3518#if CORO_JIT
3519 PUTBACK;
3520 jit_init (aTHX);
3521 SPAGAIN;
3522#endif
3250} 3523}
3251 3524
3252SV * 3525SV *
3253new (SV *klass, ...) 3526new (SV *klass, ...)
3254 ALIAS: 3527 ALIAS:
… …
3261void 3534void
3262transfer (...) 3535transfer (...)
3263 PROTOTYPE: $$ 3536 PROTOTYPE: $$
3264 CODE: 3537 CODE:
3265 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3538 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3266
3267void
3268_exit (int code)
3269 PROTOTYPE: $
3270 CODE:
3271 _exit (code);
3272 3539
3273SV * 3540SV *
3274clone (Coro::State coro) 3541clone (Coro::State coro)
3275 CODE: 3542 CODE:
3276{ 3543{
… …
3331void 3598void
3332list () 3599list ()
3333 PROTOTYPE: 3600 PROTOTYPE:
3334 PPCODE: 3601 PPCODE:
3335{ 3602{
3336 struct coro *coro; 3603 struct coro *coro;
3337 for (coro = coro_first; coro; coro = coro->next) 3604 for (coro = coro_first; coro; coro = coro->next)
3338 if (coro->hv) 3605 if (coro->hv)
3339 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3606 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3340} 3607}
3341 3608
… …
3396 PROTOTYPE: $ 3663 PROTOTYPE: $
3397 ALIAS: 3664 ALIAS:
3398 is_ready = CF_READY 3665 is_ready = CF_READY
3399 is_running = CF_RUNNING 3666 is_running = CF_RUNNING
3400 is_new = CF_NEW 3667 is_new = CF_NEW
3401 is_destroyed = CF_DESTROYED 3668 is_destroyed = CF_ZOMBIE
3669 is_zombie = CF_ZOMBIE
3402 is_suspended = CF_SUSPENDED 3670 is_suspended = CF_SUSPENDED
3403 CODE: 3671 CODE:
3404 RETVAL = boolSV (coro->flags & ix); 3672 RETVAL = boolSV (coro->flags & ix);
3405 OUTPUT: 3673 OUTPUT:
3406 RETVAL 3674 RETVAL
3407 3675
3408void 3676void
3409throw (Coro::State self, SV *exception = &PL_sv_undef) 3677throw (SV *self, SV *exception = &PL_sv_undef)
3410 PROTOTYPE: $;$ 3678 PROTOTYPE: $;$
3411 CODE: 3679 CODE:
3412{ 3680{
3681 struct coro *coro = SvSTATE (self);
3413 struct coro *current = SvSTATE_current; 3682 struct coro *current = SvSTATE_current;
3414 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3683 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3415 SvREFCNT_dec (*exceptionp); 3684 SvREFCNT_dec (*exceptionp);
3416 SvGETMAGIC (exception); 3685 SvGETMAGIC (exception);
3417 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3686 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3687
3688 api_ready (aTHX_ self);
3418} 3689}
3419 3690
3420void 3691void
3421api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3692api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3422 PROTOTYPE: $;$ 3693 PROTOTYPE: $;$
… …
3499 3770
3500void 3771void
3501times (Coro::State self) 3772times (Coro::State self)
3502 PPCODE: 3773 PPCODE:
3503{ 3774{
3504 struct coro *current = SvSTATE (coro_current); 3775 struct coro *current = SvSTATE (coro_current);
3505 3776
3506 if (expect_false (current == self)) 3777 if (ecb_expect_false (current == self))
3507 { 3778 {
3508 coro_times_update (); 3779 coro_times_update ();
3509 coro_times_add (SvSTATE (coro_current)); 3780 coro_times_add (SvSTATE (coro_current));
3510 } 3781 }
3511 3782
3512 EXTEND (SP, 2); 3783 EXTEND (SP, 2);
3513 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3784 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3514 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3785 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3515 3786
3516 if (expect_false (current == self)) 3787 if (ecb_expect_false (current == self))
3517 coro_times_sub (SvSTATE (coro_current)); 3788 coro_times_sub (SvSTATE (coro_current));
3518} 3789}
3519 3790
3520void 3791void
3521swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3792swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3542BOOT: 3813BOOT:
3543{ 3814{
3544 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3815 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3545 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3816 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3546 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3817 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3547 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3548 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3818 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3549 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3819 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3550 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3820 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3551 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3821 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3552 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3822 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3553 3823
3554 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3824 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3555 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3825 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3556 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3826 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3557 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3827 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3558 3828
3559 coro_stash = gv_stashpv ("Coro", TRUE); 3829 coro_stash = gv_stashpv ("Coro", TRUE);
3560 3830
3561 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3831 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3562 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3832 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3563 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3833 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3595void 3865void
3596_destroy (Coro::State coro) 3866_destroy (Coro::State coro)
3597 CODE: 3867 CODE:
3598 /* used by the manager thread */ 3868 /* used by the manager thread */
3599 coro_state_destroy (aTHX_ coro); 3869 coro_state_destroy (aTHX_ coro);
3870
3871void
3872on_destroy (Coro::State coro, SV *cb)
3873 CODE:
3600 coro_call_on_destroy (aTHX_ coro); 3874 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3875
3876void
3877join (...)
3878 CODE:
3879 CORO_EXECUTE_SLF_XS (slf_init_join);
3601 3880
3602void 3881void
3603terminate (...) 3882terminate (...)
3604 CODE: 3883 CODE:
3605 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3884 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3606 3885
3607void 3886void
3608cancel (...) 3887cancel (...)
3609 CODE: 3888 CODE:
3610 CORO_EXECUTE_SLF_XS (slf_init_cancel); 3889 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3890
3891int
3892safe_cancel (Coro::State self, ...)
3893 C_ARGS: aTHX_ self, &ST (1), items - 1
3611 3894
3612void 3895void
3613schedule (...) 3896schedule (...)
3614 CODE: 3897 CODE:
3615 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3898 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3772 on_leave = 1 4055 on_leave = 1
3773 PROTOTYPE: & 4056 PROTOTYPE: &
3774 CODE: 4057 CODE:
3775{ 4058{
3776 struct coro *coro = SvSTATE_current; 4059 struct coro *coro = SvSTATE_current;
3777 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4060 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3778 4061
3779 block = s_get_cv_croak (block); 4062 block = s_get_cv_croak (block);
3780 4063
3781 if (!*avp) 4064 if (!*avp)
3782 *avp = newAV (); 4065 *avp = newAV ();
… …
3802 4085
3803SV * 4086SV *
3804new (SV *klass, SV *count = 0) 4087new (SV *klass, SV *count = 0)
3805 CODE: 4088 CODE:
3806{ 4089{
3807 int semcnt = 1; 4090 int semcnt = 1;
3808 4091
3809 if (count) 4092 if (count)
3810 { 4093 {
3811 SvGETMAGIC (count); 4094 SvGETMAGIC (count);
3812 4095
… …
3872 XSRETURN_NO; 4155 XSRETURN_NO;
3873} 4156}
3874 4157
3875void 4158void
3876waiters (SV *self) 4159waiters (SV *self)
3877 PPCODE: 4160 PPCODE:
3878{ 4161{
3879 AV *av = (AV *)SvRV (self); 4162 AV *av = (AV *)SvRV (self);
3880 int wcount = AvFILLp (av) + 1 - 1; 4163 int wcount = AvFILLp (av) + 1 - 1;
3881 4164
3882 if (GIMME_V == G_SCALAR) 4165 if (GIMME_V == G_SCALAR)
… …
3891} 4174}
3892 4175
3893MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4176MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3894 4177
3895void 4178void
3896_may_delete (SV *sem, int count, int extra_refs) 4179_may_delete (SV *sem, int count, unsigned int extra_refs)
3897 PPCODE: 4180 PPCODE:
3898{ 4181{
3899 AV *av = (AV *)SvRV (sem); 4182 AV *av = (AV *)SvRV (sem);
3900 4183
3901 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4184 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3902 && AvFILLp (av) == 0 /* no waiters, just count */ 4185 && AvFILLp (av) == 0 /* no waiters, just count */
3903 && SvIV (AvARRAY (av)[0]) == count) 4186 && SvIV (AvARRAY (av)[0]) == count)
3904 XSRETURN_YES; 4187 XSRETURN_YES;
… …
3925 4208
3926void 4209void
3927broadcast (SV *self) 4210broadcast (SV *self)
3928 CODE: 4211 CODE:
3929{ 4212{
3930 AV *av = (AV *)SvRV (self); 4213 AV *av = (AV *)SvRV (self);
3931 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4214 coro_signal_wake (aTHX_ av, AvFILLp (av));
3932} 4215}
3933 4216
3934void 4217void
3935send (SV *self) 4218send (SV *self)
… …
3943 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4226 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3944} 4227}
3945 4228
3946IV 4229IV
3947awaited (SV *self) 4230awaited (SV *self)
3948 CODE: 4231 CODE:
3949 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4232 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3950 OUTPUT: 4233 OUTPUT:
3951 RETVAL 4234 RETVAL
3952 4235
3953 4236
… …
3958 4241
3959void 4242void
3960_schedule (...) 4243_schedule (...)
3961 CODE: 4244 CODE:
3962{ 4245{
3963 static int incede; 4246 static int incede;
3964 4247
3965 api_cede_notself (aTHX); 4248 api_cede_notself (aTHX);
3966 4249
3967 ++incede; 4250 ++incede;
3968 while (coro_nready >= incede && api_cede (aTHX)) 4251 while (coro_nready >= incede && api_cede (aTHX))
… …
4012 { 4295 {
4013 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4296 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4014 coro_old_pp_sselect = 0; 4297 coro_old_pp_sselect = 0;
4015 } 4298 }
4016 4299
4300MODULE = Coro::State PACKAGE = Coro::Util
4301
4302void
4303_exit (int code)
4304 CODE:
4305 _exit (code);
4306
4307NV
4308time ()
4309 CODE:
4310 RETVAL = nvtime (aTHX);
4311 OUTPUT:
4312 RETVAL
4313
4314NV
4315gettimeofday ()
4316 PPCODE:
4317{
4318 UV tv [2];
4319 u2time (aTHX_ tv);
4320 EXTEND (SP, 2);
4321 PUSHs (sv_2mortal (newSVuv (tv [0])));
4322 PUSHs (sv_2mortal (newSVuv (tv [1])));
4323}
4324

Diff Legend

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