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.378 by root, Sat Dec 12 01:30:26 2009 UTC vs.
Revision 1.404 by root, Fri Jun 10 12:27:02 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
1#define NDEBUG 1 4#define NDEBUG 1
2 5
3#include "libcoro/coro.c" 6#include "libcoro/coro.c"
4 7
5#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
… …
9#include "perl.h" 12#include "perl.h"
10#include "XSUB.h" 13#include "XSUB.h"
11#include "perliol.h" 14#include "perliol.h"
12 15
13#include "schmorp.h" 16#include "schmorp.h"
17#include "ecb.h"
14 18
19#include <stddef.h>
15#include <stdio.h> 20#include <stdio.h>
16#include <errno.h> 21#include <errno.h>
17#include <assert.h> 22#include <assert.h>
18 23
19#ifndef SVs_PADSTALE 24#ifndef SVs_PADSTALE
20# define SVs_PADSTALE 0 25# define SVs_PADSTALE 0
21#endif 26#endif
22 27
23#ifdef WIN32 28#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY
24# undef setjmp 30# undef setjmp
25# undef longjmp 31# undef longjmp
26# undef _exit 32# undef _exit
27# define setjmp _setjmp /* deep magic */ 33# define setjmp _setjmp /* deep magic */
28#else 34#else
… …
82# define STACKLEVEL ((void *)&stacklevel) 88# define STACKLEVEL ((void *)&stacklevel)
83#endif 89#endif
84 90
85#define IN_DESTRUCT PL_dirty 91#define IN_DESTRUCT PL_dirty
86 92
87#if __GNUC__ >= 3
88# define attribute(x) __attribute__(x)
89# define expect(expr,value) __builtin_expect ((expr), (value))
90# define INLINE static inline
91#else
92# define attribute(x)
93# define expect(expr,value) (expr)
94# define INLINE static
95#endif
96
97#define expect_false(expr) expect ((expr) != 0, 0)
98#define expect_true(expr) expect ((expr) != 0, 1)
99
100#define NOINLINE attribute ((noinline))
101
102#include "CoroAPI.h" 93#include "CoroAPI.h"
103#define GCoroAPI (&coroapi) /* very sneaky */ 94#define GCoroAPI (&coroapi) /* very sneaky */
104 95
105#ifdef USE_ITHREADS 96#ifdef USE_ITHREADS
106# if CORO_PTHREAD 97# if CORO_PTHREAD
… …
122static void (*u2time)(pTHX_ UV ret[2]); 113static void (*u2time)(pTHX_ UV ret[2]);
123 114
124/* we hijack an hopefully unused CV flag for our purposes */ 115/* we hijack an hopefully unused CV flag for our purposes */
125#define CVf_SLF 0x4000 116#define CVf_SLF 0x4000
126static OP *pp_slf (pTHX); 117static OP *pp_slf (pTHX);
118static void slf_destroy (pTHX_ struct coro *coro);
127 119
128static U32 cctx_gen; 120static U32 cctx_gen;
129static size_t cctx_stacksize = CORO_STACKSIZE; 121static size_t cctx_stacksize = CORO_STACKSIZE;
130static struct CoroAPI coroapi; 122static struct CoroAPI coroapi;
131static AV *main_mainstack; /* used to differentiate between $main and others */ 123static AV *main_mainstack; /* used to differentiate between $main and others */
… …
161static char times_valid; 153static char times_valid;
162 154
163static struct coro_cctx *cctx_first; 155static struct coro_cctx *cctx_first;
164static int cctx_count, cctx_idle; 156static int cctx_count, cctx_idle;
165 157
166enum { 158enum
159{
167 CC_MAPPED = 0x01, 160 CC_MAPPED = 0x01,
168 CC_NOREUSE = 0x02, /* throw this away after tracing */ 161 CC_NOREUSE = 0x02, /* throw this away after tracing */
169 CC_TRACE = 0x04, 162 CC_TRACE = 0x04,
170 CC_TRACE_SUB = 0x08, /* trace sub calls */ 163 CC_TRACE_SUB = 0x08, /* trace sub calls */
171 CC_TRACE_LINE = 0x10, /* trace each statement */ 164 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
192 int valgrind_id; 185 int valgrind_id;
193#endif 186#endif
194 unsigned char flags; 187 unsigned char flags;
195} coro_cctx; 188} coro_cctx;
196 189
197coro_cctx *cctx_current; /* the currently running cctx */ 190static coro_cctx *cctx_current; /* the currently running cctx */
198 191
199/*****************************************************************************/ 192/*****************************************************************************/
200 193
194static MGVTBL coro_state_vtbl;
195
201enum { 196enum
197{
202 CF_RUNNING = 0x0001, /* coroutine is running */ 198 CF_RUNNING = 0x0001, /* coroutine is running */
203 CF_READY = 0x0002, /* coroutine is ready */ 199 CF_READY = 0x0002, /* coroutine is ready */
204 CF_NEW = 0x0004, /* has never been switched to */ 200 CF_NEW = 0x0004, /* has never been switched to */
205 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 201 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
206 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 202 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
203 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
207}; 204};
208 205
209/* the structure where most of the perl state is stored, overlaid on the cxstack */ 206/* the structure where most of the perl state is stored, overlaid on the cxstack */
210typedef struct 207typedef struct
211{ 208{
… …
217#define VAR(name,type) type name; 214#define VAR(name,type) type name;
218# include "state.h" 215# include "state.h"
219#undef VAR 216#undef VAR
220} perl_slots; 217} perl_slots;
221 218
219// how many context stack entries do we need for perl_slots
222#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 220#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
223 221
224/* this is a structure representing a perl-level coroutine */ 222/* this is a structure representing a perl-level coroutine */
225struct coro { 223struct coro
224{
226 /* the C coroutine allocated to this perl coroutine, if any */ 225 /* the C coroutine allocated to this perl coroutine, if any */
227 coro_cctx *cctx; 226 coro_cctx *cctx;
228 227
229 /* ready queue */ 228 /* ready queue */
230 struct coro *next_ready; 229 struct coro *next_ready;
… …
232 /* state data */ 231 /* state data */
233 struct CoroSLF slf_frame; /* saved slf frame */ 232 struct CoroSLF slf_frame; /* saved slf frame */
234 AV *mainstack; 233 AV *mainstack;
235 perl_slots *slot; /* basically the saved sp */ 234 perl_slots *slot; /* basically the saved sp */
236 235
237 CV *startcv; /* the CV to execute */ 236 CV *startcv; /* the CV to execute */
238 AV *args; /* data associated with this coroutine (initial args) */ 237 AV *args; /* data associated with this coroutine (initial args) */
239 int refcnt; /* coroutines are refcounted, yes */
240 int flags; /* CF_ flags */ 238 int flags; /* CF_ flags */
241 HV *hv; /* the perl hash associated with this coro, if any */ 239 HV *hv; /* the perl hash associated with this coro, if any */
242 void (*on_destroy)(pTHX_ struct coro *coro);
243 240
244 /* statistics */ 241 /* statistics */
245 int usecount; /* number of transfers to this coro */ 242 int usecount; /* number of transfers to this coro */
246 243
247 /* coro process data */ 244 /* coro process data */
248 int prio; 245 int prio;
249 SV *except; /* exception to be thrown */ 246 SV *except; /* exception to be thrown */
250 SV *rouse_cb; 247 SV *rouse_cb; /* last rouse callback */
248 AV *on_destroy; /* callbacks or coros to notify on destroy */
249 AV *status; /* the exit status list */
251 250
252 /* async_pool */ 251 /* async_pool */
253 SV *saved_deffh; 252 SV *saved_deffh;
254 SV *invoke_cb; 253 SV *invoke_cb;
255 AV *invoke_av; 254 AV *invoke_av;
… …
271typedef struct coro *Coro__State; 270typedef struct coro *Coro__State;
272typedef struct coro *Coro__State_or_hashref; 271typedef struct coro *Coro__State_or_hashref;
273 272
274/* the following variables are effectively part of the perl context */ 273/* the following variables are effectively part of the perl context */
275/* and get copied between struct coro and these variables */ 274/* and get copied between struct coro and these variables */
276/* the mainr easonw e don't support windows process emulation */ 275/* the main reason we don't support windows process emulation */
277static struct CoroSLF slf_frame; /* the current slf frame */ 276static struct CoroSLF slf_frame; /* the current slf frame */
278 277
279/** Coro ********************************************************************/ 278/** Coro ********************************************************************/
280 279
281#define CORO_PRIO_MAX 3 280#define CORO_PRIO_MAX 3
… …
287 286
288/* for Coro.pm */ 287/* for Coro.pm */
289static SV *coro_current; 288static SV *coro_current;
290static SV *coro_readyhook; 289static SV *coro_readyhook;
291static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 290static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
292static CV *cv_coro_run, *cv_coro_terminate; 291static CV *cv_coro_run;
293static struct coro *coro_first; 292static struct coro *coro_first;
294#define coro_nready coroapi.nready 293#define coro_nready coroapi.nready
295 294
296/** Coro::Select ************************************************************/ 295/** Coro::Select ************************************************************/
297 296
… …
311 PL_op->op_flags |= OPf_STACKED; 310 PL_op->op_flags |= OPf_STACKED;
312 PL_op->op_private = 0; 311 PL_op->op_private = 0;
313 return PL_ppaddr [OP_ENTERSUB](aTHX); 312 return PL_ppaddr [OP_ENTERSUB](aTHX);
314} 313}
315 314
315/** time stuff **************************************************************/
316
317#ifdef HAS_GETTIMEOFDAY
318
319ECB_INLINE void
320coro_u2time (pTHX_ UV ret[2])
321{
322 struct timeval tv;
323 gettimeofday (&tv, 0);
324
325 ret [0] = tv.tv_sec;
326 ret [1] = tv.tv_usec;
327}
328
329ECB_INLINE double
330coro_nvtime ()
331{
332 struct timeval tv;
333 gettimeofday (&tv, 0);
334
335 return tv.tv_sec + tv.tv_usec * 1e-6;
336}
337
338ECB_INLINE void
339time_init (pTHX)
340{
341 nvtime = coro_nvtime;
342 u2time = coro_u2time;
343}
344
345#else
346
347ECB_INLINE void
348time_init (pTHX)
349{
350 SV **svp;
351
352 require_pv ("Time/HiRes.pm");
353
354 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
355
356 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
357 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
358
359 nvtime = INT2PTR (double (*)(), SvIV (*svp));
360
361 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
362 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
363}
364
365#endif
366
316/** lowlevel stuff **********************************************************/ 367/** lowlevel stuff **********************************************************/
317 368
318static SV * 369static SV * ecb_noinline
319coro_get_sv (pTHX_ const char *name, int create) 370coro_get_sv (pTHX_ const char *name, int create)
320{ 371{
321#if PERL_VERSION_ATLEAST (5,10,0) 372#if PERL_VERSION_ATLEAST (5,10,0)
322 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 373 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
323 get_sv (name, create); 374 get_sv (name, create);
324#endif 375#endif
325 return get_sv (name, create); 376 return get_sv (name, create);
326} 377}
327 378
328static AV * 379static AV * ecb_noinline
329coro_get_av (pTHX_ const char *name, int create) 380coro_get_av (pTHX_ const char *name, int create)
330{ 381{
331#if PERL_VERSION_ATLEAST (5,10,0) 382#if PERL_VERSION_ATLEAST (5,10,0)
332 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 383 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
333 get_av (name, create); 384 get_av (name, create);
334#endif 385#endif
335 return get_av (name, create); 386 return get_av (name, create);
336} 387}
337 388
338static HV * 389static HV * ecb_noinline
339coro_get_hv (pTHX_ const char *name, int create) 390coro_get_hv (pTHX_ const char *name, int create)
340{ 391{
341#if PERL_VERSION_ATLEAST (5,10,0) 392#if PERL_VERSION_ATLEAST (5,10,0)
342 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 393 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
343 get_hv (name, create); 394 get_hv (name, create);
344#endif 395#endif
345 return get_hv (name, create); 396 return get_hv (name, create);
346} 397}
347 398
348INLINE void 399ECB_INLINE void
349coro_times_update () 400coro_times_update ()
350{ 401{
351#ifdef coro_clock_gettime 402#ifdef coro_clock_gettime
352 struct timespec ts; 403 struct timespec ts;
353 404
… …
366 time_real [0] = tv [0]; 417 time_real [0] = tv [0];
367 time_real [1] = tv [1] * 1000; 418 time_real [1] = tv [1] * 1000;
368#endif 419#endif
369} 420}
370 421
371INLINE void 422ECB_INLINE void
372coro_times_add (struct coro *c) 423coro_times_add (struct coro *c)
373{ 424{
374 c->t_real [1] += time_real [1]; 425 c->t_real [1] += time_real [1];
375 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 426 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
376 c->t_real [0] += time_real [0]; 427 c->t_real [0] += time_real [0];
… …
378 c->t_cpu [1] += time_cpu [1]; 429 c->t_cpu [1] += time_cpu [1];
379 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 430 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
380 c->t_cpu [0] += time_cpu [0]; 431 c->t_cpu [0] += time_cpu [0];
381} 432}
382 433
383INLINE void 434ECB_INLINE void
384coro_times_sub (struct coro *c) 435coro_times_sub (struct coro *c)
385{ 436{
386 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 437 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
387 c->t_real [1] -= time_real [1]; 438 c->t_real [1] -= time_real [1];
388 c->t_real [0] -= time_real [0]; 439 c->t_real [0] -= time_real [0];
… …
396/* magic glue */ 447/* magic glue */
397 448
398#define CORO_MAGIC_type_cv 26 449#define CORO_MAGIC_type_cv 26
399#define CORO_MAGIC_type_state PERL_MAGIC_ext 450#define CORO_MAGIC_type_state PERL_MAGIC_ext
400 451
401#define CORO_MAGIC_NN(sv, type) \ 452#define CORO_MAGIC_NN(sv, type) \
402 (expect_true (SvMAGIC (sv)->mg_type == type) \ 453 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
403 ? SvMAGIC (sv) \ 454 ? SvMAGIC (sv) \
404 : mg_find (sv, type)) 455 : mg_find (sv, type))
405 456
406#define CORO_MAGIC(sv, type) \ 457#define CORO_MAGIC(sv, type) \
407 (expect_true (SvMAGIC (sv)) \ 458 (ecb_expect_true (SvMAGIC (sv)) \
408 ? CORO_MAGIC_NN (sv, type) \ 459 ? CORO_MAGIC_NN (sv, type) \
409 : 0) 460 : 0)
410 461
411#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 462#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
412#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 463#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
413 464
465ECB_INLINE MAGIC *
466SvSTATEhv_p (pTHX_ SV *coro)
467{
468 MAGIC *mg;
469
470 if (ecb_expect_true (
471 SvTYPE (coro) == SVt_PVHV
472 && (mg = CORO_MAGIC_state (coro))
473 && mg->mg_virtual == &coro_state_vtbl
474 ))
475 return mg;
476
477 return 0;
478}
479
414INLINE struct coro * 480ECB_INLINE struct coro *
415SvSTATE_ (pTHX_ SV *coro) 481SvSTATE_ (pTHX_ SV *coro)
416{ 482{
417 HV *stash;
418 MAGIC *mg; 483 MAGIC *mg;
419 484
420 if (SvROK (coro)) 485 if (SvROK (coro))
421 coro = SvRV (coro); 486 coro = SvRV (coro);
422 487
423 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 488 mg = SvSTATEhv_p (aTHX_ coro);
489 if (!mg)
424 croak ("Coro::State object required"); 490 croak ("Coro::State object required");
425 491
426 stash = SvSTASH (coro);
427 if (expect_false (stash != coro_stash && stash != coro_state_stash))
428 {
429 /* very slow, but rare, check */
430 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
431 croak ("Coro::State object required");
432 }
433
434 mg = CORO_MAGIC_state (coro);
435 return (struct coro *)mg->mg_ptr; 492 return (struct coro *)mg->mg_ptr;
436} 493}
437 494
438#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
439 496
… …
442#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
443 500
444/*****************************************************************************/ 501/*****************************************************************************/
445/* padlist management and caching */ 502/* padlist management and caching */
446 503
447static AV * 504ECB_INLINE AV *
448coro_derive_padlist (pTHX_ CV *cv) 505coro_derive_padlist (pTHX_ CV *cv)
449{ 506{
450 AV *padlist = CvPADLIST (cv); 507 AV *padlist = CvPADLIST (cv);
451 AV *newpadlist, *newpad; 508 AV *newpadlist, *newpad;
452 509
… …
464 av_store (newpadlist, 1, (SV *)newpad); 521 av_store (newpadlist, 1, (SV *)newpad);
465 522
466 return newpadlist; 523 return newpadlist;
467} 524}
468 525
469static void 526ECB_INLINE void
470free_padlist (pTHX_ AV *padlist) 527free_padlist (pTHX_ AV *padlist)
471{ 528{
472 /* may be during global destruction */ 529 /* may be during global destruction */
473 if (!IN_DESTRUCT) 530 if (!IN_DESTRUCT)
474 { 531 {
… …
517 0, 0, 0, 0, 574 0, 0, 0, 0,
518 coro_cv_free 575 coro_cv_free
519}; 576};
520 577
521/* the next two functions merely cache the padlists */ 578/* the next two functions merely cache the padlists */
522static void 579ECB_INLINE void
523get_padlist (pTHX_ CV *cv) 580get_padlist (pTHX_ CV *cv)
524{ 581{
525 MAGIC *mg = CORO_MAGIC_cv (cv); 582 MAGIC *mg = CORO_MAGIC_cv (cv);
526 AV *av; 583 AV *av;
527 584
528 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 585 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
529 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
530 else 587 else
531 { 588 {
532#if CORO_PREFER_PERL_FUNCTIONS 589#if CORO_PREFER_PERL_FUNCTIONS
533 /* this is probably cleaner? but also slower! */ 590 /* this is probably cleaner? but also slower! */
… …
540 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
541#endif 598#endif
542 } 599 }
543} 600}
544 601
545static void 602ECB_INLINE void
546put_padlist (pTHX_ CV *cv) 603put_padlist (pTHX_ CV *cv)
547{ 604{
548 MAGIC *mg = CORO_MAGIC_cv (cv); 605 MAGIC *mg = CORO_MAGIC_cv (cv);
549 AV *av; 606 AV *av;
550 607
551 if (expect_false (!mg)) 608 if (ecb_expect_false (!mg))
552 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 609 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
553 610
554 av = (AV *)mg->mg_obj; 611 av = (AV *)mg->mg_obj;
555 612
556 if (expect_false (AvFILLp (av) >= AvMAX (av))) 613 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
557 av_extend (av, AvFILLp (av) + 1); 614 av_extend (av, AvFILLp (av) + 1);
558 615
559 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
560} 617}
561 618
… …
583 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep); 640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
584 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep); 641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
585 642
586#if PERL_VERSION_ATLEAST (5,10,0) 643#if PERL_VERSION_ATLEAST (5,10,0)
587 /* perl 5.10 complicates this _quite_ a bit, but it also is 644 /* perl 5.10 complicates this _quite_ a bit, but it also is
588 * is much faster, so no quarrels here. alternatively, we could 645 * much faster, so no quarrels here. alternatively, we could
589 * sv_upgrade to avoid this. 646 * sv_upgrade to avoid this.
590 */ 647 */
591 { 648 {
592 /* swap sv_u */ 649 /* swap sv_u */
593 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
… …
606 } 663 }
607#endif 664#endif
608 } 665 }
609} 666}
610 667
611#define SWAP_SVS(coro) \ 668#define SWAP_SVS(coro) \
612 if (expect_false ((coro)->swap_sv)) \ 669 if (ecb_expect_false ((coro)->swap_sv)) \
613 swap_svs (aTHX_ (coro)) 670 swap_svs (aTHX_ (coro))
614 671
615static void 672static void
616on_enterleave_call (pTHX_ SV *cb); 673on_enterleave_call (pTHX_ SV *cb);
617 674
… …
637 dSP; 694 dSP;
638 695
639 CV *cv; 696 CV *cv;
640 697
641 /* now do the ugly restore mess */ 698 /* now do the ugly restore mess */
642 while (expect_true (cv = (CV *)POPs)) 699 while (ecb_expect_true (cv = (CV *)POPs))
643 { 700 {
644 put_padlist (aTHX_ cv); /* mark this padlist as available */ 701 put_padlist (aTHX_ cv); /* mark this padlist as available */
645 CvDEPTH (cv) = PTR2IV (POPs); 702 CvDEPTH (cv) = PTR2IV (POPs);
646 CvPADLIST (cv) = (AV *)POPs; 703 CvPADLIST (cv) = (AV *)POPs;
647 } 704 }
… …
650 } 707 }
651 708
652 slf_frame = c->slf_frame; 709 slf_frame = c->slf_frame;
653 CORO_THROW = c->except; 710 CORO_THROW = c->except;
654 711
655 if (expect_false (enable_times)) 712 if (ecb_expect_false (enable_times))
656 { 713 {
657 if (expect_false (!times_valid)) 714 if (ecb_expect_false (!times_valid))
658 coro_times_update (); 715 coro_times_update ();
659 716
660 coro_times_sub (c); 717 coro_times_sub (c);
661 } 718 }
662 719
663 if (expect_false (c->on_enter)) 720 if (ecb_expect_false (c->on_enter))
664 { 721 {
665 int i; 722 int i;
666 723
667 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 724 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
668 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
674static void 731static void
675save_perl (pTHX_ Coro__State c) 732save_perl (pTHX_ Coro__State c)
676{ 733{
677 SWAP_SVS (c); 734 SWAP_SVS (c);
678 735
679 if (expect_false (c->on_leave)) 736 if (ecb_expect_false (c->on_leave))
680 { 737 {
681 int i; 738 int i;
682 739
683 for (i = AvFILLp (c->on_leave); i >= 0; --i) 740 for (i = AvFILLp (c->on_leave); i >= 0; --i)
684 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
685 } 742 }
686 743
687 times_valid = 0; 744 times_valid = 0;
688 745
689 if (expect_false (enable_times)) 746 if (ecb_expect_false (enable_times))
690 { 747 {
691 coro_times_update (); times_valid = 1; 748 coro_times_update (); times_valid = 1;
692 coro_times_add (c); 749 coro_times_add (c);
693 } 750 }
694 751
… …
708 765
709 XPUSHs (Nullsv); 766 XPUSHs (Nullsv);
710 /* this loop was inspired by pp_caller */ 767 /* this loop was inspired by pp_caller */
711 for (;;) 768 for (;;)
712 { 769 {
713 while (expect_true (cxix >= 0)) 770 while (ecb_expect_true (cxix >= 0))
714 { 771 {
715 PERL_CONTEXT *cx = &ccstk[cxix--]; 772 PERL_CONTEXT *cx = &ccstk[cxix--];
716 773
717 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 774 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
718 { 775 {
719 CV *cv = cx->blk_sub.cv; 776 CV *cv = cx->blk_sub.cv;
720 777
721 if (expect_true (CvDEPTH (cv))) 778 if (ecb_expect_true (CvDEPTH (cv)))
722 { 779 {
723 EXTEND (SP, 3); 780 EXTEND (SP, 3);
724 PUSHs ((SV *)CvPADLIST (cv)); 781 PUSHs ((SV *)CvPADLIST (cv));
725 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
726 PUSHs ((SV *)cv); 783 PUSHs ((SV *)cv);
… …
729 get_padlist (aTHX_ cv); 786 get_padlist (aTHX_ cv);
730 } 787 }
731 } 788 }
732 } 789 }
733 790
734 if (expect_true (top_si->si_type == PERLSI_MAIN)) 791 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
735 break; 792 break;
736 793
737 top_si = top_si->si_prev; 794 top_si = top_si->si_prev;
738 ccstk = top_si->si_cxstack; 795 ccstk = top_si->si_cxstack;
739 cxix = top_si->si_cxix; 796 cxix = top_si->si_cxix;
… …
741 798
742 PUTBACK; 799 PUTBACK;
743 } 800 }
744 801
745 /* allocate some space on the context stack for our purposes */ 802 /* allocate some space on the context stack for our purposes */
746 /* we manually unroll here, as usually 2 slots is enough */ 803 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
747 if (SLOT_COUNT >= 1) CXINC;
748 if (SLOT_COUNT >= 2) CXINC;
749 if (SLOT_COUNT >= 3) CXINC;
750 { 804 {
751 unsigned int i; 805 unsigned int i;
806
752 for (i = 3; i < SLOT_COUNT; ++i) 807 for (i = 0; i < SLOT_COUNT; ++i)
753 CXINC; 808 CXINC;
754 } 809
755 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 810 cxstack_ix -= SLOT_COUNT; /* undo allocation */
811 }
756 812
757 c->mainstack = PL_mainstack; 813 c->mainstack = PL_mainstack;
758 814
759 { 815 {
760 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 816 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
… …
781# define coro_init_stacks(thx) init_stacks () 837# define coro_init_stacks(thx) init_stacks ()
782#else 838#else
783static void 839static void
784coro_init_stacks (pTHX) 840coro_init_stacks (pTHX)
785{ 841{
786 PL_curstackinfo = new_stackinfo(32, 8); 842 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
787 PL_curstackinfo->si_type = PERLSI_MAIN; 843 PL_curstackinfo->si_type = PERLSI_MAIN;
788 PL_curstack = PL_curstackinfo->si_stack; 844 PL_curstack = PL_curstackinfo->si_stack;
789 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 845 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
790 846
791 PL_stack_base = AvARRAY(PL_curstack); 847 PL_stack_base = AvARRAY(PL_curstack);
… …
898#endif 954#endif
899 955
900/* 956/*
901 * This overrides the default magic get method of %SIG elements. 957 * This overrides the default magic get method of %SIG elements.
902 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 958 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
903 * and instead of trying to save and restore the hash elements, we just provide 959 * and instead of trying to save and restore the hash elements (extremely slow),
904 * readback here. 960 * we just provide our own readback here.
905 */ 961 */
906static int 962static int ecb_cold
907coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 963coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
908{ 964{
909 const char *s = MgPV_nolen_const (mg); 965 const char *s = MgPV_nolen_const (mg);
910 966
911 if (*s == '_') 967 if (*s == '_')
… …
923 } 979 }
924 980
925 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 981 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
926} 982}
927 983
928static int 984static int ecb_cold
929coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 985coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
930{ 986{
931 const char *s = MgPV_nolen_const (mg); 987 const char *s = MgPV_nolen_const (mg);
932 988
933 if (*s == '_') 989 if (*s == '_')
… …
947 } 1003 }
948 1004
949 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1005 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
950} 1006}
951 1007
952static int 1008static int ecb_cold
953coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1009coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
954{ 1010{
955 const char *s = MgPV_nolen_const (mg); 1011 const char *s = MgPV_nolen_const (mg);
956 1012
957 if (*s == '_') 1013 if (*s == '_')
… …
992 return 1; 1048 return 1;
993} 1049}
994 1050
995static UNOP init_perl_op; 1051static UNOP init_perl_op;
996 1052
997static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1053ecb_noinline static void /* noinline to keep it out of the transfer fast path */
998init_perl (pTHX_ struct coro *coro) 1054init_perl (pTHX_ struct coro *coro)
999{ 1055{
1000 /* 1056 /*
1001 * emulate part of the perl startup here. 1057 * emulate part of the perl startup here.
1002 */ 1058 */
… …
1010 PL_comppad_name_fill = 0; 1066 PL_comppad_name_fill = 0;
1011 PL_comppad_name_floor = 0; 1067 PL_comppad_name_floor = 0;
1012 PL_curpm = 0; 1068 PL_curpm = 0;
1013 PL_curpad = 0; 1069 PL_curpad = 0;
1014 PL_localizing = 0; 1070 PL_localizing = 0;
1015 PL_dirty = 0;
1016 PL_restartop = 0; 1071 PL_restartop = 0;
1017#if PERL_VERSION_ATLEAST (5,10,0) 1072#if PERL_VERSION_ATLEAST (5,10,0)
1018 PL_parser = 0; 1073 PL_parser = 0;
1019#endif 1074#endif
1020 PL_hints = 0; 1075 PL_hints = 0;
1021 1076
1022 /* recreate the die/warn hooks */ 1077 /* recreate the die/warn hooks */
1023 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1078 PL_diehook = SvREFCNT_inc (rv_diehook);
1024 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1079 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1025 1080
1026 GvSV (PL_defgv) = newSV (0); 1081 GvSV (PL_defgv) = newSV (0);
1027 GvAV (PL_defgv) = coro->args; coro->args = 0; 1082 GvAV (PL_defgv) = coro->args; coro->args = 0;
1028 GvSV (PL_errgv) = newSV (0); 1083 GvSV (PL_errgv) = newSV (0);
1029 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1084 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
1050 /* this newly created coroutine might be run on an existing cctx which most 1105 /* this newly created coroutine might be run on an existing cctx which most
1051 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1106 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1052 */ 1107 */
1053 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1108 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1054 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1109 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1110 slf_frame.destroy = 0;
1055 1111
1056 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1057 init_perl_op.op_next = PL_op; 1113 init_perl_op.op_next = PL_op;
1058 init_perl_op.op_type = OP_ENTERSUB; 1114 init_perl_op.op_type = OP_ENTERSUB;
1059 init_perl_op.op_ppaddr = pp_slf; 1115 init_perl_op.op_ppaddr = pp_slf;
… …
1064 /* copy throw, in case it was set before init_perl */ 1120 /* copy throw, in case it was set before init_perl */
1065 CORO_THROW = coro->except; 1121 CORO_THROW = coro->except;
1066 1122
1067 SWAP_SVS (coro); 1123 SWAP_SVS (coro);
1068 1124
1069 if (expect_false (enable_times)) 1125 if (ecb_expect_false (enable_times))
1070 { 1126 {
1071 coro_times_update (); 1127 coro_times_update ();
1072 coro_times_sub (coro); 1128 coro_times_sub (coro);
1073 } 1129 }
1074} 1130}
… …
1098destroy_perl (pTHX_ struct coro *coro) 1154destroy_perl (pTHX_ struct coro *coro)
1099{ 1155{
1100 SV *svf [9]; 1156 SV *svf [9];
1101 1157
1102 { 1158 {
1159 SV *old_current = SvRV (coro_current);
1103 struct coro *current = SvSTATE_current; 1160 struct coro *current = SvSTATE (old_current);
1104 1161
1105 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1162 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1106 1163
1107 save_perl (aTHX_ current); 1164 save_perl (aTHX_ current);
1165
1166 /* this will cause transfer_check to croak on block*/
1167 SvRV_set (coro_current, (SV *)coro->hv);
1168
1108 load_perl (aTHX_ coro); 1169 load_perl (aTHX_ coro);
1109 1170
1110 coro_unwind_stacks (aTHX); 1171 coro_unwind_stacks (aTHX);
1111 coro_destruct_stacks (aTHX);
1112 1172
1113 /* restore swapped sv's */ 1173 /* restore swapped sv's */
1114 SWAP_SVS (coro); 1174 SWAP_SVS (coro);
1175
1176 coro_destruct_stacks (aTHX);
1115 1177
1116 // now save some sv's to be free'd later 1178 // now save some sv's to be free'd later
1117 svf [0] = GvSV (PL_defgv); 1179 svf [0] = GvSV (PL_defgv);
1118 svf [1] = (SV *)GvAV (PL_defgv); 1180 svf [1] = (SV *)GvAV (PL_defgv);
1119 svf [2] = GvSV (PL_errgv); 1181 svf [2] = GvSV (PL_errgv);
… …
1123 svf [6] = (SV *)GvHV (PL_hintgv); 1185 svf [6] = (SV *)GvHV (PL_hintgv);
1124 svf [7] = PL_diehook; 1186 svf [7] = PL_diehook;
1125 svf [8] = PL_warnhook; 1187 svf [8] = PL_warnhook;
1126 assert (9 == sizeof (svf) / sizeof (*svf)); 1188 assert (9 == sizeof (svf) / sizeof (*svf));
1127 1189
1190 SvRV_set (coro_current, old_current);
1191
1128 load_perl (aTHX_ current); 1192 load_perl (aTHX_ current);
1129 } 1193 }
1130 1194
1131 { 1195 {
1132 unsigned int i; 1196 unsigned int i;
… …
1139 SvREFCNT_dec (coro->invoke_cb); 1203 SvREFCNT_dec (coro->invoke_cb);
1140 SvREFCNT_dec (coro->invoke_av); 1204 SvREFCNT_dec (coro->invoke_av);
1141 } 1205 }
1142} 1206}
1143 1207
1144INLINE void 1208ECB_INLINE void
1145free_coro_mortal (pTHX) 1209free_coro_mortal (pTHX)
1146{ 1210{
1147 if (expect_true (coro_mortal)) 1211 if (ecb_expect_true (coro_mortal))
1148 { 1212 {
1149 SvREFCNT_dec (coro_mortal); 1213 SvREFCNT_dec ((SV *)coro_mortal);
1150 coro_mortal = 0; 1214 coro_mortal = 0;
1151 } 1215 }
1152} 1216}
1153 1217
1154static int 1218static int
… …
1287 1351
1288 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1352 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1289} 1353}
1290 1354
1291/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1355/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1292static void NOINLINE 1356static void ecb_noinline
1293cctx_prepare (pTHX) 1357cctx_prepare (pTHX)
1294{ 1358{
1295 PL_top_env = &PL_start_env; 1359 PL_top_env = &PL_start_env;
1296 1360
1297 if (cctx_current->flags & CC_TRACE) 1361 if (cctx_current->flags & CC_TRACE)
… …
1308 slf_frame.prepare = slf_prepare_set_stacklevel; 1372 slf_frame.prepare = slf_prepare_set_stacklevel;
1309 slf_frame.check = slf_check_set_stacklevel; 1373 slf_frame.check = slf_check_set_stacklevel;
1310} 1374}
1311 1375
1312/* the tail of transfer: execute stuff we can only do after a transfer */ 1376/* the tail of transfer: execute stuff we can only do after a transfer */
1313INLINE void 1377ECB_INLINE void
1314transfer_tail (pTHX) 1378transfer_tail (pTHX)
1315{ 1379{
1316 free_coro_mortal (aTHX); 1380 free_coro_mortal (aTHX);
1317} 1381}
1318 1382
… …
1441cctx_destroy (coro_cctx *cctx) 1505cctx_destroy (coro_cctx *cctx)
1442{ 1506{
1443 if (!cctx) 1507 if (!cctx)
1444 return; 1508 return;
1445 1509
1446 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1510 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1447 1511
1448 --cctx_count; 1512 --cctx_count;
1449 coro_destroy (&cctx->cctx); 1513 coro_destroy (&cctx->cctx);
1450 1514
1451 /* coro_transfer creates new, empty cctx's */ 1515 /* coro_transfer creates new, empty cctx's */
… …
1470#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1534#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1471 1535
1472static coro_cctx * 1536static coro_cctx *
1473cctx_get (pTHX) 1537cctx_get (pTHX)
1474{ 1538{
1475 while (expect_true (cctx_first)) 1539 while (ecb_expect_true (cctx_first))
1476 { 1540 {
1477 coro_cctx *cctx = cctx_first; 1541 coro_cctx *cctx = cctx_first;
1478 cctx_first = cctx->next; 1542 cctx_first = cctx->next;
1479 --cctx_idle; 1543 --cctx_idle;
1480 1544
1481 if (expect_true (!CCTX_EXPIRED (cctx))) 1545 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1482 return cctx; 1546 return cctx;
1483 1547
1484 cctx_destroy (cctx); 1548 cctx_destroy (cctx);
1485 } 1549 }
1486 1550
… …
1491cctx_put (coro_cctx *cctx) 1555cctx_put (coro_cctx *cctx)
1492{ 1556{
1493 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1557 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1494 1558
1495 /* free another cctx if overlimit */ 1559 /* free another cctx if overlimit */
1496 if (expect_false (cctx_idle >= cctx_max_idle)) 1560 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1497 { 1561 {
1498 coro_cctx *first = cctx_first; 1562 coro_cctx *first = cctx_first;
1499 cctx_first = first->next; 1563 cctx_first = first->next;
1500 --cctx_idle; 1564 --cctx_idle;
1501 1565
… …
1512static void 1576static void
1513transfer_check (pTHX_ struct coro *prev, struct coro *next) 1577transfer_check (pTHX_ struct coro *prev, struct coro *next)
1514{ 1578{
1515 /* TODO: throwing up here is considered harmful */ 1579 /* TODO: throwing up here is considered harmful */
1516 1580
1517 if (expect_true (prev != next)) 1581 if (ecb_expect_true (prev != next))
1518 { 1582 {
1519 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1583 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1520 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1584 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1521 1585
1522 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1586 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1523 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1587 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1524 1588
1525#if !PERL_VERSION_ATLEAST (5,10,0) 1589#if !PERL_VERSION_ATLEAST (5,10,0)
1526 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1590 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1527 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1591 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1528#endif 1592#endif
1529 } 1593 }
1530} 1594}
1531 1595
1532/* always use the TRANSFER macro */ 1596/* always use the TRANSFER macro */
1533static void NOINLINE /* noinline so we have a fixed stackframe */ 1597static void ecb_noinline /* noinline so we have a fixed stackframe */
1534transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1598transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1535{ 1599{
1536 dSTACKLEVEL; 1600 dSTACKLEVEL;
1537 1601
1538 /* sometimes transfer is only called to set idle_sp */ 1602 /* sometimes transfer is only called to set idle_sp */
1539 if (expect_false (!prev)) 1603 if (ecb_expect_false (!prev))
1540 { 1604 {
1541 cctx_current->idle_sp = STACKLEVEL; 1605 cctx_current->idle_sp = STACKLEVEL;
1542 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1606 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1543 } 1607 }
1544 else if (expect_true (prev != next)) 1608 else if (ecb_expect_true (prev != next))
1545 { 1609 {
1546 coro_cctx *cctx_prev; 1610 coro_cctx *cctx_prev;
1547 1611
1548 if (expect_false (prev->flags & CF_NEW)) 1612 if (ecb_expect_false (prev->flags & CF_NEW))
1549 { 1613 {
1550 /* create a new empty/source context */ 1614 /* create a new empty/source context */
1551 prev->flags &= ~CF_NEW; 1615 prev->flags &= ~CF_NEW;
1552 prev->flags |= CF_RUNNING; 1616 prev->flags |= CF_RUNNING;
1553 } 1617 }
… …
1556 next->flags |= CF_RUNNING; 1620 next->flags |= CF_RUNNING;
1557 1621
1558 /* first get rid of the old state */ 1622 /* first get rid of the old state */
1559 save_perl (aTHX_ prev); 1623 save_perl (aTHX_ prev);
1560 1624
1561 if (expect_false (next->flags & CF_NEW)) 1625 if (ecb_expect_false (next->flags & CF_NEW))
1562 { 1626 {
1563 /* need to start coroutine */ 1627 /* need to start coroutine */
1564 next->flags &= ~CF_NEW; 1628 next->flags &= ~CF_NEW;
1565 /* setup coroutine call */ 1629 /* setup coroutine call */
1566 init_perl (aTHX_ next); 1630 init_perl (aTHX_ next);
1567 } 1631 }
1568 else 1632 else
1569 load_perl (aTHX_ next); 1633 load_perl (aTHX_ next);
1570 1634
1571 /* possibly untie and reuse the cctx */ 1635 /* possibly untie and reuse the cctx */
1572 if (expect_true ( 1636 if (ecb_expect_true (
1573 cctx_current->idle_sp == STACKLEVEL 1637 cctx_current->idle_sp == STACKLEVEL
1574 && !(cctx_current->flags & CC_TRACE) 1638 && !(cctx_current->flags & CC_TRACE)
1575 && !force_cctx 1639 && !force_cctx
1576 )) 1640 ))
1577 { 1641 {
1578 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1642 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1579 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1643 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1580 1644
1581 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1645 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1582 /* without this the next cctx_get might destroy the running cctx while still in use */ 1646 /* without this the next cctx_get might destroy the running cctx while still in use */
1583 if (expect_false (CCTX_EXPIRED (cctx_current))) 1647 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1584 if (expect_true (!next->cctx)) 1648 if (ecb_expect_true (!next->cctx))
1585 next->cctx = cctx_get (aTHX); 1649 next->cctx = cctx_get (aTHX);
1586 1650
1587 cctx_put (cctx_current); 1651 cctx_put (cctx_current);
1588 } 1652 }
1589 else 1653 else
1590 prev->cctx = cctx_current; 1654 prev->cctx = cctx_current;
1591 1655
1592 ++next->usecount; 1656 ++next->usecount;
1593 1657
1594 cctx_prev = cctx_current; 1658 cctx_prev = cctx_current;
1595 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1659 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1596 1660
1597 next->cctx = 0; 1661 next->cctx = 0;
1598 1662
1599 if (expect_false (cctx_prev != cctx_current)) 1663 if (ecb_expect_false (cctx_prev != cctx_current))
1600 { 1664 {
1601 cctx_prev->top_env = PL_top_env; 1665 cctx_prev->top_env = PL_top_env;
1602 PL_top_env = cctx_current->top_env; 1666 PL_top_env = cctx_current->top_env;
1603 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1667 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1604 } 1668 }
… …
1610#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1674#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1611#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1675#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1612 1676
1613/** high level stuff ********************************************************/ 1677/** high level stuff ********************************************************/
1614 1678
1679/* this function is actually Coro, not Coro::State, but we call it from here */
1680/* because it is convenient - but it hasn't been declared yet for that reason */
1615static int 1681static void
1682coro_call_on_destroy (pTHX_ struct coro *coro);
1683
1684static void
1616coro_state_destroy (pTHX_ struct coro *coro) 1685coro_state_destroy (pTHX_ struct coro *coro)
1617{ 1686{
1618 if (coro->flags & CF_DESTROYED) 1687 if (coro->flags & CF_ZOMBIE)
1619 return 0; 1688 return;
1620 1689
1621 if (coro->on_destroy && !PL_dirty)
1622 coro->on_destroy (aTHX_ coro); 1690 slf_destroy (aTHX_ coro);
1623 1691
1624 coro->flags |= CF_DESTROYED; 1692 coro->flags |= CF_ZOMBIE;
1625 1693
1626 if (coro->flags & CF_READY) 1694 if (coro->flags & CF_READY)
1627 { 1695 {
1628 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1696 /* reduce nready, as destroying a ready coro effectively unreadies it */
1629 /* alternative: look through all ready queues and remove the coro */ 1697 /* alternative: look through all ready queues and remove the coro */
1630 --coro_nready; 1698 --coro_nready;
1631 } 1699 }
1632 else 1700 else
1633 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1701 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1702
1703 if (coro->next) coro->next->prev = coro->prev;
1704 if (coro->prev) coro->prev->next = coro->next;
1705 if (coro == coro_first) coro_first = coro->next;
1634 1706
1635 if (coro->mainstack 1707 if (coro->mainstack
1636 && coro->mainstack != main_mainstack 1708 && coro->mainstack != main_mainstack
1637 && coro->slot 1709 && coro->slot
1638 && !PL_dirty) 1710 && !PL_dirty)
1639 destroy_perl (aTHX_ coro); 1711 destroy_perl (aTHX_ coro);
1640 1712
1641 if (coro->next) coro->next->prev = coro->prev;
1642 if (coro->prev) coro->prev->next = coro->next;
1643 if (coro == coro_first) coro_first = coro->next;
1644
1645 cctx_destroy (coro->cctx); 1713 cctx_destroy (coro->cctx);
1646 SvREFCNT_dec (coro->startcv); 1714 SvREFCNT_dec (coro->startcv);
1647 SvREFCNT_dec (coro->args); 1715 SvREFCNT_dec (coro->args);
1648 SvREFCNT_dec (coro->swap_sv); 1716 SvREFCNT_dec (coro->swap_sv);
1649 SvREFCNT_dec (CORO_THROW); 1717 SvREFCNT_dec (CORO_THROW);
1650 1718
1651 return 1; 1719 coro_call_on_destroy (aTHX_ coro);
1720
1721 /* more destruction mayhem in coro_state_free */
1652} 1722}
1653 1723
1654static int 1724static int
1655coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1725coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1656{ 1726{
1657 struct coro *coro = (struct coro *)mg->mg_ptr; 1727 struct coro *coro = (struct coro *)mg->mg_ptr;
1658 mg->mg_ptr = 0; 1728 mg->mg_ptr = 0;
1659 1729
1660 coro->hv = 0;
1661
1662 if (--coro->refcnt < 0)
1663 {
1664 coro_state_destroy (aTHX_ coro); 1730 coro_state_destroy (aTHX_ coro);
1731 SvREFCNT_dec (coro->on_destroy);
1732 SvREFCNT_dec (coro->status);
1733
1665 Safefree (coro); 1734 Safefree (coro);
1666 }
1667 1735
1668 return 0; 1736 return 0;
1669} 1737}
1670 1738
1671static int 1739static int ecb_cold
1672coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1740coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1673{ 1741{
1674 struct coro *coro = (struct coro *)mg->mg_ptr; 1742 /* called when perl clones the current process the slow way (windows process emulation) */
1675 1743 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1676 ++coro->refcnt; 1744 mg->mg_ptr = 0;
1745 mg->mg_virtual = 0;
1677 1746
1678 return 0; 1747 return 0;
1679} 1748}
1680 1749
1681static MGVTBL coro_state_vtbl = { 1750static MGVTBL coro_state_vtbl = {
… …
1706 TRANSFER (ta, 1); 1775 TRANSFER (ta, 1);
1707} 1776}
1708 1777
1709/** Coro ********************************************************************/ 1778/** Coro ********************************************************************/
1710 1779
1711INLINE void 1780ECB_INLINE void
1712coro_enq (pTHX_ struct coro *coro) 1781coro_enq (pTHX_ struct coro *coro)
1713{ 1782{
1714 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1783 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1715 1784
1716 SvREFCNT_inc_NN (coro->hv); 1785 SvREFCNT_inc_NN (coro->hv);
… …
1718 coro->next_ready = 0; 1787 coro->next_ready = 0;
1719 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1788 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1720 ready [1] = coro; 1789 ready [1] = coro;
1721} 1790}
1722 1791
1723INLINE struct coro * 1792ECB_INLINE struct coro *
1724coro_deq (pTHX) 1793coro_deq (pTHX)
1725{ 1794{
1726 int prio; 1795 int prio;
1727 1796
1728 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1797 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1781{ 1850{
1782 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1851 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1783} 1852}
1784 1853
1785/* expects to own a reference to next->hv */ 1854/* expects to own a reference to next->hv */
1786INLINE void 1855ECB_INLINE void
1787prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1856prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1788{ 1857{
1789 SV *prev_sv = SvRV (coro_current); 1858 SV *prev_sv = SvRV (coro_current);
1790 1859
1791 ta->prev = SvSTATE_hv (prev_sv); 1860 ta->prev = SvSTATE_hv (prev_sv);
… …
1804{ 1873{
1805 for (;;) 1874 for (;;)
1806 { 1875 {
1807 struct coro *next = coro_deq (aTHX); 1876 struct coro *next = coro_deq (aTHX);
1808 1877
1809 if (expect_true (next)) 1878 if (ecb_expect_true (next))
1810 { 1879 {
1811 /* cannot transfer to destroyed coros, skip and look for next */ 1880 /* cannot transfer to destroyed coros, skip and look for next */
1812 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1881 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1813 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1882 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1814 else 1883 else
1815 { 1884 {
1816 next->flags &= ~CF_READY; 1885 next->flags &= ~CF_READY;
1817 --coro_nready; 1886 --coro_nready;
… …
1850 } 1919 }
1851 } 1920 }
1852 } 1921 }
1853} 1922}
1854 1923
1855INLINE void 1924ECB_INLINE void
1856prepare_cede (pTHX_ struct coro_transfer_args *ta) 1925prepare_cede (pTHX_ struct coro_transfer_args *ta)
1857{ 1926{
1858 api_ready (aTHX_ coro_current); 1927 api_ready (aTHX_ coro_current);
1859 prepare_schedule (aTHX_ ta); 1928 prepare_schedule (aTHX_ ta);
1860} 1929}
1861 1930
1862INLINE void 1931ECB_INLINE void
1863prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1932prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1864{ 1933{
1865 SV *prev = SvRV (coro_current); 1934 SV *prev = SvRV (coro_current);
1866 1935
1867 if (coro_nready) 1936 if (coro_nready)
… …
1897{ 1966{
1898 struct coro_transfer_args ta; 1967 struct coro_transfer_args ta;
1899 1968
1900 prepare_cede (aTHX_ &ta); 1969 prepare_cede (aTHX_ &ta);
1901 1970
1902 if (expect_true (ta.prev != ta.next)) 1971 if (ecb_expect_true (ta.prev != ta.next))
1903 { 1972 {
1904 TRANSFER (ta, 1); 1973 TRANSFER (ta, 1);
1905 return 1; 1974 return 1;
1906 } 1975 }
1907 else 1976 else
… …
1950 coro->slot->runops = RUNOPS_DEFAULT; 2019 coro->slot->runops = RUNOPS_DEFAULT;
1951 } 2020 }
1952} 2021}
1953 2022
1954static void 2023static void
2024coro_push_av (pTHX_ AV *av, I32 gimme_v)
2025{
2026 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2027 {
2028 dSP;
2029
2030 if (gimme_v == G_SCALAR)
2031 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2032 else
2033 {
2034 int i;
2035 EXTEND (SP, AvFILLp (av) + 1);
2036
2037 for (i = 0; i <= AvFILLp (av); ++i)
2038 PUSHs (AvARRAY (av)[i]);
2039 }
2040
2041 PUTBACK;
2042 }
2043}
2044
2045static void
2046coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2047{
2048 if (!coro->on_destroy)
2049 coro->on_destroy = newAV ();
2050
2051 av_push (coro->on_destroy, cb);
2052}
2053
2054static void
2055slf_destroy_join (pTHX_ struct CoroSLF *frame)
2056{
2057 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2058}
2059
2060static int
2061slf_check_join (pTHX_ struct CoroSLF *frame)
2062{
2063 struct coro *coro = (struct coro *)frame->data;
2064
2065 if (!coro->status)
2066 return 1;
2067
2068 frame->destroy = 0;
2069
2070 coro_push_av (aTHX_ coro->status, GIMME_V);
2071
2072 SvREFCNT_dec ((SV *)coro->hv);
2073
2074 return 0;
2075}
2076
2077static void
2078slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2079{
2080 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2081
2082 if (items > 1)
2083 croak ("join called with too many arguments");
2084
2085 if (coro->status)
2086 frame->prepare = prepare_nop;
2087 else
2088 {
2089 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2090 frame->prepare = prepare_schedule;
2091 }
2092
2093 frame->check = slf_check_join;
2094 frame->destroy = slf_destroy_join;
2095 frame->data = (void *)coro;
2096 SvREFCNT_inc (coro->hv);
2097}
2098
2099static void
1955coro_call_on_destroy (pTHX_ struct coro *coro) 2100coro_call_on_destroy (pTHX_ struct coro *coro)
1956{ 2101{
1957 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2102 AV *od = coro->on_destroy;
1958 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1959 2103
1960 if (on_destroyp) 2104 if (!od)
1961 { 2105 return;
1962 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1963 2106
1964 while (AvFILLp (on_destroy) >= 0) 2107 while (AvFILLp (od) >= 0)
2108 {
2109 SV *cb = sv_2mortal (av_pop (od));
2110
2111 /* coro hv's (and only hv's at the moment) are supported as well */
2112 if (SvSTATEhv_p (aTHX_ cb))
2113 api_ready (aTHX_ cb);
2114 else
1965 { 2115 {
1966 dSP; /* don't disturb outer sp */ 2116 dSP; /* don't disturb outer sp */
1967 SV *cb = av_pop (on_destroy);
1968
1969 PUSHMARK (SP); 2117 PUSHMARK (SP);
1970 2118
1971 if (statusp) 2119 if (coro->status)
1972 { 2120 {
1973 int i; 2121 PUTBACK;
1974 AV *status = (AV *)SvRV (*statusp); 2122 coro_push_av (aTHX_ coro->status, G_ARRAY);
1975 EXTEND (SP, AvFILLp (status) + 1); 2123 SPAGAIN;
1976
1977 for (i = 0; i <= AvFILLp (status); ++i)
1978 PUSHs (AvARRAY (status)[i]);
1979 } 2124 }
1980 2125
1981 PUTBACK; 2126 PUTBACK;
1982 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2127 call_sv (cb, G_VOID | G_DISCARD);
1983 } 2128 }
1984 } 2129 }
1985} 2130}
1986 2131
1987static void 2132static void
1988slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2133coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1989{ 2134{
1990 int i; 2135 AV *av;
1991 HV *hv = (HV *)SvRV (coro_current); 2136
1992 AV *av = newAV (); 2137 if (coro->status)
2138 {
2139 av = coro->status;
2140 av_clear (av);
2141 }
2142 else
2143 av = coro->status = newAV ();
1993 2144
1994 /* items are actually not so common, so optimise for this case */ 2145 /* items are actually not so common, so optimise for this case */
1995 if (items) 2146 if (items)
1996 { 2147 {
2148 int i;
2149
1997 av_extend (av, items - 1); 2150 av_extend (av, items - 1);
1998 2151
1999 for (i = 0; i < items; ++i) 2152 for (i = 0; i < items; ++i)
2000 av_push (av, SvREFCNT_inc_NN (arg [i])); 2153 av_push (av, SvREFCNT_inc_NN (arg [i]));
2001 } 2154 }
2155}
2002 2156
2003 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2157static void
2004 2158slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2159{
2005 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2160 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2006 api_ready (aTHX_ sv_manager); 2161 api_ready (aTHX_ sv_manager);
2007 2162
2008 frame->prepare = prepare_schedule; 2163 frame->prepare = prepare_schedule;
2009 frame->check = slf_check_repeat; 2164 frame->check = slf_check_repeat;
2010 2165
2011 /* as a minor optimisation, we could unwind all stacks here */ 2166 /* as a minor optimisation, we could unwind all stacks here */
2012 /* but that puts extra pressure on pp_slf, and is not worth much */ 2167 /* but that puts extra pressure on pp_slf, and is not worth much */
2013 /*coro_unwind_stacks (aTHX);*/ 2168 /*coro_unwind_stacks (aTHX);*/
2169}
2170
2171static void
2172slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2173{
2174 HV *coro_hv = (HV *)SvRV (coro_current);
2175
2176 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2177 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2178}
2179
2180static void
2181slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2182{
2183 HV *coro_hv;
2184 struct coro *coro;
2185
2186 if (items <= 0)
2187 croak ("Coro::cancel called without coro object,");
2188
2189 coro = SvSTATE (arg [0]);
2190 coro_hv = coro->hv;
2191
2192 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2193
2194 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2195 {
2196 /* coro currently busy cancelling something, so just notify it */
2197 coro->slf_frame.data = (void *)coro;
2198
2199 frame->prepare = prepare_nop;
2200 frame->check = slf_check_nop;
2201 }
2202 else if (coro_hv == (HV *)SvRV (coro_current))
2203 {
2204 /* cancelling the current coro is allowed, and equals terminate */
2205 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2206 }
2207 else
2208 {
2209 struct coro *self = SvSTATE_current;
2210
2211 /* otherwise we cancel directly, purely for speed reasons
2212 * unfortunately, this requires some magic trickery, as
2213 * somebody else could cancel us, so we have to fight the cancellation.
2214 * this is ugly, and hopefully fully worth the extra speed.
2215 * besides, I can't get the slow-but-safe version working...
2216 */
2217 slf_frame.data = 0;
2218 self->flags |= CF_NOCANCEL;
2219 coro_state_destroy (aTHX_ coro);
2220 self->flags &= ~CF_NOCANCEL;
2221
2222 if (slf_frame.data)
2223 {
2224 /* while we were busy we have been cancelled, so terminate */
2225 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2226 }
2227 else
2228 {
2229 frame->prepare = prepare_nop;
2230 frame->check = slf_check_nop;
2231 }
2232 }
2233}
2234
2235static int
2236slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2237{
2238 frame->prepare = 0;
2239 coro_unwind_stacks (aTHX);
2240
2241 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2242
2243 return 1;
2244}
2245
2246static int
2247safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2248{
2249 if (coro->cctx)
2250 croak ("coro inside C callback, unable to cancel at this time, caught");
2251
2252 if (coro->flags & CF_NEW)
2253 {
2254 coro_set_status (aTHX_ coro, arg, items);
2255 coro_state_destroy (aTHX_ coro);
2256 }
2257 else
2258 {
2259 if (!coro->slf_frame.prepare)
2260 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2261
2262 slf_destroy (aTHX_ coro);
2263
2264 coro_set_status (aTHX_ coro, arg, items);
2265 coro->slf_frame.prepare = prepare_nop;
2266 coro->slf_frame.check = slf_check_safe_cancel;
2267
2268 api_ready (aTHX_ (SV *)coro->hv);
2269 }
2270
2271 return 1;
2014} 2272}
2015 2273
2016/*****************************************************************************/ 2274/*****************************************************************************/
2017/* async pool handler */ 2275/* async pool handler */
2018 2276
… …
2049slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2307slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2050{ 2308{
2051 HV *hv = (HV *)SvRV (coro_current); 2309 HV *hv = (HV *)SvRV (coro_current);
2052 struct coro *coro = SvSTATE_hv ((SV *)hv); 2310 struct coro *coro = SvSTATE_hv ((SV *)hv);
2053 2311
2054 if (expect_true (coro->saved_deffh)) 2312 if (ecb_expect_true (coro->saved_deffh))
2055 { 2313 {
2056 /* subsequent iteration */ 2314 /* subsequent iteration */
2057 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2315 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2058 coro->saved_deffh = 0; 2316 coro->saved_deffh = 0;
2059 2317
2060 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2318 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2061 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2319 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2062 { 2320 {
2063 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2321 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2064 coro->invoke_av = newAV (); 2322 return;
2065
2066 frame->prepare = prepare_nop;
2067 } 2323 }
2068 else 2324 else
2069 { 2325 {
2070 av_clear (GvAV (PL_defgv)); 2326 av_clear (GvAV (PL_defgv));
2071 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2327 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2294static void 2550static void
2295slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2551slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2296{ 2552{
2297 frame->prepare = prepare_cede_notself; 2553 frame->prepare = prepare_cede_notself;
2298 frame->check = slf_check_nop; 2554 frame->check = slf_check_nop;
2555}
2556
2557/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2558static void
2559slf_destroy (pTHX_ struct coro *coro)
2560{
2561 /* this callback is reserved for slf functions needing to do cleanup */
2562 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2563 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2564
2565 /*
2566 * The on_destroy above most likely is from an SLF call.
2567 * Since by definition the SLF call will not finish when we destroy
2568 * the coro, we will have to force-finish it here, otherwise
2569 * cleanup functions cannot call SLF functions.
2570 */
2571 coro->slf_frame.prepare = 0;
2299} 2572}
2300 2573
2301/* 2574/*
2302 * these not obviously related functions are all rolled into one 2575 * these not obviously related functions are all rolled into one
2303 * function to increase chances that they all will call transfer with the same 2576 * function to increase chances that they all will call transfer with the same
… …
2310 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2583 I32 checkmark; /* mark SP to see how many elements check has pushed */
2311 2584
2312 /* set up the slf frame, unless it has already been set-up */ 2585 /* set up the slf frame, unless it has already been set-up */
2313 /* the latter happens when a new coro has been started */ 2586 /* the latter happens when a new coro has been started */
2314 /* or when a new cctx was attached to an existing coroutine */ 2587 /* or when a new cctx was attached to an existing coroutine */
2315 if (expect_true (!slf_frame.prepare)) 2588 if (ecb_expect_true (!slf_frame.prepare))
2316 { 2589 {
2317 /* first iteration */ 2590 /* first iteration */
2318 dSP; 2591 dSP;
2319 SV **arg = PL_stack_base + TOPMARK + 1; 2592 SV **arg = PL_stack_base + TOPMARK + 1;
2320 int items = SP - arg; /* args without function object */ 2593 int items = SP - arg; /* args without function object */
… …
2361 while (slf_frame.check (aTHX_ &slf_frame)); 2634 while (slf_frame.check (aTHX_ &slf_frame));
2362 2635
2363 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2636 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2364 2637
2365 /* exception handling */ 2638 /* exception handling */
2366 if (expect_false (CORO_THROW)) 2639 if (ecb_expect_false (CORO_THROW))
2367 { 2640 {
2368 SV *exception = sv_2mortal (CORO_THROW); 2641 SV *exception = sv_2mortal (CORO_THROW);
2369 2642
2370 CORO_THROW = 0; 2643 CORO_THROW = 0;
2371 sv_setsv (ERRSV, exception); 2644 sv_setsv (ERRSV, exception);
2372 croak (0); 2645 croak (0);
2373 } 2646 }
2374 2647
2375 /* return value handling - mostly like entersub */ 2648 /* return value handling - mostly like entersub */
2376 /* make sure we put something on the stack in scalar context */ 2649 /* make sure we put something on the stack in scalar context */
2377 if (GIMME_V == G_SCALAR) 2650 if (GIMME_V == G_SCALAR
2651 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2378 { 2652 {
2379 dSP; 2653 dSP;
2380 SV **bot = PL_stack_base + checkmark; 2654 SV **bot = PL_stack_base + checkmark;
2381 2655
2382 if (sp == bot) /* too few, push undef */ 2656 if (sp == bot) /* too few, push undef */
2383 bot [1] = &PL_sv_undef; 2657 bot [1] = &PL_sv_undef;
2384 else if (sp != bot + 1) /* too many, take last one */ 2658 else /* too many, take last one */
2385 bot [1] = *sp; 2659 bot [1] = *sp;
2386 2660
2387 SP = bot + 1; 2661 SP = bot + 1;
2388 2662
2389 PUTBACK; 2663 PUTBACK;
… …
2422 if (PL_op->op_flags & OPf_STACKED) 2696 if (PL_op->op_flags & OPf_STACKED)
2423 { 2697 {
2424 if (items > slf_arga) 2698 if (items > slf_arga)
2425 { 2699 {
2426 slf_arga = items; 2700 slf_arga = items;
2427 free (slf_argv); 2701 Safefree (slf_argv);
2428 slf_argv = malloc (slf_arga * sizeof (SV *)); 2702 New (0, slf_argv, slf_arga, SV *);
2429 } 2703 }
2430 2704
2431 slf_argc = items; 2705 slf_argc = items;
2432 2706
2433 for (i = 0; i < items; ++i) 2707 for (i = 0; i < items; ++i)
… …
2496{ 2770{
2497 PerlIOBuf base; 2771 PerlIOBuf base;
2498 NV next, every; 2772 NV next, every;
2499} PerlIOCede; 2773} PerlIOCede;
2500 2774
2501static IV 2775static IV ecb_cold
2502PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2776PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2503{ 2777{
2504 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2778 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2505 2779
2506 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2780 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2507 self->next = nvtime () + self->every; 2781 self->next = nvtime () + self->every;
2508 2782
2509 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2783 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2510} 2784}
2511 2785
2512static SV * 2786static SV * ecb_cold
2513PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2787PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2514{ 2788{
2515 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2789 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2516 2790
2517 return newSVnv (self->every); 2791 return newSVnv (self->every);
… …
2629 SvREFCNT_dec (cb); 2903 SvREFCNT_dec (cb);
2630 } 2904 }
2631} 2905}
2632 2906
2633static void 2907static void
2634coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2908coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2635{ 2909{
2636 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2910 /* call $sem->adjust (0) to possibly wake up some other waiters */
2637 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2911 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2638} 2912}
2639 2913
2640static int 2914static int
2641slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2915slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2642{ 2916{
2643 AV *av = (AV *)frame->data; 2917 AV *av = (AV *)frame->data;
2644 SV *count_sv = AvARRAY (av)[0]; 2918 SV *count_sv = AvARRAY (av)[0];
2919 SV *coro_hv = SvRV (coro_current);
2645 2920
2646 /* if we are about to throw, don't actually acquire the lock, just throw */ 2921 /* if we are about to throw, don't actually acquire the lock, just throw */
2647 if (CORO_THROW) 2922 if (CORO_THROW)
2648 return 0; 2923 return 0;
2649 else if (SvIVX (count_sv) > 0) 2924 else if (SvIVX (count_sv) > 0)
2650 { 2925 {
2651 SvSTATE_current->on_destroy = 0; 2926 frame->destroy = 0;
2652 2927
2653 if (acquire) 2928 if (acquire)
2654 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2929 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2655 else 2930 else
2656 coro_semaphore_adjust (aTHX_ av, 0); 2931 coro_semaphore_adjust (aTHX_ av, 0);
… …
2661 { 2936 {
2662 int i; 2937 int i;
2663 /* if we were woken up but can't down, we look through the whole */ 2938 /* if we were woken up but can't down, we look through the whole */
2664 /* waiters list and only add us if we aren't in there already */ 2939 /* waiters list and only add us if we aren't in there already */
2665 /* this avoids some degenerate memory usage cases */ 2940 /* this avoids some degenerate memory usage cases */
2666 2941 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug
2667 for (i = 1; i <= AvFILLp (av); ++i)
2668 if (AvARRAY (av)[i] == SvRV (coro_current)) 2942 if (AvARRAY (av)[i] == coro_hv)
2669 return 1; 2943 return 1;
2670 2944
2671 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2945 av_push (av, SvREFCNT_inc (coro_hv));
2672 return 1; 2946 return 1;
2673 } 2947 }
2674} 2948}
2675 2949
2676static int 2950static int
… …
2699 { 2973 {
2700 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2974 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2701 2975
2702 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2976 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2703 frame->prepare = prepare_schedule; 2977 frame->prepare = prepare_schedule;
2704
2705 /* to avoid race conditions when a woken-up coro gets terminated */ 2978 /* to avoid race conditions when a woken-up coro gets terminated */
2706 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2979 /* we arrange for a temporary on_destroy that calls adjust (0) */
2707 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2980 frame->destroy = coro_semaphore_destroy;
2708 } 2981 }
2709} 2982}
2710 2983
2711static void 2984static void
2712slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2985slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2794 { 3067 {
2795 SV *cb_cv = s_get_cv_croak (arg [1]); 3068 SV *cb_cv = s_get_cv_croak (arg [1]);
2796 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3069 av_push (av, SvREFCNT_inc_NN (cb_cv));
2797 3070
2798 if (SvIVX (AvARRAY (av)[0])) 3071 if (SvIVX (AvARRAY (av)[0]))
2799 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3072 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2800 3073
2801 frame->prepare = prepare_nop; 3074 frame->prepare = prepare_nop;
2802 frame->check = slf_check_nop; 3075 frame->check = slf_check_nop;
2803 } 3076 }
2804 else if (SvIVX (AvARRAY (av)[0])) 3077 else if (SvIVX (AvARRAY (av)[0]))
… …
2930 dSP; 3203 dSP;
2931 3204
2932 static SV *prio_cv; 3205 static SV *prio_cv;
2933 static SV *prio_sv; 3206 static SV *prio_sv;
2934 3207
2935 if (expect_false (!prio_cv)) 3208 if (ecb_expect_false (!prio_cv))
2936 { 3209 {
2937 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3210 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2938 prio_sv = newSViv (0); 3211 prio_sv = newSViv (0);
2939 } 3212 }
2940 3213
… …
2966 /* now call the AIO function - we assume our request is uncancelable */ 3239 /* now call the AIO function - we assume our request is uncancelable */
2967 PUTBACK; 3240 PUTBACK;
2968 call_sv ((SV *)req, G_VOID | G_DISCARD); 3241 call_sv ((SV *)req, G_VOID | G_DISCARD);
2969 } 3242 }
2970 3243
2971 /* now that the requets is going, we loop toll we have a result */ 3244 /* now that the request is going, we loop till we have a result */
2972 frame->data = (void *)state; 3245 frame->data = (void *)state;
2973 frame->prepare = prepare_schedule; 3246 frame->prepare = prepare_schedule;
2974 frame->check = slf_check_aio_req; 3247 frame->check = slf_check_aio_req;
2975} 3248}
2976 3249
… …
3046 } 3319 }
3047 3320
3048 return coro_sv; 3321 return coro_sv;
3049} 3322}
3050 3323
3324#ifndef __cplusplus
3325ecb_cold XS(boot_Coro__State);
3326#endif
3327
3051MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3328MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3052 3329
3053PROTOTYPES: DISABLE 3330PROTOTYPES: DISABLE
3054 3331
3055BOOT: 3332BOOT:
… …
3107 coroapi.prepare_nop = prepare_nop; 3384 coroapi.prepare_nop = prepare_nop;
3108 coroapi.prepare_schedule = prepare_schedule; 3385 coroapi.prepare_schedule = prepare_schedule;
3109 coroapi.prepare_cede = prepare_cede; 3386 coroapi.prepare_cede = prepare_cede;
3110 coroapi.prepare_cede_notself = prepare_cede_notself; 3387 coroapi.prepare_cede_notself = prepare_cede_notself;
3111 3388
3112 { 3389 time_init (aTHX);
3113 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3114
3115 if (!svp) croak ("Time::HiRes is required");
3116 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3117
3118 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3119
3120 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3121 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3122 }
3123 3390
3124 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3391 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3125} 3392}
3126 3393
3127SV * 3394SV *
… …
3136void 3403void
3137transfer (...) 3404transfer (...)
3138 PROTOTYPE: $$ 3405 PROTOTYPE: $$
3139 CODE: 3406 CODE:
3140 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3407 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3141
3142bool
3143_destroy (SV *coro_sv)
3144 CODE:
3145 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3146 OUTPUT:
3147 RETVAL
3148 3408
3149void 3409void
3150_exit (int code) 3410_exit (int code)
3151 PROTOTYPE: $ 3411 PROTOTYPE: $
3152 CODE: 3412 CODE:
… …
3228 CODE: 3488 CODE:
3229{ 3489{
3230 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3490 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3231 { 3491 {
3232 struct coro *current = SvSTATE_current; 3492 struct coro *current = SvSTATE_current;
3493 struct CoroSLF slf_save;
3233 3494
3234 if (current != coro) 3495 if (current != coro)
3235 { 3496 {
3236 PUTBACK; 3497 PUTBACK;
3237 save_perl (aTHX_ current); 3498 save_perl (aTHX_ current);
3238 load_perl (aTHX_ coro); 3499 load_perl (aTHX_ coro);
3500 /* the coro is most likely in an active SLF call.
3501 * while not strictly required (the code we execute is
3502 * not allowed to call any SLF functions), it's cleaner
3503 * to reinitialise the slf_frame and restore it later.
3504 * This might one day allow us to actually do SLF calls
3505 * from code executed here.
3506 */
3507 slf_save = slf_frame;
3508 slf_frame.prepare = 0;
3239 SPAGAIN; 3509 SPAGAIN;
3240 } 3510 }
3241 3511
3242 PUSHSTACK; 3512 PUSHSTACK;
3243 3513
… …
3253 SPAGAIN; 3523 SPAGAIN;
3254 3524
3255 if (current != coro) 3525 if (current != coro)
3256 { 3526 {
3257 PUTBACK; 3527 PUTBACK;
3528 slf_frame = slf_save;
3258 save_perl (aTHX_ coro); 3529 save_perl (aTHX_ coro);
3259 load_perl (aTHX_ current); 3530 load_perl (aTHX_ current);
3260 SPAGAIN; 3531 SPAGAIN;
3261 } 3532 }
3262 } 3533 }
… …
3267 PROTOTYPE: $ 3538 PROTOTYPE: $
3268 ALIAS: 3539 ALIAS:
3269 is_ready = CF_READY 3540 is_ready = CF_READY
3270 is_running = CF_RUNNING 3541 is_running = CF_RUNNING
3271 is_new = CF_NEW 3542 is_new = CF_NEW
3272 is_destroyed = CF_DESTROYED 3543 is_destroyed = CF_ZOMBIE
3544 is_zombie = CF_ZOMBIE
3273 is_suspended = CF_SUSPENDED 3545 is_suspended = CF_SUSPENDED
3274 CODE: 3546 CODE:
3275 RETVAL = boolSV (coro->flags & ix); 3547 RETVAL = boolSV (coro->flags & ix);
3276 OUTPUT: 3548 OUTPUT:
3277 RETVAL 3549 RETVAL
3278 3550
3279void 3551void
3280throw (Coro::State self, SV *throw = &PL_sv_undef) 3552throw (Coro::State self, SV *exception = &PL_sv_undef)
3281 PROTOTYPE: $;$ 3553 PROTOTYPE: $;$
3282 CODE: 3554 CODE:
3283{ 3555{
3284 struct coro *current = SvSTATE_current; 3556 struct coro *current = SvSTATE_current;
3285 SV **throwp = self == current ? &CORO_THROW : &self->except; 3557 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3286 SvREFCNT_dec (*throwp); 3558 SvREFCNT_dec (*exceptionp);
3287 SvGETMAGIC (throw); 3559 SvGETMAGIC (exception);
3288 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3560 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3289} 3561}
3290 3562
3291void 3563void
3292api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3564api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3293 PROTOTYPE: $;$ 3565 PROTOTYPE: $;$
… …
3348 3620
3349void 3621void
3350cancel (Coro::State self) 3622cancel (Coro::State self)
3351 CODE: 3623 CODE:
3352 coro_state_destroy (aTHX_ self); 3624 coro_state_destroy (aTHX_ self);
3353 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3354
3355 3625
3356SV * 3626SV *
3357enable_times (int enabled = enable_times) 3627enable_times (int enabled = enable_times)
3358 CODE: 3628 CODE:
3359{ 3629{
… …
3374times (Coro::State self) 3644times (Coro::State self)
3375 PPCODE: 3645 PPCODE:
3376{ 3646{
3377 struct coro *current = SvSTATE (coro_current); 3647 struct coro *current = SvSTATE (coro_current);
3378 3648
3379 if (expect_false (current == self)) 3649 if (ecb_expect_false (current == self))
3380 { 3650 {
3381 coro_times_update (); 3651 coro_times_update ();
3382 coro_times_add (SvSTATE (coro_current)); 3652 coro_times_add (SvSTATE (coro_current));
3383 } 3653 }
3384 3654
3385 EXTEND (SP, 2); 3655 EXTEND (SP, 2);
3386 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3656 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3387 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3657 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3388 3658
3389 if (expect_false (current == self)) 3659 if (ecb_expect_false (current == self))
3390 coro_times_sub (SvSTATE (coro_current)); 3660 coro_times_sub (SvSTATE (coro_current));
3391} 3661}
3392 3662
3393void 3663void
3394swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3664swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3415BOOT: 3685BOOT:
3416{ 3686{
3417 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3687 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3418 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3688 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3419 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3689 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3420 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3421 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3690 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3422 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3691 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3423 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3692 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3424 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3693 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3425 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3694 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
… …
3464 api_ready (aTHX_ RETVAL); 3733 api_ready (aTHX_ RETVAL);
3465 OUTPUT: 3734 OUTPUT:
3466 RETVAL 3735 RETVAL
3467 3736
3468void 3737void
3738_destroy (Coro::State coro)
3739 CODE:
3740 /* used by the manager thread */
3741 coro_state_destroy (aTHX_ coro);
3742
3743void
3744on_destroy (Coro::State coro, SV *cb)
3745 CODE:
3746 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3747
3748void
3749join (...)
3750 CODE:
3751 CORO_EXECUTE_SLF_XS (slf_init_join);
3752
3753void
3469terminate (...) 3754terminate (...)
3470 CODE: 3755 CODE:
3471 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3756 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3757
3758void
3759cancel (...)
3760 CODE:
3761 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3762
3763int
3764safe_cancel (Coro::State self, ...)
3765 C_ARGS: aTHX_ self, &ST (1), items - 1
3472 3766
3473void 3767void
3474schedule (...) 3768schedule (...)
3475 CODE: 3769 CODE:
3476 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3770 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3873 { 4167 {
3874 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4168 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3875 coro_old_pp_sselect = 0; 4169 coro_old_pp_sselect = 0;
3876 } 4170 }
3877 4171
3878

Diff Legend

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