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.436 by root, Tue Nov 5 14:38:46 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))
24#endif 45#endif
25 46
26#if defined(_WIN32) 47#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY 48# undef HAS_GETTIMEOFDAY
28# undef setjmp 49# undef setjmp
… …
31# define setjmp _setjmp /* deep magic */ 52# define setjmp _setjmp /* deep magic */
32#else 53#else
33# include <inttypes.h> /* most portable stdint.h */ 54# include <inttypes.h> /* most portable stdint.h */
34#endif 55#endif
35 56
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 */ 57/* the maximum number of idle cctx that will be pooled */
64static int cctx_max_idle = 4; 58static int cctx_max_idle = 4;
65 59
66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 60#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
67# undef CORO_STACKGUARD 61# define HAS_SCOPESTACK_NAME 1
68#endif
69
70#ifndef CORO_STACKGUARD
71# define CORO_STACKGUARD 0
72#endif 62#endif
73 63
74/* prefer perl internal functions over our own? */ 64/* prefer perl internal functions over our own? */
75#ifndef CORO_PREFER_PERL_FUNCTIONS 65#ifndef CORO_PREFER_PERL_FUNCTIONS
76# define CORO_PREFER_PERL_FUNCTIONS 0 66# define CORO_PREFER_PERL_FUNCTIONS 0
… …
86# define STACKLEVEL ((void *)&stacklevel) 76# define STACKLEVEL ((void *)&stacklevel)
87#endif 77#endif
88 78
89#define IN_DESTRUCT PL_dirty 79#define IN_DESTRUCT PL_dirty
90 80
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" 81#include "CoroAPI.h"
107#define GCoroAPI (&coroapi) /* very sneaky */ 82#define GCoroAPI (&coroapi) /* very sneaky */
108 83
109#ifdef USE_ITHREADS 84#ifdef USE_ITHREADS
110# if CORO_PTHREAD 85# if CORO_PTHREAD
… …
166static char times_valid; 141static char times_valid;
167 142
168static struct coro_cctx *cctx_first; 143static struct coro_cctx *cctx_first;
169static int cctx_count, cctx_idle; 144static int cctx_count, cctx_idle;
170 145
171enum { 146enum
147{
172 CC_MAPPED = 0x01, 148 CC_MAPPED = 0x01,
173 CC_NOREUSE = 0x02, /* throw this away after tracing */ 149 CC_NOREUSE = 0x02, /* throw this away after tracing */
174 CC_TRACE = 0x04, 150 CC_TRACE = 0x04,
175 CC_TRACE_SUB = 0x08, /* trace sub calls */ 151 CC_TRACE_SUB = 0x08, /* trace sub calls */
176 CC_TRACE_LINE = 0x10, /* trace each statement */ 152 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
181typedef struct coro_cctx 157typedef struct coro_cctx
182{ 158{
183 struct coro_cctx *next; 159 struct coro_cctx *next;
184 160
185 /* the stack */ 161 /* the stack */
186 void *sptr; 162 struct coro_stack stack;
187 size_t ssize;
188 163
189 /* cpu state */ 164 /* cpu state */
190 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 165 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
166#ifndef NDEBUG
191 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 167 JMPENV *idle_te; /* same as idle_sp, but for top_env */
168#endif
192 JMPENV *top_env; 169 JMPENV *top_env;
193 coro_context cctx; 170 coro_context cctx;
194 171
195 U32 gen; 172 U32 gen;
196#if CORO_USE_VALGRIND 173#if CORO_USE_VALGRIND
… …
201 178
202static coro_cctx *cctx_current; /* the currently running cctx */ 179static coro_cctx *cctx_current; /* the currently running cctx */
203 180
204/*****************************************************************************/ 181/*****************************************************************************/
205 182
183static MGVTBL coro_state_vtbl;
184
206enum { 185enum
186{
207 CF_RUNNING = 0x0001, /* coroutine is running */ 187 CF_RUNNING = 0x0001, /* coroutine is running */
208 CF_READY = 0x0002, /* coroutine is ready */ 188 CF_READY = 0x0002, /* coroutine is ready */
209 CF_NEW = 0x0004, /* has never been switched to */ 189 CF_NEW = 0x0004, /* has never been switched to */
210 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 190 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 191 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */ 192 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
213}; 193};
214 194
215/* the structure where most of the perl state is stored, overlaid on the cxstack */ 195/* the structure where most of the perl state is stored, overlaid on the cxstack */
216typedef struct 196typedef struct
217{ 197{
218 SV *defsv;
219 AV *defav;
220 SV *errsv;
221 SV *irsgv;
222 HV *hinthv;
223#define VAR(name,type) type name; 198 #define VARx(name,expr,type) type name;
224# include "state.h" 199 #include "state.h"
225#undef VAR
226} perl_slots; 200} perl_slots;
227 201
202/* 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)) 203#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
229 204
230/* this is a structure representing a perl-level coroutine */ 205/* this is a structure representing a perl-level coroutine */
231struct coro { 206struct coro
207{
232 /* the C coroutine allocated to this perl coroutine, if any */ 208 /* the C coroutine allocated to this perl coroutine, if any */
233 coro_cctx *cctx; 209 coro_cctx *cctx;
234 210
235 /* ready queue */ 211 /* ready queue */
236 struct coro *next_ready; 212 struct coro *next_ready;
… …
238 /* state data */ 214 /* state data */
239 struct CoroSLF slf_frame; /* saved slf frame */ 215 struct CoroSLF slf_frame; /* saved slf frame */
240 AV *mainstack; 216 AV *mainstack;
241 perl_slots *slot; /* basically the saved sp */ 217 perl_slots *slot; /* basically the saved sp */
242 218
243 CV *startcv; /* the CV to execute */ 219 CV *startcv; /* the CV to execute */
244 AV *args; /* data associated with this coroutine (initial args) */ 220 AV *args; /* data associated with this coroutine (initial args) */
245 int refcnt; /* coroutines are refcounted, yes */
246 int flags; /* CF_ flags */ 221 int flags; /* CF_ flags */
247 HV *hv; /* the perl hash associated with this coro, if any */ 222 HV *hv; /* the perl hash associated with this coro, if any */
248 223
249 /* statistics */ 224 /* statistics */
250 int usecount; /* number of transfers to this coro */ 225 int usecount; /* number of transfers to this coro */
251 226
252 /* coro process data */ 227 /* coro process data */
253 int prio; 228 int prio;
254 SV *except; /* exception to be thrown */ 229 SV *except; /* exception to be thrown */
255 SV *rouse_cb; 230 SV *rouse_cb; /* last rouse callback */
231 AV *on_destroy; /* callbacks or coros to notify on destroy */
232 AV *status; /* the exit status list */
256 233
257 /* async_pool */ 234 /* async_pool */
258 SV *saved_deffh; 235 SV *saved_deffh;
259 SV *invoke_cb; 236 SV *invoke_cb;
260 AV *invoke_av; 237 AV *invoke_av;
… …
296static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 273static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
297static CV *cv_coro_run; 274static CV *cv_coro_run;
298static struct coro *coro_first; 275static struct coro *coro_first;
299#define coro_nready coroapi.nready 276#define coro_nready coroapi.nready
300 277
278/** JIT *********************************************************************/
279
280#if CORO_JIT
281 /* APPLE doesn't have mmap though */
282 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
283 #ifndef CORO_JIT_TYPE
284 #if ECB_AMD64 && CORO_JIT_UNIXY
285 #define CORO_JIT_TYPE "amd64-unix"
286 #elif __i386 && CORO_JIT_UNIXY
287 #define CORO_JIT_TYPE "x86-unix"
288 #endif
289 #endif
290#endif
291
292#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
293 #undef CORO_JIT
294#endif
295
296#if CORO_JIT
297 typedef void (*load_save_perl_slots_type)(perl_slots *);
298 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
299#endif
300
301/** Coro::Select ************************************************************/ 301/** Coro::Select ************************************************************/
302 302
303static OP *(*coro_old_pp_sselect) (pTHX); 303static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select; 304static SV *coro_select_select;
305 305
… …
320 320
321/** time stuff **************************************************************/ 321/** time stuff **************************************************************/
322 322
323#ifdef HAS_GETTIMEOFDAY 323#ifdef HAS_GETTIMEOFDAY
324 324
325static void 325ecb_inline void
326coro_u2time (pTHX_ UV ret[2]) 326coro_u2time (pTHX_ UV ret[2])
327{ 327{
328 struct timeval tv; 328 struct timeval tv;
329 gettimeofday (&tv, 0); 329 gettimeofday (&tv, 0);
330 330
331 ret [0] = tv.tv_sec; 331 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec; 332 ret [1] = tv.tv_usec;
333} 333}
334 334
335static double 335ecb_inline double
336coro_nvtime () 336coro_nvtime (void)
337{ 337{
338 struct timeval tv; 338 struct timeval tv;
339 gettimeofday (&tv, 0); 339 gettimeofday (&tv, 0);
340 340
341 return tv.tv_sec + tv.tv_usec * 1e-6; 341 return tv.tv_sec + tv.tv_usec * 1e-6;
342} 342}
343 343
344static void 344ecb_inline void
345time_init (pTHX) 345time_init (pTHX)
346{ 346{
347 nvtime = coro_nvtime; 347 nvtime = coro_nvtime;
348 u2time = coro_u2time; 348 u2time = coro_u2time;
349} 349}
350 350
351#else 351#else
352 352
353static void 353ecb_inline void
354time_init (pTHX) 354time_init (pTHX)
355{ 355{
356 SV **svp; 356 SV **svp;
357 357
358 require_pv ("Time/HiRes.pm"); 358 require_pv ("Time/HiRes.pm");
359 359
360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
361 361
362 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
364 364
… …
370 370
371#endif 371#endif
372 372
373/** lowlevel stuff **********************************************************/ 373/** lowlevel stuff **********************************************************/
374 374
375static SV * 375static SV * ecb_noinline
376coro_get_sv (pTHX_ const char *name, int create) 376coro_get_sv (pTHX_ const char *name, int create)
377{ 377{
378#if PERL_VERSION_ATLEAST (5,10,0) 378#if PERL_VERSION_ATLEAST (5,10,0)
379 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 379 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
380 get_sv (name, create); 380 get_sv (name, create);
381#endif 381#endif
382 return get_sv (name, create); 382 return get_sv (name, create);
383} 383}
384 384
385static AV * 385static AV * ecb_noinline
386coro_get_av (pTHX_ const char *name, int create) 386coro_get_av (pTHX_ const char *name, int create)
387{ 387{
388#if PERL_VERSION_ATLEAST (5,10,0) 388#if PERL_VERSION_ATLEAST (5,10,0)
389 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 389 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
390 get_av (name, create); 390 get_av (name, create);
391#endif 391#endif
392 return get_av (name, create); 392 return get_av (name, create);
393} 393}
394 394
395static HV * 395static HV * ecb_noinline
396coro_get_hv (pTHX_ const char *name, int create) 396coro_get_hv (pTHX_ const char *name, int create)
397{ 397{
398#if PERL_VERSION_ATLEAST (5,10,0) 398#if PERL_VERSION_ATLEAST (5,10,0)
399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
400 get_hv (name, create); 400 get_hv (name, create);
401#endif 401#endif
402 return get_hv (name, create); 402 return get_hv (name, create);
403} 403}
404 404
405INLINE void 405ecb_inline void
406coro_times_update () 406coro_times_update (void)
407{ 407{
408#ifdef coro_clock_gettime 408#ifdef coro_clock_gettime
409 struct timespec ts; 409 struct timespec ts;
410 410
411 ts.tv_sec = ts.tv_nsec = 0; 411 ts.tv_sec = ts.tv_nsec = 0;
… …
423 time_real [0] = tv [0]; 423 time_real [0] = tv [0];
424 time_real [1] = tv [1] * 1000; 424 time_real [1] = tv [1] * 1000;
425#endif 425#endif
426} 426}
427 427
428INLINE void 428ecb_inline void
429coro_times_add (struct coro *c) 429coro_times_add (struct coro *c)
430{ 430{
431 c->t_real [1] += time_real [1]; 431 c->t_real [1] += time_real [1];
432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
433 c->t_real [0] += time_real [0]; 433 c->t_real [0] += time_real [0];
… …
435 c->t_cpu [1] += time_cpu [1]; 435 c->t_cpu [1] += time_cpu [1];
436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
437 c->t_cpu [0] += time_cpu [0]; 437 c->t_cpu [0] += time_cpu [0];
438} 438}
439 439
440INLINE void 440ecb_inline void
441coro_times_sub (struct coro *c) 441coro_times_sub (struct coro *c)
442{ 442{
443 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 443 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]; 444 c->t_real [1] -= time_real [1];
445 c->t_real [0] -= time_real [0]; 445 c->t_real [0] -= time_real [0];
… …
453/* magic glue */ 453/* magic glue */
454 454
455#define CORO_MAGIC_type_cv 26 455#define CORO_MAGIC_type_cv 26
456#define CORO_MAGIC_type_state PERL_MAGIC_ext 456#define CORO_MAGIC_type_state PERL_MAGIC_ext
457 457
458#define CORO_MAGIC_NN(sv, type) \ 458#define CORO_MAGIC_NN(sv, type) \
459 (expect_true (SvMAGIC (sv)->mg_type == type) \ 459 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
460 ? SvMAGIC (sv) \ 460 ? SvMAGIC (sv) \
461 : mg_find (sv, type)) 461 : mg_find (sv, type))
462 462
463#define CORO_MAGIC(sv, type) \ 463#define CORO_MAGIC(sv, type) \
464 (expect_true (SvMAGIC (sv)) \ 464 (ecb_expect_true (SvMAGIC (sv)) \
465 ? CORO_MAGIC_NN (sv, type) \ 465 ? CORO_MAGIC_NN (sv, type) \
466 : 0) 466 : 0)
467 467
468#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 468#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) 469#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
470 470
471INLINE struct coro * 471ecb_inline MAGIC *
472SvSTATEhv_p (pTHX_ SV *coro)
473{
474 MAGIC *mg;
475
476 if (ecb_expect_true (
477 SvTYPE (coro) == SVt_PVHV
478 && (mg = CORO_MAGIC_state (coro))
479 && mg->mg_virtual == &coro_state_vtbl
480 ))
481 return mg;
482
483 return 0;
484}
485
486ecb_inline struct coro *
472SvSTATE_ (pTHX_ SV *coro) 487SvSTATE_ (pTHX_ SV *coro)
473{ 488{
474 HV *stash;
475 MAGIC *mg; 489 MAGIC *mg;
476 490
477 if (SvROK (coro)) 491 if (SvROK (coro))
478 coro = SvRV (coro); 492 coro = SvRV (coro);
479 493
480 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 494 mg = SvSTATEhv_p (aTHX_ coro);
495 if (!mg)
481 croak ("Coro::State object required"); 496 croak ("Coro::State object required");
482 497
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; 498 return (struct coro *)mg->mg_ptr;
493} 499}
494 500
495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 501#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
496 502
… …
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 505#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500 506
501/*****************************************************************************/ 507/*****************************************************************************/
502/* padlist management and caching */ 508/* padlist management and caching */
503 509
504static AV * 510ecb_inline PADLIST *
505coro_derive_padlist (pTHX_ CV *cv) 511coro_derive_padlist (pTHX_ CV *cv)
506{ 512{
507 AV *padlist = CvPADLIST (cv); 513 PADLIST *padlist = CvPADLIST (cv);
508 AV *newpadlist, *newpad; 514 PADLIST *newpadlist;
515 PAD *newpad;
516 PADOFFSET off = PadlistMAX (padlist) + 1;
509 517
510 newpadlist = newAV (); 518#if NEWPADAPI
519
520 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
521 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
522 while (!PadlistARRAY (padlist)[off - 1])
523 --off;
524
525 Perl_pad_push (aTHX_ padlist, off);
526
527 newpad = PadlistARRAY (padlist)[off];
528 PadlistARRAY (padlist)[off] = 0;
529
530#else
531
532#if PERL_VERSION_ATLEAST (5,10,0)
533 Perl_pad_push (aTHX_ padlist, off);
534#else
535 Perl_pad_push (aTHX_ padlist, off, 1);
536#endif
537
538 newpad = PadlistARRAY (padlist)[off];
539 PadlistMAX (padlist) = off - 1;
540
541#endif
542
543 newPADLIST (newpadlist);
544#if !PERL_VERSION_ATLEAST(5,15,3)
545 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
511 AvREAL_off (newpadlist); 546 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 547#endif
517 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
518 --AvFILLp (padlist);
519 548
520 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 549 /* Already extended to 2 elements by newPADLIST. */
521 av_store (newpadlist, 1, (SV *)newpad); 550 PadlistMAX (newpadlist) = 1;
551 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
552 PadlistARRAY (newpadlist)[1] = newpad;
522 553
523 return newpadlist; 554 return newpadlist;
524} 555}
525 556
526static void 557ecb_inline void
527free_padlist (pTHX_ AV *padlist) 558free_padlist (pTHX_ PADLIST *padlist)
528{ 559{
529 /* may be during global destruction */ 560 /* may be during global destruction */
530 if (!IN_DESTRUCT) 561 if (!IN_DESTRUCT)
531 { 562 {
532 I32 i = AvFILLp (padlist); 563 I32 i = PadlistMAX (padlist);
533 564
534 while (i > 0) /* special-case index 0 */ 565 while (i > 0) /* special-case index 0 */
535 { 566 {
536 /* we try to be extra-careful here */ 567 /* we try to be extra-careful here */
537 AV *av = (AV *)AvARRAY (padlist)[i--]; 568 PAD *pad = PadlistARRAY (padlist)[i--];
538 I32 j = AvFILLp (av); 569 I32 j = PadMAX (pad);
539 570
540 while (j >= 0) 571 while (j >= 0)
541 SvREFCNT_dec (AvARRAY (av)[j--]); 572 SvREFCNT_dec (PadARRAY (pad)[j--]);
542 573
543 AvFILLp (av) = -1; 574 PadMAX (pad) = -1;
544 SvREFCNT_dec (av); 575 SvREFCNT_dec (pad);
545 } 576 }
546 577
547 SvREFCNT_dec (AvARRAY (padlist)[0]); 578 SvREFCNT_dec (PadlistNAMES (padlist));
548 579
580#if NEWPADAPI
581 Safefree (PadlistARRAY (padlist));
582 Safefree (padlist);
583#else
549 AvFILLp (padlist) = -1; 584 AvFILLp (padlist) = -1;
585 AvREAL_off (padlist);
550 SvREFCNT_dec ((SV*)padlist); 586 SvREFCNT_dec ((SV*)padlist);
587#endif
551 } 588 }
552} 589}
553 590
554static int 591static int
555coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 592coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
556{ 593{
557 AV *padlist; 594 PADLIST *padlist;
558 AV *av = (AV *)mg->mg_obj; 595 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
596 size_t len = *(size_t *)mg->mg_ptr;
559 597
560 /* perl manages to free our internal AV and _then_ call us */ 598 /* perl manages to free our internal AV and _then_ call us */
561 if (IN_DESTRUCT) 599 if (IN_DESTRUCT)
562 return 0; 600 return 0;
563 601
564 /* casting is fun. */ 602 while (len--)
565 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
566 free_padlist (aTHX_ padlist); 603 free_padlist (aTHX_ padlists[len]);
567
568 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
569 604
570 return 0; 605 return 0;
571} 606}
572 607
573static MGVTBL coro_cv_vtbl = { 608static MGVTBL coro_cv_vtbl = {
574 0, 0, 0, 0, 609 0, 0, 0, 0,
575 coro_cv_free 610 coro_cv_free
576}; 611};
577 612
578/* the next two functions merely cache the padlists */ 613/* the next two functions merely cache the padlists */
579static void 614ecb_inline void
580get_padlist (pTHX_ CV *cv) 615get_padlist (pTHX_ CV *cv)
581{ 616{
582 MAGIC *mg = CORO_MAGIC_cv (cv); 617 MAGIC *mg = CORO_MAGIC_cv (cv);
583 AV *av; 618 size_t *lenp;
584 619
585 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 620 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 621 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
587 else 622 else
588 { 623 {
589#if CORO_PREFER_PERL_FUNCTIONS 624#if CORO_PREFER_PERL_FUNCTIONS
590 /* this is probably cleaner? but also slower! */ 625 /* this is probably cleaner? but also slower! */
591 /* in practise, it seems to be less stable */ 626 /* in practise, it seems to be less stable */
… …
597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 632 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
598#endif 633#endif
599 } 634 }
600} 635}
601 636
602static void 637ecb_inline void
603put_padlist (pTHX_ CV *cv) 638put_padlist (pTHX_ CV *cv)
604{ 639{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 640 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av;
607 641
608 if (expect_false (!mg)) 642 if (ecb_expect_false (!mg))
643 {
609 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 644 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
645 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
646 mg->mg_len = 1; /* so mg_free frees mg_ptr */
647 }
648 else
649 Renew (mg->mg_ptr,
650 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
651 char);
610 652
611 av = (AV *)mg->mg_obj; 653 ((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} 654}
618 655
619/** load & save, init *******************************************************/ 656/** load & save, init *******************************************************/
620 657
658ecb_inline void
659swap_sv (SV *a, SV *b)
660{
661 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
662 SV tmp;
663
664 /* swap sv_any */
665 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
666
667 /* swap sv_flags */
668 SvFLAGS (&tmp) = SvFLAGS (a);
669 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
670 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
671
672#if PERL_VERSION_ATLEAST (5,10,0)
673 /* perl 5.10 and later complicates this _quite_ a bit, but it also
674 * is much faster, so no quarrels here. alternatively, we could
675 * sv_upgrade to avoid this.
676 */
677 {
678 /* swap sv_u */
679 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
680
681 /* if SvANY points to the head, we need to adjust the pointers,
682 * as the pointer for a still points to b, and maybe vice versa.
683 */
684 #define svany_in_head(type) \
685 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
686
687 if (svany_in_head (SvTYPE (a)))
688 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
689
690 if (svany_in_head (SvTYPE (b)))
691 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
692 }
693#endif
694}
695
621/* swap sv heads, at least logically */ 696/* swap sv heads, at least logically */
622static void 697static void
623swap_svs (pTHX_ Coro__State c) 698swap_svs (pTHX_ Coro__State c)
624{ 699{
625 int i; 700 int i;
626 701
627 for (i = 0; i <= AvFILLp (c->swap_sv); ) 702 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
628 { 703 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} 704}
667 705
668#define SWAP_SVS(coro) \ 706#define SWAP_SVS(coro) \
669 if (expect_false ((coro)->swap_sv)) \ 707 if (ecb_expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro)) 708 swap_svs (aTHX_ (coro))
671 709
672static void 710static void
673on_enterleave_call (pTHX_ SV *cb); 711on_enterleave_call (pTHX_ SV *cb);
674 712
… …
678 perl_slots *slot = c->slot; 716 perl_slots *slot = c->slot;
679 c->slot = 0; 717 c->slot = 0;
680 718
681 PL_mainstack = c->mainstack; 719 PL_mainstack = c->mainstack;
682 720
683 GvSV (PL_defgv) = slot->defsv; 721#if CORO_JIT
684 GvAV (PL_defgv) = slot->defav; 722 load_perl_slots (slot);
685 GvSV (PL_errgv) = slot->errsv; 723#else
686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
688
689 #define VAR(name,type) PL_ ## name = slot->name; 724 #define VARx(name,expr,type) expr = slot->name;
690 # include "state.h" 725 #include "state.h"
691 #undef VAR 726#endif
692 727
693 { 728 {
694 dSP; 729 dSP;
695 730
696 CV *cv; 731 CV *cv;
697 732
698 /* now do the ugly restore mess */ 733 /* now do the ugly restore mess */
699 while (expect_true (cv = (CV *)POPs)) 734 while (ecb_expect_true (cv = (CV *)POPs))
700 { 735 {
701 put_padlist (aTHX_ cv); /* mark this padlist as available */ 736 put_padlist (aTHX_ cv); /* mark this padlist as available */
702 CvDEPTH (cv) = PTR2IV (POPs); 737 CvDEPTH (cv) = PTR2IV (POPs);
703 CvPADLIST (cv) = (AV *)POPs; 738 CvPADLIST (cv) = (PADLIST *)POPs;
704 } 739 }
705 740
706 PUTBACK; 741 PUTBACK;
707 } 742 }
708 743
709 slf_frame = c->slf_frame; 744 slf_frame = c->slf_frame;
710 CORO_THROW = c->except; 745 CORO_THROW = c->except;
711 746
712 if (expect_false (enable_times)) 747 if (ecb_expect_false (enable_times))
713 { 748 {
714 if (expect_false (!times_valid)) 749 if (ecb_expect_false (!times_valid))
715 coro_times_update (); 750 coro_times_update ();
716 751
717 coro_times_sub (c); 752 coro_times_sub (c);
718 } 753 }
719 754
720 if (expect_false (c->on_enter)) 755 if (ecb_expect_false (c->on_enter))
721 { 756 {
722 int i; 757 int i;
723 758
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 759 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 760 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
731static void 766static void
732save_perl (pTHX_ Coro__State c) 767save_perl (pTHX_ Coro__State c)
733{ 768{
734 SWAP_SVS (c); 769 SWAP_SVS (c);
735 770
736 if (expect_false (c->on_leave)) 771 if (ecb_expect_false (c->on_leave))
737 { 772 {
738 int i; 773 int i;
739 774
740 for (i = AvFILLp (c->on_leave); i >= 0; --i) 775 for (i = AvFILLp (c->on_leave); i >= 0; --i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 776 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 } 777 }
743 778
744 times_valid = 0; 779 times_valid = 0;
745 780
746 if (expect_false (enable_times)) 781 if (ecb_expect_false (enable_times))
747 { 782 {
748 coro_times_update (); times_valid = 1; 783 coro_times_update (); times_valid = 1;
749 coro_times_add (c); 784 coro_times_add (c);
750 } 785 }
751 786
… …
765 800
766 XPUSHs (Nullsv); 801 XPUSHs (Nullsv);
767 /* this loop was inspired by pp_caller */ 802 /* this loop was inspired by pp_caller */
768 for (;;) 803 for (;;)
769 { 804 {
770 while (expect_true (cxix >= 0)) 805 while (ecb_expect_true (cxix >= 0))
771 { 806 {
772 PERL_CONTEXT *cx = &ccstk[cxix--]; 807 PERL_CONTEXT *cx = &ccstk[cxix--];
773 808
774 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 809 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
775 { 810 {
776 CV *cv = cx->blk_sub.cv; 811 CV *cv = cx->blk_sub.cv;
777 812
778 if (expect_true (CvDEPTH (cv))) 813 if (ecb_expect_true (CvDEPTH (cv)))
779 { 814 {
780 EXTEND (SP, 3); 815 EXTEND (SP, 3);
781 PUSHs ((SV *)CvPADLIST (cv)); 816 PUSHs ((SV *)CvPADLIST (cv));
782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 817 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
783 PUSHs ((SV *)cv); 818 PUSHs ((SV *)cv);
… …
786 get_padlist (aTHX_ cv); 821 get_padlist (aTHX_ cv);
787 } 822 }
788 } 823 }
789 } 824 }
790 825
791 if (expect_true (top_si->si_type == PERLSI_MAIN)) 826 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
792 break; 827 break;
793 828
794 top_si = top_si->si_prev; 829 top_si = top_si->si_prev;
795 ccstk = top_si->si_cxstack; 830 ccstk = top_si->si_cxstack;
796 cxix = top_si->si_cxix; 831 cxix = top_si->si_cxix;
… …
798 833
799 PUTBACK; 834 PUTBACK;
800 } 835 }
801 836
802 /* allocate some space on the context stack for our purposes */ 837 /* allocate some space on the context stack for our purposes */
803 /* we manually unroll here, as usually 2 slots is enough */ 838 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 { 839 {
808 unsigned int i; 840 unsigned int i;
841
809 for (i = 3; i < SLOT_COUNT; ++i) 842 for (i = 0; i < SLOT_COUNT; ++i)
810 CXINC; 843 CXINC;
811 } 844
812 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 845 cxstack_ix -= SLOT_COUNT; /* undo allocation */
846 }
813 847
814 c->mainstack = PL_mainstack; 848 c->mainstack = PL_mainstack;
815 849
816 { 850 {
817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 851 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
818 852
819 slot->defav = GvAV (PL_defgv); 853#if CORO_JIT
820 slot->defsv = DEFSV; 854 save_perl_slots (slot);
821 slot->errsv = ERRSV; 855#else
822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
824
825 #define VAR(name,type) slot->name = PL_ ## name; 856 #define VARx(name,expr,type) slot->name = expr;
826 # include "state.h" 857 #include "state.h"
827 #undef VAR 858#endif
828 } 859 }
829} 860}
830 861
831/* 862/*
832 * allocate various perl stacks. This is almost an exact copy 863 * allocate various perl stacks. This is almost an exact copy
… …
838# define coro_init_stacks(thx) init_stacks () 869# define coro_init_stacks(thx) init_stacks ()
839#else 870#else
840static void 871static void
841coro_init_stacks (pTHX) 872coro_init_stacks (pTHX)
842{ 873{
843 PL_curstackinfo = new_stackinfo(32, 8); 874 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; 875 PL_curstackinfo->si_type = PERLSI_MAIN;
845 PL_curstack = PL_curstackinfo->si_stack; 876 PL_curstack = PL_curstackinfo->si_stack;
846 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 877 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
847 878
848 PL_stack_base = AvARRAY(PL_curstack); 879 PL_stack_base = AvARRAY(PL_curstack);
… …
863#endif 894#endif
864 895
865 New(54,PL_scopestack,8,I32); 896 New(54,PL_scopestack,8,I32);
866 PL_scopestack_ix = 0; 897 PL_scopestack_ix = 0;
867 PL_scopestack_max = 8; 898 PL_scopestack_max = 8;
899#if HAS_SCOPESTACK_NAME
900 New(54,PL_scopestack_name,8,const char*);
901#endif
868 902
869 New(54,PL_savestack,24,ANY); 903 New(54,PL_savestack,24,ANY);
870 PL_savestack_ix = 0; 904 PL_savestack_ix = 0;
871 PL_savestack_max = 24; 905 PL_savestack_max = 24;
872 906
… …
900 } 934 }
901 935
902 Safefree (PL_tmps_stack); 936 Safefree (PL_tmps_stack);
903 Safefree (PL_markstack); 937 Safefree (PL_markstack);
904 Safefree (PL_scopestack); 938 Safefree (PL_scopestack);
939#if HAS_SCOPESTACK_NAME
940 Safefree (PL_scopestack_name);
941#endif
905 Safefree (PL_savestack); 942 Safefree (PL_savestack);
906#if !PERL_VERSION_ATLEAST (5,10,0) 943#if !PERL_VERSION_ATLEAST (5,10,0)
907 Safefree (PL_retstack); 944 Safefree (PL_retstack);
908#endif 945#endif
909} 946}
… …
955#endif 992#endif
956 993
957/* 994/*
958 * This overrides the default magic get method of %SIG elements. 995 * 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 996 * 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 997 * and instead of trying to save and restore the hash elements (extremely slow),
961 * readback here. 998 * we just provide our own readback here.
962 */ 999 */
963static int 1000static int ecb_cold
964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1001coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
965{ 1002{
966 const char *s = MgPV_nolen_const (mg); 1003 const char *s = MgPV_nolen_const (mg);
967 1004
968 if (*s == '_') 1005 if (*s == '_')
969 { 1006 {
970 SV **svp = 0; 1007 SV **svp = 0;
971 1008
972 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1009 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
973 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1010 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
974 1011
975 if (svp) 1012 if (svp)
976 { 1013 {
977 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1014 SV *ssv;
1015
1016 if (!*svp)
1017 ssv = &PL_sv_undef;
1018 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1019 ssv = sv_2mortal (newRV_inc (*svp));
1020 else
1021 ssv = *svp;
1022
1023 sv_setsv (sv, ssv);
978 return 0; 1024 return 0;
979 } 1025 }
980 } 1026 }
981 1027
982 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1028 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
983} 1029}
984 1030
985static int 1031static int ecb_cold
986coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1032coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
987{ 1033{
988 const char *s = MgPV_nolen_const (mg); 1034 const char *s = MgPV_nolen_const (mg);
989 1035
990 if (*s == '_') 1036 if (*s == '_')
… …
1004 } 1050 }
1005 1051
1006 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1052 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1007} 1053}
1008 1054
1009static int 1055static int ecb_cold
1010coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1056coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1011{ 1057{
1012 const char *s = MgPV_nolen_const (mg); 1058 const char *s = MgPV_nolen_const (mg);
1013 1059
1014 if (*s == '_') 1060 if (*s == '_')
… …
1049 return 1; 1095 return 1;
1050} 1096}
1051 1097
1052static UNOP init_perl_op; 1098static UNOP init_perl_op;
1053 1099
1054static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1100ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1055init_perl (pTHX_ struct coro *coro) 1101init_perl (pTHX_ struct coro *coro)
1056{ 1102{
1057 /* 1103 /*
1058 * emulate part of the perl startup here. 1104 * emulate part of the perl startup here.
1059 */ 1105 */
… …
1074 PL_parser = 0; 1120 PL_parser = 0;
1075#endif 1121#endif
1076 PL_hints = 0; 1122 PL_hints = 0;
1077 1123
1078 /* recreate the die/warn hooks */ 1124 /* recreate the die/warn hooks */
1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1125 PL_diehook = SvREFCNT_inc (rv_diehook);
1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1126 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1081 1127
1082 GvSV (PL_defgv) = newSV (0); 1128 GvSV (PL_defgv) = newSV (0);
1083 GvAV (PL_defgv) = coro->args; coro->args = 0; 1129 GvAV (PL_defgv) = coro->args; coro->args = 0;
1084 GvSV (PL_errgv) = newSV (0); 1130 GvSV (PL_errgv) = newSV (0);
1085 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1131 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1086 GvHV (PL_hintgv) = 0; 1132 GvHV (PL_hintgv) = 0;
… …
1106 /* this newly created coroutine might be run on an existing cctx which most 1152 /* 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. 1153 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1108 */ 1154 */
1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1155 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 */ 1156 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1157 slf_frame.destroy = 0;
1111 1158
1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1159 /* 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; 1160 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1161 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1162 init_perl_op.op_ppaddr = pp_slf;
… …
1120 /* copy throw, in case it was set before init_perl */ 1167 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1168 CORO_THROW = coro->except;
1122 1169
1123 SWAP_SVS (coro); 1170 SWAP_SVS (coro);
1124 1171
1125 if (expect_false (enable_times)) 1172 if (ecb_expect_false (enable_times))
1126 { 1173 {
1127 coro_times_update (); 1174 coro_times_update ();
1128 coro_times_sub (coro); 1175 coro_times_sub (coro);
1129 } 1176 }
1130} 1177}
… …
1167 SvRV_set (coro_current, (SV *)coro->hv); 1214 SvRV_set (coro_current, (SV *)coro->hv);
1168 1215
1169 load_perl (aTHX_ coro); 1216 load_perl (aTHX_ coro);
1170 1217
1171 coro_unwind_stacks (aTHX); 1218 coro_unwind_stacks (aTHX);
1172 coro_destruct_stacks (aTHX);
1173 1219
1174 /* restore swapped sv's */ 1220 /* restore swapped sv's */
1175 SWAP_SVS (coro); 1221 SWAP_SVS (coro);
1176 1222
1223 coro_destruct_stacks (aTHX);
1224
1177 // now save some sv's to be free'd later 1225 /* now save some sv's to be free'd later */
1178 svf [0] = GvSV (PL_defgv); 1226 svf [0] = GvSV (PL_defgv);
1179 svf [1] = (SV *)GvAV (PL_defgv); 1227 svf [1] = (SV *)GvAV (PL_defgv);
1180 svf [2] = GvSV (PL_errgv); 1228 svf [2] = GvSV (PL_errgv);
1181 svf [3] = (SV *)PL_defoutgv; 1229 svf [3] = (SV *)PL_defoutgv;
1182 svf [4] = PL_rs; 1230 svf [4] = PL_rs;
… …
1202 SvREFCNT_dec (coro->invoke_cb); 1250 SvREFCNT_dec (coro->invoke_cb);
1203 SvREFCNT_dec (coro->invoke_av); 1251 SvREFCNT_dec (coro->invoke_av);
1204 } 1252 }
1205} 1253}
1206 1254
1207INLINE void 1255ecb_inline void
1208free_coro_mortal (pTHX) 1256free_coro_mortal (pTHX)
1209{ 1257{
1210 if (expect_true (coro_mortal)) 1258 if (ecb_expect_true (coro_mortal))
1211 { 1259 {
1212 SvREFCNT_dec (coro_mortal); 1260 SvREFCNT_dec ((SV *)coro_mortal);
1213 coro_mortal = 0; 1261 coro_mortal = 0;
1214 } 1262 }
1215} 1263}
1216 1264
1217static int 1265static int
… …
1350 1398
1351 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1399 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1352} 1400}
1353 1401
1354/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1402/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1355static void NOINLINE 1403static void ecb_noinline
1356cctx_prepare (pTHX) 1404cctx_prepare (pTHX)
1357{ 1405{
1358 PL_top_env = &PL_start_env; 1406 PL_top_env = &PL_start_env;
1359 1407
1360 if (cctx_current->flags & CC_TRACE) 1408 if (cctx_current->flags & CC_TRACE)
… …
1371 slf_frame.prepare = slf_prepare_set_stacklevel; 1419 slf_frame.prepare = slf_prepare_set_stacklevel;
1372 slf_frame.check = slf_check_set_stacklevel; 1420 slf_frame.check = slf_check_set_stacklevel;
1373} 1421}
1374 1422
1375/* the tail of transfer: execute stuff we can only do after a transfer */ 1423/* the tail of transfer: execute stuff we can only do after a transfer */
1376INLINE void 1424ecb_inline void
1377transfer_tail (pTHX) 1425transfer_tail (pTHX)
1378{ 1426{
1379 free_coro_mortal (aTHX); 1427 free_coro_mortal (aTHX);
1428}
1429
1430/* try to exit the same way perl's main function would do */
1431/* we do not bother resetting the environment or other things *7
1432/* that are not, uhm, essential */
1433/* this obviously also doesn't work when perl is embedded */
1434static void ecb_noinline ecb_cold
1435perlish_exit (pTHX)
1436{
1437 int exitstatus = perl_destruct (PL_curinterp);
1438 perl_free (PL_curinterp);
1439 exit (exitstatus);
1380} 1440}
1381 1441
1382/* 1442/*
1383 * this is a _very_ stripped down perl interpreter ;) 1443 * this is a _very_ stripped down perl interpreter ;)
1384 */ 1444 */
… …
1413 */ 1473 */
1414 1474
1415 /* 1475 /*
1416 * If perl-run returns we assume exit() was being called or the coro 1476 * 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) 1477 * 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 1478 * 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" 1479 * 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 */ 1480 */
1424 PL_top_env = main_top_env; 1481 perlish_exit (aTHX);
1425 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1426 } 1482 }
1427} 1483}
1428 1484
1429static coro_cctx * 1485static coro_cctx *
1430cctx_new () 1486cctx_new (void)
1431{ 1487{
1432 coro_cctx *cctx; 1488 coro_cctx *cctx;
1433 1489
1434 ++cctx_count; 1490 ++cctx_count;
1435 New (0, cctx, 1, coro_cctx); 1491 New (0, cctx, 1, coro_cctx);
… …
1441 return cctx; 1497 return cctx;
1442} 1498}
1443 1499
1444/* create a new cctx only suitable as source */ 1500/* create a new cctx only suitable as source */
1445static coro_cctx * 1501static coro_cctx *
1446cctx_new_empty () 1502cctx_new_empty (void)
1447{ 1503{
1448 coro_cctx *cctx = cctx_new (); 1504 coro_cctx *cctx = cctx_new ();
1449 1505
1450 cctx->sptr = 0; 1506 cctx->stack.sptr = 0;
1451 coro_create (&cctx->cctx, 0, 0, 0, 0); 1507 coro_create (&cctx->cctx, 0, 0, 0, 0);
1452 1508
1453 return cctx; 1509 return cctx;
1454} 1510}
1455 1511
1456/* create a new cctx suitable as destination/running a perl interpreter */ 1512/* create a new cctx suitable as destination/running a perl interpreter */
1457static coro_cctx * 1513static coro_cctx *
1458cctx_new_run () 1514cctx_new_run (void)
1459{ 1515{
1460 coro_cctx *cctx = cctx_new (); 1516 coro_cctx *cctx = cctx_new ();
1461 void *stack_start;
1462 size_t stack_size;
1463 1517
1464#if HAVE_MMAP 1518 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 } 1519 {
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."); 1520 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1487 _exit (EXIT_FAILURE); 1521 _exit (EXIT_FAILURE);
1488 }
1489
1490 stack_start = cctx->sptr;
1491 stack_size = cctx->ssize;
1492 } 1522 }
1493 1523
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); 1524 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1499 1525
1500 return cctx; 1526 return cctx;
1501} 1527}
1502 1528
1503static void 1529static void
… …
1509 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1535 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1510 1536
1511 --cctx_count; 1537 --cctx_count;
1512 coro_destroy (&cctx->cctx); 1538 coro_destroy (&cctx->cctx);
1513 1539
1514 /* coro_transfer creates new, empty cctx's */ 1540 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 1541
1529 Safefree (cctx); 1542 Safefree (cctx);
1530} 1543}
1531 1544
1532/* wether this cctx should be destructed */ 1545/* wether this cctx should be destructed */
1533#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1546#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1534 1547
1535static coro_cctx * 1548static coro_cctx *
1536cctx_get (pTHX) 1549cctx_get (pTHX)
1537{ 1550{
1538 while (expect_true (cctx_first)) 1551 while (ecb_expect_true (cctx_first))
1539 { 1552 {
1540 coro_cctx *cctx = cctx_first; 1553 coro_cctx *cctx = cctx_first;
1541 cctx_first = cctx->next; 1554 cctx_first = cctx->next;
1542 --cctx_idle; 1555 --cctx_idle;
1543 1556
1544 if (expect_true (!CCTX_EXPIRED (cctx))) 1557 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1545 return cctx; 1558 return cctx;
1546 1559
1547 cctx_destroy (cctx); 1560 cctx_destroy (cctx);
1548 } 1561 }
1549 1562
… …
1551} 1564}
1552 1565
1553static void 1566static void
1554cctx_put (coro_cctx *cctx) 1567cctx_put (coro_cctx *cctx)
1555{ 1568{
1556 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1569 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1557 1570
1558 /* free another cctx if overlimit */ 1571 /* free another cctx if overlimit */
1559 if (expect_false (cctx_idle >= cctx_max_idle)) 1572 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1560 { 1573 {
1561 coro_cctx *first = cctx_first; 1574 coro_cctx *first = cctx_first;
1562 cctx_first = first->next; 1575 cctx_first = first->next;
1563 --cctx_idle; 1576 --cctx_idle;
1564 1577
… …
1575static void 1588static void
1576transfer_check (pTHX_ struct coro *prev, struct coro *next) 1589transfer_check (pTHX_ struct coro *prev, struct coro *next)
1577{ 1590{
1578 /* TODO: throwing up here is considered harmful */ 1591 /* TODO: throwing up here is considered harmful */
1579 1592
1580 if (expect_true (prev != next)) 1593 if (ecb_expect_true (prev != next))
1581 { 1594 {
1582 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1595 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,"); 1596 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1584 1597
1585 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1598 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,"); 1599 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1587 1600
1588#if !PERL_VERSION_ATLEAST (5,10,0) 1601#if !PERL_VERSION_ATLEAST (5,10,0)
1589 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1602 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,"); 1603 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1591#endif 1604#endif
1592 } 1605 }
1593} 1606}
1594 1607
1595/* always use the TRANSFER macro */ 1608/* always use the TRANSFER macro */
1596static void NOINLINE /* noinline so we have a fixed stackframe */ 1609static void ecb_noinline /* noinline so we have a fixed stackframe */
1597transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1610transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1598{ 1611{
1599 dSTACKLEVEL; 1612 dSTACKLEVEL;
1600 1613
1601 /* sometimes transfer is only called to set idle_sp */ 1614 /* sometimes transfer is only called to set idle_sp */
1602 if (expect_false (!prev)) 1615 if (ecb_expect_false (!prev))
1603 { 1616 {
1604 cctx_current->idle_sp = STACKLEVEL; 1617 cctx_current->idle_sp = STACKLEVEL;
1605 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1618 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1606 } 1619 }
1607 else if (expect_true (prev != next)) 1620 else if (ecb_expect_true (prev != next))
1608 { 1621 {
1609 coro_cctx *cctx_prev; 1622 coro_cctx *cctx_prev;
1610 1623
1611 if (expect_false (prev->flags & CF_NEW)) 1624 if (ecb_expect_false (prev->flags & CF_NEW))
1612 { 1625 {
1613 /* create a new empty/source context */ 1626 /* create a new empty/source context */
1614 prev->flags &= ~CF_NEW; 1627 prev->flags &= ~CF_NEW;
1615 prev->flags |= CF_RUNNING; 1628 prev->flags |= CF_RUNNING;
1616 } 1629 }
… …
1619 next->flags |= CF_RUNNING; 1632 next->flags |= CF_RUNNING;
1620 1633
1621 /* first get rid of the old state */ 1634 /* first get rid of the old state */
1622 save_perl (aTHX_ prev); 1635 save_perl (aTHX_ prev);
1623 1636
1624 if (expect_false (next->flags & CF_NEW)) 1637 if (ecb_expect_false (next->flags & CF_NEW))
1625 { 1638 {
1626 /* need to start coroutine */ 1639 /* need to start coroutine */
1627 next->flags &= ~CF_NEW; 1640 next->flags &= ~CF_NEW;
1628 /* setup coroutine call */ 1641 /* setup coroutine call */
1629 init_perl (aTHX_ next); 1642 init_perl (aTHX_ next);
1630 } 1643 }
1631 else 1644 else
1632 load_perl (aTHX_ next); 1645 load_perl (aTHX_ next);
1633 1646
1634 /* possibly untie and reuse the cctx */ 1647 /* possibly untie and reuse the cctx */
1635 if (expect_true ( 1648 if (ecb_expect_true (
1636 cctx_current->idle_sp == STACKLEVEL 1649 cctx_current->idle_sp == STACKLEVEL
1637 && !(cctx_current->flags & CC_TRACE) 1650 && !(cctx_current->flags & CC_TRACE)
1638 && !force_cctx 1651 && !force_cctx
1639 )) 1652 ))
1640 { 1653 {
1641 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1654 /* 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)); 1655 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1643 1656
1644 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1657 /* 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 */ 1658 /* without this the next cctx_get might destroy the running cctx while still in use */
1646 if (expect_false (CCTX_EXPIRED (cctx_current))) 1659 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1647 if (expect_true (!next->cctx)) 1660 if (ecb_expect_true (!next->cctx))
1648 next->cctx = cctx_get (aTHX); 1661 next->cctx = cctx_get (aTHX);
1649 1662
1650 cctx_put (cctx_current); 1663 cctx_put (cctx_current);
1651 } 1664 }
1652 else 1665 else
1653 prev->cctx = cctx_current; 1666 prev->cctx = cctx_current;
1654 1667
1655 ++next->usecount; 1668 ++next->usecount;
1656 1669
1657 cctx_prev = cctx_current; 1670 cctx_prev = cctx_current;
1658 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1671 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1659 1672
1660 next->cctx = 0; 1673 next->cctx = 0;
1661 1674
1662 if (expect_false (cctx_prev != cctx_current)) 1675 if (ecb_expect_false (cctx_prev != cctx_current))
1663 { 1676 {
1664 cctx_prev->top_env = PL_top_env; 1677 cctx_prev->top_env = PL_top_env;
1665 PL_top_env = cctx_current->top_env; 1678 PL_top_env = cctx_current->top_env;
1666 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1679 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1667 } 1680 }
… …
1673#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1686#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) 1687#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1675 1688
1676/** high level stuff ********************************************************/ 1689/** high level stuff ********************************************************/
1677 1690
1691/* this function is actually Coro, not Coro::State, but we call it from here */
1692/* because it is convenient - but it hasn't been declared yet for that reason */
1693static void
1694coro_call_on_destroy (pTHX_ struct coro *coro);
1695
1678static void 1696static void
1679coro_state_destroy (pTHX_ struct coro *coro) 1697coro_state_destroy (pTHX_ struct coro *coro)
1680{ 1698{
1681 if (coro->flags & CF_DESTROYED) 1699 if (coro->flags & CF_ZOMBIE)
1682 return; 1700 return;
1683 1701
1684 slf_destroy (aTHX_ coro); 1702 slf_destroy (aTHX_ coro);
1685 1703
1686 coro->flags |= CF_DESTROYED; 1704 coro->flags |= CF_ZOMBIE;
1687 1705
1688 if (coro->flags & CF_READY) 1706 if (coro->flags & CF_READY)
1689 { 1707 {
1690 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1708 /* reduce nready, as destroying a ready coro effectively unreadies it */
1691 /* alternative: look through all ready queues and remove the coro */ 1709 /* alternative: look through all ready queues and remove the coro */
1692 --coro_nready; 1710 --coro_nready;
1693 } 1711 }
1694 else 1712 else
1695 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1713 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1714
1715 if (coro->next) coro->next->prev = coro->prev;
1716 if (coro->prev) coro->prev->next = coro->next;
1717 if (coro == coro_first) coro_first = coro->next;
1696 1718
1697 if (coro->mainstack 1719 if (coro->mainstack
1698 && coro->mainstack != main_mainstack 1720 && coro->mainstack != main_mainstack
1699 && coro->slot 1721 && coro->slot
1700 && !PL_dirty) 1722 && !PL_dirty)
1701 destroy_perl (aTHX_ coro); 1723 destroy_perl (aTHX_ coro);
1702 1724
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); 1725 cctx_destroy (coro->cctx);
1708 SvREFCNT_dec (coro->startcv); 1726 SvREFCNT_dec (coro->startcv);
1709 SvREFCNT_dec (coro->args); 1727 SvREFCNT_dec (coro->args);
1710 SvREFCNT_dec (coro->swap_sv); 1728 SvREFCNT_dec (coro->swap_sv);
1711 SvREFCNT_dec (CORO_THROW); 1729 SvREFCNT_dec (CORO_THROW);
1730
1731 coro_call_on_destroy (aTHX_ coro);
1732
1733 /* more destruction mayhem in coro_state_free */
1712} 1734}
1713 1735
1714static int 1736static int
1715coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1737coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1716{ 1738{
1717 struct coro *coro = (struct coro *)mg->mg_ptr; 1739 struct coro *coro = (struct coro *)mg->mg_ptr;
1718 mg->mg_ptr = 0; 1740 mg->mg_ptr = 0;
1719 1741
1720 coro->hv = 0;
1721
1722 if (--coro->refcnt < 0)
1723 {
1724 coro_state_destroy (aTHX_ coro); 1742 coro_state_destroy (aTHX_ coro);
1743 SvREFCNT_dec (coro->on_destroy);
1744 SvREFCNT_dec (coro->status);
1745
1725 Safefree (coro); 1746 Safefree (coro);
1726 }
1727 1747
1728 return 0; 1748 return 0;
1729} 1749}
1730 1750
1731static int 1751static int ecb_cold
1732coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1752coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1733{ 1753{
1734 struct coro *coro = (struct coro *)mg->mg_ptr; 1754 /* called when perl clones the current process the slow way (windows process emulation) */
1735 1755 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1736 ++coro->refcnt; 1756 mg->mg_ptr = 0;
1757 mg->mg_virtual = 0;
1737 1758
1738 return 0; 1759 return 0;
1739} 1760}
1740 1761
1741static MGVTBL coro_state_vtbl = { 1762static MGVTBL coro_state_vtbl = {
… …
1766 TRANSFER (ta, 1); 1787 TRANSFER (ta, 1);
1767} 1788}
1768 1789
1769/** Coro ********************************************************************/ 1790/** Coro ********************************************************************/
1770 1791
1771INLINE void 1792ecb_inline void
1772coro_enq (pTHX_ struct coro *coro) 1793coro_enq (pTHX_ struct coro *coro)
1773{ 1794{
1774 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1795 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1775 1796
1776 SvREFCNT_inc_NN (coro->hv); 1797 SvREFCNT_inc_NN (coro->hv);
… …
1778 coro->next_ready = 0; 1799 coro->next_ready = 0;
1779 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1800 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1780 ready [1] = coro; 1801 ready [1] = coro;
1781} 1802}
1782 1803
1783INLINE struct coro * 1804ecb_inline struct coro *
1784coro_deq (pTHX) 1805coro_deq (pTHX)
1785{ 1806{
1786 int prio; 1807 int prio;
1787 1808
1788 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1809 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1841{ 1862{
1842 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1863 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1843} 1864}
1844 1865
1845/* expects to own a reference to next->hv */ 1866/* expects to own a reference to next->hv */
1846INLINE void 1867ecb_inline void
1847prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1868prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1848{ 1869{
1849 SV *prev_sv = SvRV (coro_current); 1870 SV *prev_sv = SvRV (coro_current);
1850 1871
1851 ta->prev = SvSTATE_hv (prev_sv); 1872 ta->prev = SvSTATE_hv (prev_sv);
… …
1864{ 1885{
1865 for (;;) 1886 for (;;)
1866 { 1887 {
1867 struct coro *next = coro_deq (aTHX); 1888 struct coro *next = coro_deq (aTHX);
1868 1889
1869 if (expect_true (next)) 1890 if (ecb_expect_true (next))
1870 { 1891 {
1871 /* cannot transfer to destroyed coros, skip and look for next */ 1892 /* cannot transfer to destroyed coros, skip and look for next */
1872 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1893 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 */ 1894 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1874 else 1895 else
1875 { 1896 {
1876 next->flags &= ~CF_READY; 1897 next->flags &= ~CF_READY;
1877 --coro_nready; 1898 --coro_nready;
… …
1910 } 1931 }
1911 } 1932 }
1912 } 1933 }
1913} 1934}
1914 1935
1915INLINE void 1936ecb_inline void
1916prepare_cede (pTHX_ struct coro_transfer_args *ta) 1937prepare_cede (pTHX_ struct coro_transfer_args *ta)
1917{ 1938{
1918 api_ready (aTHX_ coro_current); 1939 api_ready (aTHX_ coro_current);
1919 prepare_schedule (aTHX_ ta); 1940 prepare_schedule (aTHX_ ta);
1920} 1941}
1921 1942
1922INLINE void 1943ecb_inline void
1923prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1944prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1924{ 1945{
1925 SV *prev = SvRV (coro_current); 1946 SV *prev = SvRV (coro_current);
1926 1947
1927 if (coro_nready) 1948 if (coro_nready)
… …
1957{ 1978{
1958 struct coro_transfer_args ta; 1979 struct coro_transfer_args ta;
1959 1980
1960 prepare_cede (aTHX_ &ta); 1981 prepare_cede (aTHX_ &ta);
1961 1982
1962 if (expect_true (ta.prev != ta.next)) 1983 if (ecb_expect_true (ta.prev != ta.next))
1963 { 1984 {
1964 TRANSFER (ta, 1); 1985 TRANSFER (ta, 1);
1965 return 1; 1986 return 1;
1966 } 1987 }
1967 else 1988 else
… …
2010 coro->slot->runops = RUNOPS_DEFAULT; 2031 coro->slot->runops = RUNOPS_DEFAULT;
2011 } 2032 }
2012} 2033}
2013 2034
2014static void 2035static void
2036coro_push_av (pTHX_ AV *av, I32 gimme_v)
2037{
2038 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2039 {
2040 dSP;
2041
2042 if (gimme_v == G_SCALAR)
2043 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2044 else
2045 {
2046 int i;
2047 EXTEND (SP, AvFILLp (av) + 1);
2048
2049 for (i = 0; i <= AvFILLp (av); ++i)
2050 PUSHs (AvARRAY (av)[i]);
2051 }
2052
2053 PUTBACK;
2054 }
2055}
2056
2057static void
2058coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2059{
2060 if (!coro->on_destroy)
2061 coro->on_destroy = newAV ();
2062
2063 av_push (coro->on_destroy, cb);
2064}
2065
2066static void
2067slf_destroy_join (pTHX_ struct CoroSLF *frame)
2068{
2069 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2070}
2071
2072static int
2073slf_check_join (pTHX_ struct CoroSLF *frame)
2074{
2075 struct coro *coro = (struct coro *)frame->data;
2076
2077 if (!coro->status)
2078 return 1;
2079
2080 frame->destroy = 0;
2081
2082 coro_push_av (aTHX_ coro->status, GIMME_V);
2083
2084 SvREFCNT_dec ((SV *)coro->hv);
2085
2086 return 0;
2087}
2088
2089static void
2090slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2091{
2092 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2093
2094 if (items > 1)
2095 croak ("join called with too many arguments");
2096
2097 if (coro->status)
2098 frame->prepare = prepare_nop;
2099 else
2100 {
2101 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2102 frame->prepare = prepare_schedule;
2103 }
2104
2105 frame->check = slf_check_join;
2106 frame->destroy = slf_destroy_join;
2107 frame->data = (void *)coro;
2108 SvREFCNT_inc (coro->hv);
2109}
2110
2111static void
2015coro_call_on_destroy (pTHX_ struct coro *coro) 2112coro_call_on_destroy (pTHX_ struct coro *coro)
2016{ 2113{
2017 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2114 AV *od = coro->on_destroy;
2018 2115
2019 if (on_destroyp) 2116 if (!od)
2020 { 2117 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 2118
2119 coro->on_destroy = 0;
2120 sv_2mortal ((SV *)od);
2121
2025 while (AvFILLp (on_destroy) >= 0) 2122 while (AvFILLp (od) >= 0)
2123 {
2124 SV *cb = sv_2mortal (av_pop (od));
2125
2126 /* coro hv's (and only hv's at the moment) are supported as well */
2127 if (SvSTATEhv_p (aTHX_ cb))
2128 api_ready (aTHX_ cb);
2129 else
2026 { 2130 {
2027 dSP; /* don't disturb outer sp */ 2131 dSP; /* don't disturb outer sp */
2028 SV *cb = av_pop (on_destroy);
2029
2030 PUSHMARK (SP); 2132 PUSHMARK (SP);
2031 2133
2032 if (statusp) 2134 if (coro->status)
2033 { 2135 {
2034 int i; 2136 PUTBACK;
2035 EXTEND (SP, AvFILLp (status) + 1); 2137 coro_push_av (aTHX_ coro->status, G_ARRAY);
2036 2138 SPAGAIN;
2037 for (i = 0; i <= AvFILLp (status); ++i)
2038 PUSHs (AvARRAY (status)[i]);
2039 } 2139 }
2040 2140
2041 PUTBACK; 2141 PUTBACK;
2042 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2142 call_sv (cb, G_VOID | G_DISCARD);
2043 } 2143 }
2044 } 2144 }
2045} 2145}
2046 2146
2047static void 2147static void
2048coro_set_status (HV *coro_hv, SV **arg, int items) 2148coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2049{ 2149{
2050 AV *av = newAV (); 2150 AV *av;
2151
2152 if (coro->status)
2153 {
2154 av = coro->status;
2155 av_clear (av);
2156 }
2157 else
2158 av = coro->status = newAV ();
2051 2159
2052 /* items are actually not so common, so optimise for this case */ 2160 /* items are actually not so common, so optimise for this case */
2053 if (items) 2161 if (items)
2054 { 2162 {
2055 int i; 2163 int i;
… …
2057 av_extend (av, items - 1); 2165 av_extend (av, items - 1);
2058 2166
2059 for (i = 0; i < items; ++i) 2167 for (i = 0; i < items; ++i)
2060 av_push (av, SvREFCNT_inc_NN (arg [i])); 2168 av_push (av, SvREFCNT_inc_NN (arg [i]));
2061 } 2169 }
2062
2063 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2064} 2170}
2065 2171
2066static void 2172static void
2067slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2173slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2068{ 2174{
… …
2080static void 2186static void
2081slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2187slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2082{ 2188{
2083 HV *coro_hv = (HV *)SvRV (coro_current); 2189 HV *coro_hv = (HV *)SvRV (coro_current);
2084 2190
2085 coro_set_status (coro_hv, arg, items); 2191 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2086 slf_init_terminate_cancel_common (frame, coro_hv); 2192 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2087} 2193}
2088 2194
2089static void 2195static void
2090slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2196slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2091{ 2197{
… …
2096 croak ("Coro::cancel called without coro object,"); 2202 croak ("Coro::cancel called without coro object,");
2097 2203
2098 coro = SvSTATE (arg [0]); 2204 coro = SvSTATE (arg [0]);
2099 coro_hv = coro->hv; 2205 coro_hv = coro->hv;
2100 2206
2101 coro_set_status (coro_hv, arg + 1, items - 1); 2207 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2102 2208
2103 if (expect_false (coro->flags & CF_NOCANCEL)) 2209 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2104 { 2210 {
2105 /* coro currently busy cancelling something, so just notify it */ 2211 /* coro currently busy cancelling something, so just notify it */
2106 coro->slf_frame.data = (void *)coro; 2212 coro->slf_frame.data = (void *)coro;
2107 2213
2108 frame->prepare = prepare_nop; 2214 frame->prepare = prepare_nop;
2109 frame->check = slf_check_nop; 2215 frame->check = slf_check_nop;
2110 } 2216 }
2111 else if (coro_hv == (HV *)SvRV (coro_current)) 2217 else if (coro_hv == (HV *)SvRV (coro_current))
2112 { 2218 {
2113 /* cancelling the current coro is allowed, and equals terminate */ 2219 /* cancelling the current coro is allowed, and equals terminate */
2114 slf_init_terminate_cancel_common (frame, coro_hv); 2220 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2115 } 2221 }
2116 else 2222 else
2117 { 2223 {
2118 struct coro *self = SvSTATE_current; 2224 struct coro *self = SvSTATE_current;
2119 2225
… …
2123 * this is ugly, and hopefully fully worth the extra speed. 2229 * this is ugly, and hopefully fully worth the extra speed.
2124 * besides, I can't get the slow-but-safe version working... 2230 * besides, I can't get the slow-but-safe version working...
2125 */ 2231 */
2126 slf_frame.data = 0; 2232 slf_frame.data = 0;
2127 self->flags |= CF_NOCANCEL; 2233 self->flags |= CF_NOCANCEL;
2128
2129 coro_state_destroy (aTHX_ coro); 2234 coro_state_destroy (aTHX_ coro);
2130 coro_call_on_destroy (aTHX_ coro);
2131
2132 self->flags &= ~CF_NOCANCEL; 2235 self->flags &= ~CF_NOCANCEL;
2133 2236
2134 if (slf_frame.data) 2237 if (slf_frame.data)
2135 { 2238 {
2136 /* while we were busy we have been cancelled, so terminate */ 2239 /* while we were busy we have been cancelled, so terminate */
2137 slf_init_terminate_cancel_common (frame, self->hv); 2240 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2138 } 2241 }
2139 else 2242 else
2140 { 2243 {
2141 frame->prepare = prepare_nop; 2244 frame->prepare = prepare_nop;
2142 frame->check = slf_check_nop; 2245 frame->check = slf_check_nop;
… …
2146 2249
2147static int 2250static int
2148slf_check_safe_cancel (pTHX_ struct CoroSLF *frame) 2251slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2149{ 2252{
2150 frame->prepare = 0; 2253 frame->prepare = 0;
2151 coro_unwind_stacks (); 2254 coro_unwind_stacks (aTHX);
2152 2255
2153 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current)); 2256 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2154 2257
2155 return 1; 2258 return 1;
2156} 2259}
… …
2161 if (coro->cctx) 2264 if (coro->cctx)
2162 croak ("coro inside C callback, unable to cancel at this time, caught"); 2265 croak ("coro inside C callback, unable to cancel at this time, caught");
2163 2266
2164 if (coro->flags & CF_NEW) 2267 if (coro->flags & CF_NEW)
2165 { 2268 {
2166 coro_set_status (coro->hv, arg, items); 2269 coro_set_status (aTHX_ coro, arg, items);
2167 coro_state_destroy (aTHX_ coro); 2270 coro_state_destroy (aTHX_ coro);
2168 coro_call_on_destroy (aTHX_ coro);
2169 } 2271 }
2170 else 2272 else
2171 { 2273 {
2172 if (!coro->slf_frame.prepare) 2274 if (!coro->slf_frame.prepare)
2173 croak ("coro outside an SLF function, unable to cancel at this time, caught"); 2275 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2174 2276
2175 slf_destroy (coro); 2277 slf_destroy (aTHX_ coro);
2176 2278
2177 coro_set_status (coro->hv, arg, items); 2279 coro_set_status (aTHX_ coro, arg, items);
2178 coro->slf_frame.prepare = prepare_nop; 2280 coro->slf_frame.prepare = prepare_nop;
2179 coro->slf_frame.check = slf_check_safe_cancel; 2281 coro->slf_frame.check = slf_check_safe_cancel;
2180 2282
2181 api_ready (aTHX_ coro->hv); 2283 api_ready (aTHX_ (SV *)coro->hv);
2182 } 2284 }
2183 2285
2184 return 1; 2286 return 1;
2185} 2287}
2186 2288
… …
2220slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2322slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2221{ 2323{
2222 HV *hv = (HV *)SvRV (coro_current); 2324 HV *hv = (HV *)SvRV (coro_current);
2223 struct coro *coro = SvSTATE_hv ((SV *)hv); 2325 struct coro *coro = SvSTATE_hv ((SV *)hv);
2224 2326
2225 if (expect_true (coro->saved_deffh)) 2327 if (ecb_expect_true (coro->saved_deffh))
2226 { 2328 {
2227 /* subsequent iteration */ 2329 /* subsequent iteration */
2228 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2330 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2229 coro->saved_deffh = 0; 2331 coro->saved_deffh = 0;
2230 2332
… …
2290 2392
2291static int 2393static int
2292slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2394slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2293{ 2395{
2294 SV *data = (SV *)frame->data; 2396 SV *data = (SV *)frame->data;
2295 2397
2296 if (CORO_THROW) 2398 if (CORO_THROW)
2297 return 0; 2399 return 0;
2298 2400
2299 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2401 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2300 return 1; 2402 return 1;
… …
2336 cb = sv_2mortal (coro->rouse_cb); 2438 cb = sv_2mortal (coro->rouse_cb);
2337 coro->rouse_cb = 0; 2439 coro->rouse_cb = 0;
2338 } 2440 }
2339 2441
2340 if (!SvROK (cb) 2442 if (!SvROK (cb)
2341 || SvTYPE (SvRV (cb)) != SVt_PVCV 2443 || SvTYPE (SvRV (cb)) != SVt_PVCV
2342 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2444 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2343 croak ("Coro::rouse_wait called with illegal callback argument,"); 2445 croak ("Coro::rouse_wait called with illegal callback argument,");
2344 2446
2345 { 2447 {
2346 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2448 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2471static void 2573static void
2472slf_destroy (pTHX_ struct coro *coro) 2574slf_destroy (pTHX_ struct coro *coro)
2473{ 2575{
2474 /* this callback is reserved for slf functions needing to do cleanup */ 2576 /* this callback is reserved for slf functions needing to do cleanup */
2475 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty) 2577 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2476 coro->slf_frame.destroy (aTHX_ coro); 2578 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2477 2579
2478 /* 2580 /*
2479 * The on_destroy above most likely is from an SLF call. 2581 * The on_destroy above most likely is from an SLF call.
2480 * Since by definition the SLF call will not finish when we destroy 2582 * Since by definition the SLF call will not finish when we destroy
2481 * the coro, we will have to force-finish it here, otherwise 2583 * the coro, we will have to force-finish it here, otherwise
… …
2496 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2598 I32 checkmark; /* mark SP to see how many elements check has pushed */
2497 2599
2498 /* set up the slf frame, unless it has already been set-up */ 2600 /* set up the slf frame, unless it has already been set-up */
2499 /* the latter happens when a new coro has been started */ 2601 /* the latter happens when a new coro has been started */
2500 /* or when a new cctx was attached to an existing coroutine */ 2602 /* or when a new cctx was attached to an existing coroutine */
2501 if (expect_true (!slf_frame.prepare)) 2603 if (ecb_expect_true (!slf_frame.prepare))
2502 { 2604 {
2503 /* first iteration */ 2605 /* first iteration */
2504 dSP; 2606 dSP;
2505 SV **arg = PL_stack_base + TOPMARK + 1; 2607 SV **arg = PL_stack_base + TOPMARK + 1;
2506 int items = SP - arg; /* args without function object */ 2608 int items = SP - arg; /* args without function object */
… …
2547 while (slf_frame.check (aTHX_ &slf_frame)); 2649 while (slf_frame.check (aTHX_ &slf_frame));
2548 2650
2549 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2651 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2550 2652
2551 /* exception handling */ 2653 /* exception handling */
2552 if (expect_false (CORO_THROW)) 2654 if (ecb_expect_false (CORO_THROW))
2553 { 2655 {
2554 SV *exception = sv_2mortal (CORO_THROW); 2656 SV *exception = sv_2mortal (CORO_THROW);
2555 2657
2556 CORO_THROW = 0; 2658 CORO_THROW = 0;
2557 sv_setsv (ERRSV, exception); 2659 sv_setsv (ERRSV, exception);
2558 croak (0); 2660 croak (0);
2559 } 2661 }
2560 2662
2561 /* return value handling - mostly like entersub */ 2663 /* return value handling - mostly like entersub */
2562 /* make sure we put something on the stack in scalar context */ 2664 /* make sure we put something on the stack in scalar context */
2563 if (GIMME_V == G_SCALAR) 2665 if (GIMME_V == G_SCALAR
2666 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2564 { 2667 {
2565 dSP; 2668 dSP;
2566 SV **bot = PL_stack_base + checkmark; 2669 SV **bot = PL_stack_base + checkmark;
2567 2670
2568 if (sp == bot) /* too few, push undef */ 2671 if (sp == bot) /* too few, push undef */
2569 bot [1] = &PL_sv_undef; 2672 bot [1] = &PL_sv_undef;
2570 else if (sp != bot + 1) /* too many, take last one */ 2673 else /* too many, take last one */
2571 bot [1] = *sp; 2674 bot [1] = *sp;
2572 2675
2573 SP = bot + 1; 2676 SP = bot + 1;
2574 2677
2575 PUTBACK; 2678 PUTBACK;
… …
2682{ 2785{
2683 PerlIOBuf base; 2786 PerlIOBuf base;
2684 NV next, every; 2787 NV next, every;
2685} PerlIOCede; 2788} PerlIOCede;
2686 2789
2687static IV 2790static IV ecb_cold
2688PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2791PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2689{ 2792{
2690 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2793 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2691 2794
2692 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2795 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2693 self->next = nvtime () + self->every; 2796 self->next = nvtime () + self->every;
2694 2797
2695 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2798 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2696} 2799}
2697 2800
2698static SV * 2801static SV * ecb_cold
2699PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2802PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2700{ 2803{
2701 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2804 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2702 2805
2703 return newSVnv (self->every); 2806 return newSVnv (self->every);
… …
2815 SvREFCNT_dec (cb); 2918 SvREFCNT_dec (cb);
2816 } 2919 }
2817} 2920}
2818 2921
2819static void 2922static void
2820coro_semaphore_destroy (pTHX_ struct coro *coro) 2923coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2821{ 2924{
2822 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2925 /* call $sem->adjust (0) to possibly wake up some other waiters */
2823 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2926 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2824} 2927}
2825 2928
2826static int 2929static int
2827slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2930slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2828{ 2931{
2829 AV *av = (AV *)frame->data; 2932 AV *av = (AV *)frame->data;
2830 SV *count_sv = AvARRAY (av)[0]; 2933 SV *count_sv = AvARRAY (av)[0];
2934 SV *coro_hv = SvRV (coro_current);
2831 2935
2832 /* if we are about to throw, don't actually acquire the lock, just throw */ 2936 /* if we are about to throw, don't actually acquire the lock, just throw */
2833 if (CORO_THROW) 2937 if (CORO_THROW)
2834 return 0; 2938 return 0;
2835 else if (SvIVX (count_sv) > 0) 2939 else if (SvIVX (count_sv) > 0)
… …
2847 { 2951 {
2848 int i; 2952 int i;
2849 /* if we were woken up but can't down, we look through the whole */ 2953 /* 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 */ 2954 /* waiters list and only add us if we aren't in there already */
2851 /* this avoids some degenerate memory usage cases */ 2955 /* this avoids some degenerate memory usage cases */
2852 2956 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)) 2957 if (AvARRAY (av)[i] == coro_hv)
2855 return 1; 2958 return 1;
2856 2959
2857 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2960 av_push (av, SvREFCNT_inc (coro_hv));
2858 return 1; 2961 return 1;
2859 } 2962 }
2860} 2963}
2861 2964
2862static int 2965static int
… …
3066 /* it quickly returns */ 3169 /* it quickly returns */
3067 if (CORO_THROW) 3170 if (CORO_THROW)
3068 return 0; 3171 return 0;
3069 3172
3070 /* one element that is an RV? repeat! */ 3173 /* one element that is an RV? repeat! */
3071 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3174 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3072 return 1; 3175 return 1;
3073 3176
3074 /* restore status */ 3177 /* restore status */
3075 { 3178 {
3076 SV *data_sv = av_pop (state); 3179 SV *data_sv = av_pop (state);
… …
3115 dSP; 3218 dSP;
3116 3219
3117 static SV *prio_cv; 3220 static SV *prio_cv;
3118 static SV *prio_sv; 3221 static SV *prio_sv;
3119 3222
3120 if (expect_false (!prio_cv)) 3223 if (ecb_expect_false (!prio_cv))
3121 { 3224 {
3122 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3225 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3123 prio_sv = newSViv (0); 3226 prio_sv = newSViv (0);
3124 } 3227 }
3125 3228
… …
3231 } 3334 }
3232 3335
3233 return coro_sv; 3336 return coro_sv;
3234} 3337}
3235 3338
3339#ifndef __cplusplus
3340ecb_cold XS(boot_Coro__State);
3341#endif
3342
3343#if CORO_JIT
3344
3345static void ecb_noinline ecb_cold
3346pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3347{
3348 dSP;
3349 AV *av = newAV ();
3350
3351 av_store (av, 3, newSVuv (d));
3352 av_store (av, 2, newSVuv (c));
3353 av_store (av, 1, newSVuv (b));
3354 av_store (av, 0, newSVuv (a));
3355
3356 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3357
3358 PUTBACK;
3359}
3360
3361static void ecb_noinline ecb_cold
3362jit_init (pTHX)
3363{
3364 dSP;
3365 SV *load, *save;
3366 char *map_base;
3367 char *load_ptr, *save_ptr;
3368 STRLEN load_len, save_len, map_len;
3369 int count;
3370
3371 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3372
3373 PUSHMARK (SP);
3374 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3375 #include "state.h"
3376 count = call_pv ("Coro::State::_jit", G_ARRAY);
3377 SPAGAIN;
3378
3379 save = POPs; save_ptr = SvPVbyte (save, save_len);
3380 load = POPs; load_ptr = SvPVbyte (load, load_len);
3381
3382 map_len = load_len + save_len + 16;
3383
3384 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3385
3386 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3387
3388 load_perl_slots = (load_save_perl_slots_type)map_base;
3389 memcpy (map_base, load_ptr, load_len);
3390
3391 map_base += (load_len + 15) & ~15;
3392
3393 save_perl_slots = (load_save_perl_slots_type)map_base;
3394 memcpy (map_base, save_ptr, save_len);
3395
3396 /* we are good citizens and try to make the page read-only, so the evil evil */
3397 /* hackers might have it a bit more difficult */
3398 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3399
3400 PUTBACK;
3401 eval_pv ("undef &Coro::State::_jit", 1);
3402}
3403
3404#endif
3405
3236MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3406MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3237 3407
3238PROTOTYPES: DISABLE 3408PROTOTYPES: DISABLE
3239 3409
3240BOOT: 3410BOOT:
… …
3242#ifdef USE_ITHREADS 3412#ifdef USE_ITHREADS
3243# if CORO_PTHREAD 3413# if CORO_PTHREAD
3244 coro_thx = PERL_GET_CONTEXT; 3414 coro_thx = PERL_GET_CONTEXT;
3245# endif 3415# endif
3246#endif 3416#endif
3247 BOOT_PAGESIZE; 3417 /* perl defines these to check for existance first, but why it doesn't */
3418 /* just create them one at init time is not clear to me, except for */
3419 /* programs trying to delete them, but... */
3420 /* anyway, we declare this as invalid and make sure they are initialised here */
3421 DEFSV;
3422 ERRSV;
3248 3423
3249 cctx_current = cctx_new_empty (); 3424 cctx_current = cctx_new_empty ();
3250 3425
3251 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3426 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3252 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3427 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3295 coroapi.prepare_cede_notself = prepare_cede_notself; 3470 coroapi.prepare_cede_notself = prepare_cede_notself;
3296 3471
3297 time_init (aTHX); 3472 time_init (aTHX);
3298 3473
3299 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3474 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3475#if CORO_JIT
3476 PUTBACK;
3477 jit_init (aTHX);
3478 SPAGAIN;
3479#endif
3300} 3480}
3301 3481
3302SV * 3482SV *
3303new (SV *klass, ...) 3483new (SV *klass, ...)
3304 ALIAS: 3484 ALIAS:
… …
3311void 3491void
3312transfer (...) 3492transfer (...)
3313 PROTOTYPE: $$ 3493 PROTOTYPE: $$
3314 CODE: 3494 CODE:
3315 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3495 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3316
3317void
3318_exit (int code)
3319 PROTOTYPE: $
3320 CODE:
3321 _exit (code);
3322 3496
3323SV * 3497SV *
3324clone (Coro::State coro) 3498clone (Coro::State coro)
3325 CODE: 3499 CODE:
3326{ 3500{
… …
3381void 3555void
3382list () 3556list ()
3383 PROTOTYPE: 3557 PROTOTYPE:
3384 PPCODE: 3558 PPCODE:
3385{ 3559{
3386 struct coro *coro; 3560 struct coro *coro;
3387 for (coro = coro_first; coro; coro = coro->next) 3561 for (coro = coro_first; coro; coro = coro->next)
3388 if (coro->hv) 3562 if (coro->hv)
3389 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3563 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3390} 3564}
3391 3565
… …
3446 PROTOTYPE: $ 3620 PROTOTYPE: $
3447 ALIAS: 3621 ALIAS:
3448 is_ready = CF_READY 3622 is_ready = CF_READY
3449 is_running = CF_RUNNING 3623 is_running = CF_RUNNING
3450 is_new = CF_NEW 3624 is_new = CF_NEW
3451 is_destroyed = CF_DESTROYED 3625 is_destroyed = CF_ZOMBIE
3626 is_zombie = CF_ZOMBIE
3452 is_suspended = CF_SUSPENDED 3627 is_suspended = CF_SUSPENDED
3453 CODE: 3628 CODE:
3454 RETVAL = boolSV (coro->flags & ix); 3629 RETVAL = boolSV (coro->flags & ix);
3455 OUTPUT: 3630 OUTPUT:
3456 RETVAL 3631 RETVAL
3457 3632
3458void 3633void
3459throw (Coro::State self, SV *exception = &PL_sv_undef) 3634throw (SV *self, SV *exception = &PL_sv_undef)
3460 PROTOTYPE: $;$ 3635 PROTOTYPE: $;$
3461 CODE: 3636 CODE:
3462{ 3637{
3638 struct coro *coro = SvSTATE (self);
3463 struct coro *current = SvSTATE_current; 3639 struct coro *current = SvSTATE_current;
3464 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3640 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3465 SvREFCNT_dec (*exceptionp); 3641 SvREFCNT_dec (*exceptionp);
3466 SvGETMAGIC (exception); 3642 SvGETMAGIC (exception);
3467 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3643 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3644
3645 api_ready (aTHX_ self);
3468} 3646}
3469 3647
3470void 3648void
3471api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3649api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3472 PROTOTYPE: $;$ 3650 PROTOTYPE: $;$
… …
3549 3727
3550void 3728void
3551times (Coro::State self) 3729times (Coro::State self)
3552 PPCODE: 3730 PPCODE:
3553{ 3731{
3554 struct coro *current = SvSTATE (coro_current); 3732 struct coro *current = SvSTATE (coro_current);
3555 3733
3556 if (expect_false (current == self)) 3734 if (ecb_expect_false (current == self))
3557 { 3735 {
3558 coro_times_update (); 3736 coro_times_update ();
3559 coro_times_add (SvSTATE (coro_current)); 3737 coro_times_add (SvSTATE (coro_current));
3560 } 3738 }
3561 3739
3562 EXTEND (SP, 2); 3740 EXTEND (SP, 2);
3563 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3741 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))); 3742 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3565 3743
3566 if (expect_false (current == self)) 3744 if (ecb_expect_false (current == self))
3567 coro_times_sub (SvSTATE (coro_current)); 3745 coro_times_sub (SvSTATE (coro_current));
3568} 3746}
3569 3747
3570void 3748void
3571swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3749swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3602 3780
3603 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3781 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); 3782 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); 3783 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 */ 3784 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3607 3785
3608 coro_stash = gv_stashpv ("Coro", TRUE); 3786 coro_stash = gv_stashpv ("Coro", TRUE);
3609 3787
3610 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3788 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3611 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3789 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3612 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3790 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3644void 3822void
3645_destroy (Coro::State coro) 3823_destroy (Coro::State coro)
3646 CODE: 3824 CODE:
3647 /* used by the manager thread */ 3825 /* used by the manager thread */
3648 coro_state_destroy (aTHX_ coro); 3826 coro_state_destroy (aTHX_ coro);
3827
3828void
3829on_destroy (Coro::State coro, SV *cb)
3830 CODE:
3649 coro_call_on_destroy (aTHX_ coro); 3831 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3832
3833void
3834join (...)
3835 CODE:
3836 CORO_EXECUTE_SLF_XS (slf_init_join);
3650 3837
3651void 3838void
3652terminate (...) 3839terminate (...)
3653 CODE: 3840 CODE:
3654 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3841 CORO_EXECUTE_SLF_XS (slf_init_terminate);
… …
3825 on_leave = 1 4012 on_leave = 1
3826 PROTOTYPE: & 4013 PROTOTYPE: &
3827 CODE: 4014 CODE:
3828{ 4015{
3829 struct coro *coro = SvSTATE_current; 4016 struct coro *coro = SvSTATE_current;
3830 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4017 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3831 4018
3832 block = s_get_cv_croak (block); 4019 block = s_get_cv_croak (block);
3833 4020
3834 if (!*avp) 4021 if (!*avp)
3835 *avp = newAV (); 4022 *avp = newAV ();
… …
3855 4042
3856SV * 4043SV *
3857new (SV *klass, SV *count = 0) 4044new (SV *klass, SV *count = 0)
3858 CODE: 4045 CODE:
3859{ 4046{
3860 int semcnt = 1; 4047 int semcnt = 1;
3861 4048
3862 if (count) 4049 if (count)
3863 { 4050 {
3864 SvGETMAGIC (count); 4051 SvGETMAGIC (count);
3865 4052
… …
3925 XSRETURN_NO; 4112 XSRETURN_NO;
3926} 4113}
3927 4114
3928void 4115void
3929waiters (SV *self) 4116waiters (SV *self)
3930 PPCODE: 4117 PPCODE:
3931{ 4118{
3932 AV *av = (AV *)SvRV (self); 4119 AV *av = (AV *)SvRV (self);
3933 int wcount = AvFILLp (av) + 1 - 1; 4120 int wcount = AvFILLp (av) + 1 - 1;
3934 4121
3935 if (GIMME_V == G_SCALAR) 4122 if (GIMME_V == G_SCALAR)
… …
3944} 4131}
3945 4132
3946MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4133MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3947 4134
3948void 4135void
3949_may_delete (SV *sem, int count, int extra_refs) 4136_may_delete (SV *sem, int count, unsigned int extra_refs)
3950 PPCODE: 4137 PPCODE:
3951{ 4138{
3952 AV *av = (AV *)SvRV (sem); 4139 AV *av = (AV *)SvRV (sem);
3953 4140
3954 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4141 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3955 && AvFILLp (av) == 0 /* no waiters, just count */ 4142 && AvFILLp (av) == 0 /* no waiters, just count */
3956 && SvIV (AvARRAY (av)[0]) == count) 4143 && SvIV (AvARRAY (av)[0]) == count)
3957 XSRETURN_YES; 4144 XSRETURN_YES;
… …
3978 4165
3979void 4166void
3980broadcast (SV *self) 4167broadcast (SV *self)
3981 CODE: 4168 CODE:
3982{ 4169{
3983 AV *av = (AV *)SvRV (self); 4170 AV *av = (AV *)SvRV (self);
3984 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4171 coro_signal_wake (aTHX_ av, AvFILLp (av));
3985} 4172}
3986 4173
3987void 4174void
3988send (SV *self) 4175send (SV *self)
… …
3996 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4183 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3997} 4184}
3998 4185
3999IV 4186IV
4000awaited (SV *self) 4187awaited (SV *self)
4001 CODE: 4188 CODE:
4002 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4189 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4003 OUTPUT: 4190 OUTPUT:
4004 RETVAL 4191 RETVAL
4005 4192
4006 4193
… …
4011 4198
4012void 4199void
4013_schedule (...) 4200_schedule (...)
4014 CODE: 4201 CODE:
4015{ 4202{
4016 static int incede; 4203 static int incede;
4017 4204
4018 api_cede_notself (aTHX); 4205 api_cede_notself (aTHX);
4019 4206
4020 ++incede; 4207 ++incede;
4021 while (coro_nready >= incede && api_cede (aTHX)) 4208 while (coro_nready >= incede && api_cede (aTHX))
… …
4065 { 4252 {
4066 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4253 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4067 coro_old_pp_sselect = 0; 4254 coro_old_pp_sselect = 0;
4068 } 4255 }
4069 4256
4257MODULE = Coro::State PACKAGE = Coro::Util
4258
4259void
4260_exit (int code)
4261 CODE:
4262 _exit (code);
4263
4264NV
4265time ()
4266 CODE:
4267 RETVAL = nvtime (aTHX);
4268 OUTPUT:
4269 RETVAL
4270
4271NV
4272gettimeofday ()
4273 PPCODE:
4274{
4275 UV tv [2];
4276 u2time (aTHX_ tv);
4277 EXTEND (SP, 2);
4278 PUSHs (sv_2mortal (newSVuv (tv [0])));
4279 PUSHs (sv_2mortal (newSVuv (tv [1])));
4280}
4281

Diff Legend

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