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.389 by root, Fri Mar 4 16:41:21 2011 UTC vs.
Revision 1.416 by root, Mon Dec 12 15:19:56 2011 UTC

… …
12#include "perl.h" 12#include "perl.h"
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#include "ecb.h"
17 18
19#include <stddef.h>
18#include <stdio.h> 20#include <stdio.h>
19#include <errno.h> 21#include <errno.h>
20#include <assert.h> 22#include <assert.h>
21 23
22#ifndef SVs_PADSTALE 24#ifndef SVs_PADSTALE
… …
31# define setjmp _setjmp /* deep magic */ 33# define setjmp _setjmp /* deep magic */
32#else 34#else
33# include <inttypes.h> /* most portable stdint.h */ 35# include <inttypes.h> /* most portable stdint.h */
34#endif 36#endif
35 37
36#ifdef HAVE_MMAP 38#if HAVE_MMAP
37# include <unistd.h> 39# include <unistd.h>
38# include <sys/mman.h> 40# include <sys/mman.h>
39# ifndef MAP_ANONYMOUS 41# ifndef MAP_ANONYMOUS
40# ifdef MAP_ANON 42# ifdef MAP_ANON
41# define MAP_ANONYMOUS MAP_ANON 43# define MAP_ANONYMOUS MAP_ANON
… …
61#endif 63#endif
62 64
63/* the maximum number of idle cctx that will be pooled */ 65/* the maximum number of idle cctx that will be pooled */
64static int cctx_max_idle = 4; 66static int cctx_max_idle = 4;
65 67
68#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# define HAS_SCOPESTACK_NAME 1
70#endif
71
66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 72#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
67# undef CORO_STACKGUARD 73# undef CORO_STACKGUARD
68#endif 74#endif
69 75
70#ifndef CORO_STACKGUARD 76#ifndef CORO_STACKGUARD
… …
86# define STACKLEVEL ((void *)&stacklevel) 92# define STACKLEVEL ((void *)&stacklevel)
87#endif 93#endif
88 94
89#define IN_DESTRUCT PL_dirty 95#define IN_DESTRUCT PL_dirty
90 96
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" 97#include "CoroAPI.h"
107#define GCoroAPI (&coroapi) /* very sneaky */ 98#define GCoroAPI (&coroapi) /* very sneaky */
108 99
109#ifdef USE_ITHREADS 100#ifdef USE_ITHREADS
110# if CORO_PTHREAD 101# if CORO_PTHREAD
111static void *coro_thx; 102static void *coro_thx;
112# endif 103# endif
113#endif 104#endif
105
106/* used in state.h */
107#define VAR(name,type) VARx(name, PL_ ## name, type)
114 108
115#ifdef __linux 109#ifdef __linux
116# include <time.h> /* for timespec */ 110# include <time.h> /* for timespec */
117# include <syscall.h> /* for SYS_* */ 111# include <syscall.h> /* for SYS_* */
118# ifdef SYS_clock_gettime 112# ifdef SYS_clock_gettime
… …
126static void (*u2time)(pTHX_ UV ret[2]); 120static void (*u2time)(pTHX_ UV ret[2]);
127 121
128/* we hijack an hopefully unused CV flag for our purposes */ 122/* we hijack an hopefully unused CV flag for our purposes */
129#define CVf_SLF 0x4000 123#define CVf_SLF 0x4000
130static OP *pp_slf (pTHX); 124static OP *pp_slf (pTHX);
125static void slf_destroy (pTHX_ struct coro *coro);
131 126
132static U32 cctx_gen; 127static U32 cctx_gen;
133static size_t cctx_stacksize = CORO_STACKSIZE; 128static size_t cctx_stacksize = CORO_STACKSIZE;
134static struct CoroAPI coroapi; 129static struct CoroAPI coroapi;
135static AV *main_mainstack; /* used to differentiate between $main and others */ 130static AV *main_mainstack; /* used to differentiate between $main and others */
… …
165static char times_valid; 160static char times_valid;
166 161
167static struct coro_cctx *cctx_first; 162static struct coro_cctx *cctx_first;
168static int cctx_count, cctx_idle; 163static int cctx_count, cctx_idle;
169 164
170enum { 165enum
166{
171 CC_MAPPED = 0x01, 167 CC_MAPPED = 0x01,
172 CC_NOREUSE = 0x02, /* throw this away after tracing */ 168 CC_NOREUSE = 0x02, /* throw this away after tracing */
173 CC_TRACE = 0x04, 169 CC_TRACE = 0x04,
174 CC_TRACE_SUB = 0x08, /* trace sub calls */ 170 CC_TRACE_SUB = 0x08, /* trace sub calls */
175 CC_TRACE_LINE = 0x10, /* trace each statement */ 171 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
185 void *sptr; 181 void *sptr;
186 size_t ssize; 182 size_t ssize;
187 183
188 /* cpu state */ 184 /* cpu state */
189 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
186#ifndef NDEBUG
190 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 187 JMPENV *idle_te; /* same as idle_sp, but for top_env */
188#endif
191 JMPENV *top_env; 189 JMPENV *top_env;
192 coro_context cctx; 190 coro_context cctx;
193 191
194 U32 gen; 192 U32 gen;
195#if CORO_USE_VALGRIND 193#if CORO_USE_VALGRIND
196 int valgrind_id; 194 int valgrind_id;
197#endif 195#endif
198 unsigned char flags; 196 unsigned char flags;
199} coro_cctx; 197} coro_cctx;
200 198
201coro_cctx *cctx_current; /* the currently running cctx */ 199static coro_cctx *cctx_current; /* the currently running cctx */
202 200
203/*****************************************************************************/ 201/*****************************************************************************/
204 202
203static MGVTBL coro_state_vtbl;
204
205enum { 205enum
206{
206 CF_RUNNING = 0x0001, /* coroutine is running */ 207 CF_RUNNING = 0x0001, /* coroutine is running */
207 CF_READY = 0x0002, /* coroutine is ready */ 208 CF_READY = 0x0002, /* coroutine is ready */
208 CF_NEW = 0x0004, /* has never been switched to */ 209 CF_NEW = 0x0004, /* has never been switched to */
209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 210 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
211}; 213};
212 214
213/* the structure where most of the perl state is stored, overlaid on the cxstack */ 215/* the structure where most of the perl state is stored, overlaid on the cxstack */
214typedef struct 216typedef struct
215{ 217{
216 SV *defsv;
217 AV *defav;
218 SV *errsv;
219 SV *irsgv;
220 HV *hinthv;
221#define VAR(name,type) type name; 218#define VARx(name,expr,type) type name;
222# include "state.h" 219# include "state.h"
223#undef VAR 220#undef VARx
224} perl_slots; 221} perl_slots;
225 222
223/* how many context stack entries do we need for perl_slots */
226#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 224#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
227 225
228/* this is a structure representing a perl-level coroutine */ 226/* this is a structure representing a perl-level coroutine */
229struct coro { 227struct coro
228{
230 /* the C coroutine allocated to this perl coroutine, if any */ 229 /* the C coroutine allocated to this perl coroutine, if any */
231 coro_cctx *cctx; 230 coro_cctx *cctx;
232 231
233 /* ready queue */ 232 /* ready queue */
234 struct coro *next_ready; 233 struct coro *next_ready;
… …
236 /* state data */ 235 /* state data */
237 struct CoroSLF slf_frame; /* saved slf frame */ 236 struct CoroSLF slf_frame; /* saved slf frame */
238 AV *mainstack; 237 AV *mainstack;
239 perl_slots *slot; /* basically the saved sp */ 238 perl_slots *slot; /* basically the saved sp */
240 239
241 CV *startcv; /* the CV to execute */ 240 CV *startcv; /* the CV to execute */
242 AV *args; /* data associated with this coroutine (initial args) */ 241 AV *args; /* data associated with this coroutine (initial args) */
243 int refcnt; /* coroutines are refcounted, yes */
244 int flags; /* CF_ flags */ 242 int flags; /* CF_ flags */
245 HV *hv; /* the perl hash associated with this coro, if any */ 243 HV *hv; /* the perl hash associated with this coro, if any */
246 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
247 244
248 /* statistics */ 245 /* statistics */
249 int usecount; /* number of transfers to this coro */ 246 int usecount; /* number of transfers to this coro */
250 247
251 /* coro process data */ 248 /* coro process data */
252 int prio; 249 int prio;
253 SV *except; /* exception to be thrown */ 250 SV *except; /* exception to be thrown */
254 SV *rouse_cb; 251 SV *rouse_cb; /* last rouse callback */
252 AV *on_destroy; /* callbacks or coros to notify on destroy */
253 AV *status; /* the exit status list */
255 254
256 /* async_pool */ 255 /* async_pool */
257 SV *saved_deffh; 256 SV *saved_deffh;
258 SV *invoke_cb; 257 SV *invoke_cb;
259 AV *invoke_av; 258 AV *invoke_av;
… …
275typedef struct coro *Coro__State; 274typedef struct coro *Coro__State;
276typedef struct coro *Coro__State_or_hashref; 275typedef struct coro *Coro__State_or_hashref;
277 276
278/* the following variables are effectively part of the perl context */ 277/* the following variables are effectively part of the perl context */
279/* and get copied between struct coro and these variables */ 278/* and get copied between struct coro and these variables */
280/* the mainr easonw e don't support windows process emulation */ 279/* the main reason we don't support windows process emulation */
281static struct CoroSLF slf_frame; /* the current slf frame */ 280static struct CoroSLF slf_frame; /* the current slf frame */
282 281
283/** Coro ********************************************************************/ 282/** Coro ********************************************************************/
284 283
285#define CORO_PRIO_MAX 3 284#define CORO_PRIO_MAX 3
… …
291 290
292/* for Coro.pm */ 291/* for Coro.pm */
293static SV *coro_current; 292static SV *coro_current;
294static SV *coro_readyhook; 293static SV *coro_readyhook;
295static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
296static CV *cv_coro_run, *cv_coro_terminate; 295static CV *cv_coro_run;
297static struct coro *coro_first; 296static struct coro *coro_first;
298#define coro_nready coroapi.nready 297#define coro_nready coroapi.nready
298
299/** JIT *********************************************************************/
300
301#if CORO_JIT
302 /* APPLE doesn't have HAVE_MMAP though */
303 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
304 #ifndef CORO_JIT_TYPE
305 #if __x86_64 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "amd64-unix"
307 #elif __i386 && CORO_JIT_UNIXY
308 #define CORO_JIT_TYPE "x86-unix"
309 #endif
310 #endif
311#endif
312
313#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP
314 #undef CORO_JIT
315#endif
316
317#if CORO_JIT
318 typedef void (*load_save_perl_slots_type)(perl_slots *);
319 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
320#endif
299 321
300/** Coro::Select ************************************************************/ 322/** Coro::Select ************************************************************/
301 323
302static OP *(*coro_old_pp_sselect) (pTHX); 324static OP *(*coro_old_pp_sselect) (pTHX);
303static SV *coro_select_select; 325static SV *coro_select_select;
… …
319 341
320/** time stuff **************************************************************/ 342/** time stuff **************************************************************/
321 343
322#ifdef HAS_GETTIMEOFDAY 344#ifdef HAS_GETTIMEOFDAY
323 345
324static void 346ecb_inline void
325coro_u2time (pTHX_ UV ret[2]) 347coro_u2time (pTHX_ UV ret[2])
326{ 348{
327 struct timeval tv; 349 struct timeval tv;
328 gettimeofday (&tv, 0); 350 gettimeofday (&tv, 0);
329 351
330 ret [0] = tv.tv_sec; 352 ret [0] = tv.tv_sec;
331 ret [1] = tv.tv_usec; 353 ret [1] = tv.tv_usec;
332} 354}
333 355
334static double 356ecb_inline double
335coro_nvtime () 357coro_nvtime (void)
336{ 358{
337 struct timeval tv; 359 struct timeval tv;
338 gettimeofday (&tv, 0); 360 gettimeofday (&tv, 0);
339 361
340 return tv.tv_sec + tv.tv_usec * 1e-6; 362 return tv.tv_sec + tv.tv_usec * 1e-6;
341} 363}
342 364
343static void 365ecb_inline void
344time_init (pTHX) 366time_init (pTHX)
345{ 367{
346 nvtime = coro_nvtime; 368 nvtime = coro_nvtime;
347 u2time = coro_u2time; 369 u2time = coro_u2time;
348} 370}
349 371
350#else 372#else
351 373
352static void 374ecb_inline void
353time_init (pTHX) 375time_init (pTHX)
354{ 376{
355 SV **svp; 377 SV **svp;
356 378
357 require_pv ("Time/HiRes.pm"); 379 require_pv ("Time/HiRes.pm");
358 380
359 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 381 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
360 382
361 if (!svp) croak ("Time::HiRes is required, but missing."); 383 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
362 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 384 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
363 385
364 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 386 nvtime = INT2PTR (double (*)(), SvIV (*svp));
365 387
366 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0); 388 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
367 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp)); 389 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
… …
369 391
370#endif 392#endif
371 393
372/** lowlevel stuff **********************************************************/ 394/** lowlevel stuff **********************************************************/
373 395
374static SV * 396static SV * ecb_noinline
375coro_get_sv (pTHX_ const char *name, int create) 397coro_get_sv (pTHX_ const char *name, int create)
376{ 398{
377#if PERL_VERSION_ATLEAST (5,10,0) 399#if PERL_VERSION_ATLEAST (5,10,0)
378 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 400 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
379 get_sv (name, create); 401 get_sv (name, create);
380#endif 402#endif
381 return get_sv (name, create); 403 return get_sv (name, create);
382} 404}
383 405
384static AV * 406static AV * ecb_noinline
385coro_get_av (pTHX_ const char *name, int create) 407coro_get_av (pTHX_ const char *name, int create)
386{ 408{
387#if PERL_VERSION_ATLEAST (5,10,0) 409#if PERL_VERSION_ATLEAST (5,10,0)
388 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 410 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
389 get_av (name, create); 411 get_av (name, create);
390#endif 412#endif
391 return get_av (name, create); 413 return get_av (name, create);
392} 414}
393 415
394static HV * 416static HV * ecb_noinline
395coro_get_hv (pTHX_ const char *name, int create) 417coro_get_hv (pTHX_ const char *name, int create)
396{ 418{
397#if PERL_VERSION_ATLEAST (5,10,0) 419#if PERL_VERSION_ATLEAST (5,10,0)
398 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 420 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
399 get_hv (name, create); 421 get_hv (name, create);
400#endif 422#endif
401 return get_hv (name, create); 423 return get_hv (name, create);
402} 424}
403 425
404INLINE void 426ecb_inline void
405coro_times_update () 427coro_times_update (void)
406{ 428{
407#ifdef coro_clock_gettime 429#ifdef coro_clock_gettime
408 struct timespec ts; 430 struct timespec ts;
409 431
410 ts.tv_sec = ts.tv_nsec = 0; 432 ts.tv_sec = ts.tv_nsec = 0;
… …
422 time_real [0] = tv [0]; 444 time_real [0] = tv [0];
423 time_real [1] = tv [1] * 1000; 445 time_real [1] = tv [1] * 1000;
424#endif 446#endif
425} 447}
426 448
427INLINE void 449ecb_inline void
428coro_times_add (struct coro *c) 450coro_times_add (struct coro *c)
429{ 451{
430 c->t_real [1] += time_real [1]; 452 c->t_real [1] += time_real [1];
431 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 453 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
432 c->t_real [0] += time_real [0]; 454 c->t_real [0] += time_real [0];
… …
434 c->t_cpu [1] += time_cpu [1]; 456 c->t_cpu [1] += time_cpu [1];
435 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 457 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
436 c->t_cpu [0] += time_cpu [0]; 458 c->t_cpu [0] += time_cpu [0];
437} 459}
438 460
439INLINE void 461ecb_inline void
440coro_times_sub (struct coro *c) 462coro_times_sub (struct coro *c)
441{ 463{
442 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 464 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
443 c->t_real [1] -= time_real [1]; 465 c->t_real [1] -= time_real [1];
444 c->t_real [0] -= time_real [0]; 466 c->t_real [0] -= time_real [0];
… …
452/* magic glue */ 474/* magic glue */
453 475
454#define CORO_MAGIC_type_cv 26 476#define CORO_MAGIC_type_cv 26
455#define CORO_MAGIC_type_state PERL_MAGIC_ext 477#define CORO_MAGIC_type_state PERL_MAGIC_ext
456 478
457#define CORO_MAGIC_NN(sv, type) \ 479#define CORO_MAGIC_NN(sv, type) \
458 (expect_true (SvMAGIC (sv)->mg_type == type) \ 480 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
459 ? SvMAGIC (sv) \ 481 ? SvMAGIC (sv) \
460 : mg_find (sv, type)) 482 : mg_find (sv, type))
461 483
462#define CORO_MAGIC(sv, type) \ 484#define CORO_MAGIC(sv, type) \
463 (expect_true (SvMAGIC (sv)) \ 485 (ecb_expect_true (SvMAGIC (sv)) \
464 ? CORO_MAGIC_NN (sv, type) \ 486 ? CORO_MAGIC_NN (sv, type) \
465 : 0) 487 : 0)
466 488
467#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 489#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
468#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 490#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
469 491
470INLINE struct coro * 492ecb_inline MAGIC *
493SvSTATEhv_p (pTHX_ SV *coro)
494{
495 MAGIC *mg;
496
497 if (ecb_expect_true (
498 SvTYPE (coro) == SVt_PVHV
499 && (mg = CORO_MAGIC_state (coro))
500 && mg->mg_virtual == &coro_state_vtbl
501 ))
502 return mg;
503
504 return 0;
505}
506
507ecb_inline struct coro *
471SvSTATE_ (pTHX_ SV *coro) 508SvSTATE_ (pTHX_ SV *coro)
472{ 509{
473 HV *stash;
474 MAGIC *mg; 510 MAGIC *mg;
475 511
476 if (SvROK (coro)) 512 if (SvROK (coro))
477 coro = SvRV (coro); 513 coro = SvRV (coro);
478 514
479 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 515 mg = SvSTATEhv_p (aTHX_ coro);
516 if (!mg)
480 croak ("Coro::State object required"); 517 croak ("Coro::State object required");
481 518
482 stash = SvSTASH (coro);
483 if (expect_false (stash != coro_stash && stash != coro_state_stash))
484 {
485 /* very slow, but rare, check */
486 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
487 croak ("Coro::State object required");
488 }
489
490 mg = CORO_MAGIC_state (coro);
491 return (struct coro *)mg->mg_ptr; 519 return (struct coro *)mg->mg_ptr;
492} 520}
493 521
494#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 522#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
495 523
… …
498#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 526#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
499 527
500/*****************************************************************************/ 528/*****************************************************************************/
501/* padlist management and caching */ 529/* padlist management and caching */
502 530
503static AV * 531ecb_inline AV *
504coro_derive_padlist (pTHX_ CV *cv) 532coro_derive_padlist (pTHX_ CV *cv)
505{ 533{
506 AV *padlist = CvPADLIST (cv); 534 AV *padlist = CvPADLIST (cv);
507 AV *newpadlist, *newpad; 535 AV *newpadlist, *newpad;
508 536
… …
520 av_store (newpadlist, 1, (SV *)newpad); 548 av_store (newpadlist, 1, (SV *)newpad);
521 549
522 return newpadlist; 550 return newpadlist;
523} 551}
524 552
525static void 553ecb_inline void
526free_padlist (pTHX_ AV *padlist) 554free_padlist (pTHX_ AV *padlist)
527{ 555{
528 /* may be during global destruction */ 556 /* may be during global destruction */
529 if (!IN_DESTRUCT) 557 if (!IN_DESTRUCT)
530 { 558 {
… …
573 0, 0, 0, 0, 601 0, 0, 0, 0,
574 coro_cv_free 602 coro_cv_free
575}; 603};
576 604
577/* the next two functions merely cache the padlists */ 605/* the next two functions merely cache the padlists */
578static void 606ecb_inline void
579get_padlist (pTHX_ CV *cv) 607get_padlist (pTHX_ CV *cv)
580{ 608{
581 MAGIC *mg = CORO_MAGIC_cv (cv); 609 MAGIC *mg = CORO_MAGIC_cv (cv);
582 AV *av; 610 AV *av;
583 611
584 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 612 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
585 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 613 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
586 else 614 else
587 { 615 {
588#if CORO_PREFER_PERL_FUNCTIONS 616#if CORO_PREFER_PERL_FUNCTIONS
589 /* this is probably cleaner? but also slower! */ 617 /* this is probably cleaner? but also slower! */
… …
596 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 624 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
597#endif 625#endif
598 } 626 }
599} 627}
600 628
601static void 629ecb_inline void
602put_padlist (pTHX_ CV *cv) 630put_padlist (pTHX_ CV *cv)
603{ 631{
604 MAGIC *mg = CORO_MAGIC_cv (cv); 632 MAGIC *mg = CORO_MAGIC_cv (cv);
605 AV *av; 633 AV *av;
606 634
607 if (expect_false (!mg)) 635 if (ecb_expect_false (!mg))
608 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 636 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
609 637
610 av = (AV *)mg->mg_obj; 638 av = (AV *)mg->mg_obj;
611 639
612 if (expect_false (AvFILLp (av) >= AvMAX (av))) 640 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
613 av_extend (av, AvFILLp (av) + 1); 641 av_extend (av, AvFILLp (av) + 1);
614 642
615 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 643 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
616} 644}
617 645
618/** load & save, init *******************************************************/ 646/** load & save, init *******************************************************/
619 647
648ecb_inline void
649swap_sv (SV *a, SV *b)
650{
651 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
652 SV tmp;
653
654 /* swap sv_any */
655 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
656
657 /* swap sv_flags */
658 SvFLAGS (&tmp) = SvFLAGS (a);
659 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
660 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
661
662#if PERL_VERSION_ATLEAST (5,10,0)
663 /* perl 5.10 and later complicates this _quite_ a bit, but it also
664 * is much faster, so no quarrels here. alternatively, we could
665 * sv_upgrade to avoid this.
666 */
667 {
668 /* swap sv_u */
669 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
670
671 /* if SvANY points to the head, we need to adjust the pointers,
672 * as the pointer for a still points to b, and maybe vice versa.
673 */
674 #define svany_in_head(type) \
675 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
676
677 if (svany_in_head (SvTYPE (a)))
678 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
679
680 if (svany_in_head (SvTYPE (b)))
681 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
682 }
683#endif
684}
685
620/* swap sv heads, at least logically */ 686/* swap sv heads, at least logically */
621static void 687static void
622swap_svs (pTHX_ Coro__State c) 688swap_svs (pTHX_ Coro__State c)
623{ 689{
624 int i; 690 int i;
625 691
626 for (i = 0; i <= AvFILLp (c->swap_sv); ) 692 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
627 { 693 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
628 SV *a = AvARRAY (c->swap_sv)[i++];
629 SV *b = AvARRAY (c->swap_sv)[i++];
630
631 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
632 SV tmp;
633
634 /* swap sv_any */
635 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
636
637 /* swap sv_flags */
638 SvFLAGS (&tmp) = SvFLAGS (a);
639 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
640 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
641
642#if PERL_VERSION_ATLEAST (5,10,0)
643 /* perl 5.10 complicates this _quite_ a bit, but it also is
644 * much faster, so no quarrels here. alternatively, we could
645 * sv_upgrade to avoid this.
646 */
647 {
648 /* swap sv_u */
649 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
650
651 /* if SvANY points to the head, we need to adjust the pointers,
652 * as the pointer for a still points to b, and maybe vice versa.
653 */
654 #define svany_in_head(type) \
655 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
656
657 if (svany_in_head (SvTYPE (a)))
658 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
659
660 if (svany_in_head (SvTYPE (b)))
661 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
662 }
663#endif
664 }
665} 694}
666 695
667#define SWAP_SVS(coro) \ 696#define SWAP_SVS(coro) \
668 if (expect_false ((coro)->swap_sv)) \ 697 if (ecb_expect_false ((coro)->swap_sv)) \
669 swap_svs (aTHX_ (coro)) 698 swap_svs (aTHX_ (coro))
670 699
671static void 700static void
672on_enterleave_call (pTHX_ SV *cb); 701on_enterleave_call (pTHX_ SV *cb);
673 702
… …
677 perl_slots *slot = c->slot; 706 perl_slots *slot = c->slot;
678 c->slot = 0; 707 c->slot = 0;
679 708
680 PL_mainstack = c->mainstack; 709 PL_mainstack = c->mainstack;
681 710
682 GvSV (PL_defgv) = slot->defsv; 711#if CORO_JIT
683 GvAV (PL_defgv) = slot->defav; 712 load_perl_slots (slot);
684 GvSV (PL_errgv) = slot->errsv; 713#else
685 GvSV (irsgv) = slot->irsgv;
686 GvHV (PL_hintgv) = slot->hinthv;
687
688 #define VAR(name,type) PL_ ## name = slot->name; 714 #define VARx(name,expr,type) expr = slot->name;
689 # include "state.h" 715 # include "state.h"
690 #undef VAR 716 #undef VARx
717#endif
691 718
692 { 719 {
693 dSP; 720 dSP;
694 721
695 CV *cv; 722 CV *cv;
696 723
697 /* now do the ugly restore mess */ 724 /* now do the ugly restore mess */
698 while (expect_true (cv = (CV *)POPs)) 725 while (ecb_expect_true (cv = (CV *)POPs))
699 { 726 {
700 put_padlist (aTHX_ cv); /* mark this padlist as available */ 727 put_padlist (aTHX_ cv); /* mark this padlist as available */
701 CvDEPTH (cv) = PTR2IV (POPs); 728 CvDEPTH (cv) = PTR2IV (POPs);
702 CvPADLIST (cv) = (AV *)POPs; 729 CvPADLIST (cv) = (AV *)POPs;
703 } 730 }
… …
706 } 733 }
707 734
708 slf_frame = c->slf_frame; 735 slf_frame = c->slf_frame;
709 CORO_THROW = c->except; 736 CORO_THROW = c->except;
710 737
711 if (expect_false (enable_times)) 738 if (ecb_expect_false (enable_times))
712 { 739 {
713 if (expect_false (!times_valid)) 740 if (ecb_expect_false (!times_valid))
714 coro_times_update (); 741 coro_times_update ();
715 742
716 coro_times_sub (c); 743 coro_times_sub (c);
717 } 744 }
718 745
719 if (expect_false (c->on_enter)) 746 if (ecb_expect_false (c->on_enter))
720 { 747 {
721 int i; 748 int i;
722 749
723 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 750 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
724 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 751 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
730static void 757static void
731save_perl (pTHX_ Coro__State c) 758save_perl (pTHX_ Coro__State c)
732{ 759{
733 SWAP_SVS (c); 760 SWAP_SVS (c);
734 761
735 if (expect_false (c->on_leave)) 762 if (ecb_expect_false (c->on_leave))
736 { 763 {
737 int i; 764 int i;
738 765
739 for (i = AvFILLp (c->on_leave); i >= 0; --i) 766 for (i = AvFILLp (c->on_leave); i >= 0; --i)
740 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 767 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
741 } 768 }
742 769
743 times_valid = 0; 770 times_valid = 0;
744 771
745 if (expect_false (enable_times)) 772 if (ecb_expect_false (enable_times))
746 { 773 {
747 coro_times_update (); times_valid = 1; 774 coro_times_update (); times_valid = 1;
748 coro_times_add (c); 775 coro_times_add (c);
749 } 776 }
750 777
… …
764 791
765 XPUSHs (Nullsv); 792 XPUSHs (Nullsv);
766 /* this loop was inspired by pp_caller */ 793 /* this loop was inspired by pp_caller */
767 for (;;) 794 for (;;)
768 { 795 {
769 while (expect_true (cxix >= 0)) 796 while (ecb_expect_true (cxix >= 0))
770 { 797 {
771 PERL_CONTEXT *cx = &ccstk[cxix--]; 798 PERL_CONTEXT *cx = &ccstk[cxix--];
772 799
773 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 800 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
774 { 801 {
775 CV *cv = cx->blk_sub.cv; 802 CV *cv = cx->blk_sub.cv;
776 803
777 if (expect_true (CvDEPTH (cv))) 804 if (ecb_expect_true (CvDEPTH (cv)))
778 { 805 {
779 EXTEND (SP, 3); 806 EXTEND (SP, 3);
780 PUSHs ((SV *)CvPADLIST (cv)); 807 PUSHs ((SV *)CvPADLIST (cv));
781 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 808 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
782 PUSHs ((SV *)cv); 809 PUSHs ((SV *)cv);
… …
785 get_padlist (aTHX_ cv); 812 get_padlist (aTHX_ cv);
786 } 813 }
787 } 814 }
788 } 815 }
789 816
790 if (expect_true (top_si->si_type == PERLSI_MAIN)) 817 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
791 break; 818 break;
792 819
793 top_si = top_si->si_prev; 820 top_si = top_si->si_prev;
794 ccstk = top_si->si_cxstack; 821 ccstk = top_si->si_cxstack;
795 cxix = top_si->si_cxix; 822 cxix = top_si->si_cxix;
… …
797 824
798 PUTBACK; 825 PUTBACK;
799 } 826 }
800 827
801 /* allocate some space on the context stack for our purposes */ 828 /* allocate some space on the context stack for our purposes */
802 /* we manually unroll here, as usually 2 slots is enough */ 829 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
803 if (SLOT_COUNT >= 1) CXINC;
804 if (SLOT_COUNT >= 2) CXINC;
805 if (SLOT_COUNT >= 3) CXINC;
806 { 830 {
807 unsigned int i; 831 unsigned int i;
832
808 for (i = 3; i < SLOT_COUNT; ++i) 833 for (i = 0; i < SLOT_COUNT; ++i)
809 CXINC; 834 CXINC;
810 } 835
811 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 836 cxstack_ix -= SLOT_COUNT; /* undo allocation */
837 }
812 838
813 c->mainstack = PL_mainstack; 839 c->mainstack = PL_mainstack;
814 840
815 { 841 {
816 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 842 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
817 843
818 slot->defav = GvAV (PL_defgv); 844#if CORO_JIT
819 slot->defsv = DEFSV; 845 save_perl_slots (slot);
820 slot->errsv = ERRSV; 846#else
821 slot->irsgv = GvSV (irsgv);
822 slot->hinthv = GvHV (PL_hintgv);
823
824 #define VAR(name,type) slot->name = PL_ ## name; 847 #define VARx(name,expr,type) slot->name = expr;
825 # include "state.h" 848 # include "state.h"
826 #undef VAR 849 #undef VARx
850#endif
827 } 851 }
828} 852}
829 853
830/* 854/*
831 * allocate various perl stacks. This is almost an exact copy 855 * allocate various perl stacks. This is almost an exact copy
… …
837# define coro_init_stacks(thx) init_stacks () 861# define coro_init_stacks(thx) init_stacks ()
838#else 862#else
839static void 863static void
840coro_init_stacks (pTHX) 864coro_init_stacks (pTHX)
841{ 865{
842 PL_curstackinfo = new_stackinfo(32, 8); 866 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
843 PL_curstackinfo->si_type = PERLSI_MAIN; 867 PL_curstackinfo->si_type = PERLSI_MAIN;
844 PL_curstack = PL_curstackinfo->si_stack; 868 PL_curstack = PL_curstackinfo->si_stack;
845 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 869 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
846 870
847 PL_stack_base = AvARRAY(PL_curstack); 871 PL_stack_base = AvARRAY(PL_curstack);
… …
862#endif 886#endif
863 887
864 New(54,PL_scopestack,8,I32); 888 New(54,PL_scopestack,8,I32);
865 PL_scopestack_ix = 0; 889 PL_scopestack_ix = 0;
866 PL_scopestack_max = 8; 890 PL_scopestack_max = 8;
891#if HAS_SCOPESTACK_NAME
892 New(54,PL_scopestack_name,8,const char*);
893#endif
867 894
868 New(54,PL_savestack,24,ANY); 895 New(54,PL_savestack,24,ANY);
869 PL_savestack_ix = 0; 896 PL_savestack_ix = 0;
870 PL_savestack_max = 24; 897 PL_savestack_max = 24;
871 898
… …
899 } 926 }
900 927
901 Safefree (PL_tmps_stack); 928 Safefree (PL_tmps_stack);
902 Safefree (PL_markstack); 929 Safefree (PL_markstack);
903 Safefree (PL_scopestack); 930 Safefree (PL_scopestack);
931#if HAS_SCOPESTACK_NAME
932 Safefree (PL_scopestack_name);
933#endif
904 Safefree (PL_savestack); 934 Safefree (PL_savestack);
905#if !PERL_VERSION_ATLEAST (5,10,0) 935#if !PERL_VERSION_ATLEAST (5,10,0)
906 Safefree (PL_retstack); 936 Safefree (PL_retstack);
907#endif 937#endif
908} 938}
… …
954#endif 984#endif
955 985
956/* 986/*
957 * This overrides the default magic get method of %SIG elements. 987 * This overrides the default magic get method of %SIG elements.
958 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 988 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
959 * and instead of trying to save and restore the hash elements, we just provide 989 * and instead of trying to save and restore the hash elements (extremely slow),
960 * readback here. 990 * we just provide our own readback here.
961 */ 991 */
962static int 992static int ecb_cold
963coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 993coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
964{ 994{
965 const char *s = MgPV_nolen_const (mg); 995 const char *s = MgPV_nolen_const (mg);
966 996
967 if (*s == '_') 997 if (*s == '_')
… …
971 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1001 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
972 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1002 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
973 1003
974 if (svp) 1004 if (svp)
975 { 1005 {
976 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1006 SV *ssv;
1007
1008 if (!*svp)
1009 ssv = &PL_sv_undef;
1010 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1011 ssv = sv_2mortal (newRV_inc (*svp));
1012 else
1013 ssv = *svp;
1014
1015 sv_setsv (sv, ssv);
977 return 0; 1016 return 0;
978 } 1017 }
979 } 1018 }
980 1019
981 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1020 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
982} 1021}
983 1022
984static int 1023static int ecb_cold
985coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1024coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
986{ 1025{
987 const char *s = MgPV_nolen_const (mg); 1026 const char *s = MgPV_nolen_const (mg);
988 1027
989 if (*s == '_') 1028 if (*s == '_')
… …
1003 } 1042 }
1004 1043
1005 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1044 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1006} 1045}
1007 1046
1008static int 1047static int ecb_cold
1009coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1048coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1010{ 1049{
1011 const char *s = MgPV_nolen_const (mg); 1050 const char *s = MgPV_nolen_const (mg);
1012 1051
1013 if (*s == '_') 1052 if (*s == '_')
… …
1048 return 1; 1087 return 1;
1049} 1088}
1050 1089
1051static UNOP init_perl_op; 1090static UNOP init_perl_op;
1052 1091
1053static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1092ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1054init_perl (pTHX_ struct coro *coro) 1093init_perl (pTHX_ struct coro *coro)
1055{ 1094{
1056 /* 1095 /*
1057 * emulate part of the perl startup here. 1096 * emulate part of the perl startup here.
1058 */ 1097 */
… …
1073 PL_parser = 0; 1112 PL_parser = 0;
1074#endif 1113#endif
1075 PL_hints = 0; 1114 PL_hints = 0;
1076 1115
1077 /* recreate the die/warn hooks */ 1116 /* recreate the die/warn hooks */
1078 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1117 PL_diehook = SvREFCNT_inc (rv_diehook);
1079 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1118 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1080 1119
1081 GvSV (PL_defgv) = newSV (0); 1120 GvSV (PL_defgv) = newSV (0);
1082 GvAV (PL_defgv) = coro->args; coro->args = 0; 1121 GvAV (PL_defgv) = coro->args; coro->args = 0;
1083 GvSV (PL_errgv) = newSV (0); 1122 GvSV (PL_errgv) = newSV (0);
1084 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1123 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
1105 /* this newly created coroutine might be run on an existing cctx which most 1144 /* this newly created coroutine might be run on an existing cctx which most
1106 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1145 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1107 */ 1146 */
1108 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1147 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1109 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1148 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1149 slf_frame.destroy = 0;
1110 1150
1111 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1151 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1112 init_perl_op.op_next = PL_op; 1152 init_perl_op.op_next = PL_op;
1113 init_perl_op.op_type = OP_ENTERSUB; 1153 init_perl_op.op_type = OP_ENTERSUB;
1114 init_perl_op.op_ppaddr = pp_slf; 1154 init_perl_op.op_ppaddr = pp_slf;
… …
1119 /* copy throw, in case it was set before init_perl */ 1159 /* copy throw, in case it was set before init_perl */
1120 CORO_THROW = coro->except; 1160 CORO_THROW = coro->except;
1121 1161
1122 SWAP_SVS (coro); 1162 SWAP_SVS (coro);
1123 1163
1124 if (expect_false (enable_times)) 1164 if (ecb_expect_false (enable_times))
1125 { 1165 {
1126 coro_times_update (); 1166 coro_times_update ();
1127 coro_times_sub (coro); 1167 coro_times_sub (coro);
1128 } 1168 }
1129} 1169}
… …
1153destroy_perl (pTHX_ struct coro *coro) 1193destroy_perl (pTHX_ struct coro *coro)
1154{ 1194{
1155 SV *svf [9]; 1195 SV *svf [9];
1156 1196
1157 { 1197 {
1198 SV *old_current = SvRV (coro_current);
1158 struct coro *current = SvSTATE_current; 1199 struct coro *current = SvSTATE (old_current);
1159 1200
1160 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1201 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1161 1202
1162 save_perl (aTHX_ current); 1203 save_perl (aTHX_ current);
1204
1205 /* this will cause transfer_check to croak on block*/
1206 SvRV_set (coro_current, (SV *)coro->hv);
1207
1163 load_perl (aTHX_ coro); 1208 load_perl (aTHX_ coro);
1164 1209
1165 coro_unwind_stacks (aTHX); 1210 coro_unwind_stacks (aTHX);
1166 coro_destruct_stacks (aTHX);
1167 1211
1168 /* restore swapped sv's */ 1212 /* restore swapped sv's */
1169 SWAP_SVS (coro); 1213 SWAP_SVS (coro);
1170 1214
1215 coro_destruct_stacks (aTHX);
1216
1171 // now save some sv's to be free'd later 1217 /* now save some sv's to be free'd later */
1172 svf [0] = GvSV (PL_defgv); 1218 svf [0] = GvSV (PL_defgv);
1173 svf [1] = (SV *)GvAV (PL_defgv); 1219 svf [1] = (SV *)GvAV (PL_defgv);
1174 svf [2] = GvSV (PL_errgv); 1220 svf [2] = GvSV (PL_errgv);
1175 svf [3] = (SV *)PL_defoutgv; 1221 svf [3] = (SV *)PL_defoutgv;
1176 svf [4] = PL_rs; 1222 svf [4] = PL_rs;
… …
1178 svf [6] = (SV *)GvHV (PL_hintgv); 1224 svf [6] = (SV *)GvHV (PL_hintgv);
1179 svf [7] = PL_diehook; 1225 svf [7] = PL_diehook;
1180 svf [8] = PL_warnhook; 1226 svf [8] = PL_warnhook;
1181 assert (9 == sizeof (svf) / sizeof (*svf)); 1227 assert (9 == sizeof (svf) / sizeof (*svf));
1182 1228
1229 SvRV_set (coro_current, old_current);
1230
1183 load_perl (aTHX_ current); 1231 load_perl (aTHX_ current);
1184 } 1232 }
1185 1233
1186 { 1234 {
1187 unsigned int i; 1235 unsigned int i;
… …
1194 SvREFCNT_dec (coro->invoke_cb); 1242 SvREFCNT_dec (coro->invoke_cb);
1195 SvREFCNT_dec (coro->invoke_av); 1243 SvREFCNT_dec (coro->invoke_av);
1196 } 1244 }
1197} 1245}
1198 1246
1199INLINE void 1247ecb_inline void
1200free_coro_mortal (pTHX) 1248free_coro_mortal (pTHX)
1201{ 1249{
1202 if (expect_true (coro_mortal)) 1250 if (ecb_expect_true (coro_mortal))
1203 { 1251 {
1204 SvREFCNT_dec (coro_mortal); 1252 SvREFCNT_dec ((SV *)coro_mortal);
1205 coro_mortal = 0; 1253 coro_mortal = 0;
1206 } 1254 }
1207} 1255}
1208 1256
1209static int 1257static int
… …
1342 1390
1343 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1391 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1344} 1392}
1345 1393
1346/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1394/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1347static void NOINLINE 1395static void ecb_noinline
1348cctx_prepare (pTHX) 1396cctx_prepare (pTHX)
1349{ 1397{
1350 PL_top_env = &PL_start_env; 1398 PL_top_env = &PL_start_env;
1351 1399
1352 if (cctx_current->flags & CC_TRACE) 1400 if (cctx_current->flags & CC_TRACE)
… …
1363 slf_frame.prepare = slf_prepare_set_stacklevel; 1411 slf_frame.prepare = slf_prepare_set_stacklevel;
1364 slf_frame.check = slf_check_set_stacklevel; 1412 slf_frame.check = slf_check_set_stacklevel;
1365} 1413}
1366 1414
1367/* the tail of transfer: execute stuff we can only do after a transfer */ 1415/* the tail of transfer: execute stuff we can only do after a transfer */
1368INLINE void 1416ecb_inline void
1369transfer_tail (pTHX) 1417transfer_tail (pTHX)
1370{ 1418{
1371 free_coro_mortal (aTHX); 1419 free_coro_mortal (aTHX);
1372} 1420}
1373 1421
… …
1417 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1465 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1418 } 1466 }
1419} 1467}
1420 1468
1421static coro_cctx * 1469static coro_cctx *
1422cctx_new () 1470cctx_new (void)
1423{ 1471{
1424 coro_cctx *cctx; 1472 coro_cctx *cctx;
1425 1473
1426 ++cctx_count; 1474 ++cctx_count;
1427 New (0, cctx, 1, coro_cctx); 1475 New (0, cctx, 1, coro_cctx);
… …
1433 return cctx; 1481 return cctx;
1434} 1482}
1435 1483
1436/* create a new cctx only suitable as source */ 1484/* create a new cctx only suitable as source */
1437static coro_cctx * 1485static coro_cctx *
1438cctx_new_empty () 1486cctx_new_empty (void)
1439{ 1487{
1440 coro_cctx *cctx = cctx_new (); 1488 coro_cctx *cctx = cctx_new ();
1441 1489
1442 cctx->sptr = 0; 1490 cctx->sptr = 0;
1443 coro_create (&cctx->cctx, 0, 0, 0, 0); 1491 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1445 return cctx; 1493 return cctx;
1446} 1494}
1447 1495
1448/* create a new cctx suitable as destination/running a perl interpreter */ 1496/* create a new cctx suitable as destination/running a perl interpreter */
1449static coro_cctx * 1497static coro_cctx *
1450cctx_new_run () 1498cctx_new_run (void)
1451{ 1499{
1452 coro_cctx *cctx = cctx_new (); 1500 coro_cctx *cctx = cctx_new ();
1453 void *stack_start; 1501 void *stack_start;
1454 size_t stack_size; 1502 size_t stack_size;
1455 1503
1456#if HAVE_MMAP 1504#if HAVE_MMAP
1457 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1505 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1458 /* mmap supposedly does allocate-on-write for us */ 1506 /* mmap supposedly does allocate-on-write for us */
1459 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1507 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1460 1508
1461 if (cctx->sptr != (void *)-1) 1509 if (cctx->sptr != (void *)-1)
1462 { 1510 {
1463 #if CORO_STACKGUARD 1511 #if CORO_STACKGUARD
1464 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1512 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1496cctx_destroy (coro_cctx *cctx) 1544cctx_destroy (coro_cctx *cctx)
1497{ 1545{
1498 if (!cctx) 1546 if (!cctx)
1499 return; 1547 return;
1500 1548
1501 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1549 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1502 1550
1503 --cctx_count; 1551 --cctx_count;
1504 coro_destroy (&cctx->cctx); 1552 coro_destroy (&cctx->cctx);
1505 1553
1506 /* coro_transfer creates new, empty cctx's */ 1554 /* coro_transfer creates new, empty cctx's */
… …
1525#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1573#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1526 1574
1527static coro_cctx * 1575static coro_cctx *
1528cctx_get (pTHX) 1576cctx_get (pTHX)
1529{ 1577{
1530 while (expect_true (cctx_first)) 1578 while (ecb_expect_true (cctx_first))
1531 { 1579 {
1532 coro_cctx *cctx = cctx_first; 1580 coro_cctx *cctx = cctx_first;
1533 cctx_first = cctx->next; 1581 cctx_first = cctx->next;
1534 --cctx_idle; 1582 --cctx_idle;
1535 1583
1536 if (expect_true (!CCTX_EXPIRED (cctx))) 1584 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1537 return cctx; 1585 return cctx;
1538 1586
1539 cctx_destroy (cctx); 1587 cctx_destroy (cctx);
1540 } 1588 }
1541 1589
… …
1546cctx_put (coro_cctx *cctx) 1594cctx_put (coro_cctx *cctx)
1547{ 1595{
1548 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1596 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1549 1597
1550 /* free another cctx if overlimit */ 1598 /* free another cctx if overlimit */
1551 if (expect_false (cctx_idle >= cctx_max_idle)) 1599 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1552 { 1600 {
1553 coro_cctx *first = cctx_first; 1601 coro_cctx *first = cctx_first;
1554 cctx_first = first->next; 1602 cctx_first = first->next;
1555 --cctx_idle; 1603 --cctx_idle;
1556 1604
… …
1567static void 1615static void
1568transfer_check (pTHX_ struct coro *prev, struct coro *next) 1616transfer_check (pTHX_ struct coro *prev, struct coro *next)
1569{ 1617{
1570 /* TODO: throwing up here is considered harmful */ 1618 /* TODO: throwing up here is considered harmful */
1571 1619
1572 if (expect_true (prev != next)) 1620 if (ecb_expect_true (prev != next))
1573 { 1621 {
1574 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1622 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1575 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1623 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1576 1624
1577 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1625 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1578 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1626 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1579 1627
1580#if !PERL_VERSION_ATLEAST (5,10,0) 1628#if !PERL_VERSION_ATLEAST (5,10,0)
1581 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1629 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1582 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1630 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1583#endif 1631#endif
1584 } 1632 }
1585} 1633}
1586 1634
1587/* always use the TRANSFER macro */ 1635/* always use the TRANSFER macro */
1588static void NOINLINE /* noinline so we have a fixed stackframe */ 1636static void ecb_noinline /* noinline so we have a fixed stackframe */
1589transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1637transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1590{ 1638{
1591 dSTACKLEVEL; 1639 dSTACKLEVEL;
1592 1640
1593 /* sometimes transfer is only called to set idle_sp */ 1641 /* sometimes transfer is only called to set idle_sp */
1594 if (expect_false (!prev)) 1642 if (ecb_expect_false (!prev))
1595 { 1643 {
1596 cctx_current->idle_sp = STACKLEVEL; 1644 cctx_current->idle_sp = STACKLEVEL;
1597 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1645 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1598 } 1646 }
1599 else if (expect_true (prev != next)) 1647 else if (ecb_expect_true (prev != next))
1600 { 1648 {
1601 coro_cctx *cctx_prev; 1649 coro_cctx *cctx_prev;
1602 1650
1603 if (expect_false (prev->flags & CF_NEW)) 1651 if (ecb_expect_false (prev->flags & CF_NEW))
1604 { 1652 {
1605 /* create a new empty/source context */ 1653 /* create a new empty/source context */
1606 prev->flags &= ~CF_NEW; 1654 prev->flags &= ~CF_NEW;
1607 prev->flags |= CF_RUNNING; 1655 prev->flags |= CF_RUNNING;
1608 } 1656 }
… …
1611 next->flags |= CF_RUNNING; 1659 next->flags |= CF_RUNNING;
1612 1660
1613 /* first get rid of the old state */ 1661 /* first get rid of the old state */
1614 save_perl (aTHX_ prev); 1662 save_perl (aTHX_ prev);
1615 1663
1616 if (expect_false (next->flags & CF_NEW)) 1664 if (ecb_expect_false (next->flags & CF_NEW))
1617 { 1665 {
1618 /* need to start coroutine */ 1666 /* need to start coroutine */
1619 next->flags &= ~CF_NEW; 1667 next->flags &= ~CF_NEW;
1620 /* setup coroutine call */ 1668 /* setup coroutine call */
1621 init_perl (aTHX_ next); 1669 init_perl (aTHX_ next);
1622 } 1670 }
1623 else 1671 else
1624 load_perl (aTHX_ next); 1672 load_perl (aTHX_ next);
1625 1673
1626 /* possibly untie and reuse the cctx */ 1674 /* possibly untie and reuse the cctx */
1627 if (expect_true ( 1675 if (ecb_expect_true (
1628 cctx_current->idle_sp == STACKLEVEL 1676 cctx_current->idle_sp == STACKLEVEL
1629 && !(cctx_current->flags & CC_TRACE) 1677 && !(cctx_current->flags & CC_TRACE)
1630 && !force_cctx 1678 && !force_cctx
1631 )) 1679 ))
1632 { 1680 {
1633 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1681 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1634 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1682 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1635 1683
1636 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1684 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1637 /* without this the next cctx_get might destroy the running cctx while still in use */ 1685 /* without this the next cctx_get might destroy the running cctx while still in use */
1638 if (expect_false (CCTX_EXPIRED (cctx_current))) 1686 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1639 if (expect_true (!next->cctx)) 1687 if (ecb_expect_true (!next->cctx))
1640 next->cctx = cctx_get (aTHX); 1688 next->cctx = cctx_get (aTHX);
1641 1689
1642 cctx_put (cctx_current); 1690 cctx_put (cctx_current);
1643 } 1691 }
1644 else 1692 else
1645 prev->cctx = cctx_current; 1693 prev->cctx = cctx_current;
1646 1694
1647 ++next->usecount; 1695 ++next->usecount;
1648 1696
1649 cctx_prev = cctx_current; 1697 cctx_prev = cctx_current;
1650 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1698 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1651 1699
1652 next->cctx = 0; 1700 next->cctx = 0;
1653 1701
1654 if (expect_false (cctx_prev != cctx_current)) 1702 if (ecb_expect_false (cctx_prev != cctx_current))
1655 { 1703 {
1656 cctx_prev->top_env = PL_top_env; 1704 cctx_prev->top_env = PL_top_env;
1657 PL_top_env = cctx_current->top_env; 1705 PL_top_env = cctx_current->top_env;
1658 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1706 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1659 } 1707 }
… …
1665#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1713#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1666#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1714#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1667 1715
1668/** high level stuff ********************************************************/ 1716/** high level stuff ********************************************************/
1669 1717
1718/* this function is actually Coro, not Coro::State, but we call it from here */
1719/* because it is convenient - but it hasn't been declared yet for that reason */
1670static int 1720static void
1721coro_call_on_destroy (pTHX_ struct coro *coro);
1722
1723static void
1671coro_state_destroy (pTHX_ struct coro *coro) 1724coro_state_destroy (pTHX_ struct coro *coro)
1672{ 1725{
1673 if (coro->flags & CF_DESTROYED) 1726 if (coro->flags & CF_ZOMBIE)
1674 return 0; 1727 return;
1675 1728
1676 if (coro->on_destroy && !PL_dirty)
1677 coro->on_destroy (aTHX_ coro); 1729 slf_destroy (aTHX_ coro);
1678 1730
1679 coro->flags |= CF_DESTROYED; 1731 coro->flags |= CF_ZOMBIE;
1680 1732
1681 if (coro->flags & CF_READY) 1733 if (coro->flags & CF_READY)
1682 { 1734 {
1683 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1735 /* reduce nready, as destroying a ready coro effectively unreadies it */
1684 /* alternative: look through all ready queues and remove the coro */ 1736 /* alternative: look through all ready queues and remove the coro */
1685 --coro_nready; 1737 --coro_nready;
1686 } 1738 }
1687 else 1739 else
1688 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1740 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1741
1742 if (coro->next) coro->next->prev = coro->prev;
1743 if (coro->prev) coro->prev->next = coro->next;
1744 if (coro == coro_first) coro_first = coro->next;
1689 1745
1690 if (coro->mainstack 1746 if (coro->mainstack
1691 && coro->mainstack != main_mainstack 1747 && coro->mainstack != main_mainstack
1692 && coro->slot 1748 && coro->slot
1693 && !PL_dirty) 1749 && !PL_dirty)
1694 destroy_perl (aTHX_ coro); 1750 destroy_perl (aTHX_ coro);
1695 1751
1696 if (coro->next) coro->next->prev = coro->prev;
1697 if (coro->prev) coro->prev->next = coro->next;
1698 if (coro == coro_first) coro_first = coro->next;
1699
1700 cctx_destroy (coro->cctx); 1752 cctx_destroy (coro->cctx);
1701 SvREFCNT_dec (coro->startcv); 1753 SvREFCNT_dec (coro->startcv);
1702 SvREFCNT_dec (coro->args); 1754 SvREFCNT_dec (coro->args);
1703 SvREFCNT_dec (coro->swap_sv); 1755 SvREFCNT_dec (coro->swap_sv);
1704 SvREFCNT_dec (CORO_THROW); 1756 SvREFCNT_dec (CORO_THROW);
1705 1757
1706 return 1; 1758 coro_call_on_destroy (aTHX_ coro);
1759
1760 /* more destruction mayhem in coro_state_free */
1707} 1761}
1708 1762
1709static int 1763static int
1710coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1764coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1711{ 1765{
1712 struct coro *coro = (struct coro *)mg->mg_ptr; 1766 struct coro *coro = (struct coro *)mg->mg_ptr;
1713 mg->mg_ptr = 0; 1767 mg->mg_ptr = 0;
1714 1768
1715 coro->hv = 0;
1716
1717 if (--coro->refcnt < 0)
1718 {
1719 coro_state_destroy (aTHX_ coro); 1769 coro_state_destroy (aTHX_ coro);
1770 SvREFCNT_dec (coro->on_destroy);
1771 SvREFCNT_dec (coro->status);
1772
1720 Safefree (coro); 1773 Safefree (coro);
1721 }
1722 1774
1723 return 0; 1775 return 0;
1724} 1776}
1725 1777
1726static int 1778static int ecb_cold
1727coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1779coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1728{ 1780{
1729 struct coro *coro = (struct coro *)mg->mg_ptr; 1781 /* called when perl clones the current process the slow way (windows process emulation) */
1730 1782 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1731 ++coro->refcnt; 1783 mg->mg_ptr = 0;
1784 mg->mg_virtual = 0;
1732 1785
1733 return 0; 1786 return 0;
1734} 1787}
1735 1788
1736static MGVTBL coro_state_vtbl = { 1789static MGVTBL coro_state_vtbl = {
… …
1761 TRANSFER (ta, 1); 1814 TRANSFER (ta, 1);
1762} 1815}
1763 1816
1764/** Coro ********************************************************************/ 1817/** Coro ********************************************************************/
1765 1818
1766INLINE void 1819ecb_inline void
1767coro_enq (pTHX_ struct coro *coro) 1820coro_enq (pTHX_ struct coro *coro)
1768{ 1821{
1769 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1822 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1770 1823
1771 SvREFCNT_inc_NN (coro->hv); 1824 SvREFCNT_inc_NN (coro->hv);
… …
1773 coro->next_ready = 0; 1826 coro->next_ready = 0;
1774 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1827 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1775 ready [1] = coro; 1828 ready [1] = coro;
1776} 1829}
1777 1830
1778INLINE struct coro * 1831ecb_inline struct coro *
1779coro_deq (pTHX) 1832coro_deq (pTHX)
1780{ 1833{
1781 int prio; 1834 int prio;
1782 1835
1783 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1836 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1836{ 1889{
1837 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1890 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1838} 1891}
1839 1892
1840/* expects to own a reference to next->hv */ 1893/* expects to own a reference to next->hv */
1841INLINE void 1894ecb_inline void
1842prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1895prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1843{ 1896{
1844 SV *prev_sv = SvRV (coro_current); 1897 SV *prev_sv = SvRV (coro_current);
1845 1898
1846 ta->prev = SvSTATE_hv (prev_sv); 1899 ta->prev = SvSTATE_hv (prev_sv);
… …
1859{ 1912{
1860 for (;;) 1913 for (;;)
1861 { 1914 {
1862 struct coro *next = coro_deq (aTHX); 1915 struct coro *next = coro_deq (aTHX);
1863 1916
1864 if (expect_true (next)) 1917 if (ecb_expect_true (next))
1865 { 1918 {
1866 /* cannot transfer to destroyed coros, skip and look for next */ 1919 /* cannot transfer to destroyed coros, skip and look for next */
1867 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1920 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1868 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1921 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1869 else 1922 else
1870 { 1923 {
1871 next->flags &= ~CF_READY; 1924 next->flags &= ~CF_READY;
1872 --coro_nready; 1925 --coro_nready;
… …
1905 } 1958 }
1906 } 1959 }
1907 } 1960 }
1908} 1961}
1909 1962
1910INLINE void 1963ecb_inline void
1911prepare_cede (pTHX_ struct coro_transfer_args *ta) 1964prepare_cede (pTHX_ struct coro_transfer_args *ta)
1912{ 1965{
1913 api_ready (aTHX_ coro_current); 1966 api_ready (aTHX_ coro_current);
1914 prepare_schedule (aTHX_ ta); 1967 prepare_schedule (aTHX_ ta);
1915} 1968}
1916 1969
1917INLINE void 1970ecb_inline void
1918prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1971prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1919{ 1972{
1920 SV *prev = SvRV (coro_current); 1973 SV *prev = SvRV (coro_current);
1921 1974
1922 if (coro_nready) 1975 if (coro_nready)
… …
1952{ 2005{
1953 struct coro_transfer_args ta; 2006 struct coro_transfer_args ta;
1954 2007
1955 prepare_cede (aTHX_ &ta); 2008 prepare_cede (aTHX_ &ta);
1956 2009
1957 if (expect_true (ta.prev != ta.next)) 2010 if (ecb_expect_true (ta.prev != ta.next))
1958 { 2011 {
1959 TRANSFER (ta, 1); 2012 TRANSFER (ta, 1);
1960 return 1; 2013 return 1;
1961 } 2014 }
1962 else 2015 else
… …
2005 coro->slot->runops = RUNOPS_DEFAULT; 2058 coro->slot->runops = RUNOPS_DEFAULT;
2006 } 2059 }
2007} 2060}
2008 2061
2009static void 2062static void
2063coro_push_av (pTHX_ AV *av, I32 gimme_v)
2064{
2065 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2066 {
2067 dSP;
2068
2069 if (gimme_v == G_SCALAR)
2070 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2071 else
2072 {
2073 int i;
2074 EXTEND (SP, AvFILLp (av) + 1);
2075
2076 for (i = 0; i <= AvFILLp (av); ++i)
2077 PUSHs (AvARRAY (av)[i]);
2078 }
2079
2080 PUTBACK;
2081 }
2082}
2083
2084static void
2085coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2086{
2087 if (!coro->on_destroy)
2088 coro->on_destroy = newAV ();
2089
2090 av_push (coro->on_destroy, cb);
2091}
2092
2093static void
2094slf_destroy_join (pTHX_ struct CoroSLF *frame)
2095{
2096 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2097}
2098
2099static int
2100slf_check_join (pTHX_ struct CoroSLF *frame)
2101{
2102 struct coro *coro = (struct coro *)frame->data;
2103
2104 if (!coro->status)
2105 return 1;
2106
2107 frame->destroy = 0;
2108
2109 coro_push_av (aTHX_ coro->status, GIMME_V);
2110
2111 SvREFCNT_dec ((SV *)coro->hv);
2112
2113 return 0;
2114}
2115
2116static void
2117slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2118{
2119 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2120
2121 if (items > 1)
2122 croak ("join called with too many arguments");
2123
2124 if (coro->status)
2125 frame->prepare = prepare_nop;
2126 else
2127 {
2128 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2129 frame->prepare = prepare_schedule;
2130 }
2131
2132 frame->check = slf_check_join;
2133 frame->destroy = slf_destroy_join;
2134 frame->data = (void *)coro;
2135 SvREFCNT_inc (coro->hv);
2136}
2137
2138static void
2010coro_call_on_destroy (pTHX_ struct coro *coro) 2139coro_call_on_destroy (pTHX_ struct coro *coro)
2011{ 2140{
2012 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2141 AV *od = coro->on_destroy;
2013 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2014 2142
2015 if (on_destroyp) 2143 if (!od)
2016 { 2144 return;
2017 AV *on_destroy = (AV *)SvRV (*on_destroyp);
2018 2145
2019 while (AvFILLp (on_destroy) >= 0) 2146 while (AvFILLp (od) >= 0)
2147 {
2148 SV *cb = sv_2mortal (av_pop (od));
2149
2150 /* coro hv's (and only hv's at the moment) are supported as well */
2151 if (SvSTATEhv_p (aTHX_ cb))
2152 api_ready (aTHX_ cb);
2153 else
2020 { 2154 {
2021 dSP; /* don't disturb outer sp */ 2155 dSP; /* don't disturb outer sp */
2022 SV *cb = av_pop (on_destroy);
2023
2024 PUSHMARK (SP); 2156 PUSHMARK (SP);
2025 2157
2026 if (statusp) 2158 if (coro->status)
2027 { 2159 {
2028 int i; 2160 PUTBACK;
2029 AV *status = (AV *)SvRV (*statusp); 2161 coro_push_av (aTHX_ coro->status, G_ARRAY);
2030 EXTEND (SP, AvFILLp (status) + 1); 2162 SPAGAIN;
2031
2032 for (i = 0; i <= AvFILLp (status); ++i)
2033 PUSHs (AvARRAY (status)[i]);
2034 } 2163 }
2035 2164
2036 PUTBACK; 2165 PUTBACK;
2037 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2166 call_sv (cb, G_VOID | G_DISCARD);
2038 } 2167 }
2039 } 2168 }
2040} 2169}
2041 2170
2042static void 2171static void
2043slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2172coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2044{ 2173{
2045 int i; 2174 AV *av;
2046 HV *hv = (HV *)SvRV (coro_current); 2175
2047 AV *av = newAV (); 2176 if (coro->status)
2177 {
2178 av = coro->status;
2179 av_clear (av);
2180 }
2181 else
2182 av = coro->status = newAV ();
2048 2183
2049 /* items are actually not so common, so optimise for this case */ 2184 /* items are actually not so common, so optimise for this case */
2050 if (items) 2185 if (items)
2051 { 2186 {
2187 int i;
2188
2052 av_extend (av, items - 1); 2189 av_extend (av, items - 1);
2053 2190
2054 for (i = 0; i < items; ++i) 2191 for (i = 0; i < items; ++i)
2055 av_push (av, SvREFCNT_inc_NN (arg [i])); 2192 av_push (av, SvREFCNT_inc_NN (arg [i]));
2056 } 2193 }
2194}
2057 2195
2058 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2196static void
2059 2197slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2198{
2060 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2199 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2061 api_ready (aTHX_ sv_manager); 2200 api_ready (aTHX_ sv_manager);
2062 2201
2063 frame->prepare = prepare_schedule; 2202 frame->prepare = prepare_schedule;
2064 frame->check = slf_check_repeat; 2203 frame->check = slf_check_repeat;
2065 2204
2066 /* as a minor optimisation, we could unwind all stacks here */ 2205 /* as a minor optimisation, we could unwind all stacks here */
2067 /* but that puts extra pressure on pp_slf, and is not worth much */ 2206 /* but that puts extra pressure on pp_slf, and is not worth much */
2068 /*coro_unwind_stacks (aTHX);*/ 2207 /*coro_unwind_stacks (aTHX);*/
2208}
2209
2210static void
2211slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2212{
2213 HV *coro_hv = (HV *)SvRV (coro_current);
2214
2215 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2216 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2217}
2218
2219static void
2220slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2221{
2222 HV *coro_hv;
2223 struct coro *coro;
2224
2225 if (items <= 0)
2226 croak ("Coro::cancel called without coro object,");
2227
2228 coro = SvSTATE (arg [0]);
2229 coro_hv = coro->hv;
2230
2231 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2232
2233 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2234 {
2235 /* coro currently busy cancelling something, so just notify it */
2236 coro->slf_frame.data = (void *)coro;
2237
2238 frame->prepare = prepare_nop;
2239 frame->check = slf_check_nop;
2240 }
2241 else if (coro_hv == (HV *)SvRV (coro_current))
2242 {
2243 /* cancelling the current coro is allowed, and equals terminate */
2244 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2245 }
2246 else
2247 {
2248 struct coro *self = SvSTATE_current;
2249
2250 /* otherwise we cancel directly, purely for speed reasons
2251 * unfortunately, this requires some magic trickery, as
2252 * somebody else could cancel us, so we have to fight the cancellation.
2253 * this is ugly, and hopefully fully worth the extra speed.
2254 * besides, I can't get the slow-but-safe version working...
2255 */
2256 slf_frame.data = 0;
2257 self->flags |= CF_NOCANCEL;
2258 coro_state_destroy (aTHX_ coro);
2259 self->flags &= ~CF_NOCANCEL;
2260
2261 if (slf_frame.data)
2262 {
2263 /* while we were busy we have been cancelled, so terminate */
2264 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2265 }
2266 else
2267 {
2268 frame->prepare = prepare_nop;
2269 frame->check = slf_check_nop;
2270 }
2271 }
2272}
2273
2274static int
2275slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2276{
2277 frame->prepare = 0;
2278 coro_unwind_stacks (aTHX);
2279
2280 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2281
2282 return 1;
2283}
2284
2285static int
2286safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2287{
2288 if (coro->cctx)
2289 croak ("coro inside C callback, unable to cancel at this time, caught");
2290
2291 if (coro->flags & CF_NEW)
2292 {
2293 coro_set_status (aTHX_ coro, arg, items);
2294 coro_state_destroy (aTHX_ coro);
2295 }
2296 else
2297 {
2298 if (!coro->slf_frame.prepare)
2299 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2300
2301 slf_destroy (aTHX_ coro);
2302
2303 coro_set_status (aTHX_ coro, arg, items);
2304 coro->slf_frame.prepare = prepare_nop;
2305 coro->slf_frame.check = slf_check_safe_cancel;
2306
2307 api_ready (aTHX_ (SV *)coro->hv);
2308 }
2309
2310 return 1;
2069} 2311}
2070 2312
2071/*****************************************************************************/ 2313/*****************************************************************************/
2072/* async pool handler */ 2314/* async pool handler */
2073 2315
… …
2104slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2346slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2105{ 2347{
2106 HV *hv = (HV *)SvRV (coro_current); 2348 HV *hv = (HV *)SvRV (coro_current);
2107 struct coro *coro = SvSTATE_hv ((SV *)hv); 2349 struct coro *coro = SvSTATE_hv ((SV *)hv);
2108 2350
2109 if (expect_true (coro->saved_deffh)) 2351 if (ecb_expect_true (coro->saved_deffh))
2110 { 2352 {
2111 /* subsequent iteration */ 2353 /* subsequent iteration */
2112 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2354 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2113 coro->saved_deffh = 0; 2355 coro->saved_deffh = 0;
2114 2356
2115 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2357 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2116 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2358 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2117 { 2359 {
2118 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2360 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2119 coro->invoke_av = newAV (); 2361 return;
2120
2121 frame->prepare = prepare_nop;
2122 } 2362 }
2123 else 2363 else
2124 { 2364 {
2125 av_clear (GvAV (PL_defgv)); 2365 av_clear (GvAV (PL_defgv));
2126 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2366 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2349static void 2589static void
2350slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2590slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2351{ 2591{
2352 frame->prepare = prepare_cede_notself; 2592 frame->prepare = prepare_cede_notself;
2353 frame->check = slf_check_nop; 2593 frame->check = slf_check_nop;
2594}
2595
2596/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2597static void
2598slf_destroy (pTHX_ struct coro *coro)
2599{
2600 /* this callback is reserved for slf functions needing to do cleanup */
2601 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2602 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2603
2604 /*
2605 * The on_destroy above most likely is from an SLF call.
2606 * Since by definition the SLF call will not finish when we destroy
2607 * the coro, we will have to force-finish it here, otherwise
2608 * cleanup functions cannot call SLF functions.
2609 */
2610 coro->slf_frame.prepare = 0;
2354} 2611}
2355 2612
2356/* 2613/*
2357 * these not obviously related functions are all rolled into one 2614 * these not obviously related functions are all rolled into one
2358 * function to increase chances that they all will call transfer with the same 2615 * function to increase chances that they all will call transfer with the same
… …
2365 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2622 I32 checkmark; /* mark SP to see how many elements check has pushed */
2366 2623
2367 /* set up the slf frame, unless it has already been set-up */ 2624 /* set up the slf frame, unless it has already been set-up */
2368 /* the latter happens when a new coro has been started */ 2625 /* the latter happens when a new coro has been started */
2369 /* or when a new cctx was attached to an existing coroutine */ 2626 /* or when a new cctx was attached to an existing coroutine */
2370 if (expect_true (!slf_frame.prepare)) 2627 if (ecb_expect_true (!slf_frame.prepare))
2371 { 2628 {
2372 /* first iteration */ 2629 /* first iteration */
2373 dSP; 2630 dSP;
2374 SV **arg = PL_stack_base + TOPMARK + 1; 2631 SV **arg = PL_stack_base + TOPMARK + 1;
2375 int items = SP - arg; /* args without function object */ 2632 int items = SP - arg; /* args without function object */
… …
2416 while (slf_frame.check (aTHX_ &slf_frame)); 2673 while (slf_frame.check (aTHX_ &slf_frame));
2417 2674
2418 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2675 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2419 2676
2420 /* exception handling */ 2677 /* exception handling */
2421 if (expect_false (CORO_THROW)) 2678 if (ecb_expect_false (CORO_THROW))
2422 { 2679 {
2423 SV *exception = sv_2mortal (CORO_THROW); 2680 SV *exception = sv_2mortal (CORO_THROW);
2424 2681
2425 CORO_THROW = 0; 2682 CORO_THROW = 0;
2426 sv_setsv (ERRSV, exception); 2683 sv_setsv (ERRSV, exception);
2427 croak (0); 2684 croak (0);
2428 } 2685 }
2429 2686
2430 /* return value handling - mostly like entersub */ 2687 /* return value handling - mostly like entersub */
2431 /* make sure we put something on the stack in scalar context */ 2688 /* make sure we put something on the stack in scalar context */
2432 if (GIMME_V == G_SCALAR) 2689 if (GIMME_V == G_SCALAR
2690 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2433 { 2691 {
2434 dSP; 2692 dSP;
2435 SV **bot = PL_stack_base + checkmark; 2693 SV **bot = PL_stack_base + checkmark;
2436 2694
2437 if (sp == bot) /* too few, push undef */ 2695 if (sp == bot) /* too few, push undef */
2438 bot [1] = &PL_sv_undef; 2696 bot [1] = &PL_sv_undef;
2439 else if (sp != bot + 1) /* too many, take last one */ 2697 else /* too many, take last one */
2440 bot [1] = *sp; 2698 bot [1] = *sp;
2441 2699
2442 SP = bot + 1; 2700 SP = bot + 1;
2443 2701
2444 PUTBACK; 2702 PUTBACK;
… …
2551{ 2809{
2552 PerlIOBuf base; 2810 PerlIOBuf base;
2553 NV next, every; 2811 NV next, every;
2554} PerlIOCede; 2812} PerlIOCede;
2555 2813
2556static IV 2814static IV ecb_cold
2557PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2815PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2558{ 2816{
2559 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2817 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2560 2818
2561 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2819 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2562 self->next = nvtime () + self->every; 2820 self->next = nvtime () + self->every;
2563 2821
2564 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2822 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2565} 2823}
2566 2824
2567static SV * 2825static SV * ecb_cold
2568PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2826PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2569{ 2827{
2570 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2828 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2571 2829
2572 return newSVnv (self->every); 2830 return newSVnv (self->every);
… …
2684 SvREFCNT_dec (cb); 2942 SvREFCNT_dec (cb);
2685 } 2943 }
2686} 2944}
2687 2945
2688static void 2946static void
2689coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2947coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2690{ 2948{
2691 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2949 /* call $sem->adjust (0) to possibly wake up some other waiters */
2692 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2950 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2693} 2951}
2694 2952
2695static int 2953static int
2696slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2954slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2697{ 2955{
2698 AV *av = (AV *)frame->data; 2956 AV *av = (AV *)frame->data;
2699 SV *count_sv = AvARRAY (av)[0]; 2957 SV *count_sv = AvARRAY (av)[0];
2958 SV *coro_hv = SvRV (coro_current);
2700 2959
2701 /* if we are about to throw, don't actually acquire the lock, just throw */ 2960 /* if we are about to throw, don't actually acquire the lock, just throw */
2702 if (CORO_THROW) 2961 if (CORO_THROW)
2703 return 0; 2962 return 0;
2704 else if (SvIVX (count_sv) > 0) 2963 else if (SvIVX (count_sv) > 0)
2705 { 2964 {
2706 SvSTATE_current->on_destroy = 0; 2965 frame->destroy = 0;
2707 2966
2708 if (acquire) 2967 if (acquire)
2709 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2968 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2710 else 2969 else
2711 coro_semaphore_adjust (aTHX_ av, 0); 2970 coro_semaphore_adjust (aTHX_ av, 0);
… …
2716 { 2975 {
2717 int i; 2976 int i;
2718 /* if we were woken up but can't down, we look through the whole */ 2977 /* if we were woken up but can't down, we look through the whole */
2719 /* waiters list and only add us if we aren't in there already */ 2978 /* waiters list and only add us if we aren't in there already */
2720 /* this avoids some degenerate memory usage cases */ 2979 /* this avoids some degenerate memory usage cases */
2721 2980 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2722 for (i = 1; i <= AvFILLp (av); ++i)
2723 if (AvARRAY (av)[i] == SvRV (coro_current)) 2981 if (AvARRAY (av)[i] == coro_hv)
2724 return 1; 2982 return 1;
2725 2983
2726 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2984 av_push (av, SvREFCNT_inc (coro_hv));
2727 return 1; 2985 return 1;
2728 } 2986 }
2729} 2987}
2730 2988
2731static int 2989static int
… …
2754 { 3012 {
2755 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3013 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2756 3014
2757 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3015 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2758 frame->prepare = prepare_schedule; 3016 frame->prepare = prepare_schedule;
2759
2760 /* to avoid race conditions when a woken-up coro gets terminated */ 3017 /* to avoid race conditions when a woken-up coro gets terminated */
2761 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3018 /* we arrange for a temporary on_destroy that calls adjust (0) */
2762 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3019 frame->destroy = coro_semaphore_destroy;
2763 } 3020 }
2764} 3021}
2765 3022
2766static void 3023static void
2767slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3024slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2985 dSP; 3242 dSP;
2986 3243
2987 static SV *prio_cv; 3244 static SV *prio_cv;
2988 static SV *prio_sv; 3245 static SV *prio_sv;
2989 3246
2990 if (expect_false (!prio_cv)) 3247 if (ecb_expect_false (!prio_cv))
2991 { 3248 {
2992 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3249 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2993 prio_sv = newSViv (0); 3250 prio_sv = newSViv (0);
2994 } 3251 }
2995 3252
… …
3101 } 3358 }
3102 3359
3103 return coro_sv; 3360 return coro_sv;
3104} 3361}
3105 3362
3363#ifndef __cplusplus
3364ecb_cold XS(boot_Coro__State);
3365#endif
3366
3367#if CORO_JIT
3368
3369static void ecb_noinline ecb_cold
3370pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3371{
3372 dSP;
3373 AV *av = newAV ();
3374
3375 av_store (av, 3, newSVuv (d));
3376 av_store (av, 2, newSVuv (c));
3377 av_store (av, 1, newSVuv (b));
3378 av_store (av, 0, newSVuv (a));
3379
3380 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3381
3382 PUTBACK;
3383}
3384
3385static void ecb_noinline ecb_cold
3386jit_init (pTHX)
3387{
3388 dSP;
3389 SV *load, *save;
3390 char *map_base;
3391 char *load_ptr, *save_ptr;
3392 STRLEN load_len, save_len, map_len;
3393 int count;
3394
3395 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3396
3397 PUSHMARK (SP);
3398#define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3399# include "state.h"
3400#undef VARx
3401 count = call_pv ("Coro::State::_jit", G_ARRAY);
3402 SPAGAIN;
3403
3404 save = POPs; save_ptr = SvPVbyte (save, save_len);
3405 load = POPs; load_ptr = SvPVbyte (load, load_len);
3406
3407 map_len = load_len + save_len + 16;
3408
3409 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3410
3411 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3412
3413 load_perl_slots = (load_save_perl_slots_type)map_base;
3414 memcpy (map_base, load_ptr, load_len);
3415
3416 map_base += (load_len + 15) & ~15;
3417
3418 save_perl_slots = (load_save_perl_slots_type)map_base;
3419 memcpy (map_base, save_ptr, save_len);
3420
3421 /* we are good citizens and try to make the page read-only, so the evil evil */
3422 /* hackers might have it a bit more difficult */
3423 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3424
3425 PUTBACK;
3426 eval_pv ("undef &Coro::State::_jit", 1);
3427}
3428
3429#endif
3430
3106MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3431MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3107 3432
3108PROTOTYPES: DISABLE 3433PROTOTYPES: DISABLE
3109 3434
3110BOOT: 3435BOOT:
… …
3113# if CORO_PTHREAD 3438# if CORO_PTHREAD
3114 coro_thx = PERL_GET_CONTEXT; 3439 coro_thx = PERL_GET_CONTEXT;
3115# endif 3440# endif
3116#endif 3441#endif
3117 BOOT_PAGESIZE; 3442 BOOT_PAGESIZE;
3443
3444 /* perl defines these to check for existance first, but why it doesn't */
3445 /* just create them one at init time is not clear to me, except for */
3446 /* programs trying to delete them, but... */
3447 /* anyway, we declare this as invalid and make sure they are initialised here */
3448 DEFSV;
3449 ERRSV;
3118 3450
3119 cctx_current = cctx_new_empty (); 3451 cctx_current = cctx_new_empty ();
3120 3452
3121 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3453 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3122 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3454 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3165 coroapi.prepare_cede_notself = prepare_cede_notself; 3497 coroapi.prepare_cede_notself = prepare_cede_notself;
3166 3498
3167 time_init (aTHX); 3499 time_init (aTHX);
3168 3500
3169 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3501 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3502#if CORO_JIT
3503 PUTBACK;
3504 jit_init (aTHX);
3505 SPAGAIN;
3506#endif
3170} 3507}
3171 3508
3172SV * 3509SV *
3173new (SV *klass, ...) 3510new (SV *klass, ...)
3174 ALIAS: 3511 ALIAS:
… …
3181void 3518void
3182transfer (...) 3519transfer (...)
3183 PROTOTYPE: $$ 3520 PROTOTYPE: $$
3184 CODE: 3521 CODE:
3185 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3522 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3186
3187bool
3188_destroy (SV *coro_sv)
3189 CODE:
3190 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3191 OUTPUT:
3192 RETVAL
3193 3523
3194void 3524void
3195_exit (int code) 3525_exit (int code)
3196 PROTOTYPE: $ 3526 PROTOTYPE: $
3197 CODE: 3527 CODE:
… …
3273 CODE: 3603 CODE:
3274{ 3604{
3275 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3605 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3276 { 3606 {
3277 struct coro *current = SvSTATE_current; 3607 struct coro *current = SvSTATE_current;
3608 struct CoroSLF slf_save;
3278 3609
3279 if (current != coro) 3610 if (current != coro)
3280 { 3611 {
3281 PUTBACK; 3612 PUTBACK;
3282 save_perl (aTHX_ current); 3613 save_perl (aTHX_ current);
3283 load_perl (aTHX_ coro); 3614 load_perl (aTHX_ coro);
3615 /* the coro is most likely in an active SLF call.
3616 * while not strictly required (the code we execute is
3617 * not allowed to call any SLF functions), it's cleaner
3618 * to reinitialise the slf_frame and restore it later.
3619 * This might one day allow us to actually do SLF calls
3620 * from code executed here.
3621 */
3622 slf_save = slf_frame;
3623 slf_frame.prepare = 0;
3284 SPAGAIN; 3624 SPAGAIN;
3285 } 3625 }
3286 3626
3287 PUSHSTACK; 3627 PUSHSTACK;
3288 3628
… …
3298 SPAGAIN; 3638 SPAGAIN;
3299 3639
3300 if (current != coro) 3640 if (current != coro)
3301 { 3641 {
3302 PUTBACK; 3642 PUTBACK;
3643 slf_frame = slf_save;
3303 save_perl (aTHX_ coro); 3644 save_perl (aTHX_ coro);
3304 load_perl (aTHX_ current); 3645 load_perl (aTHX_ current);
3305 SPAGAIN; 3646 SPAGAIN;
3306 } 3647 }
3307 } 3648 }
… …
3312 PROTOTYPE: $ 3653 PROTOTYPE: $
3313 ALIAS: 3654 ALIAS:
3314 is_ready = CF_READY 3655 is_ready = CF_READY
3315 is_running = CF_RUNNING 3656 is_running = CF_RUNNING
3316 is_new = CF_NEW 3657 is_new = CF_NEW
3317 is_destroyed = CF_DESTROYED 3658 is_destroyed = CF_ZOMBIE
3659 is_zombie = CF_ZOMBIE
3318 is_suspended = CF_SUSPENDED 3660 is_suspended = CF_SUSPENDED
3319 CODE: 3661 CODE:
3320 RETVAL = boolSV (coro->flags & ix); 3662 RETVAL = boolSV (coro->flags & ix);
3321 OUTPUT: 3663 OUTPUT:
3322 RETVAL 3664 RETVAL
… …
3393 3735
3394void 3736void
3395cancel (Coro::State self) 3737cancel (Coro::State self)
3396 CODE: 3738 CODE:
3397 coro_state_destroy (aTHX_ self); 3739 coro_state_destroy (aTHX_ self);
3398 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3399
3400 3740
3401SV * 3741SV *
3402enable_times (int enabled = enable_times) 3742enable_times (int enabled = enable_times)
3403 CODE: 3743 CODE:
3404{ 3744{
… …
3419times (Coro::State self) 3759times (Coro::State self)
3420 PPCODE: 3760 PPCODE:
3421{ 3761{
3422 struct coro *current = SvSTATE (coro_current); 3762 struct coro *current = SvSTATE (coro_current);
3423 3763
3424 if (expect_false (current == self)) 3764 if (ecb_expect_false (current == self))
3425 { 3765 {
3426 coro_times_update (); 3766 coro_times_update ();
3427 coro_times_add (SvSTATE (coro_current)); 3767 coro_times_add (SvSTATE (coro_current));
3428 } 3768 }
3429 3769
3430 EXTEND (SP, 2); 3770 EXTEND (SP, 2);
3431 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3771 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3432 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3772 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3433 3773
3434 if (expect_false (current == self)) 3774 if (ecb_expect_false (current == self))
3435 coro_times_sub (SvSTATE (coro_current)); 3775 coro_times_sub (SvSTATE (coro_current));
3436} 3776}
3437 3777
3438void 3778void
3439swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3779swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3460BOOT: 3800BOOT:
3461{ 3801{
3462 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3802 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3463 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3803 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3464 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3804 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3465 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3466 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3805 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3467 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3806 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3468 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3807 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3469 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3808 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3470 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3809 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
… …
3509 api_ready (aTHX_ RETVAL); 3848 api_ready (aTHX_ RETVAL);
3510 OUTPUT: 3849 OUTPUT:
3511 RETVAL 3850 RETVAL
3512 3851
3513void 3852void
3853_destroy (Coro::State coro)
3854 CODE:
3855 /* used by the manager thread */
3856 coro_state_destroy (aTHX_ coro);
3857
3858void
3859on_destroy (Coro::State coro, SV *cb)
3860 CODE:
3861 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3862
3863void
3864join (...)
3865 CODE:
3866 CORO_EXECUTE_SLF_XS (slf_init_join);
3867
3868void
3514terminate (...) 3869terminate (...)
3515 CODE: 3870 CODE:
3516 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3871 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3872
3873void
3874cancel (...)
3875 CODE:
3876 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3877
3878int
3879safe_cancel (Coro::State self, ...)
3880 C_ARGS: aTHX_ self, &ST (1), items - 1
3517 3881
3518void 3882void
3519schedule (...) 3883schedule (...)
3520 CODE: 3884 CODE:
3521 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3885 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3797} 4161}
3798 4162
3799MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4163MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3800 4164
3801void 4165void
3802_may_delete (SV *sem, int count, int extra_refs) 4166_may_delete (SV *sem, int count, unsigned int extra_refs)
3803 PPCODE: 4167 PPCODE:
3804{ 4168{
3805 AV *av = (AV *)SvRV (sem); 4169 AV *av = (AV *)SvRV (sem);
3806 4170
3807 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4171 if (SvREFCNT ((SV *)av) == 1 + extra_refs

Diff Legend

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