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.386 by root, Sat Feb 19 06:51:23 2011 UTC vs.
Revision 1.414 by root, Wed Jun 29 16:08:31 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
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 */
… …
195 int valgrind_id; 192 int valgrind_id;
196#endif 193#endif
197 unsigned char flags; 194 unsigned char flags;
198} coro_cctx; 195} coro_cctx;
199 196
200coro_cctx *cctx_current; /* the currently running cctx */ 197static coro_cctx *cctx_current; /* the currently running cctx */
201 198
202/*****************************************************************************/ 199/*****************************************************************************/
203 200
201static MGVTBL coro_state_vtbl;
202
204enum { 203enum
204{
205 CF_RUNNING = 0x0001, /* coroutine is running */ 205 CF_RUNNING = 0x0001, /* coroutine is running */
206 CF_READY = 0x0002, /* coroutine is ready */ 206 CF_READY = 0x0002, /* coroutine is ready */
207 CF_NEW = 0x0004, /* has never been switched to */ 207 CF_NEW = 0x0004, /* has never been switched to */
208 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 208 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
209 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 209 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
210 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
210}; 211};
211 212
212/* the structure where most of the perl state is stored, overlaid on the cxstack */ 213/* the structure where most of the perl state is stored, overlaid on the cxstack */
213typedef struct 214typedef struct
214{ 215{
215 SV *defsv;
216 AV *defav;
217 SV *errsv;
218 SV *irsgv;
219 HV *hinthv;
220#define VAR(name,type) type name; 216#define VARx(name,expr,type) type name;
221# include "state.h" 217# include "state.h"
222#undef VAR 218#undef VARx
223} perl_slots; 219} perl_slots;
224 220
221/* 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)) 222#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
226 223
227/* this is a structure representing a perl-level coroutine */ 224/* this is a structure representing a perl-level coroutine */
228struct coro { 225struct coro
226{
229 /* the C coroutine allocated to this perl coroutine, if any */ 227 /* the C coroutine allocated to this perl coroutine, if any */
230 coro_cctx *cctx; 228 coro_cctx *cctx;
231 229
232 /* ready queue */ 230 /* ready queue */
233 struct coro *next_ready; 231 struct coro *next_ready;
… …
235 /* state data */ 233 /* state data */
236 struct CoroSLF slf_frame; /* saved slf frame */ 234 struct CoroSLF slf_frame; /* saved slf frame */
237 AV *mainstack; 235 AV *mainstack;
238 perl_slots *slot; /* basically the saved sp */ 236 perl_slots *slot; /* basically the saved sp */
239 237
240 CV *startcv; /* the CV to execute */ 238 CV *startcv; /* the CV to execute */
241 AV *args; /* data associated with this coroutine (initial args) */ 239 AV *args; /* data associated with this coroutine (initial args) */
242 int refcnt; /* coroutines are refcounted, yes */
243 int flags; /* CF_ flags */ 240 int flags; /* CF_ flags */
244 HV *hv; /* the perl hash associated with this coro, if any */ 241 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 242
247 /* statistics */ 243 /* statistics */
248 int usecount; /* number of transfers to this coro */ 244 int usecount; /* number of transfers to this coro */
249 245
250 /* coro process data */ 246 /* coro process data */
251 int prio; 247 int prio;
252 SV *except; /* exception to be thrown */ 248 SV *except; /* exception to be thrown */
253 SV *rouse_cb; 249 SV *rouse_cb; /* last rouse callback */
250 AV *on_destroy; /* callbacks or coros to notify on destroy */
251 AV *status; /* the exit status list */
254 252
255 /* async_pool */ 253 /* async_pool */
256 SV *saved_deffh; 254 SV *saved_deffh;
257 SV *invoke_cb; 255 SV *invoke_cb;
258 AV *invoke_av; 256 AV *invoke_av;
… …
274typedef struct coro *Coro__State; 272typedef struct coro *Coro__State;
275typedef struct coro *Coro__State_or_hashref; 273typedef struct coro *Coro__State_or_hashref;
276 274
277/* the following variables are effectively part of the perl context */ 275/* the following variables are effectively part of the perl context */
278/* and get copied between struct coro and these variables */ 276/* and get copied between struct coro and these variables */
279/* the mainr easonw e don't support windows process emulation */ 277/* the main reason we don't support windows process emulation */
280static struct CoroSLF slf_frame; /* the current slf frame */ 278static struct CoroSLF slf_frame; /* the current slf frame */
281 279
282/** Coro ********************************************************************/ 280/** Coro ********************************************************************/
283 281
284#define CORO_PRIO_MAX 3 282#define CORO_PRIO_MAX 3
… …
290 288
291/* for Coro.pm */ 289/* for Coro.pm */
292static SV *coro_current; 290static SV *coro_current;
293static SV *coro_readyhook; 291static SV *coro_readyhook;
294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 292static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
295static CV *cv_coro_run, *cv_coro_terminate; 293static CV *cv_coro_run;
296static struct coro *coro_first; 294static struct coro *coro_first;
297#define coro_nready coroapi.nready 295#define coro_nready coroapi.nready
296
297/** JIT *********************************************************************/
298
299#if CORO_JIT
300 /* APPLE doesn't have HAVE_MMAP though */
301 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
302 #ifndef CORO_JIT_TYPE
303 #if __x86_64 && CORO_JIT_UNIXY
304 #define CORO_JIT_TYPE "amd64-unix"
305 #elif __i386 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "x86-unix"
307 #endif
308 #endif
309#endif
310
311#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP
312 #undef CORO_JIT
313#endif
314
315#if CORO_JIT
316 typedef void (*load_save_perl_slots_type)(perl_slots *);
317 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
318#endif
298 319
299/** Coro::Select ************************************************************/ 320/** Coro::Select ************************************************************/
300 321
301static OP *(*coro_old_pp_sselect) (pTHX); 322static OP *(*coro_old_pp_sselect) (pTHX);
302static SV *coro_select_select; 323static SV *coro_select_select;
… …
318 339
319/** time stuff **************************************************************/ 340/** time stuff **************************************************************/
320 341
321#ifdef HAS_GETTIMEOFDAY 342#ifdef HAS_GETTIMEOFDAY
322 343
323static void 344ecb_inline void
324coro_u2time (aTHX_ UV ret[2]) 345coro_u2time (pTHX_ UV ret[2])
325{ 346{
326 struct timeval tv; 347 struct timeval tv;
327 gettimeofday (&tv, 0); 348 gettimeofday (&tv, 0);
328 349
329 ret [0] = tv.tv_sec; 350 ret [0] = tv.tv_sec;
330 ret [1] = tv.tv_usec; 351 ret [1] = tv.tv_usec;
331} 352}
332 353
333static double 354ecb_inline double
334coro_nvtime () 355coro_nvtime (void)
335{ 356{
336 struct timeval tv; 357 struct timeval tv;
337 gettimeofday (&tv, 0); 358 gettimeofday (&tv, 0);
338 359
339 return tv.tv_sec + tv.tv_usec * 1e-6; 360 return tv.tv_sec + tv.tv_usec * 1e-6;
340} 361}
341 362
342static void 363ecb_inline void
343time_init (void) 364time_init (pTHX)
344{ 365{
345 nvtime = coro_nvtime; 366 nvtime = coro_nvtime;
346 u2time = coro_u2time; 367 u2time = coro_u2time;
347} 368}
348 369
349#else 370#else
350 371
351static void 372ecb_inline void
352time_init (void) 373time_init (pTHX)
353{ 374{
354 SV **svp; 375 SV **svp;
355 376
356 require_pv ("Time::HiRes"); 377 require_pv ("Time/HiRes.pm");
357 378
358 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 379 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
359 380
360 if (!svp) croak ("Time::HiRes is required"); 381 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
361 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 382 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
362 383
363 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 384 nvtime = INT2PTR (double (*)(), SvIV (*svp));
364 385
365 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0); 386 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
366 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp)); 387 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
… …
368 389
369#endif 390#endif
370 391
371/** lowlevel stuff **********************************************************/ 392/** lowlevel stuff **********************************************************/
372 393
373static SV * 394static SV * ecb_noinline
374coro_get_sv (pTHX_ const char *name, int create) 395coro_get_sv (pTHX_ const char *name, int create)
375{ 396{
376#if PERL_VERSION_ATLEAST (5,10,0) 397#if PERL_VERSION_ATLEAST (5,10,0)
377 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 398 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
378 get_sv (name, create); 399 get_sv (name, create);
379#endif 400#endif
380 return get_sv (name, create); 401 return get_sv (name, create);
381} 402}
382 403
383static AV * 404static AV * ecb_noinline
384coro_get_av (pTHX_ const char *name, int create) 405coro_get_av (pTHX_ const char *name, int create)
385{ 406{
386#if PERL_VERSION_ATLEAST (5,10,0) 407#if PERL_VERSION_ATLEAST (5,10,0)
387 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 408 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
388 get_av (name, create); 409 get_av (name, create);
389#endif 410#endif
390 return get_av (name, create); 411 return get_av (name, create);
391} 412}
392 413
393static HV * 414static HV * ecb_noinline
394coro_get_hv (pTHX_ const char *name, int create) 415coro_get_hv (pTHX_ const char *name, int create)
395{ 416{
396#if PERL_VERSION_ATLEAST (5,10,0) 417#if PERL_VERSION_ATLEAST (5,10,0)
397 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 418 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
398 get_hv (name, create); 419 get_hv (name, create);
399#endif 420#endif
400 return get_hv (name, create); 421 return get_hv (name, create);
401} 422}
402 423
403INLINE void 424ecb_inline void
404coro_times_update () 425coro_times_update (void)
405{ 426{
406#ifdef coro_clock_gettime 427#ifdef coro_clock_gettime
407 struct timespec ts; 428 struct timespec ts;
408 429
409 ts.tv_sec = ts.tv_nsec = 0; 430 ts.tv_sec = ts.tv_nsec = 0;
… …
421 time_real [0] = tv [0]; 442 time_real [0] = tv [0];
422 time_real [1] = tv [1] * 1000; 443 time_real [1] = tv [1] * 1000;
423#endif 444#endif
424} 445}
425 446
426INLINE void 447ecb_inline void
427coro_times_add (struct coro *c) 448coro_times_add (struct coro *c)
428{ 449{
429 c->t_real [1] += time_real [1]; 450 c->t_real [1] += time_real [1];
430 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 451 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
431 c->t_real [0] += time_real [0]; 452 c->t_real [0] += time_real [0];
… …
433 c->t_cpu [1] += time_cpu [1]; 454 c->t_cpu [1] += time_cpu [1];
434 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 455 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
435 c->t_cpu [0] += time_cpu [0]; 456 c->t_cpu [0] += time_cpu [0];
436} 457}
437 458
438INLINE void 459ecb_inline void
439coro_times_sub (struct coro *c) 460coro_times_sub (struct coro *c)
440{ 461{
441 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 462 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]; 463 c->t_real [1] -= time_real [1];
443 c->t_real [0] -= time_real [0]; 464 c->t_real [0] -= time_real [0];
… …
451/* magic glue */ 472/* magic glue */
452 473
453#define CORO_MAGIC_type_cv 26 474#define CORO_MAGIC_type_cv 26
454#define CORO_MAGIC_type_state PERL_MAGIC_ext 475#define CORO_MAGIC_type_state PERL_MAGIC_ext
455 476
456#define CORO_MAGIC_NN(sv, type) \ 477#define CORO_MAGIC_NN(sv, type) \
457 (expect_true (SvMAGIC (sv)->mg_type == type) \ 478 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
458 ? SvMAGIC (sv) \ 479 ? SvMAGIC (sv) \
459 : mg_find (sv, type)) 480 : mg_find (sv, type))
460 481
461#define CORO_MAGIC(sv, type) \ 482#define CORO_MAGIC(sv, type) \
462 (expect_true (SvMAGIC (sv)) \ 483 (ecb_expect_true (SvMAGIC (sv)) \
463 ? CORO_MAGIC_NN (sv, type) \ 484 ? CORO_MAGIC_NN (sv, type) \
464 : 0) 485 : 0)
465 486
466#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 487#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) 488#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
468 489
469INLINE struct coro * 490ecb_inline MAGIC *
491SvSTATEhv_p (pTHX_ SV *coro)
492{
493 MAGIC *mg;
494
495 if (ecb_expect_true (
496 SvTYPE (coro) == SVt_PVHV
497 && (mg = CORO_MAGIC_state (coro))
498 && mg->mg_virtual == &coro_state_vtbl
499 ))
500 return mg;
501
502 return 0;
503}
504
505ecb_inline struct coro *
470SvSTATE_ (pTHX_ SV *coro) 506SvSTATE_ (pTHX_ SV *coro)
471{ 507{
472 HV *stash;
473 MAGIC *mg; 508 MAGIC *mg;
474 509
475 if (SvROK (coro)) 510 if (SvROK (coro))
476 coro = SvRV (coro); 511 coro = SvRV (coro);
477 512
478 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 513 mg = SvSTATEhv_p (aTHX_ coro);
514 if (!mg)
479 croak ("Coro::State object required"); 515 croak ("Coro::State object required");
480 516
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; 517 return (struct coro *)mg->mg_ptr;
491} 518}
492 519
493#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 520#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
494 521
… …
497#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 524#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
498 525
499/*****************************************************************************/ 526/*****************************************************************************/
500/* padlist management and caching */ 527/* padlist management and caching */
501 528
502static AV * 529ecb_inline AV *
503coro_derive_padlist (pTHX_ CV *cv) 530coro_derive_padlist (pTHX_ CV *cv)
504{ 531{
505 AV *padlist = CvPADLIST (cv); 532 AV *padlist = CvPADLIST (cv);
506 AV *newpadlist, *newpad; 533 AV *newpadlist, *newpad;
507 534
… …
519 av_store (newpadlist, 1, (SV *)newpad); 546 av_store (newpadlist, 1, (SV *)newpad);
520 547
521 return newpadlist; 548 return newpadlist;
522} 549}
523 550
524static void 551ecb_inline void
525free_padlist (pTHX_ AV *padlist) 552free_padlist (pTHX_ AV *padlist)
526{ 553{
527 /* may be during global destruction */ 554 /* may be during global destruction */
528 if (!IN_DESTRUCT) 555 if (!IN_DESTRUCT)
529 { 556 {
… …
572 0, 0, 0, 0, 599 0, 0, 0, 0,
573 coro_cv_free 600 coro_cv_free
574}; 601};
575 602
576/* the next two functions merely cache the padlists */ 603/* the next two functions merely cache the padlists */
577static void 604ecb_inline void
578get_padlist (pTHX_ CV *cv) 605get_padlist (pTHX_ CV *cv)
579{ 606{
580 MAGIC *mg = CORO_MAGIC_cv (cv); 607 MAGIC *mg = CORO_MAGIC_cv (cv);
581 AV *av; 608 AV *av;
582 609
583 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 610 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
584 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 611 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
585 else 612 else
586 { 613 {
587#if CORO_PREFER_PERL_FUNCTIONS 614#if CORO_PREFER_PERL_FUNCTIONS
588 /* this is probably cleaner? but also slower! */ 615 /* this is probably cleaner? but also slower! */
… …
595 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 622 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
596#endif 623#endif
597 } 624 }
598} 625}
599 626
600static void 627ecb_inline void
601put_padlist (pTHX_ CV *cv) 628put_padlist (pTHX_ CV *cv)
602{ 629{
603 MAGIC *mg = CORO_MAGIC_cv (cv); 630 MAGIC *mg = CORO_MAGIC_cv (cv);
604 AV *av; 631 AV *av;
605 632
606 if (expect_false (!mg)) 633 if (ecb_expect_false (!mg))
607 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 634 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
608 635
609 av = (AV *)mg->mg_obj; 636 av = (AV *)mg->mg_obj;
610 637
611 if (expect_false (AvFILLp (av) >= AvMAX (av))) 638 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
612 av_extend (av, AvFILLp (av) + 1); 639 av_extend (av, AvFILLp (av) + 1);
613 640
614 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 641 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
615} 642}
616 643
… …
661 } 688 }
662#endif 689#endif
663 } 690 }
664} 691}
665 692
666#define SWAP_SVS(coro) \ 693#define SWAP_SVS(coro) \
667 if (expect_false ((coro)->swap_sv)) \ 694 if (ecb_expect_false ((coro)->swap_sv)) \
668 swap_svs (aTHX_ (coro)) 695 swap_svs (aTHX_ (coro))
669 696
670static void 697static void
671on_enterleave_call (pTHX_ SV *cb); 698on_enterleave_call (pTHX_ SV *cb);
672 699
… …
676 perl_slots *slot = c->slot; 703 perl_slots *slot = c->slot;
677 c->slot = 0; 704 c->slot = 0;
678 705
679 PL_mainstack = c->mainstack; 706 PL_mainstack = c->mainstack;
680 707
681 GvSV (PL_defgv) = slot->defsv; 708#if CORO_JIT
682 GvAV (PL_defgv) = slot->defav; 709 load_perl_slots (slot);
683 GvSV (PL_errgv) = slot->errsv; 710#else
684 GvSV (irsgv) = slot->irsgv;
685 GvHV (PL_hintgv) = slot->hinthv;
686
687 #define VAR(name,type) PL_ ## name = slot->name; 711 #define VARx(name,expr,type) expr = slot->name;
688 # include "state.h" 712 # include "state.h"
689 #undef VAR 713 #undef VARx
714#endif
690 715
691 { 716 {
692 dSP; 717 dSP;
693 718
694 CV *cv; 719 CV *cv;
695 720
696 /* now do the ugly restore mess */ 721 /* now do the ugly restore mess */
697 while (expect_true (cv = (CV *)POPs)) 722 while (ecb_expect_true (cv = (CV *)POPs))
698 { 723 {
699 put_padlist (aTHX_ cv); /* mark this padlist as available */ 724 put_padlist (aTHX_ cv); /* mark this padlist as available */
700 CvDEPTH (cv) = PTR2IV (POPs); 725 CvDEPTH (cv) = PTR2IV (POPs);
701 CvPADLIST (cv) = (AV *)POPs; 726 CvPADLIST (cv) = (AV *)POPs;
702 } 727 }
… …
705 } 730 }
706 731
707 slf_frame = c->slf_frame; 732 slf_frame = c->slf_frame;
708 CORO_THROW = c->except; 733 CORO_THROW = c->except;
709 734
710 if (expect_false (enable_times)) 735 if (ecb_expect_false (enable_times))
711 { 736 {
712 if (expect_false (!times_valid)) 737 if (ecb_expect_false (!times_valid))
713 coro_times_update (); 738 coro_times_update ();
714 739
715 coro_times_sub (c); 740 coro_times_sub (c);
716 } 741 }
717 742
718 if (expect_false (c->on_enter)) 743 if (ecb_expect_false (c->on_enter))
719 { 744 {
720 int i; 745 int i;
721 746
722 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 747 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
723 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 748 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
729static void 754static void
730save_perl (pTHX_ Coro__State c) 755save_perl (pTHX_ Coro__State c)
731{ 756{
732 SWAP_SVS (c); 757 SWAP_SVS (c);
733 758
734 if (expect_false (c->on_leave)) 759 if (ecb_expect_false (c->on_leave))
735 { 760 {
736 int i; 761 int i;
737 762
738 for (i = AvFILLp (c->on_leave); i >= 0; --i) 763 for (i = AvFILLp (c->on_leave); i >= 0; --i)
739 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 764 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
740 } 765 }
741 766
742 times_valid = 0; 767 times_valid = 0;
743 768
744 if (expect_false (enable_times)) 769 if (ecb_expect_false (enable_times))
745 { 770 {
746 coro_times_update (); times_valid = 1; 771 coro_times_update (); times_valid = 1;
747 coro_times_add (c); 772 coro_times_add (c);
748 } 773 }
749 774
… …
763 788
764 XPUSHs (Nullsv); 789 XPUSHs (Nullsv);
765 /* this loop was inspired by pp_caller */ 790 /* this loop was inspired by pp_caller */
766 for (;;) 791 for (;;)
767 { 792 {
768 while (expect_true (cxix >= 0)) 793 while (ecb_expect_true (cxix >= 0))
769 { 794 {
770 PERL_CONTEXT *cx = &ccstk[cxix--]; 795 PERL_CONTEXT *cx = &ccstk[cxix--];
771 796
772 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 797 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
773 { 798 {
774 CV *cv = cx->blk_sub.cv; 799 CV *cv = cx->blk_sub.cv;
775 800
776 if (expect_true (CvDEPTH (cv))) 801 if (ecb_expect_true (CvDEPTH (cv)))
777 { 802 {
778 EXTEND (SP, 3); 803 EXTEND (SP, 3);
779 PUSHs ((SV *)CvPADLIST (cv)); 804 PUSHs ((SV *)CvPADLIST (cv));
780 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 805 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
781 PUSHs ((SV *)cv); 806 PUSHs ((SV *)cv);
… …
784 get_padlist (aTHX_ cv); 809 get_padlist (aTHX_ cv);
785 } 810 }
786 } 811 }
787 } 812 }
788 813
789 if (expect_true (top_si->si_type == PERLSI_MAIN)) 814 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
790 break; 815 break;
791 816
792 top_si = top_si->si_prev; 817 top_si = top_si->si_prev;
793 ccstk = top_si->si_cxstack; 818 ccstk = top_si->si_cxstack;
794 cxix = top_si->si_cxix; 819 cxix = top_si->si_cxix;
… …
796 821
797 PUTBACK; 822 PUTBACK;
798 } 823 }
799 824
800 /* allocate some space on the context stack for our purposes */ 825 /* allocate some space on the context stack for our purposes */
801 /* we manually unroll here, as usually 2 slots is enough */ 826 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 { 827 {
806 unsigned int i; 828 unsigned int i;
829
807 for (i = 3; i < SLOT_COUNT; ++i) 830 for (i = 0; i < SLOT_COUNT; ++i)
808 CXINC; 831 CXINC;
809 } 832
810 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 833 cxstack_ix -= SLOT_COUNT; /* undo allocation */
834 }
811 835
812 c->mainstack = PL_mainstack; 836 c->mainstack = PL_mainstack;
813 837
814 { 838 {
815 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 839 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
816 840
817 slot->defav = GvAV (PL_defgv); 841#if CORO_JIT
818 slot->defsv = DEFSV; 842 save_perl_slots (slot);
819 slot->errsv = ERRSV; 843#else
820 slot->irsgv = GvSV (irsgv);
821 slot->hinthv = GvHV (PL_hintgv);
822
823 #define VAR(name,type) slot->name = PL_ ## name; 844 #define VARx(name,expr,type) slot->name = expr;
824 # include "state.h" 845 # include "state.h"
825 #undef VAR 846 #undef VARx
847#endif
826 } 848 }
827} 849}
828 850
829/* 851/*
830 * allocate various perl stacks. This is almost an exact copy 852 * allocate various perl stacks. This is almost an exact copy
… …
836# define coro_init_stacks(thx) init_stacks () 858# define coro_init_stacks(thx) init_stacks ()
837#else 859#else
838static void 860static void
839coro_init_stacks (pTHX) 861coro_init_stacks (pTHX)
840{ 862{
841 PL_curstackinfo = new_stackinfo(32, 8); 863 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; 864 PL_curstackinfo->si_type = PERLSI_MAIN;
843 PL_curstack = PL_curstackinfo->si_stack; 865 PL_curstack = PL_curstackinfo->si_stack;
844 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 866 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
845 867
846 PL_stack_base = AvARRAY(PL_curstack); 868 PL_stack_base = AvARRAY(PL_curstack);
… …
861#endif 883#endif
862 884
863 New(54,PL_scopestack,8,I32); 885 New(54,PL_scopestack,8,I32);
864 PL_scopestack_ix = 0; 886 PL_scopestack_ix = 0;
865 PL_scopestack_max = 8; 887 PL_scopestack_max = 8;
888#if HAS_SCOPESTACK_NAME
889 New(54,PL_scopestack_name,8,const char*);
890#endif
866 891
867 New(54,PL_savestack,24,ANY); 892 New(54,PL_savestack,24,ANY);
868 PL_savestack_ix = 0; 893 PL_savestack_ix = 0;
869 PL_savestack_max = 24; 894 PL_savestack_max = 24;
870 895
… …
898 } 923 }
899 924
900 Safefree (PL_tmps_stack); 925 Safefree (PL_tmps_stack);
901 Safefree (PL_markstack); 926 Safefree (PL_markstack);
902 Safefree (PL_scopestack); 927 Safefree (PL_scopestack);
928#if HAS_SCOPESTACK_NAME
929 Safefree (PL_scopestack_name);
930#endif
903 Safefree (PL_savestack); 931 Safefree (PL_savestack);
904#if !PERL_VERSION_ATLEAST (5,10,0) 932#if !PERL_VERSION_ATLEAST (5,10,0)
905 Safefree (PL_retstack); 933 Safefree (PL_retstack);
906#endif 934#endif
907} 935}
… …
953#endif 981#endif
954 982
955/* 983/*
956 * This overrides the default magic get method of %SIG elements. 984 * 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 985 * 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 986 * and instead of trying to save and restore the hash elements (extremely slow),
959 * readback here. 987 * we just provide our own readback here.
960 */ 988 */
961static int 989static int ecb_cold
962coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 990coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
963{ 991{
964 const char *s = MgPV_nolen_const (mg); 992 const char *s = MgPV_nolen_const (mg);
965 993
966 if (*s == '_') 994 if (*s == '_')
… …
978 } 1006 }
979 1007
980 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1008 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
981} 1009}
982 1010
983static int 1011static int ecb_cold
984coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1012coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
985{ 1013{
986 const char *s = MgPV_nolen_const (mg); 1014 const char *s = MgPV_nolen_const (mg);
987 1015
988 if (*s == '_') 1016 if (*s == '_')
… …
1002 } 1030 }
1003 1031
1004 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1032 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1005} 1033}
1006 1034
1007static int 1035static int ecb_cold
1008coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1036coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1009{ 1037{
1010 const char *s = MgPV_nolen_const (mg); 1038 const char *s = MgPV_nolen_const (mg);
1011 1039
1012 if (*s == '_') 1040 if (*s == '_')
… …
1047 return 1; 1075 return 1;
1048} 1076}
1049 1077
1050static UNOP init_perl_op; 1078static UNOP init_perl_op;
1051 1079
1052static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1080ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1053init_perl (pTHX_ struct coro *coro) 1081init_perl (pTHX_ struct coro *coro)
1054{ 1082{
1055 /* 1083 /*
1056 * emulate part of the perl startup here. 1084 * emulate part of the perl startup here.
1057 */ 1085 */
… …
1072 PL_parser = 0; 1100 PL_parser = 0;
1073#endif 1101#endif
1074 PL_hints = 0; 1102 PL_hints = 0;
1075 1103
1076 /* recreate the die/warn hooks */ 1104 /* recreate the die/warn hooks */
1077 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1105 PL_diehook = SvREFCNT_inc (rv_diehook);
1078 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1106 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1079 1107
1080 GvSV (PL_defgv) = newSV (0); 1108 GvSV (PL_defgv) = newSV (0);
1081 GvAV (PL_defgv) = coro->args; coro->args = 0; 1109 GvAV (PL_defgv) = coro->args; coro->args = 0;
1082 GvSV (PL_errgv) = newSV (0); 1110 GvSV (PL_errgv) = newSV (0);
1083 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1111 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 1132 /* 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. 1133 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1106 */ 1134 */
1107 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1135 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 */ 1136 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1137 slf_frame.destroy = 0;
1109 1138
1110 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1139 /* 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; 1140 init_perl_op.op_next = PL_op;
1112 init_perl_op.op_type = OP_ENTERSUB; 1141 init_perl_op.op_type = OP_ENTERSUB;
1113 init_perl_op.op_ppaddr = pp_slf; 1142 init_perl_op.op_ppaddr = pp_slf;
… …
1118 /* copy throw, in case it was set before init_perl */ 1147 /* copy throw, in case it was set before init_perl */
1119 CORO_THROW = coro->except; 1148 CORO_THROW = coro->except;
1120 1149
1121 SWAP_SVS (coro); 1150 SWAP_SVS (coro);
1122 1151
1123 if (expect_false (enable_times)) 1152 if (ecb_expect_false (enable_times))
1124 { 1153 {
1125 coro_times_update (); 1154 coro_times_update ();
1126 coro_times_sub (coro); 1155 coro_times_sub (coro);
1127 } 1156 }
1128} 1157}
… …
1152destroy_perl (pTHX_ struct coro *coro) 1181destroy_perl (pTHX_ struct coro *coro)
1153{ 1182{
1154 SV *svf [9]; 1183 SV *svf [9];
1155 1184
1156 { 1185 {
1186 SV *old_current = SvRV (coro_current);
1157 struct coro *current = SvSTATE_current; 1187 struct coro *current = SvSTATE (old_current);
1158 1188
1159 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1189 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1160 1190
1161 save_perl (aTHX_ current); 1191 save_perl (aTHX_ current);
1192
1193 /* this will cause transfer_check to croak on block*/
1194 SvRV_set (coro_current, (SV *)coro->hv);
1195
1162 load_perl (aTHX_ coro); 1196 load_perl (aTHX_ coro);
1163 1197
1164 coro_unwind_stacks (aTHX); 1198 coro_unwind_stacks (aTHX);
1165 coro_destruct_stacks (aTHX);
1166 1199
1167 /* restore swapped sv's */ 1200 /* restore swapped sv's */
1168 SWAP_SVS (coro); 1201 SWAP_SVS (coro);
1169 1202
1203 coro_destruct_stacks (aTHX);
1204
1170 // now save some sv's to be free'd later 1205 /* now save some sv's to be free'd later */
1171 svf [0] = GvSV (PL_defgv); 1206 svf [0] = GvSV (PL_defgv);
1172 svf [1] = (SV *)GvAV (PL_defgv); 1207 svf [1] = (SV *)GvAV (PL_defgv);
1173 svf [2] = GvSV (PL_errgv); 1208 svf [2] = GvSV (PL_errgv);
1174 svf [3] = (SV *)PL_defoutgv; 1209 svf [3] = (SV *)PL_defoutgv;
1175 svf [4] = PL_rs; 1210 svf [4] = PL_rs;
… …
1177 svf [6] = (SV *)GvHV (PL_hintgv); 1212 svf [6] = (SV *)GvHV (PL_hintgv);
1178 svf [7] = PL_diehook; 1213 svf [7] = PL_diehook;
1179 svf [8] = PL_warnhook; 1214 svf [8] = PL_warnhook;
1180 assert (9 == sizeof (svf) / sizeof (*svf)); 1215 assert (9 == sizeof (svf) / sizeof (*svf));
1181 1216
1217 SvRV_set (coro_current, old_current);
1218
1182 load_perl (aTHX_ current); 1219 load_perl (aTHX_ current);
1183 } 1220 }
1184 1221
1185 { 1222 {
1186 unsigned int i; 1223 unsigned int i;
… …
1193 SvREFCNT_dec (coro->invoke_cb); 1230 SvREFCNT_dec (coro->invoke_cb);
1194 SvREFCNT_dec (coro->invoke_av); 1231 SvREFCNT_dec (coro->invoke_av);
1195 } 1232 }
1196} 1233}
1197 1234
1198INLINE void 1235ecb_inline void
1199free_coro_mortal (pTHX) 1236free_coro_mortal (pTHX)
1200{ 1237{
1201 if (expect_true (coro_mortal)) 1238 if (ecb_expect_true (coro_mortal))
1202 { 1239 {
1203 SvREFCNT_dec (coro_mortal); 1240 SvREFCNT_dec ((SV *)coro_mortal);
1204 coro_mortal = 0; 1241 coro_mortal = 0;
1205 } 1242 }
1206} 1243}
1207 1244
1208static int 1245static int
… …
1341 1378
1342 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1379 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1343} 1380}
1344 1381
1345/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1382/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1346static void NOINLINE 1383static void ecb_noinline
1347cctx_prepare (pTHX) 1384cctx_prepare (pTHX)
1348{ 1385{
1349 PL_top_env = &PL_start_env; 1386 PL_top_env = &PL_start_env;
1350 1387
1351 if (cctx_current->flags & CC_TRACE) 1388 if (cctx_current->flags & CC_TRACE)
… …
1362 slf_frame.prepare = slf_prepare_set_stacklevel; 1399 slf_frame.prepare = slf_prepare_set_stacklevel;
1363 slf_frame.check = slf_check_set_stacklevel; 1400 slf_frame.check = slf_check_set_stacklevel;
1364} 1401}
1365 1402
1366/* the tail of transfer: execute stuff we can only do after a transfer */ 1403/* the tail of transfer: execute stuff we can only do after a transfer */
1367INLINE void 1404ecb_inline void
1368transfer_tail (pTHX) 1405transfer_tail (pTHX)
1369{ 1406{
1370 free_coro_mortal (aTHX); 1407 free_coro_mortal (aTHX);
1371} 1408}
1372 1409
… …
1416 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1453 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1417 } 1454 }
1418} 1455}
1419 1456
1420static coro_cctx * 1457static coro_cctx *
1421cctx_new () 1458cctx_new (void)
1422{ 1459{
1423 coro_cctx *cctx; 1460 coro_cctx *cctx;
1424 1461
1425 ++cctx_count; 1462 ++cctx_count;
1426 New (0, cctx, 1, coro_cctx); 1463 New (0, cctx, 1, coro_cctx);
… …
1432 return cctx; 1469 return cctx;
1433} 1470}
1434 1471
1435/* create a new cctx only suitable as source */ 1472/* create a new cctx only suitable as source */
1436static coro_cctx * 1473static coro_cctx *
1437cctx_new_empty () 1474cctx_new_empty (void)
1438{ 1475{
1439 coro_cctx *cctx = cctx_new (); 1476 coro_cctx *cctx = cctx_new ();
1440 1477
1441 cctx->sptr = 0; 1478 cctx->sptr = 0;
1442 coro_create (&cctx->cctx, 0, 0, 0, 0); 1479 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1444 return cctx; 1481 return cctx;
1445} 1482}
1446 1483
1447/* create a new cctx suitable as destination/running a perl interpreter */ 1484/* create a new cctx suitable as destination/running a perl interpreter */
1448static coro_cctx * 1485static coro_cctx *
1449cctx_new_run () 1486cctx_new_run (void)
1450{ 1487{
1451 coro_cctx *cctx = cctx_new (); 1488 coro_cctx *cctx = cctx_new ();
1452 void *stack_start; 1489 void *stack_start;
1453 size_t stack_size; 1490 size_t stack_size;
1454 1491
1455#if HAVE_MMAP 1492#if HAVE_MMAP
1456 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1493 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1457 /* mmap supposedly does allocate-on-write for us */ 1494 /* 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); 1495 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1459 1496
1460 if (cctx->sptr != (void *)-1) 1497 if (cctx->sptr != (void *)-1)
1461 { 1498 {
1462 #if CORO_STACKGUARD 1499 #if CORO_STACKGUARD
1463 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1500 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1495cctx_destroy (coro_cctx *cctx) 1532cctx_destroy (coro_cctx *cctx)
1496{ 1533{
1497 if (!cctx) 1534 if (!cctx)
1498 return; 1535 return;
1499 1536
1500 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1537 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1501 1538
1502 --cctx_count; 1539 --cctx_count;
1503 coro_destroy (&cctx->cctx); 1540 coro_destroy (&cctx->cctx);
1504 1541
1505 /* coro_transfer creates new, empty cctx's */ 1542 /* coro_transfer creates new, empty cctx's */
… …
1524#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1561#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1525 1562
1526static coro_cctx * 1563static coro_cctx *
1527cctx_get (pTHX) 1564cctx_get (pTHX)
1528{ 1565{
1529 while (expect_true (cctx_first)) 1566 while (ecb_expect_true (cctx_first))
1530 { 1567 {
1531 coro_cctx *cctx = cctx_first; 1568 coro_cctx *cctx = cctx_first;
1532 cctx_first = cctx->next; 1569 cctx_first = cctx->next;
1533 --cctx_idle; 1570 --cctx_idle;
1534 1571
1535 if (expect_true (!CCTX_EXPIRED (cctx))) 1572 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1536 return cctx; 1573 return cctx;
1537 1574
1538 cctx_destroy (cctx); 1575 cctx_destroy (cctx);
1539 } 1576 }
1540 1577
… …
1545cctx_put (coro_cctx *cctx) 1582cctx_put (coro_cctx *cctx)
1546{ 1583{
1547 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1584 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1548 1585
1549 /* free another cctx if overlimit */ 1586 /* free another cctx if overlimit */
1550 if (expect_false (cctx_idle >= cctx_max_idle)) 1587 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1551 { 1588 {
1552 coro_cctx *first = cctx_first; 1589 coro_cctx *first = cctx_first;
1553 cctx_first = first->next; 1590 cctx_first = first->next;
1554 --cctx_idle; 1591 --cctx_idle;
1555 1592
… …
1566static void 1603static void
1567transfer_check (pTHX_ struct coro *prev, struct coro *next) 1604transfer_check (pTHX_ struct coro *prev, struct coro *next)
1568{ 1605{
1569 /* TODO: throwing up here is considered harmful */ 1606 /* TODO: throwing up here is considered harmful */
1570 1607
1571 if (expect_true (prev != next)) 1608 if (ecb_expect_true (prev != next))
1572 { 1609 {
1573 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1610 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,"); 1611 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1575 1612
1576 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1613 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,"); 1614 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1578 1615
1579#if !PERL_VERSION_ATLEAST (5,10,0) 1616#if !PERL_VERSION_ATLEAST (5,10,0)
1580 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1617 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,"); 1618 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1582#endif 1619#endif
1583 } 1620 }
1584} 1621}
1585 1622
1586/* always use the TRANSFER macro */ 1623/* always use the TRANSFER macro */
1587static void NOINLINE /* noinline so we have a fixed stackframe */ 1624static void ecb_noinline /* noinline so we have a fixed stackframe */
1588transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1625transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1589{ 1626{
1590 dSTACKLEVEL; 1627 dSTACKLEVEL;
1591 1628
1592 /* sometimes transfer is only called to set idle_sp */ 1629 /* sometimes transfer is only called to set idle_sp */
1593 if (expect_false (!prev)) 1630 if (ecb_expect_false (!prev))
1594 { 1631 {
1595 cctx_current->idle_sp = STACKLEVEL; 1632 cctx_current->idle_sp = STACKLEVEL;
1596 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1633 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1597 } 1634 }
1598 else if (expect_true (prev != next)) 1635 else if (ecb_expect_true (prev != next))
1599 { 1636 {
1600 coro_cctx *cctx_prev; 1637 coro_cctx *cctx_prev;
1601 1638
1602 if (expect_false (prev->flags & CF_NEW)) 1639 if (ecb_expect_false (prev->flags & CF_NEW))
1603 { 1640 {
1604 /* create a new empty/source context */ 1641 /* create a new empty/source context */
1605 prev->flags &= ~CF_NEW; 1642 prev->flags &= ~CF_NEW;
1606 prev->flags |= CF_RUNNING; 1643 prev->flags |= CF_RUNNING;
1607 } 1644 }
… …
1610 next->flags |= CF_RUNNING; 1647 next->flags |= CF_RUNNING;
1611 1648
1612 /* first get rid of the old state */ 1649 /* first get rid of the old state */
1613 save_perl (aTHX_ prev); 1650 save_perl (aTHX_ prev);
1614 1651
1615 if (expect_false (next->flags & CF_NEW)) 1652 if (ecb_expect_false (next->flags & CF_NEW))
1616 { 1653 {
1617 /* need to start coroutine */ 1654 /* need to start coroutine */
1618 next->flags &= ~CF_NEW; 1655 next->flags &= ~CF_NEW;
1619 /* setup coroutine call */ 1656 /* setup coroutine call */
1620 init_perl (aTHX_ next); 1657 init_perl (aTHX_ next);
1621 } 1658 }
1622 else 1659 else
1623 load_perl (aTHX_ next); 1660 load_perl (aTHX_ next);
1624 1661
1625 /* possibly untie and reuse the cctx */ 1662 /* possibly untie and reuse the cctx */
1626 if (expect_true ( 1663 if (ecb_expect_true (
1627 cctx_current->idle_sp == STACKLEVEL 1664 cctx_current->idle_sp == STACKLEVEL
1628 && !(cctx_current->flags & CC_TRACE) 1665 && !(cctx_current->flags & CC_TRACE)
1629 && !force_cctx 1666 && !force_cctx
1630 )) 1667 ))
1631 { 1668 {
1632 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1669 /* 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)); 1670 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1634 1671
1635 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1672 /* 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 */ 1673 /* without this the next cctx_get might destroy the running cctx while still in use */
1637 if (expect_false (CCTX_EXPIRED (cctx_current))) 1674 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1638 if (expect_true (!next->cctx)) 1675 if (ecb_expect_true (!next->cctx))
1639 next->cctx = cctx_get (aTHX); 1676 next->cctx = cctx_get (aTHX);
1640 1677
1641 cctx_put (cctx_current); 1678 cctx_put (cctx_current);
1642 } 1679 }
1643 else 1680 else
1644 prev->cctx = cctx_current; 1681 prev->cctx = cctx_current;
1645 1682
1646 ++next->usecount; 1683 ++next->usecount;
1647 1684
1648 cctx_prev = cctx_current; 1685 cctx_prev = cctx_current;
1649 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1686 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1650 1687
1651 next->cctx = 0; 1688 next->cctx = 0;
1652 1689
1653 if (expect_false (cctx_prev != cctx_current)) 1690 if (ecb_expect_false (cctx_prev != cctx_current))
1654 { 1691 {
1655 cctx_prev->top_env = PL_top_env; 1692 cctx_prev->top_env = PL_top_env;
1656 PL_top_env = cctx_current->top_env; 1693 PL_top_env = cctx_current->top_env;
1657 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1694 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1658 } 1695 }
… …
1664#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1701#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) 1702#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1666 1703
1667/** high level stuff ********************************************************/ 1704/** high level stuff ********************************************************/
1668 1705
1706/* this function is actually Coro, not Coro::State, but we call it from here */
1707/* because it is convenient - but it hasn't been declared yet for that reason */
1669static int 1708static void
1709coro_call_on_destroy (pTHX_ struct coro *coro);
1710
1711static void
1670coro_state_destroy (pTHX_ struct coro *coro) 1712coro_state_destroy (pTHX_ struct coro *coro)
1671{ 1713{
1672 if (coro->flags & CF_DESTROYED) 1714 if (coro->flags & CF_ZOMBIE)
1673 return 0; 1715 return;
1674 1716
1675 if (coro->on_destroy && !PL_dirty)
1676 coro->on_destroy (aTHX_ coro); 1717 slf_destroy (aTHX_ coro);
1677 1718
1678 coro->flags |= CF_DESTROYED; 1719 coro->flags |= CF_ZOMBIE;
1679 1720
1680 if (coro->flags & CF_READY) 1721 if (coro->flags & CF_READY)
1681 { 1722 {
1682 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1723 /* reduce nready, as destroying a ready coro effectively unreadies it */
1683 /* alternative: look through all ready queues and remove the coro */ 1724 /* alternative: look through all ready queues and remove the coro */
1684 --coro_nready; 1725 --coro_nready;
1685 } 1726 }
1686 else 1727 else
1687 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1728 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1729
1730 if (coro->next) coro->next->prev = coro->prev;
1731 if (coro->prev) coro->prev->next = coro->next;
1732 if (coro == coro_first) coro_first = coro->next;
1688 1733
1689 if (coro->mainstack 1734 if (coro->mainstack
1690 && coro->mainstack != main_mainstack 1735 && coro->mainstack != main_mainstack
1691 && coro->slot 1736 && coro->slot
1692 && !PL_dirty) 1737 && !PL_dirty)
1693 destroy_perl (aTHX_ coro); 1738 destroy_perl (aTHX_ coro);
1694 1739
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); 1740 cctx_destroy (coro->cctx);
1700 SvREFCNT_dec (coro->startcv); 1741 SvREFCNT_dec (coro->startcv);
1701 SvREFCNT_dec (coro->args); 1742 SvREFCNT_dec (coro->args);
1702 SvREFCNT_dec (coro->swap_sv); 1743 SvREFCNT_dec (coro->swap_sv);
1703 SvREFCNT_dec (CORO_THROW); 1744 SvREFCNT_dec (CORO_THROW);
1704 1745
1705 return 1; 1746 coro_call_on_destroy (aTHX_ coro);
1747
1748 /* more destruction mayhem in coro_state_free */
1706} 1749}
1707 1750
1708static int 1751static int
1709coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1752coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1710{ 1753{
1711 struct coro *coro = (struct coro *)mg->mg_ptr; 1754 struct coro *coro = (struct coro *)mg->mg_ptr;
1712 mg->mg_ptr = 0; 1755 mg->mg_ptr = 0;
1713 1756
1714 coro->hv = 0;
1715
1716 if (--coro->refcnt < 0)
1717 {
1718 coro_state_destroy (aTHX_ coro); 1757 coro_state_destroy (aTHX_ coro);
1758 SvREFCNT_dec (coro->on_destroy);
1759 SvREFCNT_dec (coro->status);
1760
1719 Safefree (coro); 1761 Safefree (coro);
1720 }
1721 1762
1722 return 0; 1763 return 0;
1723} 1764}
1724 1765
1725static int 1766static int ecb_cold
1726coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1767coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1727{ 1768{
1728 struct coro *coro = (struct coro *)mg->mg_ptr; 1769 /* called when perl clones the current process the slow way (windows process emulation) */
1729 1770 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1730 ++coro->refcnt; 1771 mg->mg_ptr = 0;
1772 mg->mg_virtual = 0;
1731 1773
1732 return 0; 1774 return 0;
1733} 1775}
1734 1776
1735static MGVTBL coro_state_vtbl = { 1777static MGVTBL coro_state_vtbl = {
… …
1760 TRANSFER (ta, 1); 1802 TRANSFER (ta, 1);
1761} 1803}
1762 1804
1763/** Coro ********************************************************************/ 1805/** Coro ********************************************************************/
1764 1806
1765INLINE void 1807ecb_inline void
1766coro_enq (pTHX_ struct coro *coro) 1808coro_enq (pTHX_ struct coro *coro)
1767{ 1809{
1768 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1810 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1769 1811
1770 SvREFCNT_inc_NN (coro->hv); 1812 SvREFCNT_inc_NN (coro->hv);
… …
1772 coro->next_ready = 0; 1814 coro->next_ready = 0;
1773 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1815 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1774 ready [1] = coro; 1816 ready [1] = coro;
1775} 1817}
1776 1818
1777INLINE struct coro * 1819ecb_inline struct coro *
1778coro_deq (pTHX) 1820coro_deq (pTHX)
1779{ 1821{
1780 int prio; 1822 int prio;
1781 1823
1782 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1824 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1835{ 1877{
1836 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1878 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1837} 1879}
1838 1880
1839/* expects to own a reference to next->hv */ 1881/* expects to own a reference to next->hv */
1840INLINE void 1882ecb_inline void
1841prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1883prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1842{ 1884{
1843 SV *prev_sv = SvRV (coro_current); 1885 SV *prev_sv = SvRV (coro_current);
1844 1886
1845 ta->prev = SvSTATE_hv (prev_sv); 1887 ta->prev = SvSTATE_hv (prev_sv);
… …
1858{ 1900{
1859 for (;;) 1901 for (;;)
1860 { 1902 {
1861 struct coro *next = coro_deq (aTHX); 1903 struct coro *next = coro_deq (aTHX);
1862 1904
1863 if (expect_true (next)) 1905 if (ecb_expect_true (next))
1864 { 1906 {
1865 /* cannot transfer to destroyed coros, skip and look for next */ 1907 /* cannot transfer to destroyed coros, skip and look for next */
1866 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1908 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 */ 1909 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1868 else 1910 else
1869 { 1911 {
1870 next->flags &= ~CF_READY; 1912 next->flags &= ~CF_READY;
1871 --coro_nready; 1913 --coro_nready;
… …
1904 } 1946 }
1905 } 1947 }
1906 } 1948 }
1907} 1949}
1908 1950
1909INLINE void 1951ecb_inline void
1910prepare_cede (pTHX_ struct coro_transfer_args *ta) 1952prepare_cede (pTHX_ struct coro_transfer_args *ta)
1911{ 1953{
1912 api_ready (aTHX_ coro_current); 1954 api_ready (aTHX_ coro_current);
1913 prepare_schedule (aTHX_ ta); 1955 prepare_schedule (aTHX_ ta);
1914} 1956}
1915 1957
1916INLINE void 1958ecb_inline void
1917prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1959prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1918{ 1960{
1919 SV *prev = SvRV (coro_current); 1961 SV *prev = SvRV (coro_current);
1920 1962
1921 if (coro_nready) 1963 if (coro_nready)
… …
1951{ 1993{
1952 struct coro_transfer_args ta; 1994 struct coro_transfer_args ta;
1953 1995
1954 prepare_cede (aTHX_ &ta); 1996 prepare_cede (aTHX_ &ta);
1955 1997
1956 if (expect_true (ta.prev != ta.next)) 1998 if (ecb_expect_true (ta.prev != ta.next))
1957 { 1999 {
1958 TRANSFER (ta, 1); 2000 TRANSFER (ta, 1);
1959 return 1; 2001 return 1;
1960 } 2002 }
1961 else 2003 else
… …
2004 coro->slot->runops = RUNOPS_DEFAULT; 2046 coro->slot->runops = RUNOPS_DEFAULT;
2005 } 2047 }
2006} 2048}
2007 2049
2008static void 2050static void
2051coro_push_av (pTHX_ AV *av, I32 gimme_v)
2052{
2053 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2054 {
2055 dSP;
2056
2057 if (gimme_v == G_SCALAR)
2058 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2059 else
2060 {
2061 int i;
2062 EXTEND (SP, AvFILLp (av) + 1);
2063
2064 for (i = 0; i <= AvFILLp (av); ++i)
2065 PUSHs (AvARRAY (av)[i]);
2066 }
2067
2068 PUTBACK;
2069 }
2070}
2071
2072static void
2073coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2074{
2075 if (!coro->on_destroy)
2076 coro->on_destroy = newAV ();
2077
2078 av_push (coro->on_destroy, cb);
2079}
2080
2081static void
2082slf_destroy_join (pTHX_ struct CoroSLF *frame)
2083{
2084 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2085}
2086
2087static int
2088slf_check_join (pTHX_ struct CoroSLF *frame)
2089{
2090 struct coro *coro = (struct coro *)frame->data;
2091
2092 if (!coro->status)
2093 return 1;
2094
2095 frame->destroy = 0;
2096
2097 coro_push_av (aTHX_ coro->status, GIMME_V);
2098
2099 SvREFCNT_dec ((SV *)coro->hv);
2100
2101 return 0;
2102}
2103
2104static void
2105slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2106{
2107 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2108
2109 if (items > 1)
2110 croak ("join called with too many arguments");
2111
2112 if (coro->status)
2113 frame->prepare = prepare_nop;
2114 else
2115 {
2116 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2117 frame->prepare = prepare_schedule;
2118 }
2119
2120 frame->check = slf_check_join;
2121 frame->destroy = slf_destroy_join;
2122 frame->data = (void *)coro;
2123 SvREFCNT_inc (coro->hv);
2124}
2125
2126static void
2009coro_call_on_destroy (pTHX_ struct coro *coro) 2127coro_call_on_destroy (pTHX_ struct coro *coro)
2010{ 2128{
2011 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2129 AV *od = coro->on_destroy;
2012 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2013 2130
2014 if (on_destroyp) 2131 if (!od)
2015 { 2132 return;
2016 AV *on_destroy = (AV *)SvRV (*on_destroyp);
2017 2133
2018 while (AvFILLp (on_destroy) >= 0) 2134 while (AvFILLp (od) >= 0)
2135 {
2136 SV *cb = sv_2mortal (av_pop (od));
2137
2138 /* coro hv's (and only hv's at the moment) are supported as well */
2139 if (SvSTATEhv_p (aTHX_ cb))
2140 api_ready (aTHX_ cb);
2141 else
2019 { 2142 {
2020 dSP; /* don't disturb outer sp */ 2143 dSP; /* don't disturb outer sp */
2021 SV *cb = av_pop (on_destroy);
2022
2023 PUSHMARK (SP); 2144 PUSHMARK (SP);
2024 2145
2025 if (statusp) 2146 if (coro->status)
2026 { 2147 {
2027 int i; 2148 PUTBACK;
2028 AV *status = (AV *)SvRV (*statusp); 2149 coro_push_av (aTHX_ coro->status, G_ARRAY);
2029 EXTEND (SP, AvFILLp (status) + 1); 2150 SPAGAIN;
2030
2031 for (i = 0; i <= AvFILLp (status); ++i)
2032 PUSHs (AvARRAY (status)[i]);
2033 } 2151 }
2034 2152
2035 PUTBACK; 2153 PUTBACK;
2036 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2154 call_sv (cb, G_VOID | G_DISCARD);
2037 } 2155 }
2038 } 2156 }
2039} 2157}
2040 2158
2041static void 2159static void
2042slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2160coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2043{ 2161{
2044 int i; 2162 AV *av;
2045 HV *hv = (HV *)SvRV (coro_current); 2163
2046 AV *av = newAV (); 2164 if (coro->status)
2165 {
2166 av = coro->status;
2167 av_clear (av);
2168 }
2169 else
2170 av = coro->status = newAV ();
2047 2171
2048 /* items are actually not so common, so optimise for this case */ 2172 /* items are actually not so common, so optimise for this case */
2049 if (items) 2173 if (items)
2050 { 2174 {
2175 int i;
2176
2051 av_extend (av, items - 1); 2177 av_extend (av, items - 1);
2052 2178
2053 for (i = 0; i < items; ++i) 2179 for (i = 0; i < items; ++i)
2054 av_push (av, SvREFCNT_inc_NN (arg [i])); 2180 av_push (av, SvREFCNT_inc_NN (arg [i]));
2055 } 2181 }
2182}
2056 2183
2057 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2184static void
2058 2185slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2186{
2059 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2187 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2060 api_ready (aTHX_ sv_manager); 2188 api_ready (aTHX_ sv_manager);
2061 2189
2062 frame->prepare = prepare_schedule; 2190 frame->prepare = prepare_schedule;
2063 frame->check = slf_check_repeat; 2191 frame->check = slf_check_repeat;
2064 2192
2065 /* as a minor optimisation, we could unwind all stacks here */ 2193 /* as a minor optimisation, we could unwind all stacks here */
2066 /* but that puts extra pressure on pp_slf, and is not worth much */ 2194 /* but that puts extra pressure on pp_slf, and is not worth much */
2067 /*coro_unwind_stacks (aTHX);*/ 2195 /*coro_unwind_stacks (aTHX);*/
2196}
2197
2198static void
2199slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2200{
2201 HV *coro_hv = (HV *)SvRV (coro_current);
2202
2203 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2204 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2205}
2206
2207static void
2208slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2209{
2210 HV *coro_hv;
2211 struct coro *coro;
2212
2213 if (items <= 0)
2214 croak ("Coro::cancel called without coro object,");
2215
2216 coro = SvSTATE (arg [0]);
2217 coro_hv = coro->hv;
2218
2219 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2220
2221 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2222 {
2223 /* coro currently busy cancelling something, so just notify it */
2224 coro->slf_frame.data = (void *)coro;
2225
2226 frame->prepare = prepare_nop;
2227 frame->check = slf_check_nop;
2228 }
2229 else if (coro_hv == (HV *)SvRV (coro_current))
2230 {
2231 /* cancelling the current coro is allowed, and equals terminate */
2232 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2233 }
2234 else
2235 {
2236 struct coro *self = SvSTATE_current;
2237
2238 /* otherwise we cancel directly, purely for speed reasons
2239 * unfortunately, this requires some magic trickery, as
2240 * somebody else could cancel us, so we have to fight the cancellation.
2241 * this is ugly, and hopefully fully worth the extra speed.
2242 * besides, I can't get the slow-but-safe version working...
2243 */
2244 slf_frame.data = 0;
2245 self->flags |= CF_NOCANCEL;
2246 coro_state_destroy (aTHX_ coro);
2247 self->flags &= ~CF_NOCANCEL;
2248
2249 if (slf_frame.data)
2250 {
2251 /* while we were busy we have been cancelled, so terminate */
2252 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2253 }
2254 else
2255 {
2256 frame->prepare = prepare_nop;
2257 frame->check = slf_check_nop;
2258 }
2259 }
2260}
2261
2262static int
2263slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2264{
2265 frame->prepare = 0;
2266 coro_unwind_stacks (aTHX);
2267
2268 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2269
2270 return 1;
2271}
2272
2273static int
2274safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2275{
2276 if (coro->cctx)
2277 croak ("coro inside C callback, unable to cancel at this time, caught");
2278
2279 if (coro->flags & CF_NEW)
2280 {
2281 coro_set_status (aTHX_ coro, arg, items);
2282 coro_state_destroy (aTHX_ coro);
2283 }
2284 else
2285 {
2286 if (!coro->slf_frame.prepare)
2287 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2288
2289 slf_destroy (aTHX_ coro);
2290
2291 coro_set_status (aTHX_ coro, arg, items);
2292 coro->slf_frame.prepare = prepare_nop;
2293 coro->slf_frame.check = slf_check_safe_cancel;
2294
2295 api_ready (aTHX_ (SV *)coro->hv);
2296 }
2297
2298 return 1;
2068} 2299}
2069 2300
2070/*****************************************************************************/ 2301/*****************************************************************************/
2071/* async pool handler */ 2302/* async pool handler */
2072 2303
… …
2103slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2334slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2104{ 2335{
2105 HV *hv = (HV *)SvRV (coro_current); 2336 HV *hv = (HV *)SvRV (coro_current);
2106 struct coro *coro = SvSTATE_hv ((SV *)hv); 2337 struct coro *coro = SvSTATE_hv ((SV *)hv);
2107 2338
2108 if (expect_true (coro->saved_deffh)) 2339 if (ecb_expect_true (coro->saved_deffh))
2109 { 2340 {
2110 /* subsequent iteration */ 2341 /* subsequent iteration */
2111 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2342 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2112 coro->saved_deffh = 0; 2343 coro->saved_deffh = 0;
2113 2344
2114 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2345 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2115 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2346 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2116 { 2347 {
2117 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2348 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2118 coro->invoke_av = newAV (); 2349 return;
2119
2120 frame->prepare = prepare_nop;
2121 } 2350 }
2122 else 2351 else
2123 { 2352 {
2124 av_clear (GvAV (PL_defgv)); 2353 av_clear (GvAV (PL_defgv));
2125 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2354 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2348static void 2577static void
2349slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2578slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2350{ 2579{
2351 frame->prepare = prepare_cede_notself; 2580 frame->prepare = prepare_cede_notself;
2352 frame->check = slf_check_nop; 2581 frame->check = slf_check_nop;
2582}
2583
2584/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2585static void
2586slf_destroy (pTHX_ struct coro *coro)
2587{
2588 /* this callback is reserved for slf functions needing to do cleanup */
2589 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2590 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2591
2592 /*
2593 * The on_destroy above most likely is from an SLF call.
2594 * Since by definition the SLF call will not finish when we destroy
2595 * the coro, we will have to force-finish it here, otherwise
2596 * cleanup functions cannot call SLF functions.
2597 */
2598 coro->slf_frame.prepare = 0;
2353} 2599}
2354 2600
2355/* 2601/*
2356 * these not obviously related functions are all rolled into one 2602 * these not obviously related functions are all rolled into one
2357 * function to increase chances that they all will call transfer with the same 2603 * 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 */ 2610 I32 checkmark; /* mark SP to see how many elements check has pushed */
2365 2611
2366 /* set up the slf frame, unless it has already been set-up */ 2612 /* set up the slf frame, unless it has already been set-up */
2367 /* the latter happens when a new coro has been started */ 2613 /* the latter happens when a new coro has been started */
2368 /* or when a new cctx was attached to an existing coroutine */ 2614 /* or when a new cctx was attached to an existing coroutine */
2369 if (expect_true (!slf_frame.prepare)) 2615 if (ecb_expect_true (!slf_frame.prepare))
2370 { 2616 {
2371 /* first iteration */ 2617 /* first iteration */
2372 dSP; 2618 dSP;
2373 SV **arg = PL_stack_base + TOPMARK + 1; 2619 SV **arg = PL_stack_base + TOPMARK + 1;
2374 int items = SP - arg; /* args without function object */ 2620 int items = SP - arg; /* args without function object */
… …
2415 while (slf_frame.check (aTHX_ &slf_frame)); 2661 while (slf_frame.check (aTHX_ &slf_frame));
2416 2662
2417 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2663 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2418 2664
2419 /* exception handling */ 2665 /* exception handling */
2420 if (expect_false (CORO_THROW)) 2666 if (ecb_expect_false (CORO_THROW))
2421 { 2667 {
2422 SV *exception = sv_2mortal (CORO_THROW); 2668 SV *exception = sv_2mortal (CORO_THROW);
2423 2669
2424 CORO_THROW = 0; 2670 CORO_THROW = 0;
2425 sv_setsv (ERRSV, exception); 2671 sv_setsv (ERRSV, exception);
2426 croak (0); 2672 croak (0);
2427 } 2673 }
2428 2674
2429 /* return value handling - mostly like entersub */ 2675 /* return value handling - mostly like entersub */
2430 /* make sure we put something on the stack in scalar context */ 2676 /* make sure we put something on the stack in scalar context */
2431 if (GIMME_V == G_SCALAR) 2677 if (GIMME_V == G_SCALAR
2678 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2432 { 2679 {
2433 dSP; 2680 dSP;
2434 SV **bot = PL_stack_base + checkmark; 2681 SV **bot = PL_stack_base + checkmark;
2435 2682
2436 if (sp == bot) /* too few, push undef */ 2683 if (sp == bot) /* too few, push undef */
2437 bot [1] = &PL_sv_undef; 2684 bot [1] = &PL_sv_undef;
2438 else if (sp != bot + 1) /* too many, take last one */ 2685 else /* too many, take last one */
2439 bot [1] = *sp; 2686 bot [1] = *sp;
2440 2687
2441 SP = bot + 1; 2688 SP = bot + 1;
2442 2689
2443 PUTBACK; 2690 PUTBACK;
… …
2550{ 2797{
2551 PerlIOBuf base; 2798 PerlIOBuf base;
2552 NV next, every; 2799 NV next, every;
2553} PerlIOCede; 2800} PerlIOCede;
2554 2801
2555static IV 2802static IV ecb_cold
2556PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2803PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2557{ 2804{
2558 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2805 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2559 2806
2560 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2807 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2561 self->next = nvtime () + self->every; 2808 self->next = nvtime () + self->every;
2562 2809
2563 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2810 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2564} 2811}
2565 2812
2566static SV * 2813static SV * ecb_cold
2567PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2814PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2568{ 2815{
2569 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2816 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2570 2817
2571 return newSVnv (self->every); 2818 return newSVnv (self->every);
… …
2683 SvREFCNT_dec (cb); 2930 SvREFCNT_dec (cb);
2684 } 2931 }
2685} 2932}
2686 2933
2687static void 2934static void
2688coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2935coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2689{ 2936{
2690 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2937 /* call $sem->adjust (0) to possibly wake up some other waiters */
2691 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2938 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2692} 2939}
2693 2940
2694static int 2941static int
2695slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2942slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2696{ 2943{
2697 AV *av = (AV *)frame->data; 2944 AV *av = (AV *)frame->data;
2698 SV *count_sv = AvARRAY (av)[0]; 2945 SV *count_sv = AvARRAY (av)[0];
2946 SV *coro_hv = SvRV (coro_current);
2699 2947
2700 /* if we are about to throw, don't actually acquire the lock, just throw */ 2948 /* if we are about to throw, don't actually acquire the lock, just throw */
2701 if (CORO_THROW) 2949 if (CORO_THROW)
2702 return 0; 2950 return 0;
2703 else if (SvIVX (count_sv) > 0) 2951 else if (SvIVX (count_sv) > 0)
2704 { 2952 {
2705 SvSTATE_current->on_destroy = 0; 2953 frame->destroy = 0;
2706 2954
2707 if (acquire) 2955 if (acquire)
2708 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2956 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2709 else 2957 else
2710 coro_semaphore_adjust (aTHX_ av, 0); 2958 coro_semaphore_adjust (aTHX_ av, 0);
… …
2715 { 2963 {
2716 int i; 2964 int i;
2717 /* if we were woken up but can't down, we look through the whole */ 2965 /* 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 */ 2966 /* waiters list and only add us if we aren't in there already */
2719 /* this avoids some degenerate memory usage cases */ 2967 /* this avoids some degenerate memory usage cases */
2720 2968 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)) 2969 if (AvARRAY (av)[i] == coro_hv)
2723 return 1; 2970 return 1;
2724 2971
2725 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2972 av_push (av, SvREFCNT_inc (coro_hv));
2726 return 1; 2973 return 1;
2727 } 2974 }
2728} 2975}
2729 2976
2730static int 2977static int
… …
2753 { 3000 {
2754 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3001 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2755 3002
2756 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3003 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2757 frame->prepare = prepare_schedule; 3004 frame->prepare = prepare_schedule;
2758
2759 /* to avoid race conditions when a woken-up coro gets terminated */ 3005 /* to avoid race conditions when a woken-up coro gets terminated */
2760 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3006 /* we arrange for a temporary on_destroy that calls adjust (0) */
2761 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3007 frame->destroy = coro_semaphore_destroy;
2762 } 3008 }
2763} 3009}
2764 3010
2765static void 3011static void
2766slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3012slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2984 dSP; 3230 dSP;
2985 3231
2986 static SV *prio_cv; 3232 static SV *prio_cv;
2987 static SV *prio_sv; 3233 static SV *prio_sv;
2988 3234
2989 if (expect_false (!prio_cv)) 3235 if (ecb_expect_false (!prio_cv))
2990 { 3236 {
2991 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3237 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2992 prio_sv = newSViv (0); 3238 prio_sv = newSViv (0);
2993 } 3239 }
2994 3240
… …
3100 } 3346 }
3101 3347
3102 return coro_sv; 3348 return coro_sv;
3103} 3349}
3104 3350
3351#ifndef __cplusplus
3352ecb_cold XS(boot_Coro__State);
3353#endif
3354
3355#if CORO_JIT
3356
3357static void ecb_noinline ecb_cold
3358pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3359{
3360 dSP;
3361 AV *av = newAV ();
3362
3363 av_store (av, 3, newSVuv (d));
3364 av_store (av, 2, newSVuv (c));
3365 av_store (av, 1, newSVuv (b));
3366 av_store (av, 0, newSVuv (a));
3367
3368 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3369
3370 PUTBACK;
3371}
3372
3373static void ecb_noinline ecb_cold
3374jit_init (pTHX)
3375{
3376 dSP;
3377 SV *load, *save;
3378 char *map_base;
3379 char *load_ptr, *save_ptr;
3380 STRLEN load_len, save_len, map_len;
3381 int count;
3382
3383 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3384
3385 PUSHMARK (SP);
3386#define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3387# include "state.h"
3388#undef VARx
3389 count = call_pv ("Coro::State::_jit", G_ARRAY);
3390 SPAGAIN;
3391
3392 save = POPs; save_ptr = SvPVbyte (save, save_len);
3393 load = POPs; load_ptr = SvPVbyte (load, load_len);
3394
3395 map_len = load_len + save_len + 16;
3396
3397 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3398
3399 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3400
3401 load_perl_slots = (load_save_perl_slots_type)map_base;
3402 memcpy (map_base, load_ptr, load_len);
3403
3404 map_base += (load_len + 15) & ~15;
3405
3406 save_perl_slots = (load_save_perl_slots_type)map_base;
3407 memcpy (map_base, save_ptr, save_len);
3408
3409 /* we are good citizens and try to make the page read-only, so the evil evil */
3410 /* hackers might have it a bit more difficult */
3411 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3412
3413 PUTBACK;
3414 eval_pv ("undef &Coro::State::_jit", 1);
3415}
3416
3417#endif
3418
3105MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3419MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3106 3420
3107PROTOTYPES: DISABLE 3421PROTOTYPES: DISABLE
3108 3422
3109BOOT: 3423BOOT:
… …
3112# if CORO_PTHREAD 3426# if CORO_PTHREAD
3113 coro_thx = PERL_GET_CONTEXT; 3427 coro_thx = PERL_GET_CONTEXT;
3114# endif 3428# endif
3115#endif 3429#endif
3116 BOOT_PAGESIZE; 3430 BOOT_PAGESIZE;
3431
3432 /* perl defines these to check for existance first, but why it doesn't */
3433 /* just create them one at init time is not clear to me, except for */
3434 /* programs trying to delete them, but... */
3435 /* anyway, we declare this as invalid and make sure they are initialised here */
3436 DEFSV;
3437 ERRSV;
3117 3438
3118 cctx_current = cctx_new_empty (); 3439 cctx_current = cctx_new_empty ();
3119 3440
3120 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3441 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3121 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3442 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3161 coroapi.prepare_nop = prepare_nop; 3482 coroapi.prepare_nop = prepare_nop;
3162 coroapi.prepare_schedule = prepare_schedule; 3483 coroapi.prepare_schedule = prepare_schedule;
3163 coroapi.prepare_cede = prepare_cede; 3484 coroapi.prepare_cede = prepare_cede;
3164 coroapi.prepare_cede_notself = prepare_cede_notself; 3485 coroapi.prepare_cede_notself = prepare_cede_notself;
3165 3486
3166 time_init (); 3487 time_init (aTHX);
3167 3488
3168 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3489 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3490#if CORO_JIT
3491 PUTBACK;
3492 jit_init (aTHX);
3493 SPAGAIN;
3494#endif
3169} 3495}
3170 3496
3171SV * 3497SV *
3172new (SV *klass, ...) 3498new (SV *klass, ...)
3173 ALIAS: 3499 ALIAS:
… …
3180void 3506void
3181transfer (...) 3507transfer (...)
3182 PROTOTYPE: $$ 3508 PROTOTYPE: $$
3183 CODE: 3509 CODE:
3184 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3510 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 3511
3193void 3512void
3194_exit (int code) 3513_exit (int code)
3195 PROTOTYPE: $ 3514 PROTOTYPE: $
3196 CODE: 3515 CODE:
… …
3272 CODE: 3591 CODE:
3273{ 3592{
3274 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3593 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3275 { 3594 {
3276 struct coro *current = SvSTATE_current; 3595 struct coro *current = SvSTATE_current;
3596 struct CoroSLF slf_save;
3277 3597
3278 if (current != coro) 3598 if (current != coro)
3279 { 3599 {
3280 PUTBACK; 3600 PUTBACK;
3281 save_perl (aTHX_ current); 3601 save_perl (aTHX_ current);
3282 load_perl (aTHX_ coro); 3602 load_perl (aTHX_ coro);
3603 /* the coro is most likely in an active SLF call.
3604 * while not strictly required (the code we execute is
3605 * not allowed to call any SLF functions), it's cleaner
3606 * to reinitialise the slf_frame and restore it later.
3607 * This might one day allow us to actually do SLF calls
3608 * from code executed here.
3609 */
3610 slf_save = slf_frame;
3611 slf_frame.prepare = 0;
3283 SPAGAIN; 3612 SPAGAIN;
3284 } 3613 }
3285 3614
3286 PUSHSTACK; 3615 PUSHSTACK;
3287 3616
… …
3297 SPAGAIN; 3626 SPAGAIN;
3298 3627
3299 if (current != coro) 3628 if (current != coro)
3300 { 3629 {
3301 PUTBACK; 3630 PUTBACK;
3631 slf_frame = slf_save;
3302 save_perl (aTHX_ coro); 3632 save_perl (aTHX_ coro);
3303 load_perl (aTHX_ current); 3633 load_perl (aTHX_ current);
3304 SPAGAIN; 3634 SPAGAIN;
3305 } 3635 }
3306 } 3636 }
… …
3311 PROTOTYPE: $ 3641 PROTOTYPE: $
3312 ALIAS: 3642 ALIAS:
3313 is_ready = CF_READY 3643 is_ready = CF_READY
3314 is_running = CF_RUNNING 3644 is_running = CF_RUNNING
3315 is_new = CF_NEW 3645 is_new = CF_NEW
3316 is_destroyed = CF_DESTROYED 3646 is_destroyed = CF_ZOMBIE
3647 is_zombie = CF_ZOMBIE
3317 is_suspended = CF_SUSPENDED 3648 is_suspended = CF_SUSPENDED
3318 CODE: 3649 CODE:
3319 RETVAL = boolSV (coro->flags & ix); 3650 RETVAL = boolSV (coro->flags & ix);
3320 OUTPUT: 3651 OUTPUT:
3321 RETVAL 3652 RETVAL
… …
3392 3723
3393void 3724void
3394cancel (Coro::State self) 3725cancel (Coro::State self)
3395 CODE: 3726 CODE:
3396 coro_state_destroy (aTHX_ self); 3727 coro_state_destroy (aTHX_ self);
3397 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3398
3399 3728
3400SV * 3729SV *
3401enable_times (int enabled = enable_times) 3730enable_times (int enabled = enable_times)
3402 CODE: 3731 CODE:
3403{ 3732{
… …
3418times (Coro::State self) 3747times (Coro::State self)
3419 PPCODE: 3748 PPCODE:
3420{ 3749{
3421 struct coro *current = SvSTATE (coro_current); 3750 struct coro *current = SvSTATE (coro_current);
3422 3751
3423 if (expect_false (current == self)) 3752 if (ecb_expect_false (current == self))
3424 { 3753 {
3425 coro_times_update (); 3754 coro_times_update ();
3426 coro_times_add (SvSTATE (coro_current)); 3755 coro_times_add (SvSTATE (coro_current));
3427 } 3756 }
3428 3757
3429 EXTEND (SP, 2); 3758 EXTEND (SP, 2);
3430 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3759 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))); 3760 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3432 3761
3433 if (expect_false (current == self)) 3762 if (ecb_expect_false (current == self))
3434 coro_times_sub (SvSTATE (coro_current)); 3763 coro_times_sub (SvSTATE (coro_current));
3435} 3764}
3436 3765
3437void 3766void
3438swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3767swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3459BOOT: 3788BOOT:
3460{ 3789{
3461 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3790 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3462 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3791 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3463 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3792 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); 3793 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); 3794 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3467 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3795 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3468 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3796 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3469 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3797 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
… …
3508 api_ready (aTHX_ RETVAL); 3836 api_ready (aTHX_ RETVAL);
3509 OUTPUT: 3837 OUTPUT:
3510 RETVAL 3838 RETVAL
3511 3839
3512void 3840void
3841_destroy (Coro::State coro)
3842 CODE:
3843 /* used by the manager thread */
3844 coro_state_destroy (aTHX_ coro);
3845
3846void
3847on_destroy (Coro::State coro, SV *cb)
3848 CODE:
3849 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3850
3851void
3852join (...)
3853 CODE:
3854 CORO_EXECUTE_SLF_XS (slf_init_join);
3855
3856void
3513terminate (...) 3857terminate (...)
3514 CODE: 3858 CODE:
3515 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3859 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3860
3861void
3862cancel (...)
3863 CODE:
3864 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3865
3866int
3867safe_cancel (Coro::State self, ...)
3868 C_ARGS: aTHX_ self, &ST (1), items - 1
3516 3869
3517void 3870void
3518schedule (...) 3871schedule (...)
3519 CODE: 3872 CODE:
3520 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3873 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3796} 4149}
3797 4150
3798MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4151MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3799 4152
3800void 4153void
3801_may_delete (SV *sem, int count, int extra_refs) 4154_may_delete (SV *sem, int count, unsigned int extra_refs)
3802 PPCODE: 4155 PPCODE:
3803{ 4156{
3804 AV *av = (AV *)SvRV (sem); 4157 AV *av = (AV *)SvRV (sem);
3805 4158
3806 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4159 if (SvREFCNT ((SV *)av) == 1 + extra_refs

Diff Legend

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