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.440 by root, Sat Feb 22 14:12:45 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) = 0;
… …
1106 /* this newly created coroutine might be run on an existing cctx which most 1163 /* this newly created coroutine might be run on an existing cctx which most
1107 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1164 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1108 */ 1165 */
1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1166 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1110 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1167 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1168 slf_frame.destroy = 0;
1111 1169
1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1170 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1113 init_perl_op.op_next = PL_op; 1171 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1172 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1173 init_perl_op.op_ppaddr = pp_slf;
… …
1120 /* copy throw, in case it was set before init_perl */ 1178 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1179 CORO_THROW = coro->except;
1122 1180
1123 SWAP_SVS (coro); 1181 SWAP_SVS (coro);
1124 1182
1125 if (expect_false (enable_times)) 1183 if (ecb_expect_false (enable_times))
1126 { 1184 {
1127 coro_times_update (); 1185 coro_times_update ();
1128 coro_times_sub (coro); 1186 coro_times_sub (coro);
1129 } 1187 }
1130} 1188}
… …
1154destroy_perl (pTHX_ struct coro *coro) 1212destroy_perl (pTHX_ struct coro *coro)
1155{ 1213{
1156 SV *svf [9]; 1214 SV *svf [9];
1157 1215
1158 { 1216 {
1217 SV *old_current = SvRV (coro_current);
1159 struct coro *current = SvSTATE_current; 1218 struct coro *current = SvSTATE (old_current);
1160 1219
1161 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1220 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1162 1221
1163 save_perl (aTHX_ current); 1222 save_perl (aTHX_ current);
1223
1224 /* this will cause transfer_check to croak on block*/
1225 SvRV_set (coro_current, (SV *)coro->hv);
1226
1164 load_perl (aTHX_ coro); 1227 load_perl (aTHX_ coro);
1165 1228
1166 coro_unwind_stacks (aTHX); 1229 coro_unwind_stacks (aTHX);
1167 coro_destruct_stacks (aTHX);
1168 1230
1169 /* restore swapped sv's */ 1231 /* restore swapped sv's */
1170 SWAP_SVS (coro); 1232 SWAP_SVS (coro);
1171 1233
1234 coro_destruct_stacks (aTHX);
1235
1172 // now save some sv's to be free'd later 1236 /* now save some sv's to be free'd later */
1173 svf [0] = GvSV (PL_defgv); 1237 svf [0] = GvSV (PL_defgv);
1174 svf [1] = (SV *)GvAV (PL_defgv); 1238 svf [1] = (SV *)GvAV (PL_defgv);
1175 svf [2] = GvSV (PL_errgv); 1239 svf [2] = GvSV (PL_errgv);
1176 svf [3] = (SV *)PL_defoutgv; 1240 svf [3] = (SV *)PL_defoutgv;
1177 svf [4] = PL_rs; 1241 svf [4] = PL_rs;
… …
1179 svf [6] = (SV *)GvHV (PL_hintgv); 1243 svf [6] = (SV *)GvHV (PL_hintgv);
1180 svf [7] = PL_diehook; 1244 svf [7] = PL_diehook;
1181 svf [8] = PL_warnhook; 1245 svf [8] = PL_warnhook;
1182 assert (9 == sizeof (svf) / sizeof (*svf)); 1246 assert (9 == sizeof (svf) / sizeof (*svf));
1183 1247
1248 SvRV_set (coro_current, old_current);
1249
1184 load_perl (aTHX_ current); 1250 load_perl (aTHX_ current);
1185 } 1251 }
1186 1252
1187 { 1253 {
1188 unsigned int i; 1254 unsigned int i;
… …
1195 SvREFCNT_dec (coro->invoke_cb); 1261 SvREFCNT_dec (coro->invoke_cb);
1196 SvREFCNT_dec (coro->invoke_av); 1262 SvREFCNT_dec (coro->invoke_av);
1197 } 1263 }
1198} 1264}
1199 1265
1200INLINE void 1266ecb_inline void
1201free_coro_mortal (pTHX) 1267free_coro_mortal (pTHX)
1202{ 1268{
1203 if (expect_true (coro_mortal)) 1269 if (ecb_expect_true (coro_mortal))
1204 { 1270 {
1205 SvREFCNT_dec (coro_mortal); 1271 SvREFCNT_dec ((SV *)coro_mortal);
1206 coro_mortal = 0; 1272 coro_mortal = 0;
1207 } 1273 }
1208} 1274}
1209 1275
1210static int 1276static int
… …
1343 1409
1344 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1410 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1345} 1411}
1346 1412
1347/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1413/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1348static void NOINLINE 1414static void ecb_noinline
1349cctx_prepare (pTHX) 1415cctx_prepare (pTHX)
1350{ 1416{
1351 PL_top_env = &PL_start_env; 1417 PL_top_env = &PL_start_env;
1352 1418
1353 if (cctx_current->flags & CC_TRACE) 1419 if (cctx_current->flags & CC_TRACE)
… …
1364 slf_frame.prepare = slf_prepare_set_stacklevel; 1430 slf_frame.prepare = slf_prepare_set_stacklevel;
1365 slf_frame.check = slf_check_set_stacklevel; 1431 slf_frame.check = slf_check_set_stacklevel;
1366} 1432}
1367 1433
1368/* the tail of transfer: execute stuff we can only do after a transfer */ 1434/* the tail of transfer: execute stuff we can only do after a transfer */
1369INLINE void 1435ecb_inline void
1370transfer_tail (pTHX) 1436transfer_tail (pTHX)
1371{ 1437{
1372 free_coro_mortal (aTHX); 1438 free_coro_mortal (aTHX);
1439}
1440
1441/* try to exit the same way perl's main function would do */
1442/* we do not bother resetting the environment or other things *7
1443/* that are not, uhm, essential */
1444/* this obviously also doesn't work when perl is embedded */
1445static void ecb_noinline ecb_cold
1446perlish_exit (pTHX)
1447{
1448 int exitstatus = perl_destruct (PL_curinterp);
1449 perl_free (PL_curinterp);
1450 exit (exitstatus);
1373} 1451}
1374 1452
1375/* 1453/*
1376 * this is a _very_ stripped down perl interpreter ;) 1454 * this is a _very_ stripped down perl interpreter ;)
1377 */ 1455 */
… …
1406 */ 1484 */
1407 1485
1408 /* 1486 /*
1409 * If perl-run returns we assume exit() was being called or the coro 1487 * If perl-run returns we assume exit() was being called or the coro
1410 * fell off the end, which seems to be the only valid (non-bug) 1488 * fell off the end, which seems to be the only valid (non-bug)
1411 * reason for perl_run to return. We try to exit by jumping to the 1489 * reason for perl_run to return. We try to mimic whatever perl is normally
1412 * bootstrap-time "top" top_env, as we cannot restore the "main" 1490 * 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 */ 1491 */
1417 PL_top_env = main_top_env; 1492 perlish_exit (aTHX);
1418 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1419 } 1493 }
1420} 1494}
1421 1495
1422static coro_cctx * 1496static coro_cctx *
1423cctx_new () 1497cctx_new (void)
1424{ 1498{
1425 coro_cctx *cctx; 1499 coro_cctx *cctx;
1426 1500
1427 ++cctx_count; 1501 ++cctx_count;
1428 New (0, cctx, 1, coro_cctx); 1502 New (0, cctx, 1, coro_cctx);
… …
1434 return cctx; 1508 return cctx;
1435} 1509}
1436 1510
1437/* create a new cctx only suitable as source */ 1511/* create a new cctx only suitable as source */
1438static coro_cctx * 1512static coro_cctx *
1439cctx_new_empty () 1513cctx_new_empty (void)
1440{ 1514{
1441 coro_cctx *cctx = cctx_new (); 1515 coro_cctx *cctx = cctx_new ();
1442 1516
1443 cctx->sptr = 0; 1517 cctx->stack.sptr = 0;
1444 coro_create (&cctx->cctx, 0, 0, 0, 0); 1518 coro_create (&cctx->cctx, 0, 0, 0, 0);
1445 1519
1446 return cctx; 1520 return cctx;
1447} 1521}
1448 1522
1449/* create a new cctx suitable as destination/running a perl interpreter */ 1523/* create a new cctx suitable as destination/running a perl interpreter */
1450static coro_cctx * 1524static coro_cctx *
1451cctx_new_run () 1525cctx_new_run (void)
1452{ 1526{
1453 coro_cctx *cctx = cctx_new (); 1527 coro_cctx *cctx = cctx_new ();
1454 void *stack_start;
1455 size_t stack_size;
1456 1528
1457#if HAVE_MMAP 1529 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 } 1530 {
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."); 1531 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1480 _exit (EXIT_FAILURE); 1532 _exit (EXIT_FAILURE);
1481 }
1482
1483 stack_start = cctx->sptr;
1484 stack_size = cctx->ssize;
1485 } 1533 }
1486 1534
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); 1535 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1492 1536
1493 return cctx; 1537 return cctx;
1494} 1538}
1495 1539
1496static void 1540static void
… …
1502 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1546 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1503 1547
1504 --cctx_count; 1548 --cctx_count;
1505 coro_destroy (&cctx->cctx); 1549 coro_destroy (&cctx->cctx);
1506 1550
1507 /* coro_transfer creates new, empty cctx's */ 1551 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 1552
1522 Safefree (cctx); 1553 Safefree (cctx);
1523} 1554}
1524 1555
1525/* wether this cctx should be destructed */ 1556/* wether this cctx should be destructed */
1526#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1557#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1527 1558
1528static coro_cctx * 1559static coro_cctx *
1529cctx_get (pTHX) 1560cctx_get (pTHX)
1530{ 1561{
1531 while (expect_true (cctx_first)) 1562 while (ecb_expect_true (cctx_first))
1532 { 1563 {
1533 coro_cctx *cctx = cctx_first; 1564 coro_cctx *cctx = cctx_first;
1534 cctx_first = cctx->next; 1565 cctx_first = cctx->next;
1535 --cctx_idle; 1566 --cctx_idle;
1536 1567
1537 if (expect_true (!CCTX_EXPIRED (cctx))) 1568 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1538 return cctx; 1569 return cctx;
1539 1570
1540 cctx_destroy (cctx); 1571 cctx_destroy (cctx);
1541 } 1572 }
1542 1573
… …
1544} 1575}
1545 1576
1546static void 1577static void
1547cctx_put (coro_cctx *cctx) 1578cctx_put (coro_cctx *cctx)
1548{ 1579{
1549 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1580 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1550 1581
1551 /* free another cctx if overlimit */ 1582 /* free another cctx if overlimit */
1552 if (expect_false (cctx_idle >= cctx_max_idle)) 1583 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1553 { 1584 {
1554 coro_cctx *first = cctx_first; 1585 coro_cctx *first = cctx_first;
1555 cctx_first = first->next; 1586 cctx_first = first->next;
1556 --cctx_idle; 1587 --cctx_idle;
1557 1588
… …
1568static void 1599static void
1569transfer_check (pTHX_ struct coro *prev, struct coro *next) 1600transfer_check (pTHX_ struct coro *prev, struct coro *next)
1570{ 1601{
1571 /* TODO: throwing up here is considered harmful */ 1602 /* TODO: throwing up here is considered harmful */
1572 1603
1573 if (expect_true (prev != next)) 1604 if (ecb_expect_true (prev != next))
1574 { 1605 {
1575 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1606 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,"); 1607 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1577 1608
1578 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1609 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,"); 1610 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1580 1611
1581#if !PERL_VERSION_ATLEAST (5,10,0) 1612#if !PERL_VERSION_ATLEAST (5,10,0)
1582 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1613 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,"); 1614 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1584#endif 1615#endif
1585 } 1616 }
1586} 1617}
1587 1618
1588/* always use the TRANSFER macro */ 1619/* always use the TRANSFER macro */
1589static void NOINLINE /* noinline so we have a fixed stackframe */ 1620static void ecb_noinline /* noinline so we have a fixed stackframe */
1590transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1621transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1591{ 1622{
1592 dSTACKLEVEL; 1623 dSTACKLEVEL;
1593 1624
1594 /* sometimes transfer is only called to set idle_sp */ 1625 /* sometimes transfer is only called to set idle_sp */
1595 if (expect_false (!prev)) 1626 if (ecb_expect_false (!prev))
1596 { 1627 {
1597 cctx_current->idle_sp = STACKLEVEL; 1628 cctx_current->idle_sp = STACKLEVEL;
1598 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1629 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1599 } 1630 }
1600 else if (expect_true (prev != next)) 1631 else if (ecb_expect_true (prev != next))
1601 { 1632 {
1602 coro_cctx *cctx_prev; 1633 coro_cctx *cctx_prev;
1603 1634
1604 if (expect_false (prev->flags & CF_NEW)) 1635 if (ecb_expect_false (prev->flags & CF_NEW))
1605 { 1636 {
1606 /* create a new empty/source context */ 1637 /* create a new empty/source context */
1607 prev->flags &= ~CF_NEW; 1638 prev->flags &= ~CF_NEW;
1608 prev->flags |= CF_RUNNING; 1639 prev->flags |= CF_RUNNING;
1609 } 1640 }
… …
1612 next->flags |= CF_RUNNING; 1643 next->flags |= CF_RUNNING;
1613 1644
1614 /* first get rid of the old state */ 1645 /* first get rid of the old state */
1615 save_perl (aTHX_ prev); 1646 save_perl (aTHX_ prev);
1616 1647
1617 if (expect_false (next->flags & CF_NEW)) 1648 if (ecb_expect_false (next->flags & CF_NEW))
1618 { 1649 {
1619 /* need to start coroutine */ 1650 /* need to start coroutine */
1620 next->flags &= ~CF_NEW; 1651 next->flags &= ~CF_NEW;
1621 /* setup coroutine call */ 1652 /* setup coroutine call */
1622 init_perl (aTHX_ next); 1653 init_perl (aTHX_ next);
1623 } 1654 }
1624 else 1655 else
1625 load_perl (aTHX_ next); 1656 load_perl (aTHX_ next);
1626 1657
1627 /* possibly untie and reuse the cctx */ 1658 /* possibly untie and reuse the cctx */
1628 if (expect_true ( 1659 if (ecb_expect_true (
1629 cctx_current->idle_sp == STACKLEVEL 1660 cctx_current->idle_sp == STACKLEVEL
1630 && !(cctx_current->flags & CC_TRACE) 1661 && !(cctx_current->flags & CC_TRACE)
1631 && !force_cctx 1662 && !force_cctx
1632 )) 1663 ))
1633 { 1664 {
1634 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1665 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1635 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1666 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1636 1667
1637 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1668 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1638 /* without this the next cctx_get might destroy the running cctx while still in use */ 1669 /* without this the next cctx_get might destroy the running cctx while still in use */
1639 if (expect_false (CCTX_EXPIRED (cctx_current))) 1670 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1640 if (expect_true (!next->cctx)) 1671 if (ecb_expect_true (!next->cctx))
1641 next->cctx = cctx_get (aTHX); 1672 next->cctx = cctx_get (aTHX);
1642 1673
1643 cctx_put (cctx_current); 1674 cctx_put (cctx_current);
1644 } 1675 }
1645 else 1676 else
1646 prev->cctx = cctx_current; 1677 prev->cctx = cctx_current;
1647 1678
1648 ++next->usecount; 1679 ++next->usecount;
1649 1680
1650 cctx_prev = cctx_current; 1681 cctx_prev = cctx_current;
1651 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1682 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1652 1683
1653 next->cctx = 0; 1684 next->cctx = 0;
1654 1685
1655 if (expect_false (cctx_prev != cctx_current)) 1686 if (ecb_expect_false (cctx_prev != cctx_current))
1656 { 1687 {
1657 cctx_prev->top_env = PL_top_env; 1688 cctx_prev->top_env = PL_top_env;
1658 PL_top_env = cctx_current->top_env; 1689 PL_top_env = cctx_current->top_env;
1659 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1690 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1660 } 1691 }
… …
1666#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1697#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1667#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1698#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1668 1699
1669/** high level stuff ********************************************************/ 1700/** high level stuff ********************************************************/
1670 1701
1702/* this function is actually Coro, not Coro::State, but we call it from here */
1703/* because it is convenient - but it hasn't been declared yet for that reason */
1671static int 1704static void
1705coro_call_on_destroy (pTHX_ struct coro *coro);
1706
1707static void
1672coro_state_destroy (pTHX_ struct coro *coro) 1708coro_state_destroy (pTHX_ struct coro *coro)
1673{ 1709{
1674 if (coro->flags & CF_DESTROYED) 1710 if (coro->flags & CF_ZOMBIE)
1675 return 0; 1711 return;
1676 1712
1677 if (coro->on_destroy && !PL_dirty)
1678 coro->on_destroy (aTHX_ coro); 1713 slf_destroy (aTHX_ coro);
1679 1714
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; 1715 coro->flags |= CF_ZOMBIE;
1689 1716
1690 if (coro->flags & CF_READY) 1717 if (coro->flags & CF_READY)
1691 { 1718 {
1692 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1719 /* reduce nready, as destroying a ready coro effectively unreadies it */
1693 /* alternative: look through all ready queues and remove the coro */ 1720 /* alternative: look through all ready queues and remove the coro */
1694 --coro_nready; 1721 --coro_nready;
1695 } 1722 }
1696 else 1723 else
1697 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1724 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1725
1726 if (coro->next) coro->next->prev = coro->prev;
1727 if (coro->prev) coro->prev->next = coro->next;
1728 if (coro == coro_first) coro_first = coro->next;
1698 1729
1699 if (coro->mainstack 1730 if (coro->mainstack
1700 && coro->mainstack != main_mainstack 1731 && coro->mainstack != main_mainstack
1701 && coro->slot 1732 && coro->slot
1702 && !PL_dirty) 1733 && !PL_dirty)
1703 destroy_perl (aTHX_ coro); 1734 destroy_perl (aTHX_ coro);
1704 1735
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); 1736 cctx_destroy (coro->cctx);
1710 SvREFCNT_dec (coro->startcv); 1737 SvREFCNT_dec (coro->startcv);
1711 SvREFCNT_dec (coro->args); 1738 SvREFCNT_dec (coro->args);
1712 SvREFCNT_dec (coro->swap_sv); 1739 SvREFCNT_dec (coro->swap_sv);
1713 SvREFCNT_dec (CORO_THROW); 1740 SvREFCNT_dec (CORO_THROW);
1714 1741
1715 return 1; 1742 coro_call_on_destroy (aTHX_ coro);
1743
1744 /* more destruction mayhem in coro_state_free */
1716} 1745}
1717 1746
1718static int 1747static int
1719coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1748coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1720{ 1749{
1721 struct coro *coro = (struct coro *)mg->mg_ptr; 1750 struct coro *coro = (struct coro *)mg->mg_ptr;
1722 mg->mg_ptr = 0; 1751 mg->mg_ptr = 0;
1723 1752
1724 coro->hv = 0;
1725
1726 if (--coro->refcnt < 0)
1727 {
1728 coro_state_destroy (aTHX_ coro); 1753 coro_state_destroy (aTHX_ coro);
1754 SvREFCNT_dec (coro->on_destroy);
1755 SvREFCNT_dec (coro->status);
1756
1729 Safefree (coro); 1757 Safefree (coro);
1730 }
1731 1758
1732 return 0; 1759 return 0;
1733} 1760}
1734 1761
1735static int 1762static int ecb_cold
1736coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1763coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1737{ 1764{
1738 struct coro *coro = (struct coro *)mg->mg_ptr; 1765 /* called when perl clones the current process the slow way (windows process emulation) */
1739 1766 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1740 ++coro->refcnt; 1767 mg->mg_ptr = 0;
1768 mg->mg_virtual = 0;
1741 1769
1742 return 0; 1770 return 0;
1743} 1771}
1744 1772
1745static MGVTBL coro_state_vtbl = { 1773static MGVTBL coro_state_vtbl = {
… …
1770 TRANSFER (ta, 1); 1798 TRANSFER (ta, 1);
1771} 1799}
1772 1800
1773/** Coro ********************************************************************/ 1801/** Coro ********************************************************************/
1774 1802
1775INLINE void 1803ecb_inline void
1776coro_enq (pTHX_ struct coro *coro) 1804coro_enq (pTHX_ struct coro *coro)
1777{ 1805{
1778 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1806 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1779 1807
1780 SvREFCNT_inc_NN (coro->hv); 1808 SvREFCNT_inc_NN (coro->hv);
… …
1782 coro->next_ready = 0; 1810 coro->next_ready = 0;
1783 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1811 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1784 ready [1] = coro; 1812 ready [1] = coro;
1785} 1813}
1786 1814
1787INLINE struct coro * 1815ecb_inline struct coro *
1788coro_deq (pTHX) 1816coro_deq (pTHX)
1789{ 1817{
1790 int prio; 1818 int prio;
1791 1819
1792 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1820 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1845{ 1873{
1846 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1874 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1847} 1875}
1848 1876
1849/* expects to own a reference to next->hv */ 1877/* expects to own a reference to next->hv */
1850INLINE void 1878ecb_inline void
1851prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1879prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1852{ 1880{
1853 SV *prev_sv = SvRV (coro_current); 1881 SV *prev_sv = SvRV (coro_current);
1854 1882
1855 ta->prev = SvSTATE_hv (prev_sv); 1883 ta->prev = SvSTATE_hv (prev_sv);
… …
1868{ 1896{
1869 for (;;) 1897 for (;;)
1870 { 1898 {
1871 struct coro *next = coro_deq (aTHX); 1899 struct coro *next = coro_deq (aTHX);
1872 1900
1873 if (expect_true (next)) 1901 if (ecb_expect_true (next))
1874 { 1902 {
1875 /* cannot transfer to destroyed coros, skip and look for next */ 1903 /* cannot transfer to destroyed coros, skip and look for next */
1876 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1904 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 */ 1905 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1878 else 1906 else
1879 { 1907 {
1880 next->flags &= ~CF_READY; 1908 next->flags &= ~CF_READY;
1881 --coro_nready; 1909 --coro_nready;
… …
1889 /* nothing to schedule: call the idle handler */ 1917 /* nothing to schedule: call the idle handler */
1890 if (SvROK (sv_idle) 1918 if (SvROK (sv_idle)
1891 && SvOBJECT (SvRV (sv_idle))) 1919 && SvOBJECT (SvRV (sv_idle)))
1892 { 1920 {
1893 if (SvRV (sv_idle) == SvRV (coro_current)) 1921 if (SvRV (sv_idle) == SvRV (coro_current))
1922 {
1923 require_pv ("Carp");
1924
1925 {
1926 dSP;
1927
1928 ENTER;
1929 SAVETMPS;
1930
1931 PUSHMARK (SP);
1894 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1932 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1933 PUTBACK;
1934 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1935
1936 FREETMPS;
1937 LEAVE;
1938 }
1939 }
1895 1940
1896 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1941 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1897 api_ready (aTHX_ SvRV (sv_idle)); 1942 api_ready (aTHX_ SvRV (sv_idle));
1898 --coro_nready; 1943 --coro_nready;
1899 } 1944 }
… …
1914 } 1959 }
1915 } 1960 }
1916 } 1961 }
1917} 1962}
1918 1963
1919INLINE void 1964ecb_inline void
1920prepare_cede (pTHX_ struct coro_transfer_args *ta) 1965prepare_cede (pTHX_ struct coro_transfer_args *ta)
1921{ 1966{
1922 api_ready (aTHX_ coro_current); 1967 api_ready (aTHX_ coro_current);
1923 prepare_schedule (aTHX_ ta); 1968 prepare_schedule (aTHX_ ta);
1924} 1969}
1925 1970
1926INLINE void 1971ecb_inline void
1927prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1972prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1928{ 1973{
1929 SV *prev = SvRV (coro_current); 1974 SV *prev = SvRV (coro_current);
1930 1975
1931 if (coro_nready) 1976 if (coro_nready)
… …
1961{ 2006{
1962 struct coro_transfer_args ta; 2007 struct coro_transfer_args ta;
1963 2008
1964 prepare_cede (aTHX_ &ta); 2009 prepare_cede (aTHX_ &ta);
1965 2010
1966 if (expect_true (ta.prev != ta.next)) 2011 if (ecb_expect_true (ta.prev != ta.next))
1967 { 2012 {
1968 TRANSFER (ta, 1); 2013 TRANSFER (ta, 1);
1969 return 1; 2014 return 1;
1970 } 2015 }
1971 else 2016 else
… …
2014 coro->slot->runops = RUNOPS_DEFAULT; 2059 coro->slot->runops = RUNOPS_DEFAULT;
2015 } 2060 }
2016} 2061}
2017 2062
2018static void 2063static void
2064coro_push_av (pTHX_ AV *av, I32 gimme_v)
2065{
2066 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2067 {
2068 dSP;
2069
2070 if (gimme_v == G_SCALAR)
2071 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2072 else
2073 {
2074 int i;
2075 EXTEND (SP, AvFILLp (av) + 1);
2076
2077 for (i = 0; i <= AvFILLp (av); ++i)
2078 PUSHs (AvARRAY (av)[i]);
2079 }
2080
2081 PUTBACK;
2082 }
2083}
2084
2085static void
2086coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2087{
2088 if (!coro->on_destroy)
2089 coro->on_destroy = newAV ();
2090
2091 av_push (coro->on_destroy, cb);
2092}
2093
2094static void
2095slf_destroy_join (pTHX_ struct CoroSLF *frame)
2096{
2097 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2098}
2099
2100static int
2101slf_check_join (pTHX_ struct CoroSLF *frame)
2102{
2103 struct coro *coro = (struct coro *)frame->data;
2104
2105 if (!coro->status)
2106 return 1;
2107
2108 frame->destroy = 0;
2109
2110 coro_push_av (aTHX_ coro->status, GIMME_V);
2111
2112 SvREFCNT_dec ((SV *)coro->hv);
2113
2114 return 0;
2115}
2116
2117static void
2118slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2119{
2120 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2121
2122 if (items > 1)
2123 croak ("join called with too many arguments");
2124
2125 if (coro->status)
2126 frame->prepare = prepare_nop;
2127 else
2128 {
2129 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2130 frame->prepare = prepare_schedule;
2131 }
2132
2133 frame->check = slf_check_join;
2134 frame->destroy = slf_destroy_join;
2135 frame->data = (void *)coro;
2136 SvREFCNT_inc (coro->hv);
2137}
2138
2139static void
2019coro_call_on_destroy (pTHX_ struct coro *coro) 2140coro_call_on_destroy (pTHX_ struct coro *coro)
2020{ 2141{
2021 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2142 AV *od = coro->on_destroy;
2022 2143
2023 if (on_destroyp) 2144 if (!od)
2024 { 2145 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 2146
2147 coro->on_destroy = 0;
2148 sv_2mortal ((SV *)od);
2149
2029 while (AvFILLp (on_destroy) >= 0) 2150 while (AvFILLp (od) >= 0)
2151 {
2152 SV *cb = sv_2mortal (av_pop (od));
2153
2154 /* coro hv's (and only hv's at the moment) are supported as well */
2155 if (SvSTATEhv_p (aTHX_ cb))
2156 api_ready (aTHX_ cb);
2157 else
2030 { 2158 {
2031 dSP; /* don't disturb outer sp */ 2159 dSP; /* don't disturb outer sp */
2032 SV *cb = av_pop (on_destroy);
2033
2034 PUSHMARK (SP); 2160 PUSHMARK (SP);
2035 2161
2036 if (statusp) 2162 if (coro->status)
2037 { 2163 {
2038 int i; 2164 PUTBACK;
2039 EXTEND (SP, AvFILLp (status) + 1); 2165 coro_push_av (aTHX_ coro->status, G_ARRAY);
2040 2166 SPAGAIN;
2041 for (i = 0; i <= AvFILLp (status); ++i)
2042 PUSHs (AvARRAY (status)[i]);
2043 } 2167 }
2044 2168
2045 PUTBACK; 2169 PUTBACK;
2046 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2170 call_sv (cb, G_VOID | G_DISCARD);
2047 } 2171 }
2048 } 2172 }
2049} 2173}
2050 2174
2051static void 2175static void
2052coro_set_status (HV *coro_hv, SV **arg, int items) 2176coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2053{ 2177{
2054 AV *av = newAV (); 2178 AV *av;
2179
2180 if (coro->status)
2181 {
2182 av = coro->status;
2183 av_clear (av);
2184 }
2185 else
2186 av = coro->status = newAV ();
2055 2187
2056 /* items are actually not so common, so optimise for this case */ 2188 /* items are actually not so common, so optimise for this case */
2057 if (items) 2189 if (items)
2058 { 2190 {
2059 int i; 2191 int i;
… …
2061 av_extend (av, items - 1); 2193 av_extend (av, items - 1);
2062 2194
2063 for (i = 0; i < items; ++i) 2195 for (i = 0; i < items; ++i)
2064 av_push (av, SvREFCNT_inc_NN (arg [i])); 2196 av_push (av, SvREFCNT_inc_NN (arg [i]));
2065 } 2197 }
2066
2067 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2068} 2198}
2069 2199
2070static void 2200static void
2071slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2201slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2072{ 2202{
… …
2084static void 2214static void
2085slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2215slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2086{ 2216{
2087 HV *coro_hv = (HV *)SvRV (coro_current); 2217 HV *coro_hv = (HV *)SvRV (coro_current);
2088 2218
2089 coro_set_status (coro_hv, arg, items); 2219 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2090 slf_init_terminate_cancel_common (frame, coro_hv); 2220 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2091} 2221}
2092 2222
2093static void 2223static void
2094slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2224slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2095{ 2225{
… …
2100 croak ("Coro::cancel called without coro object,"); 2230 croak ("Coro::cancel called without coro object,");
2101 2231
2102 coro = SvSTATE (arg [0]); 2232 coro = SvSTATE (arg [0]);
2103 coro_hv = coro->hv; 2233 coro_hv = coro->hv;
2104 2234
2105 coro_set_status (coro_hv, arg + 1, items - 1); 2235 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2106 2236
2107 if (expect_false (coro->flags & CF_NOCANCEL)) 2237 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2108 { 2238 {
2109 /* coro currently busy cancelling something, so just notify it */ 2239 /* coro currently busy cancelling something, so just notify it */
2110 coro->slf_frame.data = (void *)coro; 2240 coro->slf_frame.data = (void *)coro;
2111 2241
2112 frame->prepare = prepare_nop; 2242 frame->prepare = prepare_nop;
2113 frame->check = slf_check_nop; 2243 frame->check = slf_check_nop;
2114 } 2244 }
2115 else if (coro_hv == (HV *)SvRV (coro_current)) 2245 else if (coro_hv == (HV *)SvRV (coro_current))
2116 { 2246 {
2117 /* cancelling the current coro is allowed, and equals terminate */ 2247 /* cancelling the current coro is allowed, and equals terminate */
2118 slf_init_terminate_cancel_common (frame, coro_hv); 2248 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2119 } 2249 }
2120 else 2250 else
2121 { 2251 {
2122 struct coro *self = SvSTATE_current; 2252 struct coro *self = SvSTATE_current;
2123 2253
… …
2127 * this is ugly, and hopefully fully worth the extra speed. 2257 * this is ugly, and hopefully fully worth the extra speed.
2128 * besides, I can't get the slow-but-safe version working... 2258 * besides, I can't get the slow-but-safe version working...
2129 */ 2259 */
2130 slf_frame.data = 0; 2260 slf_frame.data = 0;
2131 self->flags |= CF_NOCANCEL; 2261 self->flags |= CF_NOCANCEL;
2132
2133 coro_state_destroy (aTHX_ coro); 2262 coro_state_destroy (aTHX_ coro);
2134 coro_call_on_destroy (aTHX_ coro);
2135
2136 self->flags &= ~CF_NOCANCEL; 2263 self->flags &= ~CF_NOCANCEL;
2137 2264
2138 if (slf_frame.data) 2265 if (slf_frame.data)
2139 { 2266 {
2140 /* while we were busy we have been cancelled, so terminate */ 2267 /* while we were busy we have been cancelled, so terminate */
2141 slf_init_terminate_cancel_common (frame, self->hv); 2268 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2142 } 2269 }
2143 else 2270 else
2144 { 2271 {
2145 frame->prepare = prepare_nop; 2272 frame->prepare = prepare_nop;
2146 frame->check = slf_check_nop; 2273 frame->check = slf_check_nop;
2147 } 2274 }
2148 } 2275 }
2149} 2276}
2150 2277
2278static int
2279slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2280{
2281 frame->prepare = 0;
2282 coro_unwind_stacks (aTHX);
2283
2284 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2285
2286 return 1;
2287}
2288
2289static int
2290safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2291{
2292 if (coro->cctx)
2293 croak ("coro inside C callback, unable to cancel at this time, caught");
2294
2295 if (coro->flags & CF_NEW)
2296 {
2297 coro_set_status (aTHX_ coro, arg, items);
2298 coro_state_destroy (aTHX_ coro);
2299 }
2300 else
2301 {
2302 if (!coro->slf_frame.prepare)
2303 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2304
2305 slf_destroy (aTHX_ coro);
2306
2307 coro_set_status (aTHX_ coro, arg, items);
2308 coro->slf_frame.prepare = prepare_nop;
2309 coro->slf_frame.check = slf_check_safe_cancel;
2310
2311 api_ready (aTHX_ (SV *)coro->hv);
2312 }
2313
2314 return 1;
2315}
2316
2151/*****************************************************************************/ 2317/*****************************************************************************/
2152/* async pool handler */ 2318/* async pool handler */
2153 2319
2154static int 2320static int
2155slf_check_pool_handler (pTHX_ struct CoroSLF *frame) 2321slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
… …
2184slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2350slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2185{ 2351{
2186 HV *hv = (HV *)SvRV (coro_current); 2352 HV *hv = (HV *)SvRV (coro_current);
2187 struct coro *coro = SvSTATE_hv ((SV *)hv); 2353 struct coro *coro = SvSTATE_hv ((SV *)hv);
2188 2354
2189 if (expect_true (coro->saved_deffh)) 2355 if (ecb_expect_true (coro->saved_deffh))
2190 { 2356 {
2191 /* subsequent iteration */ 2357 /* subsequent iteration */
2192 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2358 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2193 coro->saved_deffh = 0; 2359 coro->saved_deffh = 0;
2194 2360
2195 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2361 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2196 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2362 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2197 { 2363 {
2198 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2364 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2199 coro->invoke_av = newAV (); 2365 return;
2200
2201 frame->prepare = prepare_nop;
2202 } 2366 }
2203 else 2367 else
2204 { 2368 {
2205 av_clear (GvAV (PL_defgv)); 2369 av_clear (GvAV (PL_defgv));
2206 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2370 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2256 2420
2257static int 2421static int
2258slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2422slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2259{ 2423{
2260 SV *data = (SV *)frame->data; 2424 SV *data = (SV *)frame->data;
2261 2425
2262 if (CORO_THROW) 2426 if (CORO_THROW)
2263 return 0; 2427 return 0;
2264 2428
2265 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2429 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2266 return 1; 2430 return 1;
… …
2302 cb = sv_2mortal (coro->rouse_cb); 2466 cb = sv_2mortal (coro->rouse_cb);
2303 coro->rouse_cb = 0; 2467 coro->rouse_cb = 0;
2304 } 2468 }
2305 2469
2306 if (!SvROK (cb) 2470 if (!SvROK (cb)
2307 || SvTYPE (SvRV (cb)) != SVt_PVCV 2471 || SvTYPE (SvRV (cb)) != SVt_PVCV
2308 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2472 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2309 croak ("Coro::rouse_wait called with illegal callback argument,"); 2473 croak ("Coro::rouse_wait called with illegal callback argument,");
2310 2474
2311 { 2475 {
2312 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2476 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2429static void 2593static void
2430slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2594slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2431{ 2595{
2432 frame->prepare = prepare_cede_notself; 2596 frame->prepare = prepare_cede_notself;
2433 frame->check = slf_check_nop; 2597 frame->check = slf_check_nop;
2598}
2599
2600/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2601static void
2602slf_destroy (pTHX_ struct coro *coro)
2603{
2604 /* this callback is reserved for slf functions needing to do cleanup */
2605 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2606 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2607
2608 /*
2609 * The on_destroy above most likely is from an SLF call.
2610 * Since by definition the SLF call will not finish when we destroy
2611 * the coro, we will have to force-finish it here, otherwise
2612 * cleanup functions cannot call SLF functions.
2613 */
2614 coro->slf_frame.prepare = 0;
2434} 2615}
2435 2616
2436/* 2617/*
2437 * these not obviously related functions are all rolled into one 2618 * these not obviously related functions are all rolled into one
2438 * function to increase chances that they all will call transfer with the same 2619 * 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 */ 2626 I32 checkmark; /* mark SP to see how many elements check has pushed */
2446 2627
2447 /* set up the slf frame, unless it has already been set-up */ 2628 /* set up the slf frame, unless it has already been set-up */
2448 /* the latter happens when a new coro has been started */ 2629 /* the latter happens when a new coro has been started */
2449 /* or when a new cctx was attached to an existing coroutine */ 2630 /* or when a new cctx was attached to an existing coroutine */
2450 if (expect_true (!slf_frame.prepare)) 2631 if (ecb_expect_true (!slf_frame.prepare))
2451 { 2632 {
2452 /* first iteration */ 2633 /* first iteration */
2453 dSP; 2634 dSP;
2454 SV **arg = PL_stack_base + TOPMARK + 1; 2635 SV **arg = PL_stack_base + TOPMARK + 1;
2455 int items = SP - arg; /* args without function object */ 2636 int items = SP - arg; /* args without function object */
… …
2496 while (slf_frame.check (aTHX_ &slf_frame)); 2677 while (slf_frame.check (aTHX_ &slf_frame));
2497 2678
2498 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2679 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2499 2680
2500 /* exception handling */ 2681 /* exception handling */
2501 if (expect_false (CORO_THROW)) 2682 if (ecb_expect_false (CORO_THROW))
2502 { 2683 {
2503 SV *exception = sv_2mortal (CORO_THROW); 2684 SV *exception = sv_2mortal (CORO_THROW);
2504 2685
2505 CORO_THROW = 0; 2686 CORO_THROW = 0;
2506 sv_setsv (ERRSV, exception); 2687 sv_setsv (ERRSV, exception);
2507 croak (0); 2688 croak (0);
2508 } 2689 }
2509 2690
2510 /* return value handling - mostly like entersub */ 2691 /* return value handling - mostly like entersub */
2511 /* make sure we put something on the stack in scalar context */ 2692 /* make sure we put something on the stack in scalar context */
2512 if (GIMME_V == G_SCALAR) 2693 if (GIMME_V == G_SCALAR
2694 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2513 { 2695 {
2514 dSP; 2696 dSP;
2515 SV **bot = PL_stack_base + checkmark; 2697 SV **bot = PL_stack_base + checkmark;
2516 2698
2517 if (sp == bot) /* too few, push undef */ 2699 if (sp == bot) /* too few, push undef */
2518 bot [1] = &PL_sv_undef; 2700 bot [1] = &PL_sv_undef;
2519 else if (sp != bot + 1) /* too many, take last one */ 2701 else /* too many, take last one */
2520 bot [1] = *sp; 2702 bot [1] = *sp;
2521 2703
2522 SP = bot + 1; 2704 SP = bot + 1;
2523 2705
2524 PUTBACK; 2706 PUTBACK;
… …
2631{ 2813{
2632 PerlIOBuf base; 2814 PerlIOBuf base;
2633 NV next, every; 2815 NV next, every;
2634} PerlIOCede; 2816} PerlIOCede;
2635 2817
2636static IV 2818static IV ecb_cold
2637PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2819PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2638{ 2820{
2639 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2821 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2640 2822
2641 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2823 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2642 self->next = nvtime () + self->every; 2824 self->next = nvtime () + self->every;
2643 2825
2644 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2826 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2645} 2827}
2646 2828
2647static SV * 2829static SV * ecb_cold
2648PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2830PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2649{ 2831{
2650 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2832 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2651 2833
2652 return newSVnv (self->every); 2834 return newSVnv (self->every);
… …
2764 SvREFCNT_dec (cb); 2946 SvREFCNT_dec (cb);
2765 } 2947 }
2766} 2948}
2767 2949
2768static void 2950static void
2769coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2951coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2770{ 2952{
2771 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2953 /* call $sem->adjust (0) to possibly wake up some other waiters */
2772 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2954 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2773} 2955}
2774 2956
2775static int 2957static int
2776slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2958slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2777{ 2959{
2778 AV *av = (AV *)frame->data; 2960 AV *av = (AV *)frame->data;
2779 SV *count_sv = AvARRAY (av)[0]; 2961 SV *count_sv = AvARRAY (av)[0];
2962 SV *coro_hv = SvRV (coro_current);
2780 2963
2781 /* if we are about to throw, don't actually acquire the lock, just throw */ 2964 /* if we are about to throw, don't actually acquire the lock, just throw */
2782 if (CORO_THROW) 2965 if (CORO_THROW)
2783 return 0; 2966 return 0;
2784 else if (SvIVX (count_sv) > 0) 2967 else if (SvIVX (count_sv) > 0)
2785 { 2968 {
2786 SvSTATE_current->on_destroy = 0; 2969 frame->destroy = 0;
2787 2970
2788 if (acquire) 2971 if (acquire)
2789 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2972 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2790 else 2973 else
2791 coro_semaphore_adjust (aTHX_ av, 0); 2974 coro_semaphore_adjust (aTHX_ av, 0);
… …
2796 { 2979 {
2797 int i; 2980 int i;
2798 /* if we were woken up but can't down, we look through the whole */ 2981 /* 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 */ 2982 /* waiters list and only add us if we aren't in there already */
2800 /* this avoids some degenerate memory usage cases */ 2983 /* this avoids some degenerate memory usage cases */
2801 2984 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)) 2985 if (AvARRAY (av)[i] == coro_hv)
2804 return 1; 2986 return 1;
2805 2987
2806 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2988 av_push (av, SvREFCNT_inc (coro_hv));
2807 return 1; 2989 return 1;
2808 } 2990 }
2809} 2991}
2810 2992
2811static int 2993static int
… …
2834 { 3016 {
2835 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3017 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2836 3018
2837 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3019 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2838 frame->prepare = prepare_schedule; 3020 frame->prepare = prepare_schedule;
2839
2840 /* to avoid race conditions when a woken-up coro gets terminated */ 3021 /* to avoid race conditions when a woken-up coro gets terminated */
2841 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3022 /* we arrange for a temporary on_destroy that calls adjust (0) */
2842 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3023 frame->destroy = coro_semaphore_destroy;
2843 } 3024 }
2844} 3025}
2845 3026
2846static void 3027static void
2847slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3028slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
3016 /* it quickly returns */ 3197 /* it quickly returns */
3017 if (CORO_THROW) 3198 if (CORO_THROW)
3018 return 0; 3199 return 0;
3019 3200
3020 /* one element that is an RV? repeat! */ 3201 /* one element that is an RV? repeat! */
3021 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3202 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3022 return 1; 3203 return 1;
3023 3204
3024 /* restore status */ 3205 /* restore status */
3025 { 3206 {
3026 SV *data_sv = av_pop (state); 3207 SV *data_sv = av_pop (state);
… …
3065 dSP; 3246 dSP;
3066 3247
3067 static SV *prio_cv; 3248 static SV *prio_cv;
3068 static SV *prio_sv; 3249 static SV *prio_sv;
3069 3250
3070 if (expect_false (!prio_cv)) 3251 if (ecb_expect_false (!prio_cv))
3071 { 3252 {
3072 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3253 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3073 prio_sv = newSViv (0); 3254 prio_sv = newSViv (0);
3074 } 3255 }
3075 3256
… …
3181 } 3362 }
3182 3363
3183 return coro_sv; 3364 return coro_sv;
3184} 3365}
3185 3366
3367#ifndef __cplusplus
3368ecb_cold XS(boot_Coro__State);
3369#endif
3370
3371#if CORO_JIT
3372
3373static void ecb_noinline ecb_cold
3374pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3375{
3376 dSP;
3377 AV *av = newAV ();
3378
3379 av_store (av, 3, newSVuv (d));
3380 av_store (av, 2, newSVuv (c));
3381 av_store (av, 1, newSVuv (b));
3382 av_store (av, 0, newSVuv (a));
3383
3384 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3385
3386 PUTBACK;
3387}
3388
3389static void ecb_noinline ecb_cold
3390jit_init (pTHX)
3391{
3392 dSP;
3393 SV *load, *save;
3394 char *map_base;
3395 char *load_ptr, *save_ptr;
3396 STRLEN load_len, save_len, map_len;
3397 int count;
3398
3399 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3400
3401 PUSHMARK (SP);
3402 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3403 #include "state.h"
3404 count = call_pv ("Coro::State::_jit", G_ARRAY);
3405 SPAGAIN;
3406
3407 save = POPs; save_ptr = SvPVbyte (save, save_len);
3408 load = POPs; load_ptr = SvPVbyte (load, load_len);
3409
3410 map_len = load_len + save_len + 16;
3411
3412 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3413
3414 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3415
3416 load_perl_slots = (load_save_perl_slots_type)map_base;
3417 memcpy (map_base, load_ptr, load_len);
3418
3419 map_base += (load_len + 15) & ~15;
3420
3421 save_perl_slots = (load_save_perl_slots_type)map_base;
3422 memcpy (map_base, save_ptr, save_len);
3423
3424 /* we are good citizens and try to make the page read-only, so the evil evil */
3425 /* hackers might have it a bit more difficult */
3426 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3427
3428 PUTBACK;
3429 eval_pv ("undef &Coro::State::_jit", 1);
3430}
3431
3432#endif
3433
3186MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3434MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3187 3435
3188PROTOTYPES: DISABLE 3436PROTOTYPES: DISABLE
3189 3437
3190BOOT: 3438BOOT:
… …
3192#ifdef USE_ITHREADS 3440#ifdef USE_ITHREADS
3193# if CORO_PTHREAD 3441# if CORO_PTHREAD
3194 coro_thx = PERL_GET_CONTEXT; 3442 coro_thx = PERL_GET_CONTEXT;
3195# endif 3443# endif
3196#endif 3444#endif
3197 BOOT_PAGESIZE; 3445 /* perl defines these to check for existance first, but why it doesn't */
3446 /* just create them one at init time is not clear to me, except for */
3447 /* programs trying to delete them, but... */
3448 /* anyway, we declare this as invalid and make sure they are initialised here */
3449 DEFSV;
3450 ERRSV;
3198 3451
3199 cctx_current = cctx_new_empty (); 3452 cctx_current = cctx_new_empty ();
3200 3453
3201 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3454 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3202 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3455 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3245 coroapi.prepare_cede_notself = prepare_cede_notself; 3498 coroapi.prepare_cede_notself = prepare_cede_notself;
3246 3499
3247 time_init (aTHX); 3500 time_init (aTHX);
3248 3501
3249 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3502 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3503#if CORO_JIT
3504 PUTBACK;
3505 jit_init (aTHX);
3506 SPAGAIN;
3507#endif
3250} 3508}
3251 3509
3252SV * 3510SV *
3253new (SV *klass, ...) 3511new (SV *klass, ...)
3254 ALIAS: 3512 ALIAS:
… …
3261void 3519void
3262transfer (...) 3520transfer (...)
3263 PROTOTYPE: $$ 3521 PROTOTYPE: $$
3264 CODE: 3522 CODE:
3265 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3523 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3266
3267void
3268_exit (int code)
3269 PROTOTYPE: $
3270 CODE:
3271 _exit (code);
3272 3524
3273SV * 3525SV *
3274clone (Coro::State coro) 3526clone (Coro::State coro)
3275 CODE: 3527 CODE:
3276{ 3528{
… …
3331void 3583void
3332list () 3584list ()
3333 PROTOTYPE: 3585 PROTOTYPE:
3334 PPCODE: 3586 PPCODE:
3335{ 3587{
3336 struct coro *coro; 3588 struct coro *coro;
3337 for (coro = coro_first; coro; coro = coro->next) 3589 for (coro = coro_first; coro; coro = coro->next)
3338 if (coro->hv) 3590 if (coro->hv)
3339 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3591 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3340} 3592}
3341 3593
… …
3396 PROTOTYPE: $ 3648 PROTOTYPE: $
3397 ALIAS: 3649 ALIAS:
3398 is_ready = CF_READY 3650 is_ready = CF_READY
3399 is_running = CF_RUNNING 3651 is_running = CF_RUNNING
3400 is_new = CF_NEW 3652 is_new = CF_NEW
3401 is_destroyed = CF_DESTROYED 3653 is_destroyed = CF_ZOMBIE
3654 is_zombie = CF_ZOMBIE
3402 is_suspended = CF_SUSPENDED 3655 is_suspended = CF_SUSPENDED
3403 CODE: 3656 CODE:
3404 RETVAL = boolSV (coro->flags & ix); 3657 RETVAL = boolSV (coro->flags & ix);
3405 OUTPUT: 3658 OUTPUT:
3406 RETVAL 3659 RETVAL
3407 3660
3408void 3661void
3409throw (Coro::State self, SV *exception = &PL_sv_undef) 3662throw (SV *self, SV *exception = &PL_sv_undef)
3410 PROTOTYPE: $;$ 3663 PROTOTYPE: $;$
3411 CODE: 3664 CODE:
3412{ 3665{
3666 struct coro *coro = SvSTATE (self);
3413 struct coro *current = SvSTATE_current; 3667 struct coro *current = SvSTATE_current;
3414 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3668 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3415 SvREFCNT_dec (*exceptionp); 3669 SvREFCNT_dec (*exceptionp);
3416 SvGETMAGIC (exception); 3670 SvGETMAGIC (exception);
3417 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3671 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3672
3673 api_ready (aTHX_ self);
3418} 3674}
3419 3675
3420void 3676void
3421api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3677api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3422 PROTOTYPE: $;$ 3678 PROTOTYPE: $;$
… …
3499 3755
3500void 3756void
3501times (Coro::State self) 3757times (Coro::State self)
3502 PPCODE: 3758 PPCODE:
3503{ 3759{
3504 struct coro *current = SvSTATE (coro_current); 3760 struct coro *current = SvSTATE (coro_current);
3505 3761
3506 if (expect_false (current == self)) 3762 if (ecb_expect_false (current == self))
3507 { 3763 {
3508 coro_times_update (); 3764 coro_times_update ();
3509 coro_times_add (SvSTATE (coro_current)); 3765 coro_times_add (SvSTATE (coro_current));
3510 } 3766 }
3511 3767
3512 EXTEND (SP, 2); 3768 EXTEND (SP, 2);
3513 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3769 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))); 3770 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3515 3771
3516 if (expect_false (current == self)) 3772 if (ecb_expect_false (current == self))
3517 coro_times_sub (SvSTATE (coro_current)); 3773 coro_times_sub (SvSTATE (coro_current));
3518} 3774}
3519 3775
3520void 3776void
3521swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3777swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3542BOOT: 3798BOOT:
3543{ 3799{
3544 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3800 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3545 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3801 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3546 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3802 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); 3803 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); 3804 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3550 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3805 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3551 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3806 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3552 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3807 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3553 3808
3554 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3809 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); 3810 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); 3811 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 */ 3812 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3558 3813
3559 coro_stash = gv_stashpv ("Coro", TRUE); 3814 coro_stash = gv_stashpv ("Coro", TRUE);
3560 3815
3561 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3816 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3562 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3817 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3563 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3818 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3595void 3850void
3596_destroy (Coro::State coro) 3851_destroy (Coro::State coro)
3597 CODE: 3852 CODE:
3598 /* used by the manager thread */ 3853 /* used by the manager thread */
3599 coro_state_destroy (aTHX_ coro); 3854 coro_state_destroy (aTHX_ coro);
3855
3856void
3857on_destroy (Coro::State coro, SV *cb)
3858 CODE:
3600 coro_call_on_destroy (aTHX_ coro); 3859 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3860
3861void
3862join (...)
3863 CODE:
3864 CORO_EXECUTE_SLF_XS (slf_init_join);
3601 3865
3602void 3866void
3603terminate (...) 3867terminate (...)
3604 CODE: 3868 CODE:
3605 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3869 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3606 3870
3607void 3871void
3608cancel (...) 3872cancel (...)
3609 CODE: 3873 CODE:
3610 CORO_EXECUTE_SLF_XS (slf_init_cancel); 3874 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3875
3876int
3877safe_cancel (Coro::State self, ...)
3878 C_ARGS: aTHX_ self, &ST (1), items - 1
3611 3879
3612void 3880void
3613schedule (...) 3881schedule (...)
3614 CODE: 3882 CODE:
3615 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3883 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3772 on_leave = 1 4040 on_leave = 1
3773 PROTOTYPE: & 4041 PROTOTYPE: &
3774 CODE: 4042 CODE:
3775{ 4043{
3776 struct coro *coro = SvSTATE_current; 4044 struct coro *coro = SvSTATE_current;
3777 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4045 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3778 4046
3779 block = s_get_cv_croak (block); 4047 block = s_get_cv_croak (block);
3780 4048
3781 if (!*avp) 4049 if (!*avp)
3782 *avp = newAV (); 4050 *avp = newAV ();
… …
3802 4070
3803SV * 4071SV *
3804new (SV *klass, SV *count = 0) 4072new (SV *klass, SV *count = 0)
3805 CODE: 4073 CODE:
3806{ 4074{
3807 int semcnt = 1; 4075 int semcnt = 1;
3808 4076
3809 if (count) 4077 if (count)
3810 { 4078 {
3811 SvGETMAGIC (count); 4079 SvGETMAGIC (count);
3812 4080
… …
3872 XSRETURN_NO; 4140 XSRETURN_NO;
3873} 4141}
3874 4142
3875void 4143void
3876waiters (SV *self) 4144waiters (SV *self)
3877 PPCODE: 4145 PPCODE:
3878{ 4146{
3879 AV *av = (AV *)SvRV (self); 4147 AV *av = (AV *)SvRV (self);
3880 int wcount = AvFILLp (av) + 1 - 1; 4148 int wcount = AvFILLp (av) + 1 - 1;
3881 4149
3882 if (GIMME_V == G_SCALAR) 4150 if (GIMME_V == G_SCALAR)
… …
3891} 4159}
3892 4160
3893MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4161MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3894 4162
3895void 4163void
3896_may_delete (SV *sem, int count, int extra_refs) 4164_may_delete (SV *sem, int count, unsigned int extra_refs)
3897 PPCODE: 4165 PPCODE:
3898{ 4166{
3899 AV *av = (AV *)SvRV (sem); 4167 AV *av = (AV *)SvRV (sem);
3900 4168
3901 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4169 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3902 && AvFILLp (av) == 0 /* no waiters, just count */ 4170 && AvFILLp (av) == 0 /* no waiters, just count */
3903 && SvIV (AvARRAY (av)[0]) == count) 4171 && SvIV (AvARRAY (av)[0]) == count)
3904 XSRETURN_YES; 4172 XSRETURN_YES;
… …
3925 4193
3926void 4194void
3927broadcast (SV *self) 4195broadcast (SV *self)
3928 CODE: 4196 CODE:
3929{ 4197{
3930 AV *av = (AV *)SvRV (self); 4198 AV *av = (AV *)SvRV (self);
3931 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4199 coro_signal_wake (aTHX_ av, AvFILLp (av));
3932} 4200}
3933 4201
3934void 4202void
3935send (SV *self) 4203send (SV *self)
… …
3943 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4211 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3944} 4212}
3945 4213
3946IV 4214IV
3947awaited (SV *self) 4215awaited (SV *self)
3948 CODE: 4216 CODE:
3949 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4217 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3950 OUTPUT: 4218 OUTPUT:
3951 RETVAL 4219 RETVAL
3952 4220
3953 4221
… …
3958 4226
3959void 4227void
3960_schedule (...) 4228_schedule (...)
3961 CODE: 4229 CODE:
3962{ 4230{
3963 static int incede; 4231 static int incede;
3964 4232
3965 api_cede_notself (aTHX); 4233 api_cede_notself (aTHX);
3966 4234
3967 ++incede; 4235 ++incede;
3968 while (coro_nready >= incede && api_cede (aTHX)) 4236 while (coro_nready >= incede && api_cede (aTHX))
… …
4012 { 4280 {
4013 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4281 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4014 coro_old_pp_sselect = 0; 4282 coro_old_pp_sselect = 0;
4015 } 4283 }
4016 4284
4285MODULE = Coro::State PACKAGE = Coro::Util
4286
4287void
4288_exit (int code)
4289 CODE:
4290 _exit (code);
4291
4292NV
4293time ()
4294 CODE:
4295 RETVAL = nvtime (aTHX);
4296 OUTPUT:
4297 RETVAL
4298
4299NV
4300gettimeofday ()
4301 PPCODE:
4302{
4303 UV tv [2];
4304 u2time (aTHX_ tv);
4305 EXTEND (SP, 2);
4306 PUSHs (sv_2mortal (newSVuv (tv [0])));
4307 PUSHs (sv_2mortal (newSVuv (tv [1])));
4308}
4309

Diff Legend

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