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.397 by root, Fri May 6 21:15:17 2011 UTC vs.
Revision 1.439 by root, Tue Nov 19 05:16:01 2013 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#include "ecb.h"
20
21#include <stddef.h>
18#include <stdio.h> 22#include <stdio.h>
19#include <errno.h> 23#include <errno.h>
20#include <assert.h> 24#include <assert.h>
21 25
22#ifndef SVs_PADSTALE 26#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0 27# define SVs_PADSTALE 0
28#endif
29
30#ifdef PadARRAY
31# define NEWPADAPI 1
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else
34typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST;
37typedef AV PAD;
38# endif
39# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
40# define PadlistMAX(pl) AvFILLp (pl)
41# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY
43# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif
46
47/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
48/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
49#if PERL_VERSION_ATLEAST(5,19,0)
50# define SVt_BIND SVt_IV
24#endif 51#endif
25 52
26#if defined(_WIN32) 53#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY 54# undef HAS_GETTIMEOFDAY
28# undef setjmp 55# undef setjmp
… …
31# define setjmp _setjmp /* deep magic */ 58# define setjmp _setjmp /* deep magic */
32#else 59#else
33# include <inttypes.h> /* most portable stdint.h */ 60# include <inttypes.h> /* most portable stdint.h */
34#endif 61#endif
35 62
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 */ 63/* the maximum number of idle cctx that will be pooled */
64static int cctx_max_idle = 4; 64static int cctx_max_idle = 4;
65 65
66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 66#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
67# undef CORO_STACKGUARD 67# define HAS_SCOPESTACK_NAME 1
68#endif
69
70#ifndef CORO_STACKGUARD
71# define CORO_STACKGUARD 0
72#endif 68#endif
73 69
74/* prefer perl internal functions over our own? */ 70/* prefer perl internal functions over our own? */
75#ifndef CORO_PREFER_PERL_FUNCTIONS 71#ifndef CORO_PREFER_PERL_FUNCTIONS
76# define CORO_PREFER_PERL_FUNCTIONS 0 72# define CORO_PREFER_PERL_FUNCTIONS 0
… …
86# define STACKLEVEL ((void *)&stacklevel) 82# define STACKLEVEL ((void *)&stacklevel)
87#endif 83#endif
88 84
89#define IN_DESTRUCT PL_dirty 85#define IN_DESTRUCT PL_dirty
90 86
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" 87#include "CoroAPI.h"
107#define GCoroAPI (&coroapi) /* very sneaky */ 88#define GCoroAPI (&coroapi) /* very sneaky */
108 89
109#ifdef USE_ITHREADS 90#ifdef USE_ITHREADS
110# if CORO_PTHREAD 91# if CORO_PTHREAD
… …
166static char times_valid; 147static char times_valid;
167 148
168static struct coro_cctx *cctx_first; 149static struct coro_cctx *cctx_first;
169static int cctx_count, cctx_idle; 150static int cctx_count, cctx_idle;
170 151
171enum { 152enum
153{
172 CC_MAPPED = 0x01, 154 CC_MAPPED = 0x01,
173 CC_NOREUSE = 0x02, /* throw this away after tracing */ 155 CC_NOREUSE = 0x02, /* throw this away after tracing */
174 CC_TRACE = 0x04, 156 CC_TRACE = 0x04,
175 CC_TRACE_SUB = 0x08, /* trace sub calls */ 157 CC_TRACE_SUB = 0x08, /* trace sub calls */
176 CC_TRACE_LINE = 0x10, /* trace each statement */ 158 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
181typedef struct coro_cctx 163typedef struct coro_cctx
182{ 164{
183 struct coro_cctx *next; 165 struct coro_cctx *next;
184 166
185 /* the stack */ 167 /* the stack */
186 void *sptr; 168 struct coro_stack stack;
187 size_t ssize;
188 169
189 /* cpu state */ 170 /* cpu state */
190 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 171 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
172#ifndef NDEBUG
191 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 173 JMPENV *idle_te; /* same as idle_sp, but for top_env */
174#endif
192 JMPENV *top_env; 175 JMPENV *top_env;
193 coro_context cctx; 176 coro_context cctx;
194 177
195 U32 gen; 178 U32 gen;
196#if CORO_USE_VALGRIND 179#if CORO_USE_VALGRIND
… …
201 184
202static coro_cctx *cctx_current; /* the currently running cctx */ 185static coro_cctx *cctx_current; /* the currently running cctx */
203 186
204/*****************************************************************************/ 187/*****************************************************************************/
205 188
189static MGVTBL coro_state_vtbl;
190
206enum { 191enum
192{
207 CF_RUNNING = 0x0001, /* coroutine is running */ 193 CF_RUNNING = 0x0001, /* coroutine is running */
208 CF_READY = 0x0002, /* coroutine is ready */ 194 CF_READY = 0x0002, /* coroutine is ready */
209 CF_NEW = 0x0004, /* has never been switched to */ 195 CF_NEW = 0x0004, /* has never been switched to */
210 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 196 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 197 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */ 198 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
213}; 199};
214 200
215/* the structure where most of the perl state is stored, overlaid on the cxstack */ 201/* the structure where most of the perl state is stored, overlaid on the cxstack */
216typedef struct 202typedef struct
217{ 203{
218 SV *defsv;
219 AV *defav;
220 SV *errsv;
221 SV *irsgv;
222 HV *hinthv;
223#define VAR(name,type) type name; 204 #define VARx(name,expr,type) type name;
224# include "state.h" 205 #include "state.h"
225#undef VAR
226} perl_slots; 206} perl_slots;
227 207
208/* how many context stack entries do we need for perl_slots */
228#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 209#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
229 210
230/* this is a structure representing a perl-level coroutine */ 211/* this is a structure representing a perl-level coroutine */
231struct coro { 212struct coro
213{
232 /* the C coroutine allocated to this perl coroutine, if any */ 214 /* the C coroutine allocated to this perl coroutine, if any */
233 coro_cctx *cctx; 215 coro_cctx *cctx;
234 216
235 /* ready queue */ 217 /* ready queue */
236 struct coro *next_ready; 218 struct coro *next_ready;
… …
238 /* state data */ 220 /* state data */
239 struct CoroSLF slf_frame; /* saved slf frame */ 221 struct CoroSLF slf_frame; /* saved slf frame */
240 AV *mainstack; 222 AV *mainstack;
241 perl_slots *slot; /* basically the saved sp */ 223 perl_slots *slot; /* basically the saved sp */
242 224
243 CV *startcv; /* the CV to execute */ 225 CV *startcv; /* the CV to execute */
244 AV *args; /* data associated with this coroutine (initial args) */ 226 AV *args; /* data associated with this coroutine (initial args) */
245 int refcnt; /* coroutines are refcounted, yes */
246 int flags; /* CF_ flags */ 227 int flags; /* CF_ flags */
247 HV *hv; /* the perl hash associated with this coro, if any */ 228 HV *hv; /* the perl hash associated with this coro, if any */
248 229
249 /* statistics */ 230 /* statistics */
250 int usecount; /* number of transfers to this coro */ 231 int usecount; /* number of transfers to this coro */
251 232
252 /* coro process data */ 233 /* coro process data */
253 int prio; 234 int prio;
254 SV *except; /* exception to be thrown */ 235 SV *except; /* exception to be thrown */
255 SV *rouse_cb; 236 SV *rouse_cb; /* last rouse callback */
237 AV *on_destroy; /* callbacks or coros to notify on destroy */
238 AV *status; /* the exit status list */
256 239
257 /* async_pool */ 240 /* async_pool */
258 SV *saved_deffh; 241 SV *saved_deffh;
259 SV *invoke_cb; 242 SV *invoke_cb;
260 AV *invoke_av; 243 AV *invoke_av;
… …
296static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 279static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
297static CV *cv_coro_run; 280static CV *cv_coro_run;
298static struct coro *coro_first; 281static struct coro *coro_first;
299#define coro_nready coroapi.nready 282#define coro_nready coroapi.nready
300 283
284/** JIT *********************************************************************/
285
286#if CORO_JIT
287 /* APPLE doesn't have mmap though */
288 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
289 #ifndef CORO_JIT_TYPE
290 #if ECB_AMD64 && CORO_JIT_UNIXY
291 #define CORO_JIT_TYPE "amd64-unix"
292 #elif __i386 && CORO_JIT_UNIXY
293 #define CORO_JIT_TYPE "x86-unix"
294 #endif
295 #endif
296#endif
297
298#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
299 #undef CORO_JIT
300#endif
301
302#if CORO_JIT
303 typedef void (*load_save_perl_slots_type)(perl_slots *);
304 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
305#endif
306
301/** Coro::Select ************************************************************/ 307/** Coro::Select ************************************************************/
302 308
303static OP *(*coro_old_pp_sselect) (pTHX); 309static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select; 310static SV *coro_select_select;
305 311
… …
320 326
321/** time stuff **************************************************************/ 327/** time stuff **************************************************************/
322 328
323#ifdef HAS_GETTIMEOFDAY 329#ifdef HAS_GETTIMEOFDAY
324 330
325static void 331ecb_inline void
326coro_u2time (pTHX_ UV ret[2]) 332coro_u2time (pTHX_ UV ret[2])
327{ 333{
328 struct timeval tv; 334 struct timeval tv;
329 gettimeofday (&tv, 0); 335 gettimeofday (&tv, 0);
330 336
331 ret [0] = tv.tv_sec; 337 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec; 338 ret [1] = tv.tv_usec;
333} 339}
334 340
335static double 341ecb_inline double
336coro_nvtime () 342coro_nvtime (void)
337{ 343{
338 struct timeval tv; 344 struct timeval tv;
339 gettimeofday (&tv, 0); 345 gettimeofday (&tv, 0);
340 346
341 return tv.tv_sec + tv.tv_usec * 1e-6; 347 return tv.tv_sec + tv.tv_usec * 1e-6;
342} 348}
343 349
344static void 350ecb_inline void
345time_init (pTHX) 351time_init (pTHX)
346{ 352{
347 nvtime = coro_nvtime; 353 nvtime = coro_nvtime;
348 u2time = coro_u2time; 354 u2time = coro_u2time;
349} 355}
350 356
351#else 357#else
352 358
353static void 359ecb_inline void
354time_init (pTHX) 360time_init (pTHX)
355{ 361{
356 SV **svp; 362 SV **svp;
357 363
358 require_pv ("Time/HiRes.pm"); 364 require_pv ("Time/HiRes.pm");
359 365
360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 366 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
361 367
362 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 368 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 369 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
364 370
… …
370 376
371#endif 377#endif
372 378
373/** lowlevel stuff **********************************************************/ 379/** lowlevel stuff **********************************************************/
374 380
375static SV * 381static SV * ecb_noinline
376coro_get_sv (pTHX_ const char *name, int create) 382coro_get_sv (pTHX_ const char *name, int create)
377{ 383{
378#if PERL_VERSION_ATLEAST (5,10,0) 384#if PERL_VERSION_ATLEAST (5,10,0)
379 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 385 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
380 get_sv (name, create); 386 get_sv (name, create);
381#endif 387#endif
382 return get_sv (name, create); 388 return get_sv (name, create);
383} 389}
384 390
385static AV * 391static AV * ecb_noinline
386coro_get_av (pTHX_ const char *name, int create) 392coro_get_av (pTHX_ const char *name, int create)
387{ 393{
388#if PERL_VERSION_ATLEAST (5,10,0) 394#if PERL_VERSION_ATLEAST (5,10,0)
389 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 395 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
390 get_av (name, create); 396 get_av (name, create);
391#endif 397#endif
392 return get_av (name, create); 398 return get_av (name, create);
393} 399}
394 400
395static HV * 401static HV * ecb_noinline
396coro_get_hv (pTHX_ const char *name, int create) 402coro_get_hv (pTHX_ const char *name, int create)
397{ 403{
398#if PERL_VERSION_ATLEAST (5,10,0) 404#if PERL_VERSION_ATLEAST (5,10,0)
399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 405 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
400 get_hv (name, create); 406 get_hv (name, create);
401#endif 407#endif
402 return get_hv (name, create); 408 return get_hv (name, create);
403} 409}
404 410
405INLINE void 411ecb_inline void
406coro_times_update () 412coro_times_update (void)
407{ 413{
408#ifdef coro_clock_gettime 414#ifdef coro_clock_gettime
409 struct timespec ts; 415 struct timespec ts;
410 416
411 ts.tv_sec = ts.tv_nsec = 0; 417 ts.tv_sec = ts.tv_nsec = 0;
… …
423 time_real [0] = tv [0]; 429 time_real [0] = tv [0];
424 time_real [1] = tv [1] * 1000; 430 time_real [1] = tv [1] * 1000;
425#endif 431#endif
426} 432}
427 433
428INLINE void 434ecb_inline void
429coro_times_add (struct coro *c) 435coro_times_add (struct coro *c)
430{ 436{
431 c->t_real [1] += time_real [1]; 437 c->t_real [1] += time_real [1];
432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 438 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
433 c->t_real [0] += time_real [0]; 439 c->t_real [0] += time_real [0];
… …
435 c->t_cpu [1] += time_cpu [1]; 441 c->t_cpu [1] += time_cpu [1];
436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 442 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
437 c->t_cpu [0] += time_cpu [0]; 443 c->t_cpu [0] += time_cpu [0];
438} 444}
439 445
440INLINE void 446ecb_inline void
441coro_times_sub (struct coro *c) 447coro_times_sub (struct coro *c)
442{ 448{
443 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 449 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]; 450 c->t_real [1] -= time_real [1];
445 c->t_real [0] -= time_real [0]; 451 c->t_real [0] -= time_real [0];
… …
453/* magic glue */ 459/* magic glue */
454 460
455#define CORO_MAGIC_type_cv 26 461#define CORO_MAGIC_type_cv 26
456#define CORO_MAGIC_type_state PERL_MAGIC_ext 462#define CORO_MAGIC_type_state PERL_MAGIC_ext
457 463
458#define CORO_MAGIC_NN(sv, type) \ 464#define CORO_MAGIC_NN(sv, type) \
459 (expect_true (SvMAGIC (sv)->mg_type == type) \ 465 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
460 ? SvMAGIC (sv) \ 466 ? SvMAGIC (sv) \
461 : mg_find (sv, type)) 467 : mg_find (sv, type))
462 468
463#define CORO_MAGIC(sv, type) \ 469#define CORO_MAGIC(sv, type) \
464 (expect_true (SvMAGIC (sv)) \ 470 (ecb_expect_true (SvMAGIC (sv)) \
465 ? CORO_MAGIC_NN (sv, type) \ 471 ? CORO_MAGIC_NN (sv, type) \
466 : 0) 472 : 0)
467 473
468#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 474#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) 475#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
470 476
471INLINE struct coro * 477ecb_inline MAGIC *
478SvSTATEhv_p (pTHX_ SV *coro)
479{
480 MAGIC *mg;
481
482 if (ecb_expect_true (
483 SvTYPE (coro) == SVt_PVHV
484 && (mg = CORO_MAGIC_state (coro))
485 && mg->mg_virtual == &coro_state_vtbl
486 ))
487 return mg;
488
489 return 0;
490}
491
492ecb_inline struct coro *
472SvSTATE_ (pTHX_ SV *coro) 493SvSTATE_ (pTHX_ SV *coro)
473{ 494{
474 HV *stash;
475 MAGIC *mg; 495 MAGIC *mg;
476 496
477 if (SvROK (coro)) 497 if (SvROK (coro))
478 coro = SvRV (coro); 498 coro = SvRV (coro);
479 499
480 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 500 mg = SvSTATEhv_p (aTHX_ coro);
501 if (!mg)
481 croak ("Coro::State object required"); 502 croak ("Coro::State object required");
482 503
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; 504 return (struct coro *)mg->mg_ptr;
493} 505}
494 506
495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 507#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
496 508
… …
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 511#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500 512
501/*****************************************************************************/ 513/*****************************************************************************/
502/* padlist management and caching */ 514/* padlist management and caching */
503 515
504static AV * 516ecb_inline PADLIST *
505coro_derive_padlist (pTHX_ CV *cv) 517coro_derive_padlist (pTHX_ CV *cv)
506{ 518{
507 AV *padlist = CvPADLIST (cv); 519 PADLIST *padlist = CvPADLIST (cv);
508 AV *newpadlist, *newpad; 520 PADLIST *newpadlist;
521 PAD *newpad;
522 PADOFFSET off = PadlistMAX (padlist) + 1;
509 523
510 newpadlist = newAV (); 524#if NEWPADAPI
525
526 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
527 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
528 while (!PadlistARRAY (padlist)[off - 1])
529 --off;
530
531 Perl_pad_push (aTHX_ padlist, off);
532
533 newpad = PadlistARRAY (padlist)[off];
534 PadlistARRAY (padlist)[off] = 0;
535
536#else
537
538#if PERL_VERSION_ATLEAST (5,10,0)
539 Perl_pad_push (aTHX_ padlist, off);
540#else
541 Perl_pad_push (aTHX_ padlist, off, 1);
542#endif
543
544 newpad = PadlistARRAY (padlist)[off];
545 PadlistMAX (padlist) = off - 1;
546
547#endif
548
549 newPADLIST (newpadlist);
550#if !PERL_VERSION_ATLEAST(5,15,3)
551 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
511 AvREAL_off (newpadlist); 552 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 553#endif
517 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
518 --AvFILLp (padlist);
519 554
520 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 555 /* Already extended to 2 elements by newPADLIST. */
521 av_store (newpadlist, 1, (SV *)newpad); 556 PadlistMAX (newpadlist) = 1;
557 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
558 PadlistARRAY (newpadlist)[1] = newpad;
522 559
523 return newpadlist; 560 return newpadlist;
524} 561}
525 562
526static void 563ecb_inline void
527free_padlist (pTHX_ AV *padlist) 564free_padlist (pTHX_ PADLIST *padlist)
528{ 565{
529 /* may be during global destruction */ 566 /* may be during global destruction */
530 if (!IN_DESTRUCT) 567 if (!IN_DESTRUCT)
531 { 568 {
532 I32 i = AvFILLp (padlist); 569 I32 i = PadlistMAX (padlist);
533 570
534 while (i > 0) /* special-case index 0 */ 571 while (i > 0) /* special-case index 0 */
535 { 572 {
536 /* we try to be extra-careful here */ 573 /* we try to be extra-careful here */
537 AV *av = (AV *)AvARRAY (padlist)[i--]; 574 PAD *pad = PadlistARRAY (padlist)[i--];
538 I32 j = AvFILLp (av);
539 575
576 if (pad)
577 {
578 I32 j = PadMAX (pad);
579
540 while (j >= 0) 580 while (j >= 0)
541 SvREFCNT_dec (AvARRAY (av)[j--]); 581 SvREFCNT_dec (PadARRAY (pad)[j--]);
542 582
543 AvFILLp (av) = -1; 583 PadMAX (pad) = -1;
544 SvREFCNT_dec (av); 584 SvREFCNT_dec (pad);
585 }
545 } 586 }
546 587
547 SvREFCNT_dec (AvARRAY (padlist)[0]); 588 SvREFCNT_dec (PadlistNAMES (padlist));
548 589
590#if NEWPADAPI
591 Safefree (PadlistARRAY (padlist));
592 Safefree (padlist);
593#else
549 AvFILLp (padlist) = -1; 594 AvFILLp (padlist) = -1;
595 AvREAL_off (padlist);
550 SvREFCNT_dec ((SV*)padlist); 596 SvREFCNT_dec ((SV*)padlist);
597#endif
551 } 598 }
552} 599}
553 600
554static int 601static int
555coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 602coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
556{ 603{
557 AV *padlist; 604 PADLIST *padlist;
558 AV *av = (AV *)mg->mg_obj; 605 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
606 size_t len = *(size_t *)mg->mg_ptr;
559 607
560 /* perl manages to free our internal AV and _then_ call us */ 608 /* perl manages to free our internal AV and _then_ call us */
561 if (IN_DESTRUCT) 609 if (IN_DESTRUCT)
562 return 0; 610 return 0;
563 611
564 /* casting is fun. */ 612 while (len--)
565 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
566 free_padlist (aTHX_ padlist); 613 free_padlist (aTHX_ padlists[len]);
567
568 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
569 614
570 return 0; 615 return 0;
571} 616}
572 617
573static MGVTBL coro_cv_vtbl = { 618static MGVTBL coro_cv_vtbl = {
574 0, 0, 0, 0, 619 0, 0, 0, 0,
575 coro_cv_free 620 coro_cv_free
576}; 621};
577 622
578/* the next two functions merely cache the padlists */ 623/* the next two functions merely cache the padlists */
579static void 624ecb_inline void
580get_padlist (pTHX_ CV *cv) 625get_padlist (pTHX_ CV *cv)
581{ 626{
582 MAGIC *mg = CORO_MAGIC_cv (cv); 627 MAGIC *mg = CORO_MAGIC_cv (cv);
583 AV *av; 628 size_t *lenp;
584 629
585 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 630 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 631 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
587 else 632 else
588 { 633 {
589#if CORO_PREFER_PERL_FUNCTIONS 634#if CORO_PREFER_PERL_FUNCTIONS
590 /* this is probably cleaner? but also slower! */ 635 /* this is probably cleaner? but also slower! */
591 /* in practise, it seems to be less stable */ 636 /* in practise, it seems to be less stable */
… …
597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 642 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
598#endif 643#endif
599 } 644 }
600} 645}
601 646
602static void 647ecb_inline void
603put_padlist (pTHX_ CV *cv) 648put_padlist (pTHX_ CV *cv)
604{ 649{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 650 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av;
607 651
608 if (expect_false (!mg)) 652 if (ecb_expect_false (!mg))
653 {
609 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 654 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
655 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
656 mg->mg_len = 1; /* so mg_free frees mg_ptr */
657 }
658 else
659 Renew (mg->mg_ptr,
660 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
661 char);
610 662
611 av = (AV *)mg->mg_obj; 663 ((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} 664}
618 665
619/** load & save, init *******************************************************/ 666/** load & save, init *******************************************************/
620 667
668ecb_inline void
669swap_sv (SV *a, SV *b)
670{
671 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
672 SV tmp;
673
674 /* swap sv_any */
675 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
676
677 /* swap sv_flags */
678 SvFLAGS (&tmp) = SvFLAGS (a);
679 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
680 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
681
682#if PERL_VERSION_ATLEAST (5,10,0)
683 /* perl 5.10 and later complicates this _quite_ a bit, but it also
684 * is much faster, so no quarrels here. alternatively, we could
685 * sv_upgrade to avoid this.
686 */
687 {
688 /* swap sv_u */
689 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
690
691 /* if SvANY points to the head, we need to adjust the pointers,
692 * as the pointer for a still points to b, and maybe vice versa.
693 */
694 #define svany_in_head(type) \
695 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
696
697 if (svany_in_head (SvTYPE (a)))
698 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
699
700 if (svany_in_head (SvTYPE (b)))
701 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
702 }
703#endif
704}
705
621/* swap sv heads, at least logically */ 706/* swap sv heads, at least logically */
622static void 707static void
623swap_svs (pTHX_ Coro__State c) 708swap_svs (pTHX_ Coro__State c)
624{ 709{
625 int i; 710 int i;
626 711
627 for (i = 0; i <= AvFILLp (c->swap_sv); ) 712 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
628 { 713 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} 714}
667 715
668#define SWAP_SVS(coro) \ 716#define SWAP_SVS(coro) \
669 if (expect_false ((coro)->swap_sv)) \ 717 if (ecb_expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro)) 718 swap_svs (aTHX_ (coro))
671 719
672static void 720static void
673on_enterleave_call (pTHX_ SV *cb); 721on_enterleave_call (pTHX_ SV *cb);
674 722
… …
678 perl_slots *slot = c->slot; 726 perl_slots *slot = c->slot;
679 c->slot = 0; 727 c->slot = 0;
680 728
681 PL_mainstack = c->mainstack; 729 PL_mainstack = c->mainstack;
682 730
683 GvSV (PL_defgv) = slot->defsv; 731#if CORO_JIT
684 GvAV (PL_defgv) = slot->defav; 732 load_perl_slots (slot);
685 GvSV (PL_errgv) = slot->errsv; 733#else
686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
688
689 #define VAR(name,type) PL_ ## name = slot->name; 734 #define VARx(name,expr,type) expr = slot->name;
690 # include "state.h" 735 #include "state.h"
691 #undef VAR 736#endif
692 737
693 { 738 {
694 dSP; 739 dSP;
695 740
696 CV *cv; 741 CV *cv;
697 742
698 /* now do the ugly restore mess */ 743 /* now do the ugly restore mess */
699 while (expect_true (cv = (CV *)POPs)) 744 while (ecb_expect_true (cv = (CV *)POPs))
700 { 745 {
701 put_padlist (aTHX_ cv); /* mark this padlist as available */ 746 put_padlist (aTHX_ cv); /* mark this padlist as available */
702 CvDEPTH (cv) = PTR2IV (POPs); 747 CvDEPTH (cv) = PTR2IV (POPs);
703 CvPADLIST (cv) = (AV *)POPs; 748 CvPADLIST (cv) = (PADLIST *)POPs;
704 } 749 }
705 750
706 PUTBACK; 751 PUTBACK;
707 } 752 }
708 753
709 slf_frame = c->slf_frame; 754 slf_frame = c->slf_frame;
710 CORO_THROW = c->except; 755 CORO_THROW = c->except;
711 756
712 if (expect_false (enable_times)) 757 if (ecb_expect_false (enable_times))
713 { 758 {
714 if (expect_false (!times_valid)) 759 if (ecb_expect_false (!times_valid))
715 coro_times_update (); 760 coro_times_update ();
716 761
717 coro_times_sub (c); 762 coro_times_sub (c);
718 } 763 }
719 764
720 if (expect_false (c->on_enter)) 765 if (ecb_expect_false (c->on_enter))
721 { 766 {
722 int i; 767 int i;
723 768
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 769 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 770 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
731static void 776static void
732save_perl (pTHX_ Coro__State c) 777save_perl (pTHX_ Coro__State c)
733{ 778{
734 SWAP_SVS (c); 779 SWAP_SVS (c);
735 780
736 if (expect_false (c->on_leave)) 781 if (ecb_expect_false (c->on_leave))
737 { 782 {
738 int i; 783 int i;
739 784
740 for (i = AvFILLp (c->on_leave); i >= 0; --i) 785 for (i = AvFILLp (c->on_leave); i >= 0; --i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 786 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 } 787 }
743 788
744 times_valid = 0; 789 times_valid = 0;
745 790
746 if (expect_false (enable_times)) 791 if (ecb_expect_false (enable_times))
747 { 792 {
748 coro_times_update (); times_valid = 1; 793 coro_times_update (); times_valid = 1;
749 coro_times_add (c); 794 coro_times_add (c);
750 } 795 }
751 796
… …
765 810
766 XPUSHs (Nullsv); 811 XPUSHs (Nullsv);
767 /* this loop was inspired by pp_caller */ 812 /* this loop was inspired by pp_caller */
768 for (;;) 813 for (;;)
769 { 814 {
770 while (expect_true (cxix >= 0)) 815 while (ecb_expect_true (cxix >= 0))
771 { 816 {
772 PERL_CONTEXT *cx = &ccstk[cxix--]; 817 PERL_CONTEXT *cx = &ccstk[cxix--];
773 818
774 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 819 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
775 { 820 {
776 CV *cv = cx->blk_sub.cv; 821 CV *cv = cx->blk_sub.cv;
777 822
778 if (expect_true (CvDEPTH (cv))) 823 if (ecb_expect_true (CvDEPTH (cv)))
779 { 824 {
780 EXTEND (SP, 3); 825 EXTEND (SP, 3);
781 PUSHs ((SV *)CvPADLIST (cv)); 826 PUSHs ((SV *)CvPADLIST (cv));
782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 827 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
783 PUSHs ((SV *)cv); 828 PUSHs ((SV *)cv);
… …
786 get_padlist (aTHX_ cv); 831 get_padlist (aTHX_ cv);
787 } 832 }
788 } 833 }
789 } 834 }
790 835
791 if (expect_true (top_si->si_type == PERLSI_MAIN)) 836 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
792 break; 837 break;
793 838
794 top_si = top_si->si_prev; 839 top_si = top_si->si_prev;
795 ccstk = top_si->si_cxstack; 840 ccstk = top_si->si_cxstack;
796 cxix = top_si->si_cxix; 841 cxix = top_si->si_cxix;
… …
798 843
799 PUTBACK; 844 PUTBACK;
800 } 845 }
801 846
802 /* allocate some space on the context stack for our purposes */ 847 /* allocate some space on the context stack for our purposes */
803 /* we manually unroll here, as usually 2 slots is enough */ 848 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 { 849 {
808 unsigned int i; 850 unsigned int i;
851
809 for (i = 3; i < SLOT_COUNT; ++i) 852 for (i = 0; i < SLOT_COUNT; ++i)
810 CXINC; 853 CXINC;
811 } 854
812 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 855 cxstack_ix -= SLOT_COUNT; /* undo allocation */
856 }
813 857
814 c->mainstack = PL_mainstack; 858 c->mainstack = PL_mainstack;
815 859
816 { 860 {
817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 861 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
818 862
819 slot->defav = GvAV (PL_defgv); 863#if CORO_JIT
820 slot->defsv = DEFSV; 864 save_perl_slots (slot);
821 slot->errsv = ERRSV; 865#else
822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
824
825 #define VAR(name,type) slot->name = PL_ ## name; 866 #define VARx(name,expr,type) slot->name = expr;
826 # include "state.h" 867 #include "state.h"
827 #undef VAR 868#endif
828 } 869 }
829} 870}
830 871
831/* 872/*
832 * allocate various perl stacks. This is almost an exact copy 873 * allocate various perl stacks. This is almost an exact copy
… …
838# define coro_init_stacks(thx) init_stacks () 879# define coro_init_stacks(thx) init_stacks ()
839#else 880#else
840static void 881static void
841coro_init_stacks (pTHX) 882coro_init_stacks (pTHX)
842{ 883{
843 PL_curstackinfo = new_stackinfo(32, 8); 884 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; 885 PL_curstackinfo->si_type = PERLSI_MAIN;
845 PL_curstack = PL_curstackinfo->si_stack; 886 PL_curstack = PL_curstackinfo->si_stack;
846 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 887 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
847 888
848 PL_stack_base = AvARRAY(PL_curstack); 889 PL_stack_base = AvARRAY(PL_curstack);
… …
863#endif 904#endif
864 905
865 New(54,PL_scopestack,8,I32); 906 New(54,PL_scopestack,8,I32);
866 PL_scopestack_ix = 0; 907 PL_scopestack_ix = 0;
867 PL_scopestack_max = 8; 908 PL_scopestack_max = 8;
909#if HAS_SCOPESTACK_NAME
910 New(54,PL_scopestack_name,8,const char*);
911#endif
868 912
869 New(54,PL_savestack,24,ANY); 913 New(54,PL_savestack,24,ANY);
870 PL_savestack_ix = 0; 914 PL_savestack_ix = 0;
871 PL_savestack_max = 24; 915 PL_savestack_max = 24;
872 916
… …
900 } 944 }
901 945
902 Safefree (PL_tmps_stack); 946 Safefree (PL_tmps_stack);
903 Safefree (PL_markstack); 947 Safefree (PL_markstack);
904 Safefree (PL_scopestack); 948 Safefree (PL_scopestack);
949#if HAS_SCOPESTACK_NAME
950 Safefree (PL_scopestack_name);
951#endif
905 Safefree (PL_savestack); 952 Safefree (PL_savestack);
906#if !PERL_VERSION_ATLEAST (5,10,0) 953#if !PERL_VERSION_ATLEAST (5,10,0)
907 Safefree (PL_retstack); 954 Safefree (PL_retstack);
908#endif 955#endif
909} 956}
… …
955#endif 1002#endif
956 1003
957/* 1004/*
958 * This overrides the default magic get method of %SIG elements. 1005 * 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 1006 * 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 1007 * and instead of trying to save and restore the hash elements (extremely slow),
961 * readback here. 1008 * we just provide our own readback here.
962 */ 1009 */
963static int 1010static int ecb_cold
964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1011coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
965{ 1012{
966 const char *s = MgPV_nolen_const (mg); 1013 const char *s = MgPV_nolen_const (mg);
967 1014
968 if (*s == '_') 1015 if (*s == '_')
969 { 1016 {
970 SV **svp = 0; 1017 SV **svp = 0;
971 1018
972 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1019 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
973 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1020 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
974 1021
975 if (svp) 1022 if (svp)
976 { 1023 {
977 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1024 SV *ssv;
1025
1026 if (!*svp)
1027 ssv = &PL_sv_undef;
1028 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1029 ssv = sv_2mortal (newRV_inc (*svp));
1030 else
1031 ssv = *svp;
1032
1033 sv_setsv (sv, ssv);
978 return 0; 1034 return 0;
979 } 1035 }
980 } 1036 }
981 1037
982 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1038 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
983} 1039}
984 1040
985static int 1041static int ecb_cold
986coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1042coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
987{ 1043{
988 const char *s = MgPV_nolen_const (mg); 1044 const char *s = MgPV_nolen_const (mg);
989 1045
990 if (*s == '_') 1046 if (*s == '_')
… …
1004 } 1060 }
1005 1061
1006 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1062 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1007} 1063}
1008 1064
1009static int 1065static int ecb_cold
1010coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1066coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1011{ 1067{
1012 const char *s = MgPV_nolen_const (mg); 1068 const char *s = MgPV_nolen_const (mg);
1013 1069
1014 if (*s == '_') 1070 if (*s == '_')
… …
1049 return 1; 1105 return 1;
1050} 1106}
1051 1107
1052static UNOP init_perl_op; 1108static UNOP init_perl_op;
1053 1109
1054static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1110ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1055init_perl (pTHX_ struct coro *coro) 1111init_perl (pTHX_ struct coro *coro)
1056{ 1112{
1057 /* 1113 /*
1058 * emulate part of the perl startup here. 1114 * emulate part of the perl startup here.
1059 */ 1115 */
… …
1074 PL_parser = 0; 1130 PL_parser = 0;
1075#endif 1131#endif
1076 PL_hints = 0; 1132 PL_hints = 0;
1077 1133
1078 /* recreate the die/warn hooks */ 1134 /* recreate the die/warn hooks */
1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1135 PL_diehook = SvREFCNT_inc (rv_diehook);
1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1136 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1081 1137
1082 GvSV (PL_defgv) = newSV (0); 1138 GvSV (PL_defgv) = newSV (0);
1083 GvAV (PL_defgv) = coro->args; coro->args = 0; 1139 GvAV (PL_defgv) = coro->args; coro->args = 0;
1084 GvSV (PL_errgv) = newSV (0); 1140 GvSV (PL_errgv) = newSV (0);
1085 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1141 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1086 GvHV (PL_hintgv) = 0; 1142 GvHV (PL_hintgv) = 0;
… …
1106 /* this newly created coroutine might be run on an existing cctx which most 1162 /* 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. 1163 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1108 */ 1164 */
1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1165 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 */ 1166 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1167 slf_frame.destroy = 0;
1111 1168
1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1169 /* 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; 1170 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1171 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1172 init_perl_op.op_ppaddr = pp_slf;
… …
1120 /* copy throw, in case it was set before init_perl */ 1177 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1178 CORO_THROW = coro->except;
1122 1179
1123 SWAP_SVS (coro); 1180 SWAP_SVS (coro);
1124 1181
1125 if (expect_false (enable_times)) 1182 if (ecb_expect_false (enable_times))
1126 { 1183 {
1127 coro_times_update (); 1184 coro_times_update ();
1128 coro_times_sub (coro); 1185 coro_times_sub (coro);
1129 } 1186 }
1130} 1187}
… …
1167 SvRV_set (coro_current, (SV *)coro->hv); 1224 SvRV_set (coro_current, (SV *)coro->hv);
1168 1225
1169 load_perl (aTHX_ coro); 1226 load_perl (aTHX_ coro);
1170 1227
1171 coro_unwind_stacks (aTHX); 1228 coro_unwind_stacks (aTHX);
1172 coro_destruct_stacks (aTHX);
1173 1229
1174 /* restore swapped sv's */ 1230 /* restore swapped sv's */
1175 SWAP_SVS (coro); 1231 SWAP_SVS (coro);
1176 1232
1233 coro_destruct_stacks (aTHX);
1234
1177 // now save some sv's to be free'd later 1235 /* now save some sv's to be free'd later */
1178 svf [0] = GvSV (PL_defgv); 1236 svf [0] = GvSV (PL_defgv);
1179 svf [1] = (SV *)GvAV (PL_defgv); 1237 svf [1] = (SV *)GvAV (PL_defgv);
1180 svf [2] = GvSV (PL_errgv); 1238 svf [2] = GvSV (PL_errgv);
1181 svf [3] = (SV *)PL_defoutgv; 1239 svf [3] = (SV *)PL_defoutgv;
1182 svf [4] = PL_rs; 1240 svf [4] = PL_rs;
… …
1202 SvREFCNT_dec (coro->invoke_cb); 1260 SvREFCNT_dec (coro->invoke_cb);
1203 SvREFCNT_dec (coro->invoke_av); 1261 SvREFCNT_dec (coro->invoke_av);
1204 } 1262 }
1205} 1263}
1206 1264
1207INLINE void 1265ecb_inline void
1208free_coro_mortal (pTHX) 1266free_coro_mortal (pTHX)
1209{ 1267{
1210 if (expect_true (coro_mortal)) 1268 if (ecb_expect_true (coro_mortal))
1211 { 1269 {
1212 SvREFCNT_dec (coro_mortal); 1270 SvREFCNT_dec ((SV *)coro_mortal);
1213 coro_mortal = 0; 1271 coro_mortal = 0;
1214 } 1272 }
1215} 1273}
1216 1274
1217static int 1275static int
… …
1350 1408
1351 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1409 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1352} 1410}
1353 1411
1354/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1412/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1355static void NOINLINE 1413static void ecb_noinline
1356cctx_prepare (pTHX) 1414cctx_prepare (pTHX)
1357{ 1415{
1358 PL_top_env = &PL_start_env; 1416 PL_top_env = &PL_start_env;
1359 1417
1360 if (cctx_current->flags & CC_TRACE) 1418 if (cctx_current->flags & CC_TRACE)
… …
1371 slf_frame.prepare = slf_prepare_set_stacklevel; 1429 slf_frame.prepare = slf_prepare_set_stacklevel;
1372 slf_frame.check = slf_check_set_stacklevel; 1430 slf_frame.check = slf_check_set_stacklevel;
1373} 1431}
1374 1432
1375/* the tail of transfer: execute stuff we can only do after a transfer */ 1433/* the tail of transfer: execute stuff we can only do after a transfer */
1376INLINE void 1434ecb_inline void
1377transfer_tail (pTHX) 1435transfer_tail (pTHX)
1378{ 1436{
1379 free_coro_mortal (aTHX); 1437 free_coro_mortal (aTHX);
1438}
1439
1440/* try to exit the same way perl's main function would do */
1441/* we do not bother resetting the environment or other things *7
1442/* that are not, uhm, essential */
1443/* this obviously also doesn't work when perl is embedded */
1444static void ecb_noinline ecb_cold
1445perlish_exit (pTHX)
1446{
1447 int exitstatus = perl_destruct (PL_curinterp);
1448 perl_free (PL_curinterp);
1449 exit (exitstatus);
1380} 1450}
1381 1451
1382/* 1452/*
1383 * this is a _very_ stripped down perl interpreter ;) 1453 * this is a _very_ stripped down perl interpreter ;)
1384 */ 1454 */
… …
1413 */ 1483 */
1414 1484
1415 /* 1485 /*
1416 * If perl-run returns we assume exit() was being called or the coro 1486 * If perl-run returns we assume exit() was being called or the coro
1417 * fell off the end, which seems to be the only valid (non-bug) 1487 * fell off the end, which seems to be the only valid (non-bug)
1418 * reason for perl_run to return. We try to exit by jumping to the 1488 * reason for perl_run to return. We try to mimic whatever perl is normally
1419 * bootstrap-time "top" top_env, as we cannot restore the "main" 1489 * doing in that case. YMMV.
1420 * coroutine as Coro has no such concept.
1421 * This actually isn't valid with the pthread backend, but OSes requiring
1422 * that backend are too broken to do it in a standards-compliant way.
1423 */ 1490 */
1424 PL_top_env = main_top_env; 1491 perlish_exit (aTHX);
1425 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1426 } 1492 }
1427} 1493}
1428 1494
1429static coro_cctx * 1495static coro_cctx *
1430cctx_new () 1496cctx_new (void)
1431{ 1497{
1432 coro_cctx *cctx; 1498 coro_cctx *cctx;
1433 1499
1434 ++cctx_count; 1500 ++cctx_count;
1435 New (0, cctx, 1, coro_cctx); 1501 New (0, cctx, 1, coro_cctx);
… …
1441 return cctx; 1507 return cctx;
1442} 1508}
1443 1509
1444/* create a new cctx only suitable as source */ 1510/* create a new cctx only suitable as source */
1445static coro_cctx * 1511static coro_cctx *
1446cctx_new_empty () 1512cctx_new_empty (void)
1447{ 1513{
1448 coro_cctx *cctx = cctx_new (); 1514 coro_cctx *cctx = cctx_new ();
1449 1515
1450 cctx->sptr = 0; 1516 cctx->stack.sptr = 0;
1451 coro_create (&cctx->cctx, 0, 0, 0, 0); 1517 coro_create (&cctx->cctx, 0, 0, 0, 0);
1452 1518
1453 return cctx; 1519 return cctx;
1454} 1520}
1455 1521
1456/* create a new cctx suitable as destination/running a perl interpreter */ 1522/* create a new cctx suitable as destination/running a perl interpreter */
1457static coro_cctx * 1523static coro_cctx *
1458cctx_new_run () 1524cctx_new_run (void)
1459{ 1525{
1460 coro_cctx *cctx = cctx_new (); 1526 coro_cctx *cctx = cctx_new ();
1461 void *stack_start;
1462 size_t stack_size;
1463 1527
1464#if HAVE_MMAP 1528 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1465 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1466 /* mmap supposedly does allocate-on-write for us */
1467 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1468
1469 if (cctx->sptr != (void *)-1)
1470 {
1471 #if CORO_STACKGUARD
1472 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1473 #endif
1474 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1475 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1476 cctx->flags |= CC_MAPPED;
1477 } 1529 {
1478 else
1479#endif
1480 {
1481 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1482 New (0, cctx->sptr, cctx_stacksize, long);
1483
1484 if (!cctx->sptr)
1485 {
1486 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1530 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1487 _exit (EXIT_FAILURE); 1531 _exit (EXIT_FAILURE);
1488 }
1489
1490 stack_start = cctx->sptr;
1491 stack_size = cctx->ssize;
1492 } 1532 }
1493 1533
1494 #if CORO_USE_VALGRIND
1495 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1496 #endif
1497
1498 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1534 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1499 1535
1500 return cctx; 1536 return cctx;
1501} 1537}
1502 1538
1503static void 1539static void
… …
1509 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1545 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1510 1546
1511 --cctx_count; 1547 --cctx_count;
1512 coro_destroy (&cctx->cctx); 1548 coro_destroy (&cctx->cctx);
1513 1549
1514 /* coro_transfer creates new, empty cctx's */ 1550 coro_stack_free (&cctx->stack);
1515 if (cctx->sptr)
1516 {
1517 #if CORO_USE_VALGRIND
1518 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1519 #endif
1520
1521#if HAVE_MMAP
1522 if (cctx->flags & CC_MAPPED)
1523 munmap (cctx->sptr, cctx->ssize);
1524 else
1525#endif
1526 Safefree (cctx->sptr);
1527 }
1528 1551
1529 Safefree (cctx); 1552 Safefree (cctx);
1530} 1553}
1531 1554
1532/* wether this cctx should be destructed */ 1555/* wether this cctx should be destructed */
1533#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1556#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1534 1557
1535static coro_cctx * 1558static coro_cctx *
1536cctx_get (pTHX) 1559cctx_get (pTHX)
1537{ 1560{
1538 while (expect_true (cctx_first)) 1561 while (ecb_expect_true (cctx_first))
1539 { 1562 {
1540 coro_cctx *cctx = cctx_first; 1563 coro_cctx *cctx = cctx_first;
1541 cctx_first = cctx->next; 1564 cctx_first = cctx->next;
1542 --cctx_idle; 1565 --cctx_idle;
1543 1566
1544 if (expect_true (!CCTX_EXPIRED (cctx))) 1567 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1545 return cctx; 1568 return cctx;
1546 1569
1547 cctx_destroy (cctx); 1570 cctx_destroy (cctx);
1548 } 1571 }
1549 1572
… …
1551} 1574}
1552 1575
1553static void 1576static void
1554cctx_put (coro_cctx *cctx) 1577cctx_put (coro_cctx *cctx)
1555{ 1578{
1556 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1579 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1557 1580
1558 /* free another cctx if overlimit */ 1581 /* free another cctx if overlimit */
1559 if (expect_false (cctx_idle >= cctx_max_idle)) 1582 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1560 { 1583 {
1561 coro_cctx *first = cctx_first; 1584 coro_cctx *first = cctx_first;
1562 cctx_first = first->next; 1585 cctx_first = first->next;
1563 --cctx_idle; 1586 --cctx_idle;
1564 1587
… …
1575static void 1598static void
1576transfer_check (pTHX_ struct coro *prev, struct coro *next) 1599transfer_check (pTHX_ struct coro *prev, struct coro *next)
1577{ 1600{
1578 /* TODO: throwing up here is considered harmful */ 1601 /* TODO: throwing up here is considered harmful */
1579 1602
1580 if (expect_true (prev != next)) 1603 if (ecb_expect_true (prev != next))
1581 { 1604 {
1582 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1605 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1583 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1606 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1584 1607
1585 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1608 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1586 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1609 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1587 1610
1588#if !PERL_VERSION_ATLEAST (5,10,0) 1611#if !PERL_VERSION_ATLEAST (5,10,0)
1589 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1612 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1590 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1613 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1591#endif 1614#endif
1592 } 1615 }
1593} 1616}
1594 1617
1595/* always use the TRANSFER macro */ 1618/* always use the TRANSFER macro */
1596static void NOINLINE /* noinline so we have a fixed stackframe */ 1619static void ecb_noinline /* noinline so we have a fixed stackframe */
1597transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1620transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1598{ 1621{
1599 dSTACKLEVEL; 1622 dSTACKLEVEL;
1600 1623
1601 /* sometimes transfer is only called to set idle_sp */ 1624 /* sometimes transfer is only called to set idle_sp */
1602 if (expect_false (!prev)) 1625 if (ecb_expect_false (!prev))
1603 { 1626 {
1604 cctx_current->idle_sp = STACKLEVEL; 1627 cctx_current->idle_sp = STACKLEVEL;
1605 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1628 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1606 } 1629 }
1607 else if (expect_true (prev != next)) 1630 else if (ecb_expect_true (prev != next))
1608 { 1631 {
1609 coro_cctx *cctx_prev; 1632 coro_cctx *cctx_prev;
1610 1633
1611 if (expect_false (prev->flags & CF_NEW)) 1634 if (ecb_expect_false (prev->flags & CF_NEW))
1612 { 1635 {
1613 /* create a new empty/source context */ 1636 /* create a new empty/source context */
1614 prev->flags &= ~CF_NEW; 1637 prev->flags &= ~CF_NEW;
1615 prev->flags |= CF_RUNNING; 1638 prev->flags |= CF_RUNNING;
1616 } 1639 }
… …
1619 next->flags |= CF_RUNNING; 1642 next->flags |= CF_RUNNING;
1620 1643
1621 /* first get rid of the old state */ 1644 /* first get rid of the old state */
1622 save_perl (aTHX_ prev); 1645 save_perl (aTHX_ prev);
1623 1646
1624 if (expect_false (next->flags & CF_NEW)) 1647 if (ecb_expect_false (next->flags & CF_NEW))
1625 { 1648 {
1626 /* need to start coroutine */ 1649 /* need to start coroutine */
1627 next->flags &= ~CF_NEW; 1650 next->flags &= ~CF_NEW;
1628 /* setup coroutine call */ 1651 /* setup coroutine call */
1629 init_perl (aTHX_ next); 1652 init_perl (aTHX_ next);
1630 } 1653 }
1631 else 1654 else
1632 load_perl (aTHX_ next); 1655 load_perl (aTHX_ next);
1633 1656
1634 /* possibly untie and reuse the cctx */ 1657 /* possibly untie and reuse the cctx */
1635 if (expect_true ( 1658 if (ecb_expect_true (
1636 cctx_current->idle_sp == STACKLEVEL 1659 cctx_current->idle_sp == STACKLEVEL
1637 && !(cctx_current->flags & CC_TRACE) 1660 && !(cctx_current->flags & CC_TRACE)
1638 && !force_cctx 1661 && !force_cctx
1639 )) 1662 ))
1640 { 1663 {
1641 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1664 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1642 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1665 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1643 1666
1644 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1667 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1645 /* without this the next cctx_get might destroy the running cctx while still in use */ 1668 /* without this the next cctx_get might destroy the running cctx while still in use */
1646 if (expect_false (CCTX_EXPIRED (cctx_current))) 1669 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1647 if (expect_true (!next->cctx)) 1670 if (ecb_expect_true (!next->cctx))
1648 next->cctx = cctx_get (aTHX); 1671 next->cctx = cctx_get (aTHX);
1649 1672
1650 cctx_put (cctx_current); 1673 cctx_put (cctx_current);
1651 } 1674 }
1652 else 1675 else
1653 prev->cctx = cctx_current; 1676 prev->cctx = cctx_current;
1654 1677
1655 ++next->usecount; 1678 ++next->usecount;
1656 1679
1657 cctx_prev = cctx_current; 1680 cctx_prev = cctx_current;
1658 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1681 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1659 1682
1660 next->cctx = 0; 1683 next->cctx = 0;
1661 1684
1662 if (expect_false (cctx_prev != cctx_current)) 1685 if (ecb_expect_false (cctx_prev != cctx_current))
1663 { 1686 {
1664 cctx_prev->top_env = PL_top_env; 1687 cctx_prev->top_env = PL_top_env;
1665 PL_top_env = cctx_current->top_env; 1688 PL_top_env = cctx_current->top_env;
1666 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1689 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1667 } 1690 }
… …
1673#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1696#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1674#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1697#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1675 1698
1676/** high level stuff ********************************************************/ 1699/** high level stuff ********************************************************/
1677 1700
1701/* this function is actually Coro, not Coro::State, but we call it from here */
1702/* because it is convenient - but it hasn't been declared yet for that reason */
1703static void
1704coro_call_on_destroy (pTHX_ struct coro *coro);
1705
1678static void 1706static void
1679coro_state_destroy (pTHX_ struct coro *coro) 1707coro_state_destroy (pTHX_ struct coro *coro)
1680{ 1708{
1681 if (coro->flags & CF_DESTROYED) 1709 if (coro->flags & CF_ZOMBIE)
1682 return; 1710 return;
1683 1711
1684 slf_destroy (aTHX_ coro); 1712 slf_destroy (aTHX_ coro);
1685 1713
1686 coro->flags |= CF_DESTROYED; 1714 coro->flags |= CF_ZOMBIE;
1687 1715
1688 if (coro->flags & CF_READY) 1716 if (coro->flags & CF_READY)
1689 { 1717 {
1690 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1718 /* reduce nready, as destroying a ready coro effectively unreadies it */
1691 /* alternative: look through all ready queues and remove the coro */ 1719 /* alternative: look through all ready queues and remove the coro */
1692 --coro_nready; 1720 --coro_nready;
1693 } 1721 }
1694 else 1722 else
1695 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1723 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1724
1725 if (coro->next) coro->next->prev = coro->prev;
1726 if (coro->prev) coro->prev->next = coro->next;
1727 if (coro == coro_first) coro_first = coro->next;
1696 1728
1697 if (coro->mainstack 1729 if (coro->mainstack
1698 && coro->mainstack != main_mainstack 1730 && coro->mainstack != main_mainstack
1699 && coro->slot 1731 && coro->slot
1700 && !PL_dirty) 1732 && !PL_dirty)
1701 destroy_perl (aTHX_ coro); 1733 destroy_perl (aTHX_ coro);
1702 1734
1703 if (coro->next) coro->next->prev = coro->prev;
1704 if (coro->prev) coro->prev->next = coro->next;
1705 if (coro == coro_first) coro_first = coro->next;
1706
1707 cctx_destroy (coro->cctx); 1735 cctx_destroy (coro->cctx);
1708 SvREFCNT_dec (coro->startcv); 1736 SvREFCNT_dec (coro->startcv);
1709 SvREFCNT_dec (coro->args); 1737 SvREFCNT_dec (coro->args);
1710 SvREFCNT_dec (coro->swap_sv); 1738 SvREFCNT_dec (coro->swap_sv);
1711 SvREFCNT_dec (CORO_THROW); 1739 SvREFCNT_dec (CORO_THROW);
1740
1741 coro_call_on_destroy (aTHX_ coro);
1742
1743 /* more destruction mayhem in coro_state_free */
1712} 1744}
1713 1745
1714static int 1746static int
1715coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1747coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1716{ 1748{
1717 struct coro *coro = (struct coro *)mg->mg_ptr; 1749 struct coro *coro = (struct coro *)mg->mg_ptr;
1718 mg->mg_ptr = 0; 1750 mg->mg_ptr = 0;
1719 1751
1720 coro->hv = 0;
1721
1722 if (--coro->refcnt < 0)
1723 {
1724 coro_state_destroy (aTHX_ coro); 1752 coro_state_destroy (aTHX_ coro);
1753 SvREFCNT_dec (coro->on_destroy);
1754 SvREFCNT_dec (coro->status);
1755
1725 Safefree (coro); 1756 Safefree (coro);
1726 }
1727 1757
1728 return 0; 1758 return 0;
1729} 1759}
1730 1760
1731static int 1761static int ecb_cold
1732coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1762coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1733{ 1763{
1734 struct coro *coro = (struct coro *)mg->mg_ptr; 1764 /* called when perl clones the current process the slow way (windows process emulation) */
1735 1765 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1736 ++coro->refcnt; 1766 mg->mg_ptr = 0;
1767 mg->mg_virtual = 0;
1737 1768
1738 return 0; 1769 return 0;
1739} 1770}
1740 1771
1741static MGVTBL coro_state_vtbl = { 1772static MGVTBL coro_state_vtbl = {
… …
1766 TRANSFER (ta, 1); 1797 TRANSFER (ta, 1);
1767} 1798}
1768 1799
1769/** Coro ********************************************************************/ 1800/** Coro ********************************************************************/
1770 1801
1771INLINE void 1802ecb_inline void
1772coro_enq (pTHX_ struct coro *coro) 1803coro_enq (pTHX_ struct coro *coro)
1773{ 1804{
1774 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1805 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1775 1806
1776 SvREFCNT_inc_NN (coro->hv); 1807 SvREFCNT_inc_NN (coro->hv);
… …
1778 coro->next_ready = 0; 1809 coro->next_ready = 0;
1779 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1810 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1780 ready [1] = coro; 1811 ready [1] = coro;
1781} 1812}
1782 1813
1783INLINE struct coro * 1814ecb_inline struct coro *
1784coro_deq (pTHX) 1815coro_deq (pTHX)
1785{ 1816{
1786 int prio; 1817 int prio;
1787 1818
1788 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1819 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1841{ 1872{
1842 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1873 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1843} 1874}
1844 1875
1845/* expects to own a reference to next->hv */ 1876/* expects to own a reference to next->hv */
1846INLINE void 1877ecb_inline void
1847prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1878prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1848{ 1879{
1849 SV *prev_sv = SvRV (coro_current); 1880 SV *prev_sv = SvRV (coro_current);
1850 1881
1851 ta->prev = SvSTATE_hv (prev_sv); 1882 ta->prev = SvSTATE_hv (prev_sv);
… …
1864{ 1895{
1865 for (;;) 1896 for (;;)
1866 { 1897 {
1867 struct coro *next = coro_deq (aTHX); 1898 struct coro *next = coro_deq (aTHX);
1868 1899
1869 if (expect_true (next)) 1900 if (ecb_expect_true (next))
1870 { 1901 {
1871 /* cannot transfer to destroyed coros, skip and look for next */ 1902 /* cannot transfer to destroyed coros, skip and look for next */
1872 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1903 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1873 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1904 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1874 else 1905 else
1875 { 1906 {
1876 next->flags &= ~CF_READY; 1907 next->flags &= ~CF_READY;
1877 --coro_nready; 1908 --coro_nready;
… …
1885 /* nothing to schedule: call the idle handler */ 1916 /* nothing to schedule: call the idle handler */
1886 if (SvROK (sv_idle) 1917 if (SvROK (sv_idle)
1887 && SvOBJECT (SvRV (sv_idle))) 1918 && SvOBJECT (SvRV (sv_idle)))
1888 { 1919 {
1889 if (SvRV (sv_idle) == SvRV (coro_current)) 1920 if (SvRV (sv_idle) == SvRV (coro_current))
1921 {
1922 require_pv ("Carp");
1923
1924 {
1925 dSP;
1926
1927 ENTER;
1928 SAVETMPS;
1929
1930 PUSHMARK (SP);
1890 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1931 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1932 PUTBACK;
1933 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1934
1935 FREETMPS;
1936 LEAVE;
1937 }
1938 }
1891 1939
1892 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1940 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1893 api_ready (aTHX_ SvRV (sv_idle)); 1941 api_ready (aTHX_ SvRV (sv_idle));
1894 --coro_nready; 1942 --coro_nready;
1895 } 1943 }
… …
1910 } 1958 }
1911 } 1959 }
1912 } 1960 }
1913} 1961}
1914 1962
1915INLINE void 1963ecb_inline void
1916prepare_cede (pTHX_ struct coro_transfer_args *ta) 1964prepare_cede (pTHX_ struct coro_transfer_args *ta)
1917{ 1965{
1918 api_ready (aTHX_ coro_current); 1966 api_ready (aTHX_ coro_current);
1919 prepare_schedule (aTHX_ ta); 1967 prepare_schedule (aTHX_ ta);
1920} 1968}
1921 1969
1922INLINE void 1970ecb_inline void
1923prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1971prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1924{ 1972{
1925 SV *prev = SvRV (coro_current); 1973 SV *prev = SvRV (coro_current);
1926 1974
1927 if (coro_nready) 1975 if (coro_nready)
… …
1957{ 2005{
1958 struct coro_transfer_args ta; 2006 struct coro_transfer_args ta;
1959 2007
1960 prepare_cede (aTHX_ &ta); 2008 prepare_cede (aTHX_ &ta);
1961 2009
1962 if (expect_true (ta.prev != ta.next)) 2010 if (ecb_expect_true (ta.prev != ta.next))
1963 { 2011 {
1964 TRANSFER (ta, 1); 2012 TRANSFER (ta, 1);
1965 return 1; 2013 return 1;
1966 } 2014 }
1967 else 2015 else
… …
2010 coro->slot->runops = RUNOPS_DEFAULT; 2058 coro->slot->runops = RUNOPS_DEFAULT;
2011 } 2059 }
2012} 2060}
2013 2061
2014static void 2062static void
2063coro_push_av (pTHX_ AV *av, I32 gimme_v)
2064{
2065 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2066 {
2067 dSP;
2068
2069 if (gimme_v == G_SCALAR)
2070 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2071 else
2072 {
2073 int i;
2074 EXTEND (SP, AvFILLp (av) + 1);
2075
2076 for (i = 0; i <= AvFILLp (av); ++i)
2077 PUSHs (AvARRAY (av)[i]);
2078 }
2079
2080 PUTBACK;
2081 }
2082}
2083
2084static void
2085coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2086{
2087 if (!coro->on_destroy)
2088 coro->on_destroy = newAV ();
2089
2090 av_push (coro->on_destroy, cb);
2091}
2092
2093static void
2094slf_destroy_join (pTHX_ struct CoroSLF *frame)
2095{
2096 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2097}
2098
2099static int
2100slf_check_join (pTHX_ struct CoroSLF *frame)
2101{
2102 struct coro *coro = (struct coro *)frame->data;
2103
2104 if (!coro->status)
2105 return 1;
2106
2107 frame->destroy = 0;
2108
2109 coro_push_av (aTHX_ coro->status, GIMME_V);
2110
2111 SvREFCNT_dec ((SV *)coro->hv);
2112
2113 return 0;
2114}
2115
2116static void
2117slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2118{
2119 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2120
2121 if (items > 1)
2122 croak ("join called with too many arguments");
2123
2124 if (coro->status)
2125 frame->prepare = prepare_nop;
2126 else
2127 {
2128 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2129 frame->prepare = prepare_schedule;
2130 }
2131
2132 frame->check = slf_check_join;
2133 frame->destroy = slf_destroy_join;
2134 frame->data = (void *)coro;
2135 SvREFCNT_inc (coro->hv);
2136}
2137
2138static void
2015coro_call_on_destroy (pTHX_ struct coro *coro) 2139coro_call_on_destroy (pTHX_ struct coro *coro)
2016{ 2140{
2017 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2141 AV *od = coro->on_destroy;
2018 2142
2019 if (on_destroyp) 2143 if (!od)
2020 { 2144 return;
2021 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2022 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2023 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2024 2145
2146 coro->on_destroy = 0;
2147 sv_2mortal ((SV *)od);
2148
2025 while (AvFILLp (on_destroy) >= 0) 2149 while (AvFILLp (od) >= 0)
2150 {
2151 SV *cb = sv_2mortal (av_pop (od));
2152
2153 /* coro hv's (and only hv's at the moment) are supported as well */
2154 if (SvSTATEhv_p (aTHX_ cb))
2155 api_ready (aTHX_ cb);
2156 else
2026 { 2157 {
2027 dSP; /* don't disturb outer sp */ 2158 dSP; /* don't disturb outer sp */
2028 SV *cb = av_pop (on_destroy);
2029
2030 PUSHMARK (SP); 2159 PUSHMARK (SP);
2031 2160
2032 if (statusp) 2161 if (coro->status)
2033 { 2162 {
2034 int i; 2163 PUTBACK;
2035 EXTEND (SP, AvFILLp (status) + 1); 2164 coro_push_av (aTHX_ coro->status, G_ARRAY);
2036 2165 SPAGAIN;
2037 for (i = 0; i <= AvFILLp (status); ++i)
2038 PUSHs (AvARRAY (status)[i]);
2039 } 2166 }
2040 2167
2041 PUTBACK; 2168 PUTBACK;
2042 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2169 call_sv (cb, G_VOID | G_DISCARD);
2043 } 2170 }
2044 } 2171 }
2045} 2172}
2046 2173
2047static void 2174static void
2048coro_set_status (HV *coro_hv, SV **arg, int items) 2175coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2049{ 2176{
2050 AV *av = newAV (); 2177 AV *av;
2178
2179 if (coro->status)
2180 {
2181 av = coro->status;
2182 av_clear (av);
2183 }
2184 else
2185 av = coro->status = newAV ();
2051 2186
2052 /* items are actually not so common, so optimise for this case */ 2187 /* items are actually not so common, so optimise for this case */
2053 if (items) 2188 if (items)
2054 { 2189 {
2055 int i; 2190 int i;
… …
2057 av_extend (av, items - 1); 2192 av_extend (av, items - 1);
2058 2193
2059 for (i = 0; i < items; ++i) 2194 for (i = 0; i < items; ++i)
2060 av_push (av, SvREFCNT_inc_NN (arg [i])); 2195 av_push (av, SvREFCNT_inc_NN (arg [i]));
2061 } 2196 }
2062
2063 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2064} 2197}
2065 2198
2066static void 2199static void
2067slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2200slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2068{ 2201{
… …
2080static void 2213static void
2081slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2214slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2082{ 2215{
2083 HV *coro_hv = (HV *)SvRV (coro_current); 2216 HV *coro_hv = (HV *)SvRV (coro_current);
2084 2217
2085 coro_set_status (coro_hv, arg, items); 2218 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2086 slf_init_terminate_cancel_common (frame, coro_hv); 2219 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2087} 2220}
2088 2221
2089static void 2222static void
2090slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2223slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2091{ 2224{
… …
2096 croak ("Coro::cancel called without coro object,"); 2229 croak ("Coro::cancel called without coro object,");
2097 2230
2098 coro = SvSTATE (arg [0]); 2231 coro = SvSTATE (arg [0]);
2099 coro_hv = coro->hv; 2232 coro_hv = coro->hv;
2100 2233
2101 coro_set_status (coro_hv, arg + 1, items - 1); 2234 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2102 2235
2103 if (expect_false (coro->flags & CF_NOCANCEL)) 2236 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2104 { 2237 {
2105 /* coro currently busy cancelling something, so just notify it */ 2238 /* coro currently busy cancelling something, so just notify it */
2106 coro->slf_frame.data = (void *)coro; 2239 coro->slf_frame.data = (void *)coro;
2107 2240
2108 frame->prepare = prepare_nop; 2241 frame->prepare = prepare_nop;
2109 frame->check = slf_check_nop; 2242 frame->check = slf_check_nop;
2110 } 2243 }
2111 else if (coro_hv == (HV *)SvRV (coro_current)) 2244 else if (coro_hv == (HV *)SvRV (coro_current))
2112 { 2245 {
2113 /* cancelling the current coro is allowed, and equals terminate */ 2246 /* cancelling the current coro is allowed, and equals terminate */
2114 slf_init_terminate_cancel_common (frame, coro_hv); 2247 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2115 } 2248 }
2116 else 2249 else
2117 { 2250 {
2118 struct coro *self = SvSTATE_current; 2251 struct coro *self = SvSTATE_current;
2119 2252
… …
2123 * this is ugly, and hopefully fully worth the extra speed. 2256 * this is ugly, and hopefully fully worth the extra speed.
2124 * besides, I can't get the slow-but-safe version working... 2257 * besides, I can't get the slow-but-safe version working...
2125 */ 2258 */
2126 slf_frame.data = 0; 2259 slf_frame.data = 0;
2127 self->flags |= CF_NOCANCEL; 2260 self->flags |= CF_NOCANCEL;
2128
2129 coro_state_destroy (aTHX_ coro); 2261 coro_state_destroy (aTHX_ coro);
2130 coro_call_on_destroy (aTHX_ coro);
2131
2132 self->flags &= ~CF_NOCANCEL; 2262 self->flags &= ~CF_NOCANCEL;
2133 2263
2134 if (slf_frame.data) 2264 if (slf_frame.data)
2135 { 2265 {
2136 /* while we were busy we have been cancelled, so terminate */ 2266 /* while we were busy we have been cancelled, so terminate */
2137 slf_init_terminate_cancel_common (frame, self->hv); 2267 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2138 } 2268 }
2139 else 2269 else
2140 { 2270 {
2141 frame->prepare = prepare_nop; 2271 frame->prepare = prepare_nop;
2142 frame->check = slf_check_nop; 2272 frame->check = slf_check_nop;
… …
2146 2276
2147static int 2277static int
2148slf_check_safe_cancel (pTHX_ struct CoroSLF *frame) 2278slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2149{ 2279{
2150 frame->prepare = 0; 2280 frame->prepare = 0;
2151 coro_unwind_stacks (); 2281 coro_unwind_stacks (aTHX);
2152 2282
2153 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current)); 2283 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2154 2284
2155 return 1; 2285 return 1;
2156} 2286}
… …
2161 if (coro->cctx) 2291 if (coro->cctx)
2162 croak ("coro inside C callback, unable to cancel at this time, caught"); 2292 croak ("coro inside C callback, unable to cancel at this time, caught");
2163 2293
2164 if (coro->flags & CF_NEW) 2294 if (coro->flags & CF_NEW)
2165 { 2295 {
2166 coro_set_status (coro->hv, arg, items); 2296 coro_set_status (aTHX_ coro, arg, items);
2167 coro_state_destroy (aTHX_ coro); 2297 coro_state_destroy (aTHX_ coro);
2168 coro_call_on_destroy (aTHX_ coro);
2169 } 2298 }
2170 else 2299 else
2171 { 2300 {
2172 if (!coro->slf_frame.prepare) 2301 if (!coro->slf_frame.prepare)
2173 croak ("coro outside an SLF function, unable to cancel at this time, caught"); 2302 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2174 2303
2175 slf_destroy (coro); 2304 slf_destroy (aTHX_ coro);
2176 2305
2177 coro_set_status (coro->hv, arg, items); 2306 coro_set_status (aTHX_ coro, arg, items);
2178 coro->slf_frame.prepare = prepare_nop; 2307 coro->slf_frame.prepare = prepare_nop;
2179 coro->slf_frame.check = slf_check_safe_cancel; 2308 coro->slf_frame.check = slf_check_safe_cancel;
2180 2309
2181 api_ready (aTHX_ coro->hv); 2310 api_ready (aTHX_ (SV *)coro->hv);
2182 } 2311 }
2183 2312
2184 return 1; 2313 return 1;
2185} 2314}
2186 2315
… …
2220slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2349slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2221{ 2350{
2222 HV *hv = (HV *)SvRV (coro_current); 2351 HV *hv = (HV *)SvRV (coro_current);
2223 struct coro *coro = SvSTATE_hv ((SV *)hv); 2352 struct coro *coro = SvSTATE_hv ((SV *)hv);
2224 2353
2225 if (expect_true (coro->saved_deffh)) 2354 if (ecb_expect_true (coro->saved_deffh))
2226 { 2355 {
2227 /* subsequent iteration */ 2356 /* subsequent iteration */
2228 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2357 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2229 coro->saved_deffh = 0; 2358 coro->saved_deffh = 0;
2230 2359
… …
2290 2419
2291static int 2420static int
2292slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2421slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2293{ 2422{
2294 SV *data = (SV *)frame->data; 2423 SV *data = (SV *)frame->data;
2295 2424
2296 if (CORO_THROW) 2425 if (CORO_THROW)
2297 return 0; 2426 return 0;
2298 2427
2299 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2428 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2300 return 1; 2429 return 1;
… …
2336 cb = sv_2mortal (coro->rouse_cb); 2465 cb = sv_2mortal (coro->rouse_cb);
2337 coro->rouse_cb = 0; 2466 coro->rouse_cb = 0;
2338 } 2467 }
2339 2468
2340 if (!SvROK (cb) 2469 if (!SvROK (cb)
2341 || SvTYPE (SvRV (cb)) != SVt_PVCV 2470 || SvTYPE (SvRV (cb)) != SVt_PVCV
2342 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2471 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2343 croak ("Coro::rouse_wait called with illegal callback argument,"); 2472 croak ("Coro::rouse_wait called with illegal callback argument,");
2344 2473
2345 { 2474 {
2346 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2475 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2471static void 2600static void
2472slf_destroy (pTHX_ struct coro *coro) 2601slf_destroy (pTHX_ struct coro *coro)
2473{ 2602{
2474 /* this callback is reserved for slf functions needing to do cleanup */ 2603 /* this callback is reserved for slf functions needing to do cleanup */
2475 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty) 2604 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2476 coro->slf_frame.destroy (aTHX_ coro); 2605 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2477 2606
2478 /* 2607 /*
2479 * The on_destroy above most likely is from an SLF call. 2608 * The on_destroy above most likely is from an SLF call.
2480 * Since by definition the SLF call will not finish when we destroy 2609 * Since by definition the SLF call will not finish when we destroy
2481 * the coro, we will have to force-finish it here, otherwise 2610 * the coro, we will have to force-finish it here, otherwise
… …
2496 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2625 I32 checkmark; /* mark SP to see how many elements check has pushed */
2497 2626
2498 /* set up the slf frame, unless it has already been set-up */ 2627 /* set up the slf frame, unless it has already been set-up */
2499 /* the latter happens when a new coro has been started */ 2628 /* the latter happens when a new coro has been started */
2500 /* or when a new cctx was attached to an existing coroutine */ 2629 /* or when a new cctx was attached to an existing coroutine */
2501 if (expect_true (!slf_frame.prepare)) 2630 if (ecb_expect_true (!slf_frame.prepare))
2502 { 2631 {
2503 /* first iteration */ 2632 /* first iteration */
2504 dSP; 2633 dSP;
2505 SV **arg = PL_stack_base + TOPMARK + 1; 2634 SV **arg = PL_stack_base + TOPMARK + 1;
2506 int items = SP - arg; /* args without function object */ 2635 int items = SP - arg; /* args without function object */
… …
2547 while (slf_frame.check (aTHX_ &slf_frame)); 2676 while (slf_frame.check (aTHX_ &slf_frame));
2548 2677
2549 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2678 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2550 2679
2551 /* exception handling */ 2680 /* exception handling */
2552 if (expect_false (CORO_THROW)) 2681 if (ecb_expect_false (CORO_THROW))
2553 { 2682 {
2554 SV *exception = sv_2mortal (CORO_THROW); 2683 SV *exception = sv_2mortal (CORO_THROW);
2555 2684
2556 CORO_THROW = 0; 2685 CORO_THROW = 0;
2557 sv_setsv (ERRSV, exception); 2686 sv_setsv (ERRSV, exception);
2558 croak (0); 2687 croak (0);
2559 } 2688 }
2560 2689
2561 /* return value handling - mostly like entersub */ 2690 /* return value handling - mostly like entersub */
2562 /* make sure we put something on the stack in scalar context */ 2691 /* make sure we put something on the stack in scalar context */
2563 if (GIMME_V == G_SCALAR) 2692 if (GIMME_V == G_SCALAR
2693 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2564 { 2694 {
2565 dSP; 2695 dSP;
2566 SV **bot = PL_stack_base + checkmark; 2696 SV **bot = PL_stack_base + checkmark;
2567 2697
2568 if (sp == bot) /* too few, push undef */ 2698 if (sp == bot) /* too few, push undef */
2569 bot [1] = &PL_sv_undef; 2699 bot [1] = &PL_sv_undef;
2570 else if (sp != bot + 1) /* too many, take last one */ 2700 else /* too many, take last one */
2571 bot [1] = *sp; 2701 bot [1] = *sp;
2572 2702
2573 SP = bot + 1; 2703 SP = bot + 1;
2574 2704
2575 PUTBACK; 2705 PUTBACK;
… …
2682{ 2812{
2683 PerlIOBuf base; 2813 PerlIOBuf base;
2684 NV next, every; 2814 NV next, every;
2685} PerlIOCede; 2815} PerlIOCede;
2686 2816
2687static IV 2817static IV ecb_cold
2688PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2818PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2689{ 2819{
2690 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2820 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2691 2821
2692 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2822 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2693 self->next = nvtime () + self->every; 2823 self->next = nvtime () + self->every;
2694 2824
2695 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2825 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2696} 2826}
2697 2827
2698static SV * 2828static SV * ecb_cold
2699PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2829PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2700{ 2830{
2701 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2831 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2702 2832
2703 return newSVnv (self->every); 2833 return newSVnv (self->every);
… …
2815 SvREFCNT_dec (cb); 2945 SvREFCNT_dec (cb);
2816 } 2946 }
2817} 2947}
2818 2948
2819static void 2949static void
2820coro_semaphore_destroy (pTHX_ struct coro *coro) 2950coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2821{ 2951{
2822 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2952 /* call $sem->adjust (0) to possibly wake up some other waiters */
2823 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2953 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2824} 2954}
2825 2955
2826static int 2956static int
2827slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2957slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2828{ 2958{
2829 AV *av = (AV *)frame->data; 2959 AV *av = (AV *)frame->data;
2830 SV *count_sv = AvARRAY (av)[0]; 2960 SV *count_sv = AvARRAY (av)[0];
2961 SV *coro_hv = SvRV (coro_current);
2831 2962
2832 /* if we are about to throw, don't actually acquire the lock, just throw */ 2963 /* if we are about to throw, don't actually acquire the lock, just throw */
2833 if (CORO_THROW) 2964 if (CORO_THROW)
2834 return 0; 2965 return 0;
2835 else if (SvIVX (count_sv) > 0) 2966 else if (SvIVX (count_sv) > 0)
… …
2847 { 2978 {
2848 int i; 2979 int i;
2849 /* if we were woken up but can't down, we look through the whole */ 2980 /* if we were woken up but can't down, we look through the whole */
2850 /* waiters list and only add us if we aren't in there already */ 2981 /* waiters list and only add us if we aren't in there already */
2851 /* this avoids some degenerate memory usage cases */ 2982 /* this avoids some degenerate memory usage cases */
2852 2983 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2853 for (i = 1; i <= AvFILLp (av); ++i)
2854 if (AvARRAY (av)[i] == SvRV (coro_current)) 2984 if (AvARRAY (av)[i] == coro_hv)
2855 return 1; 2985 return 1;
2856 2986
2857 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2987 av_push (av, SvREFCNT_inc (coro_hv));
2858 return 1; 2988 return 1;
2859 } 2989 }
2860} 2990}
2861 2991
2862static int 2992static int
… …
3066 /* it quickly returns */ 3196 /* it quickly returns */
3067 if (CORO_THROW) 3197 if (CORO_THROW)
3068 return 0; 3198 return 0;
3069 3199
3070 /* one element that is an RV? repeat! */ 3200 /* one element that is an RV? repeat! */
3071 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3201 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3072 return 1; 3202 return 1;
3073 3203
3074 /* restore status */ 3204 /* restore status */
3075 { 3205 {
3076 SV *data_sv = av_pop (state); 3206 SV *data_sv = av_pop (state);
… …
3115 dSP; 3245 dSP;
3116 3246
3117 static SV *prio_cv; 3247 static SV *prio_cv;
3118 static SV *prio_sv; 3248 static SV *prio_sv;
3119 3249
3120 if (expect_false (!prio_cv)) 3250 if (ecb_expect_false (!prio_cv))
3121 { 3251 {
3122 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3252 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3123 prio_sv = newSViv (0); 3253 prio_sv = newSViv (0);
3124 } 3254 }
3125 3255
… …
3231 } 3361 }
3232 3362
3233 return coro_sv; 3363 return coro_sv;
3234} 3364}
3235 3365
3366#ifndef __cplusplus
3367ecb_cold XS(boot_Coro__State);
3368#endif
3369
3370#if CORO_JIT
3371
3372static void ecb_noinline ecb_cold
3373pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3374{
3375 dSP;
3376 AV *av = newAV ();
3377
3378 av_store (av, 3, newSVuv (d));
3379 av_store (av, 2, newSVuv (c));
3380 av_store (av, 1, newSVuv (b));
3381 av_store (av, 0, newSVuv (a));
3382
3383 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3384
3385 PUTBACK;
3386}
3387
3388static void ecb_noinline ecb_cold
3389jit_init (pTHX)
3390{
3391 dSP;
3392 SV *load, *save;
3393 char *map_base;
3394 char *load_ptr, *save_ptr;
3395 STRLEN load_len, save_len, map_len;
3396 int count;
3397
3398 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3399
3400 PUSHMARK (SP);
3401 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3402 #include "state.h"
3403 count = call_pv ("Coro::State::_jit", G_ARRAY);
3404 SPAGAIN;
3405
3406 save = POPs; save_ptr = SvPVbyte (save, save_len);
3407 load = POPs; load_ptr = SvPVbyte (load, load_len);
3408
3409 map_len = load_len + save_len + 16;
3410
3411 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3412
3413 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3414
3415 load_perl_slots = (load_save_perl_slots_type)map_base;
3416 memcpy (map_base, load_ptr, load_len);
3417
3418 map_base += (load_len + 15) & ~15;
3419
3420 save_perl_slots = (load_save_perl_slots_type)map_base;
3421 memcpy (map_base, save_ptr, save_len);
3422
3423 /* we are good citizens and try to make the page read-only, so the evil evil */
3424 /* hackers might have it a bit more difficult */
3425 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3426
3427 PUTBACK;
3428 eval_pv ("undef &Coro::State::_jit", 1);
3429}
3430
3431#endif
3432
3236MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3433MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3237 3434
3238PROTOTYPES: DISABLE 3435PROTOTYPES: DISABLE
3239 3436
3240BOOT: 3437BOOT:
… …
3242#ifdef USE_ITHREADS 3439#ifdef USE_ITHREADS
3243# if CORO_PTHREAD 3440# if CORO_PTHREAD
3244 coro_thx = PERL_GET_CONTEXT; 3441 coro_thx = PERL_GET_CONTEXT;
3245# endif 3442# endif
3246#endif 3443#endif
3247 BOOT_PAGESIZE; 3444 /* perl defines these to check for existance first, but why it doesn't */
3445 /* just create them one at init time is not clear to me, except for */
3446 /* programs trying to delete them, but... */
3447 /* anyway, we declare this as invalid and make sure they are initialised here */
3448 DEFSV;
3449 ERRSV;
3248 3450
3249 cctx_current = cctx_new_empty (); 3451 cctx_current = cctx_new_empty ();
3250 3452
3251 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3453 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3252 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3454 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3295 coroapi.prepare_cede_notself = prepare_cede_notself; 3497 coroapi.prepare_cede_notself = prepare_cede_notself;
3296 3498
3297 time_init (aTHX); 3499 time_init (aTHX);
3298 3500
3299 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3501 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3502#if CORO_JIT
3503 PUTBACK;
3504 jit_init (aTHX);
3505 SPAGAIN;
3506#endif
3300} 3507}
3301 3508
3302SV * 3509SV *
3303new (SV *klass, ...) 3510new (SV *klass, ...)
3304 ALIAS: 3511 ALIAS:
… …
3311void 3518void
3312transfer (...) 3519transfer (...)
3313 PROTOTYPE: $$ 3520 PROTOTYPE: $$
3314 CODE: 3521 CODE:
3315 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3522 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3316
3317void
3318_exit (int code)
3319 PROTOTYPE: $
3320 CODE:
3321 _exit (code);
3322 3523
3323SV * 3524SV *
3324clone (Coro::State coro) 3525clone (Coro::State coro)
3325 CODE: 3526 CODE:
3326{ 3527{
… …
3381void 3582void
3382list () 3583list ()
3383 PROTOTYPE: 3584 PROTOTYPE:
3384 PPCODE: 3585 PPCODE:
3385{ 3586{
3386 struct coro *coro; 3587 struct coro *coro;
3387 for (coro = coro_first; coro; coro = coro->next) 3588 for (coro = coro_first; coro; coro = coro->next)
3388 if (coro->hv) 3589 if (coro->hv)
3389 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3590 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3390} 3591}
3391 3592
… …
3446 PROTOTYPE: $ 3647 PROTOTYPE: $
3447 ALIAS: 3648 ALIAS:
3448 is_ready = CF_READY 3649 is_ready = CF_READY
3449 is_running = CF_RUNNING 3650 is_running = CF_RUNNING
3450 is_new = CF_NEW 3651 is_new = CF_NEW
3451 is_destroyed = CF_DESTROYED 3652 is_destroyed = CF_ZOMBIE
3653 is_zombie = CF_ZOMBIE
3452 is_suspended = CF_SUSPENDED 3654 is_suspended = CF_SUSPENDED
3453 CODE: 3655 CODE:
3454 RETVAL = boolSV (coro->flags & ix); 3656 RETVAL = boolSV (coro->flags & ix);
3455 OUTPUT: 3657 OUTPUT:
3456 RETVAL 3658 RETVAL
3457 3659
3458void 3660void
3459throw (Coro::State self, SV *exception = &PL_sv_undef) 3661throw (SV *self, SV *exception = &PL_sv_undef)
3460 PROTOTYPE: $;$ 3662 PROTOTYPE: $;$
3461 CODE: 3663 CODE:
3462{ 3664{
3665 struct coro *coro = SvSTATE (self);
3463 struct coro *current = SvSTATE_current; 3666 struct coro *current = SvSTATE_current;
3464 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3667 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3465 SvREFCNT_dec (*exceptionp); 3668 SvREFCNT_dec (*exceptionp);
3466 SvGETMAGIC (exception); 3669 SvGETMAGIC (exception);
3467 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3670 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3671
3672 api_ready (aTHX_ self);
3468} 3673}
3469 3674
3470void 3675void
3471api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3676api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3472 PROTOTYPE: $;$ 3677 PROTOTYPE: $;$
… …
3549 3754
3550void 3755void
3551times (Coro::State self) 3756times (Coro::State self)
3552 PPCODE: 3757 PPCODE:
3553{ 3758{
3554 struct coro *current = SvSTATE (coro_current); 3759 struct coro *current = SvSTATE (coro_current);
3555 3760
3556 if (expect_false (current == self)) 3761 if (ecb_expect_false (current == self))
3557 { 3762 {
3558 coro_times_update (); 3763 coro_times_update ();
3559 coro_times_add (SvSTATE (coro_current)); 3764 coro_times_add (SvSTATE (coro_current));
3560 } 3765 }
3561 3766
3562 EXTEND (SP, 2); 3767 EXTEND (SP, 2);
3563 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3768 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3564 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3769 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3565 3770
3566 if (expect_false (current == self)) 3771 if (ecb_expect_false (current == self))
3567 coro_times_sub (SvSTATE (coro_current)); 3772 coro_times_sub (SvSTATE (coro_current));
3568} 3773}
3569 3774
3570void 3775void
3571swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3776swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3602 3807
3603 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3808 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3604 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3809 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3605 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3810 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3606 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3811 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3607 3812
3608 coro_stash = gv_stashpv ("Coro", TRUE); 3813 coro_stash = gv_stashpv ("Coro", TRUE);
3609 3814
3610 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3815 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3611 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3816 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3612 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3817 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3644void 3849void
3645_destroy (Coro::State coro) 3850_destroy (Coro::State coro)
3646 CODE: 3851 CODE:
3647 /* used by the manager thread */ 3852 /* used by the manager thread */
3648 coro_state_destroy (aTHX_ coro); 3853 coro_state_destroy (aTHX_ coro);
3854
3855void
3856on_destroy (Coro::State coro, SV *cb)
3857 CODE:
3649 coro_call_on_destroy (aTHX_ coro); 3858 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3859
3860void
3861join (...)
3862 CODE:
3863 CORO_EXECUTE_SLF_XS (slf_init_join);
3650 3864
3651void 3865void
3652terminate (...) 3866terminate (...)
3653 CODE: 3867 CODE:
3654 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3868 CORO_EXECUTE_SLF_XS (slf_init_terminate);
… …
3825 on_leave = 1 4039 on_leave = 1
3826 PROTOTYPE: & 4040 PROTOTYPE: &
3827 CODE: 4041 CODE:
3828{ 4042{
3829 struct coro *coro = SvSTATE_current; 4043 struct coro *coro = SvSTATE_current;
3830 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4044 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3831 4045
3832 block = s_get_cv_croak (block); 4046 block = s_get_cv_croak (block);
3833 4047
3834 if (!*avp) 4048 if (!*avp)
3835 *avp = newAV (); 4049 *avp = newAV ();
… …
3855 4069
3856SV * 4070SV *
3857new (SV *klass, SV *count = 0) 4071new (SV *klass, SV *count = 0)
3858 CODE: 4072 CODE:
3859{ 4073{
3860 int semcnt = 1; 4074 int semcnt = 1;
3861 4075
3862 if (count) 4076 if (count)
3863 { 4077 {
3864 SvGETMAGIC (count); 4078 SvGETMAGIC (count);
3865 4079
… …
3925 XSRETURN_NO; 4139 XSRETURN_NO;
3926} 4140}
3927 4141
3928void 4142void
3929waiters (SV *self) 4143waiters (SV *self)
3930 PPCODE: 4144 PPCODE:
3931{ 4145{
3932 AV *av = (AV *)SvRV (self); 4146 AV *av = (AV *)SvRV (self);
3933 int wcount = AvFILLp (av) + 1 - 1; 4147 int wcount = AvFILLp (av) + 1 - 1;
3934 4148
3935 if (GIMME_V == G_SCALAR) 4149 if (GIMME_V == G_SCALAR)
… …
3944} 4158}
3945 4159
3946MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4160MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3947 4161
3948void 4162void
3949_may_delete (SV *sem, int count, int extra_refs) 4163_may_delete (SV *sem, int count, unsigned int extra_refs)
3950 PPCODE: 4164 PPCODE:
3951{ 4165{
3952 AV *av = (AV *)SvRV (sem); 4166 AV *av = (AV *)SvRV (sem);
3953 4167
3954 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4168 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3955 && AvFILLp (av) == 0 /* no waiters, just count */ 4169 && AvFILLp (av) == 0 /* no waiters, just count */
3956 && SvIV (AvARRAY (av)[0]) == count) 4170 && SvIV (AvARRAY (av)[0]) == count)
3957 XSRETURN_YES; 4171 XSRETURN_YES;
… …
3978 4192
3979void 4193void
3980broadcast (SV *self) 4194broadcast (SV *self)
3981 CODE: 4195 CODE:
3982{ 4196{
3983 AV *av = (AV *)SvRV (self); 4197 AV *av = (AV *)SvRV (self);
3984 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4198 coro_signal_wake (aTHX_ av, AvFILLp (av));
3985} 4199}
3986 4200
3987void 4201void
3988send (SV *self) 4202send (SV *self)
… …
3996 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4210 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3997} 4211}
3998 4212
3999IV 4213IV
4000awaited (SV *self) 4214awaited (SV *self)
4001 CODE: 4215 CODE:
4002 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4216 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4003 OUTPUT: 4217 OUTPUT:
4004 RETVAL 4218 RETVAL
4005 4219
4006 4220
… …
4011 4225
4012void 4226void
4013_schedule (...) 4227_schedule (...)
4014 CODE: 4228 CODE:
4015{ 4229{
4016 static int incede; 4230 static int incede;
4017 4231
4018 api_cede_notself (aTHX); 4232 api_cede_notself (aTHX);
4019 4233
4020 ++incede; 4234 ++incede;
4021 while (coro_nready >= incede && api_cede (aTHX)) 4235 while (coro_nready >= incede && api_cede (aTHX))
… …
4065 { 4279 {
4066 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4280 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4067 coro_old_pp_sselect = 0; 4281 coro_old_pp_sselect = 0;
4068 } 4282 }
4069 4283
4284MODULE = Coro::State PACKAGE = Coro::Util
4285
4286void
4287_exit (int code)
4288 CODE:
4289 _exit (code);
4290
4291NV
4292time ()
4293 CODE:
4294 RETVAL = nvtime (aTHX);
4295 OUTPUT:
4296 RETVAL
4297
4298NV
4299gettimeofday ()
4300 PPCODE:
4301{
4302 UV tv [2];
4303 u2time (aTHX_ tv);
4304 EXTEND (SP, 2);
4305 PUSHs (sv_2mortal (newSVuv (tv [0])));
4306 PUSHs (sv_2mortal (newSVuv (tv [1])));
4307}
4308

Diff Legend

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