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.384 by root, Thu Feb 17 01:32:18 2011 UTC vs.
Revision 1.413 by root, Fri Jun 17 18:55:08 2011 UTC

… …
12#include "perl.h" 12#include "perl.h"
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17#include "ecb.h"
17 18
19#include <stddef.h>
18#include <stdio.h> 20#include <stdio.h>
19#include <errno.h> 21#include <errno.h>
20#include <assert.h> 22#include <assert.h>
21 23
22#ifndef SVs_PADSTALE 24#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0 25# define SVs_PADSTALE 0
24#endif 26#endif
25 27
26#ifdef WIN32 28#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY
27# undef setjmp 30# undef setjmp
28# undef longjmp 31# undef longjmp
29# undef _exit 32# undef _exit
30# define setjmp _setjmp /* deep magic */ 33# define setjmp _setjmp /* deep magic */
31#else 34#else
32# include <inttypes.h> /* most portable stdint.h */ 35# include <inttypes.h> /* most portable stdint.h */
33#endif 36#endif
34 37
35#ifdef HAVE_MMAP 38#if HAVE_MMAP
36# include <unistd.h> 39# include <unistd.h>
37# include <sys/mman.h> 40# include <sys/mman.h>
38# ifndef MAP_ANONYMOUS 41# ifndef MAP_ANONYMOUS
39# ifdef MAP_ANON 42# ifdef MAP_ANON
40# define MAP_ANONYMOUS MAP_ANON 43# define MAP_ANONYMOUS MAP_ANON
… …
85# define STACKLEVEL ((void *)&stacklevel) 88# define STACKLEVEL ((void *)&stacklevel)
86#endif 89#endif
87 90
88#define IN_DESTRUCT PL_dirty 91#define IN_DESTRUCT PL_dirty
89 92
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" 93#include "CoroAPI.h"
106#define GCoroAPI (&coroapi) /* very sneaky */ 94#define GCoroAPI (&coroapi) /* very sneaky */
107 95
108#ifdef USE_ITHREADS 96#ifdef USE_ITHREADS
109# if CORO_PTHREAD 97# if CORO_PTHREAD
110static void *coro_thx; 98static void *coro_thx;
111# endif 99# endif
112#endif 100#endif
101
102/* used in state.h */
103#define VAR(name,type) VARx(name, PL_ ## name, type)
113 104
114#ifdef __linux 105#ifdef __linux
115# include <time.h> /* for timespec */ 106# include <time.h> /* for timespec */
116# include <syscall.h> /* for SYS_* */ 107# include <syscall.h> /* for SYS_* */
117# ifdef SYS_clock_gettime 108# ifdef SYS_clock_gettime
… …
125static void (*u2time)(pTHX_ UV ret[2]); 116static void (*u2time)(pTHX_ UV ret[2]);
126 117
127/* we hijack an hopefully unused CV flag for our purposes */ 118/* we hijack an hopefully unused CV flag for our purposes */
128#define CVf_SLF 0x4000 119#define CVf_SLF 0x4000
129static OP *pp_slf (pTHX); 120static OP *pp_slf (pTHX);
121static void slf_destroy (pTHX_ struct coro *coro);
130 122
131static U32 cctx_gen; 123static U32 cctx_gen;
132static size_t cctx_stacksize = CORO_STACKSIZE; 124static size_t cctx_stacksize = CORO_STACKSIZE;
133static struct CoroAPI coroapi; 125static struct CoroAPI coroapi;
134static AV *main_mainstack; /* used to differentiate between $main and others */ 126static AV *main_mainstack; /* used to differentiate between $main and others */
… …
164static char times_valid; 156static char times_valid;
165 157
166static struct coro_cctx *cctx_first; 158static struct coro_cctx *cctx_first;
167static int cctx_count, cctx_idle; 159static int cctx_count, cctx_idle;
168 160
169enum { 161enum
162{
170 CC_MAPPED = 0x01, 163 CC_MAPPED = 0x01,
171 CC_NOREUSE = 0x02, /* throw this away after tracing */ 164 CC_NOREUSE = 0x02, /* throw this away after tracing */
172 CC_TRACE = 0x04, 165 CC_TRACE = 0x04,
173 CC_TRACE_SUB = 0x08, /* trace sub calls */ 166 CC_TRACE_SUB = 0x08, /* trace sub calls */
174 CC_TRACE_LINE = 0x10, /* trace each statement */ 167 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
195 int valgrind_id; 188 int valgrind_id;
196#endif 189#endif
197 unsigned char flags; 190 unsigned char flags;
198} coro_cctx; 191} coro_cctx;
199 192
200coro_cctx *cctx_current; /* the currently running cctx */ 193static coro_cctx *cctx_current; /* the currently running cctx */
201 194
202/*****************************************************************************/ 195/*****************************************************************************/
203 196
197static MGVTBL coro_state_vtbl;
198
204enum { 199enum
200{
205 CF_RUNNING = 0x0001, /* coroutine is running */ 201 CF_RUNNING = 0x0001, /* coroutine is running */
206 CF_READY = 0x0002, /* coroutine is ready */ 202 CF_READY = 0x0002, /* coroutine is ready */
207 CF_NEW = 0x0004, /* has never been switched to */ 203 CF_NEW = 0x0004, /* has never been switched to */
208 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 204 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
209 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 205 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
206 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
210}; 207};
211 208
212/* the structure where most of the perl state is stored, overlaid on the cxstack */ 209/* the structure where most of the perl state is stored, overlaid on the cxstack */
213typedef struct 210typedef struct
214{ 211{
215 SV *defsv;
216 AV *defav;
217 SV *errsv;
218 SV *irsgv;
219 HV *hinthv;
220#define VAR(name,type) type name; 212#define VARx(name,expr,type) type name;
221# include "state.h" 213# include "state.h"
222#undef VAR 214#undef VARx
223} perl_slots; 215} perl_slots;
224 216
217/* 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)) 218#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
226 219
227/* this is a structure representing a perl-level coroutine */ 220/* this is a structure representing a perl-level coroutine */
228struct coro { 221struct coro
222{
229 /* the C coroutine allocated to this perl coroutine, if any */ 223 /* the C coroutine allocated to this perl coroutine, if any */
230 coro_cctx *cctx; 224 coro_cctx *cctx;
231 225
232 /* ready queue */ 226 /* ready queue */
233 struct coro *next_ready; 227 struct coro *next_ready;
… …
235 /* state data */ 229 /* state data */
236 struct CoroSLF slf_frame; /* saved slf frame */ 230 struct CoroSLF slf_frame; /* saved slf frame */
237 AV *mainstack; 231 AV *mainstack;
238 perl_slots *slot; /* basically the saved sp */ 232 perl_slots *slot; /* basically the saved sp */
239 233
240 CV *startcv; /* the CV to execute */ 234 CV *startcv; /* the CV to execute */
241 AV *args; /* data associated with this coroutine (initial args) */ 235 AV *args; /* data associated with this coroutine (initial args) */
242 int refcnt; /* coroutines are refcounted, yes */
243 int flags; /* CF_ flags */ 236 int flags; /* CF_ flags */
244 HV *hv; /* the perl hash associated with this coro, if any */ 237 HV *hv; /* the perl hash associated with this coro, if any */
245 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
246 238
247 /* statistics */ 239 /* statistics */
248 int usecount; /* number of transfers to this coro */ 240 int usecount; /* number of transfers to this coro */
249 241
250 /* coro process data */ 242 /* coro process data */
251 int prio; 243 int prio;
252 SV *except; /* exception to be thrown */ 244 SV *except; /* exception to be thrown */
253 SV *rouse_cb; 245 SV *rouse_cb; /* last rouse callback */
246 AV *on_destroy; /* callbacks or coros to notify on destroy */
247 AV *status; /* the exit status list */
254 248
255 /* async_pool */ 249 /* async_pool */
256 SV *saved_deffh; 250 SV *saved_deffh;
257 SV *invoke_cb; 251 SV *invoke_cb;
258 AV *invoke_av; 252 AV *invoke_av;
… …
274typedef struct coro *Coro__State; 268typedef struct coro *Coro__State;
275typedef struct coro *Coro__State_or_hashref; 269typedef struct coro *Coro__State_or_hashref;
276 270
277/* the following variables are effectively part of the perl context */ 271/* the following variables are effectively part of the perl context */
278/* and get copied between struct coro and these variables */ 272/* and get copied between struct coro and these variables */
279/* the mainr easonw e don't support windows process emulation */ 273/* the main reason we don't support windows process emulation */
280static struct CoroSLF slf_frame; /* the current slf frame */ 274static struct CoroSLF slf_frame; /* the current slf frame */
281 275
282/** Coro ********************************************************************/ 276/** Coro ********************************************************************/
283 277
284#define CORO_PRIO_MAX 3 278#define CORO_PRIO_MAX 3
… …
290 284
291/* for Coro.pm */ 285/* for Coro.pm */
292static SV *coro_current; 286static SV *coro_current;
293static SV *coro_readyhook; 287static SV *coro_readyhook;
294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 288static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
295static CV *cv_coro_run, *cv_coro_terminate; 289static CV *cv_coro_run;
296static struct coro *coro_first; 290static struct coro *coro_first;
297#define coro_nready coroapi.nready 291#define coro_nready coroapi.nready
292
293/** JIT *********************************************************************/
294
295#if CORO_JIT
296 /* APPLE doesn't have HAVE_MMAP though */
297 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
298 #ifndef CORO_JIT_TYPE
299 #if __x86_64 && CORO_JIT_UNIXY
300 #define CORO_JIT_TYPE "amd64-unix"
301 #elif __i386 && CORO_JIT_UNIXY
302 #define CORO_JIT_TYPE "x86-unix"
303 #endif
304 #endif
305#endif
306
307#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP
308 #undef CORO_JIT
309#endif
310
311#if CORO_JIT
312 typedef void (*load_save_perl_slots_type)(perl_slots *);
313 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
314#endif
298 315
299/** Coro::Select ************************************************************/ 316/** Coro::Select ************************************************************/
300 317
301static OP *(*coro_old_pp_sselect) (pTHX); 318static OP *(*coro_old_pp_sselect) (pTHX);
302static SV *coro_select_select; 319static SV *coro_select_select;
… …
314 PL_op->op_flags |= OPf_STACKED; 331 PL_op->op_flags |= OPf_STACKED;
315 PL_op->op_private = 0; 332 PL_op->op_private = 0;
316 return PL_ppaddr [OP_ENTERSUB](aTHX); 333 return PL_ppaddr [OP_ENTERSUB](aTHX);
317} 334}
318 335
336/** time stuff **************************************************************/
337
338#ifdef HAS_GETTIMEOFDAY
339
340ecb_inline void
341coro_u2time (pTHX_ UV ret[2])
342{
343 struct timeval tv;
344 gettimeofday (&tv, 0);
345
346 ret [0] = tv.tv_sec;
347 ret [1] = tv.tv_usec;
348}
349
350ecb_inline double
351coro_nvtime (void)
352{
353 struct timeval tv;
354 gettimeofday (&tv, 0);
355
356 return tv.tv_sec + tv.tv_usec * 1e-6;
357}
358
359ecb_inline void
360time_init (pTHX)
361{
362 nvtime = coro_nvtime;
363 u2time = coro_u2time;
364}
365
366#else
367
368ecb_inline void
369time_init (pTHX)
370{
371 SV **svp;
372
373 require_pv ("Time/HiRes.pm");
374
375 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
376
377 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
378 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
379
380 nvtime = INT2PTR (double (*)(), SvIV (*svp));
381
382 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
383 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
384}
385
386#endif
387
319/** lowlevel stuff **********************************************************/ 388/** lowlevel stuff **********************************************************/
320 389
321static SV * 390static SV * ecb_noinline
322coro_get_sv (pTHX_ const char *name, int create) 391coro_get_sv (pTHX_ const char *name, int create)
323{ 392{
324#if PERL_VERSION_ATLEAST (5,10,0) 393#if PERL_VERSION_ATLEAST (5,10,0)
325 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 394 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
326 get_sv (name, create); 395 get_sv (name, create);
327#endif 396#endif
328 return get_sv (name, create); 397 return get_sv (name, create);
329} 398}
330 399
331static AV * 400static AV * ecb_noinline
332coro_get_av (pTHX_ const char *name, int create) 401coro_get_av (pTHX_ const char *name, int create)
333{ 402{
334#if PERL_VERSION_ATLEAST (5,10,0) 403#if PERL_VERSION_ATLEAST (5,10,0)
335 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 404 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
336 get_av (name, create); 405 get_av (name, create);
337#endif 406#endif
338 return get_av (name, create); 407 return get_av (name, create);
339} 408}
340 409
341static HV * 410static HV * ecb_noinline
342coro_get_hv (pTHX_ const char *name, int create) 411coro_get_hv (pTHX_ const char *name, int create)
343{ 412{
344#if PERL_VERSION_ATLEAST (5,10,0) 413#if PERL_VERSION_ATLEAST (5,10,0)
345 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 414 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
346 get_hv (name, create); 415 get_hv (name, create);
347#endif 416#endif
348 return get_hv (name, create); 417 return get_hv (name, create);
349} 418}
350 419
351INLINE void 420ecb_inline void
352coro_times_update () 421coro_times_update (void)
353{ 422{
354#ifdef coro_clock_gettime 423#ifdef coro_clock_gettime
355 struct timespec ts; 424 struct timespec ts;
356 425
357 ts.tv_sec = ts.tv_nsec = 0; 426 ts.tv_sec = ts.tv_nsec = 0;
… …
369 time_real [0] = tv [0]; 438 time_real [0] = tv [0];
370 time_real [1] = tv [1] * 1000; 439 time_real [1] = tv [1] * 1000;
371#endif 440#endif
372} 441}
373 442
374INLINE void 443ecb_inline void
375coro_times_add (struct coro *c) 444coro_times_add (struct coro *c)
376{ 445{
377 c->t_real [1] += time_real [1]; 446 c->t_real [1] += time_real [1];
378 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 447 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
379 c->t_real [0] += time_real [0]; 448 c->t_real [0] += time_real [0];
… …
381 c->t_cpu [1] += time_cpu [1]; 450 c->t_cpu [1] += time_cpu [1];
382 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 451 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
383 c->t_cpu [0] += time_cpu [0]; 452 c->t_cpu [0] += time_cpu [0];
384} 453}
385 454
386INLINE void 455ecb_inline void
387coro_times_sub (struct coro *c) 456coro_times_sub (struct coro *c)
388{ 457{
389 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 458 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]; 459 c->t_real [1] -= time_real [1];
391 c->t_real [0] -= time_real [0]; 460 c->t_real [0] -= time_real [0];
… …
399/* magic glue */ 468/* magic glue */
400 469
401#define CORO_MAGIC_type_cv 26 470#define CORO_MAGIC_type_cv 26
402#define CORO_MAGIC_type_state PERL_MAGIC_ext 471#define CORO_MAGIC_type_state PERL_MAGIC_ext
403 472
404#define CORO_MAGIC_NN(sv, type) \ 473#define CORO_MAGIC_NN(sv, type) \
405 (expect_true (SvMAGIC (sv)->mg_type == type) \ 474 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
406 ? SvMAGIC (sv) \ 475 ? SvMAGIC (sv) \
407 : mg_find (sv, type)) 476 : mg_find (sv, type))
408 477
409#define CORO_MAGIC(sv, type) \ 478#define CORO_MAGIC(sv, type) \
410 (expect_true (SvMAGIC (sv)) \ 479 (ecb_expect_true (SvMAGIC (sv)) \
411 ? CORO_MAGIC_NN (sv, type) \ 480 ? CORO_MAGIC_NN (sv, type) \
412 : 0) 481 : 0)
413 482
414#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 483#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) 484#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
416 485
417INLINE struct coro * 486ecb_inline MAGIC *
487SvSTATEhv_p (pTHX_ SV *coro)
488{
489 MAGIC *mg;
490
491 if (ecb_expect_true (
492 SvTYPE (coro) == SVt_PVHV
493 && (mg = CORO_MAGIC_state (coro))
494 && mg->mg_virtual == &coro_state_vtbl
495 ))
496 return mg;
497
498 return 0;
499}
500
501ecb_inline struct coro *
418SvSTATE_ (pTHX_ SV *coro) 502SvSTATE_ (pTHX_ SV *coro)
419{ 503{
420 HV *stash;
421 MAGIC *mg; 504 MAGIC *mg;
422 505
423 if (SvROK (coro)) 506 if (SvROK (coro))
424 coro = SvRV (coro); 507 coro = SvRV (coro);
425 508
426 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 509 mg = SvSTATEhv_p (aTHX_ coro);
510 if (!mg)
427 croak ("Coro::State object required"); 511 croak ("Coro::State object required");
428 512
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; 513 return (struct coro *)mg->mg_ptr;
439} 514}
440 515
441#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 516#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
442 517
… …
445#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 520#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
446 521
447/*****************************************************************************/ 522/*****************************************************************************/
448/* padlist management and caching */ 523/* padlist management and caching */
449 524
450static AV * 525ecb_inline AV *
451coro_derive_padlist (pTHX_ CV *cv) 526coro_derive_padlist (pTHX_ CV *cv)
452{ 527{
453 AV *padlist = CvPADLIST (cv); 528 AV *padlist = CvPADLIST (cv);
454 AV *newpadlist, *newpad; 529 AV *newpadlist, *newpad;
455 530
… …
467 av_store (newpadlist, 1, (SV *)newpad); 542 av_store (newpadlist, 1, (SV *)newpad);
468 543
469 return newpadlist; 544 return newpadlist;
470} 545}
471 546
472static void 547ecb_inline void
473free_padlist (pTHX_ AV *padlist) 548free_padlist (pTHX_ AV *padlist)
474{ 549{
475 /* may be during global destruction */ 550 /* may be during global destruction */
476 if (!IN_DESTRUCT) 551 if (!IN_DESTRUCT)
477 { 552 {
… …
520 0, 0, 0, 0, 595 0, 0, 0, 0,
521 coro_cv_free 596 coro_cv_free
522}; 597};
523 598
524/* the next two functions merely cache the padlists */ 599/* the next two functions merely cache the padlists */
525static void 600ecb_inline void
526get_padlist (pTHX_ CV *cv) 601get_padlist (pTHX_ CV *cv)
527{ 602{
528 MAGIC *mg = CORO_MAGIC_cv (cv); 603 MAGIC *mg = CORO_MAGIC_cv (cv);
529 AV *av; 604 AV *av;
530 605
531 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 606 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
532 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 607 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
533 else 608 else
534 { 609 {
535#if CORO_PREFER_PERL_FUNCTIONS 610#if CORO_PREFER_PERL_FUNCTIONS
536 /* this is probably cleaner? but also slower! */ 611 /* this is probably cleaner? but also slower! */
… …
543 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 618 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
544#endif 619#endif
545 } 620 }
546} 621}
547 622
548static void 623ecb_inline void
549put_padlist (pTHX_ CV *cv) 624put_padlist (pTHX_ CV *cv)
550{ 625{
551 MAGIC *mg = CORO_MAGIC_cv (cv); 626 MAGIC *mg = CORO_MAGIC_cv (cv);
552 AV *av; 627 AV *av;
553 628
554 if (expect_false (!mg)) 629 if (ecb_expect_false (!mg))
555 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 630 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
556 631
557 av = (AV *)mg->mg_obj; 632 av = (AV *)mg->mg_obj;
558 633
559 if (expect_false (AvFILLp (av) >= AvMAX (av))) 634 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
560 av_extend (av, AvFILLp (av) + 1); 635 av_extend (av, AvFILLp (av) + 1);
561 636
562 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 637 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
563} 638}
564 639
… …
586 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep); 661 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
587 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep); 662 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
588 663
589#if PERL_VERSION_ATLEAST (5,10,0) 664#if PERL_VERSION_ATLEAST (5,10,0)
590 /* perl 5.10 complicates this _quite_ a bit, but it also is 665 /* perl 5.10 complicates this _quite_ a bit, but it also is
591 * is much faster, so no quarrels here. alternatively, we could 666 * much faster, so no quarrels here. alternatively, we could
592 * sv_upgrade to avoid this. 667 * sv_upgrade to avoid this.
593 */ 668 */
594 { 669 {
595 /* swap sv_u */ 670 /* swap sv_u */
596 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 671 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
… …
609 } 684 }
610#endif 685#endif
611 } 686 }
612} 687}
613 688
614#define SWAP_SVS(coro) \ 689#define SWAP_SVS(coro) \
615 if (expect_false ((coro)->swap_sv)) \ 690 if (ecb_expect_false ((coro)->swap_sv)) \
616 swap_svs (aTHX_ (coro)) 691 swap_svs (aTHX_ (coro))
617 692
618static void 693static void
619on_enterleave_call (pTHX_ SV *cb); 694on_enterleave_call (pTHX_ SV *cb);
620 695
… …
624 perl_slots *slot = c->slot; 699 perl_slots *slot = c->slot;
625 c->slot = 0; 700 c->slot = 0;
626 701
627 PL_mainstack = c->mainstack; 702 PL_mainstack = c->mainstack;
628 703
629 GvSV (PL_defgv) = slot->defsv; 704#if CORO_JIT
630 GvAV (PL_defgv) = slot->defav; 705 load_perl_slots (slot);
631 GvSV (PL_errgv) = slot->errsv; 706#else
632 GvSV (irsgv) = slot->irsgv;
633 GvHV (PL_hintgv) = slot->hinthv;
634
635 #define VAR(name,type) PL_ ## name = slot->name; 707 #define VARx(name,expr,type) expr = slot->name;
636 # include "state.h" 708 # include "state.h"
637 #undef VAR 709 #undef VARx
710#endif
638 711
639 { 712 {
640 dSP; 713 dSP;
641 714
642 CV *cv; 715 CV *cv;
643 716
644 /* now do the ugly restore mess */ 717 /* now do the ugly restore mess */
645 while (expect_true (cv = (CV *)POPs)) 718 while (ecb_expect_true (cv = (CV *)POPs))
646 { 719 {
647 put_padlist (aTHX_ cv); /* mark this padlist as available */ 720 put_padlist (aTHX_ cv); /* mark this padlist as available */
648 CvDEPTH (cv) = PTR2IV (POPs); 721 CvDEPTH (cv) = PTR2IV (POPs);
649 CvPADLIST (cv) = (AV *)POPs; 722 CvPADLIST (cv) = (AV *)POPs;
650 } 723 }
… …
653 } 726 }
654 727
655 slf_frame = c->slf_frame; 728 slf_frame = c->slf_frame;
656 CORO_THROW = c->except; 729 CORO_THROW = c->except;
657 730
658 if (expect_false (enable_times)) 731 if (ecb_expect_false (enable_times))
659 { 732 {
660 if (expect_false (!times_valid)) 733 if (ecb_expect_false (!times_valid))
661 coro_times_update (); 734 coro_times_update ();
662 735
663 coro_times_sub (c); 736 coro_times_sub (c);
664 } 737 }
665 738
666 if (expect_false (c->on_enter)) 739 if (ecb_expect_false (c->on_enter))
667 { 740 {
668 int i; 741 int i;
669 742
670 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 743 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
671 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 744 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
677static void 750static void
678save_perl (pTHX_ Coro__State c) 751save_perl (pTHX_ Coro__State c)
679{ 752{
680 SWAP_SVS (c); 753 SWAP_SVS (c);
681 754
682 if (expect_false (c->on_leave)) 755 if (ecb_expect_false (c->on_leave))
683 { 756 {
684 int i; 757 int i;
685 758
686 for (i = AvFILLp (c->on_leave); i >= 0; --i) 759 for (i = AvFILLp (c->on_leave); i >= 0; --i)
687 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 760 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
688 } 761 }
689 762
690 times_valid = 0; 763 times_valid = 0;
691 764
692 if (expect_false (enable_times)) 765 if (ecb_expect_false (enable_times))
693 { 766 {
694 coro_times_update (); times_valid = 1; 767 coro_times_update (); times_valid = 1;
695 coro_times_add (c); 768 coro_times_add (c);
696 } 769 }
697 770
… …
711 784
712 XPUSHs (Nullsv); 785 XPUSHs (Nullsv);
713 /* this loop was inspired by pp_caller */ 786 /* this loop was inspired by pp_caller */
714 for (;;) 787 for (;;)
715 { 788 {
716 while (expect_true (cxix >= 0)) 789 while (ecb_expect_true (cxix >= 0))
717 { 790 {
718 PERL_CONTEXT *cx = &ccstk[cxix--]; 791 PERL_CONTEXT *cx = &ccstk[cxix--];
719 792
720 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 793 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
721 { 794 {
722 CV *cv = cx->blk_sub.cv; 795 CV *cv = cx->blk_sub.cv;
723 796
724 if (expect_true (CvDEPTH (cv))) 797 if (ecb_expect_true (CvDEPTH (cv)))
725 { 798 {
726 EXTEND (SP, 3); 799 EXTEND (SP, 3);
727 PUSHs ((SV *)CvPADLIST (cv)); 800 PUSHs ((SV *)CvPADLIST (cv));
728 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 801 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
729 PUSHs ((SV *)cv); 802 PUSHs ((SV *)cv);
… …
732 get_padlist (aTHX_ cv); 805 get_padlist (aTHX_ cv);
733 } 806 }
734 } 807 }
735 } 808 }
736 809
737 if (expect_true (top_si->si_type == PERLSI_MAIN)) 810 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
738 break; 811 break;
739 812
740 top_si = top_si->si_prev; 813 top_si = top_si->si_prev;
741 ccstk = top_si->si_cxstack; 814 ccstk = top_si->si_cxstack;
742 cxix = top_si->si_cxix; 815 cxix = top_si->si_cxix;
… …
744 817
745 PUTBACK; 818 PUTBACK;
746 } 819 }
747 820
748 /* allocate some space on the context stack for our purposes */ 821 /* allocate some space on the context stack for our purposes */
749 /* we manually unroll here, as usually 2 slots is enough */ 822 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 { 823 {
754 unsigned int i; 824 unsigned int i;
825
755 for (i = 3; i < SLOT_COUNT; ++i) 826 for (i = 0; i < SLOT_COUNT; ++i)
756 CXINC; 827 CXINC;
757 } 828
758 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 829 cxstack_ix -= SLOT_COUNT; /* undo allocation */
830 }
759 831
760 c->mainstack = PL_mainstack; 832 c->mainstack = PL_mainstack;
761 833
762 { 834 {
763 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 835 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
764 836
765 slot->defav = GvAV (PL_defgv); 837#if CORO_JIT
766 slot->defsv = DEFSV; 838 save_perl_slots (slot);
767 slot->errsv = ERRSV; 839#else
768 slot->irsgv = GvSV (irsgv);
769 slot->hinthv = GvHV (PL_hintgv);
770
771 #define VAR(name,type) slot->name = PL_ ## name; 840 #define VARx(name,expr,type) slot->name = expr;
772 # include "state.h" 841 # include "state.h"
773 #undef VAR 842 #undef VARx
843#endif
774 } 844 }
775} 845}
776 846
777/* 847/*
778 * allocate various perl stacks. This is almost an exact copy 848 * allocate various perl stacks. This is almost an exact copy
… …
784# define coro_init_stacks(thx) init_stacks () 854# define coro_init_stacks(thx) init_stacks ()
785#else 855#else
786static void 856static void
787coro_init_stacks (pTHX) 857coro_init_stacks (pTHX)
788{ 858{
789 PL_curstackinfo = new_stackinfo(32, 8); 859 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; 860 PL_curstackinfo->si_type = PERLSI_MAIN;
791 PL_curstack = PL_curstackinfo->si_stack; 861 PL_curstack = PL_curstackinfo->si_stack;
792 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 862 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
793 863
794 PL_stack_base = AvARRAY(PL_curstack); 864 PL_stack_base = AvARRAY(PL_curstack);
… …
901#endif 971#endif
902 972
903/* 973/*
904 * This overrides the default magic get method of %SIG elements. 974 * 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 975 * 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 976 * and instead of trying to save and restore the hash elements (extremely slow),
907 * readback here. 977 * we just provide our own readback here.
908 */ 978 */
909static int 979static int ecb_cold
910coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 980coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
911{ 981{
912 const char *s = MgPV_nolen_const (mg); 982 const char *s = MgPV_nolen_const (mg);
913 983
914 if (*s == '_') 984 if (*s == '_')
… …
926 } 996 }
927 997
928 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 998 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
929} 999}
930 1000
931static int 1001static int ecb_cold
932coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1002coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
933{ 1003{
934 const char *s = MgPV_nolen_const (mg); 1004 const char *s = MgPV_nolen_const (mg);
935 1005
936 if (*s == '_') 1006 if (*s == '_')
… …
950 } 1020 }
951 1021
952 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1022 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
953} 1023}
954 1024
955static int 1025static int ecb_cold
956coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1026coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
957{ 1027{
958 const char *s = MgPV_nolen_const (mg); 1028 const char *s = MgPV_nolen_const (mg);
959 1029
960 if (*s == '_') 1030 if (*s == '_')
… …
995 return 1; 1065 return 1;
996} 1066}
997 1067
998static UNOP init_perl_op; 1068static UNOP init_perl_op;
999 1069
1000static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1070ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1001init_perl (pTHX_ struct coro *coro) 1071init_perl (pTHX_ struct coro *coro)
1002{ 1072{
1003 /* 1073 /*
1004 * emulate part of the perl startup here. 1074 * emulate part of the perl startup here.
1005 */ 1075 */
… …
1020 PL_parser = 0; 1090 PL_parser = 0;
1021#endif 1091#endif
1022 PL_hints = 0; 1092 PL_hints = 0;
1023 1093
1024 /* recreate the die/warn hooks */ 1094 /* recreate the die/warn hooks */
1025 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1095 PL_diehook = SvREFCNT_inc (rv_diehook);
1026 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1096 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1027 1097
1028 GvSV (PL_defgv) = newSV (0); 1098 GvSV (PL_defgv) = newSV (0);
1029 GvAV (PL_defgv) = coro->args; coro->args = 0; 1099 GvAV (PL_defgv) = coro->args; coro->args = 0;
1030 GvSV (PL_errgv) = newSV (0); 1100 GvSV (PL_errgv) = newSV (0);
1031 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1101 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 1122 /* 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. 1123 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1054 */ 1124 */
1055 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1125 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 */ 1126 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1127 slf_frame.destroy = 0;
1057 1128
1058 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1129 /* 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; 1130 init_perl_op.op_next = PL_op;
1060 init_perl_op.op_type = OP_ENTERSUB; 1131 init_perl_op.op_type = OP_ENTERSUB;
1061 init_perl_op.op_ppaddr = pp_slf; 1132 init_perl_op.op_ppaddr = pp_slf;
… …
1066 /* copy throw, in case it was set before init_perl */ 1137 /* copy throw, in case it was set before init_perl */
1067 CORO_THROW = coro->except; 1138 CORO_THROW = coro->except;
1068 1139
1069 SWAP_SVS (coro); 1140 SWAP_SVS (coro);
1070 1141
1071 if (expect_false (enable_times)) 1142 if (ecb_expect_false (enable_times))
1072 { 1143 {
1073 coro_times_update (); 1144 coro_times_update ();
1074 coro_times_sub (coro); 1145 coro_times_sub (coro);
1075 } 1146 }
1076} 1147}
… …
1100destroy_perl (pTHX_ struct coro *coro) 1171destroy_perl (pTHX_ struct coro *coro)
1101{ 1172{
1102 SV *svf [9]; 1173 SV *svf [9];
1103 1174
1104 { 1175 {
1176 SV *old_current = SvRV (coro_current);
1105 struct coro *current = SvSTATE_current; 1177 struct coro *current = SvSTATE (old_current);
1106 1178
1107 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1179 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1108 1180
1109 save_perl (aTHX_ current); 1181 save_perl (aTHX_ current);
1182
1183 /* this will cause transfer_check to croak on block*/
1184 SvRV_set (coro_current, (SV *)coro->hv);
1185
1110 load_perl (aTHX_ coro); 1186 load_perl (aTHX_ coro);
1111 1187
1112 coro_unwind_stacks (aTHX); 1188 coro_unwind_stacks (aTHX);
1113 coro_destruct_stacks (aTHX);
1114 1189
1115 /* restore swapped sv's */ 1190 /* restore swapped sv's */
1116 SWAP_SVS (coro); 1191 SWAP_SVS (coro);
1117 1192
1193 coro_destruct_stacks (aTHX);
1194
1118 // now save some sv's to be free'd later 1195 /* now save some sv's to be free'd later */
1119 svf [0] = GvSV (PL_defgv); 1196 svf [0] = GvSV (PL_defgv);
1120 svf [1] = (SV *)GvAV (PL_defgv); 1197 svf [1] = (SV *)GvAV (PL_defgv);
1121 svf [2] = GvSV (PL_errgv); 1198 svf [2] = GvSV (PL_errgv);
1122 svf [3] = (SV *)PL_defoutgv; 1199 svf [3] = (SV *)PL_defoutgv;
1123 svf [4] = PL_rs; 1200 svf [4] = PL_rs;
… …
1125 svf [6] = (SV *)GvHV (PL_hintgv); 1202 svf [6] = (SV *)GvHV (PL_hintgv);
1126 svf [7] = PL_diehook; 1203 svf [7] = PL_diehook;
1127 svf [8] = PL_warnhook; 1204 svf [8] = PL_warnhook;
1128 assert (9 == sizeof (svf) / sizeof (*svf)); 1205 assert (9 == sizeof (svf) / sizeof (*svf));
1129 1206
1207 SvRV_set (coro_current, old_current);
1208
1130 load_perl (aTHX_ current); 1209 load_perl (aTHX_ current);
1131 } 1210 }
1132 1211
1133 { 1212 {
1134 unsigned int i; 1213 unsigned int i;
… …
1141 SvREFCNT_dec (coro->invoke_cb); 1220 SvREFCNT_dec (coro->invoke_cb);
1142 SvREFCNT_dec (coro->invoke_av); 1221 SvREFCNT_dec (coro->invoke_av);
1143 } 1222 }
1144} 1223}
1145 1224
1146INLINE void 1225ecb_inline void
1147free_coro_mortal (pTHX) 1226free_coro_mortal (pTHX)
1148{ 1227{
1149 if (expect_true (coro_mortal)) 1228 if (ecb_expect_true (coro_mortal))
1150 { 1229 {
1151 SvREFCNT_dec (coro_mortal); 1230 SvREFCNT_dec ((SV *)coro_mortal);
1152 coro_mortal = 0; 1231 coro_mortal = 0;
1153 } 1232 }
1154} 1233}
1155 1234
1156static int 1235static int
… …
1289 1368
1290 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1369 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1291} 1370}
1292 1371
1293/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1372/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1294static void NOINLINE 1373static void ecb_noinline
1295cctx_prepare (pTHX) 1374cctx_prepare (pTHX)
1296{ 1375{
1297 PL_top_env = &PL_start_env; 1376 PL_top_env = &PL_start_env;
1298 1377
1299 if (cctx_current->flags & CC_TRACE) 1378 if (cctx_current->flags & CC_TRACE)
… …
1310 slf_frame.prepare = slf_prepare_set_stacklevel; 1389 slf_frame.prepare = slf_prepare_set_stacklevel;
1311 slf_frame.check = slf_check_set_stacklevel; 1390 slf_frame.check = slf_check_set_stacklevel;
1312} 1391}
1313 1392
1314/* the tail of transfer: execute stuff we can only do after a transfer */ 1393/* the tail of transfer: execute stuff we can only do after a transfer */
1315INLINE void 1394ecb_inline void
1316transfer_tail (pTHX) 1395transfer_tail (pTHX)
1317{ 1396{
1318 free_coro_mortal (aTHX); 1397 free_coro_mortal (aTHX);
1319} 1398}
1320 1399
… …
1364 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1443 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1365 } 1444 }
1366} 1445}
1367 1446
1368static coro_cctx * 1447static coro_cctx *
1369cctx_new () 1448cctx_new (void)
1370{ 1449{
1371 coro_cctx *cctx; 1450 coro_cctx *cctx;
1372 1451
1373 ++cctx_count; 1452 ++cctx_count;
1374 New (0, cctx, 1, coro_cctx); 1453 New (0, cctx, 1, coro_cctx);
… …
1380 return cctx; 1459 return cctx;
1381} 1460}
1382 1461
1383/* create a new cctx only suitable as source */ 1462/* create a new cctx only suitable as source */
1384static coro_cctx * 1463static coro_cctx *
1385cctx_new_empty () 1464cctx_new_empty (void)
1386{ 1465{
1387 coro_cctx *cctx = cctx_new (); 1466 coro_cctx *cctx = cctx_new ();
1388 1467
1389 cctx->sptr = 0; 1468 cctx->sptr = 0;
1390 coro_create (&cctx->cctx, 0, 0, 0, 0); 1469 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1392 return cctx; 1471 return cctx;
1393} 1472}
1394 1473
1395/* create a new cctx suitable as destination/running a perl interpreter */ 1474/* create a new cctx suitable as destination/running a perl interpreter */
1396static coro_cctx * 1475static coro_cctx *
1397cctx_new_run () 1476cctx_new_run (void)
1398{ 1477{
1399 coro_cctx *cctx = cctx_new (); 1478 coro_cctx *cctx = cctx_new ();
1400 void *stack_start; 1479 void *stack_start;
1401 size_t stack_size; 1480 size_t stack_size;
1402 1481
1403#if HAVE_MMAP 1482#if HAVE_MMAP
1404 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1483 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1405 /* mmap supposedly does allocate-on-write for us */ 1484 /* 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); 1485 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1407 1486
1408 if (cctx->sptr != (void *)-1) 1487 if (cctx->sptr != (void *)-1)
1409 { 1488 {
1410 #if CORO_STACKGUARD 1489 #if CORO_STACKGUARD
1411 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1490 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1443cctx_destroy (coro_cctx *cctx) 1522cctx_destroy (coro_cctx *cctx)
1444{ 1523{
1445 if (!cctx) 1524 if (!cctx)
1446 return; 1525 return;
1447 1526
1448 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1527 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1449 1528
1450 --cctx_count; 1529 --cctx_count;
1451 coro_destroy (&cctx->cctx); 1530 coro_destroy (&cctx->cctx);
1452 1531
1453 /* coro_transfer creates new, empty cctx's */ 1532 /* coro_transfer creates new, empty cctx's */
… …
1472#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1551#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1473 1552
1474static coro_cctx * 1553static coro_cctx *
1475cctx_get (pTHX) 1554cctx_get (pTHX)
1476{ 1555{
1477 while (expect_true (cctx_first)) 1556 while (ecb_expect_true (cctx_first))
1478 { 1557 {
1479 coro_cctx *cctx = cctx_first; 1558 coro_cctx *cctx = cctx_first;
1480 cctx_first = cctx->next; 1559 cctx_first = cctx->next;
1481 --cctx_idle; 1560 --cctx_idle;
1482 1561
1483 if (expect_true (!CCTX_EXPIRED (cctx))) 1562 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1484 return cctx; 1563 return cctx;
1485 1564
1486 cctx_destroy (cctx); 1565 cctx_destroy (cctx);
1487 } 1566 }
1488 1567
… …
1493cctx_put (coro_cctx *cctx) 1572cctx_put (coro_cctx *cctx)
1494{ 1573{
1495 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1574 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1496 1575
1497 /* free another cctx if overlimit */ 1576 /* free another cctx if overlimit */
1498 if (expect_false (cctx_idle >= cctx_max_idle)) 1577 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1499 { 1578 {
1500 coro_cctx *first = cctx_first; 1579 coro_cctx *first = cctx_first;
1501 cctx_first = first->next; 1580 cctx_first = first->next;
1502 --cctx_idle; 1581 --cctx_idle;
1503 1582
… …
1514static void 1593static void
1515transfer_check (pTHX_ struct coro *prev, struct coro *next) 1594transfer_check (pTHX_ struct coro *prev, struct coro *next)
1516{ 1595{
1517 /* TODO: throwing up here is considered harmful */ 1596 /* TODO: throwing up here is considered harmful */
1518 1597
1519 if (expect_true (prev != next)) 1598 if (ecb_expect_true (prev != next))
1520 { 1599 {
1521 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1600 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,"); 1601 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1523 1602
1524 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1603 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,"); 1604 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1526 1605
1527#if !PERL_VERSION_ATLEAST (5,10,0) 1606#if !PERL_VERSION_ATLEAST (5,10,0)
1528 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1607 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,"); 1608 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1530#endif 1609#endif
1531 } 1610 }
1532} 1611}
1533 1612
1534/* always use the TRANSFER macro */ 1613/* always use the TRANSFER macro */
1535static void NOINLINE /* noinline so we have a fixed stackframe */ 1614static void ecb_noinline /* noinline so we have a fixed stackframe */
1536transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1615transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1537{ 1616{
1538 dSTACKLEVEL; 1617 dSTACKLEVEL;
1539 1618
1540 /* sometimes transfer is only called to set idle_sp */ 1619 /* sometimes transfer is only called to set idle_sp */
1541 if (expect_false (!prev)) 1620 if (ecb_expect_false (!prev))
1542 { 1621 {
1543 cctx_current->idle_sp = STACKLEVEL; 1622 cctx_current->idle_sp = STACKLEVEL;
1544 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1623 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1545 } 1624 }
1546 else if (expect_true (prev != next)) 1625 else if (ecb_expect_true (prev != next))
1547 { 1626 {
1548 coro_cctx *cctx_prev; 1627 coro_cctx *cctx_prev;
1549 1628
1550 if (expect_false (prev->flags & CF_NEW)) 1629 if (ecb_expect_false (prev->flags & CF_NEW))
1551 { 1630 {
1552 /* create a new empty/source context */ 1631 /* create a new empty/source context */
1553 prev->flags &= ~CF_NEW; 1632 prev->flags &= ~CF_NEW;
1554 prev->flags |= CF_RUNNING; 1633 prev->flags |= CF_RUNNING;
1555 } 1634 }
… …
1558 next->flags |= CF_RUNNING; 1637 next->flags |= CF_RUNNING;
1559 1638
1560 /* first get rid of the old state */ 1639 /* first get rid of the old state */
1561 save_perl (aTHX_ prev); 1640 save_perl (aTHX_ prev);
1562 1641
1563 if (expect_false (next->flags & CF_NEW)) 1642 if (ecb_expect_false (next->flags & CF_NEW))
1564 { 1643 {
1565 /* need to start coroutine */ 1644 /* need to start coroutine */
1566 next->flags &= ~CF_NEW; 1645 next->flags &= ~CF_NEW;
1567 /* setup coroutine call */ 1646 /* setup coroutine call */
1568 init_perl (aTHX_ next); 1647 init_perl (aTHX_ next);
1569 } 1648 }
1570 else 1649 else
1571 load_perl (aTHX_ next); 1650 load_perl (aTHX_ next);
1572 1651
1573 /* possibly untie and reuse the cctx */ 1652 /* possibly untie and reuse the cctx */
1574 if (expect_true ( 1653 if (ecb_expect_true (
1575 cctx_current->idle_sp == STACKLEVEL 1654 cctx_current->idle_sp == STACKLEVEL
1576 && !(cctx_current->flags & CC_TRACE) 1655 && !(cctx_current->flags & CC_TRACE)
1577 && !force_cctx 1656 && !force_cctx
1578 )) 1657 ))
1579 { 1658 {
1580 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1659 /* 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)); 1660 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1582 1661
1583 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1662 /* 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 */ 1663 /* without this the next cctx_get might destroy the running cctx while still in use */
1585 if (expect_false (CCTX_EXPIRED (cctx_current))) 1664 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1586 if (expect_true (!next->cctx)) 1665 if (ecb_expect_true (!next->cctx))
1587 next->cctx = cctx_get (aTHX); 1666 next->cctx = cctx_get (aTHX);
1588 1667
1589 cctx_put (cctx_current); 1668 cctx_put (cctx_current);
1590 } 1669 }
1591 else 1670 else
1592 prev->cctx = cctx_current; 1671 prev->cctx = cctx_current;
1593 1672
1594 ++next->usecount; 1673 ++next->usecount;
1595 1674
1596 cctx_prev = cctx_current; 1675 cctx_prev = cctx_current;
1597 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1676 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1598 1677
1599 next->cctx = 0; 1678 next->cctx = 0;
1600 1679
1601 if (expect_false (cctx_prev != cctx_current)) 1680 if (ecb_expect_false (cctx_prev != cctx_current))
1602 { 1681 {
1603 cctx_prev->top_env = PL_top_env; 1682 cctx_prev->top_env = PL_top_env;
1604 PL_top_env = cctx_current->top_env; 1683 PL_top_env = cctx_current->top_env;
1605 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1684 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1606 } 1685 }
… …
1612#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1691#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) 1692#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1614 1693
1615/** high level stuff ********************************************************/ 1694/** high level stuff ********************************************************/
1616 1695
1696/* this function is actually Coro, not Coro::State, but we call it from here */
1697/* because it is convenient - but it hasn't been declared yet for that reason */
1617static int 1698static void
1699coro_call_on_destroy (pTHX_ struct coro *coro);
1700
1701static void
1618coro_state_destroy (pTHX_ struct coro *coro) 1702coro_state_destroy (pTHX_ struct coro *coro)
1619{ 1703{
1620 if (coro->flags & CF_DESTROYED) 1704 if (coro->flags & CF_ZOMBIE)
1621 return 0; 1705 return;
1622 1706
1623 if (coro->on_destroy && !PL_dirty)
1624 coro->on_destroy (aTHX_ coro); 1707 slf_destroy (aTHX_ coro);
1625 1708
1626 coro->flags |= CF_DESTROYED; 1709 coro->flags |= CF_ZOMBIE;
1627 1710
1628 if (coro->flags & CF_READY) 1711 if (coro->flags & CF_READY)
1629 { 1712 {
1630 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1713 /* reduce nready, as destroying a ready coro effectively unreadies it */
1631 /* alternative: look through all ready queues and remove the coro */ 1714 /* alternative: look through all ready queues and remove the coro */
1632 --coro_nready; 1715 --coro_nready;
1633 } 1716 }
1634 else 1717 else
1635 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1718 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1719
1720 if (coro->next) coro->next->prev = coro->prev;
1721 if (coro->prev) coro->prev->next = coro->next;
1722 if (coro == coro_first) coro_first = coro->next;
1636 1723
1637 if (coro->mainstack 1724 if (coro->mainstack
1638 && coro->mainstack != main_mainstack 1725 && coro->mainstack != main_mainstack
1639 && coro->slot 1726 && coro->slot
1640 && !PL_dirty) 1727 && !PL_dirty)
1641 destroy_perl (aTHX_ coro); 1728 destroy_perl (aTHX_ coro);
1642 1729
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); 1730 cctx_destroy (coro->cctx);
1648 SvREFCNT_dec (coro->startcv); 1731 SvREFCNT_dec (coro->startcv);
1649 SvREFCNT_dec (coro->args); 1732 SvREFCNT_dec (coro->args);
1650 SvREFCNT_dec (coro->swap_sv); 1733 SvREFCNT_dec (coro->swap_sv);
1651 SvREFCNT_dec (CORO_THROW); 1734 SvREFCNT_dec (CORO_THROW);
1652 1735
1653 return 1; 1736 coro_call_on_destroy (aTHX_ coro);
1737
1738 /* more destruction mayhem in coro_state_free */
1654} 1739}
1655 1740
1656static int 1741static int
1657coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1742coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1658{ 1743{
1659 struct coro *coro = (struct coro *)mg->mg_ptr; 1744 struct coro *coro = (struct coro *)mg->mg_ptr;
1660 mg->mg_ptr = 0; 1745 mg->mg_ptr = 0;
1661 1746
1662 coro->hv = 0;
1663
1664 if (--coro->refcnt < 0)
1665 {
1666 coro_state_destroy (aTHX_ coro); 1747 coro_state_destroy (aTHX_ coro);
1748 SvREFCNT_dec (coro->on_destroy);
1749 SvREFCNT_dec (coro->status);
1750
1667 Safefree (coro); 1751 Safefree (coro);
1668 }
1669 1752
1670 return 0; 1753 return 0;
1671} 1754}
1672 1755
1673static int 1756static int ecb_cold
1674coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1757coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1675{ 1758{
1676 struct coro *coro = (struct coro *)mg->mg_ptr; 1759 /* called when perl clones the current process the slow way (windows process emulation) */
1677 1760 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1678 ++coro->refcnt; 1761 mg->mg_ptr = 0;
1762 mg->mg_virtual = 0;
1679 1763
1680 return 0; 1764 return 0;
1681} 1765}
1682 1766
1683static MGVTBL coro_state_vtbl = { 1767static MGVTBL coro_state_vtbl = {
… …
1708 TRANSFER (ta, 1); 1792 TRANSFER (ta, 1);
1709} 1793}
1710 1794
1711/** Coro ********************************************************************/ 1795/** Coro ********************************************************************/
1712 1796
1713INLINE void 1797ecb_inline void
1714coro_enq (pTHX_ struct coro *coro) 1798coro_enq (pTHX_ struct coro *coro)
1715{ 1799{
1716 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1800 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1717 1801
1718 SvREFCNT_inc_NN (coro->hv); 1802 SvREFCNT_inc_NN (coro->hv);
… …
1720 coro->next_ready = 0; 1804 coro->next_ready = 0;
1721 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1805 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1722 ready [1] = coro; 1806 ready [1] = coro;
1723} 1807}
1724 1808
1725INLINE struct coro * 1809ecb_inline struct coro *
1726coro_deq (pTHX) 1810coro_deq (pTHX)
1727{ 1811{
1728 int prio; 1812 int prio;
1729 1813
1730 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1814 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1783{ 1867{
1784 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1868 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1785} 1869}
1786 1870
1787/* expects to own a reference to next->hv */ 1871/* expects to own a reference to next->hv */
1788INLINE void 1872ecb_inline void
1789prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1873prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1790{ 1874{
1791 SV *prev_sv = SvRV (coro_current); 1875 SV *prev_sv = SvRV (coro_current);
1792 1876
1793 ta->prev = SvSTATE_hv (prev_sv); 1877 ta->prev = SvSTATE_hv (prev_sv);
… …
1806{ 1890{
1807 for (;;) 1891 for (;;)
1808 { 1892 {
1809 struct coro *next = coro_deq (aTHX); 1893 struct coro *next = coro_deq (aTHX);
1810 1894
1811 if (expect_true (next)) 1895 if (ecb_expect_true (next))
1812 { 1896 {
1813 /* cannot transfer to destroyed coros, skip and look for next */ 1897 /* cannot transfer to destroyed coros, skip and look for next */
1814 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1898 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 */ 1899 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1816 else 1900 else
1817 { 1901 {
1818 next->flags &= ~CF_READY; 1902 next->flags &= ~CF_READY;
1819 --coro_nready; 1903 --coro_nready;
… …
1852 } 1936 }
1853 } 1937 }
1854 } 1938 }
1855} 1939}
1856 1940
1857INLINE void 1941ecb_inline void
1858prepare_cede (pTHX_ struct coro_transfer_args *ta) 1942prepare_cede (pTHX_ struct coro_transfer_args *ta)
1859{ 1943{
1860 api_ready (aTHX_ coro_current); 1944 api_ready (aTHX_ coro_current);
1861 prepare_schedule (aTHX_ ta); 1945 prepare_schedule (aTHX_ ta);
1862} 1946}
1863 1947
1864INLINE void 1948ecb_inline void
1865prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1949prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1866{ 1950{
1867 SV *prev = SvRV (coro_current); 1951 SV *prev = SvRV (coro_current);
1868 1952
1869 if (coro_nready) 1953 if (coro_nready)
… …
1899{ 1983{
1900 struct coro_transfer_args ta; 1984 struct coro_transfer_args ta;
1901 1985
1902 prepare_cede (aTHX_ &ta); 1986 prepare_cede (aTHX_ &ta);
1903 1987
1904 if (expect_true (ta.prev != ta.next)) 1988 if (ecb_expect_true (ta.prev != ta.next))
1905 { 1989 {
1906 TRANSFER (ta, 1); 1990 TRANSFER (ta, 1);
1907 return 1; 1991 return 1;
1908 } 1992 }
1909 else 1993 else
… …
1952 coro->slot->runops = RUNOPS_DEFAULT; 2036 coro->slot->runops = RUNOPS_DEFAULT;
1953 } 2037 }
1954} 2038}
1955 2039
1956static void 2040static void
2041coro_push_av (pTHX_ AV *av, I32 gimme_v)
2042{
2043 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2044 {
2045 dSP;
2046
2047 if (gimme_v == G_SCALAR)
2048 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2049 else
2050 {
2051 int i;
2052 EXTEND (SP, AvFILLp (av) + 1);
2053
2054 for (i = 0; i <= AvFILLp (av); ++i)
2055 PUSHs (AvARRAY (av)[i]);
2056 }
2057
2058 PUTBACK;
2059 }
2060}
2061
2062static void
2063coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2064{
2065 if (!coro->on_destroy)
2066 coro->on_destroy = newAV ();
2067
2068 av_push (coro->on_destroy, cb);
2069}
2070
2071static void
2072slf_destroy_join (pTHX_ struct CoroSLF *frame)
2073{
2074 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2075}
2076
2077static int
2078slf_check_join (pTHX_ struct CoroSLF *frame)
2079{
2080 struct coro *coro = (struct coro *)frame->data;
2081
2082 if (!coro->status)
2083 return 1;
2084
2085 frame->destroy = 0;
2086
2087 coro_push_av (aTHX_ coro->status, GIMME_V);
2088
2089 SvREFCNT_dec ((SV *)coro->hv);
2090
2091 return 0;
2092}
2093
2094static void
2095slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2096{
2097 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2098
2099 if (items > 1)
2100 croak ("join called with too many arguments");
2101
2102 if (coro->status)
2103 frame->prepare = prepare_nop;
2104 else
2105 {
2106 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2107 frame->prepare = prepare_schedule;
2108 }
2109
2110 frame->check = slf_check_join;
2111 frame->destroy = slf_destroy_join;
2112 frame->data = (void *)coro;
2113 SvREFCNT_inc (coro->hv);
2114}
2115
2116static void
1957coro_call_on_destroy (pTHX_ struct coro *coro) 2117coro_call_on_destroy (pTHX_ struct coro *coro)
1958{ 2118{
1959 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2119 AV *od = coro->on_destroy;
1960 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1961 2120
1962 if (on_destroyp) 2121 if (!od)
1963 { 2122 return;
1964 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1965 2123
1966 while (AvFILLp (on_destroy) >= 0) 2124 while (AvFILLp (od) >= 0)
2125 {
2126 SV *cb = sv_2mortal (av_pop (od));
2127
2128 /* coro hv's (and only hv's at the moment) are supported as well */
2129 if (SvSTATEhv_p (aTHX_ cb))
2130 api_ready (aTHX_ cb);
2131 else
1967 { 2132 {
1968 dSP; /* don't disturb outer sp */ 2133 dSP; /* don't disturb outer sp */
1969 SV *cb = av_pop (on_destroy);
1970
1971 PUSHMARK (SP); 2134 PUSHMARK (SP);
1972 2135
1973 if (statusp) 2136 if (coro->status)
1974 { 2137 {
1975 int i; 2138 PUTBACK;
1976 AV *status = (AV *)SvRV (*statusp); 2139 coro_push_av (aTHX_ coro->status, G_ARRAY);
1977 EXTEND (SP, AvFILLp (status) + 1); 2140 SPAGAIN;
1978
1979 for (i = 0; i <= AvFILLp (status); ++i)
1980 PUSHs (AvARRAY (status)[i]);
1981 } 2141 }
1982 2142
1983 PUTBACK; 2143 PUTBACK;
1984 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2144 call_sv (cb, G_VOID | G_DISCARD);
1985 } 2145 }
1986 } 2146 }
1987} 2147}
1988 2148
1989static void 2149static void
1990slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2150coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1991{ 2151{
1992 int i; 2152 AV *av;
1993 HV *hv = (HV *)SvRV (coro_current); 2153
1994 AV *av = newAV (); 2154 if (coro->status)
2155 {
2156 av = coro->status;
2157 av_clear (av);
2158 }
2159 else
2160 av = coro->status = newAV ();
1995 2161
1996 /* items are actually not so common, so optimise for this case */ 2162 /* items are actually not so common, so optimise for this case */
1997 if (items) 2163 if (items)
1998 { 2164 {
2165 int i;
2166
1999 av_extend (av, items - 1); 2167 av_extend (av, items - 1);
2000 2168
2001 for (i = 0; i < items; ++i) 2169 for (i = 0; i < items; ++i)
2002 av_push (av, SvREFCNT_inc_NN (arg [i])); 2170 av_push (av, SvREFCNT_inc_NN (arg [i]));
2003 } 2171 }
2172}
2004 2173
2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2174static void
2006 2175slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2176{
2007 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2177 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2008 api_ready (aTHX_ sv_manager); 2178 api_ready (aTHX_ sv_manager);
2009 2179
2010 frame->prepare = prepare_schedule; 2180 frame->prepare = prepare_schedule;
2011 frame->check = slf_check_repeat; 2181 frame->check = slf_check_repeat;
2012 2182
2013 /* as a minor optimisation, we could unwind all stacks here */ 2183 /* as a minor optimisation, we could unwind all stacks here */
2014 /* but that puts extra pressure on pp_slf, and is not worth much */ 2184 /* but that puts extra pressure on pp_slf, and is not worth much */
2015 /*coro_unwind_stacks (aTHX);*/ 2185 /*coro_unwind_stacks (aTHX);*/
2186}
2187
2188static void
2189slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2190{
2191 HV *coro_hv = (HV *)SvRV (coro_current);
2192
2193 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2194 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2195}
2196
2197static void
2198slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2199{
2200 HV *coro_hv;
2201 struct coro *coro;
2202
2203 if (items <= 0)
2204 croak ("Coro::cancel called without coro object,");
2205
2206 coro = SvSTATE (arg [0]);
2207 coro_hv = coro->hv;
2208
2209 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2210
2211 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2212 {
2213 /* coro currently busy cancelling something, so just notify it */
2214 coro->slf_frame.data = (void *)coro;
2215
2216 frame->prepare = prepare_nop;
2217 frame->check = slf_check_nop;
2218 }
2219 else if (coro_hv == (HV *)SvRV (coro_current))
2220 {
2221 /* cancelling the current coro is allowed, and equals terminate */
2222 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2223 }
2224 else
2225 {
2226 struct coro *self = SvSTATE_current;
2227
2228 /* otherwise we cancel directly, purely for speed reasons
2229 * unfortunately, this requires some magic trickery, as
2230 * somebody else could cancel us, so we have to fight the cancellation.
2231 * this is ugly, and hopefully fully worth the extra speed.
2232 * besides, I can't get the slow-but-safe version working...
2233 */
2234 slf_frame.data = 0;
2235 self->flags |= CF_NOCANCEL;
2236 coro_state_destroy (aTHX_ coro);
2237 self->flags &= ~CF_NOCANCEL;
2238
2239 if (slf_frame.data)
2240 {
2241 /* while we were busy we have been cancelled, so terminate */
2242 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2243 }
2244 else
2245 {
2246 frame->prepare = prepare_nop;
2247 frame->check = slf_check_nop;
2248 }
2249 }
2250}
2251
2252static int
2253slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2254{
2255 frame->prepare = 0;
2256 coro_unwind_stacks (aTHX);
2257
2258 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2259
2260 return 1;
2261}
2262
2263static int
2264safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2265{
2266 if (coro->cctx)
2267 croak ("coro inside C callback, unable to cancel at this time, caught");
2268
2269 if (coro->flags & CF_NEW)
2270 {
2271 coro_set_status (aTHX_ coro, arg, items);
2272 coro_state_destroy (aTHX_ coro);
2273 }
2274 else
2275 {
2276 if (!coro->slf_frame.prepare)
2277 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2278
2279 slf_destroy (aTHX_ coro);
2280
2281 coro_set_status (aTHX_ coro, arg, items);
2282 coro->slf_frame.prepare = prepare_nop;
2283 coro->slf_frame.check = slf_check_safe_cancel;
2284
2285 api_ready (aTHX_ (SV *)coro->hv);
2286 }
2287
2288 return 1;
2016} 2289}
2017 2290
2018/*****************************************************************************/ 2291/*****************************************************************************/
2019/* async pool handler */ 2292/* async pool handler */
2020 2293
… …
2051slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2324slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2052{ 2325{
2053 HV *hv = (HV *)SvRV (coro_current); 2326 HV *hv = (HV *)SvRV (coro_current);
2054 struct coro *coro = SvSTATE_hv ((SV *)hv); 2327 struct coro *coro = SvSTATE_hv ((SV *)hv);
2055 2328
2056 if (expect_true (coro->saved_deffh)) 2329 if (ecb_expect_true (coro->saved_deffh))
2057 { 2330 {
2058 /* subsequent iteration */ 2331 /* subsequent iteration */
2059 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2332 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2060 coro->saved_deffh = 0; 2333 coro->saved_deffh = 0;
2061 2334
2062 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2335 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2063 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2336 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2064 { 2337 {
2065 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2338 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2066 coro->invoke_av = newAV (); 2339 return;
2067
2068 frame->prepare = prepare_nop;
2069 } 2340 }
2070 else 2341 else
2071 { 2342 {
2072 av_clear (GvAV (PL_defgv)); 2343 av_clear (GvAV (PL_defgv));
2073 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2344 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2296static void 2567static void
2297slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2568slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2298{ 2569{
2299 frame->prepare = prepare_cede_notself; 2570 frame->prepare = prepare_cede_notself;
2300 frame->check = slf_check_nop; 2571 frame->check = slf_check_nop;
2572}
2573
2574/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2575static void
2576slf_destroy (pTHX_ struct coro *coro)
2577{
2578 /* this callback is reserved for slf functions needing to do cleanup */
2579 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2580 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2581
2582 /*
2583 * The on_destroy above most likely is from an SLF call.
2584 * Since by definition the SLF call will not finish when we destroy
2585 * the coro, we will have to force-finish it here, otherwise
2586 * cleanup functions cannot call SLF functions.
2587 */
2588 coro->slf_frame.prepare = 0;
2301} 2589}
2302 2590
2303/* 2591/*
2304 * these not obviously related functions are all rolled into one 2592 * these not obviously related functions are all rolled into one
2305 * function to increase chances that they all will call transfer with the same 2593 * 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 */ 2600 I32 checkmark; /* mark SP to see how many elements check has pushed */
2313 2601
2314 /* set up the slf frame, unless it has already been set-up */ 2602 /* set up the slf frame, unless it has already been set-up */
2315 /* the latter happens when a new coro has been started */ 2603 /* the latter happens when a new coro has been started */
2316 /* or when a new cctx was attached to an existing coroutine */ 2604 /* or when a new cctx was attached to an existing coroutine */
2317 if (expect_true (!slf_frame.prepare)) 2605 if (ecb_expect_true (!slf_frame.prepare))
2318 { 2606 {
2319 /* first iteration */ 2607 /* first iteration */
2320 dSP; 2608 dSP;
2321 SV **arg = PL_stack_base + TOPMARK + 1; 2609 SV **arg = PL_stack_base + TOPMARK + 1;
2322 int items = SP - arg; /* args without function object */ 2610 int items = SP - arg; /* args without function object */
… …
2363 while (slf_frame.check (aTHX_ &slf_frame)); 2651 while (slf_frame.check (aTHX_ &slf_frame));
2364 2652
2365 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2653 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2366 2654
2367 /* exception handling */ 2655 /* exception handling */
2368 if (expect_false (CORO_THROW)) 2656 if (ecb_expect_false (CORO_THROW))
2369 { 2657 {
2370 SV *exception = sv_2mortal (CORO_THROW); 2658 SV *exception = sv_2mortal (CORO_THROW);
2371 2659
2372 CORO_THROW = 0; 2660 CORO_THROW = 0;
2373 sv_setsv (ERRSV, exception); 2661 sv_setsv (ERRSV, exception);
2374 croak (0); 2662 croak (0);
2375 } 2663 }
2376 2664
2377 /* return value handling - mostly like entersub */ 2665 /* return value handling - mostly like entersub */
2378 /* make sure we put something on the stack in scalar context */ 2666 /* make sure we put something on the stack in scalar context */
2379 if (GIMME_V == G_SCALAR) 2667 if (GIMME_V == G_SCALAR
2668 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2380 { 2669 {
2381 dSP; 2670 dSP;
2382 SV **bot = PL_stack_base + checkmark; 2671 SV **bot = PL_stack_base + checkmark;
2383 2672
2384 if (sp == bot) /* too few, push undef */ 2673 if (sp == bot) /* too few, push undef */
2385 bot [1] = &PL_sv_undef; 2674 bot [1] = &PL_sv_undef;
2386 else if (sp != bot + 1) /* too many, take last one */ 2675 else /* too many, take last one */
2387 bot [1] = *sp; 2676 bot [1] = *sp;
2388 2677
2389 SP = bot + 1; 2678 SP = bot + 1;
2390 2679
2391 PUTBACK; 2680 PUTBACK;
… …
2498{ 2787{
2499 PerlIOBuf base; 2788 PerlIOBuf base;
2500 NV next, every; 2789 NV next, every;
2501} PerlIOCede; 2790} PerlIOCede;
2502 2791
2503static IV 2792static IV ecb_cold
2504PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2793PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2505{ 2794{
2506 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2795 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2507 2796
2508 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2797 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2509 self->next = nvtime () + self->every; 2798 self->next = nvtime () + self->every;
2510 2799
2511 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2800 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2512} 2801}
2513 2802
2514static SV * 2803static SV * ecb_cold
2515PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2804PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2516{ 2805{
2517 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2806 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2518 2807
2519 return newSVnv (self->every); 2808 return newSVnv (self->every);
… …
2631 SvREFCNT_dec (cb); 2920 SvREFCNT_dec (cb);
2632 } 2921 }
2633} 2922}
2634 2923
2635static void 2924static void
2636coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2925coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2637{ 2926{
2638 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2927 /* call $sem->adjust (0) to possibly wake up some other waiters */
2639 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2928 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2640} 2929}
2641 2930
2642static int 2931static int
2643slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2932slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2644{ 2933{
2645 AV *av = (AV *)frame->data; 2934 AV *av = (AV *)frame->data;
2646 SV *count_sv = AvARRAY (av)[0]; 2935 SV *count_sv = AvARRAY (av)[0];
2936 SV *coro_hv = SvRV (coro_current);
2647 2937
2648 /* if we are about to throw, don't actually acquire the lock, just throw */ 2938 /* if we are about to throw, don't actually acquire the lock, just throw */
2649 if (CORO_THROW) 2939 if (CORO_THROW)
2650 return 0; 2940 return 0;
2651 else if (SvIVX (count_sv) > 0) 2941 else if (SvIVX (count_sv) > 0)
2652 { 2942 {
2653 SvSTATE_current->on_destroy = 0; 2943 frame->destroy = 0;
2654 2944
2655 if (acquire) 2945 if (acquire)
2656 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2946 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2657 else 2947 else
2658 coro_semaphore_adjust (aTHX_ av, 0); 2948 coro_semaphore_adjust (aTHX_ av, 0);
… …
2663 { 2953 {
2664 int i; 2954 int i;
2665 /* if we were woken up but can't down, we look through the whole */ 2955 /* 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 */ 2956 /* waiters list and only add us if we aren't in there already */
2667 /* this avoids some degenerate memory usage cases */ 2957 /* this avoids some degenerate memory usage cases */
2668 2958 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)) 2959 if (AvARRAY (av)[i] == coro_hv)
2671 return 1; 2960 return 1;
2672 2961
2673 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2962 av_push (av, SvREFCNT_inc (coro_hv));
2674 return 1; 2963 return 1;
2675 } 2964 }
2676} 2965}
2677 2966
2678static int 2967static int
… …
2701 { 2990 {
2702 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2991 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2703 2992
2704 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2993 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2705 frame->prepare = prepare_schedule; 2994 frame->prepare = prepare_schedule;
2706
2707 /* to avoid race conditions when a woken-up coro gets terminated */ 2995 /* to avoid race conditions when a woken-up coro gets terminated */
2708 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2996 /* we arrange for a temporary on_destroy that calls adjust (0) */
2709 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2997 frame->destroy = coro_semaphore_destroy;
2710 } 2998 }
2711} 2999}
2712 3000
2713static void 3001static void
2714slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3002slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2932 dSP; 3220 dSP;
2933 3221
2934 static SV *prio_cv; 3222 static SV *prio_cv;
2935 static SV *prio_sv; 3223 static SV *prio_sv;
2936 3224
2937 if (expect_false (!prio_cv)) 3225 if (ecb_expect_false (!prio_cv))
2938 { 3226 {
2939 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3227 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2940 prio_sv = newSViv (0); 3228 prio_sv = newSViv (0);
2941 } 3229 }
2942 3230
… …
3048 } 3336 }
3049 3337
3050 return coro_sv; 3338 return coro_sv;
3051} 3339}
3052 3340
3341#ifndef __cplusplus
3342ecb_cold XS(boot_Coro__State);
3343#endif
3344
3345#if CORO_JIT
3346
3347static void ecb_noinline ecb_cold
3348pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3349{
3350 dSP;
3351 AV *av = newAV ();
3352
3353 av_store (av, 3, newSVuv (d));
3354 av_store (av, 2, newSVuv (c));
3355 av_store (av, 1, newSVuv (b));
3356 av_store (av, 0, newSVuv (a));
3357
3358 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3359
3360 PUTBACK;
3361}
3362
3363static void ecb_noinline ecb_cold
3364jit_init (pTHX)
3365{
3366 dSP;
3367 SV *load, *save;
3368 char *map_base;
3369 char *load_ptr, *save_ptr;
3370 STRLEN load_len, save_len, map_len;
3371 int count;
3372
3373 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3374
3375 PUSHMARK (SP);
3376#define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3377# include "state.h"
3378#undef VARx
3379 count = call_pv ("Coro::State::_jit", G_ARRAY);
3380 SPAGAIN;
3381
3382 save = POPs; save_ptr = SvPVbyte (save, save_len);
3383 load = POPs; load_ptr = SvPVbyte (load, load_len);
3384
3385 map_len = load_len + save_len + 16;
3386
3387 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3388
3389 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3390
3391 load_perl_slots = (load_save_perl_slots_type)map_base;
3392 memcpy (map_base, load_ptr, load_len);
3393
3394 map_base += (load_len + 15) & ~15;
3395
3396 save_perl_slots = (load_save_perl_slots_type)map_base;
3397 memcpy (map_base, save_ptr, save_len);
3398
3399 /* we are good citizens and try to make the page read-only, so the evil evil */
3400 /* hackers might have it a bit more difficult */
3401 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3402
3403 PUTBACK;
3404 eval_pv ("undef &Coro::State::_jit", 1);
3405}
3406
3407#endif
3408
3053MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3409MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3054 3410
3055PROTOTYPES: DISABLE 3411PROTOTYPES: DISABLE
3056 3412
3057BOOT: 3413BOOT:
… …
3061 coro_thx = PERL_GET_CONTEXT; 3417 coro_thx = PERL_GET_CONTEXT;
3062# endif 3418# endif
3063#endif 3419#endif
3064 BOOT_PAGESIZE; 3420 BOOT_PAGESIZE;
3065 3421
3422 /* perl defines these to check for existance first, but why it doesn't */
3423 /* just create them one at init time is not clear to me, except for */
3424 /* programs trying to delete them, but... */
3425 /* anyway, we declare this as invalid and make sure they are initialised here */
3426 DEFSV;
3427 ERRSV;
3428
3066 cctx_current = cctx_new_empty (); 3429 cctx_current = cctx_new_empty ();
3067 3430
3068 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3431 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3069 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3432 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3070 3433
… …
3109 coroapi.prepare_nop = prepare_nop; 3472 coroapi.prepare_nop = prepare_nop;
3110 coroapi.prepare_schedule = prepare_schedule; 3473 coroapi.prepare_schedule = prepare_schedule;
3111 coroapi.prepare_cede = prepare_cede; 3474 coroapi.prepare_cede = prepare_cede;
3112 coroapi.prepare_cede_notself = prepare_cede_notself; 3475 coroapi.prepare_cede_notself = prepare_cede_notself;
3113 3476
3114 { 3477 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 3478
3126 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3479 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3480#if CORO_JIT
3481 PUTBACK;
3482 jit_init (aTHX);
3483 SPAGAIN;
3484#endif
3127} 3485}
3128 3486
3129SV * 3487SV *
3130new (SV *klass, ...) 3488new (SV *klass, ...)
3131 ALIAS: 3489 ALIAS:
… …
3138void 3496void
3139transfer (...) 3497transfer (...)
3140 PROTOTYPE: $$ 3498 PROTOTYPE: $$
3141 CODE: 3499 CODE:
3142 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3500 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 3501
3151void 3502void
3152_exit (int code) 3503_exit (int code)
3153 PROTOTYPE: $ 3504 PROTOTYPE: $
3154 CODE: 3505 CODE:
… …
3230 CODE: 3581 CODE:
3231{ 3582{
3232 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3583 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3233 { 3584 {
3234 struct coro *current = SvSTATE_current; 3585 struct coro *current = SvSTATE_current;
3586 struct CoroSLF slf_save;
3235 3587
3236 if (current != coro) 3588 if (current != coro)
3237 { 3589 {
3238 PUTBACK; 3590 PUTBACK;
3239 save_perl (aTHX_ current); 3591 save_perl (aTHX_ current);
3240 load_perl (aTHX_ coro); 3592 load_perl (aTHX_ coro);
3593 /* the coro is most likely in an active SLF call.
3594 * while not strictly required (the code we execute is
3595 * not allowed to call any SLF functions), it's cleaner
3596 * to reinitialise the slf_frame and restore it later.
3597 * This might one day allow us to actually do SLF calls
3598 * from code executed here.
3599 */
3600 slf_save = slf_frame;
3601 slf_frame.prepare = 0;
3241 SPAGAIN; 3602 SPAGAIN;
3242 } 3603 }
3243 3604
3244 PUSHSTACK; 3605 PUSHSTACK;
3245 3606
… …
3255 SPAGAIN; 3616 SPAGAIN;
3256 3617
3257 if (current != coro) 3618 if (current != coro)
3258 { 3619 {
3259 PUTBACK; 3620 PUTBACK;
3621 slf_frame = slf_save;
3260 save_perl (aTHX_ coro); 3622 save_perl (aTHX_ coro);
3261 load_perl (aTHX_ current); 3623 load_perl (aTHX_ current);
3262 SPAGAIN; 3624 SPAGAIN;
3263 } 3625 }
3264 } 3626 }
… …
3269 PROTOTYPE: $ 3631 PROTOTYPE: $
3270 ALIAS: 3632 ALIAS:
3271 is_ready = CF_READY 3633 is_ready = CF_READY
3272 is_running = CF_RUNNING 3634 is_running = CF_RUNNING
3273 is_new = CF_NEW 3635 is_new = CF_NEW
3274 is_destroyed = CF_DESTROYED 3636 is_destroyed = CF_ZOMBIE
3637 is_zombie = CF_ZOMBIE
3275 is_suspended = CF_SUSPENDED 3638 is_suspended = CF_SUSPENDED
3276 CODE: 3639 CODE:
3277 RETVAL = boolSV (coro->flags & ix); 3640 RETVAL = boolSV (coro->flags & ix);
3278 OUTPUT: 3641 OUTPUT:
3279 RETVAL 3642 RETVAL
… …
3350 3713
3351void 3714void
3352cancel (Coro::State self) 3715cancel (Coro::State self)
3353 CODE: 3716 CODE:
3354 coro_state_destroy (aTHX_ self); 3717 coro_state_destroy (aTHX_ self);
3355 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3356
3357 3718
3358SV * 3719SV *
3359enable_times (int enabled = enable_times) 3720enable_times (int enabled = enable_times)
3360 CODE: 3721 CODE:
3361{ 3722{
… …
3376times (Coro::State self) 3737times (Coro::State self)
3377 PPCODE: 3738 PPCODE:
3378{ 3739{
3379 struct coro *current = SvSTATE (coro_current); 3740 struct coro *current = SvSTATE (coro_current);
3380 3741
3381 if (expect_false (current == self)) 3742 if (ecb_expect_false (current == self))
3382 { 3743 {
3383 coro_times_update (); 3744 coro_times_update ();
3384 coro_times_add (SvSTATE (coro_current)); 3745 coro_times_add (SvSTATE (coro_current));
3385 } 3746 }
3386 3747
3387 EXTEND (SP, 2); 3748 EXTEND (SP, 2);
3388 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3749 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))); 3750 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3390 3751
3391 if (expect_false (current == self)) 3752 if (ecb_expect_false (current == self))
3392 coro_times_sub (SvSTATE (coro_current)); 3753 coro_times_sub (SvSTATE (coro_current));
3393} 3754}
3394 3755
3395void 3756void
3396swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3757swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3417BOOT: 3778BOOT:
3418{ 3779{
3419 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3780 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3420 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3781 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3421 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3782 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); 3783 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); 3784 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3425 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3785 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3426 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3786 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3427 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3787 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
… …
3466 api_ready (aTHX_ RETVAL); 3826 api_ready (aTHX_ RETVAL);
3467 OUTPUT: 3827 OUTPUT:
3468 RETVAL 3828 RETVAL
3469 3829
3470void 3830void
3831_destroy (Coro::State coro)
3832 CODE:
3833 /* used by the manager thread */
3834 coro_state_destroy (aTHX_ coro);
3835
3836void
3837on_destroy (Coro::State coro, SV *cb)
3838 CODE:
3839 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3840
3841void
3842join (...)
3843 CODE:
3844 CORO_EXECUTE_SLF_XS (slf_init_join);
3845
3846void
3471terminate (...) 3847terminate (...)
3472 CODE: 3848 CODE:
3473 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3849 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3850
3851void
3852cancel (...)
3853 CODE:
3854 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3855
3856int
3857safe_cancel (Coro::State self, ...)
3858 C_ARGS: aTHX_ self, &ST (1), items - 1
3474 3859
3475void 3860void
3476schedule (...) 3861schedule (...)
3477 CODE: 3862 CODE:
3478 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3863 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3754} 4139}
3755 4140
3756MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4141MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3757 4142
3758void 4143void
3759_may_delete (SV *sem, int count, int extra_refs) 4144_may_delete (SV *sem, int count, unsigned int extra_refs)
3760 PPCODE: 4145 PPCODE:
3761{ 4146{
3762 AV *av = (AV *)SvRV (sem); 4147 AV *av = (AV *)SvRV (sem);
3763 4148
3764 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4149 if (SvREFCNT ((SV *)av) == 1 + extra_refs

Diff Legend

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