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

Diff Legend

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