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.422 by root, Sat Oct 6 21:25:24 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
… …
126static void (*u2time)(pTHX_ UV ret[2]); 117static void (*u2time)(pTHX_ UV ret[2]);
127 118
128/* we hijack an hopefully unused CV flag for our purposes */ 119/* we hijack an hopefully unused CV flag for our purposes */
129#define CVf_SLF 0x4000 120#define CVf_SLF 0x4000
130static OP *pp_slf (pTHX); 121static OP *pp_slf (pTHX);
122static void slf_destroy (pTHX_ struct coro *coro);
131 123
132static U32 cctx_gen; 124static U32 cctx_gen;
133static size_t cctx_stacksize = CORO_STACKSIZE; 125static size_t cctx_stacksize = CORO_STACKSIZE;
134static struct CoroAPI coroapi; 126static struct CoroAPI coroapi;
135static AV *main_mainstack; /* used to differentiate between $main and others */ 127static AV *main_mainstack; /* used to differentiate between $main and others */
… …
165static char times_valid; 157static char times_valid;
166 158
167static struct coro_cctx *cctx_first; 159static struct coro_cctx *cctx_first;
168static int cctx_count, cctx_idle; 160static int cctx_count, cctx_idle;
169 161
170enum { 162enum
163{
171 CC_MAPPED = 0x01, 164 CC_MAPPED = 0x01,
172 CC_NOREUSE = 0x02, /* throw this away after tracing */ 165 CC_NOREUSE = 0x02, /* throw this away after tracing */
173 CC_TRACE = 0x04, 166 CC_TRACE = 0x04,
174 CC_TRACE_SUB = 0x08, /* trace sub calls */ 167 CC_TRACE_SUB = 0x08, /* trace sub calls */
175 CC_TRACE_LINE = 0x10, /* trace each statement */ 168 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
185 void *sptr; 178 void *sptr;
186 size_t ssize; 179 size_t ssize;
187 180
188 /* cpu state */ 181 /* cpu state */
189 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 182 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
183#ifndef NDEBUG
190 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 184 JMPENV *idle_te; /* same as idle_sp, but for top_env */
185#endif
191 JMPENV *top_env; 186 JMPENV *top_env;
192 coro_context cctx; 187 coro_context cctx;
193 188
194 U32 gen; 189 U32 gen;
195#if CORO_USE_VALGRIND 190#if CORO_USE_VALGRIND
… …
200 195
201static coro_cctx *cctx_current; /* the currently running cctx */ 196static coro_cctx *cctx_current; /* the currently running cctx */
202 197
203/*****************************************************************************/ 198/*****************************************************************************/
204 199
200static MGVTBL coro_state_vtbl;
201
205enum { 202enum
203{
206 CF_RUNNING = 0x0001, /* coroutine is running */ 204 CF_RUNNING = 0x0001, /* coroutine is running */
207 CF_READY = 0x0002, /* coroutine is ready */ 205 CF_READY = 0x0002, /* coroutine is ready */
208 CF_NEW = 0x0004, /* has never been switched to */ 206 CF_NEW = 0x0004, /* has never been switched to */
209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 207 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 208 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
211 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */ 209 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
212}; 210};
213 211
214/* the structure where most of the perl state is stored, overlaid on the cxstack */ 212/* the structure where most of the perl state is stored, overlaid on the cxstack */
215typedef struct 213typedef struct
216{ 214{
217 SV *defsv;
218 AV *defav;
219 SV *errsv;
220 SV *irsgv;
221 HV *hinthv;
222#define VAR(name,type) type name; 215 #define VARx(name,expr,type) type name;
223# include "state.h" 216 #include "state.h"
224#undef VAR
225} perl_slots; 217} perl_slots;
226 218
219/* 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)) 220#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
228 221
229/* this is a structure representing a perl-level coroutine */ 222/* this is a structure representing a perl-level coroutine */
230struct coro { 223struct coro
224{
231 /* the C coroutine allocated to this perl coroutine, if any */ 225 /* the C coroutine allocated to this perl coroutine, if any */
232 coro_cctx *cctx; 226 coro_cctx *cctx;
233 227
234 /* ready queue */ 228 /* ready queue */
235 struct coro *next_ready; 229 struct coro *next_ready;
… …
237 /* state data */ 231 /* state data */
238 struct CoroSLF slf_frame; /* saved slf frame */ 232 struct CoroSLF slf_frame; /* saved slf frame */
239 AV *mainstack; 233 AV *mainstack;
240 perl_slots *slot; /* basically the saved sp */ 234 perl_slots *slot; /* basically the saved sp */
241 235
242 CV *startcv; /* the CV to execute */ 236 CV *startcv; /* the CV to execute */
243 AV *args; /* data associated with this coroutine (initial args) */ 237 AV *args; /* data associated with this coroutine (initial args) */
244 int refcnt; /* coroutines are refcounted, yes */
245 int flags; /* CF_ flags */ 238 int flags; /* CF_ flags */
246 HV *hv; /* the perl hash associated with this coro, if any */ 239 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 240
249 /* statistics */ 241 /* statistics */
250 int usecount; /* number of transfers to this coro */ 242 int usecount; /* number of transfers to this coro */
251 243
252 /* coro process data */ 244 /* coro process data */
253 int prio; 245 int prio;
254 SV *except; /* exception to be thrown */ 246 SV *except; /* exception to be thrown */
255 SV *rouse_cb; 247 SV *rouse_cb; /* last rouse callback */
248 AV *on_destroy; /* callbacks or coros to notify on destroy */
249 AV *status; /* the exit status list */
256 250
257 /* async_pool */ 251 /* async_pool */
258 SV *saved_deffh; 252 SV *saved_deffh;
259 SV *invoke_cb; 253 SV *invoke_cb;
260 AV *invoke_av; 254 AV *invoke_av;
… …
292 286
293/* for Coro.pm */ 287/* for Coro.pm */
294static SV *coro_current; 288static SV *coro_current;
295static SV *coro_readyhook; 289static SV *coro_readyhook;
296static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 290static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
297static CV *cv_coro_run, *cv_coro_terminate; 291static CV *cv_coro_run;
298static struct coro *coro_first; 292static struct coro *coro_first;
299#define coro_nready coroapi.nready 293#define coro_nready coroapi.nready
294
295/** JIT *********************************************************************/
296
297#if CORO_JIT
298 /* APPLE doesn't have HAVE_MMAP though */
299 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
300 #ifndef CORO_JIT_TYPE
301 #if __x86_64 && CORO_JIT_UNIXY
302 #define CORO_JIT_TYPE "amd64-unix"
303 #elif __i386 && CORO_JIT_UNIXY
304 #define CORO_JIT_TYPE "x86-unix"
305 #endif
306 #endif
307#endif
308
309#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP
310 #undef CORO_JIT
311#endif
312
313#if CORO_JIT
314 typedef void (*load_save_perl_slots_type)(perl_slots *);
315 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
316#endif
300 317
301/** Coro::Select ************************************************************/ 318/** Coro::Select ************************************************************/
302 319
303static OP *(*coro_old_pp_sselect) (pTHX); 320static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select; 321static SV *coro_select_select;
… …
320 337
321/** time stuff **************************************************************/ 338/** time stuff **************************************************************/
322 339
323#ifdef HAS_GETTIMEOFDAY 340#ifdef HAS_GETTIMEOFDAY
324 341
325static void 342ecb_inline void
326coro_u2time (pTHX_ UV ret[2]) 343coro_u2time (pTHX_ UV ret[2])
327{ 344{
328 struct timeval tv; 345 struct timeval tv;
329 gettimeofday (&tv, 0); 346 gettimeofday (&tv, 0);
330 347
331 ret [0] = tv.tv_sec; 348 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec; 349 ret [1] = tv.tv_usec;
333} 350}
334 351
335static double 352ecb_inline double
336coro_nvtime () 353coro_nvtime (void)
337{ 354{
338 struct timeval tv; 355 struct timeval tv;
339 gettimeofday (&tv, 0); 356 gettimeofday (&tv, 0);
340 357
341 return tv.tv_sec + tv.tv_usec * 1e-6; 358 return tv.tv_sec + tv.tv_usec * 1e-6;
342} 359}
343 360
344static void 361ecb_inline void
345time_init (pTHX) 362time_init (pTHX)
346{ 363{
347 nvtime = coro_nvtime; 364 nvtime = coro_nvtime;
348 u2time = coro_u2time; 365 u2time = coro_u2time;
349} 366}
350 367
351#else 368#else
352 369
353static void 370ecb_inline void
354time_init (pTHX) 371time_init (pTHX)
355{ 372{
356 SV **svp; 373 SV **svp;
357 374
358 require_pv ("Time/HiRes.pm"); 375 require_pv ("Time/HiRes.pm");
… …
370 387
371#endif 388#endif
372 389
373/** lowlevel stuff **********************************************************/ 390/** lowlevel stuff **********************************************************/
374 391
375static SV * 392static SV * ecb_noinline
376coro_get_sv (pTHX_ const char *name, int create) 393coro_get_sv (pTHX_ const char *name, int create)
377{ 394{
378#if PERL_VERSION_ATLEAST (5,10,0) 395#if PERL_VERSION_ATLEAST (5,10,0)
379 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 396 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
380 get_sv (name, create); 397 get_sv (name, create);
381#endif 398#endif
382 return get_sv (name, create); 399 return get_sv (name, create);
383} 400}
384 401
385static AV * 402static AV * ecb_noinline
386coro_get_av (pTHX_ const char *name, int create) 403coro_get_av (pTHX_ const char *name, int create)
387{ 404{
388#if PERL_VERSION_ATLEAST (5,10,0) 405#if PERL_VERSION_ATLEAST (5,10,0)
389 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 406 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
390 get_av (name, create); 407 get_av (name, create);
391#endif 408#endif
392 return get_av (name, create); 409 return get_av (name, create);
393} 410}
394 411
395static HV * 412static HV * ecb_noinline
396coro_get_hv (pTHX_ const char *name, int create) 413coro_get_hv (pTHX_ const char *name, int create)
397{ 414{
398#if PERL_VERSION_ATLEAST (5,10,0) 415#if PERL_VERSION_ATLEAST (5,10,0)
399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 416 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
400 get_hv (name, create); 417 get_hv (name, create);
401#endif 418#endif
402 return get_hv (name, create); 419 return get_hv (name, create);
403} 420}
404 421
405INLINE void 422ecb_inline void
406coro_times_update () 423coro_times_update (void)
407{ 424{
408#ifdef coro_clock_gettime 425#ifdef coro_clock_gettime
409 struct timespec ts; 426 struct timespec ts;
410 427
411 ts.tv_sec = ts.tv_nsec = 0; 428 ts.tv_sec = ts.tv_nsec = 0;
… …
423 time_real [0] = tv [0]; 440 time_real [0] = tv [0];
424 time_real [1] = tv [1] * 1000; 441 time_real [1] = tv [1] * 1000;
425#endif 442#endif
426} 443}
427 444
428INLINE void 445ecb_inline void
429coro_times_add (struct coro *c) 446coro_times_add (struct coro *c)
430{ 447{
431 c->t_real [1] += time_real [1]; 448 c->t_real [1] += time_real [1];
432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 449 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
433 c->t_real [0] += time_real [0]; 450 c->t_real [0] += time_real [0];
… …
435 c->t_cpu [1] += time_cpu [1]; 452 c->t_cpu [1] += time_cpu [1];
436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 453 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
437 c->t_cpu [0] += time_cpu [0]; 454 c->t_cpu [0] += time_cpu [0];
438} 455}
439 456
440INLINE void 457ecb_inline void
441coro_times_sub (struct coro *c) 458coro_times_sub (struct coro *c)
442{ 459{
443 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 460 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]; 461 c->t_real [1] -= time_real [1];
445 c->t_real [0] -= time_real [0]; 462 c->t_real [0] -= time_real [0];
… …
453/* magic glue */ 470/* magic glue */
454 471
455#define CORO_MAGIC_type_cv 26 472#define CORO_MAGIC_type_cv 26
456#define CORO_MAGIC_type_state PERL_MAGIC_ext 473#define CORO_MAGIC_type_state PERL_MAGIC_ext
457 474
458#define CORO_MAGIC_NN(sv, type) \ 475#define CORO_MAGIC_NN(sv, type) \
459 (expect_true (SvMAGIC (sv)->mg_type == type) \ 476 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
460 ? SvMAGIC (sv) \ 477 ? SvMAGIC (sv) \
461 : mg_find (sv, type)) 478 : mg_find (sv, type))
462 479
463#define CORO_MAGIC(sv, type) \ 480#define CORO_MAGIC(sv, type) \
464 (expect_true (SvMAGIC (sv)) \ 481 (ecb_expect_true (SvMAGIC (sv)) \
465 ? CORO_MAGIC_NN (sv, type) \ 482 ? CORO_MAGIC_NN (sv, type) \
466 : 0) 483 : 0)
467 484
468#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 485#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) 486#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
470 487
471INLINE struct coro * 488ecb_inline MAGIC *
489SvSTATEhv_p (pTHX_ SV *coro)
490{
491 MAGIC *mg;
492
493 if (ecb_expect_true (
494 SvTYPE (coro) == SVt_PVHV
495 && (mg = CORO_MAGIC_state (coro))
496 && mg->mg_virtual == &coro_state_vtbl
497 ))
498 return mg;
499
500 return 0;
501}
502
503ecb_inline struct coro *
472SvSTATE_ (pTHX_ SV *coro) 504SvSTATE_ (pTHX_ SV *coro)
473{ 505{
474 HV *stash;
475 MAGIC *mg; 506 MAGIC *mg;
476 507
477 if (SvROK (coro)) 508 if (SvROK (coro))
478 coro = SvRV (coro); 509 coro = SvRV (coro);
479 510
480 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 511 mg = SvSTATEhv_p (aTHX_ coro);
512 if (!mg)
481 croak ("Coro::State object required"); 513 croak ("Coro::State object required");
482 514
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; 515 return (struct coro *)mg->mg_ptr;
493} 516}
494 517
495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 518#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
496 519
… …
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 522#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500 523
501/*****************************************************************************/ 524/*****************************************************************************/
502/* padlist management and caching */ 525/* padlist management and caching */
503 526
504static AV * 527ecb_inline AV *
505coro_derive_padlist (pTHX_ CV *cv) 528coro_derive_padlist (pTHX_ CV *cv)
506{ 529{
507 AV *padlist = CvPADLIST (cv); 530 AV *padlist = CvPADLIST (cv);
508 AV *newpadlist, *newpad; 531 AV *newpadlist, *newpad;
509 532
… …
521 av_store (newpadlist, 1, (SV *)newpad); 544 av_store (newpadlist, 1, (SV *)newpad);
522 545
523 return newpadlist; 546 return newpadlist;
524} 547}
525 548
526static void 549ecb_inline void
527free_padlist (pTHX_ AV *padlist) 550free_padlist (pTHX_ AV *padlist)
528{ 551{
529 /* may be during global destruction */ 552 /* may be during global destruction */
530 if (!IN_DESTRUCT) 553 if (!IN_DESTRUCT)
531 { 554 {
… …
574 0, 0, 0, 0, 597 0, 0, 0, 0,
575 coro_cv_free 598 coro_cv_free
576}; 599};
577 600
578/* the next two functions merely cache the padlists */ 601/* the next two functions merely cache the padlists */
579static void 602ecb_inline void
580get_padlist (pTHX_ CV *cv) 603get_padlist (pTHX_ CV *cv)
581{ 604{
582 MAGIC *mg = CORO_MAGIC_cv (cv); 605 MAGIC *mg = CORO_MAGIC_cv (cv);
583 AV *av; 606 AV *av;
584 607
585 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 608 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 609 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
587 else 610 else
588 { 611 {
589#if CORO_PREFER_PERL_FUNCTIONS 612#if CORO_PREFER_PERL_FUNCTIONS
590 /* this is probably cleaner? but also slower! */ 613 /* this is probably cleaner? but also slower! */
… …
597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 620 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
598#endif 621#endif
599 } 622 }
600} 623}
601 624
602static void 625ecb_inline void
603put_padlist (pTHX_ CV *cv) 626put_padlist (pTHX_ CV *cv)
604{ 627{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 628 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av; 629 AV *av;
607 630
608 if (expect_false (!mg)) 631 if (ecb_expect_false (!mg))
609 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 632 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
610 633
611 av = (AV *)mg->mg_obj; 634 av = (AV *)mg->mg_obj;
612 635
613 if (expect_false (AvFILLp (av) >= AvMAX (av))) 636 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
614 av_extend (av, AvFILLp (av) + 1); 637 av_extend (av, AvFILLp (av) + 1);
615 638
616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 639 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
617} 640}
618 641
619/** load & save, init *******************************************************/ 642/** load & save, init *******************************************************/
620 643
644ecb_inline void
645swap_sv (SV *a, SV *b)
646{
647 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
648 SV tmp;
649
650 /* swap sv_any */
651 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
652
653 /* swap sv_flags */
654 SvFLAGS (&tmp) = SvFLAGS (a);
655 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
656 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
657
658#if PERL_VERSION_ATLEAST (5,10,0)
659 /* perl 5.10 and later complicates this _quite_ a bit, but it also
660 * is much faster, so no quarrels here. alternatively, we could
661 * sv_upgrade to avoid this.
662 */
663 {
664 /* swap sv_u */
665 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
666
667 /* if SvANY points to the head, we need to adjust the pointers,
668 * as the pointer for a still points to b, and maybe vice versa.
669 */
670 #define svany_in_head(type) \
671 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
672
673 if (svany_in_head (SvTYPE (a)))
674 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
675
676 if (svany_in_head (SvTYPE (b)))
677 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
678 }
679#endif
680}
681
621/* swap sv heads, at least logically */ 682/* swap sv heads, at least logically */
622static void 683static void
623swap_svs (pTHX_ Coro__State c) 684swap_svs (pTHX_ Coro__State c)
624{ 685{
625 int i; 686 int i;
626 687
627 for (i = 0; i <= AvFILLp (c->swap_sv); ) 688 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
628 { 689 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} 690}
667 691
668#define SWAP_SVS(coro) \ 692#define SWAP_SVS(coro) \
669 if (expect_false ((coro)->swap_sv)) \ 693 if (ecb_expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro)) 694 swap_svs (aTHX_ (coro))
671 695
672static void 696static void
673on_enterleave_call (pTHX_ SV *cb); 697on_enterleave_call (pTHX_ SV *cb);
674 698
… …
678 perl_slots *slot = c->slot; 702 perl_slots *slot = c->slot;
679 c->slot = 0; 703 c->slot = 0;
680 704
681 PL_mainstack = c->mainstack; 705 PL_mainstack = c->mainstack;
682 706
683 GvSV (PL_defgv) = slot->defsv; 707#if CORO_JIT
684 GvAV (PL_defgv) = slot->defav; 708 load_perl_slots (slot);
685 GvSV (PL_errgv) = slot->errsv; 709#else
686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
688
689 #define VAR(name,type) PL_ ## name = slot->name; 710 #define VARx(name,expr,type) expr = slot->name;
690 # include "state.h" 711 #include "state.h"
691 #undef VAR 712#endif
692 713
693 { 714 {
694 dSP; 715 dSP;
695 716
696 CV *cv; 717 CV *cv;
697 718
698 /* now do the ugly restore mess */ 719 /* now do the ugly restore mess */
699 while (expect_true (cv = (CV *)POPs)) 720 while (ecb_expect_true (cv = (CV *)POPs))
700 { 721 {
701 put_padlist (aTHX_ cv); /* mark this padlist as available */ 722 put_padlist (aTHX_ cv); /* mark this padlist as available */
702 CvDEPTH (cv) = PTR2IV (POPs); 723 CvDEPTH (cv) = PTR2IV (POPs);
703 CvPADLIST (cv) = (AV *)POPs; 724 CvPADLIST (cv) = (AV *)POPs;
704 } 725 }
… …
707 } 728 }
708 729
709 slf_frame = c->slf_frame; 730 slf_frame = c->slf_frame;
710 CORO_THROW = c->except; 731 CORO_THROW = c->except;
711 732
712 if (expect_false (enable_times)) 733 if (ecb_expect_false (enable_times))
713 { 734 {
714 if (expect_false (!times_valid)) 735 if (ecb_expect_false (!times_valid))
715 coro_times_update (); 736 coro_times_update ();
716 737
717 coro_times_sub (c); 738 coro_times_sub (c);
718 } 739 }
719 740
720 if (expect_false (c->on_enter)) 741 if (ecb_expect_false (c->on_enter))
721 { 742 {
722 int i; 743 int i;
723 744
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 745 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 746 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
731static void 752static void
732save_perl (pTHX_ Coro__State c) 753save_perl (pTHX_ Coro__State c)
733{ 754{
734 SWAP_SVS (c); 755 SWAP_SVS (c);
735 756
736 if (expect_false (c->on_leave)) 757 if (ecb_expect_false (c->on_leave))
737 { 758 {
738 int i; 759 int i;
739 760
740 for (i = AvFILLp (c->on_leave); i >= 0; --i) 761 for (i = AvFILLp (c->on_leave); i >= 0; --i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 762 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 } 763 }
743 764
744 times_valid = 0; 765 times_valid = 0;
745 766
746 if (expect_false (enable_times)) 767 if (ecb_expect_false (enable_times))
747 { 768 {
748 coro_times_update (); times_valid = 1; 769 coro_times_update (); times_valid = 1;
749 coro_times_add (c); 770 coro_times_add (c);
750 } 771 }
751 772
… …
765 786
766 XPUSHs (Nullsv); 787 XPUSHs (Nullsv);
767 /* this loop was inspired by pp_caller */ 788 /* this loop was inspired by pp_caller */
768 for (;;) 789 for (;;)
769 { 790 {
770 while (expect_true (cxix >= 0)) 791 while (ecb_expect_true (cxix >= 0))
771 { 792 {
772 PERL_CONTEXT *cx = &ccstk[cxix--]; 793 PERL_CONTEXT *cx = &ccstk[cxix--];
773 794
774 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 795 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
775 { 796 {
776 CV *cv = cx->blk_sub.cv; 797 CV *cv = cx->blk_sub.cv;
777 798
778 if (expect_true (CvDEPTH (cv))) 799 if (ecb_expect_true (CvDEPTH (cv)))
779 { 800 {
780 EXTEND (SP, 3); 801 EXTEND (SP, 3);
781 PUSHs ((SV *)CvPADLIST (cv)); 802 PUSHs ((SV *)CvPADLIST (cv));
782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 803 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
783 PUSHs ((SV *)cv); 804 PUSHs ((SV *)cv);
… …
786 get_padlist (aTHX_ cv); 807 get_padlist (aTHX_ cv);
787 } 808 }
788 } 809 }
789 } 810 }
790 811
791 if (expect_true (top_si->si_type == PERLSI_MAIN)) 812 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
792 break; 813 break;
793 814
794 top_si = top_si->si_prev; 815 top_si = top_si->si_prev;
795 ccstk = top_si->si_cxstack; 816 ccstk = top_si->si_cxstack;
796 cxix = top_si->si_cxix; 817 cxix = top_si->si_cxix;
… …
798 819
799 PUTBACK; 820 PUTBACK;
800 } 821 }
801 822
802 /* allocate some space on the context stack for our purposes */ 823 /* allocate some space on the context stack for our purposes */
803 /* we manually unroll here, as usually 2 slots is enough */ 824 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 { 825 {
808 unsigned int i; 826 unsigned int i;
827
809 for (i = 3; i < SLOT_COUNT; ++i) 828 for (i = 0; i < SLOT_COUNT; ++i)
810 CXINC; 829 CXINC;
811 } 830
812 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 831 cxstack_ix -= SLOT_COUNT; /* undo allocation */
832 }
813 833
814 c->mainstack = PL_mainstack; 834 c->mainstack = PL_mainstack;
815 835
816 { 836 {
817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 837 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
818 838
819 slot->defav = GvAV (PL_defgv); 839#if CORO_JIT
820 slot->defsv = DEFSV; 840 save_perl_slots (slot);
821 slot->errsv = ERRSV; 841#else
822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
824
825 #define VAR(name,type) slot->name = PL_ ## name; 842 #define VARx(name,expr,type) slot->name = expr;
826 # include "state.h" 843 #include "state.h"
827 #undef VAR 844#endif
828 } 845 }
829} 846}
830 847
831/* 848/*
832 * allocate various perl stacks. This is almost an exact copy 849 * allocate various perl stacks. This is almost an exact copy
… …
838# define coro_init_stacks(thx) init_stacks () 855# define coro_init_stacks(thx) init_stacks ()
839#else 856#else
840static void 857static void
841coro_init_stacks (pTHX) 858coro_init_stacks (pTHX)
842{ 859{
843 PL_curstackinfo = new_stackinfo(32, 8); 860 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; 861 PL_curstackinfo->si_type = PERLSI_MAIN;
845 PL_curstack = PL_curstackinfo->si_stack; 862 PL_curstack = PL_curstackinfo->si_stack;
846 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 863 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
847 864
848 PL_stack_base = AvARRAY(PL_curstack); 865 PL_stack_base = AvARRAY(PL_curstack);
… …
863#endif 880#endif
864 881
865 New(54,PL_scopestack,8,I32); 882 New(54,PL_scopestack,8,I32);
866 PL_scopestack_ix = 0; 883 PL_scopestack_ix = 0;
867 PL_scopestack_max = 8; 884 PL_scopestack_max = 8;
885#if HAS_SCOPESTACK_NAME
886 New(54,PL_scopestack_name,8,const char*);
887#endif
868 888
869 New(54,PL_savestack,24,ANY); 889 New(54,PL_savestack,24,ANY);
870 PL_savestack_ix = 0; 890 PL_savestack_ix = 0;
871 PL_savestack_max = 24; 891 PL_savestack_max = 24;
872 892
… …
900 } 920 }
901 921
902 Safefree (PL_tmps_stack); 922 Safefree (PL_tmps_stack);
903 Safefree (PL_markstack); 923 Safefree (PL_markstack);
904 Safefree (PL_scopestack); 924 Safefree (PL_scopestack);
925#if HAS_SCOPESTACK_NAME
926 Safefree (PL_scopestack_name);
927#endif
905 Safefree (PL_savestack); 928 Safefree (PL_savestack);
906#if !PERL_VERSION_ATLEAST (5,10,0) 929#if !PERL_VERSION_ATLEAST (5,10,0)
907 Safefree (PL_retstack); 930 Safefree (PL_retstack);
908#endif 931#endif
909} 932}
… …
955#endif 978#endif
956 979
957/* 980/*
958 * This overrides the default magic get method of %SIG elements. 981 * 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 982 * 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 983 * and instead of trying to save and restore the hash elements (extremely slow),
961 * readback here. 984 * we just provide our own readback here.
962 */ 985 */
963static int 986static int ecb_cold
964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 987coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
965{ 988{
966 const char *s = MgPV_nolen_const (mg); 989 const char *s = MgPV_nolen_const (mg);
967 990
968 if (*s == '_') 991 if (*s == '_')
… …
972 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 995 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
973 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 996 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
974 997
975 if (svp) 998 if (svp)
976 { 999 {
977 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1000 SV *ssv;
1001
1002 if (!*svp)
1003 ssv = &PL_sv_undef;
1004 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1005 ssv = sv_2mortal (newRV_inc (*svp));
1006 else
1007 ssv = *svp;
1008
1009 sv_setsv (sv, ssv);
978 return 0; 1010 return 0;
979 } 1011 }
980 } 1012 }
981 1013
982 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1014 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
983} 1015}
984 1016
985static int 1017static int ecb_cold
986coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1018coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
987{ 1019{
988 const char *s = MgPV_nolen_const (mg); 1020 const char *s = MgPV_nolen_const (mg);
989 1021
990 if (*s == '_') 1022 if (*s == '_')
… …
1004 } 1036 }
1005 1037
1006 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1038 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1007} 1039}
1008 1040
1009static int 1041static int ecb_cold
1010coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1042coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1011{ 1043{
1012 const char *s = MgPV_nolen_const (mg); 1044 const char *s = MgPV_nolen_const (mg);
1013 1045
1014 if (*s == '_') 1046 if (*s == '_')
… …
1049 return 1; 1081 return 1;
1050} 1082}
1051 1083
1052static UNOP init_perl_op; 1084static UNOP init_perl_op;
1053 1085
1054static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1086ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1055init_perl (pTHX_ struct coro *coro) 1087init_perl (pTHX_ struct coro *coro)
1056{ 1088{
1057 /* 1089 /*
1058 * emulate part of the perl startup here. 1090 * emulate part of the perl startup here.
1059 */ 1091 */
… …
1074 PL_parser = 0; 1106 PL_parser = 0;
1075#endif 1107#endif
1076 PL_hints = 0; 1108 PL_hints = 0;
1077 1109
1078 /* recreate the die/warn hooks */ 1110 /* recreate the die/warn hooks */
1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1111 PL_diehook = SvREFCNT_inc (rv_diehook);
1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1112 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1081 1113
1082 GvSV (PL_defgv) = newSV (0); 1114 GvSV (PL_defgv) = newSV (0);
1083 GvAV (PL_defgv) = coro->args; coro->args = 0; 1115 GvAV (PL_defgv) = coro->args; coro->args = 0;
1084 GvSV (PL_errgv) = newSV (0); 1116 GvSV (PL_errgv) = newSV (0);
1085 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1117 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 1138 /* 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. 1139 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1108 */ 1140 */
1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1141 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 */ 1142 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1143 slf_frame.destroy = 0;
1111 1144
1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1145 /* 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; 1146 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1147 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1148 init_perl_op.op_ppaddr = pp_slf;
… …
1120 /* copy throw, in case it was set before init_perl */ 1153 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1154 CORO_THROW = coro->except;
1122 1155
1123 SWAP_SVS (coro); 1156 SWAP_SVS (coro);
1124 1157
1125 if (expect_false (enable_times)) 1158 if (ecb_expect_false (enable_times))
1126 { 1159 {
1127 coro_times_update (); 1160 coro_times_update ();
1128 coro_times_sub (coro); 1161 coro_times_sub (coro);
1129 } 1162 }
1130} 1163}
… …
1154destroy_perl (pTHX_ struct coro *coro) 1187destroy_perl (pTHX_ struct coro *coro)
1155{ 1188{
1156 SV *svf [9]; 1189 SV *svf [9];
1157 1190
1158 { 1191 {
1192 SV *old_current = SvRV (coro_current);
1159 struct coro *current = SvSTATE_current; 1193 struct coro *current = SvSTATE (old_current);
1160 1194
1161 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1195 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1162 1196
1163 save_perl (aTHX_ current); 1197 save_perl (aTHX_ current);
1198
1199 /* this will cause transfer_check to croak on block*/
1200 SvRV_set (coro_current, (SV *)coro->hv);
1201
1164 load_perl (aTHX_ coro); 1202 load_perl (aTHX_ coro);
1165 1203
1166 coro_unwind_stacks (aTHX); 1204 coro_unwind_stacks (aTHX);
1167 coro_destruct_stacks (aTHX);
1168 1205
1169 /* restore swapped sv's */ 1206 /* restore swapped sv's */
1170 SWAP_SVS (coro); 1207 SWAP_SVS (coro);
1171 1208
1209 coro_destruct_stacks (aTHX);
1210
1172 // now save some sv's to be free'd later 1211 /* now save some sv's to be free'd later */
1173 svf [0] = GvSV (PL_defgv); 1212 svf [0] = GvSV (PL_defgv);
1174 svf [1] = (SV *)GvAV (PL_defgv); 1213 svf [1] = (SV *)GvAV (PL_defgv);
1175 svf [2] = GvSV (PL_errgv); 1214 svf [2] = GvSV (PL_errgv);
1176 svf [3] = (SV *)PL_defoutgv; 1215 svf [3] = (SV *)PL_defoutgv;
1177 svf [4] = PL_rs; 1216 svf [4] = PL_rs;
… …
1179 svf [6] = (SV *)GvHV (PL_hintgv); 1218 svf [6] = (SV *)GvHV (PL_hintgv);
1180 svf [7] = PL_diehook; 1219 svf [7] = PL_diehook;
1181 svf [8] = PL_warnhook; 1220 svf [8] = PL_warnhook;
1182 assert (9 == sizeof (svf) / sizeof (*svf)); 1221 assert (9 == sizeof (svf) / sizeof (*svf));
1183 1222
1223 SvRV_set (coro_current, old_current);
1224
1184 load_perl (aTHX_ current); 1225 load_perl (aTHX_ current);
1185 } 1226 }
1186 1227
1187 { 1228 {
1188 unsigned int i; 1229 unsigned int i;
… …
1195 SvREFCNT_dec (coro->invoke_cb); 1236 SvREFCNT_dec (coro->invoke_cb);
1196 SvREFCNT_dec (coro->invoke_av); 1237 SvREFCNT_dec (coro->invoke_av);
1197 } 1238 }
1198} 1239}
1199 1240
1200INLINE void 1241ecb_inline void
1201free_coro_mortal (pTHX) 1242free_coro_mortal (pTHX)
1202{ 1243{
1203 if (expect_true (coro_mortal)) 1244 if (ecb_expect_true (coro_mortal))
1204 { 1245 {
1205 SvREFCNT_dec (coro_mortal); 1246 SvREFCNT_dec ((SV *)coro_mortal);
1206 coro_mortal = 0; 1247 coro_mortal = 0;
1207 } 1248 }
1208} 1249}
1209 1250
1210static int 1251static int
… …
1343 1384
1344 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1385 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1345} 1386}
1346 1387
1347/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1388/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1348static void NOINLINE 1389static void ecb_noinline
1349cctx_prepare (pTHX) 1390cctx_prepare (pTHX)
1350{ 1391{
1351 PL_top_env = &PL_start_env; 1392 PL_top_env = &PL_start_env;
1352 1393
1353 if (cctx_current->flags & CC_TRACE) 1394 if (cctx_current->flags & CC_TRACE)
… …
1364 slf_frame.prepare = slf_prepare_set_stacklevel; 1405 slf_frame.prepare = slf_prepare_set_stacklevel;
1365 slf_frame.check = slf_check_set_stacklevel; 1406 slf_frame.check = slf_check_set_stacklevel;
1366} 1407}
1367 1408
1368/* the tail of transfer: execute stuff we can only do after a transfer */ 1409/* the tail of transfer: execute stuff we can only do after a transfer */
1369INLINE void 1410ecb_inline void
1370transfer_tail (pTHX) 1411transfer_tail (pTHX)
1371{ 1412{
1372 free_coro_mortal (aTHX); 1413 free_coro_mortal (aTHX);
1414}
1415
1416/* try to exit the same way perl's main function would do */
1417/* we do not bother resetting the environment or other things *7
1418/* that are not, uhm, essential */
1419/* this obviously also doesn't work when perl is embedded */
1420static void ecb_noinline ecb_cold
1421perlish_exit (pTHX)
1422{
1423 int exitstatus = perl_destruct (PL_curinterp);
1424 perl_free (PL_curinterp);
1425 exit (exitstatus);
1373} 1426}
1374 1427
1375/* 1428/*
1376 * this is a _very_ stripped down perl interpreter ;) 1429 * this is a _very_ stripped down perl interpreter ;)
1377 */ 1430 */
… …
1406 */ 1459 */
1407 1460
1408 /* 1461 /*
1409 * If perl-run returns we assume exit() was being called or the coro 1462 * 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) 1463 * 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 1464 * 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" 1465 * 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 */ 1466 */
1417 PL_top_env = main_top_env; 1467 perlish_exit (aTHX);
1418 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1419 } 1468 }
1420} 1469}
1421 1470
1422static coro_cctx * 1471static coro_cctx *
1423cctx_new () 1472cctx_new (void)
1424{ 1473{
1425 coro_cctx *cctx; 1474 coro_cctx *cctx;
1426 1475
1427 ++cctx_count; 1476 ++cctx_count;
1428 New (0, cctx, 1, coro_cctx); 1477 New (0, cctx, 1, coro_cctx);
… …
1434 return cctx; 1483 return cctx;
1435} 1484}
1436 1485
1437/* create a new cctx only suitable as source */ 1486/* create a new cctx only suitable as source */
1438static coro_cctx * 1487static coro_cctx *
1439cctx_new_empty () 1488cctx_new_empty (void)
1440{ 1489{
1441 coro_cctx *cctx = cctx_new (); 1490 coro_cctx *cctx = cctx_new ();
1442 1491
1443 cctx->sptr = 0; 1492 cctx->sptr = 0;
1444 coro_create (&cctx->cctx, 0, 0, 0, 0); 1493 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1446 return cctx; 1495 return cctx;
1447} 1496}
1448 1497
1449/* create a new cctx suitable as destination/running a perl interpreter */ 1498/* create a new cctx suitable as destination/running a perl interpreter */
1450static coro_cctx * 1499static coro_cctx *
1451cctx_new_run () 1500cctx_new_run (void)
1452{ 1501{
1453 coro_cctx *cctx = cctx_new (); 1502 coro_cctx *cctx = cctx_new ();
1454 void *stack_start; 1503 void *stack_start;
1455 size_t stack_size; 1504 size_t stack_size;
1456 1505
1457#if HAVE_MMAP 1506#if HAVE_MMAP
1458 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1507 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1459 /* mmap supposedly does allocate-on-write for us */ 1508 /* 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); 1509 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, -1, 0);
1461 1510
1462 if (cctx->sptr != (void *)-1) 1511 if (cctx->sptr != (void *)-1)
1463 { 1512 {
1464 #if CORO_STACKGUARD 1513 #if CORO_STACKGUARD
1465 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1514 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1526#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1575#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1527 1576
1528static coro_cctx * 1577static coro_cctx *
1529cctx_get (pTHX) 1578cctx_get (pTHX)
1530{ 1579{
1531 while (expect_true (cctx_first)) 1580 while (ecb_expect_true (cctx_first))
1532 { 1581 {
1533 coro_cctx *cctx = cctx_first; 1582 coro_cctx *cctx = cctx_first;
1534 cctx_first = cctx->next; 1583 cctx_first = cctx->next;
1535 --cctx_idle; 1584 --cctx_idle;
1536 1585
1537 if (expect_true (!CCTX_EXPIRED (cctx))) 1586 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1538 return cctx; 1587 return cctx;
1539 1588
1540 cctx_destroy (cctx); 1589 cctx_destroy (cctx);
1541 } 1590 }
1542 1591
… …
1547cctx_put (coro_cctx *cctx) 1596cctx_put (coro_cctx *cctx)
1548{ 1597{
1549 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1598 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1550 1599
1551 /* free another cctx if overlimit */ 1600 /* free another cctx if overlimit */
1552 if (expect_false (cctx_idle >= cctx_max_idle)) 1601 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1553 { 1602 {
1554 coro_cctx *first = cctx_first; 1603 coro_cctx *first = cctx_first;
1555 cctx_first = first->next; 1604 cctx_first = first->next;
1556 --cctx_idle; 1605 --cctx_idle;
1557 1606
… …
1568static void 1617static void
1569transfer_check (pTHX_ struct coro *prev, struct coro *next) 1618transfer_check (pTHX_ struct coro *prev, struct coro *next)
1570{ 1619{
1571 /* TODO: throwing up here is considered harmful */ 1620 /* TODO: throwing up here is considered harmful */
1572 1621
1573 if (expect_true (prev != next)) 1622 if (ecb_expect_true (prev != next))
1574 { 1623 {
1575 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1624 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,"); 1625 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1577 1626
1578 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1627 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,"); 1628 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1580 1629
1581#if !PERL_VERSION_ATLEAST (5,10,0) 1630#if !PERL_VERSION_ATLEAST (5,10,0)
1582 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1631 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,"); 1632 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1584#endif 1633#endif
1585 } 1634 }
1586} 1635}
1587 1636
1588/* always use the TRANSFER macro */ 1637/* always use the TRANSFER macro */
1589static void NOINLINE /* noinline so we have a fixed stackframe */ 1638static void ecb_noinline /* noinline so we have a fixed stackframe */
1590transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1639transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1591{ 1640{
1592 dSTACKLEVEL; 1641 dSTACKLEVEL;
1593 1642
1594 /* sometimes transfer is only called to set idle_sp */ 1643 /* sometimes transfer is only called to set idle_sp */
1595 if (expect_false (!prev)) 1644 if (ecb_expect_false (!prev))
1596 { 1645 {
1597 cctx_current->idle_sp = STACKLEVEL; 1646 cctx_current->idle_sp = STACKLEVEL;
1598 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1647 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1599 } 1648 }
1600 else if (expect_true (prev != next)) 1649 else if (ecb_expect_true (prev != next))
1601 { 1650 {
1602 coro_cctx *cctx_prev; 1651 coro_cctx *cctx_prev;
1603 1652
1604 if (expect_false (prev->flags & CF_NEW)) 1653 if (ecb_expect_false (prev->flags & CF_NEW))
1605 { 1654 {
1606 /* create a new empty/source context */ 1655 /* create a new empty/source context */
1607 prev->flags &= ~CF_NEW; 1656 prev->flags &= ~CF_NEW;
1608 prev->flags |= CF_RUNNING; 1657 prev->flags |= CF_RUNNING;
1609 } 1658 }
… …
1612 next->flags |= CF_RUNNING; 1661 next->flags |= CF_RUNNING;
1613 1662
1614 /* first get rid of the old state */ 1663 /* first get rid of the old state */
1615 save_perl (aTHX_ prev); 1664 save_perl (aTHX_ prev);
1616 1665
1617 if (expect_false (next->flags & CF_NEW)) 1666 if (ecb_expect_false (next->flags & CF_NEW))
1618 { 1667 {
1619 /* need to start coroutine */ 1668 /* need to start coroutine */
1620 next->flags &= ~CF_NEW; 1669 next->flags &= ~CF_NEW;
1621 /* setup coroutine call */ 1670 /* setup coroutine call */
1622 init_perl (aTHX_ next); 1671 init_perl (aTHX_ next);
1623 } 1672 }
1624 else 1673 else
1625 load_perl (aTHX_ next); 1674 load_perl (aTHX_ next);
1626 1675
1627 /* possibly untie and reuse the cctx */ 1676 /* possibly untie and reuse the cctx */
1628 if (expect_true ( 1677 if (ecb_expect_true (
1629 cctx_current->idle_sp == STACKLEVEL 1678 cctx_current->idle_sp == STACKLEVEL
1630 && !(cctx_current->flags & CC_TRACE) 1679 && !(cctx_current->flags & CC_TRACE)
1631 && !force_cctx 1680 && !force_cctx
1632 )) 1681 ))
1633 { 1682 {
1634 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1683 /* 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)); 1684 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1636 1685
1637 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1686 /* 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 */ 1687 /* without this the next cctx_get might destroy the running cctx while still in use */
1639 if (expect_false (CCTX_EXPIRED (cctx_current))) 1688 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1640 if (expect_true (!next->cctx)) 1689 if (ecb_expect_true (!next->cctx))
1641 next->cctx = cctx_get (aTHX); 1690 next->cctx = cctx_get (aTHX);
1642 1691
1643 cctx_put (cctx_current); 1692 cctx_put (cctx_current);
1644 } 1693 }
1645 else 1694 else
1646 prev->cctx = cctx_current; 1695 prev->cctx = cctx_current;
1647 1696
1648 ++next->usecount; 1697 ++next->usecount;
1649 1698
1650 cctx_prev = cctx_current; 1699 cctx_prev = cctx_current;
1651 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1700 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1652 1701
1653 next->cctx = 0; 1702 next->cctx = 0;
1654 1703
1655 if (expect_false (cctx_prev != cctx_current)) 1704 if (ecb_expect_false (cctx_prev != cctx_current))
1656 { 1705 {
1657 cctx_prev->top_env = PL_top_env; 1706 cctx_prev->top_env = PL_top_env;
1658 PL_top_env = cctx_current->top_env; 1707 PL_top_env = cctx_current->top_env;
1659 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1708 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1660 } 1709 }
… …
1666#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1715#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) 1716#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1668 1717
1669/** high level stuff ********************************************************/ 1718/** high level stuff ********************************************************/
1670 1719
1720/* this function is actually Coro, not Coro::State, but we call it from here */
1721/* because it is convenient - but it hasn't been declared yet for that reason */
1671static int 1722static void
1723coro_call_on_destroy (pTHX_ struct coro *coro);
1724
1725static void
1672coro_state_destroy (pTHX_ struct coro *coro) 1726coro_state_destroy (pTHX_ struct coro *coro)
1673{ 1727{
1674 if (coro->flags & CF_DESTROYED) 1728 if (coro->flags & CF_ZOMBIE)
1675 return 0; 1729 return;
1676 1730
1677 if (coro->on_destroy && !PL_dirty)
1678 coro->on_destroy (aTHX_ coro); 1731 slf_destroy (aTHX_ coro);
1679 1732
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; 1733 coro->flags |= CF_ZOMBIE;
1689 1734
1690 if (coro->flags & CF_READY) 1735 if (coro->flags & CF_READY)
1691 { 1736 {
1692 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1737 /* reduce nready, as destroying a ready coro effectively unreadies it */
1693 /* alternative: look through all ready queues and remove the coro */ 1738 /* alternative: look through all ready queues and remove the coro */
1694 --coro_nready; 1739 --coro_nready;
1695 } 1740 }
1696 else 1741 else
1697 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1742 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1743
1744 if (coro->next) coro->next->prev = coro->prev;
1745 if (coro->prev) coro->prev->next = coro->next;
1746 if (coro == coro_first) coro_first = coro->next;
1698 1747
1699 if (coro->mainstack 1748 if (coro->mainstack
1700 && coro->mainstack != main_mainstack 1749 && coro->mainstack != main_mainstack
1701 && coro->slot 1750 && coro->slot
1702 && !PL_dirty) 1751 && !PL_dirty)
1703 destroy_perl (aTHX_ coro); 1752 destroy_perl (aTHX_ coro);
1704 1753
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); 1754 cctx_destroy (coro->cctx);
1710 SvREFCNT_dec (coro->startcv); 1755 SvREFCNT_dec (coro->startcv);
1711 SvREFCNT_dec (coro->args); 1756 SvREFCNT_dec (coro->args);
1712 SvREFCNT_dec (coro->swap_sv); 1757 SvREFCNT_dec (coro->swap_sv);
1713 SvREFCNT_dec (CORO_THROW); 1758 SvREFCNT_dec (CORO_THROW);
1714 1759
1715 return 1; 1760 coro_call_on_destroy (aTHX_ coro);
1761
1762 /* more destruction mayhem in coro_state_free */
1716} 1763}
1717 1764
1718static int 1765static int
1719coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1766coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1720{ 1767{
1721 struct coro *coro = (struct coro *)mg->mg_ptr; 1768 struct coro *coro = (struct coro *)mg->mg_ptr;
1722 mg->mg_ptr = 0; 1769 mg->mg_ptr = 0;
1723 1770
1724 coro->hv = 0;
1725
1726 if (--coro->refcnt < 0)
1727 {
1728 coro_state_destroy (aTHX_ coro); 1771 coro_state_destroy (aTHX_ coro);
1772 SvREFCNT_dec (coro->on_destroy);
1773 SvREFCNT_dec (coro->status);
1774
1729 Safefree (coro); 1775 Safefree (coro);
1730 }
1731 1776
1732 return 0; 1777 return 0;
1733} 1778}
1734 1779
1735static int 1780static int ecb_cold
1736coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1781coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1737{ 1782{
1738 struct coro *coro = (struct coro *)mg->mg_ptr; 1783 /* called when perl clones the current process the slow way (windows process emulation) */
1739 1784 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1740 ++coro->refcnt; 1785 mg->mg_ptr = 0;
1786 mg->mg_virtual = 0;
1741 1787
1742 return 0; 1788 return 0;
1743} 1789}
1744 1790
1745static MGVTBL coro_state_vtbl = { 1791static MGVTBL coro_state_vtbl = {
… …
1770 TRANSFER (ta, 1); 1816 TRANSFER (ta, 1);
1771} 1817}
1772 1818
1773/** Coro ********************************************************************/ 1819/** Coro ********************************************************************/
1774 1820
1775INLINE void 1821ecb_inline void
1776coro_enq (pTHX_ struct coro *coro) 1822coro_enq (pTHX_ struct coro *coro)
1777{ 1823{
1778 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1824 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1779 1825
1780 SvREFCNT_inc_NN (coro->hv); 1826 SvREFCNT_inc_NN (coro->hv);
… …
1782 coro->next_ready = 0; 1828 coro->next_ready = 0;
1783 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1829 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1784 ready [1] = coro; 1830 ready [1] = coro;
1785} 1831}
1786 1832
1787INLINE struct coro * 1833ecb_inline struct coro *
1788coro_deq (pTHX) 1834coro_deq (pTHX)
1789{ 1835{
1790 int prio; 1836 int prio;
1791 1837
1792 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1838 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1845{ 1891{
1846 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1892 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1847} 1893}
1848 1894
1849/* expects to own a reference to next->hv */ 1895/* expects to own a reference to next->hv */
1850INLINE void 1896ecb_inline void
1851prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1897prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1852{ 1898{
1853 SV *prev_sv = SvRV (coro_current); 1899 SV *prev_sv = SvRV (coro_current);
1854 1900
1855 ta->prev = SvSTATE_hv (prev_sv); 1901 ta->prev = SvSTATE_hv (prev_sv);
… …
1868{ 1914{
1869 for (;;) 1915 for (;;)
1870 { 1916 {
1871 struct coro *next = coro_deq (aTHX); 1917 struct coro *next = coro_deq (aTHX);
1872 1918
1873 if (expect_true (next)) 1919 if (ecb_expect_true (next))
1874 { 1920 {
1875 /* cannot transfer to destroyed coros, skip and look for next */ 1921 /* cannot transfer to destroyed coros, skip and look for next */
1876 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1922 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 */ 1923 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1878 else 1924 else
1879 { 1925 {
1880 next->flags &= ~CF_READY; 1926 next->flags &= ~CF_READY;
1881 --coro_nready; 1927 --coro_nready;
… …
1914 } 1960 }
1915 } 1961 }
1916 } 1962 }
1917} 1963}
1918 1964
1919INLINE void 1965ecb_inline void
1920prepare_cede (pTHX_ struct coro_transfer_args *ta) 1966prepare_cede (pTHX_ struct coro_transfer_args *ta)
1921{ 1967{
1922 api_ready (aTHX_ coro_current); 1968 api_ready (aTHX_ coro_current);
1923 prepare_schedule (aTHX_ ta); 1969 prepare_schedule (aTHX_ ta);
1924} 1970}
1925 1971
1926INLINE void 1972ecb_inline void
1927prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1973prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1928{ 1974{
1929 SV *prev = SvRV (coro_current); 1975 SV *prev = SvRV (coro_current);
1930 1976
1931 if (coro_nready) 1977 if (coro_nready)
… …
1961{ 2007{
1962 struct coro_transfer_args ta; 2008 struct coro_transfer_args ta;
1963 2009
1964 prepare_cede (aTHX_ &ta); 2010 prepare_cede (aTHX_ &ta);
1965 2011
1966 if (expect_true (ta.prev != ta.next)) 2012 if (ecb_expect_true (ta.prev != ta.next))
1967 { 2013 {
1968 TRANSFER (ta, 1); 2014 TRANSFER (ta, 1);
1969 return 1; 2015 return 1;
1970 } 2016 }
1971 else 2017 else
… …
2014 coro->slot->runops = RUNOPS_DEFAULT; 2060 coro->slot->runops = RUNOPS_DEFAULT;
2015 } 2061 }
2016} 2062}
2017 2063
2018static void 2064static void
2065coro_push_av (pTHX_ AV *av, I32 gimme_v)
2066{
2067 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2068 {
2069 dSP;
2070
2071 if (gimme_v == G_SCALAR)
2072 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2073 else
2074 {
2075 int i;
2076 EXTEND (SP, AvFILLp (av) + 1);
2077
2078 for (i = 0; i <= AvFILLp (av); ++i)
2079 PUSHs (AvARRAY (av)[i]);
2080 }
2081
2082 PUTBACK;
2083 }
2084}
2085
2086static void
2087coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2088{
2089 if (!coro->on_destroy)
2090 coro->on_destroy = newAV ();
2091
2092 av_push (coro->on_destroy, cb);
2093}
2094
2095static void
2096slf_destroy_join (pTHX_ struct CoroSLF *frame)
2097{
2098 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2099}
2100
2101static int
2102slf_check_join (pTHX_ struct CoroSLF *frame)
2103{
2104 struct coro *coro = (struct coro *)frame->data;
2105
2106 if (!coro->status)
2107 return 1;
2108
2109 frame->destroy = 0;
2110
2111 coro_push_av (aTHX_ coro->status, GIMME_V);
2112
2113 SvREFCNT_dec ((SV *)coro->hv);
2114
2115 return 0;
2116}
2117
2118static void
2119slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2120{
2121 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2122
2123 if (items > 1)
2124 croak ("join called with too many arguments");
2125
2126 if (coro->status)
2127 frame->prepare = prepare_nop;
2128 else
2129 {
2130 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2131 frame->prepare = prepare_schedule;
2132 }
2133
2134 frame->check = slf_check_join;
2135 frame->destroy = slf_destroy_join;
2136 frame->data = (void *)coro;
2137 SvREFCNT_inc (coro->hv);
2138}
2139
2140static void
2019coro_call_on_destroy (pTHX_ struct coro *coro) 2141coro_call_on_destroy (pTHX_ struct coro *coro)
2020{ 2142{
2021 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2143 AV *od = coro->on_destroy;
2022 2144
2023 if (on_destroyp) 2145 if (!od)
2024 { 2146 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 2147
2029 while (AvFILLp (on_destroy) >= 0) 2148 while (AvFILLp (od) >= 0)
2149 {
2150 SV *cb = sv_2mortal (av_pop (od));
2151
2152 /* coro hv's (and only hv's at the moment) are supported as well */
2153 if (SvSTATEhv_p (aTHX_ cb))
2154 api_ready (aTHX_ cb);
2155 else
2030 { 2156 {
2031 dSP; /* don't disturb outer sp */ 2157 dSP; /* don't disturb outer sp */
2032 SV *cb = av_pop (on_destroy);
2033
2034 PUSHMARK (SP); 2158 PUSHMARK (SP);
2035 2159
2036 if (statusp) 2160 if (coro->status)
2037 { 2161 {
2038 int i; 2162 PUTBACK;
2039 EXTEND (SP, AvFILLp (status) + 1); 2163 coro_push_av (aTHX_ coro->status, G_ARRAY);
2040 2164 SPAGAIN;
2041 for (i = 0; i <= AvFILLp (status); ++i)
2042 PUSHs (AvARRAY (status)[i]);
2043 } 2165 }
2044 2166
2045 PUTBACK; 2167 PUTBACK;
2046 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2168 call_sv (cb, G_VOID | G_DISCARD);
2047 } 2169 }
2048 } 2170 }
2049} 2171}
2050 2172
2051static void 2173static void
2052coro_set_status (HV *coro_hv, SV **arg, int items) 2174coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2053{ 2175{
2054 AV *av = newAV (); 2176 AV *av;
2177
2178 if (coro->status)
2179 {
2180 av = coro->status;
2181 av_clear (av);
2182 }
2183 else
2184 av = coro->status = newAV ();
2055 2185
2056 /* items are actually not so common, so optimise for this case */ 2186 /* items are actually not so common, so optimise for this case */
2057 if (items) 2187 if (items)
2058 { 2188 {
2059 int i; 2189 int i;
… …
2061 av_extend (av, items - 1); 2191 av_extend (av, items - 1);
2062 2192
2063 for (i = 0; i < items; ++i) 2193 for (i = 0; i < items; ++i)
2064 av_push (av, SvREFCNT_inc_NN (arg [i])); 2194 av_push (av, SvREFCNT_inc_NN (arg [i]));
2065 } 2195 }
2066
2067 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2068} 2196}
2069 2197
2070static void 2198static void
2071slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2199slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2072{ 2200{
… …
2084static void 2212static void
2085slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2213slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2086{ 2214{
2087 HV *coro_hv = (HV *)SvRV (coro_current); 2215 HV *coro_hv = (HV *)SvRV (coro_current);
2088 2216
2089 coro_set_status (coro_hv, arg, items); 2217 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2090 slf_init_terminate_cancel_common (frame, coro_hv); 2218 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2091} 2219}
2092 2220
2093static void 2221static void
2094slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2222slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2095{ 2223{
… …
2100 croak ("Coro::cancel called without coro object,"); 2228 croak ("Coro::cancel called without coro object,");
2101 2229
2102 coro = SvSTATE (arg [0]); 2230 coro = SvSTATE (arg [0]);
2103 coro_hv = coro->hv; 2231 coro_hv = coro->hv;
2104 2232
2105 coro_set_status (coro_hv, arg + 1, items - 1); 2233 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2106 2234
2107 if (expect_false (coro->flags & CF_NOCANCEL)) 2235 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2108 { 2236 {
2109 /* coro currently busy cancelling something, so just notify it */ 2237 /* coro currently busy cancelling something, so just notify it */
2110 coro->slf_frame.data = (void *)coro; 2238 coro->slf_frame.data = (void *)coro;
2111 2239
2112 frame->prepare = prepare_nop; 2240 frame->prepare = prepare_nop;
2113 frame->check = slf_check_nop; 2241 frame->check = slf_check_nop;
2114 } 2242 }
2115 else if (coro_hv == (HV *)SvRV (coro_current)) 2243 else if (coro_hv == (HV *)SvRV (coro_current))
2116 { 2244 {
2117 /* cancelling the current coro is allowed, and equals terminate */ 2245 /* cancelling the current coro is allowed, and equals terminate */
2118 slf_init_terminate_cancel_common (frame, coro_hv); 2246 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2119 } 2247 }
2120 else 2248 else
2121 { 2249 {
2122 struct coro *self = SvSTATE_current; 2250 struct coro *self = SvSTATE_current;
2123 2251
… …
2127 * this is ugly, and hopefully fully worth the extra speed. 2255 * this is ugly, and hopefully fully worth the extra speed.
2128 * besides, I can't get the slow-but-safe version working... 2256 * besides, I can't get the slow-but-safe version working...
2129 */ 2257 */
2130 slf_frame.data = 0; 2258 slf_frame.data = 0;
2131 self->flags |= CF_NOCANCEL; 2259 self->flags |= CF_NOCANCEL;
2132
2133 coro_state_destroy (aTHX_ coro); 2260 coro_state_destroy (aTHX_ coro);
2134 coro_call_on_destroy (aTHX_ coro);
2135
2136 self->flags &= ~CF_NOCANCEL; 2261 self->flags &= ~CF_NOCANCEL;
2137 2262
2138 if (slf_frame.data) 2263 if (slf_frame.data)
2139 { 2264 {
2140 /* while we were busy we have been cancelled, so terminate */ 2265 /* while we were busy we have been cancelled, so terminate */
2141 slf_init_terminate_cancel_common (frame, self->hv); 2266 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2142 } 2267 }
2143 else 2268 else
2144 { 2269 {
2145 frame->prepare = prepare_nop; 2270 frame->prepare = prepare_nop;
2146 frame->check = slf_check_nop; 2271 frame->check = slf_check_nop;
2147 } 2272 }
2148 } 2273 }
2149} 2274}
2150 2275
2276static int
2277slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2278{
2279 frame->prepare = 0;
2280 coro_unwind_stacks (aTHX);
2281
2282 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2283
2284 return 1;
2285}
2286
2287static int
2288safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2289{
2290 if (coro->cctx)
2291 croak ("coro inside C callback, unable to cancel at this time, caught");
2292
2293 if (coro->flags & CF_NEW)
2294 {
2295 coro_set_status (aTHX_ coro, arg, items);
2296 coro_state_destroy (aTHX_ coro);
2297 }
2298 else
2299 {
2300 if (!coro->slf_frame.prepare)
2301 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2302
2303 slf_destroy (aTHX_ coro);
2304
2305 coro_set_status (aTHX_ coro, arg, items);
2306 coro->slf_frame.prepare = prepare_nop;
2307 coro->slf_frame.check = slf_check_safe_cancel;
2308
2309 api_ready (aTHX_ (SV *)coro->hv);
2310 }
2311
2312 return 1;
2313}
2314
2151/*****************************************************************************/ 2315/*****************************************************************************/
2152/* async pool handler */ 2316/* async pool handler */
2153 2317
2154static int 2318static int
2155slf_check_pool_handler (pTHX_ struct CoroSLF *frame) 2319slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
… …
2184slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2348slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2185{ 2349{
2186 HV *hv = (HV *)SvRV (coro_current); 2350 HV *hv = (HV *)SvRV (coro_current);
2187 struct coro *coro = SvSTATE_hv ((SV *)hv); 2351 struct coro *coro = SvSTATE_hv ((SV *)hv);
2188 2352
2189 if (expect_true (coro->saved_deffh)) 2353 if (ecb_expect_true (coro->saved_deffh))
2190 { 2354 {
2191 /* subsequent iteration */ 2355 /* subsequent iteration */
2192 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2356 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2193 coro->saved_deffh = 0; 2357 coro->saved_deffh = 0;
2194 2358
2195 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2359 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2196 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2360 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2197 { 2361 {
2198 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2362 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2199 coro->invoke_av = newAV (); 2363 return;
2200
2201 frame->prepare = prepare_nop;
2202 } 2364 }
2203 else 2365 else
2204 { 2366 {
2205 av_clear (GvAV (PL_defgv)); 2367 av_clear (GvAV (PL_defgv));
2206 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2368 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2429static void 2591static void
2430slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2592slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2431{ 2593{
2432 frame->prepare = prepare_cede_notself; 2594 frame->prepare = prepare_cede_notself;
2433 frame->check = slf_check_nop; 2595 frame->check = slf_check_nop;
2596}
2597
2598/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2599static void
2600slf_destroy (pTHX_ struct coro *coro)
2601{
2602 /* this callback is reserved for slf functions needing to do cleanup */
2603 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2604 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2605
2606 /*
2607 * The on_destroy above most likely is from an SLF call.
2608 * Since by definition the SLF call will not finish when we destroy
2609 * the coro, we will have to force-finish it here, otherwise
2610 * cleanup functions cannot call SLF functions.
2611 */
2612 coro->slf_frame.prepare = 0;
2434} 2613}
2435 2614
2436/* 2615/*
2437 * these not obviously related functions are all rolled into one 2616 * these not obviously related functions are all rolled into one
2438 * function to increase chances that they all will call transfer with the same 2617 * 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 */ 2624 I32 checkmark; /* mark SP to see how many elements check has pushed */
2446 2625
2447 /* set up the slf frame, unless it has already been set-up */ 2626 /* set up the slf frame, unless it has already been set-up */
2448 /* the latter happens when a new coro has been started */ 2627 /* the latter happens when a new coro has been started */
2449 /* or when a new cctx was attached to an existing coroutine */ 2628 /* or when a new cctx was attached to an existing coroutine */
2450 if (expect_true (!slf_frame.prepare)) 2629 if (ecb_expect_true (!slf_frame.prepare))
2451 { 2630 {
2452 /* first iteration */ 2631 /* first iteration */
2453 dSP; 2632 dSP;
2454 SV **arg = PL_stack_base + TOPMARK + 1; 2633 SV **arg = PL_stack_base + TOPMARK + 1;
2455 int items = SP - arg; /* args without function object */ 2634 int items = SP - arg; /* args without function object */
… …
2496 while (slf_frame.check (aTHX_ &slf_frame)); 2675 while (slf_frame.check (aTHX_ &slf_frame));
2497 2676
2498 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2677 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2499 2678
2500 /* exception handling */ 2679 /* exception handling */
2501 if (expect_false (CORO_THROW)) 2680 if (ecb_expect_false (CORO_THROW))
2502 { 2681 {
2503 SV *exception = sv_2mortal (CORO_THROW); 2682 SV *exception = sv_2mortal (CORO_THROW);
2504 2683
2505 CORO_THROW = 0; 2684 CORO_THROW = 0;
2506 sv_setsv (ERRSV, exception); 2685 sv_setsv (ERRSV, exception);
2507 croak (0); 2686 croak (0);
2508 } 2687 }
2509 2688
2510 /* return value handling - mostly like entersub */ 2689 /* return value handling - mostly like entersub */
2511 /* make sure we put something on the stack in scalar context */ 2690 /* make sure we put something on the stack in scalar context */
2512 if (GIMME_V == G_SCALAR) 2691 if (GIMME_V == G_SCALAR
2692 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2513 { 2693 {
2514 dSP; 2694 dSP;
2515 SV **bot = PL_stack_base + checkmark; 2695 SV **bot = PL_stack_base + checkmark;
2516 2696
2517 if (sp == bot) /* too few, push undef */ 2697 if (sp == bot) /* too few, push undef */
2518 bot [1] = &PL_sv_undef; 2698 bot [1] = &PL_sv_undef;
2519 else if (sp != bot + 1) /* too many, take last one */ 2699 else /* too many, take last one */
2520 bot [1] = *sp; 2700 bot [1] = *sp;
2521 2701
2522 SP = bot + 1; 2702 SP = bot + 1;
2523 2703
2524 PUTBACK; 2704 PUTBACK;
… …
2631{ 2811{
2632 PerlIOBuf base; 2812 PerlIOBuf base;
2633 NV next, every; 2813 NV next, every;
2634} PerlIOCede; 2814} PerlIOCede;
2635 2815
2636static IV 2816static IV ecb_cold
2637PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2817PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2638{ 2818{
2639 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2819 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2640 2820
2641 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2821 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2642 self->next = nvtime () + self->every; 2822 self->next = nvtime () + self->every;
2643 2823
2644 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2824 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2645} 2825}
2646 2826
2647static SV * 2827static SV * ecb_cold
2648PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2828PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2649{ 2829{
2650 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2830 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2651 2831
2652 return newSVnv (self->every); 2832 return newSVnv (self->every);
… …
2764 SvREFCNT_dec (cb); 2944 SvREFCNT_dec (cb);
2765 } 2945 }
2766} 2946}
2767 2947
2768static void 2948static void
2769coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2949coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2770{ 2950{
2771 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2951 /* call $sem->adjust (0) to possibly wake up some other waiters */
2772 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2952 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2773} 2953}
2774 2954
2775static int 2955static int
2776slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2956slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2777{ 2957{
2778 AV *av = (AV *)frame->data; 2958 AV *av = (AV *)frame->data;
2779 SV *count_sv = AvARRAY (av)[0]; 2959 SV *count_sv = AvARRAY (av)[0];
2960 SV *coro_hv = SvRV (coro_current);
2780 2961
2781 /* if we are about to throw, don't actually acquire the lock, just throw */ 2962 /* if we are about to throw, don't actually acquire the lock, just throw */
2782 if (CORO_THROW) 2963 if (CORO_THROW)
2783 return 0; 2964 return 0;
2784 else if (SvIVX (count_sv) > 0) 2965 else if (SvIVX (count_sv) > 0)
2785 { 2966 {
2786 SvSTATE_current->on_destroy = 0; 2967 frame->destroy = 0;
2787 2968
2788 if (acquire) 2969 if (acquire)
2789 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2970 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2790 else 2971 else
2791 coro_semaphore_adjust (aTHX_ av, 0); 2972 coro_semaphore_adjust (aTHX_ av, 0);
… …
2796 { 2977 {
2797 int i; 2978 int i;
2798 /* if we were woken up but can't down, we look through the whole */ 2979 /* 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 */ 2980 /* waiters list and only add us if we aren't in there already */
2800 /* this avoids some degenerate memory usage cases */ 2981 /* this avoids some degenerate memory usage cases */
2801 2982 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)) 2983 if (AvARRAY (av)[i] == coro_hv)
2804 return 1; 2984 return 1;
2805 2985
2806 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2986 av_push (av, SvREFCNT_inc (coro_hv));
2807 return 1; 2987 return 1;
2808 } 2988 }
2809} 2989}
2810 2990
2811static int 2991static int
… …
2834 { 3014 {
2835 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3015 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2836 3016
2837 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3017 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2838 frame->prepare = prepare_schedule; 3018 frame->prepare = prepare_schedule;
2839
2840 /* to avoid race conditions when a woken-up coro gets terminated */ 3019 /* to avoid race conditions when a woken-up coro gets terminated */
2841 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3020 /* we arrange for a temporary on_destroy that calls adjust (0) */
2842 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3021 frame->destroy = coro_semaphore_destroy;
2843 } 3022 }
2844} 3023}
2845 3024
2846static void 3025static void
2847slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3026slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
3065 dSP; 3244 dSP;
3066 3245
3067 static SV *prio_cv; 3246 static SV *prio_cv;
3068 static SV *prio_sv; 3247 static SV *prio_sv;
3069 3248
3070 if (expect_false (!prio_cv)) 3249 if (ecb_expect_false (!prio_cv))
3071 { 3250 {
3072 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3251 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3073 prio_sv = newSViv (0); 3252 prio_sv = newSViv (0);
3074 } 3253 }
3075 3254
… …
3181 } 3360 }
3182 3361
3183 return coro_sv; 3362 return coro_sv;
3184} 3363}
3185 3364
3365#ifndef __cplusplus
3366ecb_cold XS(boot_Coro__State);
3367#endif
3368
3369#if CORO_JIT
3370
3371static void ecb_noinline ecb_cold
3372pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3373{
3374 dSP;
3375 AV *av = newAV ();
3376
3377 av_store (av, 3, newSVuv (d));
3378 av_store (av, 2, newSVuv (c));
3379 av_store (av, 1, newSVuv (b));
3380 av_store (av, 0, newSVuv (a));
3381
3382 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3383
3384 PUTBACK;
3385}
3386
3387static void ecb_noinline ecb_cold
3388jit_init (pTHX)
3389{
3390 dSP;
3391 SV *load, *save;
3392 char *map_base;
3393 char *load_ptr, *save_ptr;
3394 STRLEN load_len, save_len, map_len;
3395 int count;
3396
3397 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3398
3399 PUSHMARK (SP);
3400 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3401 #include "state.h"
3402 count = call_pv ("Coro::State::_jit", G_ARRAY);
3403 SPAGAIN;
3404
3405 save = POPs; save_ptr = SvPVbyte (save, save_len);
3406 load = POPs; load_ptr = SvPVbyte (load, load_len);
3407
3408 map_len = load_len + save_len + 16;
3409
3410 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3411
3412 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3413
3414 load_perl_slots = (load_save_perl_slots_type)map_base;
3415 memcpy (map_base, load_ptr, load_len);
3416
3417 map_base += (load_len + 15) & ~15;
3418
3419 save_perl_slots = (load_save_perl_slots_type)map_base;
3420 memcpy (map_base, save_ptr, save_len);
3421
3422 /* we are good citizens and try to make the page read-only, so the evil evil */
3423 /* hackers might have it a bit more difficult */
3424 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3425
3426 PUTBACK;
3427 eval_pv ("undef &Coro::State::_jit", 1);
3428}
3429
3430#endif
3431
3186MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3432MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3187 3433
3188PROTOTYPES: DISABLE 3434PROTOTYPES: DISABLE
3189 3435
3190BOOT: 3436BOOT:
… …
3193# if CORO_PTHREAD 3439# if CORO_PTHREAD
3194 coro_thx = PERL_GET_CONTEXT; 3440 coro_thx = PERL_GET_CONTEXT;
3195# endif 3441# endif
3196#endif 3442#endif
3197 BOOT_PAGESIZE; 3443 BOOT_PAGESIZE;
3444
3445 /* perl defines these to check for existance first, but why it doesn't */
3446 /* just create them one at init time is not clear to me, except for */
3447 /* programs trying to delete them, but... */
3448 /* anyway, we declare this as invalid and make sure they are initialised here */
3449 DEFSV;
3450 ERRSV;
3198 3451
3199 cctx_current = cctx_new_empty (); 3452 cctx_current = cctx_new_empty ();
3200 3453
3201 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3454 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3202 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3455 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3245 coroapi.prepare_cede_notself = prepare_cede_notself; 3498 coroapi.prepare_cede_notself = prepare_cede_notself;
3246 3499
3247 time_init (aTHX); 3500 time_init (aTHX);
3248 3501
3249 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3502 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3503#if CORO_JIT
3504 PUTBACK;
3505 jit_init (aTHX);
3506 SPAGAIN;
3507#endif
3250} 3508}
3251 3509
3252SV * 3510SV *
3253new (SV *klass, ...) 3511new (SV *klass, ...)
3254 ALIAS: 3512 ALIAS:
… …
3396 PROTOTYPE: $ 3654 PROTOTYPE: $
3397 ALIAS: 3655 ALIAS:
3398 is_ready = CF_READY 3656 is_ready = CF_READY
3399 is_running = CF_RUNNING 3657 is_running = CF_RUNNING
3400 is_new = CF_NEW 3658 is_new = CF_NEW
3401 is_destroyed = CF_DESTROYED 3659 is_destroyed = CF_ZOMBIE
3660 is_zombie = CF_ZOMBIE
3402 is_suspended = CF_SUSPENDED 3661 is_suspended = CF_SUSPENDED
3403 CODE: 3662 CODE:
3404 RETVAL = boolSV (coro->flags & ix); 3663 RETVAL = boolSV (coro->flags & ix);
3405 OUTPUT: 3664 OUTPUT:
3406 RETVAL 3665 RETVAL
3407 3666
3408void 3667void
3409throw (Coro::State self, SV *exception = &PL_sv_undef) 3668throw (SV *self, SV *exception = &PL_sv_undef)
3410 PROTOTYPE: $;$ 3669 PROTOTYPE: $;$
3411 CODE: 3670 CODE:
3412{ 3671{
3672 struct coro *coro = SvSTATE (self);
3413 struct coro *current = SvSTATE_current; 3673 struct coro *current = SvSTATE_current;
3414 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3674 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3415 SvREFCNT_dec (*exceptionp); 3675 SvREFCNT_dec (*exceptionp);
3416 SvGETMAGIC (exception); 3676 SvGETMAGIC (exception);
3417 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3677 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3678
3679 api_ready (aTHX_ self);
3418} 3680}
3419 3681
3420void 3682void
3421api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3683api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3422 PROTOTYPE: $;$ 3684 PROTOTYPE: $;$
… …
3501times (Coro::State self) 3763times (Coro::State self)
3502 PPCODE: 3764 PPCODE:
3503{ 3765{
3504 struct coro *current = SvSTATE (coro_current); 3766 struct coro *current = SvSTATE (coro_current);
3505 3767
3506 if (expect_false (current == self)) 3768 if (ecb_expect_false (current == self))
3507 { 3769 {
3508 coro_times_update (); 3770 coro_times_update ();
3509 coro_times_add (SvSTATE (coro_current)); 3771 coro_times_add (SvSTATE (coro_current));
3510 } 3772 }
3511 3773
3512 EXTEND (SP, 2); 3774 EXTEND (SP, 2);
3513 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3775 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))); 3776 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3515 3777
3516 if (expect_false (current == self)) 3778 if (ecb_expect_false (current == self))
3517 coro_times_sub (SvSTATE (coro_current)); 3779 coro_times_sub (SvSTATE (coro_current));
3518} 3780}
3519 3781
3520void 3782void
3521swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3783swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3542BOOT: 3804BOOT:
3543{ 3805{
3544 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3806 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3545 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3807 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3546 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3808 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); 3809 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); 3810 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3550 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3811 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3551 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3812 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3552 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3813 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
… …
3595void 3856void
3596_destroy (Coro::State coro) 3857_destroy (Coro::State coro)
3597 CODE: 3858 CODE:
3598 /* used by the manager thread */ 3859 /* used by the manager thread */
3599 coro_state_destroy (aTHX_ coro); 3860 coro_state_destroy (aTHX_ coro);
3861
3862void
3863on_destroy (Coro::State coro, SV *cb)
3864 CODE:
3600 coro_call_on_destroy (aTHX_ coro); 3865 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3866
3867void
3868join (...)
3869 CODE:
3870 CORO_EXECUTE_SLF_XS (slf_init_join);
3601 3871
3602void 3872void
3603terminate (...) 3873terminate (...)
3604 CODE: 3874 CODE:
3605 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3875 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3606 3876
3607void 3877void
3608cancel (...) 3878cancel (...)
3609 CODE: 3879 CODE:
3610 CORO_EXECUTE_SLF_XS (slf_init_cancel); 3880 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3881
3882int
3883safe_cancel (Coro::State self, ...)
3884 C_ARGS: aTHX_ self, &ST (1), items - 1
3611 3885
3612void 3886void
3613schedule (...) 3887schedule (...)
3614 CODE: 3888 CODE:
3615 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3889 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3891} 4165}
3892 4166
3893MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4167MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3894 4168
3895void 4169void
3896_may_delete (SV *sem, int count, int extra_refs) 4170_may_delete (SV *sem, int count, unsigned int extra_refs)
3897 PPCODE: 4171 PPCODE:
3898{ 4172{
3899 AV *av = (AV *)SvRV (sem); 4173 AV *av = (AV *)SvRV (sem);
3900 4174
3901 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4175 if (SvREFCNT ((SV *)av) == 1 + extra_refs

Diff Legend

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