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.385 by root, Sat Feb 19 05:42:46 2011 UTC vs.
Revision 1.406 by root, Sat Jun 11 13:49:00 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
… …
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 #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 #else
301 #undef CORO_JIT
302 #endif
303 #endif
304#endif
305
306#if CORO_JIT
307static load_save_perl_slots_type load_perl_slots, save_perl_slots;
308#endif
298 309
299/** Coro::Select ************************************************************/ 310/** Coro::Select ************************************************************/
300 311
301static OP *(*coro_old_pp_sselect) (pTHX); 312static OP *(*coro_old_pp_sselect) (pTHX);
302static SV *coro_select_select; 313static SV *coro_select_select;
… …
314 PL_op->op_flags |= OPf_STACKED; 325 PL_op->op_flags |= OPf_STACKED;
315 PL_op->op_private = 0; 326 PL_op->op_private = 0;
316 return PL_ppaddr [OP_ENTERSUB](aTHX); 327 return PL_ppaddr [OP_ENTERSUB](aTHX);
317} 328}
318 329
330/** time stuff **************************************************************/
331
332#ifdef HAS_GETTIMEOFDAY
333
334ECB_INLINE void
335coro_u2time (pTHX_ UV ret[2])
336{
337 struct timeval tv;
338 gettimeofday (&tv, 0);
339
340 ret [0] = tv.tv_sec;
341 ret [1] = tv.tv_usec;
342}
343
344ECB_INLINE double
345coro_nvtime ()
346{
347 struct timeval tv;
348 gettimeofday (&tv, 0);
349
350 return tv.tv_sec + tv.tv_usec * 1e-6;
351}
352
353ECB_INLINE void
354time_init (pTHX)
355{
356 nvtime = coro_nvtime;
357 u2time = coro_u2time;
358}
359
360#else
361
362ECB_INLINE void
363time_init (pTHX)
364{
365 SV **svp;
366
367 require_pv ("Time/HiRes.pm");
368
369 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
370
371 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
372 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
373
374 nvtime = INT2PTR (double (*)(), SvIV (*svp));
375
376 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
377 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
378}
379
380#endif
381
319/** lowlevel stuff **********************************************************/ 382/** lowlevel stuff **********************************************************/
320 383
321static SV * 384static SV * ecb_noinline
322coro_get_sv (pTHX_ const char *name, int create) 385coro_get_sv (pTHX_ const char *name, int create)
323{ 386{
324#if PERL_VERSION_ATLEAST (5,10,0) 387#if PERL_VERSION_ATLEAST (5,10,0)
325 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 388 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
326 get_sv (name, create); 389 get_sv (name, create);
327#endif 390#endif
328 return get_sv (name, create); 391 return get_sv (name, create);
329} 392}
330 393
331static AV * 394static AV * ecb_noinline
332coro_get_av (pTHX_ const char *name, int create) 395coro_get_av (pTHX_ const char *name, int create)
333{ 396{
334#if PERL_VERSION_ATLEAST (5,10,0) 397#if PERL_VERSION_ATLEAST (5,10,0)
335 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 398 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
336 get_av (name, create); 399 get_av (name, create);
337#endif 400#endif
338 return get_av (name, create); 401 return get_av (name, create);
339} 402}
340 403
341static HV * 404static HV * ecb_noinline
342coro_get_hv (pTHX_ const char *name, int create) 405coro_get_hv (pTHX_ const char *name, int create)
343{ 406{
344#if PERL_VERSION_ATLEAST (5,10,0) 407#if PERL_VERSION_ATLEAST (5,10,0)
345 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 408 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
346 get_hv (name, create); 409 get_hv (name, create);
347#endif 410#endif
348 return get_hv (name, create); 411 return get_hv (name, create);
349} 412}
350 413
351INLINE void 414ECB_INLINE void
352coro_times_update () 415coro_times_update ()
353{ 416{
354#ifdef coro_clock_gettime 417#ifdef coro_clock_gettime
355 struct timespec ts; 418 struct timespec ts;
356 419
… …
369 time_real [0] = tv [0]; 432 time_real [0] = tv [0];
370 time_real [1] = tv [1] * 1000; 433 time_real [1] = tv [1] * 1000;
371#endif 434#endif
372} 435}
373 436
374INLINE void 437ECB_INLINE void
375coro_times_add (struct coro *c) 438coro_times_add (struct coro *c)
376{ 439{
377 c->t_real [1] += time_real [1]; 440 c->t_real [1] += time_real [1];
378 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 441 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
379 c->t_real [0] += time_real [0]; 442 c->t_real [0] += time_real [0];
… …
381 c->t_cpu [1] += time_cpu [1]; 444 c->t_cpu [1] += time_cpu [1];
382 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 445 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
383 c->t_cpu [0] += time_cpu [0]; 446 c->t_cpu [0] += time_cpu [0];
384} 447}
385 448
386INLINE void 449ECB_INLINE void
387coro_times_sub (struct coro *c) 450coro_times_sub (struct coro *c)
388{ 451{
389 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 452 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]; 453 c->t_real [1] -= time_real [1];
391 c->t_real [0] -= time_real [0]; 454 c->t_real [0] -= time_real [0];
… …
399/* magic glue */ 462/* magic glue */
400 463
401#define CORO_MAGIC_type_cv 26 464#define CORO_MAGIC_type_cv 26
402#define CORO_MAGIC_type_state PERL_MAGIC_ext 465#define CORO_MAGIC_type_state PERL_MAGIC_ext
403 466
404#define CORO_MAGIC_NN(sv, type) \ 467#define CORO_MAGIC_NN(sv, type) \
405 (expect_true (SvMAGIC (sv)->mg_type == type) \ 468 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
406 ? SvMAGIC (sv) \ 469 ? SvMAGIC (sv) \
407 : mg_find (sv, type)) 470 : mg_find (sv, type))
408 471
409#define CORO_MAGIC(sv, type) \ 472#define CORO_MAGIC(sv, type) \
410 (expect_true (SvMAGIC (sv)) \ 473 (ecb_expect_true (SvMAGIC (sv)) \
411 ? CORO_MAGIC_NN (sv, type) \ 474 ? CORO_MAGIC_NN (sv, type) \
412 : 0) 475 : 0)
413 476
414#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 477#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) 478#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
416 479
480ECB_INLINE MAGIC *
481SvSTATEhv_p (pTHX_ SV *coro)
482{
483 MAGIC *mg;
484
485 if (ecb_expect_true (
486 SvTYPE (coro) == SVt_PVHV
487 && (mg = CORO_MAGIC_state (coro))
488 && mg->mg_virtual == &coro_state_vtbl
489 ))
490 return mg;
491
492 return 0;
493}
494
417INLINE struct coro * 495ECB_INLINE struct coro *
418SvSTATE_ (pTHX_ SV *coro) 496SvSTATE_ (pTHX_ SV *coro)
419{ 497{
420 HV *stash;
421 MAGIC *mg; 498 MAGIC *mg;
422 499
423 if (SvROK (coro)) 500 if (SvROK (coro))
424 coro = SvRV (coro); 501 coro = SvRV (coro);
425 502
426 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 503 mg = SvSTATEhv_p (aTHX_ coro);
504 if (!mg)
427 croak ("Coro::State object required"); 505 croak ("Coro::State object required");
428 506
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; 507 return (struct coro *)mg->mg_ptr;
439} 508}
440 509
441#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 510#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
442 511
… …
445#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 514#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
446 515
447/*****************************************************************************/ 516/*****************************************************************************/
448/* padlist management and caching */ 517/* padlist management and caching */
449 518
450static AV * 519ECB_INLINE AV *
451coro_derive_padlist (pTHX_ CV *cv) 520coro_derive_padlist (pTHX_ CV *cv)
452{ 521{
453 AV *padlist = CvPADLIST (cv); 522 AV *padlist = CvPADLIST (cv);
454 AV *newpadlist, *newpad; 523 AV *newpadlist, *newpad;
455 524
… …
467 av_store (newpadlist, 1, (SV *)newpad); 536 av_store (newpadlist, 1, (SV *)newpad);
468 537
469 return newpadlist; 538 return newpadlist;
470} 539}
471 540
472static void 541ECB_INLINE void
473free_padlist (pTHX_ AV *padlist) 542free_padlist (pTHX_ AV *padlist)
474{ 543{
475 /* may be during global destruction */ 544 /* may be during global destruction */
476 if (!IN_DESTRUCT) 545 if (!IN_DESTRUCT)
477 { 546 {
… …
520 0, 0, 0, 0, 589 0, 0, 0, 0,
521 coro_cv_free 590 coro_cv_free
522}; 591};
523 592
524/* the next two functions merely cache the padlists */ 593/* the next two functions merely cache the padlists */
525static void 594ECB_INLINE void
526get_padlist (pTHX_ CV *cv) 595get_padlist (pTHX_ CV *cv)
527{ 596{
528 MAGIC *mg = CORO_MAGIC_cv (cv); 597 MAGIC *mg = CORO_MAGIC_cv (cv);
529 AV *av; 598 AV *av;
530 599
531 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 600 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
532 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 601 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
533 else 602 else
534 { 603 {
535#if CORO_PREFER_PERL_FUNCTIONS 604#if CORO_PREFER_PERL_FUNCTIONS
536 /* this is probably cleaner? but also slower! */ 605 /* this is probably cleaner? but also slower! */
… …
543 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 612 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
544#endif 613#endif
545 } 614 }
546} 615}
547 616
548static void 617ECB_INLINE void
549put_padlist (pTHX_ CV *cv) 618put_padlist (pTHX_ CV *cv)
550{ 619{
551 MAGIC *mg = CORO_MAGIC_cv (cv); 620 MAGIC *mg = CORO_MAGIC_cv (cv);
552 AV *av; 621 AV *av;
553 622
554 if (expect_false (!mg)) 623 if (ecb_expect_false (!mg))
555 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 624 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
556 625
557 av = (AV *)mg->mg_obj; 626 av = (AV *)mg->mg_obj;
558 627
559 if (expect_false (AvFILLp (av) >= AvMAX (av))) 628 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
560 av_extend (av, AvFILLp (av) + 1); 629 av_extend (av, AvFILLp (av) + 1);
561 630
562 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 631 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
563} 632}
564 633
… …
609 } 678 }
610#endif 679#endif
611 } 680 }
612} 681}
613 682
614#define SWAP_SVS(coro) \ 683#define SWAP_SVS(coro) \
615 if (expect_false ((coro)->swap_sv)) \ 684 if (ecb_expect_false ((coro)->swap_sv)) \
616 swap_svs (aTHX_ (coro)) 685 swap_svs (aTHX_ (coro))
617 686
618static void 687static void
619on_enterleave_call (pTHX_ SV *cb); 688on_enterleave_call (pTHX_ SV *cb);
620 689
… …
624 perl_slots *slot = c->slot; 693 perl_slots *slot = c->slot;
625 c->slot = 0; 694 c->slot = 0;
626 695
627 PL_mainstack = c->mainstack; 696 PL_mainstack = c->mainstack;
628 697
629 GvSV (PL_defgv) = slot->defsv; 698#if CORO_JIT
630 GvAV (PL_defgv) = slot->defav; 699 load_perl_slots (slot);
631 GvSV (PL_errgv) = slot->errsv; 700#else
632 GvSV (irsgv) = slot->irsgv;
633 GvHV (PL_hintgv) = slot->hinthv;
634
635 #define VAR(name,type) PL_ ## name = slot->name; 701 #define VARx(name,expr,type) expr = slot->name;
636 # include "state.h" 702 # include "state.h"
637 #undef VAR 703 #undef VARx
704#endif
638 705
639 { 706 {
640 dSP; 707 dSP;
641 708
642 CV *cv; 709 CV *cv;
643 710
644 /* now do the ugly restore mess */ 711 /* now do the ugly restore mess */
645 while (expect_true (cv = (CV *)POPs)) 712 while (ecb_expect_true (cv = (CV *)POPs))
646 { 713 {
647 put_padlist (aTHX_ cv); /* mark this padlist as available */ 714 put_padlist (aTHX_ cv); /* mark this padlist as available */
648 CvDEPTH (cv) = PTR2IV (POPs); 715 CvDEPTH (cv) = PTR2IV (POPs);
649 CvPADLIST (cv) = (AV *)POPs; 716 CvPADLIST (cv) = (AV *)POPs;
650 } 717 }
… …
653 } 720 }
654 721
655 slf_frame = c->slf_frame; 722 slf_frame = c->slf_frame;
656 CORO_THROW = c->except; 723 CORO_THROW = c->except;
657 724
658 if (expect_false (enable_times)) 725 if (ecb_expect_false (enable_times))
659 { 726 {
660 if (expect_false (!times_valid)) 727 if (ecb_expect_false (!times_valid))
661 coro_times_update (); 728 coro_times_update ();
662 729
663 coro_times_sub (c); 730 coro_times_sub (c);
664 } 731 }
665 732
666 if (expect_false (c->on_enter)) 733 if (ecb_expect_false (c->on_enter))
667 { 734 {
668 int i; 735 int i;
669 736
670 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 737 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
671 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 738 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
677static void 744static void
678save_perl (pTHX_ Coro__State c) 745save_perl (pTHX_ Coro__State c)
679{ 746{
680 SWAP_SVS (c); 747 SWAP_SVS (c);
681 748
682 if (expect_false (c->on_leave)) 749 if (ecb_expect_false (c->on_leave))
683 { 750 {
684 int i; 751 int i;
685 752
686 for (i = AvFILLp (c->on_leave); i >= 0; --i) 753 for (i = AvFILLp (c->on_leave); i >= 0; --i)
687 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 754 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
688 } 755 }
689 756
690 times_valid = 0; 757 times_valid = 0;
691 758
692 if (expect_false (enable_times)) 759 if (ecb_expect_false (enable_times))
693 { 760 {
694 coro_times_update (); times_valid = 1; 761 coro_times_update (); times_valid = 1;
695 coro_times_add (c); 762 coro_times_add (c);
696 } 763 }
697 764
… …
711 778
712 XPUSHs (Nullsv); 779 XPUSHs (Nullsv);
713 /* this loop was inspired by pp_caller */ 780 /* this loop was inspired by pp_caller */
714 for (;;) 781 for (;;)
715 { 782 {
716 while (expect_true (cxix >= 0)) 783 while (ecb_expect_true (cxix >= 0))
717 { 784 {
718 PERL_CONTEXT *cx = &ccstk[cxix--]; 785 PERL_CONTEXT *cx = &ccstk[cxix--];
719 786
720 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 787 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
721 { 788 {
722 CV *cv = cx->blk_sub.cv; 789 CV *cv = cx->blk_sub.cv;
723 790
724 if (expect_true (CvDEPTH (cv))) 791 if (ecb_expect_true (CvDEPTH (cv)))
725 { 792 {
726 EXTEND (SP, 3); 793 EXTEND (SP, 3);
727 PUSHs ((SV *)CvPADLIST (cv)); 794 PUSHs ((SV *)CvPADLIST (cv));
728 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 795 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
729 PUSHs ((SV *)cv); 796 PUSHs ((SV *)cv);
… …
732 get_padlist (aTHX_ cv); 799 get_padlist (aTHX_ cv);
733 } 800 }
734 } 801 }
735 } 802 }
736 803
737 if (expect_true (top_si->si_type == PERLSI_MAIN)) 804 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
738 break; 805 break;
739 806
740 top_si = top_si->si_prev; 807 top_si = top_si->si_prev;
741 ccstk = top_si->si_cxstack; 808 ccstk = top_si->si_cxstack;
742 cxix = top_si->si_cxix; 809 cxix = top_si->si_cxix;
… …
744 811
745 PUTBACK; 812 PUTBACK;
746 } 813 }
747 814
748 /* allocate some space on the context stack for our purposes */ 815 /* allocate some space on the context stack for our purposes */
749 /* we manually unroll here, as usually 2 slots is enough */ 816 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
750 if (SLOT_COUNT >= 1) CXINC;
751 if (SLOT_COUNT >= 2) CXINC;
752 if (SLOT_COUNT >= 3) CXINC;
753 { 817 {
754 unsigned int i; 818 unsigned int i;
819
755 for (i = 3; i < SLOT_COUNT; ++i) 820 for (i = 0; i < SLOT_COUNT; ++i)
756 CXINC; 821 CXINC;
757 } 822
758 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 823 cxstack_ix -= SLOT_COUNT; /* undo allocation */
824 }
759 825
760 c->mainstack = PL_mainstack; 826 c->mainstack = PL_mainstack;
761 827
762 { 828 {
763 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 829 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
764 830
765 slot->defav = GvAV (PL_defgv); 831#if CORO_JIT
766 slot->defsv = DEFSV; 832 save_perl_slots (slot);
767 slot->errsv = ERRSV; 833#else
768 slot->irsgv = GvSV (irsgv);
769 slot->hinthv = GvHV (PL_hintgv);
770
771 #define VAR(name,type) slot->name = PL_ ## name; 834 #define VARx(name,expr,type) slot->name = expr;
772 # include "state.h" 835 # include "state.h"
773 #undef VAR 836 #undef VARx
837#endif
774 } 838 }
775} 839}
776 840
777/* 841/*
778 * allocate various perl stacks. This is almost an exact copy 842 * allocate various perl stacks. This is almost an exact copy
… …
784# define coro_init_stacks(thx) init_stacks () 848# define coro_init_stacks(thx) init_stacks ()
785#else 849#else
786static void 850static void
787coro_init_stacks (pTHX) 851coro_init_stacks (pTHX)
788{ 852{
789 PL_curstackinfo = new_stackinfo(32, 8); 853 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; 854 PL_curstackinfo->si_type = PERLSI_MAIN;
791 PL_curstack = PL_curstackinfo->si_stack; 855 PL_curstack = PL_curstackinfo->si_stack;
792 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 856 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
793 857
794 PL_stack_base = AvARRAY(PL_curstack); 858 PL_stack_base = AvARRAY(PL_curstack);
… …
901#endif 965#endif
902 966
903/* 967/*
904 * This overrides the default magic get method of %SIG elements. 968 * 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 969 * 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 970 * and instead of trying to save and restore the hash elements (extremely slow),
907 * readback here. 971 * we just provide our own readback here.
908 */ 972 */
909static int 973static int ecb_cold
910coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 974coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
911{ 975{
912 const char *s = MgPV_nolen_const (mg); 976 const char *s = MgPV_nolen_const (mg);
913 977
914 if (*s == '_') 978 if (*s == '_')
… …
926 } 990 }
927 991
928 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 992 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
929} 993}
930 994
931static int 995static int ecb_cold
932coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 996coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
933{ 997{
934 const char *s = MgPV_nolen_const (mg); 998 const char *s = MgPV_nolen_const (mg);
935 999
936 if (*s == '_') 1000 if (*s == '_')
… …
950 } 1014 }
951 1015
952 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1016 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
953} 1017}
954 1018
955static int 1019static int ecb_cold
956coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1020coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
957{ 1021{
958 const char *s = MgPV_nolen_const (mg); 1022 const char *s = MgPV_nolen_const (mg);
959 1023
960 if (*s == '_') 1024 if (*s == '_')
… …
995 return 1; 1059 return 1;
996} 1060}
997 1061
998static UNOP init_perl_op; 1062static UNOP init_perl_op;
999 1063
1000static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1064ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1001init_perl (pTHX_ struct coro *coro) 1065init_perl (pTHX_ struct coro *coro)
1002{ 1066{
1003 /* 1067 /*
1004 * emulate part of the perl startup here. 1068 * emulate part of the perl startup here.
1005 */ 1069 */
… …
1020 PL_parser = 0; 1084 PL_parser = 0;
1021#endif 1085#endif
1022 PL_hints = 0; 1086 PL_hints = 0;
1023 1087
1024 /* recreate the die/warn hooks */ 1088 /* recreate the die/warn hooks */
1025 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1089 PL_diehook = SvREFCNT_inc (rv_diehook);
1026 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1090 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1027 1091
1028 GvSV (PL_defgv) = newSV (0); 1092 GvSV (PL_defgv) = newSV (0);
1029 GvAV (PL_defgv) = coro->args; coro->args = 0; 1093 GvAV (PL_defgv) = coro->args; coro->args = 0;
1030 GvSV (PL_errgv) = newSV (0); 1094 GvSV (PL_errgv) = newSV (0);
1031 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1095 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 1116 /* 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. 1117 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1054 */ 1118 */
1055 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1119 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 */ 1120 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1121 slf_frame.destroy = 0;
1057 1122
1058 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1123 /* 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; 1124 init_perl_op.op_next = PL_op;
1060 init_perl_op.op_type = OP_ENTERSUB; 1125 init_perl_op.op_type = OP_ENTERSUB;
1061 init_perl_op.op_ppaddr = pp_slf; 1126 init_perl_op.op_ppaddr = pp_slf;
… …
1066 /* copy throw, in case it was set before init_perl */ 1131 /* copy throw, in case it was set before init_perl */
1067 CORO_THROW = coro->except; 1132 CORO_THROW = coro->except;
1068 1133
1069 SWAP_SVS (coro); 1134 SWAP_SVS (coro);
1070 1135
1071 if (expect_false (enable_times)) 1136 if (ecb_expect_false (enable_times))
1072 { 1137 {
1073 coro_times_update (); 1138 coro_times_update ();
1074 coro_times_sub (coro); 1139 coro_times_sub (coro);
1075 } 1140 }
1076} 1141}
… …
1100destroy_perl (pTHX_ struct coro *coro) 1165destroy_perl (pTHX_ struct coro *coro)
1101{ 1166{
1102 SV *svf [9]; 1167 SV *svf [9];
1103 1168
1104 { 1169 {
1170 SV *old_current = SvRV (coro_current);
1105 struct coro *current = SvSTATE_current; 1171 struct coro *current = SvSTATE (old_current);
1106 1172
1107 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1173 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1108 1174
1109 save_perl (aTHX_ current); 1175 save_perl (aTHX_ current);
1176
1177 /* this will cause transfer_check to croak on block*/
1178 SvRV_set (coro_current, (SV *)coro->hv);
1179
1110 load_perl (aTHX_ coro); 1180 load_perl (aTHX_ coro);
1111 1181
1112 coro_unwind_stacks (aTHX); 1182 coro_unwind_stacks (aTHX);
1113 coro_destruct_stacks (aTHX);
1114 1183
1115 /* restore swapped sv's */ 1184 /* restore swapped sv's */
1116 SWAP_SVS (coro); 1185 SWAP_SVS (coro);
1186
1187 coro_destruct_stacks (aTHX);
1117 1188
1118 // now save some sv's to be free'd later 1189 // now save some sv's to be free'd later
1119 svf [0] = GvSV (PL_defgv); 1190 svf [0] = GvSV (PL_defgv);
1120 svf [1] = (SV *)GvAV (PL_defgv); 1191 svf [1] = (SV *)GvAV (PL_defgv);
1121 svf [2] = GvSV (PL_errgv); 1192 svf [2] = GvSV (PL_errgv);
… …
1125 svf [6] = (SV *)GvHV (PL_hintgv); 1196 svf [6] = (SV *)GvHV (PL_hintgv);
1126 svf [7] = PL_diehook; 1197 svf [7] = PL_diehook;
1127 svf [8] = PL_warnhook; 1198 svf [8] = PL_warnhook;
1128 assert (9 == sizeof (svf) / sizeof (*svf)); 1199 assert (9 == sizeof (svf) / sizeof (*svf));
1129 1200
1201 SvRV_set (coro_current, old_current);
1202
1130 load_perl (aTHX_ current); 1203 load_perl (aTHX_ current);
1131 } 1204 }
1132 1205
1133 { 1206 {
1134 unsigned int i; 1207 unsigned int i;
… …
1141 SvREFCNT_dec (coro->invoke_cb); 1214 SvREFCNT_dec (coro->invoke_cb);
1142 SvREFCNT_dec (coro->invoke_av); 1215 SvREFCNT_dec (coro->invoke_av);
1143 } 1216 }
1144} 1217}
1145 1218
1146INLINE void 1219ECB_INLINE void
1147free_coro_mortal (pTHX) 1220free_coro_mortal (pTHX)
1148{ 1221{
1149 if (expect_true (coro_mortal)) 1222 if (ecb_expect_true (coro_mortal))
1150 { 1223 {
1151 SvREFCNT_dec (coro_mortal); 1224 SvREFCNT_dec ((SV *)coro_mortal);
1152 coro_mortal = 0; 1225 coro_mortal = 0;
1153 } 1226 }
1154} 1227}
1155 1228
1156static int 1229static int
… …
1289 1362
1290 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1363 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1291} 1364}
1292 1365
1293/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1366/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1294static void NOINLINE 1367static void ecb_noinline
1295cctx_prepare (pTHX) 1368cctx_prepare (pTHX)
1296{ 1369{
1297 PL_top_env = &PL_start_env; 1370 PL_top_env = &PL_start_env;
1298 1371
1299 if (cctx_current->flags & CC_TRACE) 1372 if (cctx_current->flags & CC_TRACE)
… …
1310 slf_frame.prepare = slf_prepare_set_stacklevel; 1383 slf_frame.prepare = slf_prepare_set_stacklevel;
1311 slf_frame.check = slf_check_set_stacklevel; 1384 slf_frame.check = slf_check_set_stacklevel;
1312} 1385}
1313 1386
1314/* the tail of transfer: execute stuff we can only do after a transfer */ 1387/* the tail of transfer: execute stuff we can only do after a transfer */
1315INLINE void 1388ECB_INLINE void
1316transfer_tail (pTHX) 1389transfer_tail (pTHX)
1317{ 1390{
1318 free_coro_mortal (aTHX); 1391 free_coro_mortal (aTHX);
1319} 1392}
1320 1393
… …
1443cctx_destroy (coro_cctx *cctx) 1516cctx_destroy (coro_cctx *cctx)
1444{ 1517{
1445 if (!cctx) 1518 if (!cctx)
1446 return; 1519 return;
1447 1520
1448 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1521 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1449 1522
1450 --cctx_count; 1523 --cctx_count;
1451 coro_destroy (&cctx->cctx); 1524 coro_destroy (&cctx->cctx);
1452 1525
1453 /* coro_transfer creates new, empty cctx's */ 1526 /* coro_transfer creates new, empty cctx's */
… …
1472#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1545#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1473 1546
1474static coro_cctx * 1547static coro_cctx *
1475cctx_get (pTHX) 1548cctx_get (pTHX)
1476{ 1549{
1477 while (expect_true (cctx_first)) 1550 while (ecb_expect_true (cctx_first))
1478 { 1551 {
1479 coro_cctx *cctx = cctx_first; 1552 coro_cctx *cctx = cctx_first;
1480 cctx_first = cctx->next; 1553 cctx_first = cctx->next;
1481 --cctx_idle; 1554 --cctx_idle;
1482 1555
1483 if (expect_true (!CCTX_EXPIRED (cctx))) 1556 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1484 return cctx; 1557 return cctx;
1485 1558
1486 cctx_destroy (cctx); 1559 cctx_destroy (cctx);
1487 } 1560 }
1488 1561
… …
1493cctx_put (coro_cctx *cctx) 1566cctx_put (coro_cctx *cctx)
1494{ 1567{
1495 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1568 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1496 1569
1497 /* free another cctx if overlimit */ 1570 /* free another cctx if overlimit */
1498 if (expect_false (cctx_idle >= cctx_max_idle)) 1571 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1499 { 1572 {
1500 coro_cctx *first = cctx_first; 1573 coro_cctx *first = cctx_first;
1501 cctx_first = first->next; 1574 cctx_first = first->next;
1502 --cctx_idle; 1575 --cctx_idle;
1503 1576
… …
1514static void 1587static void
1515transfer_check (pTHX_ struct coro *prev, struct coro *next) 1588transfer_check (pTHX_ struct coro *prev, struct coro *next)
1516{ 1589{
1517 /* TODO: throwing up here is considered harmful */ 1590 /* TODO: throwing up here is considered harmful */
1518 1591
1519 if (expect_true (prev != next)) 1592 if (ecb_expect_true (prev != next))
1520 { 1593 {
1521 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1594 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,"); 1595 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1523 1596
1524 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1597 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,"); 1598 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1526 1599
1527#if !PERL_VERSION_ATLEAST (5,10,0) 1600#if !PERL_VERSION_ATLEAST (5,10,0)
1528 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1601 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,"); 1602 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1530#endif 1603#endif
1531 } 1604 }
1532} 1605}
1533 1606
1534/* always use the TRANSFER macro */ 1607/* always use the TRANSFER macro */
1535static void NOINLINE /* noinline so we have a fixed stackframe */ 1608static void ecb_noinline /* noinline so we have a fixed stackframe */
1536transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1609transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1537{ 1610{
1538 dSTACKLEVEL; 1611 dSTACKLEVEL;
1539 1612
1540 /* sometimes transfer is only called to set idle_sp */ 1613 /* sometimes transfer is only called to set idle_sp */
1541 if (expect_false (!prev)) 1614 if (ecb_expect_false (!prev))
1542 { 1615 {
1543 cctx_current->idle_sp = STACKLEVEL; 1616 cctx_current->idle_sp = STACKLEVEL;
1544 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1617 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1545 } 1618 }
1546 else if (expect_true (prev != next)) 1619 else if (ecb_expect_true (prev != next))
1547 { 1620 {
1548 coro_cctx *cctx_prev; 1621 coro_cctx *cctx_prev;
1549 1622
1550 if (expect_false (prev->flags & CF_NEW)) 1623 if (ecb_expect_false (prev->flags & CF_NEW))
1551 { 1624 {
1552 /* create a new empty/source context */ 1625 /* create a new empty/source context */
1553 prev->flags &= ~CF_NEW; 1626 prev->flags &= ~CF_NEW;
1554 prev->flags |= CF_RUNNING; 1627 prev->flags |= CF_RUNNING;
1555 } 1628 }
… …
1558 next->flags |= CF_RUNNING; 1631 next->flags |= CF_RUNNING;
1559 1632
1560 /* first get rid of the old state */ 1633 /* first get rid of the old state */
1561 save_perl (aTHX_ prev); 1634 save_perl (aTHX_ prev);
1562 1635
1563 if (expect_false (next->flags & CF_NEW)) 1636 if (ecb_expect_false (next->flags & CF_NEW))
1564 { 1637 {
1565 /* need to start coroutine */ 1638 /* need to start coroutine */
1566 next->flags &= ~CF_NEW; 1639 next->flags &= ~CF_NEW;
1567 /* setup coroutine call */ 1640 /* setup coroutine call */
1568 init_perl (aTHX_ next); 1641 init_perl (aTHX_ next);
1569 } 1642 }
1570 else 1643 else
1571 load_perl (aTHX_ next); 1644 load_perl (aTHX_ next);
1572 1645
1573 /* possibly untie and reuse the cctx */ 1646 /* possibly untie and reuse the cctx */
1574 if (expect_true ( 1647 if (ecb_expect_true (
1575 cctx_current->idle_sp == STACKLEVEL 1648 cctx_current->idle_sp == STACKLEVEL
1576 && !(cctx_current->flags & CC_TRACE) 1649 && !(cctx_current->flags & CC_TRACE)
1577 && !force_cctx 1650 && !force_cctx
1578 )) 1651 ))
1579 { 1652 {
1580 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1653 /* 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)); 1654 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1582 1655
1583 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1656 /* 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 */ 1657 /* without this the next cctx_get might destroy the running cctx while still in use */
1585 if (expect_false (CCTX_EXPIRED (cctx_current))) 1658 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1586 if (expect_true (!next->cctx)) 1659 if (ecb_expect_true (!next->cctx))
1587 next->cctx = cctx_get (aTHX); 1660 next->cctx = cctx_get (aTHX);
1588 1661
1589 cctx_put (cctx_current); 1662 cctx_put (cctx_current);
1590 } 1663 }
1591 else 1664 else
1592 prev->cctx = cctx_current; 1665 prev->cctx = cctx_current;
1593 1666
1594 ++next->usecount; 1667 ++next->usecount;
1595 1668
1596 cctx_prev = cctx_current; 1669 cctx_prev = cctx_current;
1597 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1670 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1598 1671
1599 next->cctx = 0; 1672 next->cctx = 0;
1600 1673
1601 if (expect_false (cctx_prev != cctx_current)) 1674 if (ecb_expect_false (cctx_prev != cctx_current))
1602 { 1675 {
1603 cctx_prev->top_env = PL_top_env; 1676 cctx_prev->top_env = PL_top_env;
1604 PL_top_env = cctx_current->top_env; 1677 PL_top_env = cctx_current->top_env;
1605 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1678 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1606 } 1679 }
… …
1612#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1685#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) 1686#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1614 1687
1615/** high level stuff ********************************************************/ 1688/** high level stuff ********************************************************/
1616 1689
1690/* this function is actually Coro, not Coro::State, but we call it from here */
1691/* because it is convenient - but it hasn't been declared yet for that reason */
1617static int 1692static void
1693coro_call_on_destroy (pTHX_ struct coro *coro);
1694
1695static void
1618coro_state_destroy (pTHX_ struct coro *coro) 1696coro_state_destroy (pTHX_ struct coro *coro)
1619{ 1697{
1620 if (coro->flags & CF_DESTROYED) 1698 if (coro->flags & CF_ZOMBIE)
1621 return 0; 1699 return;
1622 1700
1623 if (coro->on_destroy && !PL_dirty)
1624 coro->on_destroy (aTHX_ coro); 1701 slf_destroy (aTHX_ coro);
1625 1702
1626 coro->flags |= CF_DESTROYED; 1703 coro->flags |= CF_ZOMBIE;
1627 1704
1628 if (coro->flags & CF_READY) 1705 if (coro->flags & CF_READY)
1629 { 1706 {
1630 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1707 /* reduce nready, as destroying a ready coro effectively unreadies it */
1631 /* alternative: look through all ready queues and remove the coro */ 1708 /* alternative: look through all ready queues and remove the coro */
1632 --coro_nready; 1709 --coro_nready;
1633 } 1710 }
1634 else 1711 else
1635 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1712 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1713
1714 if (coro->next) coro->next->prev = coro->prev;
1715 if (coro->prev) coro->prev->next = coro->next;
1716 if (coro == coro_first) coro_first = coro->next;
1636 1717
1637 if (coro->mainstack 1718 if (coro->mainstack
1638 && coro->mainstack != main_mainstack 1719 && coro->mainstack != main_mainstack
1639 && coro->slot 1720 && coro->slot
1640 && !PL_dirty) 1721 && !PL_dirty)
1641 destroy_perl (aTHX_ coro); 1722 destroy_perl (aTHX_ coro);
1642 1723
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); 1724 cctx_destroy (coro->cctx);
1648 SvREFCNT_dec (coro->startcv); 1725 SvREFCNT_dec (coro->startcv);
1649 SvREFCNT_dec (coro->args); 1726 SvREFCNT_dec (coro->args);
1650 SvREFCNT_dec (coro->swap_sv); 1727 SvREFCNT_dec (coro->swap_sv);
1651 SvREFCNT_dec (CORO_THROW); 1728 SvREFCNT_dec (CORO_THROW);
1652 1729
1653 return 1; 1730 coro_call_on_destroy (aTHX_ coro);
1731
1732 /* more destruction mayhem in coro_state_free */
1654} 1733}
1655 1734
1656static int 1735static int
1657coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1736coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1658{ 1737{
1659 struct coro *coro = (struct coro *)mg->mg_ptr; 1738 struct coro *coro = (struct coro *)mg->mg_ptr;
1660 mg->mg_ptr = 0; 1739 mg->mg_ptr = 0;
1661 1740
1662 coro->hv = 0;
1663
1664 if (--coro->refcnt < 0)
1665 {
1666 coro_state_destroy (aTHX_ coro); 1741 coro_state_destroy (aTHX_ coro);
1742 SvREFCNT_dec (coro->on_destroy);
1743 SvREFCNT_dec (coro->status);
1744
1667 Safefree (coro); 1745 Safefree (coro);
1668 }
1669 1746
1670 return 0; 1747 return 0;
1671} 1748}
1672 1749
1673static int 1750static int ecb_cold
1674coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1751coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1675{ 1752{
1676 struct coro *coro = (struct coro *)mg->mg_ptr; 1753 /* called when perl clones the current process the slow way (windows process emulation) */
1677 1754 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1678 ++coro->refcnt; 1755 mg->mg_ptr = 0;
1756 mg->mg_virtual = 0;
1679 1757
1680 return 0; 1758 return 0;
1681} 1759}
1682 1760
1683static MGVTBL coro_state_vtbl = { 1761static MGVTBL coro_state_vtbl = {
… …
1708 TRANSFER (ta, 1); 1786 TRANSFER (ta, 1);
1709} 1787}
1710 1788
1711/** Coro ********************************************************************/ 1789/** Coro ********************************************************************/
1712 1790
1713INLINE void 1791ECB_INLINE void
1714coro_enq (pTHX_ struct coro *coro) 1792coro_enq (pTHX_ struct coro *coro)
1715{ 1793{
1716 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1794 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1717 1795
1718 SvREFCNT_inc_NN (coro->hv); 1796 SvREFCNT_inc_NN (coro->hv);
… …
1720 coro->next_ready = 0; 1798 coro->next_ready = 0;
1721 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1799 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1722 ready [1] = coro; 1800 ready [1] = coro;
1723} 1801}
1724 1802
1725INLINE struct coro * 1803ECB_INLINE struct coro *
1726coro_deq (pTHX) 1804coro_deq (pTHX)
1727{ 1805{
1728 int prio; 1806 int prio;
1729 1807
1730 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1808 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1783{ 1861{
1784 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1862 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1785} 1863}
1786 1864
1787/* expects to own a reference to next->hv */ 1865/* expects to own a reference to next->hv */
1788INLINE void 1866ECB_INLINE void
1789prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1867prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1790{ 1868{
1791 SV *prev_sv = SvRV (coro_current); 1869 SV *prev_sv = SvRV (coro_current);
1792 1870
1793 ta->prev = SvSTATE_hv (prev_sv); 1871 ta->prev = SvSTATE_hv (prev_sv);
… …
1806{ 1884{
1807 for (;;) 1885 for (;;)
1808 { 1886 {
1809 struct coro *next = coro_deq (aTHX); 1887 struct coro *next = coro_deq (aTHX);
1810 1888
1811 if (expect_true (next)) 1889 if (ecb_expect_true (next))
1812 { 1890 {
1813 /* cannot transfer to destroyed coros, skip and look for next */ 1891 /* cannot transfer to destroyed coros, skip and look for next */
1814 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1892 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 */ 1893 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1816 else 1894 else
1817 { 1895 {
1818 next->flags &= ~CF_READY; 1896 next->flags &= ~CF_READY;
1819 --coro_nready; 1897 --coro_nready;
… …
1852 } 1930 }
1853 } 1931 }
1854 } 1932 }
1855} 1933}
1856 1934
1857INLINE void 1935ECB_INLINE void
1858prepare_cede (pTHX_ struct coro_transfer_args *ta) 1936prepare_cede (pTHX_ struct coro_transfer_args *ta)
1859{ 1937{
1860 api_ready (aTHX_ coro_current); 1938 api_ready (aTHX_ coro_current);
1861 prepare_schedule (aTHX_ ta); 1939 prepare_schedule (aTHX_ ta);
1862} 1940}
1863 1941
1864INLINE void 1942ECB_INLINE void
1865prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1943prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1866{ 1944{
1867 SV *prev = SvRV (coro_current); 1945 SV *prev = SvRV (coro_current);
1868 1946
1869 if (coro_nready) 1947 if (coro_nready)
… …
1899{ 1977{
1900 struct coro_transfer_args ta; 1978 struct coro_transfer_args ta;
1901 1979
1902 prepare_cede (aTHX_ &ta); 1980 prepare_cede (aTHX_ &ta);
1903 1981
1904 if (expect_true (ta.prev != ta.next)) 1982 if (ecb_expect_true (ta.prev != ta.next))
1905 { 1983 {
1906 TRANSFER (ta, 1); 1984 TRANSFER (ta, 1);
1907 return 1; 1985 return 1;
1908 } 1986 }
1909 else 1987 else
… …
1952 coro->slot->runops = RUNOPS_DEFAULT; 2030 coro->slot->runops = RUNOPS_DEFAULT;
1953 } 2031 }
1954} 2032}
1955 2033
1956static void 2034static void
2035coro_push_av (pTHX_ AV *av, I32 gimme_v)
2036{
2037 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2038 {
2039 dSP;
2040
2041 if (gimme_v == G_SCALAR)
2042 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2043 else
2044 {
2045 int i;
2046 EXTEND (SP, AvFILLp (av) + 1);
2047
2048 for (i = 0; i <= AvFILLp (av); ++i)
2049 PUSHs (AvARRAY (av)[i]);
2050 }
2051
2052 PUTBACK;
2053 }
2054}
2055
2056static void
2057coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2058{
2059 if (!coro->on_destroy)
2060 coro->on_destroy = newAV ();
2061
2062 av_push (coro->on_destroy, cb);
2063}
2064
2065static void
2066slf_destroy_join (pTHX_ struct CoroSLF *frame)
2067{
2068 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2069}
2070
2071static int
2072slf_check_join (pTHX_ struct CoroSLF *frame)
2073{
2074 struct coro *coro = (struct coro *)frame->data;
2075
2076 if (!coro->status)
2077 return 1;
2078
2079 frame->destroy = 0;
2080
2081 coro_push_av (aTHX_ coro->status, GIMME_V);
2082
2083 SvREFCNT_dec ((SV *)coro->hv);
2084
2085 return 0;
2086}
2087
2088static void
2089slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2090{
2091 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2092
2093 if (items > 1)
2094 croak ("join called with too many arguments");
2095
2096 if (coro->status)
2097 frame->prepare = prepare_nop;
2098 else
2099 {
2100 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2101 frame->prepare = prepare_schedule;
2102 }
2103
2104 frame->check = slf_check_join;
2105 frame->destroy = slf_destroy_join;
2106 frame->data = (void *)coro;
2107 SvREFCNT_inc (coro->hv);
2108}
2109
2110static void
1957coro_call_on_destroy (pTHX_ struct coro *coro) 2111coro_call_on_destroy (pTHX_ struct coro *coro)
1958{ 2112{
1959 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2113 AV *od = coro->on_destroy;
1960 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1961 2114
1962 if (on_destroyp) 2115 if (!od)
1963 { 2116 return;
1964 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1965 2117
1966 while (AvFILLp (on_destroy) >= 0) 2118 while (AvFILLp (od) >= 0)
2119 {
2120 SV *cb = sv_2mortal (av_pop (od));
2121
2122 /* coro hv's (and only hv's at the moment) are supported as well */
2123 if (SvSTATEhv_p (aTHX_ cb))
2124 api_ready (aTHX_ cb);
2125 else
1967 { 2126 {
1968 dSP; /* don't disturb outer sp */ 2127 dSP; /* don't disturb outer sp */
1969 SV *cb = av_pop (on_destroy);
1970
1971 PUSHMARK (SP); 2128 PUSHMARK (SP);
1972 2129
1973 if (statusp) 2130 if (coro->status)
1974 { 2131 {
1975 int i; 2132 PUTBACK;
1976 AV *status = (AV *)SvRV (*statusp); 2133 coro_push_av (aTHX_ coro->status, G_ARRAY);
1977 EXTEND (SP, AvFILLp (status) + 1); 2134 SPAGAIN;
1978
1979 for (i = 0; i <= AvFILLp (status); ++i)
1980 PUSHs (AvARRAY (status)[i]);
1981 } 2135 }
1982 2136
1983 PUTBACK; 2137 PUTBACK;
1984 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2138 call_sv (cb, G_VOID | G_DISCARD);
1985 } 2139 }
1986 } 2140 }
1987} 2141}
1988 2142
1989static void 2143static void
1990slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2144coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1991{ 2145{
1992 int i; 2146 AV *av;
1993 HV *hv = (HV *)SvRV (coro_current); 2147
1994 AV *av = newAV (); 2148 if (coro->status)
2149 {
2150 av = coro->status;
2151 av_clear (av);
2152 }
2153 else
2154 av = coro->status = newAV ();
1995 2155
1996 /* items are actually not so common, so optimise for this case */ 2156 /* items are actually not so common, so optimise for this case */
1997 if (items) 2157 if (items)
1998 { 2158 {
2159 int i;
2160
1999 av_extend (av, items - 1); 2161 av_extend (av, items - 1);
2000 2162
2001 for (i = 0; i < items; ++i) 2163 for (i = 0; i < items; ++i)
2002 av_push (av, SvREFCNT_inc_NN (arg [i])); 2164 av_push (av, SvREFCNT_inc_NN (arg [i]));
2003 } 2165 }
2166}
2004 2167
2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2168static void
2006 2169slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2170{
2007 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2171 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2008 api_ready (aTHX_ sv_manager); 2172 api_ready (aTHX_ sv_manager);
2009 2173
2010 frame->prepare = prepare_schedule; 2174 frame->prepare = prepare_schedule;
2011 frame->check = slf_check_repeat; 2175 frame->check = slf_check_repeat;
2012 2176
2013 /* as a minor optimisation, we could unwind all stacks here */ 2177 /* as a minor optimisation, we could unwind all stacks here */
2014 /* but that puts extra pressure on pp_slf, and is not worth much */ 2178 /* but that puts extra pressure on pp_slf, and is not worth much */
2015 /*coro_unwind_stacks (aTHX);*/ 2179 /*coro_unwind_stacks (aTHX);*/
2180}
2181
2182static void
2183slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2184{
2185 HV *coro_hv = (HV *)SvRV (coro_current);
2186
2187 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2188 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2189}
2190
2191static void
2192slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2193{
2194 HV *coro_hv;
2195 struct coro *coro;
2196
2197 if (items <= 0)
2198 croak ("Coro::cancel called without coro object,");
2199
2200 coro = SvSTATE (arg [0]);
2201 coro_hv = coro->hv;
2202
2203 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2204
2205 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2206 {
2207 /* coro currently busy cancelling something, so just notify it */
2208 coro->slf_frame.data = (void *)coro;
2209
2210 frame->prepare = prepare_nop;
2211 frame->check = slf_check_nop;
2212 }
2213 else if (coro_hv == (HV *)SvRV (coro_current))
2214 {
2215 /* cancelling the current coro is allowed, and equals terminate */
2216 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2217 }
2218 else
2219 {
2220 struct coro *self = SvSTATE_current;
2221
2222 /* otherwise we cancel directly, purely for speed reasons
2223 * unfortunately, this requires some magic trickery, as
2224 * somebody else could cancel us, so we have to fight the cancellation.
2225 * this is ugly, and hopefully fully worth the extra speed.
2226 * besides, I can't get the slow-but-safe version working...
2227 */
2228 slf_frame.data = 0;
2229 self->flags |= CF_NOCANCEL;
2230 coro_state_destroy (aTHX_ coro);
2231 self->flags &= ~CF_NOCANCEL;
2232
2233 if (slf_frame.data)
2234 {
2235 /* while we were busy we have been cancelled, so terminate */
2236 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2237 }
2238 else
2239 {
2240 frame->prepare = prepare_nop;
2241 frame->check = slf_check_nop;
2242 }
2243 }
2244}
2245
2246static int
2247slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2248{
2249 frame->prepare = 0;
2250 coro_unwind_stacks (aTHX);
2251
2252 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2253
2254 return 1;
2255}
2256
2257static int
2258safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2259{
2260 if (coro->cctx)
2261 croak ("coro inside C callback, unable to cancel at this time, caught");
2262
2263 if (coro->flags & CF_NEW)
2264 {
2265 coro_set_status (aTHX_ coro, arg, items);
2266 coro_state_destroy (aTHX_ coro);
2267 }
2268 else
2269 {
2270 if (!coro->slf_frame.prepare)
2271 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2272
2273 slf_destroy (aTHX_ coro);
2274
2275 coro_set_status (aTHX_ coro, arg, items);
2276 coro->slf_frame.prepare = prepare_nop;
2277 coro->slf_frame.check = slf_check_safe_cancel;
2278
2279 api_ready (aTHX_ (SV *)coro->hv);
2280 }
2281
2282 return 1;
2016} 2283}
2017 2284
2018/*****************************************************************************/ 2285/*****************************************************************************/
2019/* async pool handler */ 2286/* async pool handler */
2020 2287
… …
2051slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2318slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2052{ 2319{
2053 HV *hv = (HV *)SvRV (coro_current); 2320 HV *hv = (HV *)SvRV (coro_current);
2054 struct coro *coro = SvSTATE_hv ((SV *)hv); 2321 struct coro *coro = SvSTATE_hv ((SV *)hv);
2055 2322
2056 if (expect_true (coro->saved_deffh)) 2323 if (ecb_expect_true (coro->saved_deffh))
2057 { 2324 {
2058 /* subsequent iteration */ 2325 /* subsequent iteration */
2059 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2326 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2060 coro->saved_deffh = 0; 2327 coro->saved_deffh = 0;
2061 2328
2062 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2329 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2063 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2330 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2064 { 2331 {
2065 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2332 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2066 coro->invoke_av = newAV (); 2333 return;
2067
2068 frame->prepare = prepare_nop;
2069 } 2334 }
2070 else 2335 else
2071 { 2336 {
2072 av_clear (GvAV (PL_defgv)); 2337 av_clear (GvAV (PL_defgv));
2073 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2338 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2296static void 2561static void
2297slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2562slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2298{ 2563{
2299 frame->prepare = prepare_cede_notself; 2564 frame->prepare = prepare_cede_notself;
2300 frame->check = slf_check_nop; 2565 frame->check = slf_check_nop;
2566}
2567
2568/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2569static void
2570slf_destroy (pTHX_ struct coro *coro)
2571{
2572 /* this callback is reserved for slf functions needing to do cleanup */
2573 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2574 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2575
2576 /*
2577 * The on_destroy above most likely is from an SLF call.
2578 * Since by definition the SLF call will not finish when we destroy
2579 * the coro, we will have to force-finish it here, otherwise
2580 * cleanup functions cannot call SLF functions.
2581 */
2582 coro->slf_frame.prepare = 0;
2301} 2583}
2302 2584
2303/* 2585/*
2304 * these not obviously related functions are all rolled into one 2586 * these not obviously related functions are all rolled into one
2305 * function to increase chances that they all will call transfer with the same 2587 * 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 */ 2594 I32 checkmark; /* mark SP to see how many elements check has pushed */
2313 2595
2314 /* set up the slf frame, unless it has already been set-up */ 2596 /* set up the slf frame, unless it has already been set-up */
2315 /* the latter happens when a new coro has been started */ 2597 /* the latter happens when a new coro has been started */
2316 /* or when a new cctx was attached to an existing coroutine */ 2598 /* or when a new cctx was attached to an existing coroutine */
2317 if (expect_true (!slf_frame.prepare)) 2599 if (ecb_expect_true (!slf_frame.prepare))
2318 { 2600 {
2319 /* first iteration */ 2601 /* first iteration */
2320 dSP; 2602 dSP;
2321 SV **arg = PL_stack_base + TOPMARK + 1; 2603 SV **arg = PL_stack_base + TOPMARK + 1;
2322 int items = SP - arg; /* args without function object */ 2604 int items = SP - arg; /* args without function object */
… …
2363 while (slf_frame.check (aTHX_ &slf_frame)); 2645 while (slf_frame.check (aTHX_ &slf_frame));
2364 2646
2365 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2647 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2366 2648
2367 /* exception handling */ 2649 /* exception handling */
2368 if (expect_false (CORO_THROW)) 2650 if (ecb_expect_false (CORO_THROW))
2369 { 2651 {
2370 SV *exception = sv_2mortal (CORO_THROW); 2652 SV *exception = sv_2mortal (CORO_THROW);
2371 2653
2372 CORO_THROW = 0; 2654 CORO_THROW = 0;
2373 sv_setsv (ERRSV, exception); 2655 sv_setsv (ERRSV, exception);
2374 croak (0); 2656 croak (0);
2375 } 2657 }
2376 2658
2377 /* return value handling - mostly like entersub */ 2659 /* return value handling - mostly like entersub */
2378 /* make sure we put something on the stack in scalar context */ 2660 /* make sure we put something on the stack in scalar context */
2379 if (GIMME_V == G_SCALAR) 2661 if (GIMME_V == G_SCALAR
2662 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2380 { 2663 {
2381 dSP; 2664 dSP;
2382 SV **bot = PL_stack_base + checkmark; 2665 SV **bot = PL_stack_base + checkmark;
2383 2666
2384 if (sp == bot) /* too few, push undef */ 2667 if (sp == bot) /* too few, push undef */
2385 bot [1] = &PL_sv_undef; 2668 bot [1] = &PL_sv_undef;
2386 else if (sp != bot + 1) /* too many, take last one */ 2669 else /* too many, take last one */
2387 bot [1] = *sp; 2670 bot [1] = *sp;
2388 2671
2389 SP = bot + 1; 2672 SP = bot + 1;
2390 2673
2391 PUTBACK; 2674 PUTBACK;
… …
2498{ 2781{
2499 PerlIOBuf base; 2782 PerlIOBuf base;
2500 NV next, every; 2783 NV next, every;
2501} PerlIOCede; 2784} PerlIOCede;
2502 2785
2503static IV 2786static IV ecb_cold
2504PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2787PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2505{ 2788{
2506 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2789 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2507 2790
2508 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2791 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2509 self->next = nvtime () + self->every; 2792 self->next = nvtime () + self->every;
2510 2793
2511 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2794 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2512} 2795}
2513 2796
2514static SV * 2797static SV * ecb_cold
2515PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2798PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2516{ 2799{
2517 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2800 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2518 2801
2519 return newSVnv (self->every); 2802 return newSVnv (self->every);
… …
2631 SvREFCNT_dec (cb); 2914 SvREFCNT_dec (cb);
2632 } 2915 }
2633} 2916}
2634 2917
2635static void 2918static void
2636coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2919coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2637{ 2920{
2638 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2921 /* call $sem->adjust (0) to possibly wake up some other waiters */
2639 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2922 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2640} 2923}
2641 2924
2642static int 2925static int
2643slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2926slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2644{ 2927{
2645 AV *av = (AV *)frame->data; 2928 AV *av = (AV *)frame->data;
2646 SV *count_sv = AvARRAY (av)[0]; 2929 SV *count_sv = AvARRAY (av)[0];
2930 SV *coro_hv = SvRV (coro_current);
2647 2931
2648 /* if we are about to throw, don't actually acquire the lock, just throw */ 2932 /* if we are about to throw, don't actually acquire the lock, just throw */
2649 if (CORO_THROW) 2933 if (CORO_THROW)
2650 return 0; 2934 return 0;
2651 else if (SvIVX (count_sv) > 0) 2935 else if (SvIVX (count_sv) > 0)
2652 { 2936 {
2653 SvSTATE_current->on_destroy = 0; 2937 frame->destroy = 0;
2654 2938
2655 if (acquire) 2939 if (acquire)
2656 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2940 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2657 else 2941 else
2658 coro_semaphore_adjust (aTHX_ av, 0); 2942 coro_semaphore_adjust (aTHX_ av, 0);
… …
2663 { 2947 {
2664 int i; 2948 int i;
2665 /* if we were woken up but can't down, we look through the whole */ 2949 /* 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 */ 2950 /* waiters list and only add us if we aren't in there already */
2667 /* this avoids some degenerate memory usage cases */ 2951 /* this avoids some degenerate memory usage cases */
2668 2952 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)) 2953 if (AvARRAY (av)[i] == coro_hv)
2671 return 1; 2954 return 1;
2672 2955
2673 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2956 av_push (av, SvREFCNT_inc (coro_hv));
2674 return 1; 2957 return 1;
2675 } 2958 }
2676} 2959}
2677 2960
2678static int 2961static int
… …
2701 { 2984 {
2702 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2985 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2703 2986
2704 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2987 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2705 frame->prepare = prepare_schedule; 2988 frame->prepare = prepare_schedule;
2706
2707 /* to avoid race conditions when a woken-up coro gets terminated */ 2989 /* to avoid race conditions when a woken-up coro gets terminated */
2708 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2990 /* we arrange for a temporary on_destroy that calls adjust (0) */
2709 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2991 frame->destroy = coro_semaphore_destroy;
2710 } 2992 }
2711} 2993}
2712 2994
2713static void 2995static void
2714slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2996slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2932 dSP; 3214 dSP;
2933 3215
2934 static SV *prio_cv; 3216 static SV *prio_cv;
2935 static SV *prio_sv; 3217 static SV *prio_sv;
2936 3218
2937 if (expect_false (!prio_cv)) 3219 if (ecb_expect_false (!prio_cv))
2938 { 3220 {
2939 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3221 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2940 prio_sv = newSViv (0); 3222 prio_sv = newSViv (0);
2941 } 3223 }
2942 3224
… …
3048 } 3330 }
3049 3331
3050 return coro_sv; 3332 return coro_sv;
3051} 3333}
3052 3334
3335#ifndef __cplusplus
3336ecb_cold XS(boot_Coro__State);
3337#endif
3338
3339#if CORO_JIT
3340
3341static void ecb_noinline ecb_cold
3342pushav_3uv (pTHX_ UV a, UV b, UV c)
3343{
3344 dSP;
3345 AV *av = newAV ();
3346
3347 av_store (av, 2, newSVuv (c));
3348 av_store (av, 1, newSVuv (b));
3349 av_store (av, 0, newSVuv (a));
3350
3351 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3352
3353 PUTBACK;
3354}
3355
3356static void ecb_noinline ecb_cold
3357jit_init (pTHX)
3358{
3359 dSP;
3360 SV *load, *save;
3361 char *map_base;
3362 char *load_ptr, *save_ptr;
3363 STRLEN load_len, save_len;
3364 int count;
3365
3366 PUSHMARK (SP);
3367 PUTBACK;
3368#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type));
3369# include "state.h"
3370#undef VARx
3371 count = call_pv ("Coro::State::_jit", G_ARRAY);
3372 SPAGAIN;
3373
3374 save = POPs; save_ptr = SvPVbyte (save, save_len);
3375 load = POPs; load_ptr = SvPVbyte (load, load_len);
3376
3377 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3378
3379 assert (("Coro: unable mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3380
3381 load_perl_slots = (load_save_perl_slots_type)map_base;
3382 memcpy (map_base, load_ptr, load_len);
3383
3384 map_base += (load_len + 15) & ~15;
3385
3386 save_perl_slots = (load_save_perl_slots_type)map_base;
3387 memcpy (map_base, save_ptr, save_len);
3388}
3389
3390#endif
3391
3053MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3392MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3054 3393
3055PROTOTYPES: DISABLE 3394PROTOTYPES: DISABLE
3056 3395
3057BOOT: 3396BOOT:
… …
3061 coro_thx = PERL_GET_CONTEXT; 3400 coro_thx = PERL_GET_CONTEXT;
3062# endif 3401# endif
3063#endif 3402#endif
3064 BOOT_PAGESIZE; 3403 BOOT_PAGESIZE;
3065 3404
3405 /* perl defines these to check for existance first, but why it doesn't */
3406 /* just create them one at init time is not clear to me, except for */
3407 /* programs trying to delete them, but... */
3408 /* anyway, we declare this as invalid and make sure they are initialised here */
3409 DEFSV;
3410 ERRSV;
3411
3066 cctx_current = cctx_new_empty (); 3412 cctx_current = cctx_new_empty ();
3067 3413
3068 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3414 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3069 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3415 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3070 3416
… …
3109 coroapi.prepare_nop = prepare_nop; 3455 coroapi.prepare_nop = prepare_nop;
3110 coroapi.prepare_schedule = prepare_schedule; 3456 coroapi.prepare_schedule = prepare_schedule;
3111 coroapi.prepare_cede = prepare_cede; 3457 coroapi.prepare_cede = prepare_cede;
3112 coroapi.prepare_cede_notself = prepare_cede_notself; 3458 coroapi.prepare_cede_notself = prepare_cede_notself;
3113 3459
3114 { 3460 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 3461
3126 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3462 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3463#if CORO_JIT
3464 PUTBACK;
3465 require_pv ("Coro/jit-" CORO_JIT_TYPE ".pl");
3466 jit_init (aTHX);
3467 perl_eval_pv ("undef &Coro::State::_jit", 1);
3468 SPAGAIN;
3469#endif
3127} 3470}
3128 3471
3129SV * 3472SV *
3130new (SV *klass, ...) 3473new (SV *klass, ...)
3131 ALIAS: 3474 ALIAS:
… …
3138void 3481void
3139transfer (...) 3482transfer (...)
3140 PROTOTYPE: $$ 3483 PROTOTYPE: $$
3141 CODE: 3484 CODE:
3142 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3485 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 3486
3151void 3487void
3152_exit (int code) 3488_exit (int code)
3153 PROTOTYPE: $ 3489 PROTOTYPE: $
3154 CODE: 3490 CODE:
… …
3230 CODE: 3566 CODE:
3231{ 3567{
3232 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3568 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3233 { 3569 {
3234 struct coro *current = SvSTATE_current; 3570 struct coro *current = SvSTATE_current;
3571 struct CoroSLF slf_save;
3235 3572
3236 if (current != coro) 3573 if (current != coro)
3237 { 3574 {
3238 PUTBACK; 3575 PUTBACK;
3239 save_perl (aTHX_ current); 3576 save_perl (aTHX_ current);
3240 load_perl (aTHX_ coro); 3577 load_perl (aTHX_ coro);
3578 /* the coro is most likely in an active SLF call.
3579 * while not strictly required (the code we execute is
3580 * not allowed to call any SLF functions), it's cleaner
3581 * to reinitialise the slf_frame and restore it later.
3582 * This might one day allow us to actually do SLF calls
3583 * from code executed here.
3584 */
3585 slf_save = slf_frame;
3586 slf_frame.prepare = 0;
3241 SPAGAIN; 3587 SPAGAIN;
3242 } 3588 }
3243 3589
3244 PUSHSTACK; 3590 PUSHSTACK;
3245 3591
… …
3255 SPAGAIN; 3601 SPAGAIN;
3256 3602
3257 if (current != coro) 3603 if (current != coro)
3258 { 3604 {
3259 PUTBACK; 3605 PUTBACK;
3606 slf_frame = slf_save;
3260 save_perl (aTHX_ coro); 3607 save_perl (aTHX_ coro);
3261 load_perl (aTHX_ current); 3608 load_perl (aTHX_ current);
3262 SPAGAIN; 3609 SPAGAIN;
3263 } 3610 }
3264 } 3611 }
… …
3269 PROTOTYPE: $ 3616 PROTOTYPE: $
3270 ALIAS: 3617 ALIAS:
3271 is_ready = CF_READY 3618 is_ready = CF_READY
3272 is_running = CF_RUNNING 3619 is_running = CF_RUNNING
3273 is_new = CF_NEW 3620 is_new = CF_NEW
3274 is_destroyed = CF_DESTROYED 3621 is_destroyed = CF_ZOMBIE
3622 is_zombie = CF_ZOMBIE
3275 is_suspended = CF_SUSPENDED 3623 is_suspended = CF_SUSPENDED
3276 CODE: 3624 CODE:
3277 RETVAL = boolSV (coro->flags & ix); 3625 RETVAL = boolSV (coro->flags & ix);
3278 OUTPUT: 3626 OUTPUT:
3279 RETVAL 3627 RETVAL
… …
3350 3698
3351void 3699void
3352cancel (Coro::State self) 3700cancel (Coro::State self)
3353 CODE: 3701 CODE:
3354 coro_state_destroy (aTHX_ self); 3702 coro_state_destroy (aTHX_ self);
3355 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3356
3357 3703
3358SV * 3704SV *
3359enable_times (int enabled = enable_times) 3705enable_times (int enabled = enable_times)
3360 CODE: 3706 CODE:
3361{ 3707{
… …
3376times (Coro::State self) 3722times (Coro::State self)
3377 PPCODE: 3723 PPCODE:
3378{ 3724{
3379 struct coro *current = SvSTATE (coro_current); 3725 struct coro *current = SvSTATE (coro_current);
3380 3726
3381 if (expect_false (current == self)) 3727 if (ecb_expect_false (current == self))
3382 { 3728 {
3383 coro_times_update (); 3729 coro_times_update ();
3384 coro_times_add (SvSTATE (coro_current)); 3730 coro_times_add (SvSTATE (coro_current));
3385 } 3731 }
3386 3732
3387 EXTEND (SP, 2); 3733 EXTEND (SP, 2);
3388 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3734 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))); 3735 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3390 3736
3391 if (expect_false (current == self)) 3737 if (ecb_expect_false (current == self))
3392 coro_times_sub (SvSTATE (coro_current)); 3738 coro_times_sub (SvSTATE (coro_current));
3393} 3739}
3394 3740
3395void 3741void
3396swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3742swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3417BOOT: 3763BOOT:
3418{ 3764{
3419 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3765 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3420 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3766 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3421 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3767 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); 3768 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); 3769 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3425 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3770 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3426 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3771 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3427 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3772 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
… …
3466 api_ready (aTHX_ RETVAL); 3811 api_ready (aTHX_ RETVAL);
3467 OUTPUT: 3812 OUTPUT:
3468 RETVAL 3813 RETVAL
3469 3814
3470void 3815void
3816_destroy (Coro::State coro)
3817 CODE:
3818 /* used by the manager thread */
3819 coro_state_destroy (aTHX_ coro);
3820
3821void
3822on_destroy (Coro::State coro, SV *cb)
3823 CODE:
3824 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3825
3826void
3827join (...)
3828 CODE:
3829 CORO_EXECUTE_SLF_XS (slf_init_join);
3830
3831void
3471terminate (...) 3832terminate (...)
3472 CODE: 3833 CODE:
3473 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3834 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3835
3836void
3837cancel (...)
3838 CODE:
3839 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3840
3841int
3842safe_cancel (Coro::State self, ...)
3843 C_ARGS: aTHX_ self, &ST (1), items - 1
3474 3844
3475void 3845void
3476schedule (...) 3846schedule (...)
3477 CODE: 3847 CODE:
3478 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3848 CORO_EXECUTE_SLF_XS (slf_init_schedule);

Diff Legend

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