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.383 by root, Sun Feb 13 04:39:16 2011 UTC vs.
Revision 1.420 by root, Fri Apr 13 10:53:25 2012 UTC

… …
12#include "perl.h" 12#include "perl.h"
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17#include "ecb.h"
17 18
19#include <stddef.h>
18#include <stdio.h> 20#include <stdio.h>
19#include <errno.h> 21#include <errno.h>
20#include <assert.h> 22#include <assert.h>
21 23
22#ifndef SVs_PADSTALE 24#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0 25# define SVs_PADSTALE 0
24#endif 26#endif
25 27
26#ifdef WIN32 28#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY
27# undef setjmp 30# undef setjmp
28# undef longjmp 31# undef longjmp
29# undef _exit 32# undef _exit
30# define setjmp _setjmp /* deep magic */ 33# define setjmp _setjmp /* deep magic */
31#else 34#else
32# include <inttypes.h> /* most portable stdint.h */ 35# include <inttypes.h> /* most portable stdint.h */
33#endif 36#endif
34 37
35#ifdef HAVE_MMAP 38#if HAVE_MMAP
36# include <unistd.h> 39# include <unistd.h>
37# include <sys/mman.h> 40# include <sys/mman.h>
38# ifndef MAP_ANONYMOUS 41# ifndef MAP_ANONYMOUS
39# ifdef MAP_ANON 42# ifdef MAP_ANON
40# define MAP_ANONYMOUS MAP_ANON 43# define MAP_ANONYMOUS MAP_ANON
… …
60#endif 63#endif
61 64
62/* the maximum number of idle cctx that will be pooled */ 65/* the maximum number of idle cctx that will be pooled */
63static int cctx_max_idle = 4; 66static int cctx_max_idle = 4;
64 67
68#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# define HAS_SCOPESTACK_NAME 1
70#endif
71
65#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 72#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
66# undef CORO_STACKGUARD 73# undef CORO_STACKGUARD
67#endif 74#endif
68 75
69#ifndef CORO_STACKGUARD 76#ifndef CORO_STACKGUARD
… …
85# define STACKLEVEL ((void *)&stacklevel) 92# define STACKLEVEL ((void *)&stacklevel)
86#endif 93#endif
87 94
88#define IN_DESTRUCT PL_dirty 95#define IN_DESTRUCT PL_dirty
89 96
90#if __GNUC__ >= 3
91# define attribute(x) __attribute__(x)
92# define expect(expr,value) __builtin_expect ((expr), (value))
93# define INLINE static inline
94#else
95# define attribute(x)
96# define expect(expr,value) (expr)
97# define INLINE static
98#endif
99
100#define expect_false(expr) expect ((expr) != 0, 0)
101#define expect_true(expr) expect ((expr) != 0, 1)
102
103#define NOINLINE attribute ((noinline))
104
105#include "CoroAPI.h" 97#include "CoroAPI.h"
106#define GCoroAPI (&coroapi) /* very sneaky */ 98#define GCoroAPI (&coroapi) /* very sneaky */
107 99
108#ifdef USE_ITHREADS 100#ifdef USE_ITHREADS
109# if CORO_PTHREAD 101# if CORO_PTHREAD
… …
125static void (*u2time)(pTHX_ UV ret[2]); 117static void (*u2time)(pTHX_ UV ret[2]);
126 118
127/* we hijack an hopefully unused CV flag for our purposes */ 119/* we hijack an hopefully unused CV flag for our purposes */
128#define CVf_SLF 0x4000 120#define CVf_SLF 0x4000
129static OP *pp_slf (pTHX); 121static OP *pp_slf (pTHX);
122static void slf_destroy (pTHX_ struct coro *coro);
130 123
131static U32 cctx_gen; 124static U32 cctx_gen;
132static size_t cctx_stacksize = CORO_STACKSIZE; 125static size_t cctx_stacksize = CORO_STACKSIZE;
133static struct CoroAPI coroapi; 126static struct CoroAPI coroapi;
134static AV *main_mainstack; /* used to differentiate between $main and others */ 127static AV *main_mainstack; /* used to differentiate between $main and others */
… …
164static char times_valid; 157static char times_valid;
165 158
166static struct coro_cctx *cctx_first; 159static struct coro_cctx *cctx_first;
167static int cctx_count, cctx_idle; 160static int cctx_count, cctx_idle;
168 161
169enum { 162enum
163{
170 CC_MAPPED = 0x01, 164 CC_MAPPED = 0x01,
171 CC_NOREUSE = 0x02, /* throw this away after tracing */ 165 CC_NOREUSE = 0x02, /* throw this away after tracing */
172 CC_TRACE = 0x04, 166 CC_TRACE = 0x04,
173 CC_TRACE_SUB = 0x08, /* trace sub calls */ 167 CC_TRACE_SUB = 0x08, /* trace sub calls */
174 CC_TRACE_LINE = 0x10, /* trace each statement */ 168 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
184 void *sptr; 178 void *sptr;
185 size_t ssize; 179 size_t ssize;
186 180
187 /* cpu state */ 181 /* cpu state */
188 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
189 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
190 JMPENV *top_env; 186 JMPENV *top_env;
191 coro_context cctx; 187 coro_context cctx;
192 188
193 U32 gen; 189 U32 gen;
194#if CORO_USE_VALGRIND 190#if CORO_USE_VALGRIND
195 int valgrind_id; 191 int valgrind_id;
196#endif 192#endif
197 unsigned char flags; 193 unsigned char flags;
198} coro_cctx; 194} coro_cctx;
199 195
200coro_cctx *cctx_current; /* the currently running cctx */ 196static coro_cctx *cctx_current; /* the currently running cctx */
201 197
202/*****************************************************************************/ 198/*****************************************************************************/
203 199
200static MGVTBL coro_state_vtbl;
201
204enum { 202enum
203{
205 CF_RUNNING = 0x0001, /* coroutine is running */ 204 CF_RUNNING = 0x0001, /* coroutine is running */
206 CF_READY = 0x0002, /* coroutine is ready */ 205 CF_READY = 0x0002, /* coroutine is ready */
207 CF_NEW = 0x0004, /* has never been switched to */ 206 CF_NEW = 0x0004, /* has never been switched to */
208 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 207 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
209 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 208 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
209 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
210}; 210};
211 211
212/* 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 */
213typedef struct 213typedef struct
214{ 214{
215 SV *defsv;
216 AV *defav;
217 SV *errsv;
218 SV *irsgv;
219 HV *hinthv;
220#define VAR(name,type) type name; 215 #define VARx(name,expr,type) type name;
221# include "state.h" 216 #include "state.h"
222#undef VAR
223} perl_slots; 217} perl_slots;
224 218
219/* how many context stack entries do we need for perl_slots */
225#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 220#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
226 221
227/* this is a structure representing a perl-level coroutine */ 222/* this is a structure representing a perl-level coroutine */
228struct coro { 223struct coro
224{
229 /* the C coroutine allocated to this perl coroutine, if any */ 225 /* the C coroutine allocated to this perl coroutine, if any */
230 coro_cctx *cctx; 226 coro_cctx *cctx;
231 227
232 /* ready queue */ 228 /* ready queue */
233 struct coro *next_ready; 229 struct coro *next_ready;
… …
235 /* state data */ 231 /* state data */
236 struct CoroSLF slf_frame; /* saved slf frame */ 232 struct CoroSLF slf_frame; /* saved slf frame */
237 AV *mainstack; 233 AV *mainstack;
238 perl_slots *slot; /* basically the saved sp */ 234 perl_slots *slot; /* basically the saved sp */
239 235
240 CV *startcv; /* the CV to execute */ 236 CV *startcv; /* the CV to execute */
241 AV *args; /* data associated with this coroutine (initial args) */ 237 AV *args; /* data associated with this coroutine (initial args) */
242 int refcnt; /* coroutines are refcounted, yes */
243 int flags; /* CF_ flags */ 238 int flags; /* CF_ flags */
244 HV *hv; /* the perl hash associated with this coro, if any */ 239 HV *hv; /* the perl hash associated with this coro, if any */
245 void (*on_destroy)(pTHX_ struct coro *coro);
246 240
247 /* statistics */ 241 /* statistics */
248 int usecount; /* number of transfers to this coro */ 242 int usecount; /* number of transfers to this coro */
249 243
250 /* coro process data */ 244 /* coro process data */
251 int prio; 245 int prio;
252 SV *except; /* exception to be thrown */ 246 SV *except; /* exception to be thrown */
253 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 */
254 250
255 /* async_pool */ 251 /* async_pool */
256 SV *saved_deffh; 252 SV *saved_deffh;
257 SV *invoke_cb; 253 SV *invoke_cb;
258 AV *invoke_av; 254 AV *invoke_av;
… …
274typedef struct coro *Coro__State; 270typedef struct coro *Coro__State;
275typedef struct coro *Coro__State_or_hashref; 271typedef struct coro *Coro__State_or_hashref;
276 272
277/* the following variables are effectively part of the perl context */ 273/* the following variables are effectively part of the perl context */
278/* and get copied between struct coro and these variables */ 274/* and get copied between struct coro and these variables */
279/* the mainr easonw e don't support windows process emulation */ 275/* the main reason we don't support windows process emulation */
280static struct CoroSLF slf_frame; /* the current slf frame */ 276static struct CoroSLF slf_frame; /* the current slf frame */
281 277
282/** Coro ********************************************************************/ 278/** Coro ********************************************************************/
283 279
284#define CORO_PRIO_MAX 3 280#define CORO_PRIO_MAX 3
… …
290 286
291/* for Coro.pm */ 287/* for Coro.pm */
292static SV *coro_current; 288static SV *coro_current;
293static SV *coro_readyhook; 289static SV *coro_readyhook;
294static 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 */
295static CV *cv_coro_run, *cv_coro_terminate; 291static CV *cv_coro_run;
296static struct coro *coro_first; 292static struct coro *coro_first;
297#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
298 317
299/** Coro::Select ************************************************************/ 318/** Coro::Select ************************************************************/
300 319
301static OP *(*coro_old_pp_sselect) (pTHX); 320static OP *(*coro_old_pp_sselect) (pTHX);
302static SV *coro_select_select; 321static SV *coro_select_select;
… …
314 PL_op->op_flags |= OPf_STACKED; 333 PL_op->op_flags |= OPf_STACKED;
315 PL_op->op_private = 0; 334 PL_op->op_private = 0;
316 return PL_ppaddr [OP_ENTERSUB](aTHX); 335 return PL_ppaddr [OP_ENTERSUB](aTHX);
317} 336}
318 337
338/** time stuff **************************************************************/
339
340#ifdef HAS_GETTIMEOFDAY
341
342ecb_inline void
343coro_u2time (pTHX_ UV ret[2])
344{
345 struct timeval tv;
346 gettimeofday (&tv, 0);
347
348 ret [0] = tv.tv_sec;
349 ret [1] = tv.tv_usec;
350}
351
352ecb_inline double
353coro_nvtime (void)
354{
355 struct timeval tv;
356 gettimeofday (&tv, 0);
357
358 return tv.tv_sec + tv.tv_usec * 1e-6;
359}
360
361ecb_inline void
362time_init (pTHX)
363{
364 nvtime = coro_nvtime;
365 u2time = coro_u2time;
366}
367
368#else
369
370ecb_inline void
371time_init (pTHX)
372{
373 SV **svp;
374
375 require_pv ("Time/HiRes.pm");
376
377 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
378
379 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
380 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
381
382 nvtime = INT2PTR (double (*)(), SvIV (*svp));
383
384 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
385 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
386}
387
388#endif
389
319/** lowlevel stuff **********************************************************/ 390/** lowlevel stuff **********************************************************/
320 391
321static SV * 392static SV * ecb_noinline
322coro_get_sv (pTHX_ const char *name, int create) 393coro_get_sv (pTHX_ const char *name, int create)
323{ 394{
324#if PERL_VERSION_ATLEAST (5,10,0) 395#if PERL_VERSION_ATLEAST (5,10,0)
325 /* 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 */
326 get_sv (name, create); 397 get_sv (name, create);
327#endif 398#endif
328 return get_sv (name, create); 399 return get_sv (name, create);
329} 400}
330 401
331static AV * 402static AV * ecb_noinline
332coro_get_av (pTHX_ const char *name, int create) 403coro_get_av (pTHX_ const char *name, int create)
333{ 404{
334#if PERL_VERSION_ATLEAST (5,10,0) 405#if PERL_VERSION_ATLEAST (5,10,0)
335 /* 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 */
336 get_av (name, create); 407 get_av (name, create);
337#endif 408#endif
338 return get_av (name, create); 409 return get_av (name, create);
339} 410}
340 411
341static HV * 412static HV * ecb_noinline
342coro_get_hv (pTHX_ const char *name, int create) 413coro_get_hv (pTHX_ const char *name, int create)
343{ 414{
344#if PERL_VERSION_ATLEAST (5,10,0) 415#if PERL_VERSION_ATLEAST (5,10,0)
345 /* 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 */
346 get_hv (name, create); 417 get_hv (name, create);
347#endif 418#endif
348 return get_hv (name, create); 419 return get_hv (name, create);
349} 420}
350 421
351INLINE void 422ecb_inline void
352coro_times_update () 423coro_times_update (void)
353{ 424{
354#ifdef coro_clock_gettime 425#ifdef coro_clock_gettime
355 struct timespec ts; 426 struct timespec ts;
356 427
357 ts.tv_sec = ts.tv_nsec = 0; 428 ts.tv_sec = ts.tv_nsec = 0;
… …
369 time_real [0] = tv [0]; 440 time_real [0] = tv [0];
370 time_real [1] = tv [1] * 1000; 441 time_real [1] = tv [1] * 1000;
371#endif 442#endif
372} 443}
373 444
374INLINE void 445ecb_inline void
375coro_times_add (struct coro *c) 446coro_times_add (struct coro *c)
376{ 447{
377 c->t_real [1] += time_real [1]; 448 c->t_real [1] += time_real [1];
378 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]; }
379 c->t_real [0] += time_real [0]; 450 c->t_real [0] += time_real [0];
… …
381 c->t_cpu [1] += time_cpu [1]; 452 c->t_cpu [1] += time_cpu [1];
382 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]; }
383 c->t_cpu [0] += time_cpu [0]; 454 c->t_cpu [0] += time_cpu [0];
384} 455}
385 456
386INLINE void 457ecb_inline void
387coro_times_sub (struct coro *c) 458coro_times_sub (struct coro *c)
388{ 459{
389 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]; }
390 c->t_real [1] -= time_real [1]; 461 c->t_real [1] -= time_real [1];
391 c->t_real [0] -= time_real [0]; 462 c->t_real [0] -= time_real [0];
… …
399/* magic glue */ 470/* magic glue */
400 471
401#define CORO_MAGIC_type_cv 26 472#define CORO_MAGIC_type_cv 26
402#define CORO_MAGIC_type_state PERL_MAGIC_ext 473#define CORO_MAGIC_type_state PERL_MAGIC_ext
403 474
404#define CORO_MAGIC_NN(sv, type) \ 475#define CORO_MAGIC_NN(sv, type) \
405 (expect_true (SvMAGIC (sv)->mg_type == type) \ 476 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
406 ? SvMAGIC (sv) \ 477 ? SvMAGIC (sv) \
407 : mg_find (sv, type)) 478 : mg_find (sv, type))
408 479
409#define CORO_MAGIC(sv, type) \ 480#define CORO_MAGIC(sv, type) \
410 (expect_true (SvMAGIC (sv)) \ 481 (ecb_expect_true (SvMAGIC (sv)) \
411 ? CORO_MAGIC_NN (sv, type) \ 482 ? CORO_MAGIC_NN (sv, type) \
412 : 0) 483 : 0)
413 484
414#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)
415#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)
416 487
417INLINE 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 *
418SvSTATE_ (pTHX_ SV *coro) 504SvSTATE_ (pTHX_ SV *coro)
419{ 505{
420 HV *stash;
421 MAGIC *mg; 506 MAGIC *mg;
422 507
423 if (SvROK (coro)) 508 if (SvROK (coro))
424 coro = SvRV (coro); 509 coro = SvRV (coro);
425 510
426 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 511 mg = SvSTATEhv_p (aTHX_ coro);
512 if (!mg)
427 croak ("Coro::State object required"); 513 croak ("Coro::State object required");
428 514
429 stash = SvSTASH (coro);
430 if (expect_false (stash != coro_stash && stash != coro_state_stash))
431 {
432 /* very slow, but rare, check */
433 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
434 croak ("Coro::State object required");
435 }
436
437 mg = CORO_MAGIC_state (coro);
438 return (struct coro *)mg->mg_ptr; 515 return (struct coro *)mg->mg_ptr;
439} 516}
440 517
441#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 518#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
442 519
… …
445#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 522#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
446 523
447/*****************************************************************************/ 524/*****************************************************************************/
448/* padlist management and caching */ 525/* padlist management and caching */
449 526
450static AV * 527ecb_inline AV *
451coro_derive_padlist (pTHX_ CV *cv) 528coro_derive_padlist (pTHX_ CV *cv)
452{ 529{
453 AV *padlist = CvPADLIST (cv); 530 AV *padlist = CvPADLIST (cv);
454 AV *newpadlist, *newpad; 531 AV *newpadlist, *newpad;
455 532
… …
467 av_store (newpadlist, 1, (SV *)newpad); 544 av_store (newpadlist, 1, (SV *)newpad);
468 545
469 return newpadlist; 546 return newpadlist;
470} 547}
471 548
472static void 549ecb_inline void
473free_padlist (pTHX_ AV *padlist) 550free_padlist (pTHX_ AV *padlist)
474{ 551{
475 /* may be during global destruction */ 552 /* may be during global destruction */
476 if (!IN_DESTRUCT) 553 if (!IN_DESTRUCT)
477 { 554 {
… …
520 0, 0, 0, 0, 597 0, 0, 0, 0,
521 coro_cv_free 598 coro_cv_free
522}; 599};
523 600
524/* the next two functions merely cache the padlists */ 601/* the next two functions merely cache the padlists */
525static void 602ecb_inline void
526get_padlist (pTHX_ CV *cv) 603get_padlist (pTHX_ CV *cv)
527{ 604{
528 MAGIC *mg = CORO_MAGIC_cv (cv); 605 MAGIC *mg = CORO_MAGIC_cv (cv);
529 AV *av; 606 AV *av;
530 607
531 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 608 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
532 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 609 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
533 else 610 else
534 { 611 {
535#if CORO_PREFER_PERL_FUNCTIONS 612#if CORO_PREFER_PERL_FUNCTIONS
536 /* this is probably cleaner? but also slower! */ 613 /* this is probably cleaner? but also slower! */
… …
543 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 620 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
544#endif 621#endif
545 } 622 }
546} 623}
547 624
548static void 625ecb_inline void
549put_padlist (pTHX_ CV *cv) 626put_padlist (pTHX_ CV *cv)
550{ 627{
551 MAGIC *mg = CORO_MAGIC_cv (cv); 628 MAGIC *mg = CORO_MAGIC_cv (cv);
552 AV *av; 629 AV *av;
553 630
554 if (expect_false (!mg)) 631 if (ecb_expect_false (!mg))
555 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);
556 633
557 av = (AV *)mg->mg_obj; 634 av = (AV *)mg->mg_obj;
558 635
559 if (expect_false (AvFILLp (av) >= AvMAX (av))) 636 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
560 av_extend (av, AvFILLp (av) + 1); 637 av_extend (av, AvFILLp (av) + 1);
561 638
562 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 639 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
563} 640}
564 641
565/** load & save, init *******************************************************/ 642/** load & save, init *******************************************************/
566 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
567/* swap sv heads, at least logically */ 682/* swap sv heads, at least logically */
568static void 683static void
569swap_svs (pTHX_ Coro__State c) 684swap_svs (pTHX_ Coro__State c)
570{ 685{
571 int i; 686 int i;
572 687
573 for (i = 0; i <= AvFILLp (c->swap_sv); ) 688 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
574 { 689 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
575 SV *a = AvARRAY (c->swap_sv)[i++];
576 SV *b = AvARRAY (c->swap_sv)[i++];
577
578 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
579 SV tmp;
580
581 /* swap sv_any */
582 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
583
584 /* swap sv_flags */
585 SvFLAGS (&tmp) = SvFLAGS (a);
586 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
587 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
588
589#if PERL_VERSION_ATLEAST (5,10,0)
590 /* perl 5.10 complicates this _quite_ a bit, but it also is
591 * is much faster, so no quarrels here. alternatively, we could
592 * sv_upgrade to avoid this.
593 */
594 {
595 /* swap sv_u */
596 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
597
598 /* if SvANY points to the head, we need to adjust the pointers,
599 * as the pointer for a still points to b, and maybe vice versa.
600 */
601 #define svany_in_head(type) \
602 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
603
604 if (svany_in_head (SvTYPE (a)))
605 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
606
607 if (svany_in_head (SvTYPE (b)))
608 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
609 }
610#endif
611 }
612} 690}
613 691
614#define SWAP_SVS(coro) \ 692#define SWAP_SVS(coro) \
615 if (expect_false ((coro)->swap_sv)) \ 693 if (ecb_expect_false ((coro)->swap_sv)) \
616 swap_svs (aTHX_ (coro)) 694 swap_svs (aTHX_ (coro))
617 695
618static void 696static void
619on_enterleave_call (pTHX_ SV *cb); 697on_enterleave_call (pTHX_ SV *cb);
620 698
… …
624 perl_slots *slot = c->slot; 702 perl_slots *slot = c->slot;
625 c->slot = 0; 703 c->slot = 0;
626 704
627 PL_mainstack = c->mainstack; 705 PL_mainstack = c->mainstack;
628 706
629 GvSV (PL_defgv) = slot->defsv; 707#if CORO_JIT
630 GvAV (PL_defgv) = slot->defav; 708 load_perl_slots (slot);
631 GvSV (PL_errgv) = slot->errsv; 709#else
632 GvSV (irsgv) = slot->irsgv;
633 GvHV (PL_hintgv) = slot->hinthv;
634
635 #define VAR(name,type) PL_ ## name = slot->name; 710 #define VARx(name,expr,type) expr = slot->name;
636 # include "state.h" 711 #include "state.h"
637 #undef VAR 712#endif
638 713
639 { 714 {
640 dSP; 715 dSP;
641 716
642 CV *cv; 717 CV *cv;
643 718
644 /* now do the ugly restore mess */ 719 /* now do the ugly restore mess */
645 while (expect_true (cv = (CV *)POPs)) 720 while (ecb_expect_true (cv = (CV *)POPs))
646 { 721 {
647 put_padlist (aTHX_ cv); /* mark this padlist as available */ 722 put_padlist (aTHX_ cv); /* mark this padlist as available */
648 CvDEPTH (cv) = PTR2IV (POPs); 723 CvDEPTH (cv) = PTR2IV (POPs);
649 CvPADLIST (cv) = (AV *)POPs; 724 CvPADLIST (cv) = (AV *)POPs;
650 } 725 }
… …
653 } 728 }
654 729
655 slf_frame = c->slf_frame; 730 slf_frame = c->slf_frame;
656 CORO_THROW = c->except; 731 CORO_THROW = c->except;
657 732
658 if (expect_false (enable_times)) 733 if (ecb_expect_false (enable_times))
659 { 734 {
660 if (expect_false (!times_valid)) 735 if (ecb_expect_false (!times_valid))
661 coro_times_update (); 736 coro_times_update ();
662 737
663 coro_times_sub (c); 738 coro_times_sub (c);
664 } 739 }
665 740
666 if (expect_false (c->on_enter)) 741 if (ecb_expect_false (c->on_enter))
667 { 742 {
668 int i; 743 int i;
669 744
670 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 745 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
671 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 746 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
677static void 752static void
678save_perl (pTHX_ Coro__State c) 753save_perl (pTHX_ Coro__State c)
679{ 754{
680 SWAP_SVS (c); 755 SWAP_SVS (c);
681 756
682 if (expect_false (c->on_leave)) 757 if (ecb_expect_false (c->on_leave))
683 { 758 {
684 int i; 759 int i;
685 760
686 for (i = AvFILLp (c->on_leave); i >= 0; --i) 761 for (i = AvFILLp (c->on_leave); i >= 0; --i)
687 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 762 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
688 } 763 }
689 764
690 times_valid = 0; 765 times_valid = 0;
691 766
692 if (expect_false (enable_times)) 767 if (ecb_expect_false (enable_times))
693 { 768 {
694 coro_times_update (); times_valid = 1; 769 coro_times_update (); times_valid = 1;
695 coro_times_add (c); 770 coro_times_add (c);
696 } 771 }
697 772
… …
711 786
712 XPUSHs (Nullsv); 787 XPUSHs (Nullsv);
713 /* this loop was inspired by pp_caller */ 788 /* this loop was inspired by pp_caller */
714 for (;;) 789 for (;;)
715 { 790 {
716 while (expect_true (cxix >= 0)) 791 while (ecb_expect_true (cxix >= 0))
717 { 792 {
718 PERL_CONTEXT *cx = &ccstk[cxix--]; 793 PERL_CONTEXT *cx = &ccstk[cxix--];
719 794
720 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))
721 { 796 {
722 CV *cv = cx->blk_sub.cv; 797 CV *cv = cx->blk_sub.cv;
723 798
724 if (expect_true (CvDEPTH (cv))) 799 if (ecb_expect_true (CvDEPTH (cv)))
725 { 800 {
726 EXTEND (SP, 3); 801 EXTEND (SP, 3);
727 PUSHs ((SV *)CvPADLIST (cv)); 802 PUSHs ((SV *)CvPADLIST (cv));
728 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 803 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
729 PUSHs ((SV *)cv); 804 PUSHs ((SV *)cv);
… …
732 get_padlist (aTHX_ cv); 807 get_padlist (aTHX_ cv);
733 } 808 }
734 } 809 }
735 } 810 }
736 811
737 if (expect_true (top_si->si_type == PERLSI_MAIN)) 812 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
738 break; 813 break;
739 814
740 top_si = top_si->si_prev; 815 top_si = top_si->si_prev;
741 ccstk = top_si->si_cxstack; 816 ccstk = top_si->si_cxstack;
742 cxix = top_si->si_cxix; 817 cxix = top_si->si_cxix;
… …
744 819
745 PUTBACK; 820 PUTBACK;
746 } 821 }
747 822
748 /* allocate some space on the context stack for our purposes */ 823 /* allocate some space on the context stack for our purposes */
749 /* we manually unroll here, as usually 2 slots is enough */ 824 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
750 if (SLOT_COUNT >= 1) CXINC;
751 if (SLOT_COUNT >= 2) CXINC;
752 if (SLOT_COUNT >= 3) CXINC;
753 { 825 {
754 unsigned int i; 826 unsigned int i;
827
755 for (i = 3; i < SLOT_COUNT; ++i) 828 for (i = 0; i < SLOT_COUNT; ++i)
756 CXINC; 829 CXINC;
757 } 830
758 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 831 cxstack_ix -= SLOT_COUNT; /* undo allocation */
832 }
759 833
760 c->mainstack = PL_mainstack; 834 c->mainstack = PL_mainstack;
761 835
762 { 836 {
763 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 837 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
764 838
765 slot->defav = GvAV (PL_defgv); 839#if CORO_JIT
766 slot->defsv = DEFSV; 840 save_perl_slots (slot);
767 slot->errsv = ERRSV; 841#else
768 slot->irsgv = GvSV (irsgv);
769 slot->hinthv = GvHV (PL_hintgv);
770
771 #define VAR(name,type) slot->name = PL_ ## name; 842 #define VARx(name,expr,type) slot->name = expr;
772 # include "state.h" 843 #include "state.h"
773 #undef VAR 844#endif
774 } 845 }
775} 846}
776 847
777/* 848/*
778 * allocate various perl stacks. This is almost an exact copy 849 * allocate various perl stacks. This is almost an exact copy
… …
784# define coro_init_stacks(thx) init_stacks () 855# define coro_init_stacks(thx) init_stacks ()
785#else 856#else
786static void 857static void
787coro_init_stacks (pTHX) 858coro_init_stacks (pTHX)
788{ 859{
789 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() */
790 PL_curstackinfo->si_type = PERLSI_MAIN; 861 PL_curstackinfo->si_type = PERLSI_MAIN;
791 PL_curstack = PL_curstackinfo->si_stack; 862 PL_curstack = PL_curstackinfo->si_stack;
792 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 863 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
793 864
794 PL_stack_base = AvARRAY(PL_curstack); 865 PL_stack_base = AvARRAY(PL_curstack);
… …
809#endif 880#endif
810 881
811 New(54,PL_scopestack,8,I32); 882 New(54,PL_scopestack,8,I32);
812 PL_scopestack_ix = 0; 883 PL_scopestack_ix = 0;
813 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
814 888
815 New(54,PL_savestack,24,ANY); 889 New(54,PL_savestack,24,ANY);
816 PL_savestack_ix = 0; 890 PL_savestack_ix = 0;
817 PL_savestack_max = 24; 891 PL_savestack_max = 24;
818 892
… …
846 } 920 }
847 921
848 Safefree (PL_tmps_stack); 922 Safefree (PL_tmps_stack);
849 Safefree (PL_markstack); 923 Safefree (PL_markstack);
850 Safefree (PL_scopestack); 924 Safefree (PL_scopestack);
925#if HAS_SCOPESTACK_NAME
926 Safefree (PL_scopestack_name);
927#endif
851 Safefree (PL_savestack); 928 Safefree (PL_savestack);
852#if !PERL_VERSION_ATLEAST (5,10,0) 929#if !PERL_VERSION_ATLEAST (5,10,0)
853 Safefree (PL_retstack); 930 Safefree (PL_retstack);
854#endif 931#endif
855} 932}
… …
901#endif 978#endif
902 979
903/* 980/*
904 * This overrides the default magic get method of %SIG elements. 981 * This overrides the default magic get method of %SIG elements.
905 * 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
906 * 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),
907 * readback here. 984 * we just provide our own readback here.
908 */ 985 */
909static int 986static int ecb_cold
910coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 987coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
911{ 988{
912 const char *s = MgPV_nolen_const (mg); 989 const char *s = MgPV_nolen_const (mg);
913 990
914 if (*s == '_') 991 if (*s == '_')
… …
918 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 995 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
919 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 996 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
920 997
921 if (svp) 998 if (svp)
922 { 999 {
923 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);
924 return 0; 1010 return 0;
925 } 1011 }
926 } 1012 }
927 1013
928 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1014 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
929} 1015}
930 1016
931static int 1017static int ecb_cold
932coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1018coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
933{ 1019{
934 const char *s = MgPV_nolen_const (mg); 1020 const char *s = MgPV_nolen_const (mg);
935 1021
936 if (*s == '_') 1022 if (*s == '_')
… …
950 } 1036 }
951 1037
952 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1038 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
953} 1039}
954 1040
955static int 1041static int ecb_cold
956coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1042coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
957{ 1043{
958 const char *s = MgPV_nolen_const (mg); 1044 const char *s = MgPV_nolen_const (mg);
959 1045
960 if (*s == '_') 1046 if (*s == '_')
… …
995 return 1; 1081 return 1;
996} 1082}
997 1083
998static UNOP init_perl_op; 1084static UNOP init_perl_op;
999 1085
1000static 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 */
1001init_perl (pTHX_ struct coro *coro) 1087init_perl (pTHX_ struct coro *coro)
1002{ 1088{
1003 /* 1089 /*
1004 * emulate part of the perl startup here. 1090 * emulate part of the perl startup here.
1005 */ 1091 */
… …
1020 PL_parser = 0; 1106 PL_parser = 0;
1021#endif 1107#endif
1022 PL_hints = 0; 1108 PL_hints = 0;
1023 1109
1024 /* recreate the die/warn hooks */ 1110 /* recreate the die/warn hooks */
1025 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1111 PL_diehook = SvREFCNT_inc (rv_diehook);
1026 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1112 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1027 1113
1028 GvSV (PL_defgv) = newSV (0); 1114 GvSV (PL_defgv) = newSV (0);
1029 GvAV (PL_defgv) = coro->args; coro->args = 0; 1115 GvAV (PL_defgv) = coro->args; coro->args = 0;
1030 GvSV (PL_errgv) = newSV (0); 1116 GvSV (PL_errgv) = newSV (0);
1031 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);
… …
1052 /* 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
1053 * 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.
1054 */ 1140 */
1055 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 */
1056 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;
1057 1144
1058 /* 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 */
1059 init_perl_op.op_next = PL_op; 1146 init_perl_op.op_next = PL_op;
1060 init_perl_op.op_type = OP_ENTERSUB; 1147 init_perl_op.op_type = OP_ENTERSUB;
1061 init_perl_op.op_ppaddr = pp_slf; 1148 init_perl_op.op_ppaddr = pp_slf;
… …
1066 /* copy throw, in case it was set before init_perl */ 1153 /* copy throw, in case it was set before init_perl */
1067 CORO_THROW = coro->except; 1154 CORO_THROW = coro->except;
1068 1155
1069 SWAP_SVS (coro); 1156 SWAP_SVS (coro);
1070 1157
1071 if (expect_false (enable_times)) 1158 if (ecb_expect_false (enable_times))
1072 { 1159 {
1073 coro_times_update (); 1160 coro_times_update ();
1074 coro_times_sub (coro); 1161 coro_times_sub (coro);
1075 } 1162 }
1076} 1163}
… …
1100destroy_perl (pTHX_ struct coro *coro) 1187destroy_perl (pTHX_ struct coro *coro)
1101{ 1188{
1102 SV *svf [9]; 1189 SV *svf [9];
1103 1190
1104 { 1191 {
1192 SV *old_current = SvRV (coro_current);
1105 struct coro *current = SvSTATE_current; 1193 struct coro *current = SvSTATE (old_current);
1106 1194
1107 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));
1108 1196
1109 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
1110 load_perl (aTHX_ coro); 1202 load_perl (aTHX_ coro);
1111 1203
1112 coro_unwind_stacks (aTHX); 1204 coro_unwind_stacks (aTHX);
1113 coro_destruct_stacks (aTHX);
1114 1205
1115 /* restore swapped sv's */ 1206 /* restore swapped sv's */
1116 SWAP_SVS (coro); 1207 SWAP_SVS (coro);
1117 1208
1209 coro_destruct_stacks (aTHX);
1210
1118 // now save some sv's to be free'd later 1211 /* now save some sv's to be free'd later */
1119 svf [0] = GvSV (PL_defgv); 1212 svf [0] = GvSV (PL_defgv);
1120 svf [1] = (SV *)GvAV (PL_defgv); 1213 svf [1] = (SV *)GvAV (PL_defgv);
1121 svf [2] = GvSV (PL_errgv); 1214 svf [2] = GvSV (PL_errgv);
1122 svf [3] = (SV *)PL_defoutgv; 1215 svf [3] = (SV *)PL_defoutgv;
1123 svf [4] = PL_rs; 1216 svf [4] = PL_rs;
… …
1125 svf [6] = (SV *)GvHV (PL_hintgv); 1218 svf [6] = (SV *)GvHV (PL_hintgv);
1126 svf [7] = PL_diehook; 1219 svf [7] = PL_diehook;
1127 svf [8] = PL_warnhook; 1220 svf [8] = PL_warnhook;
1128 assert (9 == sizeof (svf) / sizeof (*svf)); 1221 assert (9 == sizeof (svf) / sizeof (*svf));
1129 1222
1223 SvRV_set (coro_current, old_current);
1224
1130 load_perl (aTHX_ current); 1225 load_perl (aTHX_ current);
1131 } 1226 }
1132 1227
1133 { 1228 {
1134 unsigned int i; 1229 unsigned int i;
… …
1141 SvREFCNT_dec (coro->invoke_cb); 1236 SvREFCNT_dec (coro->invoke_cb);
1142 SvREFCNT_dec (coro->invoke_av); 1237 SvREFCNT_dec (coro->invoke_av);
1143 } 1238 }
1144} 1239}
1145 1240
1146INLINE void 1241ecb_inline void
1147free_coro_mortal (pTHX) 1242free_coro_mortal (pTHX)
1148{ 1243{
1149 if (expect_true (coro_mortal)) 1244 if (ecb_expect_true (coro_mortal))
1150 { 1245 {
1151 SvREFCNT_dec (coro_mortal); 1246 SvREFCNT_dec ((SV *)coro_mortal);
1152 coro_mortal = 0; 1247 coro_mortal = 0;
1153 } 1248 }
1154} 1249}
1155 1250
1156static int 1251static int
… …
1289 1384
1290 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 */
1291} 1386}
1292 1387
1293/* 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 */
1294static void NOINLINE 1389static void ecb_noinline
1295cctx_prepare (pTHX) 1390cctx_prepare (pTHX)
1296{ 1391{
1297 PL_top_env = &PL_start_env; 1392 PL_top_env = &PL_start_env;
1298 1393
1299 if (cctx_current->flags & CC_TRACE) 1394 if (cctx_current->flags & CC_TRACE)
… …
1310 slf_frame.prepare = slf_prepare_set_stacklevel; 1405 slf_frame.prepare = slf_prepare_set_stacklevel;
1311 slf_frame.check = slf_check_set_stacklevel; 1406 slf_frame.check = slf_check_set_stacklevel;
1312} 1407}
1313 1408
1314/* 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 */
1315INLINE void 1410ecb_inline void
1316transfer_tail (pTHX) 1411transfer_tail (pTHX)
1317{ 1412{
1318 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);
1319} 1426}
1320 1427
1321/* 1428/*
1322 * this is a _very_ stripped down perl interpreter ;) 1429 * this is a _very_ stripped down perl interpreter ;)
1323 */ 1430 */
… …
1352 */ 1459 */
1353 1460
1354 /* 1461 /*
1355 * 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
1356 * 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)
1357 * 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
1358 * bootstrap-time "top" top_env, as we cannot restore the "main" 1465 * doing in that case. YMMV.
1359 * coroutine as Coro has no such concept.
1360 * This actually isn't valid with the pthread backend, but OSes requiring
1361 * that backend are too broken to do it in a standards-compliant way.
1362 */ 1466 */
1363 PL_top_env = main_top_env; 1467 perlish_exit (aTHX);
1364 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1365 } 1468 }
1366} 1469}
1367 1470
1368static coro_cctx * 1471static coro_cctx *
1369cctx_new () 1472cctx_new (void)
1370{ 1473{
1371 coro_cctx *cctx; 1474 coro_cctx *cctx;
1372 1475
1373 ++cctx_count; 1476 ++cctx_count;
1374 New (0, cctx, 1, coro_cctx); 1477 New (0, cctx, 1, coro_cctx);
… …
1380 return cctx; 1483 return cctx;
1381} 1484}
1382 1485
1383/* create a new cctx only suitable as source */ 1486/* create a new cctx only suitable as source */
1384static coro_cctx * 1487static coro_cctx *
1385cctx_new_empty () 1488cctx_new_empty (void)
1386{ 1489{
1387 coro_cctx *cctx = cctx_new (); 1490 coro_cctx *cctx = cctx_new ();
1388 1491
1389 cctx->sptr = 0; 1492 cctx->sptr = 0;
1390 coro_create (&cctx->cctx, 0, 0, 0, 0); 1493 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1392 return cctx; 1495 return cctx;
1393} 1496}
1394 1497
1395/* create a new cctx suitable as destination/running a perl interpreter */ 1498/* create a new cctx suitable as destination/running a perl interpreter */
1396static coro_cctx * 1499static coro_cctx *
1397cctx_new_run () 1500cctx_new_run (void)
1398{ 1501{
1399 coro_cctx *cctx = cctx_new (); 1502 coro_cctx *cctx = cctx_new ();
1400 void *stack_start; 1503 void *stack_start;
1401 size_t stack_size; 1504 size_t stack_size;
1402 1505
1403#if HAVE_MMAP 1506#if HAVE_MMAP
1404 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;
1405 /* mmap supposedly does allocate-on-write for us */ 1508 /* mmap supposedly does allocate-on-write for us */
1406 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, 0, 0);
1407 1510
1408 if (cctx->sptr != (void *)-1) 1511 if (cctx->sptr != (void *)-1)
1409 { 1512 {
1410 #if CORO_STACKGUARD 1513 #if CORO_STACKGUARD
1411 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1514 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1443cctx_destroy (coro_cctx *cctx) 1546cctx_destroy (coro_cctx *cctx)
1444{ 1547{
1445 if (!cctx) 1548 if (!cctx)
1446 return; 1549 return;
1447 1550
1448 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1551 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1449 1552
1450 --cctx_count; 1553 --cctx_count;
1451 coro_destroy (&cctx->cctx); 1554 coro_destroy (&cctx->cctx);
1452 1555
1453 /* coro_transfer creates new, empty cctx's */ 1556 /* coro_transfer creates new, empty cctx's */
… …
1472#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))
1473 1576
1474static coro_cctx * 1577static coro_cctx *
1475cctx_get (pTHX) 1578cctx_get (pTHX)
1476{ 1579{
1477 while (expect_true (cctx_first)) 1580 while (ecb_expect_true (cctx_first))
1478 { 1581 {
1479 coro_cctx *cctx = cctx_first; 1582 coro_cctx *cctx = cctx_first;
1480 cctx_first = cctx->next; 1583 cctx_first = cctx->next;
1481 --cctx_idle; 1584 --cctx_idle;
1482 1585
1483 if (expect_true (!CCTX_EXPIRED (cctx))) 1586 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1484 return cctx; 1587 return cctx;
1485 1588
1486 cctx_destroy (cctx); 1589 cctx_destroy (cctx);
1487 } 1590 }
1488 1591
… …
1493cctx_put (coro_cctx *cctx) 1596cctx_put (coro_cctx *cctx)
1494{ 1597{
1495 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));
1496 1599
1497 /* free another cctx if overlimit */ 1600 /* free another cctx if overlimit */
1498 if (expect_false (cctx_idle >= cctx_max_idle)) 1601 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1499 { 1602 {
1500 coro_cctx *first = cctx_first; 1603 coro_cctx *first = cctx_first;
1501 cctx_first = first->next; 1604 cctx_first = first->next;
1502 --cctx_idle; 1605 --cctx_idle;
1503 1606
… …
1514static void 1617static void
1515transfer_check (pTHX_ struct coro *prev, struct coro *next) 1618transfer_check (pTHX_ struct coro *prev, struct coro *next)
1516{ 1619{
1517 /* TODO: throwing up here is considered harmful */ 1620 /* TODO: throwing up here is considered harmful */
1518 1621
1519 if (expect_true (prev != next)) 1622 if (ecb_expect_true (prev != next))
1520 { 1623 {
1521 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1624 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1522 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,");
1523 1626
1524 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1627 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1525 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,");
1526 1629
1527#if !PERL_VERSION_ATLEAST (5,10,0) 1630#if !PERL_VERSION_ATLEAST (5,10,0)
1528 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1631 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1529 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,");
1530#endif 1633#endif
1531 } 1634 }
1532} 1635}
1533 1636
1534/* always use the TRANSFER macro */ 1637/* always use the TRANSFER macro */
1535static void NOINLINE /* noinline so we have a fixed stackframe */ 1638static void ecb_noinline /* noinline so we have a fixed stackframe */
1536transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1639transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1537{ 1640{
1538 dSTACKLEVEL; 1641 dSTACKLEVEL;
1539 1642
1540 /* sometimes transfer is only called to set idle_sp */ 1643 /* sometimes transfer is only called to set idle_sp */
1541 if (expect_false (!prev)) 1644 if (ecb_expect_false (!prev))
1542 { 1645 {
1543 cctx_current->idle_sp = STACKLEVEL; 1646 cctx_current->idle_sp = STACKLEVEL;
1544 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 */
1545 } 1648 }
1546 else if (expect_true (prev != next)) 1649 else if (ecb_expect_true (prev != next))
1547 { 1650 {
1548 coro_cctx *cctx_prev; 1651 coro_cctx *cctx_prev;
1549 1652
1550 if (expect_false (prev->flags & CF_NEW)) 1653 if (ecb_expect_false (prev->flags & CF_NEW))
1551 { 1654 {
1552 /* create a new empty/source context */ 1655 /* create a new empty/source context */
1553 prev->flags &= ~CF_NEW; 1656 prev->flags &= ~CF_NEW;
1554 prev->flags |= CF_RUNNING; 1657 prev->flags |= CF_RUNNING;
1555 } 1658 }
… …
1558 next->flags |= CF_RUNNING; 1661 next->flags |= CF_RUNNING;
1559 1662
1560 /* first get rid of the old state */ 1663 /* first get rid of the old state */
1561 save_perl (aTHX_ prev); 1664 save_perl (aTHX_ prev);
1562 1665
1563 if (expect_false (next->flags & CF_NEW)) 1666 if (ecb_expect_false (next->flags & CF_NEW))
1564 { 1667 {
1565 /* need to start coroutine */ 1668 /* need to start coroutine */
1566 next->flags &= ~CF_NEW; 1669 next->flags &= ~CF_NEW;
1567 /* setup coroutine call */ 1670 /* setup coroutine call */
1568 init_perl (aTHX_ next); 1671 init_perl (aTHX_ next);
1569 } 1672 }
1570 else 1673 else
1571 load_perl (aTHX_ next); 1674 load_perl (aTHX_ next);
1572 1675
1573 /* possibly untie and reuse the cctx */ 1676 /* possibly untie and reuse the cctx */
1574 if (expect_true ( 1677 if (ecb_expect_true (
1575 cctx_current->idle_sp == STACKLEVEL 1678 cctx_current->idle_sp == STACKLEVEL
1576 && !(cctx_current->flags & CC_TRACE) 1679 && !(cctx_current->flags & CC_TRACE)
1577 && !force_cctx 1680 && !force_cctx
1578 )) 1681 ))
1579 { 1682 {
1580 /* 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 */
1581 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));
1582 1685
1583 /* 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. */
1584 /* 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 */
1585 if (expect_false (CCTX_EXPIRED (cctx_current))) 1688 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1586 if (expect_true (!next->cctx)) 1689 if (ecb_expect_true (!next->cctx))
1587 next->cctx = cctx_get (aTHX); 1690 next->cctx = cctx_get (aTHX);
1588 1691
1589 cctx_put (cctx_current); 1692 cctx_put (cctx_current);
1590 } 1693 }
1591 else 1694 else
1592 prev->cctx = cctx_current; 1695 prev->cctx = cctx_current;
1593 1696
1594 ++next->usecount; 1697 ++next->usecount;
1595 1698
1596 cctx_prev = cctx_current; 1699 cctx_prev = cctx_current;
1597 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1700 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1598 1701
1599 next->cctx = 0; 1702 next->cctx = 0;
1600 1703
1601 if (expect_false (cctx_prev != cctx_current)) 1704 if (ecb_expect_false (cctx_prev != cctx_current))
1602 { 1705 {
1603 cctx_prev->top_env = PL_top_env; 1706 cctx_prev->top_env = PL_top_env;
1604 PL_top_env = cctx_current->top_env; 1707 PL_top_env = cctx_current->top_env;
1605 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1708 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1606 } 1709 }
… …
1612#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))
1613#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1716#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1614 1717
1615/** high level stuff ********************************************************/ 1718/** high level stuff ********************************************************/
1616 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 */
1617static int 1722static void
1723coro_call_on_destroy (pTHX_ struct coro *coro);
1724
1725static void
1618coro_state_destroy (pTHX_ struct coro *coro) 1726coro_state_destroy (pTHX_ struct coro *coro)
1619{ 1727{
1620 if (coro->flags & CF_DESTROYED) 1728 if (coro->flags & CF_ZOMBIE)
1621 return 0; 1729 return;
1622 1730
1623 if (coro->on_destroy && !PL_dirty)
1624 coro->on_destroy (aTHX_ coro); 1731 slf_destroy (aTHX_ coro);
1625 1732
1626 coro->flags |= CF_DESTROYED; 1733 coro->flags |= CF_ZOMBIE;
1627 1734
1628 if (coro->flags & CF_READY) 1735 if (coro->flags & CF_READY)
1629 { 1736 {
1630 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1737 /* reduce nready, as destroying a ready coro effectively unreadies it */
1631 /* alternative: look through all ready queues and remove the coro */ 1738 /* alternative: look through all ready queues and remove the coro */
1632 --coro_nready; 1739 --coro_nready;
1633 } 1740 }
1634 else 1741 else
1635 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;
1636 1747
1637 if (coro->mainstack 1748 if (coro->mainstack
1638 && coro->mainstack != main_mainstack 1749 && coro->mainstack != main_mainstack
1639 && coro->slot 1750 && coro->slot
1640 && !PL_dirty) 1751 && !PL_dirty)
1641 destroy_perl (aTHX_ coro); 1752 destroy_perl (aTHX_ coro);
1642 1753
1643 if (coro->next) coro->next->prev = coro->prev;
1644 if (coro->prev) coro->prev->next = coro->next;
1645 if (coro == coro_first) coro_first = coro->next;
1646
1647 cctx_destroy (coro->cctx); 1754 cctx_destroy (coro->cctx);
1648 SvREFCNT_dec (coro->startcv); 1755 SvREFCNT_dec (coro->startcv);
1649 SvREFCNT_dec (coro->args); 1756 SvREFCNT_dec (coro->args);
1650 SvREFCNT_dec (coro->swap_sv); 1757 SvREFCNT_dec (coro->swap_sv);
1651 SvREFCNT_dec (CORO_THROW); 1758 SvREFCNT_dec (CORO_THROW);
1652 1759
1653 return 1; 1760 coro_call_on_destroy (aTHX_ coro);
1761
1762 /* more destruction mayhem in coro_state_free */
1654} 1763}
1655 1764
1656static int 1765static int
1657coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1766coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1658{ 1767{
1659 struct coro *coro = (struct coro *)mg->mg_ptr; 1768 struct coro *coro = (struct coro *)mg->mg_ptr;
1660 mg->mg_ptr = 0; 1769 mg->mg_ptr = 0;
1661 1770
1662 coro->hv = 0;
1663
1664 if (--coro->refcnt < 0)
1665 {
1666 coro_state_destroy (aTHX_ coro); 1771 coro_state_destroy (aTHX_ coro);
1772 SvREFCNT_dec (coro->on_destroy);
1773 SvREFCNT_dec (coro->status);
1774
1667 Safefree (coro); 1775 Safefree (coro);
1668 }
1669 1776
1670 return 0; 1777 return 0;
1671} 1778}
1672 1779
1673static int 1780static int ecb_cold
1674coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1781coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1675{ 1782{
1676 struct coro *coro = (struct coro *)mg->mg_ptr; 1783 /* called when perl clones the current process the slow way (windows process emulation) */
1677 1784 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1678 ++coro->refcnt; 1785 mg->mg_ptr = 0;
1786 mg->mg_virtual = 0;
1679 1787
1680 return 0; 1788 return 0;
1681} 1789}
1682 1790
1683static MGVTBL coro_state_vtbl = { 1791static MGVTBL coro_state_vtbl = {
… …
1708 TRANSFER (ta, 1); 1816 TRANSFER (ta, 1);
1709} 1817}
1710 1818
1711/** Coro ********************************************************************/ 1819/** Coro ********************************************************************/
1712 1820
1713INLINE void 1821ecb_inline void
1714coro_enq (pTHX_ struct coro *coro) 1822coro_enq (pTHX_ struct coro *coro)
1715{ 1823{
1716 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1824 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1717 1825
1718 SvREFCNT_inc_NN (coro->hv); 1826 SvREFCNT_inc_NN (coro->hv);
… …
1720 coro->next_ready = 0; 1828 coro->next_ready = 0;
1721 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1829 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1722 ready [1] = coro; 1830 ready [1] = coro;
1723} 1831}
1724 1832
1725INLINE struct coro * 1833ecb_inline struct coro *
1726coro_deq (pTHX) 1834coro_deq (pTHX)
1727{ 1835{
1728 int prio; 1836 int prio;
1729 1837
1730 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1838 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1783{ 1891{
1784 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1892 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1785} 1893}
1786 1894
1787/* expects to own a reference to next->hv */ 1895/* expects to own a reference to next->hv */
1788INLINE void 1896ecb_inline void
1789prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1897prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1790{ 1898{
1791 SV *prev_sv = SvRV (coro_current); 1899 SV *prev_sv = SvRV (coro_current);
1792 1900
1793 ta->prev = SvSTATE_hv (prev_sv); 1901 ta->prev = SvSTATE_hv (prev_sv);
… …
1806{ 1914{
1807 for (;;) 1915 for (;;)
1808 { 1916 {
1809 struct coro *next = coro_deq (aTHX); 1917 struct coro *next = coro_deq (aTHX);
1810 1918
1811 if (expect_true (next)) 1919 if (ecb_expect_true (next))
1812 { 1920 {
1813 /* cannot transfer to destroyed coros, skip and look for next */ 1921 /* cannot transfer to destroyed coros, skip and look for next */
1814 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1922 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1815 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 */
1816 else 1924 else
1817 { 1925 {
1818 next->flags &= ~CF_READY; 1926 next->flags &= ~CF_READY;
1819 --coro_nready; 1927 --coro_nready;
… …
1852 } 1960 }
1853 } 1961 }
1854 } 1962 }
1855} 1963}
1856 1964
1857INLINE void 1965ecb_inline void
1858prepare_cede (pTHX_ struct coro_transfer_args *ta) 1966prepare_cede (pTHX_ struct coro_transfer_args *ta)
1859{ 1967{
1860 api_ready (aTHX_ coro_current); 1968 api_ready (aTHX_ coro_current);
1861 prepare_schedule (aTHX_ ta); 1969 prepare_schedule (aTHX_ ta);
1862} 1970}
1863 1971
1864INLINE void 1972ecb_inline void
1865prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1973prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1866{ 1974{
1867 SV *prev = SvRV (coro_current); 1975 SV *prev = SvRV (coro_current);
1868 1976
1869 if (coro_nready) 1977 if (coro_nready)
… …
1899{ 2007{
1900 struct coro_transfer_args ta; 2008 struct coro_transfer_args ta;
1901 2009
1902 prepare_cede (aTHX_ &ta); 2010 prepare_cede (aTHX_ &ta);
1903 2011
1904 if (expect_true (ta.prev != ta.next)) 2012 if (ecb_expect_true (ta.prev != ta.next))
1905 { 2013 {
1906 TRANSFER (ta, 1); 2014 TRANSFER (ta, 1);
1907 return 1; 2015 return 1;
1908 } 2016 }
1909 else 2017 else
… …
1952 coro->slot->runops = RUNOPS_DEFAULT; 2060 coro->slot->runops = RUNOPS_DEFAULT;
1953 } 2061 }
1954} 2062}
1955 2063
1956static 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
1957coro_call_on_destroy (pTHX_ struct coro *coro) 2141coro_call_on_destroy (pTHX_ struct coro *coro)
1958{ 2142{
1959 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2143 AV *od = coro->on_destroy;
1960 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1961 2144
1962 if (on_destroyp) 2145 if (!od)
1963 { 2146 return;
1964 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1965 2147
1966 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
1967 { 2156 {
1968 dSP; /* don't disturb outer sp */ 2157 dSP; /* don't disturb outer sp */
1969 SV *cb = av_pop (on_destroy);
1970
1971 PUSHMARK (SP); 2158 PUSHMARK (SP);
1972 2159
1973 if (statusp) 2160 if (coro->status)
1974 { 2161 {
1975 int i; 2162 PUTBACK;
1976 AV *status = (AV *)SvRV (*statusp); 2163 coro_push_av (aTHX_ coro->status, G_ARRAY);
1977 EXTEND (SP, AvFILLp (status) + 1); 2164 SPAGAIN;
1978
1979 for (i = 0; i <= AvFILLp (status); ++i)
1980 PUSHs (AvARRAY (status)[i]);
1981 } 2165 }
1982 2166
1983 PUTBACK; 2167 PUTBACK;
1984 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2168 call_sv (cb, G_VOID | G_DISCARD);
1985 } 2169 }
1986 } 2170 }
1987} 2171}
1988 2172
1989static void 2173static void
1990slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2174coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1991{ 2175{
1992 int i; 2176 AV *av;
1993 HV *hv = (HV *)SvRV (coro_current); 2177
1994 AV *av = newAV (); 2178 if (coro->status)
2179 {
2180 av = coro->status;
2181 av_clear (av);
2182 }
2183 else
2184 av = coro->status = newAV ();
1995 2185
1996 /* items are actually not so common, so optimise for this case */ 2186 /* items are actually not so common, so optimise for this case */
1997 if (items) 2187 if (items)
1998 { 2188 {
2189 int i;
2190
1999 av_extend (av, items - 1); 2191 av_extend (av, items - 1);
2000 2192
2001 for (i = 0; i < items; ++i) 2193 for (i = 0; i < items; ++i)
2002 av_push (av, SvREFCNT_inc_NN (arg [i])); 2194 av_push (av, SvREFCNT_inc_NN (arg [i]));
2003 } 2195 }
2196}
2004 2197
2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2198static void
2006 2199slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2200{
2007 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2201 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2008 api_ready (aTHX_ sv_manager); 2202 api_ready (aTHX_ sv_manager);
2009 2203
2010 frame->prepare = prepare_schedule; 2204 frame->prepare = prepare_schedule;
2011 frame->check = slf_check_repeat; 2205 frame->check = slf_check_repeat;
2012 2206
2013 /* as a minor optimisation, we could unwind all stacks here */ 2207 /* as a minor optimisation, we could unwind all stacks here */
2014 /* but that puts extra pressure on pp_slf, and is not worth much */ 2208 /* but that puts extra pressure on pp_slf, and is not worth much */
2015 /*coro_unwind_stacks (aTHX);*/ 2209 /*coro_unwind_stacks (aTHX);*/
2210}
2211
2212static void
2213slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2214{
2215 HV *coro_hv = (HV *)SvRV (coro_current);
2216
2217 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2218 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2219}
2220
2221static void
2222slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2223{
2224 HV *coro_hv;
2225 struct coro *coro;
2226
2227 if (items <= 0)
2228 croak ("Coro::cancel called without coro object,");
2229
2230 coro = SvSTATE (arg [0]);
2231 coro_hv = coro->hv;
2232
2233 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2234
2235 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2236 {
2237 /* coro currently busy cancelling something, so just notify it */
2238 coro->slf_frame.data = (void *)coro;
2239
2240 frame->prepare = prepare_nop;
2241 frame->check = slf_check_nop;
2242 }
2243 else if (coro_hv == (HV *)SvRV (coro_current))
2244 {
2245 /* cancelling the current coro is allowed, and equals terminate */
2246 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2247 }
2248 else
2249 {
2250 struct coro *self = SvSTATE_current;
2251
2252 /* otherwise we cancel directly, purely for speed reasons
2253 * unfortunately, this requires some magic trickery, as
2254 * somebody else could cancel us, so we have to fight the cancellation.
2255 * this is ugly, and hopefully fully worth the extra speed.
2256 * besides, I can't get the slow-but-safe version working...
2257 */
2258 slf_frame.data = 0;
2259 self->flags |= CF_NOCANCEL;
2260 coro_state_destroy (aTHX_ coro);
2261 self->flags &= ~CF_NOCANCEL;
2262
2263 if (slf_frame.data)
2264 {
2265 /* while we were busy we have been cancelled, so terminate */
2266 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2267 }
2268 else
2269 {
2270 frame->prepare = prepare_nop;
2271 frame->check = slf_check_nop;
2272 }
2273 }
2274}
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;
2016} 2313}
2017 2314
2018/*****************************************************************************/ 2315/*****************************************************************************/
2019/* async pool handler */ 2316/* async pool handler */
2020 2317
… …
2051slf_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)
2052{ 2349{
2053 HV *hv = (HV *)SvRV (coro_current); 2350 HV *hv = (HV *)SvRV (coro_current);
2054 struct coro *coro = SvSTATE_hv ((SV *)hv); 2351 struct coro *coro = SvSTATE_hv ((SV *)hv);
2055 2352
2056 if (expect_true (coro->saved_deffh)) 2353 if (ecb_expect_true (coro->saved_deffh))
2057 { 2354 {
2058 /* subsequent iteration */ 2355 /* subsequent iteration */
2059 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2356 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2060 coro->saved_deffh = 0; 2357 coro->saved_deffh = 0;
2061 2358
2062 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2359 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2063 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2360 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2064 { 2361 {
2065 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2362 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2066 coro->invoke_av = newAV (); 2363 return;
2067
2068 frame->prepare = prepare_nop;
2069 } 2364 }
2070 else 2365 else
2071 { 2366 {
2072 av_clear (GvAV (PL_defgv)); 2367 av_clear (GvAV (PL_defgv));
2073 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);
… …
2296static void 2591static void
2297slf_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)
2298{ 2593{
2299 frame->prepare = prepare_cede_notself; 2594 frame->prepare = prepare_cede_notself;
2300 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;
2301} 2613}
2302 2614
2303/* 2615/*
2304 * these not obviously related functions are all rolled into one 2616 * these not obviously related functions are all rolled into one
2305 * 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
… …
2312 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 */
2313 2625
2314 /* 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 */
2315 /* the latter happens when a new coro has been started */ 2627 /* the latter happens when a new coro has been started */
2316 /* or when a new cctx was attached to an existing coroutine */ 2628 /* or when a new cctx was attached to an existing coroutine */
2317 if (expect_true (!slf_frame.prepare)) 2629 if (ecb_expect_true (!slf_frame.prepare))
2318 { 2630 {
2319 /* first iteration */ 2631 /* first iteration */
2320 dSP; 2632 dSP;
2321 SV **arg = PL_stack_base + TOPMARK + 1; 2633 SV **arg = PL_stack_base + TOPMARK + 1;
2322 int items = SP - arg; /* args without function object */ 2634 int items = SP - arg; /* args without function object */
… …
2363 while (slf_frame.check (aTHX_ &slf_frame)); 2675 while (slf_frame.check (aTHX_ &slf_frame));
2364 2676
2365 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 */
2366 2678
2367 /* exception handling */ 2679 /* exception handling */
2368 if (expect_false (CORO_THROW)) 2680 if (ecb_expect_false (CORO_THROW))
2369 { 2681 {
2370 SV *exception = sv_2mortal (CORO_THROW); 2682 SV *exception = sv_2mortal (CORO_THROW);
2371 2683
2372 CORO_THROW = 0; 2684 CORO_THROW = 0;
2373 sv_setsv (ERRSV, exception); 2685 sv_setsv (ERRSV, exception);
2374 croak (0); 2686 croak (0);
2375 } 2687 }
2376 2688
2377 /* return value handling - mostly like entersub */ 2689 /* return value handling - mostly like entersub */
2378 /* make sure we put something on the stack in scalar context */ 2690 /* make sure we put something on the stack in scalar context */
2379 if (GIMME_V == G_SCALAR) 2691 if (GIMME_V == G_SCALAR
2692 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2380 { 2693 {
2381 dSP; 2694 dSP;
2382 SV **bot = PL_stack_base + checkmark; 2695 SV **bot = PL_stack_base + checkmark;
2383 2696
2384 if (sp == bot) /* too few, push undef */ 2697 if (sp == bot) /* too few, push undef */
2385 bot [1] = &PL_sv_undef; 2698 bot [1] = &PL_sv_undef;
2386 else if (sp != bot + 1) /* too many, take last one */ 2699 else /* too many, take last one */
2387 bot [1] = *sp; 2700 bot [1] = *sp;
2388 2701
2389 SP = bot + 1; 2702 SP = bot + 1;
2390 2703
2391 PUTBACK; 2704 PUTBACK;
… …
2498{ 2811{
2499 PerlIOBuf base; 2812 PerlIOBuf base;
2500 NV next, every; 2813 NV next, every;
2501} PerlIOCede; 2814} PerlIOCede;
2502 2815
2503static IV 2816static IV ecb_cold
2504PerlIOCede_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)
2505{ 2818{
2506 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2819 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2507 2820
2508 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2821 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2509 self->next = nvtime () + self->every; 2822 self->next = nvtime () + self->every;
2510 2823
2511 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2824 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2512} 2825}
2513 2826
2514static SV * 2827static SV * ecb_cold
2515PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2828PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2516{ 2829{
2517 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2830 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2518 2831
2519 return newSVnv (self->every); 2832 return newSVnv (self->every);
… …
2631 SvREFCNT_dec (cb); 2944 SvREFCNT_dec (cb);
2632 } 2945 }
2633} 2946}
2634 2947
2635static void 2948static void
2636coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2949coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2637{ 2950{
2638 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2951 /* call $sem->adjust (0) to possibly wake up some other waiters */
2639 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2952 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2640} 2953}
2641 2954
2642static int 2955static int
2643slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2956slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2644{ 2957{
2645 AV *av = (AV *)frame->data; 2958 AV *av = (AV *)frame->data;
2646 SV *count_sv = AvARRAY (av)[0]; 2959 SV *count_sv = AvARRAY (av)[0];
2960 SV *coro_hv = SvRV (coro_current);
2647 2961
2648 /* 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 */
2649 if (CORO_THROW) 2963 if (CORO_THROW)
2650 return 0; 2964 return 0;
2651 else if (SvIVX (count_sv) > 0) 2965 else if (SvIVX (count_sv) > 0)
2652 { 2966 {
2653 SvSTATE_current->on_destroy = 0; 2967 frame->destroy = 0;
2654 2968
2655 if (acquire) 2969 if (acquire)
2656 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2970 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2657 else 2971 else
2658 coro_semaphore_adjust (aTHX_ av, 0); 2972 coro_semaphore_adjust (aTHX_ av, 0);
… …
2663 { 2977 {
2664 int i; 2978 int i;
2665 /* 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 */
2666 /* 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 */
2667 /* this avoids some degenerate memory usage cases */ 2981 /* this avoids some degenerate memory usage cases */
2668 2982 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2669 for (i = 1; i <= AvFILLp (av); ++i)
2670 if (AvARRAY (av)[i] == SvRV (coro_current)) 2983 if (AvARRAY (av)[i] == coro_hv)
2671 return 1; 2984 return 1;
2672 2985
2673 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2986 av_push (av, SvREFCNT_inc (coro_hv));
2674 return 1; 2987 return 1;
2675 } 2988 }
2676} 2989}
2677 2990
2678static int 2991static int
… …
2701 { 3014 {
2702 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3015 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2703 3016
2704 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3017 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2705 frame->prepare = prepare_schedule; 3018 frame->prepare = prepare_schedule;
2706
2707 /* to avoid race conditions when a woken-up coro gets terminated */ 3019 /* to avoid race conditions when a woken-up coro gets terminated */
2708 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3020 /* we arrange for a temporary on_destroy that calls adjust (0) */
2709 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3021 frame->destroy = coro_semaphore_destroy;
2710 } 3022 }
2711} 3023}
2712 3024
2713static void 3025static void
2714slf_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)
… …
2932 dSP; 3244 dSP;
2933 3245
2934 static SV *prio_cv; 3246 static SV *prio_cv;
2935 static SV *prio_sv; 3247 static SV *prio_sv;
2936 3248
2937 if (expect_false (!prio_cv)) 3249 if (ecb_expect_false (!prio_cv))
2938 { 3250 {
2939 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3251 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2940 prio_sv = newSViv (0); 3252 prio_sv = newSViv (0);
2941 } 3253 }
2942 3254
… …
3048 } 3360 }
3049 3361
3050 return coro_sv; 3362 return coro_sv;
3051} 3363}
3052 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
3053MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3432MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3054 3433
3055PROTOTYPES: DISABLE 3434PROTOTYPES: DISABLE
3056 3435
3057BOOT: 3436BOOT:
… …
3060# if CORO_PTHREAD 3439# if CORO_PTHREAD
3061 coro_thx = PERL_GET_CONTEXT; 3440 coro_thx = PERL_GET_CONTEXT;
3062# endif 3441# endif
3063#endif 3442#endif
3064 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;
3065 3451
3066 cctx_current = cctx_new_empty (); 3452 cctx_current = cctx_new_empty ();
3067 3453
3068 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3454 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3069 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3455 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3109 coroapi.prepare_nop = prepare_nop; 3495 coroapi.prepare_nop = prepare_nop;
3110 coroapi.prepare_schedule = prepare_schedule; 3496 coroapi.prepare_schedule = prepare_schedule;
3111 coroapi.prepare_cede = prepare_cede; 3497 coroapi.prepare_cede = prepare_cede;
3112 coroapi.prepare_cede_notself = prepare_cede_notself; 3498 coroapi.prepare_cede_notself = prepare_cede_notself;
3113 3499
3114 { 3500 time_init (aTHX);
3115 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3116
3117 if (!svp) croak ("Time::HiRes is required");
3118 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3119
3120 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3121
3122 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3123 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3124 }
3125 3501
3126 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
3127} 3508}
3128 3509
3129SV * 3510SV *
3130new (SV *klass, ...) 3511new (SV *klass, ...)
3131 ALIAS: 3512 ALIAS:
… …
3138void 3519void
3139transfer (...) 3520transfer (...)
3140 PROTOTYPE: $$ 3521 PROTOTYPE: $$
3141 CODE: 3522 CODE:
3142 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3523 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3143
3144bool
3145_destroy (SV *coro_sv)
3146 CODE:
3147 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3148 OUTPUT:
3149 RETVAL
3150 3524
3151void 3525void
3152_exit (int code) 3526_exit (int code)
3153 PROTOTYPE: $ 3527 PROTOTYPE: $
3154 CODE: 3528 CODE:
… …
3230 CODE: 3604 CODE:
3231{ 3605{
3232 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3606 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3233 { 3607 {
3234 struct coro *current = SvSTATE_current; 3608 struct coro *current = SvSTATE_current;
3609 struct CoroSLF slf_save;
3235 3610
3236 if (current != coro) 3611 if (current != coro)
3237 { 3612 {
3238 PUTBACK; 3613 PUTBACK;
3239 save_perl (aTHX_ current); 3614 save_perl (aTHX_ current);
3240 load_perl (aTHX_ coro); 3615 load_perl (aTHX_ coro);
3616 /* the coro is most likely in an active SLF call.
3617 * while not strictly required (the code we execute is
3618 * not allowed to call any SLF functions), it's cleaner
3619 * to reinitialise the slf_frame and restore it later.
3620 * This might one day allow us to actually do SLF calls
3621 * from code executed here.
3622 */
3623 slf_save = slf_frame;
3624 slf_frame.prepare = 0;
3241 SPAGAIN; 3625 SPAGAIN;
3242 } 3626 }
3243 3627
3244 PUSHSTACK; 3628 PUSHSTACK;
3245 3629
… …
3255 SPAGAIN; 3639 SPAGAIN;
3256 3640
3257 if (current != coro) 3641 if (current != coro)
3258 { 3642 {
3259 PUTBACK; 3643 PUTBACK;
3644 slf_frame = slf_save;
3260 save_perl (aTHX_ coro); 3645 save_perl (aTHX_ coro);
3261 load_perl (aTHX_ current); 3646 load_perl (aTHX_ current);
3262 SPAGAIN; 3647 SPAGAIN;
3263 } 3648 }
3264 } 3649 }
… …
3269 PROTOTYPE: $ 3654 PROTOTYPE: $
3270 ALIAS: 3655 ALIAS:
3271 is_ready = CF_READY 3656 is_ready = CF_READY
3272 is_running = CF_RUNNING 3657 is_running = CF_RUNNING
3273 is_new = CF_NEW 3658 is_new = CF_NEW
3274 is_destroyed = CF_DESTROYED 3659 is_destroyed = CF_ZOMBIE
3660 is_zombie = CF_ZOMBIE
3275 is_suspended = CF_SUSPENDED 3661 is_suspended = CF_SUSPENDED
3276 CODE: 3662 CODE:
3277 RETVAL = boolSV (coro->flags & ix); 3663 RETVAL = boolSV (coro->flags & ix);
3278 OUTPUT: 3664 OUTPUT:
3279 RETVAL 3665 RETVAL
… …
3350 3736
3351void 3737void
3352cancel (Coro::State self) 3738cancel (Coro::State self)
3353 CODE: 3739 CODE:
3354 coro_state_destroy (aTHX_ self); 3740 coro_state_destroy (aTHX_ self);
3355 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3356
3357 3741
3358SV * 3742SV *
3359enable_times (int enabled = enable_times) 3743enable_times (int enabled = enable_times)
3360 CODE: 3744 CODE:
3361{ 3745{
… …
3376times (Coro::State self) 3760times (Coro::State self)
3377 PPCODE: 3761 PPCODE:
3378{ 3762{
3379 struct coro *current = SvSTATE (coro_current); 3763 struct coro *current = SvSTATE (coro_current);
3380 3764
3381 if (expect_false (current == self)) 3765 if (ecb_expect_false (current == self))
3382 { 3766 {
3383 coro_times_update (); 3767 coro_times_update ();
3384 coro_times_add (SvSTATE (coro_current)); 3768 coro_times_add (SvSTATE (coro_current));
3385 } 3769 }
3386 3770
3387 EXTEND (SP, 2); 3771 EXTEND (SP, 2);
3388 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3772 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3389 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3773 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3390 3774
3391 if (expect_false (current == self)) 3775 if (ecb_expect_false (current == self))
3392 coro_times_sub (SvSTATE (coro_current)); 3776 coro_times_sub (SvSTATE (coro_current));
3393} 3777}
3394 3778
3395void 3779void
3396swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3780swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3417BOOT: 3801BOOT:
3418{ 3802{
3419 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3803 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3420 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3804 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3421 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3805 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3422 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3423 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3806 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3424 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3807 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3425 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3808 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3426 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3809 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3427 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3810 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
… …
3466 api_ready (aTHX_ RETVAL); 3849 api_ready (aTHX_ RETVAL);
3467 OUTPUT: 3850 OUTPUT:
3468 RETVAL 3851 RETVAL
3469 3852
3470void 3853void
3854_destroy (Coro::State coro)
3855 CODE:
3856 /* used by the manager thread */
3857 coro_state_destroy (aTHX_ coro);
3858
3859void
3860on_destroy (Coro::State coro, SV *cb)
3861 CODE:
3862 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3863
3864void
3865join (...)
3866 CODE:
3867 CORO_EXECUTE_SLF_XS (slf_init_join);
3868
3869void
3471terminate (...) 3870terminate (...)
3472 CODE: 3871 CODE:
3473 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3872 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3873
3874void
3875cancel (...)
3876 CODE:
3877 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3878
3879int
3880safe_cancel (Coro::State self, ...)
3881 C_ARGS: aTHX_ self, &ST (1), items - 1
3474 3882
3475void 3883void
3476schedule (...) 3884schedule (...)
3477 CODE: 3885 CODE:
3478 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3886 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3754} 4162}
3755 4163
3756MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4164MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3757 4165
3758void 4166void
3759_may_delete (SV *sem, int count, int extra_refs) 4167_may_delete (SV *sem, int count, unsigned int extra_refs)
3760 PPCODE: 4168 PPCODE:
3761{ 4169{
3762 AV *av = (AV *)SvRV (sem); 4170 AV *av = (AV *)SvRV (sem);
3763 4171
3764 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4172 if (SvREFCNT ((SV *)av) == 1 + extra_refs

Diff Legend

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