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