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.393 by root, Fri Apr 29 17:38:56 2011 UTC vs.
Revision 1.418 by root, Mon Feb 20 00:03:07 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
… …
31# define setjmp _setjmp /* deep magic */ 33# define setjmp _setjmp /* deep magic */
32#else 34#else
33# include <inttypes.h> /* most portable stdint.h */ 35# include <inttypes.h> /* most portable stdint.h */
34#endif 36#endif
35 37
36#ifdef HAVE_MMAP 38#if HAVE_MMAP
37# include <unistd.h> 39# include <unistd.h>
38# include <sys/mman.h> 40# include <sys/mman.h>
39# ifndef MAP_ANONYMOUS 41# ifndef MAP_ANONYMOUS
40# ifdef MAP_ANON 42# ifdef MAP_ANON
41# define MAP_ANONYMOUS MAP_ANON 43# define MAP_ANONYMOUS MAP_ANON
… …
61#endif 63#endif
62 64
63/* the maximum number of idle cctx that will be pooled */ 65/* the maximum number of idle cctx that will be pooled */
64static int cctx_max_idle = 4; 66static int cctx_max_idle = 4;
65 67
68#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# define HAS_SCOPESTACK_NAME 1
70#endif
71
66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 72#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
67# undef CORO_STACKGUARD 73# undef CORO_STACKGUARD
68#endif 74#endif
69 75
70#ifndef CORO_STACKGUARD 76#ifndef CORO_STACKGUARD
… …
86# define STACKLEVEL ((void *)&stacklevel) 92# define STACKLEVEL ((void *)&stacklevel)
87#endif 93#endif
88 94
89#define IN_DESTRUCT PL_dirty 95#define IN_DESTRUCT PL_dirty
90 96
91#if __GNUC__ >= 3
92# define attribute(x) __attribute__(x)
93# define expect(expr,value) __builtin_expect ((expr), (value))
94# define INLINE static inline
95#else
96# define attribute(x)
97# define expect(expr,value) (expr)
98# define INLINE static
99#endif
100
101#define expect_false(expr) expect ((expr) != 0, 0)
102#define expect_true(expr) expect ((expr) != 0, 1)
103
104#define NOINLINE attribute ((noinline))
105
106#include "CoroAPI.h" 97#include "CoroAPI.h"
107#define GCoroAPI (&coroapi) /* very sneaky */ 98#define GCoroAPI (&coroapi) /* very sneaky */
108 99
109#ifdef USE_ITHREADS 100#ifdef USE_ITHREADS
110# if CORO_PTHREAD 101# if CORO_PTHREAD
111static void *coro_thx; 102static void *coro_thx;
112# endif 103# endif
113#endif 104#endif
105
106/* used in state.h */
107#define VAR(name,type) VARx(name, PL_ ## name, type)
114 108
115#ifdef __linux 109#ifdef __linux
116# include <time.h> /* for timespec */ 110# include <time.h> /* for timespec */
117# include <syscall.h> /* for SYS_* */ 111# include <syscall.h> /* for SYS_* */
118# ifdef SYS_clock_gettime 112# ifdef SYS_clock_gettime
… …
126static void (*u2time)(pTHX_ UV ret[2]); 120static void (*u2time)(pTHX_ UV ret[2]);
127 121
128/* we hijack an hopefully unused CV flag for our purposes */ 122/* we hijack an hopefully unused CV flag for our purposes */
129#define CVf_SLF 0x4000 123#define CVf_SLF 0x4000
130static OP *pp_slf (pTHX); 124static OP *pp_slf (pTHX);
125static void slf_destroy (pTHX_ struct coro *coro);
131 126
132static U32 cctx_gen; 127static U32 cctx_gen;
133static size_t cctx_stacksize = CORO_STACKSIZE; 128static size_t cctx_stacksize = CORO_STACKSIZE;
134static struct CoroAPI coroapi; 129static struct CoroAPI coroapi;
135static AV *main_mainstack; /* used to differentiate between $main and others */ 130static AV *main_mainstack; /* used to differentiate between $main and others */
… …
165static char times_valid; 160static char times_valid;
166 161
167static struct coro_cctx *cctx_first; 162static struct coro_cctx *cctx_first;
168static int cctx_count, cctx_idle; 163static int cctx_count, cctx_idle;
169 164
170enum { 165enum
166{
171 CC_MAPPED = 0x01, 167 CC_MAPPED = 0x01,
172 CC_NOREUSE = 0x02, /* throw this away after tracing */ 168 CC_NOREUSE = 0x02, /* throw this away after tracing */
173 CC_TRACE = 0x04, 169 CC_TRACE = 0x04,
174 CC_TRACE_SUB = 0x08, /* trace sub calls */ 170 CC_TRACE_SUB = 0x08, /* trace sub calls */
175 CC_TRACE_LINE = 0x10, /* trace each statement */ 171 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
185 void *sptr; 181 void *sptr;
186 size_t ssize; 182 size_t ssize;
187 183
188 /* cpu state */ 184 /* cpu state */
189 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
186#ifndef NDEBUG
190 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 187 JMPENV *idle_te; /* same as idle_sp, but for top_env */
188#endif
191 JMPENV *top_env; 189 JMPENV *top_env;
192 coro_context cctx; 190 coro_context cctx;
193 191
194 U32 gen; 192 U32 gen;
195#if CORO_USE_VALGRIND 193#if CORO_USE_VALGRIND
… …
200 198
201static coro_cctx *cctx_current; /* the currently running cctx */ 199static coro_cctx *cctx_current; /* the currently running cctx */
202 200
203/*****************************************************************************/ 201/*****************************************************************************/
204 202
203static MGVTBL coro_state_vtbl;
204
205enum { 205enum
206{
206 CF_RUNNING = 0x0001, /* coroutine is running */ 207 CF_RUNNING = 0x0001, /* coroutine is running */
207 CF_READY = 0x0002, /* coroutine is ready */ 208 CF_READY = 0x0002, /* coroutine is ready */
208 CF_NEW = 0x0004, /* has never been switched to */ 209 CF_NEW = 0x0004, /* has never been switched to */
209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 210 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
211 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */ 212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
212}; 213};
213 214
214/* 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 */
215typedef struct 216typedef struct
216{ 217{
217 SV *defsv;
218 AV *defav;
219 SV *errsv;
220 SV *irsgv;
221 HV *hinthv;
222#define VAR(name,type) type name; 218#define VARx(name,expr,type) type name;
223# include "state.h" 219# include "state.h"
224#undef VAR 220#undef VARx
225} perl_slots; 221} perl_slots;
226 222
223/* how many context stack entries do we need for perl_slots */
227#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))
228 225
229/* this is a structure representing a perl-level coroutine */ 226/* this is a structure representing a perl-level coroutine */
230struct coro { 227struct coro
228{
231 /* the C coroutine allocated to this perl coroutine, if any */ 229 /* the C coroutine allocated to this perl coroutine, if any */
232 coro_cctx *cctx; 230 coro_cctx *cctx;
233 231
234 /* ready queue */ 232 /* ready queue */
235 struct coro *next_ready; 233 struct coro *next_ready;
… …
237 /* state data */ 235 /* state data */
238 struct CoroSLF slf_frame; /* saved slf frame */ 236 struct CoroSLF slf_frame; /* saved slf frame */
239 AV *mainstack; 237 AV *mainstack;
240 perl_slots *slot; /* basically the saved sp */ 238 perl_slots *slot; /* basically the saved sp */
241 239
242 CV *startcv; /* the CV to execute */ 240 CV *startcv; /* the CV to execute */
243 AV *args; /* data associated with this coroutine (initial args) */ 241 AV *args; /* data associated with this coroutine (initial args) */
244 int refcnt; /* coroutines are refcounted, yes */
245 int flags; /* CF_ flags */ 242 int flags; /* CF_ flags */
246 HV *hv; /* the perl hash associated with this coro, if any */ 243 HV *hv; /* the perl hash associated with this coro, if any */
247 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
248 244
249 /* statistics */ 245 /* statistics */
250 int usecount; /* number of transfers to this coro */ 246 int usecount; /* number of transfers to this coro */
251 247
252 /* coro process data */ 248 /* coro process data */
253 int prio; 249 int prio;
254 SV *except; /* exception to be thrown */ 250 SV *except; /* exception to be thrown */
255 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 */
256 254
257 /* async_pool */ 255 /* async_pool */
258 SV *saved_deffh; 256 SV *saved_deffh;
259 SV *invoke_cb; 257 SV *invoke_cb;
260 AV *invoke_av; 258 AV *invoke_av;
… …
292 290
293/* for Coro.pm */ 291/* for Coro.pm */
294static SV *coro_current; 292static SV *coro_current;
295static SV *coro_readyhook; 293static SV *coro_readyhook;
296static 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 */
297static CV *cv_coro_run, *cv_coro_terminate; 295static CV *cv_coro_run;
298static struct coro *coro_first; 296static struct coro *coro_first;
299#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
300 321
301/** Coro::Select ************************************************************/ 322/** Coro::Select ************************************************************/
302 323
303static OP *(*coro_old_pp_sselect) (pTHX); 324static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select; 325static SV *coro_select_select;
… …
320 341
321/** time stuff **************************************************************/ 342/** time stuff **************************************************************/
322 343
323#ifdef HAS_GETTIMEOFDAY 344#ifdef HAS_GETTIMEOFDAY
324 345
325static void 346ecb_inline void
326coro_u2time (pTHX_ UV ret[2]) 347coro_u2time (pTHX_ UV ret[2])
327{ 348{
328 struct timeval tv; 349 struct timeval tv;
329 gettimeofday (&tv, 0); 350 gettimeofday (&tv, 0);
330 351
331 ret [0] = tv.tv_sec; 352 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec; 353 ret [1] = tv.tv_usec;
333} 354}
334 355
335static double 356ecb_inline double
336coro_nvtime () 357coro_nvtime (void)
337{ 358{
338 struct timeval tv; 359 struct timeval tv;
339 gettimeofday (&tv, 0); 360 gettimeofday (&tv, 0);
340 361
341 return tv.tv_sec + tv.tv_usec * 1e-6; 362 return tv.tv_sec + tv.tv_usec * 1e-6;
342} 363}
343 364
344static void 365ecb_inline void
345time_init (pTHX) 366time_init (pTHX)
346{ 367{
347 nvtime = coro_nvtime; 368 nvtime = coro_nvtime;
348 u2time = coro_u2time; 369 u2time = coro_u2time;
349} 370}
350 371
351#else 372#else
352 373
353static void 374ecb_inline void
354time_init (pTHX) 375time_init (pTHX)
355{ 376{
356 SV **svp; 377 SV **svp;
357 378
358 require_pv ("Time/HiRes.pm"); 379 require_pv ("Time/HiRes.pm");
… …
370 391
371#endif 392#endif
372 393
373/** lowlevel stuff **********************************************************/ 394/** lowlevel stuff **********************************************************/
374 395
375static SV * 396static SV * ecb_noinline
376coro_get_sv (pTHX_ const char *name, int create) 397coro_get_sv (pTHX_ const char *name, int create)
377{ 398{
378#if PERL_VERSION_ATLEAST (5,10,0) 399#if PERL_VERSION_ATLEAST (5,10,0)
379 /* 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 */
380 get_sv (name, create); 401 get_sv (name, create);
381#endif 402#endif
382 return get_sv (name, create); 403 return get_sv (name, create);
383} 404}
384 405
385static AV * 406static AV * ecb_noinline
386coro_get_av (pTHX_ const char *name, int create) 407coro_get_av (pTHX_ const char *name, int create)
387{ 408{
388#if PERL_VERSION_ATLEAST (5,10,0) 409#if PERL_VERSION_ATLEAST (5,10,0)
389 /* 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 */
390 get_av (name, create); 411 get_av (name, create);
391#endif 412#endif
392 return get_av (name, create); 413 return get_av (name, create);
393} 414}
394 415
395static HV * 416static HV * ecb_noinline
396coro_get_hv (pTHX_ const char *name, int create) 417coro_get_hv (pTHX_ const char *name, int create)
397{ 418{
398#if PERL_VERSION_ATLEAST (5,10,0) 419#if PERL_VERSION_ATLEAST (5,10,0)
399 /* 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 */
400 get_hv (name, create); 421 get_hv (name, create);
401#endif 422#endif
402 return get_hv (name, create); 423 return get_hv (name, create);
403} 424}
404 425
405INLINE void 426ecb_inline void
406coro_times_update () 427coro_times_update (void)
407{ 428{
408#ifdef coro_clock_gettime 429#ifdef coro_clock_gettime
409 struct timespec ts; 430 struct timespec ts;
410 431
411 ts.tv_sec = ts.tv_nsec = 0; 432 ts.tv_sec = ts.tv_nsec = 0;
… …
423 time_real [0] = tv [0]; 444 time_real [0] = tv [0];
424 time_real [1] = tv [1] * 1000; 445 time_real [1] = tv [1] * 1000;
425#endif 446#endif
426} 447}
427 448
428INLINE void 449ecb_inline void
429coro_times_add (struct coro *c) 450coro_times_add (struct coro *c)
430{ 451{
431 c->t_real [1] += time_real [1]; 452 c->t_real [1] += time_real [1];
432 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]; }
433 c->t_real [0] += time_real [0]; 454 c->t_real [0] += time_real [0];
… …
435 c->t_cpu [1] += time_cpu [1]; 456 c->t_cpu [1] += time_cpu [1];
436 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]; }
437 c->t_cpu [0] += time_cpu [0]; 458 c->t_cpu [0] += time_cpu [0];
438} 459}
439 460
440INLINE void 461ecb_inline void
441coro_times_sub (struct coro *c) 462coro_times_sub (struct coro *c)
442{ 463{
443 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]; }
444 c->t_real [1] -= time_real [1]; 465 c->t_real [1] -= time_real [1];
445 c->t_real [0] -= time_real [0]; 466 c->t_real [0] -= time_real [0];
… …
453/* magic glue */ 474/* magic glue */
454 475
455#define CORO_MAGIC_type_cv 26 476#define CORO_MAGIC_type_cv 26
456#define CORO_MAGIC_type_state PERL_MAGIC_ext 477#define CORO_MAGIC_type_state PERL_MAGIC_ext
457 478
458#define CORO_MAGIC_NN(sv, type) \ 479#define CORO_MAGIC_NN(sv, type) \
459 (expect_true (SvMAGIC (sv)->mg_type == type) \ 480 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
460 ? SvMAGIC (sv) \ 481 ? SvMAGIC (sv) \
461 : mg_find (sv, type)) 482 : mg_find (sv, type))
462 483
463#define CORO_MAGIC(sv, type) \ 484#define CORO_MAGIC(sv, type) \
464 (expect_true (SvMAGIC (sv)) \ 485 (ecb_expect_true (SvMAGIC (sv)) \
465 ? CORO_MAGIC_NN (sv, type) \ 486 ? CORO_MAGIC_NN (sv, type) \
466 : 0) 487 : 0)
467 488
468#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)
469#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)
470 491
471INLINE 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 *
472SvSTATE_ (pTHX_ SV *coro) 508SvSTATE_ (pTHX_ SV *coro)
473{ 509{
474 HV *stash;
475 MAGIC *mg; 510 MAGIC *mg;
476 511
477 if (SvROK (coro)) 512 if (SvROK (coro))
478 coro = SvRV (coro); 513 coro = SvRV (coro);
479 514
480 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 515 mg = SvSTATEhv_p (aTHX_ coro);
516 if (!mg)
481 croak ("Coro::State object required"); 517 croak ("Coro::State object required");
482 518
483 stash = SvSTASH (coro);
484 if (expect_false (stash != coro_stash && stash != coro_state_stash))
485 {
486 /* very slow, but rare, check */
487 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
488 croak ("Coro::State object required");
489 }
490
491 mg = CORO_MAGIC_state (coro);
492 return (struct coro *)mg->mg_ptr; 519 return (struct coro *)mg->mg_ptr;
493} 520}
494 521
495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 522#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
496 523
… …
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 526#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500 527
501/*****************************************************************************/ 528/*****************************************************************************/
502/* padlist management and caching */ 529/* padlist management and caching */
503 530
504static AV * 531ecb_inline AV *
505coro_derive_padlist (pTHX_ CV *cv) 532coro_derive_padlist (pTHX_ CV *cv)
506{ 533{
507 AV *padlist = CvPADLIST (cv); 534 AV *padlist = CvPADLIST (cv);
508 AV *newpadlist, *newpad; 535 AV *newpadlist, *newpad;
509 536
… …
521 av_store (newpadlist, 1, (SV *)newpad); 548 av_store (newpadlist, 1, (SV *)newpad);
522 549
523 return newpadlist; 550 return newpadlist;
524} 551}
525 552
526static void 553ecb_inline void
527free_padlist (pTHX_ AV *padlist) 554free_padlist (pTHX_ AV *padlist)
528{ 555{
529 /* may be during global destruction */ 556 /* may be during global destruction */
530 if (!IN_DESTRUCT) 557 if (!IN_DESTRUCT)
531 { 558 {
… …
574 0, 0, 0, 0, 601 0, 0, 0, 0,
575 coro_cv_free 602 coro_cv_free
576}; 603};
577 604
578/* the next two functions merely cache the padlists */ 605/* the next two functions merely cache the padlists */
579static void 606ecb_inline void
580get_padlist (pTHX_ CV *cv) 607get_padlist (pTHX_ CV *cv)
581{ 608{
582 MAGIC *mg = CORO_MAGIC_cv (cv); 609 MAGIC *mg = CORO_MAGIC_cv (cv);
583 AV *av; 610 AV *av;
584 611
585 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 612 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 613 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
587 else 614 else
588 { 615 {
589#if CORO_PREFER_PERL_FUNCTIONS 616#if CORO_PREFER_PERL_FUNCTIONS
590 /* this is probably cleaner? but also slower! */ 617 /* this is probably cleaner? but also slower! */
… …
597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 624 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
598#endif 625#endif
599 } 626 }
600} 627}
601 628
602static void 629ecb_inline void
603put_padlist (pTHX_ CV *cv) 630put_padlist (pTHX_ CV *cv)
604{ 631{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 632 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av; 633 AV *av;
607 634
608 if (expect_false (!mg)) 635 if (ecb_expect_false (!mg))
609 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);
610 637
611 av = (AV *)mg->mg_obj; 638 av = (AV *)mg->mg_obj;
612 639
613 if (expect_false (AvFILLp (av) >= AvMAX (av))) 640 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
614 av_extend (av, AvFILLp (av) + 1); 641 av_extend (av, AvFILLp (av) + 1);
615 642
616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 643 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
617} 644}
618 645
619/** load & save, init *******************************************************/ 646/** load & save, init *******************************************************/
620 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
621/* swap sv heads, at least logically */ 686/* swap sv heads, at least logically */
622static void 687static void
623swap_svs (pTHX_ Coro__State c) 688swap_svs (pTHX_ Coro__State c)
624{ 689{
625 int i; 690 int i;
626 691
627 for (i = 0; i <= AvFILLp (c->swap_sv); ) 692 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
628 { 693 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
629 SV *a = AvARRAY (c->swap_sv)[i++];
630 SV *b = AvARRAY (c->swap_sv)[i++];
631
632 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
633 SV tmp;
634
635 /* swap sv_any */
636 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
637
638 /* swap sv_flags */
639 SvFLAGS (&tmp) = SvFLAGS (a);
640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
642
643#if PERL_VERSION_ATLEAST (5,10,0)
644 /* perl 5.10 complicates this _quite_ a bit, but it also is
645 * much faster, so no quarrels here. alternatively, we could
646 * sv_upgrade to avoid this.
647 */
648 {
649 /* swap sv_u */
650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
651
652 /* if SvANY points to the head, we need to adjust the pointers,
653 * as the pointer for a still points to b, and maybe vice versa.
654 */
655 #define svany_in_head(type) \
656 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
657
658 if (svany_in_head (SvTYPE (a)))
659 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
660
661 if (svany_in_head (SvTYPE (b)))
662 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
663 }
664#endif
665 }
666} 694}
667 695
668#define SWAP_SVS(coro) \ 696#define SWAP_SVS(coro) \
669 if (expect_false ((coro)->swap_sv)) \ 697 if (ecb_expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro)) 698 swap_svs (aTHX_ (coro))
671 699
672static void 700static void
673on_enterleave_call (pTHX_ SV *cb); 701on_enterleave_call (pTHX_ SV *cb);
674 702
… …
678 perl_slots *slot = c->slot; 706 perl_slots *slot = c->slot;
679 c->slot = 0; 707 c->slot = 0;
680 708
681 PL_mainstack = c->mainstack; 709 PL_mainstack = c->mainstack;
682 710
683 GvSV (PL_defgv) = slot->defsv; 711#if CORO_JIT
684 GvAV (PL_defgv) = slot->defav; 712 load_perl_slots (slot);
685 GvSV (PL_errgv) = slot->errsv; 713#else
686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
688
689 #define VAR(name,type) PL_ ## name = slot->name; 714 #define VARx(name,expr,type) expr = slot->name;
690 # include "state.h" 715 # include "state.h"
691 #undef VAR 716 #undef VARx
717#endif
692 718
693 { 719 {
694 dSP; 720 dSP;
695 721
696 CV *cv; 722 CV *cv;
697 723
698 /* now do the ugly restore mess */ 724 /* now do the ugly restore mess */
699 while (expect_true (cv = (CV *)POPs)) 725 while (ecb_expect_true (cv = (CV *)POPs))
700 { 726 {
701 put_padlist (aTHX_ cv); /* mark this padlist as available */ 727 put_padlist (aTHX_ cv); /* mark this padlist as available */
702 CvDEPTH (cv) = PTR2IV (POPs); 728 CvDEPTH (cv) = PTR2IV (POPs);
703 CvPADLIST (cv) = (AV *)POPs; 729 CvPADLIST (cv) = (AV *)POPs;
704 } 730 }
… …
707 } 733 }
708 734
709 slf_frame = c->slf_frame; 735 slf_frame = c->slf_frame;
710 CORO_THROW = c->except; 736 CORO_THROW = c->except;
711 737
712 if (expect_false (enable_times)) 738 if (ecb_expect_false (enable_times))
713 { 739 {
714 if (expect_false (!times_valid)) 740 if (ecb_expect_false (!times_valid))
715 coro_times_update (); 741 coro_times_update ();
716 742
717 coro_times_sub (c); 743 coro_times_sub (c);
718 } 744 }
719 745
720 if (expect_false (c->on_enter)) 746 if (ecb_expect_false (c->on_enter))
721 { 747 {
722 int i; 748 int i;
723 749
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 750 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 751 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
731static void 757static void
732save_perl (pTHX_ Coro__State c) 758save_perl (pTHX_ Coro__State c)
733{ 759{
734 SWAP_SVS (c); 760 SWAP_SVS (c);
735 761
736 if (expect_false (c->on_leave)) 762 if (ecb_expect_false (c->on_leave))
737 { 763 {
738 int i; 764 int i;
739 765
740 for (i = AvFILLp (c->on_leave); i >= 0; --i) 766 for (i = AvFILLp (c->on_leave); i >= 0; --i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 767 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 } 768 }
743 769
744 times_valid = 0; 770 times_valid = 0;
745 771
746 if (expect_false (enable_times)) 772 if (ecb_expect_false (enable_times))
747 { 773 {
748 coro_times_update (); times_valid = 1; 774 coro_times_update (); times_valid = 1;
749 coro_times_add (c); 775 coro_times_add (c);
750 } 776 }
751 777
… …
765 791
766 XPUSHs (Nullsv); 792 XPUSHs (Nullsv);
767 /* this loop was inspired by pp_caller */ 793 /* this loop was inspired by pp_caller */
768 for (;;) 794 for (;;)
769 { 795 {
770 while (expect_true (cxix >= 0)) 796 while (ecb_expect_true (cxix >= 0))
771 { 797 {
772 PERL_CONTEXT *cx = &ccstk[cxix--]; 798 PERL_CONTEXT *cx = &ccstk[cxix--];
773 799
774 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))
775 { 801 {
776 CV *cv = cx->blk_sub.cv; 802 CV *cv = cx->blk_sub.cv;
777 803
778 if (expect_true (CvDEPTH (cv))) 804 if (ecb_expect_true (CvDEPTH (cv)))
779 { 805 {
780 EXTEND (SP, 3); 806 EXTEND (SP, 3);
781 PUSHs ((SV *)CvPADLIST (cv)); 807 PUSHs ((SV *)CvPADLIST (cv));
782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 808 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
783 PUSHs ((SV *)cv); 809 PUSHs ((SV *)cv);
… …
786 get_padlist (aTHX_ cv); 812 get_padlist (aTHX_ cv);
787 } 813 }
788 } 814 }
789 } 815 }
790 816
791 if (expect_true (top_si->si_type == PERLSI_MAIN)) 817 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
792 break; 818 break;
793 819
794 top_si = top_si->si_prev; 820 top_si = top_si->si_prev;
795 ccstk = top_si->si_cxstack; 821 ccstk = top_si->si_cxstack;
796 cxix = top_si->si_cxix; 822 cxix = top_si->si_cxix;
… …
798 824
799 PUTBACK; 825 PUTBACK;
800 } 826 }
801 827
802 /* allocate some space on the context stack for our purposes */ 828 /* allocate some space on the context stack for our purposes */
803 /* we manually unroll here, as usually 2 slots is enough */ 829 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
804 if (SLOT_COUNT >= 1) CXINC;
805 if (SLOT_COUNT >= 2) CXINC;
806 if (SLOT_COUNT >= 3) CXINC;
807 { 830 {
808 unsigned int i; 831 unsigned int i;
832
809 for (i = 3; i < SLOT_COUNT; ++i) 833 for (i = 0; i < SLOT_COUNT; ++i)
810 CXINC; 834 CXINC;
811 } 835
812 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 836 cxstack_ix -= SLOT_COUNT; /* undo allocation */
837 }
813 838
814 c->mainstack = PL_mainstack; 839 c->mainstack = PL_mainstack;
815 840
816 { 841 {
817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 842 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
818 843
819 slot->defav = GvAV (PL_defgv); 844#if CORO_JIT
820 slot->defsv = DEFSV; 845 save_perl_slots (slot);
821 slot->errsv = ERRSV; 846#else
822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
824
825 #define VAR(name,type) slot->name = PL_ ## name; 847 #define VARx(name,expr,type) slot->name = expr;
826 # include "state.h" 848 # include "state.h"
827 #undef VAR 849 #undef VARx
850#endif
828 } 851 }
829} 852}
830 853
831/* 854/*
832 * allocate various perl stacks. This is almost an exact copy 855 * allocate various perl stacks. This is almost an exact copy
… …
838# define coro_init_stacks(thx) init_stacks () 861# define coro_init_stacks(thx) init_stacks ()
839#else 862#else
840static void 863static void
841coro_init_stacks (pTHX) 864coro_init_stacks (pTHX)
842{ 865{
843 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() */
844 PL_curstackinfo->si_type = PERLSI_MAIN; 867 PL_curstackinfo->si_type = PERLSI_MAIN;
845 PL_curstack = PL_curstackinfo->si_stack; 868 PL_curstack = PL_curstackinfo->si_stack;
846 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 869 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
847 870
848 PL_stack_base = AvARRAY(PL_curstack); 871 PL_stack_base = AvARRAY(PL_curstack);
… …
863#endif 886#endif
864 887
865 New(54,PL_scopestack,8,I32); 888 New(54,PL_scopestack,8,I32);
866 PL_scopestack_ix = 0; 889 PL_scopestack_ix = 0;
867 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
868 894
869 New(54,PL_savestack,24,ANY); 895 New(54,PL_savestack,24,ANY);
870 PL_savestack_ix = 0; 896 PL_savestack_ix = 0;
871 PL_savestack_max = 24; 897 PL_savestack_max = 24;
872 898
… …
900 } 926 }
901 927
902 Safefree (PL_tmps_stack); 928 Safefree (PL_tmps_stack);
903 Safefree (PL_markstack); 929 Safefree (PL_markstack);
904 Safefree (PL_scopestack); 930 Safefree (PL_scopestack);
931#if HAS_SCOPESTACK_NAME
932 Safefree (PL_scopestack_name);
933#endif
905 Safefree (PL_savestack); 934 Safefree (PL_savestack);
906#if !PERL_VERSION_ATLEAST (5,10,0) 935#if !PERL_VERSION_ATLEAST (5,10,0)
907 Safefree (PL_retstack); 936 Safefree (PL_retstack);
908#endif 937#endif
909} 938}
… …
955#endif 984#endif
956 985
957/* 986/*
958 * This overrides the default magic get method of %SIG elements. 987 * This overrides the default magic get method of %SIG elements.
959 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 988 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
960 * and instead of trying to save and restore the hash elements, we just provide 989 * and instead of trying to save and restore the hash elements (extremely slow),
961 * readback here. 990 * we just provide our own readback here.
962 */ 991 */
963static int 992static int ecb_cold
964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 993coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
965{ 994{
966 const char *s = MgPV_nolen_const (mg); 995 const char *s = MgPV_nolen_const (mg);
967 996
968 if (*s == '_') 997 if (*s == '_')
… …
972 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1001 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
973 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1002 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
974 1003
975 if (svp) 1004 if (svp)
976 { 1005 {
977 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);
978 return 0; 1016 return 0;
979 } 1017 }
980 } 1018 }
981 1019
982 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1020 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
983} 1021}
984 1022
985static int 1023static int ecb_cold
986coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1024coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
987{ 1025{
988 const char *s = MgPV_nolen_const (mg); 1026 const char *s = MgPV_nolen_const (mg);
989 1027
990 if (*s == '_') 1028 if (*s == '_')
… …
1004 } 1042 }
1005 1043
1006 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1044 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1007} 1045}
1008 1046
1009static int 1047static int ecb_cold
1010coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1048coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1011{ 1049{
1012 const char *s = MgPV_nolen_const (mg); 1050 const char *s = MgPV_nolen_const (mg);
1013 1051
1014 if (*s == '_') 1052 if (*s == '_')
… …
1049 return 1; 1087 return 1;
1050} 1088}
1051 1089
1052static UNOP init_perl_op; 1090static UNOP init_perl_op;
1053 1091
1054static 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 */
1055init_perl (pTHX_ struct coro *coro) 1093init_perl (pTHX_ struct coro *coro)
1056{ 1094{
1057 /* 1095 /*
1058 * emulate part of the perl startup here. 1096 * emulate part of the perl startup here.
1059 */ 1097 */
… …
1074 PL_parser = 0; 1112 PL_parser = 0;
1075#endif 1113#endif
1076 PL_hints = 0; 1114 PL_hints = 0;
1077 1115
1078 /* recreate the die/warn hooks */ 1116 /* recreate the die/warn hooks */
1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1117 PL_diehook = SvREFCNT_inc (rv_diehook);
1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1118 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1081 1119
1082 GvSV (PL_defgv) = newSV (0); 1120 GvSV (PL_defgv) = newSV (0);
1083 GvAV (PL_defgv) = coro->args; coro->args = 0; 1121 GvAV (PL_defgv) = coro->args; coro->args = 0;
1084 GvSV (PL_errgv) = newSV (0); 1122 GvSV (PL_errgv) = newSV (0);
1085 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);
… …
1106 /* 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
1107 * 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.
1108 */ 1146 */
1109 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 */
1110 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;
1111 1150
1112 /* 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 */
1113 init_perl_op.op_next = PL_op; 1152 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1153 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1154 init_perl_op.op_ppaddr = pp_slf;
… …
1120 /* copy throw, in case it was set before init_perl */ 1159 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1160 CORO_THROW = coro->except;
1122 1161
1123 SWAP_SVS (coro); 1162 SWAP_SVS (coro);
1124 1163
1125 if (expect_false (enable_times)) 1164 if (ecb_expect_false (enable_times))
1126 { 1165 {
1127 coro_times_update (); 1166 coro_times_update ();
1128 coro_times_sub (coro); 1167 coro_times_sub (coro);
1129 } 1168 }
1130} 1169}
… …
1154destroy_perl (pTHX_ struct coro *coro) 1193destroy_perl (pTHX_ struct coro *coro)
1155{ 1194{
1156 SV *svf [9]; 1195 SV *svf [9];
1157 1196
1158 { 1197 {
1198 SV *old_current = SvRV (coro_current);
1159 struct coro *current = SvSTATE_current; 1199 struct coro *current = SvSTATE (old_current);
1160 1200
1161 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));
1162 1202
1163 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
1164 load_perl (aTHX_ coro); 1208 load_perl (aTHX_ coro);
1165 1209
1166 coro_unwind_stacks (aTHX); 1210 coro_unwind_stacks (aTHX);
1167 coro_destruct_stacks (aTHX);
1168 1211
1169 /* restore swapped sv's */ 1212 /* restore swapped sv's */
1170 SWAP_SVS (coro); 1213 SWAP_SVS (coro);
1171 1214
1215 coro_destruct_stacks (aTHX);
1216
1172 // now save some sv's to be free'd later 1217 /* now save some sv's to be free'd later */
1173 svf [0] = GvSV (PL_defgv); 1218 svf [0] = GvSV (PL_defgv);
1174 svf [1] = (SV *)GvAV (PL_defgv); 1219 svf [1] = (SV *)GvAV (PL_defgv);
1175 svf [2] = GvSV (PL_errgv); 1220 svf [2] = GvSV (PL_errgv);
1176 svf [3] = (SV *)PL_defoutgv; 1221 svf [3] = (SV *)PL_defoutgv;
1177 svf [4] = PL_rs; 1222 svf [4] = PL_rs;
… …
1179 svf [6] = (SV *)GvHV (PL_hintgv); 1224 svf [6] = (SV *)GvHV (PL_hintgv);
1180 svf [7] = PL_diehook; 1225 svf [7] = PL_diehook;
1181 svf [8] = PL_warnhook; 1226 svf [8] = PL_warnhook;
1182 assert (9 == sizeof (svf) / sizeof (*svf)); 1227 assert (9 == sizeof (svf) / sizeof (*svf));
1183 1228
1229 SvRV_set (coro_current, old_current);
1230
1184 load_perl (aTHX_ current); 1231 load_perl (aTHX_ current);
1185 } 1232 }
1186 1233
1187 { 1234 {
1188 unsigned int i; 1235 unsigned int i;
… …
1195 SvREFCNT_dec (coro->invoke_cb); 1242 SvREFCNT_dec (coro->invoke_cb);
1196 SvREFCNT_dec (coro->invoke_av); 1243 SvREFCNT_dec (coro->invoke_av);
1197 } 1244 }
1198} 1245}
1199 1246
1200INLINE void 1247ecb_inline void
1201free_coro_mortal (pTHX) 1248free_coro_mortal (pTHX)
1202{ 1249{
1203 if (expect_true (coro_mortal)) 1250 if (ecb_expect_true (coro_mortal))
1204 { 1251 {
1205 SvREFCNT_dec (coro_mortal); 1252 SvREFCNT_dec ((SV *)coro_mortal);
1206 coro_mortal = 0; 1253 coro_mortal = 0;
1207 } 1254 }
1208} 1255}
1209 1256
1210static int 1257static int
… …
1343 1390
1344 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 */
1345} 1392}
1346 1393
1347/* 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 */
1348static void NOINLINE 1395static void ecb_noinline
1349cctx_prepare (pTHX) 1396cctx_prepare (pTHX)
1350{ 1397{
1351 PL_top_env = &PL_start_env; 1398 PL_top_env = &PL_start_env;
1352 1399
1353 if (cctx_current->flags & CC_TRACE) 1400 if (cctx_current->flags & CC_TRACE)
… …
1364 slf_frame.prepare = slf_prepare_set_stacklevel; 1411 slf_frame.prepare = slf_prepare_set_stacklevel;
1365 slf_frame.check = slf_check_set_stacklevel; 1412 slf_frame.check = slf_check_set_stacklevel;
1366} 1413}
1367 1414
1368/* the tail of transfer: execute stuff we can only do after a transfer */ 1415/* the tail of transfer: execute stuff we can only do after a transfer */
1369INLINE void 1416ecb_inline void
1370transfer_tail (pTHX) 1417transfer_tail (pTHX)
1371{ 1418{
1372 free_coro_mortal (aTHX); 1419 free_coro_mortal (aTHX);
1420}
1421
1422/* try to exit the same way perl's main function would do */
1423/* we do not bother resetting the environment or other things *7
1424/* that are not, uhm, essential */
1425/* this obviously also doesn't work when perl is embedded */
1426static void ecb_noinline ecb_cold
1427perlish_exit (void)
1428{
1429 int exitstatus = perl_destruct (PL_curinterp);
1430 perl_free (PL_curinterp);
1431 exit (exitstatus);
1373} 1432}
1374 1433
1375/* 1434/*
1376 * this is a _very_ stripped down perl interpreter ;) 1435 * this is a _very_ stripped down perl interpreter ;)
1377 */ 1436 */
… …
1406 */ 1465 */
1407 1466
1408 /* 1467 /*
1409 * 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
1410 * 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)
1411 * 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
1412 * bootstrap-time "top" top_env, as we cannot restore the "main" 1471 * doing in that case. YMMV.
1413 * coroutine as Coro has no such concept.
1414 * This actually isn't valid with the pthread backend, but OSes requiring
1415 * that backend are too broken to do it in a standards-compliant way.
1416 */ 1472 */
1417 PL_top_env = main_top_env; 1473 perlish_exit ();
1418 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1419 } 1474 }
1420} 1475}
1421 1476
1422static coro_cctx * 1477static coro_cctx *
1423cctx_new () 1478cctx_new (void)
1424{ 1479{
1425 coro_cctx *cctx; 1480 coro_cctx *cctx;
1426 1481
1427 ++cctx_count; 1482 ++cctx_count;
1428 New (0, cctx, 1, coro_cctx); 1483 New (0, cctx, 1, coro_cctx);
… …
1434 return cctx; 1489 return cctx;
1435} 1490}
1436 1491
1437/* create a new cctx only suitable as source */ 1492/* create a new cctx only suitable as source */
1438static coro_cctx * 1493static coro_cctx *
1439cctx_new_empty () 1494cctx_new_empty (void)
1440{ 1495{
1441 coro_cctx *cctx = cctx_new (); 1496 coro_cctx *cctx = cctx_new ();
1442 1497
1443 cctx->sptr = 0; 1498 cctx->sptr = 0;
1444 coro_create (&cctx->cctx, 0, 0, 0, 0); 1499 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1446 return cctx; 1501 return cctx;
1447} 1502}
1448 1503
1449/* create a new cctx suitable as destination/running a perl interpreter */ 1504/* create a new cctx suitable as destination/running a perl interpreter */
1450static coro_cctx * 1505static coro_cctx *
1451cctx_new_run () 1506cctx_new_run (void)
1452{ 1507{
1453 coro_cctx *cctx = cctx_new (); 1508 coro_cctx *cctx = cctx_new ();
1454 void *stack_start; 1509 void *stack_start;
1455 size_t stack_size; 1510 size_t stack_size;
1456 1511
1457#if HAVE_MMAP 1512#if HAVE_MMAP
1458 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;
1459 /* mmap supposedly does allocate-on-write for us */ 1514 /* mmap supposedly does allocate-on-write for us */
1460 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);
1461 1516
1462 if (cctx->sptr != (void *)-1) 1517 if (cctx->sptr != (void *)-1)
1463 { 1518 {
1464 #if CORO_STACKGUARD 1519 #if CORO_STACKGUARD
1465 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1520 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1526#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))
1527 1582
1528static coro_cctx * 1583static coro_cctx *
1529cctx_get (pTHX) 1584cctx_get (pTHX)
1530{ 1585{
1531 while (expect_true (cctx_first)) 1586 while (ecb_expect_true (cctx_first))
1532 { 1587 {
1533 coro_cctx *cctx = cctx_first; 1588 coro_cctx *cctx = cctx_first;
1534 cctx_first = cctx->next; 1589 cctx_first = cctx->next;
1535 --cctx_idle; 1590 --cctx_idle;
1536 1591
1537 if (expect_true (!CCTX_EXPIRED (cctx))) 1592 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1538 return cctx; 1593 return cctx;
1539 1594
1540 cctx_destroy (cctx); 1595 cctx_destroy (cctx);
1541 } 1596 }
1542 1597
… …
1547cctx_put (coro_cctx *cctx) 1602cctx_put (coro_cctx *cctx)
1548{ 1603{
1549 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));
1550 1605
1551 /* free another cctx if overlimit */ 1606 /* free another cctx if overlimit */
1552 if (expect_false (cctx_idle >= cctx_max_idle)) 1607 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1553 { 1608 {
1554 coro_cctx *first = cctx_first; 1609 coro_cctx *first = cctx_first;
1555 cctx_first = first->next; 1610 cctx_first = first->next;
1556 --cctx_idle; 1611 --cctx_idle;
1557 1612
… …
1568static void 1623static void
1569transfer_check (pTHX_ struct coro *prev, struct coro *next) 1624transfer_check (pTHX_ struct coro *prev, struct coro *next)
1570{ 1625{
1571 /* TODO: throwing up here is considered harmful */ 1626 /* TODO: throwing up here is considered harmful */
1572 1627
1573 if (expect_true (prev != next)) 1628 if (ecb_expect_true (prev != next))
1574 { 1629 {
1575 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1630 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1576 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,");
1577 1632
1578 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1633 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1579 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,");
1580 1635
1581#if !PERL_VERSION_ATLEAST (5,10,0) 1636#if !PERL_VERSION_ATLEAST (5,10,0)
1582 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1637 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1583 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,");
1584#endif 1639#endif
1585 } 1640 }
1586} 1641}
1587 1642
1588/* always use the TRANSFER macro */ 1643/* always use the TRANSFER macro */
1589static void NOINLINE /* noinline so we have a fixed stackframe */ 1644static void ecb_noinline /* noinline so we have a fixed stackframe */
1590transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1645transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1591{ 1646{
1592 dSTACKLEVEL; 1647 dSTACKLEVEL;
1593 1648
1594 /* sometimes transfer is only called to set idle_sp */ 1649 /* sometimes transfer is only called to set idle_sp */
1595 if (expect_false (!prev)) 1650 if (ecb_expect_false (!prev))
1596 { 1651 {
1597 cctx_current->idle_sp = STACKLEVEL; 1652 cctx_current->idle_sp = STACKLEVEL;
1598 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 */
1599 } 1654 }
1600 else if (expect_true (prev != next)) 1655 else if (ecb_expect_true (prev != next))
1601 { 1656 {
1602 coro_cctx *cctx_prev; 1657 coro_cctx *cctx_prev;
1603 1658
1604 if (expect_false (prev->flags & CF_NEW)) 1659 if (ecb_expect_false (prev->flags & CF_NEW))
1605 { 1660 {
1606 /* create a new empty/source context */ 1661 /* create a new empty/source context */
1607 prev->flags &= ~CF_NEW; 1662 prev->flags &= ~CF_NEW;
1608 prev->flags |= CF_RUNNING; 1663 prev->flags |= CF_RUNNING;
1609 } 1664 }
… …
1612 next->flags |= CF_RUNNING; 1667 next->flags |= CF_RUNNING;
1613 1668
1614 /* first get rid of the old state */ 1669 /* first get rid of the old state */
1615 save_perl (aTHX_ prev); 1670 save_perl (aTHX_ prev);
1616 1671
1617 if (expect_false (next->flags & CF_NEW)) 1672 if (ecb_expect_false (next->flags & CF_NEW))
1618 { 1673 {
1619 /* need to start coroutine */ 1674 /* need to start coroutine */
1620 next->flags &= ~CF_NEW; 1675 next->flags &= ~CF_NEW;
1621 /* setup coroutine call */ 1676 /* setup coroutine call */
1622 init_perl (aTHX_ next); 1677 init_perl (aTHX_ next);
1623 } 1678 }
1624 else 1679 else
1625 load_perl (aTHX_ next); 1680 load_perl (aTHX_ next);
1626 1681
1627 /* possibly untie and reuse the cctx */ 1682 /* possibly untie and reuse the cctx */
1628 if (expect_true ( 1683 if (ecb_expect_true (
1629 cctx_current->idle_sp == STACKLEVEL 1684 cctx_current->idle_sp == STACKLEVEL
1630 && !(cctx_current->flags & CC_TRACE) 1685 && !(cctx_current->flags & CC_TRACE)
1631 && !force_cctx 1686 && !force_cctx
1632 )) 1687 ))
1633 { 1688 {
1634 /* 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 */
1635 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));
1636 1691
1637 /* 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. */
1638 /* 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 */
1639 if (expect_false (CCTX_EXPIRED (cctx_current))) 1694 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1640 if (expect_true (!next->cctx)) 1695 if (ecb_expect_true (!next->cctx))
1641 next->cctx = cctx_get (aTHX); 1696 next->cctx = cctx_get (aTHX);
1642 1697
1643 cctx_put (cctx_current); 1698 cctx_put (cctx_current);
1644 } 1699 }
1645 else 1700 else
1646 prev->cctx = cctx_current; 1701 prev->cctx = cctx_current;
1647 1702
1648 ++next->usecount; 1703 ++next->usecount;
1649 1704
1650 cctx_prev = cctx_current; 1705 cctx_prev = cctx_current;
1651 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1706 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1652 1707
1653 next->cctx = 0; 1708 next->cctx = 0;
1654 1709
1655 if (expect_false (cctx_prev != cctx_current)) 1710 if (ecb_expect_false (cctx_prev != cctx_current))
1656 { 1711 {
1657 cctx_prev->top_env = PL_top_env; 1712 cctx_prev->top_env = PL_top_env;
1658 PL_top_env = cctx_current->top_env; 1713 PL_top_env = cctx_current->top_env;
1659 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1714 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1660 } 1715 }
… …
1666#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))
1667#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1722#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1668 1723
1669/** high level stuff ********************************************************/ 1724/** high level stuff ********************************************************/
1670 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 */
1671static int 1728static void
1729coro_call_on_destroy (pTHX_ struct coro *coro);
1730
1731static void
1672coro_state_destroy (pTHX_ struct coro *coro) 1732coro_state_destroy (pTHX_ struct coro *coro)
1673{ 1733{
1674 if (coro->flags & CF_DESTROYED) 1734 if (coro->flags & CF_ZOMBIE)
1675 return 0; 1735 return;
1676 1736
1677 if (coro->on_destroy && !PL_dirty)
1678 coro->on_destroy (aTHX_ coro); 1737 slf_destroy (aTHX_ coro);
1679 1738
1680 /*
1681 * The on_destroy above most likely is from an SLF call.
1682 * Since by definition the SLF call will not finish when we destroy
1683 * the coro, we will have to force-finish it here, otherwise
1684 * cleanup functions cannot call SLF functions.
1685 */
1686 coro->slf_frame.prepare = 0;
1687
1688 coro->flags |= CF_DESTROYED; 1739 coro->flags |= CF_ZOMBIE;
1689 1740
1690 if (coro->flags & CF_READY) 1741 if (coro->flags & CF_READY)
1691 { 1742 {
1692 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1743 /* reduce nready, as destroying a ready coro effectively unreadies it */
1693 /* alternative: look through all ready queues and remove the coro */ 1744 /* alternative: look through all ready queues and remove the coro */
1694 --coro_nready; 1745 --coro_nready;
1695 } 1746 }
1696 else 1747 else
1697 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;
1698 1753
1699 if (coro->mainstack 1754 if (coro->mainstack
1700 && coro->mainstack != main_mainstack 1755 && coro->mainstack != main_mainstack
1701 && coro->slot 1756 && coro->slot
1702 && !PL_dirty) 1757 && !PL_dirty)
1703 destroy_perl (aTHX_ coro); 1758 destroy_perl (aTHX_ coro);
1704 1759
1705 if (coro->next) coro->next->prev = coro->prev;
1706 if (coro->prev) coro->prev->next = coro->next;
1707 if (coro == coro_first) coro_first = coro->next;
1708
1709 cctx_destroy (coro->cctx); 1760 cctx_destroy (coro->cctx);
1710 SvREFCNT_dec (coro->startcv); 1761 SvREFCNT_dec (coro->startcv);
1711 SvREFCNT_dec (coro->args); 1762 SvREFCNT_dec (coro->args);
1712 SvREFCNT_dec (coro->swap_sv); 1763 SvREFCNT_dec (coro->swap_sv);
1713 SvREFCNT_dec (CORO_THROW); 1764 SvREFCNT_dec (CORO_THROW);
1714 1765
1715 return 1; 1766 coro_call_on_destroy (aTHX_ coro);
1767
1768 /* more destruction mayhem in coro_state_free */
1716} 1769}
1717 1770
1718static int 1771static int
1719coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1772coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1720{ 1773{
1721 struct coro *coro = (struct coro *)mg->mg_ptr; 1774 struct coro *coro = (struct coro *)mg->mg_ptr;
1722 mg->mg_ptr = 0; 1775 mg->mg_ptr = 0;
1723 1776
1724 coro->hv = 0;
1725
1726 if (--coro->refcnt < 0)
1727 {
1728 coro_state_destroy (aTHX_ coro); 1777 coro_state_destroy (aTHX_ coro);
1778 SvREFCNT_dec (coro->on_destroy);
1779 SvREFCNT_dec (coro->status);
1780
1729 Safefree (coro); 1781 Safefree (coro);
1730 }
1731 1782
1732 return 0; 1783 return 0;
1733} 1784}
1734 1785
1735static int 1786static int ecb_cold
1736coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1787coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1737{ 1788{
1738 struct coro *coro = (struct coro *)mg->mg_ptr; 1789 /* called when perl clones the current process the slow way (windows process emulation) */
1739 1790 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1740 ++coro->refcnt; 1791 mg->mg_ptr = 0;
1792 mg->mg_virtual = 0;
1741 1793
1742 return 0; 1794 return 0;
1743} 1795}
1744 1796
1745static MGVTBL coro_state_vtbl = { 1797static MGVTBL coro_state_vtbl = {
… …
1770 TRANSFER (ta, 1); 1822 TRANSFER (ta, 1);
1771} 1823}
1772 1824
1773/** Coro ********************************************************************/ 1825/** Coro ********************************************************************/
1774 1826
1775INLINE void 1827ecb_inline void
1776coro_enq (pTHX_ struct coro *coro) 1828coro_enq (pTHX_ struct coro *coro)
1777{ 1829{
1778 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1830 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1779 1831
1780 SvREFCNT_inc_NN (coro->hv); 1832 SvREFCNT_inc_NN (coro->hv);
… …
1782 coro->next_ready = 0; 1834 coro->next_ready = 0;
1783 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1835 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1784 ready [1] = coro; 1836 ready [1] = coro;
1785} 1837}
1786 1838
1787INLINE struct coro * 1839ecb_inline struct coro *
1788coro_deq (pTHX) 1840coro_deq (pTHX)
1789{ 1841{
1790 int prio; 1842 int prio;
1791 1843
1792 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1844 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1845{ 1897{
1846 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1898 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1847} 1899}
1848 1900
1849/* expects to own a reference to next->hv */ 1901/* expects to own a reference to next->hv */
1850INLINE void 1902ecb_inline void
1851prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1903prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1852{ 1904{
1853 SV *prev_sv = SvRV (coro_current); 1905 SV *prev_sv = SvRV (coro_current);
1854 1906
1855 ta->prev = SvSTATE_hv (prev_sv); 1907 ta->prev = SvSTATE_hv (prev_sv);
… …
1868{ 1920{
1869 for (;;) 1921 for (;;)
1870 { 1922 {
1871 struct coro *next = coro_deq (aTHX); 1923 struct coro *next = coro_deq (aTHX);
1872 1924
1873 if (expect_true (next)) 1925 if (ecb_expect_true (next))
1874 { 1926 {
1875 /* cannot transfer to destroyed coros, skip and look for next */ 1927 /* cannot transfer to destroyed coros, skip and look for next */
1876 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1928 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1877 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 */
1878 else 1930 else
1879 { 1931 {
1880 next->flags &= ~CF_READY; 1932 next->flags &= ~CF_READY;
1881 --coro_nready; 1933 --coro_nready;
… …
1914 } 1966 }
1915 } 1967 }
1916 } 1968 }
1917} 1969}
1918 1970
1919INLINE void 1971ecb_inline void
1920prepare_cede (pTHX_ struct coro_transfer_args *ta) 1972prepare_cede (pTHX_ struct coro_transfer_args *ta)
1921{ 1973{
1922 api_ready (aTHX_ coro_current); 1974 api_ready (aTHX_ coro_current);
1923 prepare_schedule (aTHX_ ta); 1975 prepare_schedule (aTHX_ ta);
1924} 1976}
1925 1977
1926INLINE void 1978ecb_inline void
1927prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1979prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1928{ 1980{
1929 SV *prev = SvRV (coro_current); 1981 SV *prev = SvRV (coro_current);
1930 1982
1931 if (coro_nready) 1983 if (coro_nready)
… …
1961{ 2013{
1962 struct coro_transfer_args ta; 2014 struct coro_transfer_args ta;
1963 2015
1964 prepare_cede (aTHX_ &ta); 2016 prepare_cede (aTHX_ &ta);
1965 2017
1966 if (expect_true (ta.prev != ta.next)) 2018 if (ecb_expect_true (ta.prev != ta.next))
1967 { 2019 {
1968 TRANSFER (ta, 1); 2020 TRANSFER (ta, 1);
1969 return 1; 2021 return 1;
1970 } 2022 }
1971 else 2023 else
… …
2014 coro->slot->runops = RUNOPS_DEFAULT; 2066 coro->slot->runops = RUNOPS_DEFAULT;
2015 } 2067 }
2016} 2068}
2017 2069
2018static 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
2019coro_call_on_destroy (pTHX_ struct coro *coro) 2147coro_call_on_destroy (pTHX_ struct coro *coro)
2020{ 2148{
2021 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2149 AV *od = coro->on_destroy;
2022 2150
2023 if (on_destroyp) 2151 if (!od)
2024 { 2152 return;
2025 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2026 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2027 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2028 2153
2029 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
2030 { 2162 {
2031 dSP; /* don't disturb outer sp */ 2163 dSP; /* don't disturb outer sp */
2032 SV *cb = av_pop (on_destroy);
2033
2034 PUSHMARK (SP); 2164 PUSHMARK (SP);
2035 2165
2036 if (statusp) 2166 if (coro->status)
2037 { 2167 {
2038 int i; 2168 PUTBACK;
2039 EXTEND (SP, AvFILLp (status) + 1); 2169 coro_push_av (aTHX_ coro->status, G_ARRAY);
2040 2170 SPAGAIN;
2041 for (i = 0; i <= AvFILLp (status); ++i)
2042 PUSHs (AvARRAY (status)[i]);
2043 } 2171 }
2044 2172
2045 PUTBACK; 2173 PUTBACK;
2046 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2174 call_sv (cb, G_VOID | G_DISCARD);
2047 } 2175 }
2048 } 2176 }
2049} 2177}
2050 2178
2051static void 2179static void
2052coro_set_status (HV *coro_hv, SV **arg, int items) 2180coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2053{ 2181{
2054 AV *av = newAV (); 2182 AV *av;
2183
2184 if (coro->status)
2185 {
2186 av = coro->status;
2187 av_clear (av);
2188 }
2189 else
2190 av = coro->status = newAV ();
2055 2191
2056 /* items are actually not so common, so optimise for this case */ 2192 /* items are actually not so common, so optimise for this case */
2057 if (items) 2193 if (items)
2058 { 2194 {
2059 int i; 2195 int i;
… …
2061 av_extend (av, items - 1); 2197 av_extend (av, items - 1);
2062 2198
2063 for (i = 0; i < items; ++i) 2199 for (i = 0; i < items; ++i)
2064 av_push (av, SvREFCNT_inc_NN (arg [i])); 2200 av_push (av, SvREFCNT_inc_NN (arg [i]));
2065 } 2201 }
2066
2067 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2068} 2202}
2069 2203
2070static void 2204static void
2071slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2205slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2072{ 2206{
… …
2084static void 2218static void
2085slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2219slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2086{ 2220{
2087 HV *coro_hv = (HV *)SvRV (coro_current); 2221 HV *coro_hv = (HV *)SvRV (coro_current);
2088 2222
2089 coro_set_status (coro_hv, arg, items); 2223 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2090 slf_init_terminate_cancel_common (frame, coro_hv); 2224 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2091} 2225}
2092 2226
2093static void 2227static void
2094slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2228slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2095{ 2229{
… …
2100 croak ("Coro::cancel called without coro object,"); 2234 croak ("Coro::cancel called without coro object,");
2101 2235
2102 coro = SvSTATE (arg [0]); 2236 coro = SvSTATE (arg [0]);
2103 coro_hv = coro->hv; 2237 coro_hv = coro->hv;
2104 2238
2105 coro_set_status (coro_hv, arg + 1, items - 1); 2239 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2106 2240
2107 if (expect_false (coro->flags & CF_NOCANCEL)) 2241 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2108 { 2242 {
2109 /* coro currently busy cancelling something, so just notify it */ 2243 /* coro currently busy cancelling something, so just notify it */
2110 coro->slf_frame.data = (void *)coro; 2244 coro->slf_frame.data = (void *)coro;
2111 2245
2112 frame->prepare = prepare_nop; 2246 frame->prepare = prepare_nop;
2113 frame->check = slf_check_nop; 2247 frame->check = slf_check_nop;
2114 } 2248 }
2115 else if (coro_hv == (HV *)SvRV (coro_current)) 2249 else if (coro_hv == (HV *)SvRV (coro_current))
2116 { 2250 {
2117 /* cancelling the current coro is allowed, and equals terminate */ 2251 /* cancelling the current coro is allowed, and equals terminate */
2118 slf_init_terminate_cancel_common (frame, coro_hv); 2252 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2119 } 2253 }
2120 else 2254 else
2121 { 2255 {
2122 struct coro *self = SvSTATE_current; 2256 struct coro *self = SvSTATE_current;
2123 2257
… …
2127 * this is ugly, and hopefully fully worth the extra speed. 2261 * this is ugly, and hopefully fully worth the extra speed.
2128 * besides, I can't get the slow-but-safe version working... 2262 * besides, I can't get the slow-but-safe version working...
2129 */ 2263 */
2130 slf_frame.data = 0; 2264 slf_frame.data = 0;
2131 self->flags |= CF_NOCANCEL; 2265 self->flags |= CF_NOCANCEL;
2132
2133 coro_state_destroy (aTHX_ coro); 2266 coro_state_destroy (aTHX_ coro);
2134 coro_call_on_destroy (aTHX_ coro);
2135
2136 self->flags &= ~CF_NOCANCEL; 2267 self->flags &= ~CF_NOCANCEL;
2137 2268
2138 if (slf_frame.data) 2269 if (slf_frame.data)
2139 { 2270 {
2140 /* while we were busy we have been cancelled, so terminate */ 2271 /* while we were busy we have been cancelled, so terminate */
2141 slf_init_terminate_cancel_common (frame, self->hv); 2272 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2142 } 2273 }
2143 else 2274 else
2144 { 2275 {
2145 frame->prepare = prepare_nop; 2276 frame->prepare = prepare_nop;
2146 frame->check = slf_check_nop; 2277 frame->check = slf_check_nop;
2147 } 2278 }
2148 } 2279 }
2149} 2280}
2150 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;
2319}
2320
2151/*****************************************************************************/ 2321/*****************************************************************************/
2152/* async pool handler */ 2322/* async pool handler */
2153 2323
2154static int 2324static int
2155slf_check_pool_handler (pTHX_ struct CoroSLF *frame) 2325slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
… …
2184slf_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)
2185{ 2355{
2186 HV *hv = (HV *)SvRV (coro_current); 2356 HV *hv = (HV *)SvRV (coro_current);
2187 struct coro *coro = SvSTATE_hv ((SV *)hv); 2357 struct coro *coro = SvSTATE_hv ((SV *)hv);
2188 2358
2189 if (expect_true (coro->saved_deffh)) 2359 if (ecb_expect_true (coro->saved_deffh))
2190 { 2360 {
2191 /* subsequent iteration */ 2361 /* subsequent iteration */
2192 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2362 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2193 coro->saved_deffh = 0; 2363 coro->saved_deffh = 0;
2194 2364
2195 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2365 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2196 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2366 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2197 { 2367 {
2198 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2368 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2199 coro->invoke_av = newAV (); 2369 return;
2200
2201 frame->prepare = prepare_nop;
2202 } 2370 }
2203 else 2371 else
2204 { 2372 {
2205 av_clear (GvAV (PL_defgv)); 2373 av_clear (GvAV (PL_defgv));
2206 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);
… …
2429static void 2597static void
2430slf_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)
2431{ 2599{
2432 frame->prepare = prepare_cede_notself; 2600 frame->prepare = prepare_cede_notself;
2433 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;
2434} 2619}
2435 2620
2436/* 2621/*
2437 * these not obviously related functions are all rolled into one 2622 * these not obviously related functions are all rolled into one
2438 * 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
… …
2445 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 */
2446 2631
2447 /* 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 */
2448 /* the latter happens when a new coro has been started */ 2633 /* the latter happens when a new coro has been started */
2449 /* or when a new cctx was attached to an existing coroutine */ 2634 /* or when a new cctx was attached to an existing coroutine */
2450 if (expect_true (!slf_frame.prepare)) 2635 if (ecb_expect_true (!slf_frame.prepare))
2451 { 2636 {
2452 /* first iteration */ 2637 /* first iteration */
2453 dSP; 2638 dSP;
2454 SV **arg = PL_stack_base + TOPMARK + 1; 2639 SV **arg = PL_stack_base + TOPMARK + 1;
2455 int items = SP - arg; /* args without function object */ 2640 int items = SP - arg; /* args without function object */
… …
2496 while (slf_frame.check (aTHX_ &slf_frame)); 2681 while (slf_frame.check (aTHX_ &slf_frame));
2497 2682
2498 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 */
2499 2684
2500 /* exception handling */ 2685 /* exception handling */
2501 if (expect_false (CORO_THROW)) 2686 if (ecb_expect_false (CORO_THROW))
2502 { 2687 {
2503 SV *exception = sv_2mortal (CORO_THROW); 2688 SV *exception = sv_2mortal (CORO_THROW);
2504 2689
2505 CORO_THROW = 0; 2690 CORO_THROW = 0;
2506 sv_setsv (ERRSV, exception); 2691 sv_setsv (ERRSV, exception);
2507 croak (0); 2692 croak (0);
2508 } 2693 }
2509 2694
2510 /* return value handling - mostly like entersub */ 2695 /* return value handling - mostly like entersub */
2511 /* make sure we put something on the stack in scalar context */ 2696 /* make sure we put something on the stack in scalar context */
2512 if (GIMME_V == G_SCALAR) 2697 if (GIMME_V == G_SCALAR
2698 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2513 { 2699 {
2514 dSP; 2700 dSP;
2515 SV **bot = PL_stack_base + checkmark; 2701 SV **bot = PL_stack_base + checkmark;
2516 2702
2517 if (sp == bot) /* too few, push undef */ 2703 if (sp == bot) /* too few, push undef */
2518 bot [1] = &PL_sv_undef; 2704 bot [1] = &PL_sv_undef;
2519 else if (sp != bot + 1) /* too many, take last one */ 2705 else /* too many, take last one */
2520 bot [1] = *sp; 2706 bot [1] = *sp;
2521 2707
2522 SP = bot + 1; 2708 SP = bot + 1;
2523 2709
2524 PUTBACK; 2710 PUTBACK;
… …
2631{ 2817{
2632 PerlIOBuf base; 2818 PerlIOBuf base;
2633 NV next, every; 2819 NV next, every;
2634} PerlIOCede; 2820} PerlIOCede;
2635 2821
2636static IV 2822static IV ecb_cold
2637PerlIOCede_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)
2638{ 2824{
2639 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2825 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2640 2826
2641 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2827 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2642 self->next = nvtime () + self->every; 2828 self->next = nvtime () + self->every;
2643 2829
2644 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2830 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2645} 2831}
2646 2832
2647static SV * 2833static SV * ecb_cold
2648PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2834PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2649{ 2835{
2650 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2836 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2651 2837
2652 return newSVnv (self->every); 2838 return newSVnv (self->every);
… …
2764 SvREFCNT_dec (cb); 2950 SvREFCNT_dec (cb);
2765 } 2951 }
2766} 2952}
2767 2953
2768static void 2954static void
2769coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2955coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2770{ 2956{
2771 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2957 /* call $sem->adjust (0) to possibly wake up some other waiters */
2772 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2958 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2773} 2959}
2774 2960
2775static int 2961static int
2776slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2962slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2777{ 2963{
2778 AV *av = (AV *)frame->data; 2964 AV *av = (AV *)frame->data;
2779 SV *count_sv = AvARRAY (av)[0]; 2965 SV *count_sv = AvARRAY (av)[0];
2966 SV *coro_hv = SvRV (coro_current);
2780 2967
2781 /* 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 */
2782 if (CORO_THROW) 2969 if (CORO_THROW)
2783 return 0; 2970 return 0;
2784 else if (SvIVX (count_sv) > 0) 2971 else if (SvIVX (count_sv) > 0)
2785 { 2972 {
2786 SvSTATE_current->on_destroy = 0; 2973 frame->destroy = 0;
2787 2974
2788 if (acquire) 2975 if (acquire)
2789 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2976 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2790 else 2977 else
2791 coro_semaphore_adjust (aTHX_ av, 0); 2978 coro_semaphore_adjust (aTHX_ av, 0);
… …
2796 { 2983 {
2797 int i; 2984 int i;
2798 /* 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 */
2799 /* 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 */
2800 /* this avoids some degenerate memory usage cases */ 2987 /* this avoids some degenerate memory usage cases */
2801 2988 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2802 for (i = 1; i <= AvFILLp (av); ++i)
2803 if (AvARRAY (av)[i] == SvRV (coro_current)) 2989 if (AvARRAY (av)[i] == coro_hv)
2804 return 1; 2990 return 1;
2805 2991
2806 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2992 av_push (av, SvREFCNT_inc (coro_hv));
2807 return 1; 2993 return 1;
2808 } 2994 }
2809} 2995}
2810 2996
2811static int 2997static int
… …
2834 { 3020 {
2835 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3021 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2836 3022
2837 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3023 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2838 frame->prepare = prepare_schedule; 3024 frame->prepare = prepare_schedule;
2839
2840 /* to avoid race conditions when a woken-up coro gets terminated */ 3025 /* to avoid race conditions when a woken-up coro gets terminated */
2841 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3026 /* we arrange for a temporary on_destroy that calls adjust (0) */
2842 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3027 frame->destroy = coro_semaphore_destroy;
2843 } 3028 }
2844} 3029}
2845 3030
2846static void 3031static void
2847slf_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)
… …
3065 dSP; 3250 dSP;
3066 3251
3067 static SV *prio_cv; 3252 static SV *prio_cv;
3068 static SV *prio_sv; 3253 static SV *prio_sv;
3069 3254
3070 if (expect_false (!prio_cv)) 3255 if (ecb_expect_false (!prio_cv))
3071 { 3256 {
3072 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3257 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3073 prio_sv = newSViv (0); 3258 prio_sv = newSViv (0);
3074 } 3259 }
3075 3260
… …
3181 } 3366 }
3182 3367
3183 return coro_sv; 3368 return coro_sv;
3184} 3369}
3185 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
3186MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3439MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3187 3440
3188PROTOTYPES: DISABLE 3441PROTOTYPES: DISABLE
3189 3442
3190BOOT: 3443BOOT:
… …
3193# if CORO_PTHREAD 3446# if CORO_PTHREAD
3194 coro_thx = PERL_GET_CONTEXT; 3447 coro_thx = PERL_GET_CONTEXT;
3195# endif 3448# endif
3196#endif 3449#endif
3197 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;
3198 3458
3199 cctx_current = cctx_new_empty (); 3459 cctx_current = cctx_new_empty ();
3200 3460
3201 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3461 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3202 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3462 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3245 coroapi.prepare_cede_notself = prepare_cede_notself; 3505 coroapi.prepare_cede_notself = prepare_cede_notself;
3246 3506
3247 time_init (aTHX); 3507 time_init (aTHX);
3248 3508
3249 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
3250} 3515}
3251 3516
3252SV * 3517SV *
3253new (SV *klass, ...) 3518new (SV *klass, ...)
3254 ALIAS: 3519 ALIAS:
… …
3396 PROTOTYPE: $ 3661 PROTOTYPE: $
3397 ALIAS: 3662 ALIAS:
3398 is_ready = CF_READY 3663 is_ready = CF_READY
3399 is_running = CF_RUNNING 3664 is_running = CF_RUNNING
3400 is_new = CF_NEW 3665 is_new = CF_NEW
3401 is_destroyed = CF_DESTROYED 3666 is_destroyed = CF_ZOMBIE
3667 is_zombie = CF_ZOMBIE
3402 is_suspended = CF_SUSPENDED 3668 is_suspended = CF_SUSPENDED
3403 CODE: 3669 CODE:
3404 RETVAL = boolSV (coro->flags & ix); 3670 RETVAL = boolSV (coro->flags & ix);
3405 OUTPUT: 3671 OUTPUT:
3406 RETVAL 3672 RETVAL
… …
3501times (Coro::State self) 3767times (Coro::State self)
3502 PPCODE: 3768 PPCODE:
3503{ 3769{
3504 struct coro *current = SvSTATE (coro_current); 3770 struct coro *current = SvSTATE (coro_current);
3505 3771
3506 if (expect_false (current == self)) 3772 if (ecb_expect_false (current == self))
3507 { 3773 {
3508 coro_times_update (); 3774 coro_times_update ();
3509 coro_times_add (SvSTATE (coro_current)); 3775 coro_times_add (SvSTATE (coro_current));
3510 } 3776 }
3511 3777
3512 EXTEND (SP, 2); 3778 EXTEND (SP, 2);
3513 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)));
3514 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)));
3515 3781
3516 if (expect_false (current == self)) 3782 if (ecb_expect_false (current == self))
3517 coro_times_sub (SvSTATE (coro_current)); 3783 coro_times_sub (SvSTATE (coro_current));
3518} 3784}
3519 3785
3520void 3786void
3521swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3787swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3542BOOT: 3808BOOT:
3543{ 3809{
3544 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3810 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3545 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3811 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3546 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3812 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3547 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3548 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);
3549 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3814 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3550 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3815 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3551 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3816 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3552 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3817 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
… …
3595void 3860void
3596_destroy (Coro::State coro) 3861_destroy (Coro::State coro)
3597 CODE: 3862 CODE:
3598 /* used by the manager thread */ 3863 /* used by the manager thread */
3599 coro_state_destroy (aTHX_ coro); 3864 coro_state_destroy (aTHX_ coro);
3865
3866void
3867on_destroy (Coro::State coro, SV *cb)
3868 CODE:
3600 coro_call_on_destroy (aTHX_ coro); 3869 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3870
3871void
3872join (...)
3873 CODE:
3874 CORO_EXECUTE_SLF_XS (slf_init_join);
3601 3875
3602void 3876void
3603terminate (...) 3877terminate (...)
3604 CODE: 3878 CODE:
3605 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3879 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3606 3880
3607void 3881void
3608cancel (...) 3882cancel (...)
3609 CODE: 3883 CODE:
3610 CORO_EXECUTE_SLF_XS (slf_init_cancel); 3884 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3885
3886int
3887safe_cancel (Coro::State self, ...)
3888 C_ARGS: aTHX_ self, &ST (1), items - 1
3611 3889
3612void 3890void
3613schedule (...) 3891schedule (...)
3614 CODE: 3892 CODE:
3615 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3893 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3891} 4169}
3892 4170
3893MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4171MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3894 4172
3895void 4173void
3896_may_delete (SV *sem, int count, int extra_refs) 4174_may_delete (SV *sem, int count, unsigned int extra_refs)
3897 PPCODE: 4175 PPCODE:
3898{ 4176{
3899 AV *av = (AV *)SvRV (sem); 4177 AV *av = (AV *)SvRV (sem);
3900 4178
3901 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