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

Diff Legend

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