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.387 by root, Mon Feb 21 13:38:04 2011 UTC vs.
Revision 1.405 by root, Sat Jun 11 13:01:26 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 __linux && __amd64
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
307
308static load_save_perl_slots_type load_perl_slots, save_perl_slots;
309
310#endif
298 311
299/** Coro::Select ************************************************************/ 312/** Coro::Select ************************************************************/
300 313
301static OP *(*coro_old_pp_sselect) (pTHX); 314static OP *(*coro_old_pp_sselect) (pTHX);
302static SV *coro_select_select; 315static SV *coro_select_select;
… …
318 331
319/** time stuff **************************************************************/ 332/** time stuff **************************************************************/
320 333
321#ifdef HAS_GETTIMEOFDAY 334#ifdef HAS_GETTIMEOFDAY
322 335
323static void 336ECB_INLINE void
324coro_u2time (pTHX_ UV ret[2]) 337coro_u2time (pTHX_ UV ret[2])
325{ 338{
326 struct timeval tv; 339 struct timeval tv;
327 gettimeofday (&tv, 0); 340 gettimeofday (&tv, 0);
328 341
329 ret [0] = tv.tv_sec; 342 ret [0] = tv.tv_sec;
330 ret [1] = tv.tv_usec; 343 ret [1] = tv.tv_usec;
331} 344}
332 345
333static double 346ECB_INLINE double
334coro_nvtime () 347coro_nvtime ()
335{ 348{
336 struct timeval tv; 349 struct timeval tv;
337 gettimeofday (&tv, 0); 350 gettimeofday (&tv, 0);
338 351
339 return tv.tv_sec + tv.tv_usec * 1e-6; 352 return tv.tv_sec + tv.tv_usec * 1e-6;
340} 353}
341 354
342static void 355ECB_INLINE void
343time_init (void) 356time_init (pTHX)
344{ 357{
345 nvtime = coro_nvtime; 358 nvtime = coro_nvtime;
346 u2time = coro_u2time; 359 u2time = coro_u2time;
347} 360}
348 361
349#else 362#else
350 363
351static void 364ECB_INLINE void
352time_init (void) 365time_init (pTHX)
353{ 366{
354 SV **svp; 367 SV **svp;
355 368
356 require_pv ("Time::HiRes"); 369 require_pv ("Time/HiRes.pm");
357 370
358 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 371 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
359 372
360 if (!svp) croak ("Time::HiRes is required"); 373 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
361 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 374 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
362 375
363 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 376 nvtime = INT2PTR (double (*)(), SvIV (*svp));
364 377
365 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0); 378 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
366 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp)); 379 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
… …
368 381
369#endif 382#endif
370 383
371/** lowlevel stuff **********************************************************/ 384/** lowlevel stuff **********************************************************/
372 385
373static SV * 386static SV * ecb_noinline
374coro_get_sv (pTHX_ const char *name, int create) 387coro_get_sv (pTHX_ const char *name, int create)
375{ 388{
376#if PERL_VERSION_ATLEAST (5,10,0) 389#if PERL_VERSION_ATLEAST (5,10,0)
377 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 390 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
378 get_sv (name, create); 391 get_sv (name, create);
379#endif 392#endif
380 return get_sv (name, create); 393 return get_sv (name, create);
381} 394}
382 395
383static AV * 396static AV * ecb_noinline
384coro_get_av (pTHX_ const char *name, int create) 397coro_get_av (pTHX_ const char *name, int create)
385{ 398{
386#if PERL_VERSION_ATLEAST (5,10,0) 399#if PERL_VERSION_ATLEAST (5,10,0)
387 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 400 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
388 get_av (name, create); 401 get_av (name, create);
389#endif 402#endif
390 return get_av (name, create); 403 return get_av (name, create);
391} 404}
392 405
393static HV * 406static HV * ecb_noinline
394coro_get_hv (pTHX_ const char *name, int create) 407coro_get_hv (pTHX_ const char *name, int create)
395{ 408{
396#if PERL_VERSION_ATLEAST (5,10,0) 409#if PERL_VERSION_ATLEAST (5,10,0)
397 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 410 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
398 get_hv (name, create); 411 get_hv (name, create);
399#endif 412#endif
400 return get_hv (name, create); 413 return get_hv (name, create);
401} 414}
402 415
403INLINE void 416ECB_INLINE void
404coro_times_update () 417coro_times_update ()
405{ 418{
406#ifdef coro_clock_gettime 419#ifdef coro_clock_gettime
407 struct timespec ts; 420 struct timespec ts;
408 421
… …
421 time_real [0] = tv [0]; 434 time_real [0] = tv [0];
422 time_real [1] = tv [1] * 1000; 435 time_real [1] = tv [1] * 1000;
423#endif 436#endif
424} 437}
425 438
426INLINE void 439ECB_INLINE void
427coro_times_add (struct coro *c) 440coro_times_add (struct coro *c)
428{ 441{
429 c->t_real [1] += time_real [1]; 442 c->t_real [1] += time_real [1];
430 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 443 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
431 c->t_real [0] += time_real [0]; 444 c->t_real [0] += time_real [0];
… …
433 c->t_cpu [1] += time_cpu [1]; 446 c->t_cpu [1] += time_cpu [1];
434 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 447 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
435 c->t_cpu [0] += time_cpu [0]; 448 c->t_cpu [0] += time_cpu [0];
436} 449}
437 450
438INLINE void 451ECB_INLINE void
439coro_times_sub (struct coro *c) 452coro_times_sub (struct coro *c)
440{ 453{
441 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 454 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
442 c->t_real [1] -= time_real [1]; 455 c->t_real [1] -= time_real [1];
443 c->t_real [0] -= time_real [0]; 456 c->t_real [0] -= time_real [0];
… …
451/* magic glue */ 464/* magic glue */
452 465
453#define CORO_MAGIC_type_cv 26 466#define CORO_MAGIC_type_cv 26
454#define CORO_MAGIC_type_state PERL_MAGIC_ext 467#define CORO_MAGIC_type_state PERL_MAGIC_ext
455 468
456#define CORO_MAGIC_NN(sv, type) \ 469#define CORO_MAGIC_NN(sv, type) \
457 (expect_true (SvMAGIC (sv)->mg_type == type) \ 470 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
458 ? SvMAGIC (sv) \ 471 ? SvMAGIC (sv) \
459 : mg_find (sv, type)) 472 : mg_find (sv, type))
460 473
461#define CORO_MAGIC(sv, type) \ 474#define CORO_MAGIC(sv, type) \
462 (expect_true (SvMAGIC (sv)) \ 475 (ecb_expect_true (SvMAGIC (sv)) \
463 ? CORO_MAGIC_NN (sv, type) \ 476 ? CORO_MAGIC_NN (sv, type) \
464 : 0) 477 : 0)
465 478
466#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 479#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
467#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 480#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
468 481
482ECB_INLINE MAGIC *
483SvSTATEhv_p (pTHX_ SV *coro)
484{
485 MAGIC *mg;
486
487 if (ecb_expect_true (
488 SvTYPE (coro) == SVt_PVHV
489 && (mg = CORO_MAGIC_state (coro))
490 && mg->mg_virtual == &coro_state_vtbl
491 ))
492 return mg;
493
494 return 0;
495}
496
469INLINE struct coro * 497ECB_INLINE struct coro *
470SvSTATE_ (pTHX_ SV *coro) 498SvSTATE_ (pTHX_ SV *coro)
471{ 499{
472 HV *stash;
473 MAGIC *mg; 500 MAGIC *mg;
474 501
475 if (SvROK (coro)) 502 if (SvROK (coro))
476 coro = SvRV (coro); 503 coro = SvRV (coro);
477 504
478 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 505 mg = SvSTATEhv_p (aTHX_ coro);
506 if (!mg)
479 croak ("Coro::State object required"); 507 croak ("Coro::State object required");
480 508
481 stash = SvSTASH (coro);
482 if (expect_false (stash != coro_stash && stash != coro_state_stash))
483 {
484 /* very slow, but rare, check */
485 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
486 croak ("Coro::State object required");
487 }
488
489 mg = CORO_MAGIC_state (coro);
490 return (struct coro *)mg->mg_ptr; 509 return (struct coro *)mg->mg_ptr;
491} 510}
492 511
493#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 512#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
494 513
… …
497#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 516#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
498 517
499/*****************************************************************************/ 518/*****************************************************************************/
500/* padlist management and caching */ 519/* padlist management and caching */
501 520
502static AV * 521ECB_INLINE AV *
503coro_derive_padlist (pTHX_ CV *cv) 522coro_derive_padlist (pTHX_ CV *cv)
504{ 523{
505 AV *padlist = CvPADLIST (cv); 524 AV *padlist = CvPADLIST (cv);
506 AV *newpadlist, *newpad; 525 AV *newpadlist, *newpad;
507 526
… …
519 av_store (newpadlist, 1, (SV *)newpad); 538 av_store (newpadlist, 1, (SV *)newpad);
520 539
521 return newpadlist; 540 return newpadlist;
522} 541}
523 542
524static void 543ECB_INLINE void
525free_padlist (pTHX_ AV *padlist) 544free_padlist (pTHX_ AV *padlist)
526{ 545{
527 /* may be during global destruction */ 546 /* may be during global destruction */
528 if (!IN_DESTRUCT) 547 if (!IN_DESTRUCT)
529 { 548 {
… …
572 0, 0, 0, 0, 591 0, 0, 0, 0,
573 coro_cv_free 592 coro_cv_free
574}; 593};
575 594
576/* the next two functions merely cache the padlists */ 595/* the next two functions merely cache the padlists */
577static void 596ECB_INLINE void
578get_padlist (pTHX_ CV *cv) 597get_padlist (pTHX_ CV *cv)
579{ 598{
580 MAGIC *mg = CORO_MAGIC_cv (cv); 599 MAGIC *mg = CORO_MAGIC_cv (cv);
581 AV *av; 600 AV *av;
582 601
583 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 602 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
584 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 603 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
585 else 604 else
586 { 605 {
587#if CORO_PREFER_PERL_FUNCTIONS 606#if CORO_PREFER_PERL_FUNCTIONS
588 /* this is probably cleaner? but also slower! */ 607 /* this is probably cleaner? but also slower! */
… …
595 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 614 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
596#endif 615#endif
597 } 616 }
598} 617}
599 618
600static void 619ECB_INLINE void
601put_padlist (pTHX_ CV *cv) 620put_padlist (pTHX_ CV *cv)
602{ 621{
603 MAGIC *mg = CORO_MAGIC_cv (cv); 622 MAGIC *mg = CORO_MAGIC_cv (cv);
604 AV *av; 623 AV *av;
605 624
606 if (expect_false (!mg)) 625 if (ecb_expect_false (!mg))
607 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 626 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
608 627
609 av = (AV *)mg->mg_obj; 628 av = (AV *)mg->mg_obj;
610 629
611 if (expect_false (AvFILLp (av) >= AvMAX (av))) 630 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
612 av_extend (av, AvFILLp (av) + 1); 631 av_extend (av, AvFILLp (av) + 1);
613 632
614 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 633 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
615} 634}
616 635
… …
661 } 680 }
662#endif 681#endif
663 } 682 }
664} 683}
665 684
666#define SWAP_SVS(coro) \ 685#define SWAP_SVS(coro) \
667 if (expect_false ((coro)->swap_sv)) \ 686 if (ecb_expect_false ((coro)->swap_sv)) \
668 swap_svs (aTHX_ (coro)) 687 swap_svs (aTHX_ (coro))
669 688
670static void 689static void
671on_enterleave_call (pTHX_ SV *cb); 690on_enterleave_call (pTHX_ SV *cb);
672 691
… …
676 perl_slots *slot = c->slot; 695 perl_slots *slot = c->slot;
677 c->slot = 0; 696 c->slot = 0;
678 697
679 PL_mainstack = c->mainstack; 698 PL_mainstack = c->mainstack;
680 699
681 GvSV (PL_defgv) = slot->defsv; 700#if CORO_JIT
682 GvAV (PL_defgv) = slot->defav; 701 load_perl_slots (slot);
683 GvSV (PL_errgv) = slot->errsv; 702#else
684 GvSV (irsgv) = slot->irsgv;
685 GvHV (PL_hintgv) = slot->hinthv;
686
687 #define VAR(name,type) PL_ ## name = slot->name; 703 #define VARx(name,expr,type) expr = slot->name;
688 # include "state.h" 704 # include "state.h"
689 #undef VAR 705 #undef VARx
706#endif
690 707
691 { 708 {
692 dSP; 709 dSP;
693 710
694 CV *cv; 711 CV *cv;
695 712
696 /* now do the ugly restore mess */ 713 /* now do the ugly restore mess */
697 while (expect_true (cv = (CV *)POPs)) 714 while (ecb_expect_true (cv = (CV *)POPs))
698 { 715 {
699 put_padlist (aTHX_ cv); /* mark this padlist as available */ 716 put_padlist (aTHX_ cv); /* mark this padlist as available */
700 CvDEPTH (cv) = PTR2IV (POPs); 717 CvDEPTH (cv) = PTR2IV (POPs);
701 CvPADLIST (cv) = (AV *)POPs; 718 CvPADLIST (cv) = (AV *)POPs;
702 } 719 }
… …
705 } 722 }
706 723
707 slf_frame = c->slf_frame; 724 slf_frame = c->slf_frame;
708 CORO_THROW = c->except; 725 CORO_THROW = c->except;
709 726
710 if (expect_false (enable_times)) 727 if (ecb_expect_false (enable_times))
711 { 728 {
712 if (expect_false (!times_valid)) 729 if (ecb_expect_false (!times_valid))
713 coro_times_update (); 730 coro_times_update ();
714 731
715 coro_times_sub (c); 732 coro_times_sub (c);
716 } 733 }
717 734
718 if (expect_false (c->on_enter)) 735 if (ecb_expect_false (c->on_enter))
719 { 736 {
720 int i; 737 int i;
721 738
722 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 739 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
723 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 740 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
729static void 746static void
730save_perl (pTHX_ Coro__State c) 747save_perl (pTHX_ Coro__State c)
731{ 748{
732 SWAP_SVS (c); 749 SWAP_SVS (c);
733 750
734 if (expect_false (c->on_leave)) 751 if (ecb_expect_false (c->on_leave))
735 { 752 {
736 int i; 753 int i;
737 754
738 for (i = AvFILLp (c->on_leave); i >= 0; --i) 755 for (i = AvFILLp (c->on_leave); i >= 0; --i)
739 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 756 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
740 } 757 }
741 758
742 times_valid = 0; 759 times_valid = 0;
743 760
744 if (expect_false (enable_times)) 761 if (ecb_expect_false (enable_times))
745 { 762 {
746 coro_times_update (); times_valid = 1; 763 coro_times_update (); times_valid = 1;
747 coro_times_add (c); 764 coro_times_add (c);
748 } 765 }
749 766
… …
763 780
764 XPUSHs (Nullsv); 781 XPUSHs (Nullsv);
765 /* this loop was inspired by pp_caller */ 782 /* this loop was inspired by pp_caller */
766 for (;;) 783 for (;;)
767 { 784 {
768 while (expect_true (cxix >= 0)) 785 while (ecb_expect_true (cxix >= 0))
769 { 786 {
770 PERL_CONTEXT *cx = &ccstk[cxix--]; 787 PERL_CONTEXT *cx = &ccstk[cxix--];
771 788
772 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 789 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
773 { 790 {
774 CV *cv = cx->blk_sub.cv; 791 CV *cv = cx->blk_sub.cv;
775 792
776 if (expect_true (CvDEPTH (cv))) 793 if (ecb_expect_true (CvDEPTH (cv)))
777 { 794 {
778 EXTEND (SP, 3); 795 EXTEND (SP, 3);
779 PUSHs ((SV *)CvPADLIST (cv)); 796 PUSHs ((SV *)CvPADLIST (cv));
780 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 797 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
781 PUSHs ((SV *)cv); 798 PUSHs ((SV *)cv);
… …
784 get_padlist (aTHX_ cv); 801 get_padlist (aTHX_ cv);
785 } 802 }
786 } 803 }
787 } 804 }
788 805
789 if (expect_true (top_si->si_type == PERLSI_MAIN)) 806 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
790 break; 807 break;
791 808
792 top_si = top_si->si_prev; 809 top_si = top_si->si_prev;
793 ccstk = top_si->si_cxstack; 810 ccstk = top_si->si_cxstack;
794 cxix = top_si->si_cxix; 811 cxix = top_si->si_cxix;
… …
796 813
797 PUTBACK; 814 PUTBACK;
798 } 815 }
799 816
800 /* allocate some space on the context stack for our purposes */ 817 /* allocate some space on the context stack for our purposes */
801 /* we manually unroll here, as usually 2 slots is enough */ 818 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
802 if (SLOT_COUNT >= 1) CXINC;
803 if (SLOT_COUNT >= 2) CXINC;
804 if (SLOT_COUNT >= 3) CXINC;
805 { 819 {
806 unsigned int i; 820 unsigned int i;
821
807 for (i = 3; i < SLOT_COUNT; ++i) 822 for (i = 0; i < SLOT_COUNT; ++i)
808 CXINC; 823 CXINC;
809 } 824
810 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 825 cxstack_ix -= SLOT_COUNT; /* undo allocation */
826 }
811 827
812 c->mainstack = PL_mainstack; 828 c->mainstack = PL_mainstack;
813 829
814 { 830 {
815 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 831 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
816 832
817 slot->defav = GvAV (PL_defgv); 833#if CORO_JIT
818 slot->defsv = DEFSV; 834 save_perl_slots (slot);
819 slot->errsv = ERRSV; 835#else
820 slot->irsgv = GvSV (irsgv);
821 slot->hinthv = GvHV (PL_hintgv);
822
823 #define VAR(name,type) slot->name = PL_ ## name; 836 #define VARx(name,expr,type) slot->name = expr;
824 # include "state.h" 837 # include "state.h"
825 #undef VAR 838 #undef VARx
839#endif
826 } 840 }
827} 841}
828 842
829/* 843/*
830 * allocate various perl stacks. This is almost an exact copy 844 * allocate various perl stacks. This is almost an exact copy
… …
836# define coro_init_stacks(thx) init_stacks () 850# define coro_init_stacks(thx) init_stacks ()
837#else 851#else
838static void 852static void
839coro_init_stacks (pTHX) 853coro_init_stacks (pTHX)
840{ 854{
841 PL_curstackinfo = new_stackinfo(32, 8); 855 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
842 PL_curstackinfo->si_type = PERLSI_MAIN; 856 PL_curstackinfo->si_type = PERLSI_MAIN;
843 PL_curstack = PL_curstackinfo->si_stack; 857 PL_curstack = PL_curstackinfo->si_stack;
844 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 858 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
845 859
846 PL_stack_base = AvARRAY(PL_curstack); 860 PL_stack_base = AvARRAY(PL_curstack);
… …
953#endif 967#endif
954 968
955/* 969/*
956 * This overrides the default magic get method of %SIG elements. 970 * This overrides the default magic get method of %SIG elements.
957 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 971 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
958 * and instead of trying to save and restore the hash elements, we just provide 972 * and instead of trying to save and restore the hash elements (extremely slow),
959 * readback here. 973 * we just provide our own readback here.
960 */ 974 */
961static int 975static int ecb_cold
962coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 976coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
963{ 977{
964 const char *s = MgPV_nolen_const (mg); 978 const char *s = MgPV_nolen_const (mg);
965 979
966 if (*s == '_') 980 if (*s == '_')
… …
978 } 992 }
979 993
980 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 994 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
981} 995}
982 996
983static int 997static int ecb_cold
984coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 998coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
985{ 999{
986 const char *s = MgPV_nolen_const (mg); 1000 const char *s = MgPV_nolen_const (mg);
987 1001
988 if (*s == '_') 1002 if (*s == '_')
… …
1002 } 1016 }
1003 1017
1004 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1018 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1005} 1019}
1006 1020
1007static int 1021static int ecb_cold
1008coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1022coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1009{ 1023{
1010 const char *s = MgPV_nolen_const (mg); 1024 const char *s = MgPV_nolen_const (mg);
1011 1025
1012 if (*s == '_') 1026 if (*s == '_')
… …
1047 return 1; 1061 return 1;
1048} 1062}
1049 1063
1050static UNOP init_perl_op; 1064static UNOP init_perl_op;
1051 1065
1052static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1066ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1053init_perl (pTHX_ struct coro *coro) 1067init_perl (pTHX_ struct coro *coro)
1054{ 1068{
1055 /* 1069 /*
1056 * emulate part of the perl startup here. 1070 * emulate part of the perl startup here.
1057 */ 1071 */
… …
1072 PL_parser = 0; 1086 PL_parser = 0;
1073#endif 1087#endif
1074 PL_hints = 0; 1088 PL_hints = 0;
1075 1089
1076 /* recreate the die/warn hooks */ 1090 /* recreate the die/warn hooks */
1077 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1091 PL_diehook = SvREFCNT_inc (rv_diehook);
1078 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1092 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1079 1093
1080 GvSV (PL_defgv) = newSV (0); 1094 GvSV (PL_defgv) = newSV (0);
1081 GvAV (PL_defgv) = coro->args; coro->args = 0; 1095 GvAV (PL_defgv) = coro->args; coro->args = 0;
1082 GvSV (PL_errgv) = newSV (0); 1096 GvSV (PL_errgv) = newSV (0);
1083 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1097 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
1104 /* this newly created coroutine might be run on an existing cctx which most 1118 /* this newly created coroutine might be run on an existing cctx which most
1105 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1119 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1106 */ 1120 */
1107 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1121 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1108 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1122 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1123 slf_frame.destroy = 0;
1109 1124
1110 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1125 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1111 init_perl_op.op_next = PL_op; 1126 init_perl_op.op_next = PL_op;
1112 init_perl_op.op_type = OP_ENTERSUB; 1127 init_perl_op.op_type = OP_ENTERSUB;
1113 init_perl_op.op_ppaddr = pp_slf; 1128 init_perl_op.op_ppaddr = pp_slf;
… …
1118 /* copy throw, in case it was set before init_perl */ 1133 /* copy throw, in case it was set before init_perl */
1119 CORO_THROW = coro->except; 1134 CORO_THROW = coro->except;
1120 1135
1121 SWAP_SVS (coro); 1136 SWAP_SVS (coro);
1122 1137
1123 if (expect_false (enable_times)) 1138 if (ecb_expect_false (enable_times))
1124 { 1139 {
1125 coro_times_update (); 1140 coro_times_update ();
1126 coro_times_sub (coro); 1141 coro_times_sub (coro);
1127 } 1142 }
1128} 1143}
… …
1152destroy_perl (pTHX_ struct coro *coro) 1167destroy_perl (pTHX_ struct coro *coro)
1153{ 1168{
1154 SV *svf [9]; 1169 SV *svf [9];
1155 1170
1156 { 1171 {
1172 SV *old_current = SvRV (coro_current);
1157 struct coro *current = SvSTATE_current; 1173 struct coro *current = SvSTATE (old_current);
1158 1174
1159 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1175 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1160 1176
1161 save_perl (aTHX_ current); 1177 save_perl (aTHX_ current);
1178
1179 /* this will cause transfer_check to croak on block*/
1180 SvRV_set (coro_current, (SV *)coro->hv);
1181
1162 load_perl (aTHX_ coro); 1182 load_perl (aTHX_ coro);
1163 1183
1164 coro_unwind_stacks (aTHX); 1184 coro_unwind_stacks (aTHX);
1165 coro_destruct_stacks (aTHX);
1166 1185
1167 /* restore swapped sv's */ 1186 /* restore swapped sv's */
1168 SWAP_SVS (coro); 1187 SWAP_SVS (coro);
1188
1189 coro_destruct_stacks (aTHX);
1169 1190
1170 // now save some sv's to be free'd later 1191 // now save some sv's to be free'd later
1171 svf [0] = GvSV (PL_defgv); 1192 svf [0] = GvSV (PL_defgv);
1172 svf [1] = (SV *)GvAV (PL_defgv); 1193 svf [1] = (SV *)GvAV (PL_defgv);
1173 svf [2] = GvSV (PL_errgv); 1194 svf [2] = GvSV (PL_errgv);
… …
1177 svf [6] = (SV *)GvHV (PL_hintgv); 1198 svf [6] = (SV *)GvHV (PL_hintgv);
1178 svf [7] = PL_diehook; 1199 svf [7] = PL_diehook;
1179 svf [8] = PL_warnhook; 1200 svf [8] = PL_warnhook;
1180 assert (9 == sizeof (svf) / sizeof (*svf)); 1201 assert (9 == sizeof (svf) / sizeof (*svf));
1181 1202
1203 SvRV_set (coro_current, old_current);
1204
1182 load_perl (aTHX_ current); 1205 load_perl (aTHX_ current);
1183 } 1206 }
1184 1207
1185 { 1208 {
1186 unsigned int i; 1209 unsigned int i;
… …
1193 SvREFCNT_dec (coro->invoke_cb); 1216 SvREFCNT_dec (coro->invoke_cb);
1194 SvREFCNT_dec (coro->invoke_av); 1217 SvREFCNT_dec (coro->invoke_av);
1195 } 1218 }
1196} 1219}
1197 1220
1198INLINE void 1221ECB_INLINE void
1199free_coro_mortal (pTHX) 1222free_coro_mortal (pTHX)
1200{ 1223{
1201 if (expect_true (coro_mortal)) 1224 if (ecb_expect_true (coro_mortal))
1202 { 1225 {
1203 SvREFCNT_dec (coro_mortal); 1226 SvREFCNT_dec ((SV *)coro_mortal);
1204 coro_mortal = 0; 1227 coro_mortal = 0;
1205 } 1228 }
1206} 1229}
1207 1230
1208static int 1231static int
… …
1341 1364
1342 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1365 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1343} 1366}
1344 1367
1345/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1368/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1346static void NOINLINE 1369static void ecb_noinline
1347cctx_prepare (pTHX) 1370cctx_prepare (pTHX)
1348{ 1371{
1349 PL_top_env = &PL_start_env; 1372 PL_top_env = &PL_start_env;
1350 1373
1351 if (cctx_current->flags & CC_TRACE) 1374 if (cctx_current->flags & CC_TRACE)
… …
1362 slf_frame.prepare = slf_prepare_set_stacklevel; 1385 slf_frame.prepare = slf_prepare_set_stacklevel;
1363 slf_frame.check = slf_check_set_stacklevel; 1386 slf_frame.check = slf_check_set_stacklevel;
1364} 1387}
1365 1388
1366/* the tail of transfer: execute stuff we can only do after a transfer */ 1389/* the tail of transfer: execute stuff we can only do after a transfer */
1367INLINE void 1390ECB_INLINE void
1368transfer_tail (pTHX) 1391transfer_tail (pTHX)
1369{ 1392{
1370 free_coro_mortal (aTHX); 1393 free_coro_mortal (aTHX);
1371} 1394}
1372 1395
… …
1495cctx_destroy (coro_cctx *cctx) 1518cctx_destroy (coro_cctx *cctx)
1496{ 1519{
1497 if (!cctx) 1520 if (!cctx)
1498 return; 1521 return;
1499 1522
1500 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1523 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1501 1524
1502 --cctx_count; 1525 --cctx_count;
1503 coro_destroy (&cctx->cctx); 1526 coro_destroy (&cctx->cctx);
1504 1527
1505 /* coro_transfer creates new, empty cctx's */ 1528 /* coro_transfer creates new, empty cctx's */
… …
1524#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1547#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1525 1548
1526static coro_cctx * 1549static coro_cctx *
1527cctx_get (pTHX) 1550cctx_get (pTHX)
1528{ 1551{
1529 while (expect_true (cctx_first)) 1552 while (ecb_expect_true (cctx_first))
1530 { 1553 {
1531 coro_cctx *cctx = cctx_first; 1554 coro_cctx *cctx = cctx_first;
1532 cctx_first = cctx->next; 1555 cctx_first = cctx->next;
1533 --cctx_idle; 1556 --cctx_idle;
1534 1557
1535 if (expect_true (!CCTX_EXPIRED (cctx))) 1558 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1536 return cctx; 1559 return cctx;
1537 1560
1538 cctx_destroy (cctx); 1561 cctx_destroy (cctx);
1539 } 1562 }
1540 1563
… …
1545cctx_put (coro_cctx *cctx) 1568cctx_put (coro_cctx *cctx)
1546{ 1569{
1547 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1570 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1548 1571
1549 /* free another cctx if overlimit */ 1572 /* free another cctx if overlimit */
1550 if (expect_false (cctx_idle >= cctx_max_idle)) 1573 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1551 { 1574 {
1552 coro_cctx *first = cctx_first; 1575 coro_cctx *first = cctx_first;
1553 cctx_first = first->next; 1576 cctx_first = first->next;
1554 --cctx_idle; 1577 --cctx_idle;
1555 1578
… …
1566static void 1589static void
1567transfer_check (pTHX_ struct coro *prev, struct coro *next) 1590transfer_check (pTHX_ struct coro *prev, struct coro *next)
1568{ 1591{
1569 /* TODO: throwing up here is considered harmful */ 1592 /* TODO: throwing up here is considered harmful */
1570 1593
1571 if (expect_true (prev != next)) 1594 if (ecb_expect_true (prev != next))
1572 { 1595 {
1573 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1596 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1574 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1597 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1575 1598
1576 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1599 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1577 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1600 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1578 1601
1579#if !PERL_VERSION_ATLEAST (5,10,0) 1602#if !PERL_VERSION_ATLEAST (5,10,0)
1580 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1603 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1581 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1604 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1582#endif 1605#endif
1583 } 1606 }
1584} 1607}
1585 1608
1586/* always use the TRANSFER macro */ 1609/* always use the TRANSFER macro */
1587static void NOINLINE /* noinline so we have a fixed stackframe */ 1610static void ecb_noinline /* noinline so we have a fixed stackframe */
1588transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1611transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1589{ 1612{
1590 dSTACKLEVEL; 1613 dSTACKLEVEL;
1591 1614
1592 /* sometimes transfer is only called to set idle_sp */ 1615 /* sometimes transfer is only called to set idle_sp */
1593 if (expect_false (!prev)) 1616 if (ecb_expect_false (!prev))
1594 { 1617 {
1595 cctx_current->idle_sp = STACKLEVEL; 1618 cctx_current->idle_sp = STACKLEVEL;
1596 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1619 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1597 } 1620 }
1598 else if (expect_true (prev != next)) 1621 else if (ecb_expect_true (prev != next))
1599 { 1622 {
1600 coro_cctx *cctx_prev; 1623 coro_cctx *cctx_prev;
1601 1624
1602 if (expect_false (prev->flags & CF_NEW)) 1625 if (ecb_expect_false (prev->flags & CF_NEW))
1603 { 1626 {
1604 /* create a new empty/source context */ 1627 /* create a new empty/source context */
1605 prev->flags &= ~CF_NEW; 1628 prev->flags &= ~CF_NEW;
1606 prev->flags |= CF_RUNNING; 1629 prev->flags |= CF_RUNNING;
1607 } 1630 }
… …
1610 next->flags |= CF_RUNNING; 1633 next->flags |= CF_RUNNING;
1611 1634
1612 /* first get rid of the old state */ 1635 /* first get rid of the old state */
1613 save_perl (aTHX_ prev); 1636 save_perl (aTHX_ prev);
1614 1637
1615 if (expect_false (next->flags & CF_NEW)) 1638 if (ecb_expect_false (next->flags & CF_NEW))
1616 { 1639 {
1617 /* need to start coroutine */ 1640 /* need to start coroutine */
1618 next->flags &= ~CF_NEW; 1641 next->flags &= ~CF_NEW;
1619 /* setup coroutine call */ 1642 /* setup coroutine call */
1620 init_perl (aTHX_ next); 1643 init_perl (aTHX_ next);
1621 } 1644 }
1622 else 1645 else
1623 load_perl (aTHX_ next); 1646 load_perl (aTHX_ next);
1624 1647
1625 /* possibly untie and reuse the cctx */ 1648 /* possibly untie and reuse the cctx */
1626 if (expect_true ( 1649 if (ecb_expect_true (
1627 cctx_current->idle_sp == STACKLEVEL 1650 cctx_current->idle_sp == STACKLEVEL
1628 && !(cctx_current->flags & CC_TRACE) 1651 && !(cctx_current->flags & CC_TRACE)
1629 && !force_cctx 1652 && !force_cctx
1630 )) 1653 ))
1631 { 1654 {
1632 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1655 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1633 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1656 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1634 1657
1635 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1658 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1636 /* without this the next cctx_get might destroy the running cctx while still in use */ 1659 /* without this the next cctx_get might destroy the running cctx while still in use */
1637 if (expect_false (CCTX_EXPIRED (cctx_current))) 1660 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1638 if (expect_true (!next->cctx)) 1661 if (ecb_expect_true (!next->cctx))
1639 next->cctx = cctx_get (aTHX); 1662 next->cctx = cctx_get (aTHX);
1640 1663
1641 cctx_put (cctx_current); 1664 cctx_put (cctx_current);
1642 } 1665 }
1643 else 1666 else
1644 prev->cctx = cctx_current; 1667 prev->cctx = cctx_current;
1645 1668
1646 ++next->usecount; 1669 ++next->usecount;
1647 1670
1648 cctx_prev = cctx_current; 1671 cctx_prev = cctx_current;
1649 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1672 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1650 1673
1651 next->cctx = 0; 1674 next->cctx = 0;
1652 1675
1653 if (expect_false (cctx_prev != cctx_current)) 1676 if (ecb_expect_false (cctx_prev != cctx_current))
1654 { 1677 {
1655 cctx_prev->top_env = PL_top_env; 1678 cctx_prev->top_env = PL_top_env;
1656 PL_top_env = cctx_current->top_env; 1679 PL_top_env = cctx_current->top_env;
1657 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1680 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1658 } 1681 }
… …
1664#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1687#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1665#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1688#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1666 1689
1667/** high level stuff ********************************************************/ 1690/** high level stuff ********************************************************/
1668 1691
1692/* this function is actually Coro, not Coro::State, but we call it from here */
1693/* because it is convenient - but it hasn't been declared yet for that reason */
1669static int 1694static void
1695coro_call_on_destroy (pTHX_ struct coro *coro);
1696
1697static void
1670coro_state_destroy (pTHX_ struct coro *coro) 1698coro_state_destroy (pTHX_ struct coro *coro)
1671{ 1699{
1672 if (coro->flags & CF_DESTROYED) 1700 if (coro->flags & CF_ZOMBIE)
1673 return 0; 1701 return;
1674 1702
1675 if (coro->on_destroy && !PL_dirty)
1676 coro->on_destroy (aTHX_ coro); 1703 slf_destroy (aTHX_ coro);
1677 1704
1678 coro->flags |= CF_DESTROYED; 1705 coro->flags |= CF_ZOMBIE;
1679 1706
1680 if (coro->flags & CF_READY) 1707 if (coro->flags & CF_READY)
1681 { 1708 {
1682 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1709 /* reduce nready, as destroying a ready coro effectively unreadies it */
1683 /* alternative: look through all ready queues and remove the coro */ 1710 /* alternative: look through all ready queues and remove the coro */
1684 --coro_nready; 1711 --coro_nready;
1685 } 1712 }
1686 else 1713 else
1687 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1714 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1715
1716 if (coro->next) coro->next->prev = coro->prev;
1717 if (coro->prev) coro->prev->next = coro->next;
1718 if (coro == coro_first) coro_first = coro->next;
1688 1719
1689 if (coro->mainstack 1720 if (coro->mainstack
1690 && coro->mainstack != main_mainstack 1721 && coro->mainstack != main_mainstack
1691 && coro->slot 1722 && coro->slot
1692 && !PL_dirty) 1723 && !PL_dirty)
1693 destroy_perl (aTHX_ coro); 1724 destroy_perl (aTHX_ coro);
1694 1725
1695 if (coro->next) coro->next->prev = coro->prev;
1696 if (coro->prev) coro->prev->next = coro->next;
1697 if (coro == coro_first) coro_first = coro->next;
1698
1699 cctx_destroy (coro->cctx); 1726 cctx_destroy (coro->cctx);
1700 SvREFCNT_dec (coro->startcv); 1727 SvREFCNT_dec (coro->startcv);
1701 SvREFCNT_dec (coro->args); 1728 SvREFCNT_dec (coro->args);
1702 SvREFCNT_dec (coro->swap_sv); 1729 SvREFCNT_dec (coro->swap_sv);
1703 SvREFCNT_dec (CORO_THROW); 1730 SvREFCNT_dec (CORO_THROW);
1704 1731
1705 return 1; 1732 coro_call_on_destroy (aTHX_ coro);
1733
1734 /* more destruction mayhem in coro_state_free */
1706} 1735}
1707 1736
1708static int 1737static int
1709coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1738coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1710{ 1739{
1711 struct coro *coro = (struct coro *)mg->mg_ptr; 1740 struct coro *coro = (struct coro *)mg->mg_ptr;
1712 mg->mg_ptr = 0; 1741 mg->mg_ptr = 0;
1713 1742
1714 coro->hv = 0;
1715
1716 if (--coro->refcnt < 0)
1717 {
1718 coro_state_destroy (aTHX_ coro); 1743 coro_state_destroy (aTHX_ coro);
1744 SvREFCNT_dec (coro->on_destroy);
1745 SvREFCNT_dec (coro->status);
1746
1719 Safefree (coro); 1747 Safefree (coro);
1720 }
1721 1748
1722 return 0; 1749 return 0;
1723} 1750}
1724 1751
1725static int 1752static int ecb_cold
1726coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1753coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1727{ 1754{
1728 struct coro *coro = (struct coro *)mg->mg_ptr; 1755 /* called when perl clones the current process the slow way (windows process emulation) */
1729 1756 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1730 ++coro->refcnt; 1757 mg->mg_ptr = 0;
1758 mg->mg_virtual = 0;
1731 1759
1732 return 0; 1760 return 0;
1733} 1761}
1734 1762
1735static MGVTBL coro_state_vtbl = { 1763static MGVTBL coro_state_vtbl = {
… …
1760 TRANSFER (ta, 1); 1788 TRANSFER (ta, 1);
1761} 1789}
1762 1790
1763/** Coro ********************************************************************/ 1791/** Coro ********************************************************************/
1764 1792
1765INLINE void 1793ECB_INLINE void
1766coro_enq (pTHX_ struct coro *coro) 1794coro_enq (pTHX_ struct coro *coro)
1767{ 1795{
1768 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1796 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1769 1797
1770 SvREFCNT_inc_NN (coro->hv); 1798 SvREFCNT_inc_NN (coro->hv);
… …
1772 coro->next_ready = 0; 1800 coro->next_ready = 0;
1773 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1801 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1774 ready [1] = coro; 1802 ready [1] = coro;
1775} 1803}
1776 1804
1777INLINE struct coro * 1805ECB_INLINE struct coro *
1778coro_deq (pTHX) 1806coro_deq (pTHX)
1779{ 1807{
1780 int prio; 1808 int prio;
1781 1809
1782 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1810 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1835{ 1863{
1836 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1864 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1837} 1865}
1838 1866
1839/* expects to own a reference to next->hv */ 1867/* expects to own a reference to next->hv */
1840INLINE void 1868ECB_INLINE void
1841prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1869prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1842{ 1870{
1843 SV *prev_sv = SvRV (coro_current); 1871 SV *prev_sv = SvRV (coro_current);
1844 1872
1845 ta->prev = SvSTATE_hv (prev_sv); 1873 ta->prev = SvSTATE_hv (prev_sv);
… …
1858{ 1886{
1859 for (;;) 1887 for (;;)
1860 { 1888 {
1861 struct coro *next = coro_deq (aTHX); 1889 struct coro *next = coro_deq (aTHX);
1862 1890
1863 if (expect_true (next)) 1891 if (ecb_expect_true (next))
1864 { 1892 {
1865 /* cannot transfer to destroyed coros, skip and look for next */ 1893 /* cannot transfer to destroyed coros, skip and look for next */
1866 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1894 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1867 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1895 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1868 else 1896 else
1869 { 1897 {
1870 next->flags &= ~CF_READY; 1898 next->flags &= ~CF_READY;
1871 --coro_nready; 1899 --coro_nready;
… …
1904 } 1932 }
1905 } 1933 }
1906 } 1934 }
1907} 1935}
1908 1936
1909INLINE void 1937ECB_INLINE void
1910prepare_cede (pTHX_ struct coro_transfer_args *ta) 1938prepare_cede (pTHX_ struct coro_transfer_args *ta)
1911{ 1939{
1912 api_ready (aTHX_ coro_current); 1940 api_ready (aTHX_ coro_current);
1913 prepare_schedule (aTHX_ ta); 1941 prepare_schedule (aTHX_ ta);
1914} 1942}
1915 1943
1916INLINE void 1944ECB_INLINE void
1917prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1945prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1918{ 1946{
1919 SV *prev = SvRV (coro_current); 1947 SV *prev = SvRV (coro_current);
1920 1948
1921 if (coro_nready) 1949 if (coro_nready)
… …
1951{ 1979{
1952 struct coro_transfer_args ta; 1980 struct coro_transfer_args ta;
1953 1981
1954 prepare_cede (aTHX_ &ta); 1982 prepare_cede (aTHX_ &ta);
1955 1983
1956 if (expect_true (ta.prev != ta.next)) 1984 if (ecb_expect_true (ta.prev != ta.next))
1957 { 1985 {
1958 TRANSFER (ta, 1); 1986 TRANSFER (ta, 1);
1959 return 1; 1987 return 1;
1960 } 1988 }
1961 else 1989 else
… …
2004 coro->slot->runops = RUNOPS_DEFAULT; 2032 coro->slot->runops = RUNOPS_DEFAULT;
2005 } 2033 }
2006} 2034}
2007 2035
2008static void 2036static void
2037coro_push_av (pTHX_ AV *av, I32 gimme_v)
2038{
2039 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2040 {
2041 dSP;
2042
2043 if (gimme_v == G_SCALAR)
2044 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2045 else
2046 {
2047 int i;
2048 EXTEND (SP, AvFILLp (av) + 1);
2049
2050 for (i = 0; i <= AvFILLp (av); ++i)
2051 PUSHs (AvARRAY (av)[i]);
2052 }
2053
2054 PUTBACK;
2055 }
2056}
2057
2058static void
2059coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2060{
2061 if (!coro->on_destroy)
2062 coro->on_destroy = newAV ();
2063
2064 av_push (coro->on_destroy, cb);
2065}
2066
2067static void
2068slf_destroy_join (pTHX_ struct CoroSLF *frame)
2069{
2070 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2071}
2072
2073static int
2074slf_check_join (pTHX_ struct CoroSLF *frame)
2075{
2076 struct coro *coro = (struct coro *)frame->data;
2077
2078 if (!coro->status)
2079 return 1;
2080
2081 frame->destroy = 0;
2082
2083 coro_push_av (aTHX_ coro->status, GIMME_V);
2084
2085 SvREFCNT_dec ((SV *)coro->hv);
2086
2087 return 0;
2088}
2089
2090static void
2091slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2092{
2093 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2094
2095 if (items > 1)
2096 croak ("join called with too many arguments");
2097
2098 if (coro->status)
2099 frame->prepare = prepare_nop;
2100 else
2101 {
2102 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2103 frame->prepare = prepare_schedule;
2104 }
2105
2106 frame->check = slf_check_join;
2107 frame->destroy = slf_destroy_join;
2108 frame->data = (void *)coro;
2109 SvREFCNT_inc (coro->hv);
2110}
2111
2112static void
2009coro_call_on_destroy (pTHX_ struct coro *coro) 2113coro_call_on_destroy (pTHX_ struct coro *coro)
2010{ 2114{
2011 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2115 AV *od = coro->on_destroy;
2012 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2013 2116
2014 if (on_destroyp) 2117 if (!od)
2015 { 2118 return;
2016 AV *on_destroy = (AV *)SvRV (*on_destroyp);
2017 2119
2018 while (AvFILLp (on_destroy) >= 0) 2120 while (AvFILLp (od) >= 0)
2121 {
2122 SV *cb = sv_2mortal (av_pop (od));
2123
2124 /* coro hv's (and only hv's at the moment) are supported as well */
2125 if (SvSTATEhv_p (aTHX_ cb))
2126 api_ready (aTHX_ cb);
2127 else
2019 { 2128 {
2020 dSP; /* don't disturb outer sp */ 2129 dSP; /* don't disturb outer sp */
2021 SV *cb = av_pop (on_destroy);
2022
2023 PUSHMARK (SP); 2130 PUSHMARK (SP);
2024 2131
2025 if (statusp) 2132 if (coro->status)
2026 { 2133 {
2027 int i; 2134 PUTBACK;
2028 AV *status = (AV *)SvRV (*statusp); 2135 coro_push_av (aTHX_ coro->status, G_ARRAY);
2029 EXTEND (SP, AvFILLp (status) + 1); 2136 SPAGAIN;
2030
2031 for (i = 0; i <= AvFILLp (status); ++i)
2032 PUSHs (AvARRAY (status)[i]);
2033 } 2137 }
2034 2138
2035 PUTBACK; 2139 PUTBACK;
2036 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2140 call_sv (cb, G_VOID | G_DISCARD);
2037 } 2141 }
2038 } 2142 }
2039} 2143}
2040 2144
2041static void 2145static void
2042slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2146coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2043{ 2147{
2044 int i; 2148 AV *av;
2045 HV *hv = (HV *)SvRV (coro_current); 2149
2046 AV *av = newAV (); 2150 if (coro->status)
2151 {
2152 av = coro->status;
2153 av_clear (av);
2154 }
2155 else
2156 av = coro->status = newAV ();
2047 2157
2048 /* items are actually not so common, so optimise for this case */ 2158 /* items are actually not so common, so optimise for this case */
2049 if (items) 2159 if (items)
2050 { 2160 {
2161 int i;
2162
2051 av_extend (av, items - 1); 2163 av_extend (av, items - 1);
2052 2164
2053 for (i = 0; i < items; ++i) 2165 for (i = 0; i < items; ++i)
2054 av_push (av, SvREFCNT_inc_NN (arg [i])); 2166 av_push (av, SvREFCNT_inc_NN (arg [i]));
2055 } 2167 }
2168}
2056 2169
2057 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2170static void
2058 2171slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2172{
2059 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2173 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2060 api_ready (aTHX_ sv_manager); 2174 api_ready (aTHX_ sv_manager);
2061 2175
2062 frame->prepare = prepare_schedule; 2176 frame->prepare = prepare_schedule;
2063 frame->check = slf_check_repeat; 2177 frame->check = slf_check_repeat;
2064 2178
2065 /* as a minor optimisation, we could unwind all stacks here */ 2179 /* as a minor optimisation, we could unwind all stacks here */
2066 /* but that puts extra pressure on pp_slf, and is not worth much */ 2180 /* but that puts extra pressure on pp_slf, and is not worth much */
2067 /*coro_unwind_stacks (aTHX);*/ 2181 /*coro_unwind_stacks (aTHX);*/
2182}
2183
2184static void
2185slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2186{
2187 HV *coro_hv = (HV *)SvRV (coro_current);
2188
2189 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2190 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2191}
2192
2193static void
2194slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2195{
2196 HV *coro_hv;
2197 struct coro *coro;
2198
2199 if (items <= 0)
2200 croak ("Coro::cancel called without coro object,");
2201
2202 coro = SvSTATE (arg [0]);
2203 coro_hv = coro->hv;
2204
2205 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2206
2207 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2208 {
2209 /* coro currently busy cancelling something, so just notify it */
2210 coro->slf_frame.data = (void *)coro;
2211
2212 frame->prepare = prepare_nop;
2213 frame->check = slf_check_nop;
2214 }
2215 else if (coro_hv == (HV *)SvRV (coro_current))
2216 {
2217 /* cancelling the current coro is allowed, and equals terminate */
2218 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2219 }
2220 else
2221 {
2222 struct coro *self = SvSTATE_current;
2223
2224 /* otherwise we cancel directly, purely for speed reasons
2225 * unfortunately, this requires some magic trickery, as
2226 * somebody else could cancel us, so we have to fight the cancellation.
2227 * this is ugly, and hopefully fully worth the extra speed.
2228 * besides, I can't get the slow-but-safe version working...
2229 */
2230 slf_frame.data = 0;
2231 self->flags |= CF_NOCANCEL;
2232 coro_state_destroy (aTHX_ coro);
2233 self->flags &= ~CF_NOCANCEL;
2234
2235 if (slf_frame.data)
2236 {
2237 /* while we were busy we have been cancelled, so terminate */
2238 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2239 }
2240 else
2241 {
2242 frame->prepare = prepare_nop;
2243 frame->check = slf_check_nop;
2244 }
2245 }
2246}
2247
2248static int
2249slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2250{
2251 frame->prepare = 0;
2252 coro_unwind_stacks (aTHX);
2253
2254 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2255
2256 return 1;
2257}
2258
2259static int
2260safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2261{
2262 if (coro->cctx)
2263 croak ("coro inside C callback, unable to cancel at this time, caught");
2264
2265 if (coro->flags & CF_NEW)
2266 {
2267 coro_set_status (aTHX_ coro, arg, items);
2268 coro_state_destroy (aTHX_ coro);
2269 }
2270 else
2271 {
2272 if (!coro->slf_frame.prepare)
2273 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2274
2275 slf_destroy (aTHX_ coro);
2276
2277 coro_set_status (aTHX_ coro, arg, items);
2278 coro->slf_frame.prepare = prepare_nop;
2279 coro->slf_frame.check = slf_check_safe_cancel;
2280
2281 api_ready (aTHX_ (SV *)coro->hv);
2282 }
2283
2284 return 1;
2068} 2285}
2069 2286
2070/*****************************************************************************/ 2287/*****************************************************************************/
2071/* async pool handler */ 2288/* async pool handler */
2072 2289
… …
2103slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2320slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2104{ 2321{
2105 HV *hv = (HV *)SvRV (coro_current); 2322 HV *hv = (HV *)SvRV (coro_current);
2106 struct coro *coro = SvSTATE_hv ((SV *)hv); 2323 struct coro *coro = SvSTATE_hv ((SV *)hv);
2107 2324
2108 if (expect_true (coro->saved_deffh)) 2325 if (ecb_expect_true (coro->saved_deffh))
2109 { 2326 {
2110 /* subsequent iteration */ 2327 /* subsequent iteration */
2111 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2328 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2112 coro->saved_deffh = 0; 2329 coro->saved_deffh = 0;
2113 2330
2114 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2331 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2115 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2332 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2116 { 2333 {
2117 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2334 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2118 coro->invoke_av = newAV (); 2335 return;
2119
2120 frame->prepare = prepare_nop;
2121 } 2336 }
2122 else 2337 else
2123 { 2338 {
2124 av_clear (GvAV (PL_defgv)); 2339 av_clear (GvAV (PL_defgv));
2125 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2340 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2348static void 2563static void
2349slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2564slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2350{ 2565{
2351 frame->prepare = prepare_cede_notself; 2566 frame->prepare = prepare_cede_notself;
2352 frame->check = slf_check_nop; 2567 frame->check = slf_check_nop;
2568}
2569
2570/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2571static void
2572slf_destroy (pTHX_ struct coro *coro)
2573{
2574 /* this callback is reserved for slf functions needing to do cleanup */
2575 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2576 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2577
2578 /*
2579 * The on_destroy above most likely is from an SLF call.
2580 * Since by definition the SLF call will not finish when we destroy
2581 * the coro, we will have to force-finish it here, otherwise
2582 * cleanup functions cannot call SLF functions.
2583 */
2584 coro->slf_frame.prepare = 0;
2353} 2585}
2354 2586
2355/* 2587/*
2356 * these not obviously related functions are all rolled into one 2588 * these not obviously related functions are all rolled into one
2357 * function to increase chances that they all will call transfer with the same 2589 * function to increase chances that they all will call transfer with the same
… …
2364 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2596 I32 checkmark; /* mark SP to see how many elements check has pushed */
2365 2597
2366 /* set up the slf frame, unless it has already been set-up */ 2598 /* set up the slf frame, unless it has already been set-up */
2367 /* the latter happens when a new coro has been started */ 2599 /* the latter happens when a new coro has been started */
2368 /* or when a new cctx was attached to an existing coroutine */ 2600 /* or when a new cctx was attached to an existing coroutine */
2369 if (expect_true (!slf_frame.prepare)) 2601 if (ecb_expect_true (!slf_frame.prepare))
2370 { 2602 {
2371 /* first iteration */ 2603 /* first iteration */
2372 dSP; 2604 dSP;
2373 SV **arg = PL_stack_base + TOPMARK + 1; 2605 SV **arg = PL_stack_base + TOPMARK + 1;
2374 int items = SP - arg; /* args without function object */ 2606 int items = SP - arg; /* args without function object */
… …
2415 while (slf_frame.check (aTHX_ &slf_frame)); 2647 while (slf_frame.check (aTHX_ &slf_frame));
2416 2648
2417 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2649 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2418 2650
2419 /* exception handling */ 2651 /* exception handling */
2420 if (expect_false (CORO_THROW)) 2652 if (ecb_expect_false (CORO_THROW))
2421 { 2653 {
2422 SV *exception = sv_2mortal (CORO_THROW); 2654 SV *exception = sv_2mortal (CORO_THROW);
2423 2655
2424 CORO_THROW = 0; 2656 CORO_THROW = 0;
2425 sv_setsv (ERRSV, exception); 2657 sv_setsv (ERRSV, exception);
2426 croak (0); 2658 croak (0);
2427 } 2659 }
2428 2660
2429 /* return value handling - mostly like entersub */ 2661 /* return value handling - mostly like entersub */
2430 /* make sure we put something on the stack in scalar context */ 2662 /* make sure we put something on the stack in scalar context */
2431 if (GIMME_V == G_SCALAR) 2663 if (GIMME_V == G_SCALAR
2664 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2432 { 2665 {
2433 dSP; 2666 dSP;
2434 SV **bot = PL_stack_base + checkmark; 2667 SV **bot = PL_stack_base + checkmark;
2435 2668
2436 if (sp == bot) /* too few, push undef */ 2669 if (sp == bot) /* too few, push undef */
2437 bot [1] = &PL_sv_undef; 2670 bot [1] = &PL_sv_undef;
2438 else if (sp != bot + 1) /* too many, take last one */ 2671 else /* too many, take last one */
2439 bot [1] = *sp; 2672 bot [1] = *sp;
2440 2673
2441 SP = bot + 1; 2674 SP = bot + 1;
2442 2675
2443 PUTBACK; 2676 PUTBACK;
… …
2550{ 2783{
2551 PerlIOBuf base; 2784 PerlIOBuf base;
2552 NV next, every; 2785 NV next, every;
2553} PerlIOCede; 2786} PerlIOCede;
2554 2787
2555static IV 2788static IV ecb_cold
2556PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2789PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2557{ 2790{
2558 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2791 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2559 2792
2560 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2793 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2561 self->next = nvtime () + self->every; 2794 self->next = nvtime () + self->every;
2562 2795
2563 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2796 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2564} 2797}
2565 2798
2566static SV * 2799static SV * ecb_cold
2567PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2800PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2568{ 2801{
2569 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2802 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2570 2803
2571 return newSVnv (self->every); 2804 return newSVnv (self->every);
… …
2683 SvREFCNT_dec (cb); 2916 SvREFCNT_dec (cb);
2684 } 2917 }
2685} 2918}
2686 2919
2687static void 2920static void
2688coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2921coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2689{ 2922{
2690 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2923 /* call $sem->adjust (0) to possibly wake up some other waiters */
2691 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2924 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2692} 2925}
2693 2926
2694static int 2927static int
2695slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2928slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2696{ 2929{
2697 AV *av = (AV *)frame->data; 2930 AV *av = (AV *)frame->data;
2698 SV *count_sv = AvARRAY (av)[0]; 2931 SV *count_sv = AvARRAY (av)[0];
2932 SV *coro_hv = SvRV (coro_current);
2699 2933
2700 /* if we are about to throw, don't actually acquire the lock, just throw */ 2934 /* if we are about to throw, don't actually acquire the lock, just throw */
2701 if (CORO_THROW) 2935 if (CORO_THROW)
2702 return 0; 2936 return 0;
2703 else if (SvIVX (count_sv) > 0) 2937 else if (SvIVX (count_sv) > 0)
2704 { 2938 {
2705 SvSTATE_current->on_destroy = 0; 2939 frame->destroy = 0;
2706 2940
2707 if (acquire) 2941 if (acquire)
2708 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2942 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2709 else 2943 else
2710 coro_semaphore_adjust (aTHX_ av, 0); 2944 coro_semaphore_adjust (aTHX_ av, 0);
… …
2715 { 2949 {
2716 int i; 2950 int i;
2717 /* if we were woken up but can't down, we look through the whole */ 2951 /* if we were woken up but can't down, we look through the whole */
2718 /* waiters list and only add us if we aren't in there already */ 2952 /* waiters list and only add us if we aren't in there already */
2719 /* this avoids some degenerate memory usage cases */ 2953 /* this avoids some degenerate memory usage cases */
2720 2954 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug
2721 for (i = 1; i <= AvFILLp (av); ++i)
2722 if (AvARRAY (av)[i] == SvRV (coro_current)) 2955 if (AvARRAY (av)[i] == coro_hv)
2723 return 1; 2956 return 1;
2724 2957
2725 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2958 av_push (av, SvREFCNT_inc (coro_hv));
2726 return 1; 2959 return 1;
2727 } 2960 }
2728} 2961}
2729 2962
2730static int 2963static int
… …
2753 { 2986 {
2754 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2987 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2755 2988
2756 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2989 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2757 frame->prepare = prepare_schedule; 2990 frame->prepare = prepare_schedule;
2758
2759 /* to avoid race conditions when a woken-up coro gets terminated */ 2991 /* to avoid race conditions when a woken-up coro gets terminated */
2760 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2992 /* we arrange for a temporary on_destroy that calls adjust (0) */
2761 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2993 frame->destroy = coro_semaphore_destroy;
2762 } 2994 }
2763} 2995}
2764 2996
2765static void 2997static void
2766slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2998slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2984 dSP; 3216 dSP;
2985 3217
2986 static SV *prio_cv; 3218 static SV *prio_cv;
2987 static SV *prio_sv; 3219 static SV *prio_sv;
2988 3220
2989 if (expect_false (!prio_cv)) 3221 if (ecb_expect_false (!prio_cv))
2990 { 3222 {
2991 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3223 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2992 prio_sv = newSViv (0); 3224 prio_sv = newSViv (0);
2993 } 3225 }
2994 3226
… …
3100 } 3332 }
3101 3333
3102 return coro_sv; 3334 return coro_sv;
3103} 3335}
3104 3336
3337#ifndef __cplusplus
3338ecb_cold XS(boot_Coro__State);
3339#endif
3340
3341#if CORO_JIT
3342
3343static void ecb_noinline ecb_cold
3344pushav_3uv (pTHX_ UV a, UV b, UV c)
3345{
3346 dSP;
3347 AV *av = newAV ();
3348
3349 av_store (av, 2, newSVuv (c));
3350 av_store (av, 1, newSVuv (b));
3351 av_store (av, 0, newSVuv (a));
3352
3353 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3354
3355 PUTBACK;
3356}
3357
3358static void ecb_noinline ecb_cold
3359jit_init (pTHX)
3360{
3361 dSP;
3362 SV *load, *save;
3363 char *map_base;
3364 char *load_ptr, *save_ptr;
3365 STRLEN load_len, save_len;
3366 int count;
3367
3368 PUSHMARK (SP);
3369 PUTBACK;
3370#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type));
3371# include "state.h"
3372#undef VARx
3373 count = call_pv ("Coro::State::_jit", G_ARRAY);
3374 SPAGAIN;
3375
3376 save = POPs; save_ptr = SvPVbyte (save, save_len);
3377 load = POPs; load_ptr = SvPVbyte (load, load_len);
3378
3379 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3380
3381 assert (("Coro: unable mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3382
3383 load_perl_slots = (load_save_perl_slots_type)map_base;
3384 memcpy (map_base, load_ptr, load_len);
3385
3386 map_base += (load_len + 15) & ~15;
3387
3388 save_perl_slots = (load_save_perl_slots_type)map_base;
3389 memcpy (map_base, save_ptr, save_len);
3390}
3391
3392#endif
3393
3105MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3394MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3106 3395
3107PROTOTYPES: DISABLE 3396PROTOTYPES: DISABLE
3108 3397
3109BOOT: 3398BOOT:
… …
3113 coro_thx = PERL_GET_CONTEXT; 3402 coro_thx = PERL_GET_CONTEXT;
3114# endif 3403# endif
3115#endif 3404#endif
3116 BOOT_PAGESIZE; 3405 BOOT_PAGESIZE;
3117 3406
3407 /* perl defines these to check for existance first, but why it doesn't */
3408 /* just create them one at init time is not clear to me, except for */
3409 /* programs trying to delete them, but... */
3410 /* anyway, we declare this as invalid and make sure they are initialised here */
3411 DEFSV;
3412 ERRSV;
3413
3118 cctx_current = cctx_new_empty (); 3414 cctx_current = cctx_new_empty ();
3119 3415
3120 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3416 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3121 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3417 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3122 3418
… …
3161 coroapi.prepare_nop = prepare_nop; 3457 coroapi.prepare_nop = prepare_nop;
3162 coroapi.prepare_schedule = prepare_schedule; 3458 coroapi.prepare_schedule = prepare_schedule;
3163 coroapi.prepare_cede = prepare_cede; 3459 coroapi.prepare_cede = prepare_cede;
3164 coroapi.prepare_cede_notself = prepare_cede_notself; 3460 coroapi.prepare_cede_notself = prepare_cede_notself;
3165 3461
3166 time_init (); 3462 time_init (aTHX);
3167 3463
3168 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3464 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3465#if CORO_JIT
3466 PUTBACK;
3467 require_pv ("Coro/jit-" CORO_JIT_TYPE ".pl");
3468 jit_init (aTHX);
3469 perl_eval_pv ("undef &Coro::State::_jit", 1);
3470 SPAGAIN;
3471#endif
3169} 3472}
3170 3473
3171SV * 3474SV *
3172new (SV *klass, ...) 3475new (SV *klass, ...)
3173 ALIAS: 3476 ALIAS:
… …
3180void 3483void
3181transfer (...) 3484transfer (...)
3182 PROTOTYPE: $$ 3485 PROTOTYPE: $$
3183 CODE: 3486 CODE:
3184 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3487 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3185
3186bool
3187_destroy (SV *coro_sv)
3188 CODE:
3189 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3190 OUTPUT:
3191 RETVAL
3192 3488
3193void 3489void
3194_exit (int code) 3490_exit (int code)
3195 PROTOTYPE: $ 3491 PROTOTYPE: $
3196 CODE: 3492 CODE:
… …
3272 CODE: 3568 CODE:
3273{ 3569{
3274 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3570 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3275 { 3571 {
3276 struct coro *current = SvSTATE_current; 3572 struct coro *current = SvSTATE_current;
3573 struct CoroSLF slf_save;
3277 3574
3278 if (current != coro) 3575 if (current != coro)
3279 { 3576 {
3280 PUTBACK; 3577 PUTBACK;
3281 save_perl (aTHX_ current); 3578 save_perl (aTHX_ current);
3282 load_perl (aTHX_ coro); 3579 load_perl (aTHX_ coro);
3580 /* the coro is most likely in an active SLF call.
3581 * while not strictly required (the code we execute is
3582 * not allowed to call any SLF functions), it's cleaner
3583 * to reinitialise the slf_frame and restore it later.
3584 * This might one day allow us to actually do SLF calls
3585 * from code executed here.
3586 */
3587 slf_save = slf_frame;
3588 slf_frame.prepare = 0;
3283 SPAGAIN; 3589 SPAGAIN;
3284 } 3590 }
3285 3591
3286 PUSHSTACK; 3592 PUSHSTACK;
3287 3593
… …
3297 SPAGAIN; 3603 SPAGAIN;
3298 3604
3299 if (current != coro) 3605 if (current != coro)
3300 { 3606 {
3301 PUTBACK; 3607 PUTBACK;
3608 slf_frame = slf_save;
3302 save_perl (aTHX_ coro); 3609 save_perl (aTHX_ coro);
3303 load_perl (aTHX_ current); 3610 load_perl (aTHX_ current);
3304 SPAGAIN; 3611 SPAGAIN;
3305 } 3612 }
3306 } 3613 }
… …
3311 PROTOTYPE: $ 3618 PROTOTYPE: $
3312 ALIAS: 3619 ALIAS:
3313 is_ready = CF_READY 3620 is_ready = CF_READY
3314 is_running = CF_RUNNING 3621 is_running = CF_RUNNING
3315 is_new = CF_NEW 3622 is_new = CF_NEW
3316 is_destroyed = CF_DESTROYED 3623 is_destroyed = CF_ZOMBIE
3624 is_zombie = CF_ZOMBIE
3317 is_suspended = CF_SUSPENDED 3625 is_suspended = CF_SUSPENDED
3318 CODE: 3626 CODE:
3319 RETVAL = boolSV (coro->flags & ix); 3627 RETVAL = boolSV (coro->flags & ix);
3320 OUTPUT: 3628 OUTPUT:
3321 RETVAL 3629 RETVAL
… …
3392 3700
3393void 3701void
3394cancel (Coro::State self) 3702cancel (Coro::State self)
3395 CODE: 3703 CODE:
3396 coro_state_destroy (aTHX_ self); 3704 coro_state_destroy (aTHX_ self);
3397 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3398
3399 3705
3400SV * 3706SV *
3401enable_times (int enabled = enable_times) 3707enable_times (int enabled = enable_times)
3402 CODE: 3708 CODE:
3403{ 3709{
… …
3418times (Coro::State self) 3724times (Coro::State self)
3419 PPCODE: 3725 PPCODE:
3420{ 3726{
3421 struct coro *current = SvSTATE (coro_current); 3727 struct coro *current = SvSTATE (coro_current);
3422 3728
3423 if (expect_false (current == self)) 3729 if (ecb_expect_false (current == self))
3424 { 3730 {
3425 coro_times_update (); 3731 coro_times_update ();
3426 coro_times_add (SvSTATE (coro_current)); 3732 coro_times_add (SvSTATE (coro_current));
3427 } 3733 }
3428 3734
3429 EXTEND (SP, 2); 3735 EXTEND (SP, 2);
3430 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3736 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3431 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3737 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3432 3738
3433 if (expect_false (current == self)) 3739 if (ecb_expect_false (current == self))
3434 coro_times_sub (SvSTATE (coro_current)); 3740 coro_times_sub (SvSTATE (coro_current));
3435} 3741}
3436 3742
3437void 3743void
3438swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3744swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3459BOOT: 3765BOOT:
3460{ 3766{
3461 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3767 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3462 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3768 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3463 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3769 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3464 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3465 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3770 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3466 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3771 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3467 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3772 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3468 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3773 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3469 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3774 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
… …
3508 api_ready (aTHX_ RETVAL); 3813 api_ready (aTHX_ RETVAL);
3509 OUTPUT: 3814 OUTPUT:
3510 RETVAL 3815 RETVAL
3511 3816
3512void 3817void
3818_destroy (Coro::State coro)
3819 CODE:
3820 /* used by the manager thread */
3821 coro_state_destroy (aTHX_ coro);
3822
3823void
3824on_destroy (Coro::State coro, SV *cb)
3825 CODE:
3826 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3827
3828void
3829join (...)
3830 CODE:
3831 CORO_EXECUTE_SLF_XS (slf_init_join);
3832
3833void
3513terminate (...) 3834terminate (...)
3514 CODE: 3835 CODE:
3515 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3836 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3837
3838void
3839cancel (...)
3840 CODE:
3841 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3842
3843int
3844safe_cancel (Coro::State self, ...)
3845 C_ARGS: aTHX_ self, &ST (1), items - 1
3516 3846
3517void 3847void
3518schedule (...) 3848schedule (...)
3519 CODE: 3849 CODE:
3520 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3850 CORO_EXECUTE_SLF_XS (slf_init_schedule);

Diff Legend

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