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.397 by root, Fri May 6 21:15:17 2011 UTC vs.
Revision 1.404 by root, Fri Jun 10 12:27:02 2011 UTC

… …
12#include "perl.h" 12#include "perl.h"
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17#include "ecb.h"
17 18
19#include <stddef.h>
18#include <stdio.h> 20#include <stdio.h>
19#include <errno.h> 21#include <errno.h>
20#include <assert.h> 22#include <assert.h>
21 23
22#ifndef SVs_PADSTALE 24#ifndef SVs_PADSTALE
… …
86# define STACKLEVEL ((void *)&stacklevel) 88# define STACKLEVEL ((void *)&stacklevel)
87#endif 89#endif
88 90
89#define IN_DESTRUCT PL_dirty 91#define IN_DESTRUCT PL_dirty
90 92
91#if __GNUC__ >= 3
92# define attribute(x) __attribute__(x)
93# define expect(expr,value) __builtin_expect ((expr), (value))
94# define INLINE static inline
95#else
96# define attribute(x)
97# define expect(expr,value) (expr)
98# define INLINE static
99#endif
100
101#define expect_false(expr) expect ((expr) != 0, 0)
102#define expect_true(expr) expect ((expr) != 0, 1)
103
104#define NOINLINE attribute ((noinline))
105
106#include "CoroAPI.h" 93#include "CoroAPI.h"
107#define GCoroAPI (&coroapi) /* very sneaky */ 94#define GCoroAPI (&coroapi) /* very sneaky */
108 95
109#ifdef USE_ITHREADS 96#ifdef USE_ITHREADS
110# if CORO_PTHREAD 97# if CORO_PTHREAD
… …
166static char times_valid; 153static char times_valid;
167 154
168static struct coro_cctx *cctx_first; 155static struct coro_cctx *cctx_first;
169static int cctx_count, cctx_idle; 156static int cctx_count, cctx_idle;
170 157
171enum { 158enum
159{
172 CC_MAPPED = 0x01, 160 CC_MAPPED = 0x01,
173 CC_NOREUSE = 0x02, /* throw this away after tracing */ 161 CC_NOREUSE = 0x02, /* throw this away after tracing */
174 CC_TRACE = 0x04, 162 CC_TRACE = 0x04,
175 CC_TRACE_SUB = 0x08, /* trace sub calls */ 163 CC_TRACE_SUB = 0x08, /* trace sub calls */
176 CC_TRACE_LINE = 0x10, /* trace each statement */ 164 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
201 189
202static coro_cctx *cctx_current; /* the currently running cctx */ 190static coro_cctx *cctx_current; /* the currently running cctx */
203 191
204/*****************************************************************************/ 192/*****************************************************************************/
205 193
194static MGVTBL coro_state_vtbl;
195
206enum { 196enum
197{
207 CF_RUNNING = 0x0001, /* coroutine is running */ 198 CF_RUNNING = 0x0001, /* coroutine is running */
208 CF_READY = 0x0002, /* coroutine is ready */ 199 CF_READY = 0x0002, /* coroutine is ready */
209 CF_NEW = 0x0004, /* has never been switched to */ 200 CF_NEW = 0x0004, /* has never been switched to */
210 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 201 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 202 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */ 203 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
213}; 204};
214 205
215/* 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 */
… …
223#define VAR(name,type) type name; 214#define VAR(name,type) type name;
224# include "state.h" 215# include "state.h"
225#undef VAR 216#undef VAR
226} perl_slots; 217} perl_slots;
227 218
219// how many context stack entries do we need for perl_slots
228#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))
229 221
230/* this is a structure representing a perl-level coroutine */ 222/* this is a structure representing a perl-level coroutine */
231struct coro { 223struct coro
224{
232 /* the C coroutine allocated to this perl coroutine, if any */ 225 /* the C coroutine allocated to this perl coroutine, if any */
233 coro_cctx *cctx; 226 coro_cctx *cctx;
234 227
235 /* ready queue */ 228 /* ready queue */
236 struct coro *next_ready; 229 struct coro *next_ready;
… …
238 /* state data */ 231 /* state data */
239 struct CoroSLF slf_frame; /* saved slf frame */ 232 struct CoroSLF slf_frame; /* saved slf frame */
240 AV *mainstack; 233 AV *mainstack;
241 perl_slots *slot; /* basically the saved sp */ 234 perl_slots *slot; /* basically the saved sp */
242 235
243 CV *startcv; /* the CV to execute */ 236 CV *startcv; /* the CV to execute */
244 AV *args; /* data associated with this coroutine (initial args) */ 237 AV *args; /* data associated with this coroutine (initial args) */
245 int refcnt; /* coroutines are refcounted, yes */
246 int flags; /* CF_ flags */ 238 int flags; /* CF_ flags */
247 HV *hv; /* the perl hash associated with this coro, if any */ 239 HV *hv; /* the perl hash associated with this coro, if any */
248 240
249 /* statistics */ 241 /* statistics */
250 int usecount; /* number of transfers to this coro */ 242 int usecount; /* number of transfers to this coro */
251 243
252 /* coro process data */ 244 /* coro process data */
253 int prio; 245 int prio;
254 SV *except; /* exception to be thrown */ 246 SV *except; /* exception to be thrown */
255 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 */
256 250
257 /* async_pool */ 251 /* async_pool */
258 SV *saved_deffh; 252 SV *saved_deffh;
259 SV *invoke_cb; 253 SV *invoke_cb;
260 AV *invoke_av; 254 AV *invoke_av;
… …
320 314
321/** time stuff **************************************************************/ 315/** time stuff **************************************************************/
322 316
323#ifdef HAS_GETTIMEOFDAY 317#ifdef HAS_GETTIMEOFDAY
324 318
325static void 319ECB_INLINE void
326coro_u2time (pTHX_ UV ret[2]) 320coro_u2time (pTHX_ UV ret[2])
327{ 321{
328 struct timeval tv; 322 struct timeval tv;
329 gettimeofday (&tv, 0); 323 gettimeofday (&tv, 0);
330 324
331 ret [0] = tv.tv_sec; 325 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec; 326 ret [1] = tv.tv_usec;
333} 327}
334 328
335static double 329ECB_INLINE double
336coro_nvtime () 330coro_nvtime ()
337{ 331{
338 struct timeval tv; 332 struct timeval tv;
339 gettimeofday (&tv, 0); 333 gettimeofday (&tv, 0);
340 334
341 return tv.tv_sec + tv.tv_usec * 1e-6; 335 return tv.tv_sec + tv.tv_usec * 1e-6;
342} 336}
343 337
344static void 338ECB_INLINE void
345time_init (pTHX) 339time_init (pTHX)
346{ 340{
347 nvtime = coro_nvtime; 341 nvtime = coro_nvtime;
348 u2time = coro_u2time; 342 u2time = coro_u2time;
349} 343}
350 344
351#else 345#else
352 346
353static void 347ECB_INLINE void
354time_init (pTHX) 348time_init (pTHX)
355{ 349{
356 SV **svp; 350 SV **svp;
357 351
358 require_pv ("Time/HiRes.pm"); 352 require_pv ("Time/HiRes.pm");
… …
370 364
371#endif 365#endif
372 366
373/** lowlevel stuff **********************************************************/ 367/** lowlevel stuff **********************************************************/
374 368
375static SV * 369static SV * ecb_noinline
376coro_get_sv (pTHX_ const char *name, int create) 370coro_get_sv (pTHX_ const char *name, int create)
377{ 371{
378#if PERL_VERSION_ATLEAST (5,10,0) 372#if PERL_VERSION_ATLEAST (5,10,0)
379 /* 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 */
380 get_sv (name, create); 374 get_sv (name, create);
381#endif 375#endif
382 return get_sv (name, create); 376 return get_sv (name, create);
383} 377}
384 378
385static AV * 379static AV * ecb_noinline
386coro_get_av (pTHX_ const char *name, int create) 380coro_get_av (pTHX_ const char *name, int create)
387{ 381{
388#if PERL_VERSION_ATLEAST (5,10,0) 382#if PERL_VERSION_ATLEAST (5,10,0)
389 /* 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 */
390 get_av (name, create); 384 get_av (name, create);
391#endif 385#endif
392 return get_av (name, create); 386 return get_av (name, create);
393} 387}
394 388
395static HV * 389static HV * ecb_noinline
396coro_get_hv (pTHX_ const char *name, int create) 390coro_get_hv (pTHX_ const char *name, int create)
397{ 391{
398#if PERL_VERSION_ATLEAST (5,10,0) 392#if PERL_VERSION_ATLEAST (5,10,0)
399 /* 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 */
400 get_hv (name, create); 394 get_hv (name, create);
401#endif 395#endif
402 return get_hv (name, create); 396 return get_hv (name, create);
403} 397}
404 398
405INLINE void 399ECB_INLINE void
406coro_times_update () 400coro_times_update ()
407{ 401{
408#ifdef coro_clock_gettime 402#ifdef coro_clock_gettime
409 struct timespec ts; 403 struct timespec ts;
410 404
… …
423 time_real [0] = tv [0]; 417 time_real [0] = tv [0];
424 time_real [1] = tv [1] * 1000; 418 time_real [1] = tv [1] * 1000;
425#endif 419#endif
426} 420}
427 421
428INLINE void 422ECB_INLINE void
429coro_times_add (struct coro *c) 423coro_times_add (struct coro *c)
430{ 424{
431 c->t_real [1] += time_real [1]; 425 c->t_real [1] += time_real [1];
432 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]; }
433 c->t_real [0] += time_real [0]; 427 c->t_real [0] += time_real [0];
… …
435 c->t_cpu [1] += time_cpu [1]; 429 c->t_cpu [1] += time_cpu [1];
436 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]; }
437 c->t_cpu [0] += time_cpu [0]; 431 c->t_cpu [0] += time_cpu [0];
438} 432}
439 433
440INLINE void 434ECB_INLINE void
441coro_times_sub (struct coro *c) 435coro_times_sub (struct coro *c)
442{ 436{
443 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]; }
444 c->t_real [1] -= time_real [1]; 438 c->t_real [1] -= time_real [1];
445 c->t_real [0] -= time_real [0]; 439 c->t_real [0] -= time_real [0];
… …
453/* magic glue */ 447/* magic glue */
454 448
455#define CORO_MAGIC_type_cv 26 449#define CORO_MAGIC_type_cv 26
456#define CORO_MAGIC_type_state PERL_MAGIC_ext 450#define CORO_MAGIC_type_state PERL_MAGIC_ext
457 451
458#define CORO_MAGIC_NN(sv, type) \ 452#define CORO_MAGIC_NN(sv, type) \
459 (expect_true (SvMAGIC (sv)->mg_type == type) \ 453 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
460 ? SvMAGIC (sv) \ 454 ? SvMAGIC (sv) \
461 : mg_find (sv, type)) 455 : mg_find (sv, type))
462 456
463#define CORO_MAGIC(sv, type) \ 457#define CORO_MAGIC(sv, type) \
464 (expect_true (SvMAGIC (sv)) \ 458 (ecb_expect_true (SvMAGIC (sv)) \
465 ? CORO_MAGIC_NN (sv, type) \ 459 ? CORO_MAGIC_NN (sv, type) \
466 : 0) 460 : 0)
467 461
468#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)
469#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)
470 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
471INLINE struct coro * 480ECB_INLINE struct coro *
472SvSTATE_ (pTHX_ SV *coro) 481SvSTATE_ (pTHX_ SV *coro)
473{ 482{
474 HV *stash;
475 MAGIC *mg; 483 MAGIC *mg;
476 484
477 if (SvROK (coro)) 485 if (SvROK (coro))
478 coro = SvRV (coro); 486 coro = SvRV (coro);
479 487
480 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 488 mg = SvSTATEhv_p (aTHX_ coro);
489 if (!mg)
481 croak ("Coro::State object required"); 490 croak ("Coro::State object required");
482 491
483 stash = SvSTASH (coro);
484 if (expect_false (stash != coro_stash && stash != coro_state_stash))
485 {
486 /* very slow, but rare, check */
487 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
488 croak ("Coro::State object required");
489 }
490
491 mg = CORO_MAGIC_state (coro);
492 return (struct coro *)mg->mg_ptr; 492 return (struct coro *)mg->mg_ptr;
493} 493}
494 494
495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
496 496
… …
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500 500
501/*****************************************************************************/ 501/*****************************************************************************/
502/* padlist management and caching */ 502/* padlist management and caching */
503 503
504static AV * 504ECB_INLINE AV *
505coro_derive_padlist (pTHX_ CV *cv) 505coro_derive_padlist (pTHX_ CV *cv)
506{ 506{
507 AV *padlist = CvPADLIST (cv); 507 AV *padlist = CvPADLIST (cv);
508 AV *newpadlist, *newpad; 508 AV *newpadlist, *newpad;
509 509
… …
521 av_store (newpadlist, 1, (SV *)newpad); 521 av_store (newpadlist, 1, (SV *)newpad);
522 522
523 return newpadlist; 523 return newpadlist;
524} 524}
525 525
526static void 526ECB_INLINE void
527free_padlist (pTHX_ AV *padlist) 527free_padlist (pTHX_ AV *padlist)
528{ 528{
529 /* may be during global destruction */ 529 /* may be during global destruction */
530 if (!IN_DESTRUCT) 530 if (!IN_DESTRUCT)
531 { 531 {
… …
574 0, 0, 0, 0, 574 0, 0, 0, 0,
575 coro_cv_free 575 coro_cv_free
576}; 576};
577 577
578/* the next two functions merely cache the padlists */ 578/* the next two functions merely cache the padlists */
579static void 579ECB_INLINE void
580get_padlist (pTHX_ CV *cv) 580get_padlist (pTHX_ CV *cv)
581{ 581{
582 MAGIC *mg = CORO_MAGIC_cv (cv); 582 MAGIC *mg = CORO_MAGIC_cv (cv);
583 AV *av; 583 AV *av;
584 584
585 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 585 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
587 else 587 else
588 { 588 {
589#if CORO_PREFER_PERL_FUNCTIONS 589#if CORO_PREFER_PERL_FUNCTIONS
590 /* this is probably cleaner? but also slower! */ 590 /* this is probably cleaner? but also slower! */
… …
597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
598#endif 598#endif
599 } 599 }
600} 600}
601 601
602static void 602ECB_INLINE void
603put_padlist (pTHX_ CV *cv) 603put_padlist (pTHX_ CV *cv)
604{ 604{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 605 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av; 606 AV *av;
607 607
608 if (expect_false (!mg)) 608 if (ecb_expect_false (!mg))
609 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);
610 610
611 av = (AV *)mg->mg_obj; 611 av = (AV *)mg->mg_obj;
612 612
613 if (expect_false (AvFILLp (av) >= AvMAX (av))) 613 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
614 av_extend (av, AvFILLp (av) + 1); 614 av_extend (av, AvFILLp (av) + 1);
615 615
616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
617} 617}
618 618
… …
663 } 663 }
664#endif 664#endif
665 } 665 }
666} 666}
667 667
668#define SWAP_SVS(coro) \ 668#define SWAP_SVS(coro) \
669 if (expect_false ((coro)->swap_sv)) \ 669 if (ecb_expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro)) 670 swap_svs (aTHX_ (coro))
671 671
672static void 672static void
673on_enterleave_call (pTHX_ SV *cb); 673on_enterleave_call (pTHX_ SV *cb);
674 674
… …
694 dSP; 694 dSP;
695 695
696 CV *cv; 696 CV *cv;
697 697
698 /* now do the ugly restore mess */ 698 /* now do the ugly restore mess */
699 while (expect_true (cv = (CV *)POPs)) 699 while (ecb_expect_true (cv = (CV *)POPs))
700 { 700 {
701 put_padlist (aTHX_ cv); /* mark this padlist as available */ 701 put_padlist (aTHX_ cv); /* mark this padlist as available */
702 CvDEPTH (cv) = PTR2IV (POPs); 702 CvDEPTH (cv) = PTR2IV (POPs);
703 CvPADLIST (cv) = (AV *)POPs; 703 CvPADLIST (cv) = (AV *)POPs;
704 } 704 }
… …
707 } 707 }
708 708
709 slf_frame = c->slf_frame; 709 slf_frame = c->slf_frame;
710 CORO_THROW = c->except; 710 CORO_THROW = c->except;
711 711
712 if (expect_false (enable_times)) 712 if (ecb_expect_false (enable_times))
713 { 713 {
714 if (expect_false (!times_valid)) 714 if (ecb_expect_false (!times_valid))
715 coro_times_update (); 715 coro_times_update ();
716 716
717 coro_times_sub (c); 717 coro_times_sub (c);
718 } 718 }
719 719
720 if (expect_false (c->on_enter)) 720 if (ecb_expect_false (c->on_enter))
721 { 721 {
722 int i; 722 int i;
723 723
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 724 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
731static void 731static void
732save_perl (pTHX_ Coro__State c) 732save_perl (pTHX_ Coro__State c)
733{ 733{
734 SWAP_SVS (c); 734 SWAP_SVS (c);
735 735
736 if (expect_false (c->on_leave)) 736 if (ecb_expect_false (c->on_leave))
737 { 737 {
738 int i; 738 int i;
739 739
740 for (i = AvFILLp (c->on_leave); i >= 0; --i) 740 for (i = AvFILLp (c->on_leave); i >= 0; --i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 } 742 }
743 743
744 times_valid = 0; 744 times_valid = 0;
745 745
746 if (expect_false (enable_times)) 746 if (ecb_expect_false (enable_times))
747 { 747 {
748 coro_times_update (); times_valid = 1; 748 coro_times_update (); times_valid = 1;
749 coro_times_add (c); 749 coro_times_add (c);
750 } 750 }
751 751
… …
765 765
766 XPUSHs (Nullsv); 766 XPUSHs (Nullsv);
767 /* this loop was inspired by pp_caller */ 767 /* this loop was inspired by pp_caller */
768 for (;;) 768 for (;;)
769 { 769 {
770 while (expect_true (cxix >= 0)) 770 while (ecb_expect_true (cxix >= 0))
771 { 771 {
772 PERL_CONTEXT *cx = &ccstk[cxix--]; 772 PERL_CONTEXT *cx = &ccstk[cxix--];
773 773
774 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))
775 { 775 {
776 CV *cv = cx->blk_sub.cv; 776 CV *cv = cx->blk_sub.cv;
777 777
778 if (expect_true (CvDEPTH (cv))) 778 if (ecb_expect_true (CvDEPTH (cv)))
779 { 779 {
780 EXTEND (SP, 3); 780 EXTEND (SP, 3);
781 PUSHs ((SV *)CvPADLIST (cv)); 781 PUSHs ((SV *)CvPADLIST (cv));
782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
783 PUSHs ((SV *)cv); 783 PUSHs ((SV *)cv);
… …
786 get_padlist (aTHX_ cv); 786 get_padlist (aTHX_ cv);
787 } 787 }
788 } 788 }
789 } 789 }
790 790
791 if (expect_true (top_si->si_type == PERLSI_MAIN)) 791 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
792 break; 792 break;
793 793
794 top_si = top_si->si_prev; 794 top_si = top_si->si_prev;
795 ccstk = top_si->si_cxstack; 795 ccstk = top_si->si_cxstack;
796 cxix = top_si->si_cxix; 796 cxix = top_si->si_cxix;
… …
798 798
799 PUTBACK; 799 PUTBACK;
800 } 800 }
801 801
802 /* allocate some space on the context stack for our purposes */ 802 /* allocate some space on the context stack for our purposes */
803 /* we manually unroll here, as usually 2 slots is enough */ 803 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
804 if (SLOT_COUNT >= 1) CXINC;
805 if (SLOT_COUNT >= 2) CXINC;
806 if (SLOT_COUNT >= 3) CXINC;
807 { 804 {
808 unsigned int i; 805 unsigned int i;
806
809 for (i = 3; i < SLOT_COUNT; ++i) 807 for (i = 0; i < SLOT_COUNT; ++i)
810 CXINC; 808 CXINC;
811 } 809
812 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 810 cxstack_ix -= SLOT_COUNT; /* undo allocation */
811 }
813 812
814 c->mainstack = PL_mainstack; 813 c->mainstack = PL_mainstack;
815 814
816 { 815 {
817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 816 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
… …
838# define coro_init_stacks(thx) init_stacks () 837# define coro_init_stacks(thx) init_stacks ()
839#else 838#else
840static void 839static void
841coro_init_stacks (pTHX) 840coro_init_stacks (pTHX)
842{ 841{
843 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() */
844 PL_curstackinfo->si_type = PERLSI_MAIN; 843 PL_curstackinfo->si_type = PERLSI_MAIN;
845 PL_curstack = PL_curstackinfo->si_stack; 844 PL_curstack = PL_curstackinfo->si_stack;
846 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 845 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
847 846
848 PL_stack_base = AvARRAY(PL_curstack); 847 PL_stack_base = AvARRAY(PL_curstack);
… …
955#endif 954#endif
956 955
957/* 956/*
958 * This overrides the default magic get method of %SIG elements. 957 * This overrides the default magic get method of %SIG elements.
959 * 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
960 * 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),
961 * readback here. 960 * we just provide our own readback here.
962 */ 961 */
963static int 962static int ecb_cold
964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 963coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
965{ 964{
966 const char *s = MgPV_nolen_const (mg); 965 const char *s = MgPV_nolen_const (mg);
967 966
968 if (*s == '_') 967 if (*s == '_')
… …
980 } 979 }
981 980
982 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 981 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
983} 982}
984 983
985static int 984static int ecb_cold
986coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 985coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
987{ 986{
988 const char *s = MgPV_nolen_const (mg); 987 const char *s = MgPV_nolen_const (mg);
989 988
990 if (*s == '_') 989 if (*s == '_')
… …
1004 } 1003 }
1005 1004
1006 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1005 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1007} 1006}
1008 1007
1009static int 1008static int ecb_cold
1010coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1009coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1011{ 1010{
1012 const char *s = MgPV_nolen_const (mg); 1011 const char *s = MgPV_nolen_const (mg);
1013 1012
1014 if (*s == '_') 1013 if (*s == '_')
… …
1049 return 1; 1048 return 1;
1050} 1049}
1051 1050
1052static UNOP init_perl_op; 1051static UNOP init_perl_op;
1053 1052
1054static 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 */
1055init_perl (pTHX_ struct coro *coro) 1054init_perl (pTHX_ struct coro *coro)
1056{ 1055{
1057 /* 1056 /*
1058 * emulate part of the perl startup here. 1057 * emulate part of the perl startup here.
1059 */ 1058 */
… …
1074 PL_parser = 0; 1073 PL_parser = 0;
1075#endif 1074#endif
1076 PL_hints = 0; 1075 PL_hints = 0;
1077 1076
1078 /* recreate the die/warn hooks */ 1077 /* recreate the die/warn hooks */
1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1078 PL_diehook = SvREFCNT_inc (rv_diehook);
1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1079 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1081 1080
1082 GvSV (PL_defgv) = newSV (0); 1081 GvSV (PL_defgv) = newSV (0);
1083 GvAV (PL_defgv) = coro->args; coro->args = 0; 1082 GvAV (PL_defgv) = coro->args; coro->args = 0;
1084 GvSV (PL_errgv) = newSV (0); 1083 GvSV (PL_errgv) = newSV (0);
1085 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);
… …
1106 /* 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
1107 * 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.
1108 */ 1107 */
1109 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 */
1110 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;
1111 1111
1112 /* 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 */
1113 init_perl_op.op_next = PL_op; 1113 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1114 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1115 init_perl_op.op_ppaddr = pp_slf;
… …
1120 /* copy throw, in case it was set before init_perl */ 1120 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1121 CORO_THROW = coro->except;
1122 1122
1123 SWAP_SVS (coro); 1123 SWAP_SVS (coro);
1124 1124
1125 if (expect_false (enable_times)) 1125 if (ecb_expect_false (enable_times))
1126 { 1126 {
1127 coro_times_update (); 1127 coro_times_update ();
1128 coro_times_sub (coro); 1128 coro_times_sub (coro);
1129 } 1129 }
1130} 1130}
… …
1167 SvRV_set (coro_current, (SV *)coro->hv); 1167 SvRV_set (coro_current, (SV *)coro->hv);
1168 1168
1169 load_perl (aTHX_ coro); 1169 load_perl (aTHX_ coro);
1170 1170
1171 coro_unwind_stacks (aTHX); 1171 coro_unwind_stacks (aTHX);
1172 coro_destruct_stacks (aTHX);
1173 1172
1174 /* restore swapped sv's */ 1173 /* restore swapped sv's */
1175 SWAP_SVS (coro); 1174 SWAP_SVS (coro);
1175
1176 coro_destruct_stacks (aTHX);
1176 1177
1177 // now save some sv's to be free'd later 1178 // now save some sv's to be free'd later
1178 svf [0] = GvSV (PL_defgv); 1179 svf [0] = GvSV (PL_defgv);
1179 svf [1] = (SV *)GvAV (PL_defgv); 1180 svf [1] = (SV *)GvAV (PL_defgv);
1180 svf [2] = GvSV (PL_errgv); 1181 svf [2] = GvSV (PL_errgv);
… …
1202 SvREFCNT_dec (coro->invoke_cb); 1203 SvREFCNT_dec (coro->invoke_cb);
1203 SvREFCNT_dec (coro->invoke_av); 1204 SvREFCNT_dec (coro->invoke_av);
1204 } 1205 }
1205} 1206}
1206 1207
1207INLINE void 1208ECB_INLINE void
1208free_coro_mortal (pTHX) 1209free_coro_mortal (pTHX)
1209{ 1210{
1210 if (expect_true (coro_mortal)) 1211 if (ecb_expect_true (coro_mortal))
1211 { 1212 {
1212 SvREFCNT_dec (coro_mortal); 1213 SvREFCNT_dec ((SV *)coro_mortal);
1213 coro_mortal = 0; 1214 coro_mortal = 0;
1214 } 1215 }
1215} 1216}
1216 1217
1217static int 1218static int
… …
1350 1351
1351 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 */
1352} 1353}
1353 1354
1354/* 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 */
1355static void NOINLINE 1356static void ecb_noinline
1356cctx_prepare (pTHX) 1357cctx_prepare (pTHX)
1357{ 1358{
1358 PL_top_env = &PL_start_env; 1359 PL_top_env = &PL_start_env;
1359 1360
1360 if (cctx_current->flags & CC_TRACE) 1361 if (cctx_current->flags & CC_TRACE)
… …
1371 slf_frame.prepare = slf_prepare_set_stacklevel; 1372 slf_frame.prepare = slf_prepare_set_stacklevel;
1372 slf_frame.check = slf_check_set_stacklevel; 1373 slf_frame.check = slf_check_set_stacklevel;
1373} 1374}
1374 1375
1375/* 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 */
1376INLINE void 1377ECB_INLINE void
1377transfer_tail (pTHX) 1378transfer_tail (pTHX)
1378{ 1379{
1379 free_coro_mortal (aTHX); 1380 free_coro_mortal (aTHX);
1380} 1381}
1381 1382
… …
1533#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))
1534 1535
1535static coro_cctx * 1536static coro_cctx *
1536cctx_get (pTHX) 1537cctx_get (pTHX)
1537{ 1538{
1538 while (expect_true (cctx_first)) 1539 while (ecb_expect_true (cctx_first))
1539 { 1540 {
1540 coro_cctx *cctx = cctx_first; 1541 coro_cctx *cctx = cctx_first;
1541 cctx_first = cctx->next; 1542 cctx_first = cctx->next;
1542 --cctx_idle; 1543 --cctx_idle;
1543 1544
1544 if (expect_true (!CCTX_EXPIRED (cctx))) 1545 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1545 return cctx; 1546 return cctx;
1546 1547
1547 cctx_destroy (cctx); 1548 cctx_destroy (cctx);
1548 } 1549 }
1549 1550
… …
1554cctx_put (coro_cctx *cctx) 1555cctx_put (coro_cctx *cctx)
1555{ 1556{
1556 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));
1557 1558
1558 /* free another cctx if overlimit */ 1559 /* free another cctx if overlimit */
1559 if (expect_false (cctx_idle >= cctx_max_idle)) 1560 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1560 { 1561 {
1561 coro_cctx *first = cctx_first; 1562 coro_cctx *first = cctx_first;
1562 cctx_first = first->next; 1563 cctx_first = first->next;
1563 --cctx_idle; 1564 --cctx_idle;
1564 1565
… …
1575static void 1576static void
1576transfer_check (pTHX_ struct coro *prev, struct coro *next) 1577transfer_check (pTHX_ struct coro *prev, struct coro *next)
1577{ 1578{
1578 /* TODO: throwing up here is considered harmful */ 1579 /* TODO: throwing up here is considered harmful */
1579 1580
1580 if (expect_true (prev != next)) 1581 if (ecb_expect_true (prev != next))
1581 { 1582 {
1582 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1583 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1583 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,");
1584 1585
1585 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1586 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1586 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,");
1587 1588
1588#if !PERL_VERSION_ATLEAST (5,10,0) 1589#if !PERL_VERSION_ATLEAST (5,10,0)
1589 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1590 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1590 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,");
1591#endif 1592#endif
1592 } 1593 }
1593} 1594}
1594 1595
1595/* always use the TRANSFER macro */ 1596/* always use the TRANSFER macro */
1596static void NOINLINE /* noinline so we have a fixed stackframe */ 1597static void ecb_noinline /* noinline so we have a fixed stackframe */
1597transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1598transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1598{ 1599{
1599 dSTACKLEVEL; 1600 dSTACKLEVEL;
1600 1601
1601 /* sometimes transfer is only called to set idle_sp */ 1602 /* sometimes transfer is only called to set idle_sp */
1602 if (expect_false (!prev)) 1603 if (ecb_expect_false (!prev))
1603 { 1604 {
1604 cctx_current->idle_sp = STACKLEVEL; 1605 cctx_current->idle_sp = STACKLEVEL;
1605 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 */
1606 } 1607 }
1607 else if (expect_true (prev != next)) 1608 else if (ecb_expect_true (prev != next))
1608 { 1609 {
1609 coro_cctx *cctx_prev; 1610 coro_cctx *cctx_prev;
1610 1611
1611 if (expect_false (prev->flags & CF_NEW)) 1612 if (ecb_expect_false (prev->flags & CF_NEW))
1612 { 1613 {
1613 /* create a new empty/source context */ 1614 /* create a new empty/source context */
1614 prev->flags &= ~CF_NEW; 1615 prev->flags &= ~CF_NEW;
1615 prev->flags |= CF_RUNNING; 1616 prev->flags |= CF_RUNNING;
1616 } 1617 }
… …
1619 next->flags |= CF_RUNNING; 1620 next->flags |= CF_RUNNING;
1620 1621
1621 /* first get rid of the old state */ 1622 /* first get rid of the old state */
1622 save_perl (aTHX_ prev); 1623 save_perl (aTHX_ prev);
1623 1624
1624 if (expect_false (next->flags & CF_NEW)) 1625 if (ecb_expect_false (next->flags & CF_NEW))
1625 { 1626 {
1626 /* need to start coroutine */ 1627 /* need to start coroutine */
1627 next->flags &= ~CF_NEW; 1628 next->flags &= ~CF_NEW;
1628 /* setup coroutine call */ 1629 /* setup coroutine call */
1629 init_perl (aTHX_ next); 1630 init_perl (aTHX_ next);
1630 } 1631 }
1631 else 1632 else
1632 load_perl (aTHX_ next); 1633 load_perl (aTHX_ next);
1633 1634
1634 /* possibly untie and reuse the cctx */ 1635 /* possibly untie and reuse the cctx */
1635 if (expect_true ( 1636 if (ecb_expect_true (
1636 cctx_current->idle_sp == STACKLEVEL 1637 cctx_current->idle_sp == STACKLEVEL
1637 && !(cctx_current->flags & CC_TRACE) 1638 && !(cctx_current->flags & CC_TRACE)
1638 && !force_cctx 1639 && !force_cctx
1639 )) 1640 ))
1640 { 1641 {
1641 /* 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 */
1642 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));
1643 1644
1644 /* 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. */
1645 /* 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 */
1646 if (expect_false (CCTX_EXPIRED (cctx_current))) 1647 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1647 if (expect_true (!next->cctx)) 1648 if (ecb_expect_true (!next->cctx))
1648 next->cctx = cctx_get (aTHX); 1649 next->cctx = cctx_get (aTHX);
1649 1650
1650 cctx_put (cctx_current); 1651 cctx_put (cctx_current);
1651 } 1652 }
1652 else 1653 else
1653 prev->cctx = cctx_current; 1654 prev->cctx = cctx_current;
1654 1655
1655 ++next->usecount; 1656 ++next->usecount;
1656 1657
1657 cctx_prev = cctx_current; 1658 cctx_prev = cctx_current;
1658 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1659 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1659 1660
1660 next->cctx = 0; 1661 next->cctx = 0;
1661 1662
1662 if (expect_false (cctx_prev != cctx_current)) 1663 if (ecb_expect_false (cctx_prev != cctx_current))
1663 { 1664 {
1664 cctx_prev->top_env = PL_top_env; 1665 cctx_prev->top_env = PL_top_env;
1665 PL_top_env = cctx_current->top_env; 1666 PL_top_env = cctx_current->top_env;
1666 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1667 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1667 } 1668 }
… …
1673#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))
1674#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1675#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1675 1676
1676/** high level stuff ********************************************************/ 1677/** high level stuff ********************************************************/
1677 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 */
1681static void
1682coro_call_on_destroy (pTHX_ struct coro *coro);
1683
1678static void 1684static void
1679coro_state_destroy (pTHX_ struct coro *coro) 1685coro_state_destroy (pTHX_ struct coro *coro)
1680{ 1686{
1681 if (coro->flags & CF_DESTROYED) 1687 if (coro->flags & CF_ZOMBIE)
1682 return; 1688 return;
1683 1689
1684 slf_destroy (aTHX_ coro); 1690 slf_destroy (aTHX_ coro);
1685 1691
1686 coro->flags |= CF_DESTROYED; 1692 coro->flags |= CF_ZOMBIE;
1687 1693
1688 if (coro->flags & CF_READY) 1694 if (coro->flags & CF_READY)
1689 { 1695 {
1690 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1696 /* reduce nready, as destroying a ready coro effectively unreadies it */
1691 /* alternative: look through all ready queues and remove the coro */ 1697 /* alternative: look through all ready queues and remove the coro */
1692 --coro_nready; 1698 --coro_nready;
1693 } 1699 }
1694 else 1700 else
1695 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;
1696 1706
1697 if (coro->mainstack 1707 if (coro->mainstack
1698 && coro->mainstack != main_mainstack 1708 && coro->mainstack != main_mainstack
1699 && coro->slot 1709 && coro->slot
1700 && !PL_dirty) 1710 && !PL_dirty)
1701 destroy_perl (aTHX_ coro); 1711 destroy_perl (aTHX_ coro);
1702 1712
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;
1706
1707 cctx_destroy (coro->cctx); 1713 cctx_destroy (coro->cctx);
1708 SvREFCNT_dec (coro->startcv); 1714 SvREFCNT_dec (coro->startcv);
1709 SvREFCNT_dec (coro->args); 1715 SvREFCNT_dec (coro->args);
1710 SvREFCNT_dec (coro->swap_sv); 1716 SvREFCNT_dec (coro->swap_sv);
1711 SvREFCNT_dec (CORO_THROW); 1717 SvREFCNT_dec (CORO_THROW);
1718
1719 coro_call_on_destroy (aTHX_ coro);
1720
1721 /* more destruction mayhem in coro_state_free */
1712} 1722}
1713 1723
1714static int 1724static int
1715coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1725coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1716{ 1726{
1717 struct coro *coro = (struct coro *)mg->mg_ptr; 1727 struct coro *coro = (struct coro *)mg->mg_ptr;
1718 mg->mg_ptr = 0; 1728 mg->mg_ptr = 0;
1719 1729
1720 coro->hv = 0;
1721
1722 if (--coro->refcnt < 0)
1723 {
1724 coro_state_destroy (aTHX_ coro); 1730 coro_state_destroy (aTHX_ coro);
1731 SvREFCNT_dec (coro->on_destroy);
1732 SvREFCNT_dec (coro->status);
1733
1725 Safefree (coro); 1734 Safefree (coro);
1726 }
1727 1735
1728 return 0; 1736 return 0;
1729} 1737}
1730 1738
1731static int 1739static int ecb_cold
1732coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1740coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1733{ 1741{
1734 struct coro *coro = (struct coro *)mg->mg_ptr; 1742 /* called when perl clones the current process the slow way (windows process emulation) */
1735 1743 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1736 ++coro->refcnt; 1744 mg->mg_ptr = 0;
1745 mg->mg_virtual = 0;
1737 1746
1738 return 0; 1747 return 0;
1739} 1748}
1740 1749
1741static MGVTBL coro_state_vtbl = { 1750static MGVTBL coro_state_vtbl = {
… …
1766 TRANSFER (ta, 1); 1775 TRANSFER (ta, 1);
1767} 1776}
1768 1777
1769/** Coro ********************************************************************/ 1778/** Coro ********************************************************************/
1770 1779
1771INLINE void 1780ECB_INLINE void
1772coro_enq (pTHX_ struct coro *coro) 1781coro_enq (pTHX_ struct coro *coro)
1773{ 1782{
1774 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1783 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1775 1784
1776 SvREFCNT_inc_NN (coro->hv); 1785 SvREFCNT_inc_NN (coro->hv);
… …
1778 coro->next_ready = 0; 1787 coro->next_ready = 0;
1779 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1788 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1780 ready [1] = coro; 1789 ready [1] = coro;
1781} 1790}
1782 1791
1783INLINE struct coro * 1792ECB_INLINE struct coro *
1784coro_deq (pTHX) 1793coro_deq (pTHX)
1785{ 1794{
1786 int prio; 1795 int prio;
1787 1796
1788 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1797 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1841{ 1850{
1842 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1851 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1843} 1852}
1844 1853
1845/* expects to own a reference to next->hv */ 1854/* expects to own a reference to next->hv */
1846INLINE void 1855ECB_INLINE void
1847prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1856prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1848{ 1857{
1849 SV *prev_sv = SvRV (coro_current); 1858 SV *prev_sv = SvRV (coro_current);
1850 1859
1851 ta->prev = SvSTATE_hv (prev_sv); 1860 ta->prev = SvSTATE_hv (prev_sv);
… …
1864{ 1873{
1865 for (;;) 1874 for (;;)
1866 { 1875 {
1867 struct coro *next = coro_deq (aTHX); 1876 struct coro *next = coro_deq (aTHX);
1868 1877
1869 if (expect_true (next)) 1878 if (ecb_expect_true (next))
1870 { 1879 {
1871 /* cannot transfer to destroyed coros, skip and look for next */ 1880 /* cannot transfer to destroyed coros, skip and look for next */
1872 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1881 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1873 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 */
1874 else 1883 else
1875 { 1884 {
1876 next->flags &= ~CF_READY; 1885 next->flags &= ~CF_READY;
1877 --coro_nready; 1886 --coro_nready;
… …
1910 } 1919 }
1911 } 1920 }
1912 } 1921 }
1913} 1922}
1914 1923
1915INLINE void 1924ECB_INLINE void
1916prepare_cede (pTHX_ struct coro_transfer_args *ta) 1925prepare_cede (pTHX_ struct coro_transfer_args *ta)
1917{ 1926{
1918 api_ready (aTHX_ coro_current); 1927 api_ready (aTHX_ coro_current);
1919 prepare_schedule (aTHX_ ta); 1928 prepare_schedule (aTHX_ ta);
1920} 1929}
1921 1930
1922INLINE void 1931ECB_INLINE void
1923prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1932prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1924{ 1933{
1925 SV *prev = SvRV (coro_current); 1934 SV *prev = SvRV (coro_current);
1926 1935
1927 if (coro_nready) 1936 if (coro_nready)
… …
1957{ 1966{
1958 struct coro_transfer_args ta; 1967 struct coro_transfer_args ta;
1959 1968
1960 prepare_cede (aTHX_ &ta); 1969 prepare_cede (aTHX_ &ta);
1961 1970
1962 if (expect_true (ta.prev != ta.next)) 1971 if (ecb_expect_true (ta.prev != ta.next))
1963 { 1972 {
1964 TRANSFER (ta, 1); 1973 TRANSFER (ta, 1);
1965 return 1; 1974 return 1;
1966 } 1975 }
1967 else 1976 else
… …
2010 coro->slot->runops = RUNOPS_DEFAULT; 2019 coro->slot->runops = RUNOPS_DEFAULT;
2011 } 2020 }
2012} 2021}
2013 2022
2014static 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
2015coro_call_on_destroy (pTHX_ struct coro *coro) 2100coro_call_on_destroy (pTHX_ struct coro *coro)
2016{ 2101{
2017 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2102 AV *od = coro->on_destroy;
2018 2103
2019 if (on_destroyp) 2104 if (!od)
2020 { 2105 return;
2021 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2022 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2023 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2024 2106
2025 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
2026 { 2115 {
2027 dSP; /* don't disturb outer sp */ 2116 dSP; /* don't disturb outer sp */
2028 SV *cb = av_pop (on_destroy);
2029
2030 PUSHMARK (SP); 2117 PUSHMARK (SP);
2031 2118
2032 if (statusp) 2119 if (coro->status)
2033 { 2120 {
2034 int i; 2121 PUTBACK;
2035 EXTEND (SP, AvFILLp (status) + 1); 2122 coro_push_av (aTHX_ coro->status, G_ARRAY);
2036 2123 SPAGAIN;
2037 for (i = 0; i <= AvFILLp (status); ++i)
2038 PUSHs (AvARRAY (status)[i]);
2039 } 2124 }
2040 2125
2041 PUTBACK; 2126 PUTBACK;
2042 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2127 call_sv (cb, G_VOID | G_DISCARD);
2043 } 2128 }
2044 } 2129 }
2045} 2130}
2046 2131
2047static void 2132static void
2048coro_set_status (HV *coro_hv, SV **arg, int items) 2133coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2049{ 2134{
2050 AV *av = newAV (); 2135 AV *av;
2136
2137 if (coro->status)
2138 {
2139 av = coro->status;
2140 av_clear (av);
2141 }
2142 else
2143 av = coro->status = newAV ();
2051 2144
2052 /* items are actually not so common, so optimise for this case */ 2145 /* items are actually not so common, so optimise for this case */
2053 if (items) 2146 if (items)
2054 { 2147 {
2055 int i; 2148 int i;
… …
2057 av_extend (av, items - 1); 2150 av_extend (av, items - 1);
2058 2151
2059 for (i = 0; i < items; ++i) 2152 for (i = 0; i < items; ++i)
2060 av_push (av, SvREFCNT_inc_NN (arg [i])); 2153 av_push (av, SvREFCNT_inc_NN (arg [i]));
2061 } 2154 }
2062
2063 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2064} 2155}
2065 2156
2066static void 2157static void
2067slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2158slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2068{ 2159{
… …
2080static void 2171static void
2081slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2172slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2082{ 2173{
2083 HV *coro_hv = (HV *)SvRV (coro_current); 2174 HV *coro_hv = (HV *)SvRV (coro_current);
2084 2175
2085 coro_set_status (coro_hv, arg, items); 2176 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2086 slf_init_terminate_cancel_common (frame, coro_hv); 2177 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2087} 2178}
2088 2179
2089static void 2180static void
2090slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2181slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2091{ 2182{
… …
2096 croak ("Coro::cancel called without coro object,"); 2187 croak ("Coro::cancel called without coro object,");
2097 2188
2098 coro = SvSTATE (arg [0]); 2189 coro = SvSTATE (arg [0]);
2099 coro_hv = coro->hv; 2190 coro_hv = coro->hv;
2100 2191
2101 coro_set_status (coro_hv, arg + 1, items - 1); 2192 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2102 2193
2103 if (expect_false (coro->flags & CF_NOCANCEL)) 2194 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2104 { 2195 {
2105 /* coro currently busy cancelling something, so just notify it */ 2196 /* coro currently busy cancelling something, so just notify it */
2106 coro->slf_frame.data = (void *)coro; 2197 coro->slf_frame.data = (void *)coro;
2107 2198
2108 frame->prepare = prepare_nop; 2199 frame->prepare = prepare_nop;
2109 frame->check = slf_check_nop; 2200 frame->check = slf_check_nop;
2110 } 2201 }
2111 else if (coro_hv == (HV *)SvRV (coro_current)) 2202 else if (coro_hv == (HV *)SvRV (coro_current))
2112 { 2203 {
2113 /* cancelling the current coro is allowed, and equals terminate */ 2204 /* cancelling the current coro is allowed, and equals terminate */
2114 slf_init_terminate_cancel_common (frame, coro_hv); 2205 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2115 } 2206 }
2116 else 2207 else
2117 { 2208 {
2118 struct coro *self = SvSTATE_current; 2209 struct coro *self = SvSTATE_current;
2119 2210
… …
2123 * this is ugly, and hopefully fully worth the extra speed. 2214 * this is ugly, and hopefully fully worth the extra speed.
2124 * besides, I can't get the slow-but-safe version working... 2215 * besides, I can't get the slow-but-safe version working...
2125 */ 2216 */
2126 slf_frame.data = 0; 2217 slf_frame.data = 0;
2127 self->flags |= CF_NOCANCEL; 2218 self->flags |= CF_NOCANCEL;
2128
2129 coro_state_destroy (aTHX_ coro); 2219 coro_state_destroy (aTHX_ coro);
2130 coro_call_on_destroy (aTHX_ coro);
2131
2132 self->flags &= ~CF_NOCANCEL; 2220 self->flags &= ~CF_NOCANCEL;
2133 2221
2134 if (slf_frame.data) 2222 if (slf_frame.data)
2135 { 2223 {
2136 /* while we were busy we have been cancelled, so terminate */ 2224 /* while we were busy we have been cancelled, so terminate */
2137 slf_init_terminate_cancel_common (frame, self->hv); 2225 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2138 } 2226 }
2139 else 2227 else
2140 { 2228 {
2141 frame->prepare = prepare_nop; 2229 frame->prepare = prepare_nop;
2142 frame->check = slf_check_nop; 2230 frame->check = slf_check_nop;
… …
2146 2234
2147static int 2235static int
2148slf_check_safe_cancel (pTHX_ struct CoroSLF *frame) 2236slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2149{ 2237{
2150 frame->prepare = 0; 2238 frame->prepare = 0;
2151 coro_unwind_stacks (); 2239 coro_unwind_stacks (aTHX);
2152 2240
2153 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current)); 2241 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2154 2242
2155 return 1; 2243 return 1;
2156} 2244}
… …
2161 if (coro->cctx) 2249 if (coro->cctx)
2162 croak ("coro inside C callback, unable to cancel at this time, caught"); 2250 croak ("coro inside C callback, unable to cancel at this time, caught");
2163 2251
2164 if (coro->flags & CF_NEW) 2252 if (coro->flags & CF_NEW)
2165 { 2253 {
2166 coro_set_status (coro->hv, arg, items); 2254 coro_set_status (aTHX_ coro, arg, items);
2167 coro_state_destroy (aTHX_ coro); 2255 coro_state_destroy (aTHX_ coro);
2168 coro_call_on_destroy (aTHX_ coro);
2169 } 2256 }
2170 else 2257 else
2171 { 2258 {
2172 if (!coro->slf_frame.prepare) 2259 if (!coro->slf_frame.prepare)
2173 croak ("coro outside an SLF function, unable to cancel at this time, caught"); 2260 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2174 2261
2175 slf_destroy (coro); 2262 slf_destroy (aTHX_ coro);
2176 2263
2177 coro_set_status (coro->hv, arg, items); 2264 coro_set_status (aTHX_ coro, arg, items);
2178 coro->slf_frame.prepare = prepare_nop; 2265 coro->slf_frame.prepare = prepare_nop;
2179 coro->slf_frame.check = slf_check_safe_cancel; 2266 coro->slf_frame.check = slf_check_safe_cancel;
2180 2267
2181 api_ready (aTHX_ coro->hv); 2268 api_ready (aTHX_ (SV *)coro->hv);
2182 } 2269 }
2183 2270
2184 return 1; 2271 return 1;
2185} 2272}
2186 2273
… …
2220slf_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)
2221{ 2308{
2222 HV *hv = (HV *)SvRV (coro_current); 2309 HV *hv = (HV *)SvRV (coro_current);
2223 struct coro *coro = SvSTATE_hv ((SV *)hv); 2310 struct coro *coro = SvSTATE_hv ((SV *)hv);
2224 2311
2225 if (expect_true (coro->saved_deffh)) 2312 if (ecb_expect_true (coro->saved_deffh))
2226 { 2313 {
2227 /* subsequent iteration */ 2314 /* subsequent iteration */
2228 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2315 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2229 coro->saved_deffh = 0; 2316 coro->saved_deffh = 0;
2230 2317
… …
2471static void 2558static void
2472slf_destroy (pTHX_ struct coro *coro) 2559slf_destroy (pTHX_ struct coro *coro)
2473{ 2560{
2474 /* this callback is reserved for slf functions needing to do cleanup */ 2561 /* this callback is reserved for slf functions needing to do cleanup */
2475 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty) 2562 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2476 coro->slf_frame.destroy (aTHX_ coro); 2563 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2477 2564
2478 /* 2565 /*
2479 * The on_destroy above most likely is from an SLF call. 2566 * The on_destroy above most likely is from an SLF call.
2480 * Since by definition the SLF call will not finish when we destroy 2567 * Since by definition the SLF call will not finish when we destroy
2481 * the coro, we will have to force-finish it here, otherwise 2568 * the coro, we will have to force-finish it here, otherwise
… …
2496 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 */
2497 2584
2498 /* 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 */
2499 /* the latter happens when a new coro has been started */ 2586 /* the latter happens when a new coro has been started */
2500 /* or when a new cctx was attached to an existing coroutine */ 2587 /* or when a new cctx was attached to an existing coroutine */
2501 if (expect_true (!slf_frame.prepare)) 2588 if (ecb_expect_true (!slf_frame.prepare))
2502 { 2589 {
2503 /* first iteration */ 2590 /* first iteration */
2504 dSP; 2591 dSP;
2505 SV **arg = PL_stack_base + TOPMARK + 1; 2592 SV **arg = PL_stack_base + TOPMARK + 1;
2506 int items = SP - arg; /* args without function object */ 2593 int items = SP - arg; /* args without function object */
… …
2547 while (slf_frame.check (aTHX_ &slf_frame)); 2634 while (slf_frame.check (aTHX_ &slf_frame));
2548 2635
2549 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 */
2550 2637
2551 /* exception handling */ 2638 /* exception handling */
2552 if (expect_false (CORO_THROW)) 2639 if (ecb_expect_false (CORO_THROW))
2553 { 2640 {
2554 SV *exception = sv_2mortal (CORO_THROW); 2641 SV *exception = sv_2mortal (CORO_THROW);
2555 2642
2556 CORO_THROW = 0; 2643 CORO_THROW = 0;
2557 sv_setsv (ERRSV, exception); 2644 sv_setsv (ERRSV, exception);
2558 croak (0); 2645 croak (0);
2559 } 2646 }
2560 2647
2561 /* return value handling - mostly like entersub */ 2648 /* return value handling - mostly like entersub */
2562 /* make sure we put something on the stack in scalar context */ 2649 /* make sure we put something on the stack in scalar context */
2563 if (GIMME_V == G_SCALAR) 2650 if (GIMME_V == G_SCALAR
2651 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2564 { 2652 {
2565 dSP; 2653 dSP;
2566 SV **bot = PL_stack_base + checkmark; 2654 SV **bot = PL_stack_base + checkmark;
2567 2655
2568 if (sp == bot) /* too few, push undef */ 2656 if (sp == bot) /* too few, push undef */
2569 bot [1] = &PL_sv_undef; 2657 bot [1] = &PL_sv_undef;
2570 else if (sp != bot + 1) /* too many, take last one */ 2658 else /* too many, take last one */
2571 bot [1] = *sp; 2659 bot [1] = *sp;
2572 2660
2573 SP = bot + 1; 2661 SP = bot + 1;
2574 2662
2575 PUTBACK; 2663 PUTBACK;
… …
2682{ 2770{
2683 PerlIOBuf base; 2771 PerlIOBuf base;
2684 NV next, every; 2772 NV next, every;
2685} PerlIOCede; 2773} PerlIOCede;
2686 2774
2687static IV 2775static IV ecb_cold
2688PerlIOCede_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)
2689{ 2777{
2690 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2778 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2691 2779
2692 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2780 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2693 self->next = nvtime () + self->every; 2781 self->next = nvtime () + self->every;
2694 2782
2695 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2783 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2696} 2784}
2697 2785
2698static SV * 2786static SV * ecb_cold
2699PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2787PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2700{ 2788{
2701 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2789 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2702 2790
2703 return newSVnv (self->every); 2791 return newSVnv (self->every);
… …
2815 SvREFCNT_dec (cb); 2903 SvREFCNT_dec (cb);
2816 } 2904 }
2817} 2905}
2818 2906
2819static void 2907static void
2820coro_semaphore_destroy (pTHX_ struct coro *coro) 2908coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2821{ 2909{
2822 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2910 /* call $sem->adjust (0) to possibly wake up some other waiters */
2823 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2911 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2824} 2912}
2825 2913
2826static int 2914static int
2827slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2915slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2828{ 2916{
2829 AV *av = (AV *)frame->data; 2917 AV *av = (AV *)frame->data;
2830 SV *count_sv = AvARRAY (av)[0]; 2918 SV *count_sv = AvARRAY (av)[0];
2919 SV *coro_hv = SvRV (coro_current);
2831 2920
2832 /* 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 */
2833 if (CORO_THROW) 2922 if (CORO_THROW)
2834 return 0; 2923 return 0;
2835 else if (SvIVX (count_sv) > 0) 2924 else if (SvIVX (count_sv) > 0)
… …
2847 { 2936 {
2848 int i; 2937 int i;
2849 /* 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 */
2850 /* 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 */
2851 /* this avoids some degenerate memory usage cases */ 2940 /* this avoids some degenerate memory usage cases */
2852 2941 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug
2853 for (i = 1; i <= AvFILLp (av); ++i)
2854 if (AvARRAY (av)[i] == SvRV (coro_current)) 2942 if (AvARRAY (av)[i] == coro_hv)
2855 return 1; 2943 return 1;
2856 2944
2857 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2945 av_push (av, SvREFCNT_inc (coro_hv));
2858 return 1; 2946 return 1;
2859 } 2947 }
2860} 2948}
2861 2949
2862static int 2950static int
… …
3115 dSP; 3203 dSP;
3116 3204
3117 static SV *prio_cv; 3205 static SV *prio_cv;
3118 static SV *prio_sv; 3206 static SV *prio_sv;
3119 3207
3120 if (expect_false (!prio_cv)) 3208 if (ecb_expect_false (!prio_cv))
3121 { 3209 {
3122 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3210 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3123 prio_sv = newSViv (0); 3211 prio_sv = newSViv (0);
3124 } 3212 }
3125 3213
… …
3230 av_push (coro->args, newSVsv (argv [i])); 3318 av_push (coro->args, newSVsv (argv [i]));
3231 } 3319 }
3232 3320
3233 return coro_sv; 3321 return coro_sv;
3234} 3322}
3323
3324#ifndef __cplusplus
3325ecb_cold XS(boot_Coro__State);
3326#endif
3235 3327
3236MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3328MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3237 3329
3238PROTOTYPES: DISABLE 3330PROTOTYPES: DISABLE
3239 3331
… …
3446 PROTOTYPE: $ 3538 PROTOTYPE: $
3447 ALIAS: 3539 ALIAS:
3448 is_ready = CF_READY 3540 is_ready = CF_READY
3449 is_running = CF_RUNNING 3541 is_running = CF_RUNNING
3450 is_new = CF_NEW 3542 is_new = CF_NEW
3451 is_destroyed = CF_DESTROYED 3543 is_destroyed = CF_ZOMBIE
3544 is_zombie = CF_ZOMBIE
3452 is_suspended = CF_SUSPENDED 3545 is_suspended = CF_SUSPENDED
3453 CODE: 3546 CODE:
3454 RETVAL = boolSV (coro->flags & ix); 3547 RETVAL = boolSV (coro->flags & ix);
3455 OUTPUT: 3548 OUTPUT:
3456 RETVAL 3549 RETVAL
… …
3551times (Coro::State self) 3644times (Coro::State self)
3552 PPCODE: 3645 PPCODE:
3553{ 3646{
3554 struct coro *current = SvSTATE (coro_current); 3647 struct coro *current = SvSTATE (coro_current);
3555 3648
3556 if (expect_false (current == self)) 3649 if (ecb_expect_false (current == self))
3557 { 3650 {
3558 coro_times_update (); 3651 coro_times_update ();
3559 coro_times_add (SvSTATE (coro_current)); 3652 coro_times_add (SvSTATE (coro_current));
3560 } 3653 }
3561 3654
3562 EXTEND (SP, 2); 3655 EXTEND (SP, 2);
3563 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)));
3564 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)));
3565 3658
3566 if (expect_false (current == self)) 3659 if (ecb_expect_false (current == self))
3567 coro_times_sub (SvSTATE (coro_current)); 3660 coro_times_sub (SvSTATE (coro_current));
3568} 3661}
3569 3662
3570void 3663void
3571swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3664swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3644void 3737void
3645_destroy (Coro::State coro) 3738_destroy (Coro::State coro)
3646 CODE: 3739 CODE:
3647 /* used by the manager thread */ 3740 /* used by the manager thread */
3648 coro_state_destroy (aTHX_ coro); 3741 coro_state_destroy (aTHX_ coro);
3742
3743void
3744on_destroy (Coro::State coro, SV *cb)
3745 CODE:
3649 coro_call_on_destroy (aTHX_ coro); 3746 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3747
3748void
3749join (...)
3750 CODE:
3751 CORO_EXECUTE_SLF_XS (slf_init_join);
3650 3752
3651void 3753void
3652terminate (...) 3754terminate (...)
3653 CODE: 3755 CODE:
3654 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3756 CORO_EXECUTE_SLF_XS (slf_init_terminate);

Diff Legend

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