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.378 by root, Sat Dec 12 01:30:26 2009 UTC vs.
Revision 1.408 by root, Sat Jun 11 16:58:40 2011 UTC

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

Diff Legend

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