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.386 by root, Sat Feb 19 06:51:23 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;
… …
318 329
319/** time stuff **************************************************************/ 330/** time stuff **************************************************************/
320 331
321#ifdef HAS_GETTIMEOFDAY 332#ifdef HAS_GETTIMEOFDAY
322 333
323static void 334ECB_INLINE void
324coro_u2time (aTHX_ UV ret[2]) 335coro_u2time (pTHX_ UV ret[2])
325{ 336{
326 struct timeval tv; 337 struct timeval tv;
327 gettimeofday (&tv, 0); 338 gettimeofday (&tv, 0);
328 339
329 ret [0] = tv.tv_sec; 340 ret [0] = tv.tv_sec;
330 ret [1] = tv.tv_usec; 341 ret [1] = tv.tv_usec;
331} 342}
332 343
333static double 344ECB_INLINE double
334coro_nvtime () 345coro_nvtime ()
335{ 346{
336 struct timeval tv; 347 struct timeval tv;
337 gettimeofday (&tv, 0); 348 gettimeofday (&tv, 0);
338 349
339 return tv.tv_sec + tv.tv_usec * 1e-6; 350 return tv.tv_sec + tv.tv_usec * 1e-6;
340} 351}
341 352
342static void 353ECB_INLINE void
343time_init (void) 354time_init (pTHX)
344{ 355{
345 nvtime = coro_nvtime; 356 nvtime = coro_nvtime;
346 u2time = coro_u2time; 357 u2time = coro_u2time;
347} 358}
348 359
349#else 360#else
350 361
351static void 362ECB_INLINE void
352time_init (void) 363time_init (pTHX)
353{ 364{
354 SV **svp; 365 SV **svp;
355 366
356 require_pv ("Time::HiRes"); 367 require_pv ("Time/HiRes.pm");
357 368
358 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 369 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
359 370
360 if (!svp) croak ("Time::HiRes is required"); 371 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
361 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 372 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
362 373
363 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 374 nvtime = INT2PTR (double (*)(), SvIV (*svp));
364 375
365 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0); 376 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
366 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp)); 377 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
… …
368 379
369#endif 380#endif
370 381
371/** lowlevel stuff **********************************************************/ 382/** lowlevel stuff **********************************************************/
372 383
373static SV * 384static SV * ecb_noinline
374coro_get_sv (pTHX_ const char *name, int create) 385coro_get_sv (pTHX_ const char *name, int create)
375{ 386{
376#if PERL_VERSION_ATLEAST (5,10,0) 387#if PERL_VERSION_ATLEAST (5,10,0)
377 /* 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 */
378 get_sv (name, create); 389 get_sv (name, create);
379#endif 390#endif
380 return get_sv (name, create); 391 return get_sv (name, create);
381} 392}
382 393
383static AV * 394static AV * ecb_noinline
384coro_get_av (pTHX_ const char *name, int create) 395coro_get_av (pTHX_ const char *name, int create)
385{ 396{
386#if PERL_VERSION_ATLEAST (5,10,0) 397#if PERL_VERSION_ATLEAST (5,10,0)
387 /* 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 */
388 get_av (name, create); 399 get_av (name, create);
389#endif 400#endif
390 return get_av (name, create); 401 return get_av (name, create);
391} 402}
392 403
393static HV * 404static HV * ecb_noinline
394coro_get_hv (pTHX_ const char *name, int create) 405coro_get_hv (pTHX_ const char *name, int create)
395{ 406{
396#if PERL_VERSION_ATLEAST (5,10,0) 407#if PERL_VERSION_ATLEAST (5,10,0)
397 /* 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 */
398 get_hv (name, create); 409 get_hv (name, create);
399#endif 410#endif
400 return get_hv (name, create); 411 return get_hv (name, create);
401} 412}
402 413
403INLINE void 414ECB_INLINE void
404coro_times_update () 415coro_times_update ()
405{ 416{
406#ifdef coro_clock_gettime 417#ifdef coro_clock_gettime
407 struct timespec ts; 418 struct timespec ts;
408 419
… …
421 time_real [0] = tv [0]; 432 time_real [0] = tv [0];
422 time_real [1] = tv [1] * 1000; 433 time_real [1] = tv [1] * 1000;
423#endif 434#endif
424} 435}
425 436
426INLINE void 437ECB_INLINE void
427coro_times_add (struct coro *c) 438coro_times_add (struct coro *c)
428{ 439{
429 c->t_real [1] += time_real [1]; 440 c->t_real [1] += time_real [1];
430 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]; }
431 c->t_real [0] += time_real [0]; 442 c->t_real [0] += time_real [0];
… …
433 c->t_cpu [1] += time_cpu [1]; 444 c->t_cpu [1] += time_cpu [1];
434 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]; }
435 c->t_cpu [0] += time_cpu [0]; 446 c->t_cpu [0] += time_cpu [0];
436} 447}
437 448
438INLINE void 449ECB_INLINE void
439coro_times_sub (struct coro *c) 450coro_times_sub (struct coro *c)
440{ 451{
441 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]; }
442 c->t_real [1] -= time_real [1]; 453 c->t_real [1] -= time_real [1];
443 c->t_real [0] -= time_real [0]; 454 c->t_real [0] -= time_real [0];
… …
451/* magic glue */ 462/* magic glue */
452 463
453#define CORO_MAGIC_type_cv 26 464#define CORO_MAGIC_type_cv 26
454#define CORO_MAGIC_type_state PERL_MAGIC_ext 465#define CORO_MAGIC_type_state PERL_MAGIC_ext
455 466
456#define CORO_MAGIC_NN(sv, type) \ 467#define CORO_MAGIC_NN(sv, type) \
457 (expect_true (SvMAGIC (sv)->mg_type == type) \ 468 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
458 ? SvMAGIC (sv) \ 469 ? SvMAGIC (sv) \
459 : mg_find (sv, type)) 470 : mg_find (sv, type))
460 471
461#define CORO_MAGIC(sv, type) \ 472#define CORO_MAGIC(sv, type) \
462 (expect_true (SvMAGIC (sv)) \ 473 (ecb_expect_true (SvMAGIC (sv)) \
463 ? CORO_MAGIC_NN (sv, type) \ 474 ? CORO_MAGIC_NN (sv, type) \
464 : 0) 475 : 0)
465 476
466#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)
467#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)
468 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
469INLINE struct coro * 495ECB_INLINE struct coro *
470SvSTATE_ (pTHX_ SV *coro) 496SvSTATE_ (pTHX_ SV *coro)
471{ 497{
472 HV *stash;
473 MAGIC *mg; 498 MAGIC *mg;
474 499
475 if (SvROK (coro)) 500 if (SvROK (coro))
476 coro = SvRV (coro); 501 coro = SvRV (coro);
477 502
478 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 503 mg = SvSTATEhv_p (aTHX_ coro);
504 if (!mg)
479 croak ("Coro::State object required"); 505 croak ("Coro::State object required");
480 506
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; 507 return (struct coro *)mg->mg_ptr;
491} 508}
492 509
493#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 510#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
494 511
… …
497#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 514#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
498 515
499/*****************************************************************************/ 516/*****************************************************************************/
500/* padlist management and caching */ 517/* padlist management and caching */
501 518
502static AV * 519ECB_INLINE AV *
503coro_derive_padlist (pTHX_ CV *cv) 520coro_derive_padlist (pTHX_ CV *cv)
504{ 521{
505 AV *padlist = CvPADLIST (cv); 522 AV *padlist = CvPADLIST (cv);
506 AV *newpadlist, *newpad; 523 AV *newpadlist, *newpad;
507 524
… …
519 av_store (newpadlist, 1, (SV *)newpad); 536 av_store (newpadlist, 1, (SV *)newpad);
520 537
521 return newpadlist; 538 return newpadlist;
522} 539}
523 540
524static void 541ECB_INLINE void
525free_padlist (pTHX_ AV *padlist) 542free_padlist (pTHX_ AV *padlist)
526{ 543{
527 /* may be during global destruction */ 544 /* may be during global destruction */
528 if (!IN_DESTRUCT) 545 if (!IN_DESTRUCT)
529 { 546 {
… …
572 0, 0, 0, 0, 589 0, 0, 0, 0,
573 coro_cv_free 590 coro_cv_free
574}; 591};
575 592
576/* the next two functions merely cache the padlists */ 593/* the next two functions merely cache the padlists */
577static void 594ECB_INLINE void
578get_padlist (pTHX_ CV *cv) 595get_padlist (pTHX_ CV *cv)
579{ 596{
580 MAGIC *mg = CORO_MAGIC_cv (cv); 597 MAGIC *mg = CORO_MAGIC_cv (cv);
581 AV *av; 598 AV *av;
582 599
583 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 600 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
584 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 601 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
585 else 602 else
586 { 603 {
587#if CORO_PREFER_PERL_FUNCTIONS 604#if CORO_PREFER_PERL_FUNCTIONS
588 /* this is probably cleaner? but also slower! */ 605 /* this is probably cleaner? but also slower! */
… …
595 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 612 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
596#endif 613#endif
597 } 614 }
598} 615}
599 616
600static void 617ECB_INLINE void
601put_padlist (pTHX_ CV *cv) 618put_padlist (pTHX_ CV *cv)
602{ 619{
603 MAGIC *mg = CORO_MAGIC_cv (cv); 620 MAGIC *mg = CORO_MAGIC_cv (cv);
604 AV *av; 621 AV *av;
605 622
606 if (expect_false (!mg)) 623 if (ecb_expect_false (!mg))
607 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);
608 625
609 av = (AV *)mg->mg_obj; 626 av = (AV *)mg->mg_obj;
610 627
611 if (expect_false (AvFILLp (av) >= AvMAX (av))) 628 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
612 av_extend (av, AvFILLp (av) + 1); 629 av_extend (av, AvFILLp (av) + 1);
613 630
614 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 631 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
615} 632}
616 633
… …
661 } 678 }
662#endif 679#endif
663 } 680 }
664} 681}
665 682
666#define SWAP_SVS(coro) \ 683#define SWAP_SVS(coro) \
667 if (expect_false ((coro)->swap_sv)) \ 684 if (ecb_expect_false ((coro)->swap_sv)) \
668 swap_svs (aTHX_ (coro)) 685 swap_svs (aTHX_ (coro))
669 686
670static void 687static void
671on_enterleave_call (pTHX_ SV *cb); 688on_enterleave_call (pTHX_ SV *cb);
672 689
… …
676 perl_slots *slot = c->slot; 693 perl_slots *slot = c->slot;
677 c->slot = 0; 694 c->slot = 0;
678 695
679 PL_mainstack = c->mainstack; 696 PL_mainstack = c->mainstack;
680 697
681 GvSV (PL_defgv) = slot->defsv; 698#if CORO_JIT
682 GvAV (PL_defgv) = slot->defav; 699 load_perl_slots (slot);
683 GvSV (PL_errgv) = slot->errsv; 700#else
684 GvSV (irsgv) = slot->irsgv;
685 GvHV (PL_hintgv) = slot->hinthv;
686
687 #define VAR(name,type) PL_ ## name = slot->name; 701 #define VARx(name,expr,type) expr = slot->name;
688 # include "state.h" 702 # include "state.h"
689 #undef VAR 703 #undef VARx
704#endif
690 705
691 { 706 {
692 dSP; 707 dSP;
693 708
694 CV *cv; 709 CV *cv;
695 710
696 /* now do the ugly restore mess */ 711 /* now do the ugly restore mess */
697 while (expect_true (cv = (CV *)POPs)) 712 while (ecb_expect_true (cv = (CV *)POPs))
698 { 713 {
699 put_padlist (aTHX_ cv); /* mark this padlist as available */ 714 put_padlist (aTHX_ cv); /* mark this padlist as available */
700 CvDEPTH (cv) = PTR2IV (POPs); 715 CvDEPTH (cv) = PTR2IV (POPs);
701 CvPADLIST (cv) = (AV *)POPs; 716 CvPADLIST (cv) = (AV *)POPs;
702 } 717 }
… …
705 } 720 }
706 721
707 slf_frame = c->slf_frame; 722 slf_frame = c->slf_frame;
708 CORO_THROW = c->except; 723 CORO_THROW = c->except;
709 724
710 if (expect_false (enable_times)) 725 if (ecb_expect_false (enable_times))
711 { 726 {
712 if (expect_false (!times_valid)) 727 if (ecb_expect_false (!times_valid))
713 coro_times_update (); 728 coro_times_update ();
714 729
715 coro_times_sub (c); 730 coro_times_sub (c);
716 } 731 }
717 732
718 if (expect_false (c->on_enter)) 733 if (ecb_expect_false (c->on_enter))
719 { 734 {
720 int i; 735 int i;
721 736
722 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 737 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
723 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 738 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
729static void 744static void
730save_perl (pTHX_ Coro__State c) 745save_perl (pTHX_ Coro__State c)
731{ 746{
732 SWAP_SVS (c); 747 SWAP_SVS (c);
733 748
734 if (expect_false (c->on_leave)) 749 if (ecb_expect_false (c->on_leave))
735 { 750 {
736 int i; 751 int i;
737 752
738 for (i = AvFILLp (c->on_leave); i >= 0; --i) 753 for (i = AvFILLp (c->on_leave); i >= 0; --i)
739 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 754 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
740 } 755 }
741 756
742 times_valid = 0; 757 times_valid = 0;
743 758
744 if (expect_false (enable_times)) 759 if (ecb_expect_false (enable_times))
745 { 760 {
746 coro_times_update (); times_valid = 1; 761 coro_times_update (); times_valid = 1;
747 coro_times_add (c); 762 coro_times_add (c);
748 } 763 }
749 764
… …
763 778
764 XPUSHs (Nullsv); 779 XPUSHs (Nullsv);
765 /* this loop was inspired by pp_caller */ 780 /* this loop was inspired by pp_caller */
766 for (;;) 781 for (;;)
767 { 782 {
768 while (expect_true (cxix >= 0)) 783 while (ecb_expect_true (cxix >= 0))
769 { 784 {
770 PERL_CONTEXT *cx = &ccstk[cxix--]; 785 PERL_CONTEXT *cx = &ccstk[cxix--];
771 786
772 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))
773 { 788 {
774 CV *cv = cx->blk_sub.cv; 789 CV *cv = cx->blk_sub.cv;
775 790
776 if (expect_true (CvDEPTH (cv))) 791 if (ecb_expect_true (CvDEPTH (cv)))
777 { 792 {
778 EXTEND (SP, 3); 793 EXTEND (SP, 3);
779 PUSHs ((SV *)CvPADLIST (cv)); 794 PUSHs ((SV *)CvPADLIST (cv));
780 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 795 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
781 PUSHs ((SV *)cv); 796 PUSHs ((SV *)cv);
… …
784 get_padlist (aTHX_ cv); 799 get_padlist (aTHX_ cv);
785 } 800 }
786 } 801 }
787 } 802 }
788 803
789 if (expect_true (top_si->si_type == PERLSI_MAIN)) 804 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
790 break; 805 break;
791 806
792 top_si = top_si->si_prev; 807 top_si = top_si->si_prev;
793 ccstk = top_si->si_cxstack; 808 ccstk = top_si->si_cxstack;
794 cxix = top_si->si_cxix; 809 cxix = top_si->si_cxix;
… …
796 811
797 PUTBACK; 812 PUTBACK;
798 } 813 }
799 814
800 /* allocate some space on the context stack for our purposes */ 815 /* allocate some space on the context stack for our purposes */
801 /* we manually unroll here, as usually 2 slots is enough */ 816 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 { 817 {
806 unsigned int i; 818 unsigned int i;
819
807 for (i = 3; i < SLOT_COUNT; ++i) 820 for (i = 0; i < SLOT_COUNT; ++i)
808 CXINC; 821 CXINC;
809 } 822
810 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 823 cxstack_ix -= SLOT_COUNT; /* undo allocation */
824 }
811 825
812 c->mainstack = PL_mainstack; 826 c->mainstack = PL_mainstack;
813 827
814 { 828 {
815 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 829 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
816 830
817 slot->defav = GvAV (PL_defgv); 831#if CORO_JIT
818 slot->defsv = DEFSV; 832 save_perl_slots (slot);
819 slot->errsv = ERRSV; 833#else
820 slot->irsgv = GvSV (irsgv);
821 slot->hinthv = GvHV (PL_hintgv);
822
823 #define VAR(name,type) slot->name = PL_ ## name; 834 #define VARx(name,expr,type) slot->name = expr;
824 # include "state.h" 835 # include "state.h"
825 #undef VAR 836 #undef VARx
837#endif
826 } 838 }
827} 839}
828 840
829/* 841/*
830 * allocate various perl stacks. This is almost an exact copy 842 * allocate various perl stacks. This is almost an exact copy
… …
836# define coro_init_stacks(thx) init_stacks () 848# define coro_init_stacks(thx) init_stacks ()
837#else 849#else
838static void 850static void
839coro_init_stacks (pTHX) 851coro_init_stacks (pTHX)
840{ 852{
841 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() */
842 PL_curstackinfo->si_type = PERLSI_MAIN; 854 PL_curstackinfo->si_type = PERLSI_MAIN;
843 PL_curstack = PL_curstackinfo->si_stack; 855 PL_curstack = PL_curstackinfo->si_stack;
844 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 856 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
845 857
846 PL_stack_base = AvARRAY(PL_curstack); 858 PL_stack_base = AvARRAY(PL_curstack);
… …
953#endif 965#endif
954 966
955/* 967/*
956 * This overrides the default magic get method of %SIG elements. 968 * 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 969 * 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 970 * and instead of trying to save and restore the hash elements (extremely slow),
959 * readback here. 971 * we just provide our own readback here.
960 */ 972 */
961static int 973static int ecb_cold
962coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 974coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
963{ 975{
964 const char *s = MgPV_nolen_const (mg); 976 const char *s = MgPV_nolen_const (mg);
965 977
966 if (*s == '_') 978 if (*s == '_')
… …
978 } 990 }
979 991
980 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 992 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
981} 993}
982 994
983static int 995static int ecb_cold
984coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 996coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
985{ 997{
986 const char *s = MgPV_nolen_const (mg); 998 const char *s = MgPV_nolen_const (mg);
987 999
988 if (*s == '_') 1000 if (*s == '_')
… …
1002 } 1014 }
1003 1015
1004 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1016 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1005} 1017}
1006 1018
1007static int 1019static int ecb_cold
1008coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1020coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1009{ 1021{
1010 const char *s = MgPV_nolen_const (mg); 1022 const char *s = MgPV_nolen_const (mg);
1011 1023
1012 if (*s == '_') 1024 if (*s == '_')
… …
1047 return 1; 1059 return 1;
1048} 1060}
1049 1061
1050static UNOP init_perl_op; 1062static UNOP init_perl_op;
1051 1063
1052static 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 */
1053init_perl (pTHX_ struct coro *coro) 1065init_perl (pTHX_ struct coro *coro)
1054{ 1066{
1055 /* 1067 /*
1056 * emulate part of the perl startup here. 1068 * emulate part of the perl startup here.
1057 */ 1069 */
… …
1072 PL_parser = 0; 1084 PL_parser = 0;
1073#endif 1085#endif
1074 PL_hints = 0; 1086 PL_hints = 0;
1075 1087
1076 /* recreate the die/warn hooks */ 1088 /* recreate the die/warn hooks */
1077 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1089 PL_diehook = SvREFCNT_inc (rv_diehook);
1078 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1090 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1079 1091
1080 GvSV (PL_defgv) = newSV (0); 1092 GvSV (PL_defgv) = newSV (0);
1081 GvAV (PL_defgv) = coro->args; coro->args = 0; 1093 GvAV (PL_defgv) = coro->args; coro->args = 0;
1082 GvSV (PL_errgv) = newSV (0); 1094 GvSV (PL_errgv) = newSV (0);
1083 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);
… …
1104 /* 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
1105 * 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.
1106 */ 1118 */
1107 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 */
1108 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;
1109 1122
1110 /* 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 */
1111 init_perl_op.op_next = PL_op; 1124 init_perl_op.op_next = PL_op;
1112 init_perl_op.op_type = OP_ENTERSUB; 1125 init_perl_op.op_type = OP_ENTERSUB;
1113 init_perl_op.op_ppaddr = pp_slf; 1126 init_perl_op.op_ppaddr = pp_slf;
… …
1118 /* copy throw, in case it was set before init_perl */ 1131 /* copy throw, in case it was set before init_perl */
1119 CORO_THROW = coro->except; 1132 CORO_THROW = coro->except;
1120 1133
1121 SWAP_SVS (coro); 1134 SWAP_SVS (coro);
1122 1135
1123 if (expect_false (enable_times)) 1136 if (ecb_expect_false (enable_times))
1124 { 1137 {
1125 coro_times_update (); 1138 coro_times_update ();
1126 coro_times_sub (coro); 1139 coro_times_sub (coro);
1127 } 1140 }
1128} 1141}
… …
1152destroy_perl (pTHX_ struct coro *coro) 1165destroy_perl (pTHX_ struct coro *coro)
1153{ 1166{
1154 SV *svf [9]; 1167 SV *svf [9];
1155 1168
1156 { 1169 {
1170 SV *old_current = SvRV (coro_current);
1157 struct coro *current = SvSTATE_current; 1171 struct coro *current = SvSTATE (old_current);
1158 1172
1159 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));
1160 1174
1161 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
1162 load_perl (aTHX_ coro); 1180 load_perl (aTHX_ coro);
1163 1181
1164 coro_unwind_stacks (aTHX); 1182 coro_unwind_stacks (aTHX);
1165 coro_destruct_stacks (aTHX);
1166 1183
1167 /* restore swapped sv's */ 1184 /* restore swapped sv's */
1168 SWAP_SVS (coro); 1185 SWAP_SVS (coro);
1186
1187 coro_destruct_stacks (aTHX);
1169 1188
1170 // now save some sv's to be free'd later 1189 // now save some sv's to be free'd later
1171 svf [0] = GvSV (PL_defgv); 1190 svf [0] = GvSV (PL_defgv);
1172 svf [1] = (SV *)GvAV (PL_defgv); 1191 svf [1] = (SV *)GvAV (PL_defgv);
1173 svf [2] = GvSV (PL_errgv); 1192 svf [2] = GvSV (PL_errgv);
… …
1177 svf [6] = (SV *)GvHV (PL_hintgv); 1196 svf [6] = (SV *)GvHV (PL_hintgv);
1178 svf [7] = PL_diehook; 1197 svf [7] = PL_diehook;
1179 svf [8] = PL_warnhook; 1198 svf [8] = PL_warnhook;
1180 assert (9 == sizeof (svf) / sizeof (*svf)); 1199 assert (9 == sizeof (svf) / sizeof (*svf));
1181 1200
1201 SvRV_set (coro_current, old_current);
1202
1182 load_perl (aTHX_ current); 1203 load_perl (aTHX_ current);
1183 } 1204 }
1184 1205
1185 { 1206 {
1186 unsigned int i; 1207 unsigned int i;
… …
1193 SvREFCNT_dec (coro->invoke_cb); 1214 SvREFCNT_dec (coro->invoke_cb);
1194 SvREFCNT_dec (coro->invoke_av); 1215 SvREFCNT_dec (coro->invoke_av);
1195 } 1216 }
1196} 1217}
1197 1218
1198INLINE void 1219ECB_INLINE void
1199free_coro_mortal (pTHX) 1220free_coro_mortal (pTHX)
1200{ 1221{
1201 if (expect_true (coro_mortal)) 1222 if (ecb_expect_true (coro_mortal))
1202 { 1223 {
1203 SvREFCNT_dec (coro_mortal); 1224 SvREFCNT_dec ((SV *)coro_mortal);
1204 coro_mortal = 0; 1225 coro_mortal = 0;
1205 } 1226 }
1206} 1227}
1207 1228
1208static int 1229static int
… …
1341 1362
1342 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 */
1343} 1364}
1344 1365
1345/* 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 */
1346static void NOINLINE 1367static void ecb_noinline
1347cctx_prepare (pTHX) 1368cctx_prepare (pTHX)
1348{ 1369{
1349 PL_top_env = &PL_start_env; 1370 PL_top_env = &PL_start_env;
1350 1371
1351 if (cctx_current->flags & CC_TRACE) 1372 if (cctx_current->flags & CC_TRACE)
… …
1362 slf_frame.prepare = slf_prepare_set_stacklevel; 1383 slf_frame.prepare = slf_prepare_set_stacklevel;
1363 slf_frame.check = slf_check_set_stacklevel; 1384 slf_frame.check = slf_check_set_stacklevel;
1364} 1385}
1365 1386
1366/* 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 */
1367INLINE void 1388ECB_INLINE void
1368transfer_tail (pTHX) 1389transfer_tail (pTHX)
1369{ 1390{
1370 free_coro_mortal (aTHX); 1391 free_coro_mortal (aTHX);
1371} 1392}
1372 1393
… …
1495cctx_destroy (coro_cctx *cctx) 1516cctx_destroy (coro_cctx *cctx)
1496{ 1517{
1497 if (!cctx) 1518 if (!cctx)
1498 return; 1519 return;
1499 1520
1500 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1521 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1501 1522
1502 --cctx_count; 1523 --cctx_count;
1503 coro_destroy (&cctx->cctx); 1524 coro_destroy (&cctx->cctx);
1504 1525
1505 /* coro_transfer creates new, empty cctx's */ 1526 /* coro_transfer creates new, empty cctx's */
… …
1524#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))
1525 1546
1526static coro_cctx * 1547static coro_cctx *
1527cctx_get (pTHX) 1548cctx_get (pTHX)
1528{ 1549{
1529 while (expect_true (cctx_first)) 1550 while (ecb_expect_true (cctx_first))
1530 { 1551 {
1531 coro_cctx *cctx = cctx_first; 1552 coro_cctx *cctx = cctx_first;
1532 cctx_first = cctx->next; 1553 cctx_first = cctx->next;
1533 --cctx_idle; 1554 --cctx_idle;
1534 1555
1535 if (expect_true (!CCTX_EXPIRED (cctx))) 1556 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1536 return cctx; 1557 return cctx;
1537 1558
1538 cctx_destroy (cctx); 1559 cctx_destroy (cctx);
1539 } 1560 }
1540 1561
… …
1545cctx_put (coro_cctx *cctx) 1566cctx_put (coro_cctx *cctx)
1546{ 1567{
1547 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));
1548 1569
1549 /* free another cctx if overlimit */ 1570 /* free another cctx if overlimit */
1550 if (expect_false (cctx_idle >= cctx_max_idle)) 1571 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1551 { 1572 {
1552 coro_cctx *first = cctx_first; 1573 coro_cctx *first = cctx_first;
1553 cctx_first = first->next; 1574 cctx_first = first->next;
1554 --cctx_idle; 1575 --cctx_idle;
1555 1576
… …
1566static void 1587static void
1567transfer_check (pTHX_ struct coro *prev, struct coro *next) 1588transfer_check (pTHX_ struct coro *prev, struct coro *next)
1568{ 1589{
1569 /* TODO: throwing up here is considered harmful */ 1590 /* TODO: throwing up here is considered harmful */
1570 1591
1571 if (expect_true (prev != next)) 1592 if (ecb_expect_true (prev != next))
1572 { 1593 {
1573 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1594 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,"); 1595 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1575 1596
1576 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1597 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,"); 1598 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1578 1599
1579#if !PERL_VERSION_ATLEAST (5,10,0) 1600#if !PERL_VERSION_ATLEAST (5,10,0)
1580 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1601 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,"); 1602 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1582#endif 1603#endif
1583 } 1604 }
1584} 1605}
1585 1606
1586/* always use the TRANSFER macro */ 1607/* always use the TRANSFER macro */
1587static void NOINLINE /* noinline so we have a fixed stackframe */ 1608static void ecb_noinline /* noinline so we have a fixed stackframe */
1588transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1609transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1589{ 1610{
1590 dSTACKLEVEL; 1611 dSTACKLEVEL;
1591 1612
1592 /* sometimes transfer is only called to set idle_sp */ 1613 /* sometimes transfer is only called to set idle_sp */
1593 if (expect_false (!prev)) 1614 if (ecb_expect_false (!prev))
1594 { 1615 {
1595 cctx_current->idle_sp = STACKLEVEL; 1616 cctx_current->idle_sp = STACKLEVEL;
1596 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 */
1597 } 1618 }
1598 else if (expect_true (prev != next)) 1619 else if (ecb_expect_true (prev != next))
1599 { 1620 {
1600 coro_cctx *cctx_prev; 1621 coro_cctx *cctx_prev;
1601 1622
1602 if (expect_false (prev->flags & CF_NEW)) 1623 if (ecb_expect_false (prev->flags & CF_NEW))
1603 { 1624 {
1604 /* create a new empty/source context */ 1625 /* create a new empty/source context */
1605 prev->flags &= ~CF_NEW; 1626 prev->flags &= ~CF_NEW;
1606 prev->flags |= CF_RUNNING; 1627 prev->flags |= CF_RUNNING;
1607 } 1628 }
… …
1610 next->flags |= CF_RUNNING; 1631 next->flags |= CF_RUNNING;
1611 1632
1612 /* first get rid of the old state */ 1633 /* first get rid of the old state */
1613 save_perl (aTHX_ prev); 1634 save_perl (aTHX_ prev);
1614 1635
1615 if (expect_false (next->flags & CF_NEW)) 1636 if (ecb_expect_false (next->flags & CF_NEW))
1616 { 1637 {
1617 /* need to start coroutine */ 1638 /* need to start coroutine */
1618 next->flags &= ~CF_NEW; 1639 next->flags &= ~CF_NEW;
1619 /* setup coroutine call */ 1640 /* setup coroutine call */
1620 init_perl (aTHX_ next); 1641 init_perl (aTHX_ next);
1621 } 1642 }
1622 else 1643 else
1623 load_perl (aTHX_ next); 1644 load_perl (aTHX_ next);
1624 1645
1625 /* possibly untie and reuse the cctx */ 1646 /* possibly untie and reuse the cctx */
1626 if (expect_true ( 1647 if (ecb_expect_true (
1627 cctx_current->idle_sp == STACKLEVEL 1648 cctx_current->idle_sp == STACKLEVEL
1628 && !(cctx_current->flags & CC_TRACE) 1649 && !(cctx_current->flags & CC_TRACE)
1629 && !force_cctx 1650 && !force_cctx
1630 )) 1651 ))
1631 { 1652 {
1632 /* 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 */
1633 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));
1634 1655
1635 /* 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. */
1636 /* 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 */
1637 if (expect_false (CCTX_EXPIRED (cctx_current))) 1658 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1638 if (expect_true (!next->cctx)) 1659 if (ecb_expect_true (!next->cctx))
1639 next->cctx = cctx_get (aTHX); 1660 next->cctx = cctx_get (aTHX);
1640 1661
1641 cctx_put (cctx_current); 1662 cctx_put (cctx_current);
1642 } 1663 }
1643 else 1664 else
1644 prev->cctx = cctx_current; 1665 prev->cctx = cctx_current;
1645 1666
1646 ++next->usecount; 1667 ++next->usecount;
1647 1668
1648 cctx_prev = cctx_current; 1669 cctx_prev = cctx_current;
1649 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1670 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1650 1671
1651 next->cctx = 0; 1672 next->cctx = 0;
1652 1673
1653 if (expect_false (cctx_prev != cctx_current)) 1674 if (ecb_expect_false (cctx_prev != cctx_current))
1654 { 1675 {
1655 cctx_prev->top_env = PL_top_env; 1676 cctx_prev->top_env = PL_top_env;
1656 PL_top_env = cctx_current->top_env; 1677 PL_top_env = cctx_current->top_env;
1657 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1678 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1658 } 1679 }
… …
1664#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))
1665#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1686#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1666 1687
1667/** high level stuff ********************************************************/ 1688/** high level stuff ********************************************************/
1668 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 */
1669static int 1692static void
1693coro_call_on_destroy (pTHX_ struct coro *coro);
1694
1695static void
1670coro_state_destroy (pTHX_ struct coro *coro) 1696coro_state_destroy (pTHX_ struct coro *coro)
1671{ 1697{
1672 if (coro->flags & CF_DESTROYED) 1698 if (coro->flags & CF_ZOMBIE)
1673 return 0; 1699 return;
1674 1700
1675 if (coro->on_destroy && !PL_dirty)
1676 coro->on_destroy (aTHX_ coro); 1701 slf_destroy (aTHX_ coro);
1677 1702
1678 coro->flags |= CF_DESTROYED; 1703 coro->flags |= CF_ZOMBIE;
1679 1704
1680 if (coro->flags & CF_READY) 1705 if (coro->flags & CF_READY)
1681 { 1706 {
1682 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1707 /* reduce nready, as destroying a ready coro effectively unreadies it */
1683 /* alternative: look through all ready queues and remove the coro */ 1708 /* alternative: look through all ready queues and remove the coro */
1684 --coro_nready; 1709 --coro_nready;
1685 } 1710 }
1686 else 1711 else
1687 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;
1688 1717
1689 if (coro->mainstack 1718 if (coro->mainstack
1690 && coro->mainstack != main_mainstack 1719 && coro->mainstack != main_mainstack
1691 && coro->slot 1720 && coro->slot
1692 && !PL_dirty) 1721 && !PL_dirty)
1693 destroy_perl (aTHX_ coro); 1722 destroy_perl (aTHX_ coro);
1694 1723
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); 1724 cctx_destroy (coro->cctx);
1700 SvREFCNT_dec (coro->startcv); 1725 SvREFCNT_dec (coro->startcv);
1701 SvREFCNT_dec (coro->args); 1726 SvREFCNT_dec (coro->args);
1702 SvREFCNT_dec (coro->swap_sv); 1727 SvREFCNT_dec (coro->swap_sv);
1703 SvREFCNT_dec (CORO_THROW); 1728 SvREFCNT_dec (CORO_THROW);
1704 1729
1705 return 1; 1730 coro_call_on_destroy (aTHX_ coro);
1731
1732 /* more destruction mayhem in coro_state_free */
1706} 1733}
1707 1734
1708static int 1735static int
1709coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1736coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1710{ 1737{
1711 struct coro *coro = (struct coro *)mg->mg_ptr; 1738 struct coro *coro = (struct coro *)mg->mg_ptr;
1712 mg->mg_ptr = 0; 1739 mg->mg_ptr = 0;
1713 1740
1714 coro->hv = 0;
1715
1716 if (--coro->refcnt < 0)
1717 {
1718 coro_state_destroy (aTHX_ coro); 1741 coro_state_destroy (aTHX_ coro);
1742 SvREFCNT_dec (coro->on_destroy);
1743 SvREFCNT_dec (coro->status);
1744
1719 Safefree (coro); 1745 Safefree (coro);
1720 }
1721 1746
1722 return 0; 1747 return 0;
1723} 1748}
1724 1749
1725static int 1750static int ecb_cold
1726coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1751coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1727{ 1752{
1728 struct coro *coro = (struct coro *)mg->mg_ptr; 1753 /* called when perl clones the current process the slow way (windows process emulation) */
1729 1754 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1730 ++coro->refcnt; 1755 mg->mg_ptr = 0;
1756 mg->mg_virtual = 0;
1731 1757
1732 return 0; 1758 return 0;
1733} 1759}
1734 1760
1735static MGVTBL coro_state_vtbl = { 1761static MGVTBL coro_state_vtbl = {
… …
1760 TRANSFER (ta, 1); 1786 TRANSFER (ta, 1);
1761} 1787}
1762 1788
1763/** Coro ********************************************************************/ 1789/** Coro ********************************************************************/
1764 1790
1765INLINE void 1791ECB_INLINE void
1766coro_enq (pTHX_ struct coro *coro) 1792coro_enq (pTHX_ struct coro *coro)
1767{ 1793{
1768 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1794 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1769 1795
1770 SvREFCNT_inc_NN (coro->hv); 1796 SvREFCNT_inc_NN (coro->hv);
… …
1772 coro->next_ready = 0; 1798 coro->next_ready = 0;
1773 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1799 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1774 ready [1] = coro; 1800 ready [1] = coro;
1775} 1801}
1776 1802
1777INLINE struct coro * 1803ECB_INLINE struct coro *
1778coro_deq (pTHX) 1804coro_deq (pTHX)
1779{ 1805{
1780 int prio; 1806 int prio;
1781 1807
1782 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1808 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1835{ 1861{
1836 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1862 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1837} 1863}
1838 1864
1839/* expects to own a reference to next->hv */ 1865/* expects to own a reference to next->hv */
1840INLINE void 1866ECB_INLINE void
1841prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1867prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1842{ 1868{
1843 SV *prev_sv = SvRV (coro_current); 1869 SV *prev_sv = SvRV (coro_current);
1844 1870
1845 ta->prev = SvSTATE_hv (prev_sv); 1871 ta->prev = SvSTATE_hv (prev_sv);
… …
1858{ 1884{
1859 for (;;) 1885 for (;;)
1860 { 1886 {
1861 struct coro *next = coro_deq (aTHX); 1887 struct coro *next = coro_deq (aTHX);
1862 1888
1863 if (expect_true (next)) 1889 if (ecb_expect_true (next))
1864 { 1890 {
1865 /* cannot transfer to destroyed coros, skip and look for next */ 1891 /* cannot transfer to destroyed coros, skip and look for next */
1866 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1892 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 */ 1893 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1868 else 1894 else
1869 { 1895 {
1870 next->flags &= ~CF_READY; 1896 next->flags &= ~CF_READY;
1871 --coro_nready; 1897 --coro_nready;
… …
1904 } 1930 }
1905 } 1931 }
1906 } 1932 }
1907} 1933}
1908 1934
1909INLINE void 1935ECB_INLINE void
1910prepare_cede (pTHX_ struct coro_transfer_args *ta) 1936prepare_cede (pTHX_ struct coro_transfer_args *ta)
1911{ 1937{
1912 api_ready (aTHX_ coro_current); 1938 api_ready (aTHX_ coro_current);
1913 prepare_schedule (aTHX_ ta); 1939 prepare_schedule (aTHX_ ta);
1914} 1940}
1915 1941
1916INLINE void 1942ECB_INLINE void
1917prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1943prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1918{ 1944{
1919 SV *prev = SvRV (coro_current); 1945 SV *prev = SvRV (coro_current);
1920 1946
1921 if (coro_nready) 1947 if (coro_nready)
… …
1951{ 1977{
1952 struct coro_transfer_args ta; 1978 struct coro_transfer_args ta;
1953 1979
1954 prepare_cede (aTHX_ &ta); 1980 prepare_cede (aTHX_ &ta);
1955 1981
1956 if (expect_true (ta.prev != ta.next)) 1982 if (ecb_expect_true (ta.prev != ta.next))
1957 { 1983 {
1958 TRANSFER (ta, 1); 1984 TRANSFER (ta, 1);
1959 return 1; 1985 return 1;
1960 } 1986 }
1961 else 1987 else
… …
2004 coro->slot->runops = RUNOPS_DEFAULT; 2030 coro->slot->runops = RUNOPS_DEFAULT;
2005 } 2031 }
2006} 2032}
2007 2033
2008static 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
2009coro_call_on_destroy (pTHX_ struct coro *coro) 2111coro_call_on_destroy (pTHX_ struct coro *coro)
2010{ 2112{
2011 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2113 AV *od = coro->on_destroy;
2012 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2013 2114
2014 if (on_destroyp) 2115 if (!od)
2015 { 2116 return;
2016 AV *on_destroy = (AV *)SvRV (*on_destroyp);
2017 2117
2018 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
2019 { 2126 {
2020 dSP; /* don't disturb outer sp */ 2127 dSP; /* don't disturb outer sp */
2021 SV *cb = av_pop (on_destroy);
2022
2023 PUSHMARK (SP); 2128 PUSHMARK (SP);
2024 2129
2025 if (statusp) 2130 if (coro->status)
2026 { 2131 {
2027 int i; 2132 PUTBACK;
2028 AV *status = (AV *)SvRV (*statusp); 2133 coro_push_av (aTHX_ coro->status, G_ARRAY);
2029 EXTEND (SP, AvFILLp (status) + 1); 2134 SPAGAIN;
2030
2031 for (i = 0; i <= AvFILLp (status); ++i)
2032 PUSHs (AvARRAY (status)[i]);
2033 } 2135 }
2034 2136
2035 PUTBACK; 2137 PUTBACK;
2036 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2138 call_sv (cb, G_VOID | G_DISCARD);
2037 } 2139 }
2038 } 2140 }
2039} 2141}
2040 2142
2041static void 2143static void
2042slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2144coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2043{ 2145{
2044 int i; 2146 AV *av;
2045 HV *hv = (HV *)SvRV (coro_current); 2147
2046 AV *av = newAV (); 2148 if (coro->status)
2149 {
2150 av = coro->status;
2151 av_clear (av);
2152 }
2153 else
2154 av = coro->status = newAV ();
2047 2155
2048 /* items are actually not so common, so optimise for this case */ 2156 /* items are actually not so common, so optimise for this case */
2049 if (items) 2157 if (items)
2050 { 2158 {
2159 int i;
2160
2051 av_extend (av, items - 1); 2161 av_extend (av, items - 1);
2052 2162
2053 for (i = 0; i < items; ++i) 2163 for (i = 0; i < items; ++i)
2054 av_push (av, SvREFCNT_inc_NN (arg [i])); 2164 av_push (av, SvREFCNT_inc_NN (arg [i]));
2055 } 2165 }
2166}
2056 2167
2057 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2168static void
2058 2169slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2170{
2059 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 */
2060 api_ready (aTHX_ sv_manager); 2172 api_ready (aTHX_ sv_manager);
2061 2173
2062 frame->prepare = prepare_schedule; 2174 frame->prepare = prepare_schedule;
2063 frame->check = slf_check_repeat; 2175 frame->check = slf_check_repeat;
2064 2176
2065 /* as a minor optimisation, we could unwind all stacks here */ 2177 /* as a minor optimisation, we could unwind all stacks here */
2066 /* 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 */
2067 /*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;
2068} 2283}
2069 2284
2070/*****************************************************************************/ 2285/*****************************************************************************/
2071/* async pool handler */ 2286/* async pool handler */
2072 2287
… …
2103slf_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)
2104{ 2319{
2105 HV *hv = (HV *)SvRV (coro_current); 2320 HV *hv = (HV *)SvRV (coro_current);
2106 struct coro *coro = SvSTATE_hv ((SV *)hv); 2321 struct coro *coro = SvSTATE_hv ((SV *)hv);
2107 2322
2108 if (expect_true (coro->saved_deffh)) 2323 if (ecb_expect_true (coro->saved_deffh))
2109 { 2324 {
2110 /* subsequent iteration */ 2325 /* subsequent iteration */
2111 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2326 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2112 coro->saved_deffh = 0; 2327 coro->saved_deffh = 0;
2113 2328
2114 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2329 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2115 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2330 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2116 { 2331 {
2117 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2332 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2118 coro->invoke_av = newAV (); 2333 return;
2119
2120 frame->prepare = prepare_nop;
2121 } 2334 }
2122 else 2335 else
2123 { 2336 {
2124 av_clear (GvAV (PL_defgv)); 2337 av_clear (GvAV (PL_defgv));
2125 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);
… …
2348static void 2561static void
2349slf_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)
2350{ 2563{
2351 frame->prepare = prepare_cede_notself; 2564 frame->prepare = prepare_cede_notself;
2352 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;
2353} 2583}
2354 2584
2355/* 2585/*
2356 * these not obviously related functions are all rolled into one 2586 * these not obviously related functions are all rolled into one
2357 * 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
… …
2364 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 */
2365 2595
2366 /* 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 */
2367 /* the latter happens when a new coro has been started */ 2597 /* the latter happens when a new coro has been started */
2368 /* or when a new cctx was attached to an existing coroutine */ 2598 /* or when a new cctx was attached to an existing coroutine */
2369 if (expect_true (!slf_frame.prepare)) 2599 if (ecb_expect_true (!slf_frame.prepare))
2370 { 2600 {
2371 /* first iteration */ 2601 /* first iteration */
2372 dSP; 2602 dSP;
2373 SV **arg = PL_stack_base + TOPMARK + 1; 2603 SV **arg = PL_stack_base + TOPMARK + 1;
2374 int items = SP - arg; /* args without function object */ 2604 int items = SP - arg; /* args without function object */
… …
2415 while (slf_frame.check (aTHX_ &slf_frame)); 2645 while (slf_frame.check (aTHX_ &slf_frame));
2416 2646
2417 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 */
2418 2648
2419 /* exception handling */ 2649 /* exception handling */
2420 if (expect_false (CORO_THROW)) 2650 if (ecb_expect_false (CORO_THROW))
2421 { 2651 {
2422 SV *exception = sv_2mortal (CORO_THROW); 2652 SV *exception = sv_2mortal (CORO_THROW);
2423 2653
2424 CORO_THROW = 0; 2654 CORO_THROW = 0;
2425 sv_setsv (ERRSV, exception); 2655 sv_setsv (ERRSV, exception);
2426 croak (0); 2656 croak (0);
2427 } 2657 }
2428 2658
2429 /* return value handling - mostly like entersub */ 2659 /* return value handling - mostly like entersub */
2430 /* make sure we put something on the stack in scalar context */ 2660 /* make sure we put something on the stack in scalar context */
2431 if (GIMME_V == G_SCALAR) 2661 if (GIMME_V == G_SCALAR
2662 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2432 { 2663 {
2433 dSP; 2664 dSP;
2434 SV **bot = PL_stack_base + checkmark; 2665 SV **bot = PL_stack_base + checkmark;
2435 2666
2436 if (sp == bot) /* too few, push undef */ 2667 if (sp == bot) /* too few, push undef */
2437 bot [1] = &PL_sv_undef; 2668 bot [1] = &PL_sv_undef;
2438 else if (sp != bot + 1) /* too many, take last one */ 2669 else /* too many, take last one */
2439 bot [1] = *sp; 2670 bot [1] = *sp;
2440 2671
2441 SP = bot + 1; 2672 SP = bot + 1;
2442 2673
2443 PUTBACK; 2674 PUTBACK;
… …
2550{ 2781{
2551 PerlIOBuf base; 2782 PerlIOBuf base;
2552 NV next, every; 2783 NV next, every;
2553} PerlIOCede; 2784} PerlIOCede;
2554 2785
2555static IV 2786static IV ecb_cold
2556PerlIOCede_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)
2557{ 2788{
2558 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2789 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2559 2790
2560 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2791 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2561 self->next = nvtime () + self->every; 2792 self->next = nvtime () + self->every;
2562 2793
2563 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2794 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2564} 2795}
2565 2796
2566static SV * 2797static SV * ecb_cold
2567PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2798PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2568{ 2799{
2569 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2800 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2570 2801
2571 return newSVnv (self->every); 2802 return newSVnv (self->every);
… …
2683 SvREFCNT_dec (cb); 2914 SvREFCNT_dec (cb);
2684 } 2915 }
2685} 2916}
2686 2917
2687static void 2918static void
2688coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2919coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2689{ 2920{
2690 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2921 /* call $sem->adjust (0) to possibly wake up some other waiters */
2691 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2922 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2692} 2923}
2693 2924
2694static int 2925static int
2695slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2926slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2696{ 2927{
2697 AV *av = (AV *)frame->data; 2928 AV *av = (AV *)frame->data;
2698 SV *count_sv = AvARRAY (av)[0]; 2929 SV *count_sv = AvARRAY (av)[0];
2930 SV *coro_hv = SvRV (coro_current);
2699 2931
2700 /* 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 */
2701 if (CORO_THROW) 2933 if (CORO_THROW)
2702 return 0; 2934 return 0;
2703 else if (SvIVX (count_sv) > 0) 2935 else if (SvIVX (count_sv) > 0)
2704 { 2936 {
2705 SvSTATE_current->on_destroy = 0; 2937 frame->destroy = 0;
2706 2938
2707 if (acquire) 2939 if (acquire)
2708 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2940 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2709 else 2941 else
2710 coro_semaphore_adjust (aTHX_ av, 0); 2942 coro_semaphore_adjust (aTHX_ av, 0);
… …
2715 { 2947 {
2716 int i; 2948 int i;
2717 /* 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 */
2718 /* 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 */
2719 /* this avoids some degenerate memory usage cases */ 2951 /* this avoids some degenerate memory usage cases */
2720 2952 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)) 2953 if (AvARRAY (av)[i] == coro_hv)
2723 return 1; 2954 return 1;
2724 2955
2725 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2956 av_push (av, SvREFCNT_inc (coro_hv));
2726 return 1; 2957 return 1;
2727 } 2958 }
2728} 2959}
2729 2960
2730static int 2961static int
… …
2753 { 2984 {
2754 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2985 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2755 2986
2756 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2987 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2757 frame->prepare = prepare_schedule; 2988 frame->prepare = prepare_schedule;
2758
2759 /* to avoid race conditions when a woken-up coro gets terminated */ 2989 /* to avoid race conditions when a woken-up coro gets terminated */
2760 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2990 /* we arrange for a temporary on_destroy that calls adjust (0) */
2761 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2991 frame->destroy = coro_semaphore_destroy;
2762 } 2992 }
2763} 2993}
2764 2994
2765static void 2995static void
2766slf_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)
… …
2984 dSP; 3214 dSP;
2985 3215
2986 static SV *prio_cv; 3216 static SV *prio_cv;
2987 static SV *prio_sv; 3217 static SV *prio_sv;
2988 3218
2989 if (expect_false (!prio_cv)) 3219 if (ecb_expect_false (!prio_cv))
2990 { 3220 {
2991 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3221 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2992 prio_sv = newSViv (0); 3222 prio_sv = newSViv (0);
2993 } 3223 }
2994 3224
… …
3100 } 3330 }
3101 3331
3102 return coro_sv; 3332 return coro_sv;
3103} 3333}
3104 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
3105MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3392MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3106 3393
3107PROTOTYPES: DISABLE 3394PROTOTYPES: DISABLE
3108 3395
3109BOOT: 3396BOOT:
… …
3113 coro_thx = PERL_GET_CONTEXT; 3400 coro_thx = PERL_GET_CONTEXT;
3114# endif 3401# endif
3115#endif 3402#endif
3116 BOOT_PAGESIZE; 3403 BOOT_PAGESIZE;
3117 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
3118 cctx_current = cctx_new_empty (); 3412 cctx_current = cctx_new_empty ();
3119 3413
3120 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3414 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3121 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3415 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3122 3416
… …
3161 coroapi.prepare_nop = prepare_nop; 3455 coroapi.prepare_nop = prepare_nop;
3162 coroapi.prepare_schedule = prepare_schedule; 3456 coroapi.prepare_schedule = prepare_schedule;
3163 coroapi.prepare_cede = prepare_cede; 3457 coroapi.prepare_cede = prepare_cede;
3164 coroapi.prepare_cede_notself = prepare_cede_notself; 3458 coroapi.prepare_cede_notself = prepare_cede_notself;
3165 3459
3166 time_init (); 3460 time_init (aTHX);
3167 3461
3168 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
3169} 3470}
3170 3471
3171SV * 3472SV *
3172new (SV *klass, ...) 3473new (SV *klass, ...)
3173 ALIAS: 3474 ALIAS:
… …
3180void 3481void
3181transfer (...) 3482transfer (...)
3182 PROTOTYPE: $$ 3483 PROTOTYPE: $$
3183 CODE: 3484 CODE:
3184 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3485 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 3486
3193void 3487void
3194_exit (int code) 3488_exit (int code)
3195 PROTOTYPE: $ 3489 PROTOTYPE: $
3196 CODE: 3490 CODE:
… …
3272 CODE: 3566 CODE:
3273{ 3567{
3274 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3568 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3275 { 3569 {
3276 struct coro *current = SvSTATE_current; 3570 struct coro *current = SvSTATE_current;
3571 struct CoroSLF slf_save;
3277 3572
3278 if (current != coro) 3573 if (current != coro)
3279 { 3574 {
3280 PUTBACK; 3575 PUTBACK;
3281 save_perl (aTHX_ current); 3576 save_perl (aTHX_ current);
3282 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;
3283 SPAGAIN; 3587 SPAGAIN;
3284 } 3588 }
3285 3589
3286 PUSHSTACK; 3590 PUSHSTACK;
3287 3591
… …
3297 SPAGAIN; 3601 SPAGAIN;
3298 3602
3299 if (current != coro) 3603 if (current != coro)
3300 { 3604 {
3301 PUTBACK; 3605 PUTBACK;
3606 slf_frame = slf_save;
3302 save_perl (aTHX_ coro); 3607 save_perl (aTHX_ coro);
3303 load_perl (aTHX_ current); 3608 load_perl (aTHX_ current);
3304 SPAGAIN; 3609 SPAGAIN;
3305 } 3610 }
3306 } 3611 }
… …
3311 PROTOTYPE: $ 3616 PROTOTYPE: $
3312 ALIAS: 3617 ALIAS:
3313 is_ready = CF_READY 3618 is_ready = CF_READY
3314 is_running = CF_RUNNING 3619 is_running = CF_RUNNING
3315 is_new = CF_NEW 3620 is_new = CF_NEW
3316 is_destroyed = CF_DESTROYED 3621 is_destroyed = CF_ZOMBIE
3622 is_zombie = CF_ZOMBIE
3317 is_suspended = CF_SUSPENDED 3623 is_suspended = CF_SUSPENDED
3318 CODE: 3624 CODE:
3319 RETVAL = boolSV (coro->flags & ix); 3625 RETVAL = boolSV (coro->flags & ix);
3320 OUTPUT: 3626 OUTPUT:
3321 RETVAL 3627 RETVAL
… …
3392 3698
3393void 3699void
3394cancel (Coro::State self) 3700cancel (Coro::State self)
3395 CODE: 3701 CODE:
3396 coro_state_destroy (aTHX_ self); 3702 coro_state_destroy (aTHX_ self);
3397 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3398
3399 3703
3400SV * 3704SV *
3401enable_times (int enabled = enable_times) 3705enable_times (int enabled = enable_times)
3402 CODE: 3706 CODE:
3403{ 3707{
… …
3418times (Coro::State self) 3722times (Coro::State self)
3419 PPCODE: 3723 PPCODE:
3420{ 3724{
3421 struct coro *current = SvSTATE (coro_current); 3725 struct coro *current = SvSTATE (coro_current);
3422 3726
3423 if (expect_false (current == self)) 3727 if (ecb_expect_false (current == self))
3424 { 3728 {
3425 coro_times_update (); 3729 coro_times_update ();
3426 coro_times_add (SvSTATE (coro_current)); 3730 coro_times_add (SvSTATE (coro_current));
3427 } 3731 }
3428 3732
3429 EXTEND (SP, 2); 3733 EXTEND (SP, 2);
3430 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)));
3431 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)));
3432 3736
3433 if (expect_false (current == self)) 3737 if (ecb_expect_false (current == self))
3434 coro_times_sub (SvSTATE (coro_current)); 3738 coro_times_sub (SvSTATE (coro_current));
3435} 3739}
3436 3740
3437void 3741void
3438swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3742swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3459BOOT: 3763BOOT:
3460{ 3764{
3461 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3765 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3462 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3766 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3463 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3767 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); 3768 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); 3769 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3467 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3770 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3468 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3771 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3469 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3772 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
… …
3508 api_ready (aTHX_ RETVAL); 3811 api_ready (aTHX_ RETVAL);
3509 OUTPUT: 3812 OUTPUT:
3510 RETVAL 3813 RETVAL
3511 3814
3512void 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
3513terminate (...) 3832terminate (...)
3514 CODE: 3833 CODE:
3515 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
3516 3844
3517void 3845void
3518schedule (...) 3846schedule (...)
3519 CODE: 3847 CODE:
3520 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