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.407 by root, Sat Jun 11 15:30:21 2011 UTC

12#include "perl.h" 12#include "perl.h"
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17#include "ecb.h"
17 18
19#include <stddef.h>
18#include <stdio.h> 20#include <stdio.h>
19#include <errno.h> 21#include <errno.h>
20#include <assert.h> 22#include <assert.h>
21 23
22#ifndef SVs_PADSTALE 24#ifndef SVs_PADSTALE
86# define STACKLEVEL ((void *)&stacklevel) 88# define STACKLEVEL ((void *)&stacklevel)
87#endif 89#endif
88 90
89#define IN_DESTRUCT PL_dirty 91#define IN_DESTRUCT PL_dirty
90 92
91#if __GNUC__ >= 3
92# define attribute(x) __attribute__(x)
93# define expect(expr,value) __builtin_expect ((expr), (value))
94# define INLINE static inline
95#else
96# define attribute(x)
97# define expect(expr,value) (expr)
98# define INLINE static
99#endif
100
101#define expect_false(expr) expect ((expr) != 0, 0)
102#define expect_true(expr) expect ((expr) != 0, 1)
103
104#define NOINLINE attribute ((noinline))
105
106#include "CoroAPI.h" 93#include "CoroAPI.h"
107#define GCoroAPI (&coroapi) /* very sneaky */ 94#define GCoroAPI (&coroapi) /* very sneaky */
108 95
109#ifdef USE_ITHREADS 96#ifdef USE_ITHREADS
110# if CORO_PTHREAD 97# if CORO_PTHREAD
111static void *coro_thx; 98static void *coro_thx;
112# endif 99# endif
113#endif 100#endif
101
102/* used in state.h */
103#define VAR(name,type) VARx(name, PL_ ## name, type)
114 104
115#ifdef __linux 105#ifdef __linux
116# include <time.h> /* for timespec */ 106# include <time.h> /* for timespec */
117# include <syscall.h> /* for SYS_* */ 107# include <syscall.h> /* for SYS_* */
118# ifdef SYS_clock_gettime 108# ifdef SYS_clock_gettime
166static char times_valid; 156static char times_valid;
167 157
168static struct coro_cctx *cctx_first; 158static struct coro_cctx *cctx_first;
169static int cctx_count, cctx_idle; 159static int cctx_count, cctx_idle;
170 160
171enum { 161enum
162{
172 CC_MAPPED = 0x01, 163 CC_MAPPED = 0x01,
173 CC_NOREUSE = 0x02, /* throw this away after tracing */ 164 CC_NOREUSE = 0x02, /* throw this away after tracing */
174 CC_TRACE = 0x04, 165 CC_TRACE = 0x04,
175 CC_TRACE_SUB = 0x08, /* trace sub calls */ 166 CC_TRACE_SUB = 0x08, /* trace sub calls */
176 CC_TRACE_LINE = 0x10, /* trace each statement */ 167 CC_TRACE_LINE = 0x10, /* trace each statement */
201 192
202static coro_cctx *cctx_current; /* the currently running cctx */ 193static coro_cctx *cctx_current; /* the currently running cctx */
203 194
204/*****************************************************************************/ 195/*****************************************************************************/
205 196
197static MGVTBL coro_state_vtbl;
198
206enum { 199enum
200{
207 CF_RUNNING = 0x0001, /* coroutine is running */ 201 CF_RUNNING = 0x0001, /* coroutine is running */
208 CF_READY = 0x0002, /* coroutine is ready */ 202 CF_READY = 0x0002, /* coroutine is ready */
209 CF_NEW = 0x0004, /* has never been switched to */ 203 CF_NEW = 0x0004, /* has never been switched to */
210 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 204 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 205 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */ 206 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
213}; 207};
214 208
215/* the structure where most of the perl state is stored, overlaid on the cxstack */ 209/* the structure where most of the perl state is stored, overlaid on the cxstack */
216typedef struct 210typedef struct
217{ 211{
218 SV *defsv;
219 AV *defav;
220 SV *errsv;
221 SV *irsgv;
222 HV *hinthv;
223#define VAR(name,type) type name; 212#define VARx(name,expr,type) type name;
224# include "state.h" 213# include "state.h"
225#undef VAR 214#undef VARx
226} perl_slots; 215} perl_slots;
227 216
217// 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)) 218#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
229 219
230/* this is a structure representing a perl-level coroutine */ 220/* this is a structure representing a perl-level coroutine */
231struct coro { 221struct coro
222{
232 /* the C coroutine allocated to this perl coroutine, if any */ 223 /* the C coroutine allocated to this perl coroutine, if any */
233 coro_cctx *cctx; 224 coro_cctx *cctx;
234 225
235 /* ready queue */ 226 /* ready queue */
236 struct coro *next_ready; 227 struct coro *next_ready;
238 /* state data */ 229 /* state data */
239 struct CoroSLF slf_frame; /* saved slf frame */ 230 struct CoroSLF slf_frame; /* saved slf frame */
240 AV *mainstack; 231 AV *mainstack;
241 perl_slots *slot; /* basically the saved sp */ 232 perl_slots *slot; /* basically the saved sp */
242 233
243 CV *startcv; /* the CV to execute */ 234 CV *startcv; /* the CV to execute */
244 AV *args; /* data associated with this coroutine (initial args) */ 235 AV *args; /* data associated with this coroutine (initial args) */
245 int refcnt; /* coroutines are refcounted, yes */
246 int flags; /* CF_ flags */ 236 int flags; /* CF_ flags */
247 HV *hv; /* the perl hash associated with this coro, if any */ 237 HV *hv; /* the perl hash associated with this coro, if any */
248 238
249 /* statistics */ 239 /* statistics */
250 int usecount; /* number of transfers to this coro */ 240 int usecount; /* number of transfers to this coro */
251 241
252 /* coro process data */ 242 /* coro process data */
253 int prio; 243 int prio;
254 SV *except; /* exception to be thrown */ 244 SV *except; /* exception to be thrown */
255 SV *rouse_cb; 245 SV *rouse_cb; /* last rouse callback */
246 AV *on_destroy; /* callbacks or coros to notify on destroy */
247 AV *status; /* the exit status list */
256 248
257 /* async_pool */ 249 /* async_pool */
258 SV *saved_deffh; 250 SV *saved_deffh;
259 SV *invoke_cb; 251 SV *invoke_cb;
260 AV *invoke_av; 252 AV *invoke_av;
296static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 288static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
297static CV *cv_coro_run; 289static CV *cv_coro_run;
298static struct coro *coro_first; 290static struct coro *coro_first;
299#define coro_nready coroapi.nready 291#define coro_nready coroapi.nready
300 292
293/** JIT *********************************************************************/
294
295#if CORO_JIT
296 #ifndef CORO_JIT_TYPE
297 #if __x86_64 && (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris)
298 #define CORO_JIT_TYPE "amd64-unix"
299 typedef void (*load_save_perl_slots_type)(perl_slots *);
300 #elif __i386 && (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris)
301 #define CORO_JIT_TYPE "x86-unix"
302 typedef void (*load_save_perl_slots_type)(perl_slots *);
303 #else
304 #undef CORO_JIT
305 #endif
306 #endif
307#endif
308
309#if CORO_JIT
310static load_save_perl_slots_type load_perl_slots, save_perl_slots;
311#endif
312
301/** Coro::Select ************************************************************/ 313/** Coro::Select ************************************************************/
302 314
303static OP *(*coro_old_pp_sselect) (pTHX); 315static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select; 316static SV *coro_select_select;
305 317
320 332
321/** time stuff **************************************************************/ 333/** time stuff **************************************************************/
322 334
323#ifdef HAS_GETTIMEOFDAY 335#ifdef HAS_GETTIMEOFDAY
324 336
325static void 337ECB_INLINE void
326coro_u2time (pTHX_ UV ret[2]) 338coro_u2time (pTHX_ UV ret[2])
327{ 339{
328 struct timeval tv; 340 struct timeval tv;
329 gettimeofday (&tv, 0); 341 gettimeofday (&tv, 0);
330 342
331 ret [0] = tv.tv_sec; 343 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec; 344 ret [1] = tv.tv_usec;
333} 345}
334 346
335static double 347ECB_INLINE double
336coro_nvtime () 348coro_nvtime ()
337{ 349{
338 struct timeval tv; 350 struct timeval tv;
339 gettimeofday (&tv, 0); 351 gettimeofday (&tv, 0);
340 352
341 return tv.tv_sec + tv.tv_usec * 1e-6; 353 return tv.tv_sec + tv.tv_usec * 1e-6;
342} 354}
343 355
344static void 356ECB_INLINE void
345time_init (pTHX) 357time_init (pTHX)
346{ 358{
347 nvtime = coro_nvtime; 359 nvtime = coro_nvtime;
348 u2time = coro_u2time; 360 u2time = coro_u2time;
349} 361}
350 362
351#else 363#else
352 364
353static void 365ECB_INLINE void
354time_init (pTHX) 366time_init (pTHX)
355{ 367{
356 SV **svp; 368 SV **svp;
357 369
358 require_pv ("Time/HiRes.pm"); 370 require_pv ("Time/HiRes.pm");
370 382
371#endif 383#endif
372 384
373/** lowlevel stuff **********************************************************/ 385/** lowlevel stuff **********************************************************/
374 386
375static SV * 387static SV * ecb_noinline
376coro_get_sv (pTHX_ const char *name, int create) 388coro_get_sv (pTHX_ const char *name, int create)
377{ 389{
378#if PERL_VERSION_ATLEAST (5,10,0) 390#if PERL_VERSION_ATLEAST (5,10,0)
379 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 391 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
380 get_sv (name, create); 392 get_sv (name, create);
381#endif 393#endif
382 return get_sv (name, create); 394 return get_sv (name, create);
383} 395}
384 396
385static AV * 397static AV * ecb_noinline
386coro_get_av (pTHX_ const char *name, int create) 398coro_get_av (pTHX_ const char *name, int create)
387{ 399{
388#if PERL_VERSION_ATLEAST (5,10,0) 400#if PERL_VERSION_ATLEAST (5,10,0)
389 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 401 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
390 get_av (name, create); 402 get_av (name, create);
391#endif 403#endif
392 return get_av (name, create); 404 return get_av (name, create);
393} 405}
394 406
395static HV * 407static HV * ecb_noinline
396coro_get_hv (pTHX_ const char *name, int create) 408coro_get_hv (pTHX_ const char *name, int create)
397{ 409{
398#if PERL_VERSION_ATLEAST (5,10,0) 410#if PERL_VERSION_ATLEAST (5,10,0)
399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 411 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
400 get_hv (name, create); 412 get_hv (name, create);
401#endif 413#endif
402 return get_hv (name, create); 414 return get_hv (name, create);
403} 415}
404 416
405INLINE void 417ECB_INLINE void
406coro_times_update () 418coro_times_update ()
407{ 419{
408#ifdef coro_clock_gettime 420#ifdef coro_clock_gettime
409 struct timespec ts; 421 struct timespec ts;
410 422
423 time_real [0] = tv [0]; 435 time_real [0] = tv [0];
424 time_real [1] = tv [1] * 1000; 436 time_real [1] = tv [1] * 1000;
425#endif 437#endif
426} 438}
427 439
428INLINE void 440ECB_INLINE void
429coro_times_add (struct coro *c) 441coro_times_add (struct coro *c)
430{ 442{
431 c->t_real [1] += time_real [1]; 443 c->t_real [1] += time_real [1];
432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 444 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
433 c->t_real [0] += time_real [0]; 445 c->t_real [0] += time_real [0];
435 c->t_cpu [1] += time_cpu [1]; 447 c->t_cpu [1] += time_cpu [1];
436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 448 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
437 c->t_cpu [0] += time_cpu [0]; 449 c->t_cpu [0] += time_cpu [0];
438} 450}
439 451
440INLINE void 452ECB_INLINE void
441coro_times_sub (struct coro *c) 453coro_times_sub (struct coro *c)
442{ 454{
443 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 455 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]; 456 c->t_real [1] -= time_real [1];
445 c->t_real [0] -= time_real [0]; 457 c->t_real [0] -= time_real [0];
453/* magic glue */ 465/* magic glue */
454 466
455#define CORO_MAGIC_type_cv 26 467#define CORO_MAGIC_type_cv 26
456#define CORO_MAGIC_type_state PERL_MAGIC_ext 468#define CORO_MAGIC_type_state PERL_MAGIC_ext
457 469
458#define CORO_MAGIC_NN(sv, type) \ 470#define CORO_MAGIC_NN(sv, type) \
459 (expect_true (SvMAGIC (sv)->mg_type == type) \ 471 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
460 ? SvMAGIC (sv) \ 472 ? SvMAGIC (sv) \
461 : mg_find (sv, type)) 473 : mg_find (sv, type))
462 474
463#define CORO_MAGIC(sv, type) \ 475#define CORO_MAGIC(sv, type) \
464 (expect_true (SvMAGIC (sv)) \ 476 (ecb_expect_true (SvMAGIC (sv)) \
465 ? CORO_MAGIC_NN (sv, type) \ 477 ? CORO_MAGIC_NN (sv, type) \
466 : 0) 478 : 0)
467 479
468#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 480#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) 481#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
470 482
483ECB_INLINE MAGIC *
484SvSTATEhv_p (pTHX_ SV *coro)
485{
486 MAGIC *mg;
487
488 if (ecb_expect_true (
489 SvTYPE (coro) == SVt_PVHV
490 && (mg = CORO_MAGIC_state (coro))
491 && mg->mg_virtual == &coro_state_vtbl
492 ))
493 return mg;
494
495 return 0;
496}
497
471INLINE struct coro * 498ECB_INLINE struct coro *
472SvSTATE_ (pTHX_ SV *coro) 499SvSTATE_ (pTHX_ SV *coro)
473{ 500{
474 HV *stash;
475 MAGIC *mg; 501 MAGIC *mg;
476 502
477 if (SvROK (coro)) 503 if (SvROK (coro))
478 coro = SvRV (coro); 504 coro = SvRV (coro);
479 505
480 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 506 mg = SvSTATEhv_p (aTHX_ coro);
507 if (!mg)
481 croak ("Coro::State object required"); 508 croak ("Coro::State object required");
482 509
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; 510 return (struct coro *)mg->mg_ptr;
493} 511}
494 512
495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 513#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
496 514
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 517#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500 518
501/*****************************************************************************/ 519/*****************************************************************************/
502/* padlist management and caching */ 520/* padlist management and caching */
503 521
504static AV * 522ECB_INLINE AV *
505coro_derive_padlist (pTHX_ CV *cv) 523coro_derive_padlist (pTHX_ CV *cv)
506{ 524{
507 AV *padlist = CvPADLIST (cv); 525 AV *padlist = CvPADLIST (cv);
508 AV *newpadlist, *newpad; 526 AV *newpadlist, *newpad;
509 527
521 av_store (newpadlist, 1, (SV *)newpad); 539 av_store (newpadlist, 1, (SV *)newpad);
522 540
523 return newpadlist; 541 return newpadlist;
524} 542}
525 543
526static void 544ECB_INLINE void
527free_padlist (pTHX_ AV *padlist) 545free_padlist (pTHX_ AV *padlist)
528{ 546{
529 /* may be during global destruction */ 547 /* may be during global destruction */
530 if (!IN_DESTRUCT) 548 if (!IN_DESTRUCT)
531 { 549 {
574 0, 0, 0, 0, 592 0, 0, 0, 0,
575 coro_cv_free 593 coro_cv_free
576}; 594};
577 595
578/* the next two functions merely cache the padlists */ 596/* the next two functions merely cache the padlists */
579static void 597ECB_INLINE void
580get_padlist (pTHX_ CV *cv) 598get_padlist (pTHX_ CV *cv)
581{ 599{
582 MAGIC *mg = CORO_MAGIC_cv (cv); 600 MAGIC *mg = CORO_MAGIC_cv (cv);
583 AV *av; 601 AV *av;
584 602
585 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 603 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 604 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
587 else 605 else
588 { 606 {
589#if CORO_PREFER_PERL_FUNCTIONS 607#if CORO_PREFER_PERL_FUNCTIONS
590 /* this is probably cleaner? but also slower! */ 608 /* this is probably cleaner? but also slower! */
597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 615 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
598#endif 616#endif
599 } 617 }
600} 618}
601 619
602static void 620ECB_INLINE void
603put_padlist (pTHX_ CV *cv) 621put_padlist (pTHX_ CV *cv)
604{ 622{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 623 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av; 624 AV *av;
607 625
608 if (expect_false (!mg)) 626 if (ecb_expect_false (!mg))
609 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 627 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
610 628
611 av = (AV *)mg->mg_obj; 629 av = (AV *)mg->mg_obj;
612 630
613 if (expect_false (AvFILLp (av) >= AvMAX (av))) 631 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
614 av_extend (av, AvFILLp (av) + 1); 632 av_extend (av, AvFILLp (av) + 1);
615 633
616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 634 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
617} 635}
618 636
663 } 681 }
664#endif 682#endif
665 } 683 }
666} 684}
667 685
668#define SWAP_SVS(coro) \ 686#define SWAP_SVS(coro) \
669 if (expect_false ((coro)->swap_sv)) \ 687 if (ecb_expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro)) 688 swap_svs (aTHX_ (coro))
671 689
672static void 690static void
673on_enterleave_call (pTHX_ SV *cb); 691on_enterleave_call (pTHX_ SV *cb);
674 692
678 perl_slots *slot = c->slot; 696 perl_slots *slot = c->slot;
679 c->slot = 0; 697 c->slot = 0;
680 698
681 PL_mainstack = c->mainstack; 699 PL_mainstack = c->mainstack;
682 700
683 GvSV (PL_defgv) = slot->defsv; 701#if CORO_JIT
684 GvAV (PL_defgv) = slot->defav; 702 load_perl_slots (slot);
685 GvSV (PL_errgv) = slot->errsv; 703#else
686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
688
689 #define VAR(name,type) PL_ ## name = slot->name; 704 #define VARx(name,expr,type) expr = slot->name;
690 # include "state.h" 705 # include "state.h"
691 #undef VAR 706 #undef VARx
707#endif
692 708
693 { 709 {
694 dSP; 710 dSP;
695 711
696 CV *cv; 712 CV *cv;
697 713
698 /* now do the ugly restore mess */ 714 /* now do the ugly restore mess */
699 while (expect_true (cv = (CV *)POPs)) 715 while (ecb_expect_true (cv = (CV *)POPs))
700 { 716 {
701 put_padlist (aTHX_ cv); /* mark this padlist as available */ 717 put_padlist (aTHX_ cv); /* mark this padlist as available */
702 CvDEPTH (cv) = PTR2IV (POPs); 718 CvDEPTH (cv) = PTR2IV (POPs);
703 CvPADLIST (cv) = (AV *)POPs; 719 CvPADLIST (cv) = (AV *)POPs;
704 } 720 }
707 } 723 }
708 724
709 slf_frame = c->slf_frame; 725 slf_frame = c->slf_frame;
710 CORO_THROW = c->except; 726 CORO_THROW = c->except;
711 727
712 if (expect_false (enable_times)) 728 if (ecb_expect_false (enable_times))
713 { 729 {
714 if (expect_false (!times_valid)) 730 if (ecb_expect_false (!times_valid))
715 coro_times_update (); 731 coro_times_update ();
716 732
717 coro_times_sub (c); 733 coro_times_sub (c);
718 } 734 }
719 735
720 if (expect_false (c->on_enter)) 736 if (ecb_expect_false (c->on_enter))
721 { 737 {
722 int i; 738 int i;
723 739
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 740 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 741 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
731static void 747static void
732save_perl (pTHX_ Coro__State c) 748save_perl (pTHX_ Coro__State c)
733{ 749{
734 SWAP_SVS (c); 750 SWAP_SVS (c);
735 751
736 if (expect_false (c->on_leave)) 752 if (ecb_expect_false (c->on_leave))
737 { 753 {
738 int i; 754 int i;
739 755
740 for (i = AvFILLp (c->on_leave); i >= 0; --i) 756 for (i = AvFILLp (c->on_leave); i >= 0; --i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 757 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 } 758 }
743 759
744 times_valid = 0; 760 times_valid = 0;
745 761
746 if (expect_false (enable_times)) 762 if (ecb_expect_false (enable_times))
747 { 763 {
748 coro_times_update (); times_valid = 1; 764 coro_times_update (); times_valid = 1;
749 coro_times_add (c); 765 coro_times_add (c);
750 } 766 }
751 767
765 781
766 XPUSHs (Nullsv); 782 XPUSHs (Nullsv);
767 /* this loop was inspired by pp_caller */ 783 /* this loop was inspired by pp_caller */
768 for (;;) 784 for (;;)
769 { 785 {
770 while (expect_true (cxix >= 0)) 786 while (ecb_expect_true (cxix >= 0))
771 { 787 {
772 PERL_CONTEXT *cx = &ccstk[cxix--]; 788 PERL_CONTEXT *cx = &ccstk[cxix--];
773 789
774 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 790 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
775 { 791 {
776 CV *cv = cx->blk_sub.cv; 792 CV *cv = cx->blk_sub.cv;
777 793
778 if (expect_true (CvDEPTH (cv))) 794 if (ecb_expect_true (CvDEPTH (cv)))
779 { 795 {
780 EXTEND (SP, 3); 796 EXTEND (SP, 3);
781 PUSHs ((SV *)CvPADLIST (cv)); 797 PUSHs ((SV *)CvPADLIST (cv));
782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 798 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
783 PUSHs ((SV *)cv); 799 PUSHs ((SV *)cv);
786 get_padlist (aTHX_ cv); 802 get_padlist (aTHX_ cv);
787 } 803 }
788 } 804 }
789 } 805 }
790 806
791 if (expect_true (top_si->si_type == PERLSI_MAIN)) 807 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
792 break; 808 break;
793 809
794 top_si = top_si->si_prev; 810 top_si = top_si->si_prev;
795 ccstk = top_si->si_cxstack; 811 ccstk = top_si->si_cxstack;
796 cxix = top_si->si_cxix; 812 cxix = top_si->si_cxix;
798 814
799 PUTBACK; 815 PUTBACK;
800 } 816 }
801 817
802 /* allocate some space on the context stack for our purposes */ 818 /* allocate some space on the context stack for our purposes */
803 /* we manually unroll here, as usually 2 slots is enough */ 819 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 { 820 {
808 unsigned int i; 821 unsigned int i;
822
809 for (i = 3; i < SLOT_COUNT; ++i) 823 for (i = 0; i < SLOT_COUNT; ++i)
810 CXINC; 824 CXINC;
811 } 825
812 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 826 cxstack_ix -= SLOT_COUNT; /* undo allocation */
827 }
813 828
814 c->mainstack = PL_mainstack; 829 c->mainstack = PL_mainstack;
815 830
816 { 831 {
817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 832 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
818 833
819 slot->defav = GvAV (PL_defgv); 834#if CORO_JIT
820 slot->defsv = DEFSV; 835 save_perl_slots (slot);
821 slot->errsv = ERRSV; 836#else
822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
824
825 #define VAR(name,type) slot->name = PL_ ## name; 837 #define VARx(name,expr,type) slot->name = expr;
826 # include "state.h" 838 # include "state.h"
827 #undef VAR 839 #undef VARx
840#endif
828 } 841 }
829} 842}
830 843
831/* 844/*
832 * allocate various perl stacks. This is almost an exact copy 845 * allocate various perl stacks. This is almost an exact copy
838# define coro_init_stacks(thx) init_stacks () 851# define coro_init_stacks(thx) init_stacks ()
839#else 852#else
840static void 853static void
841coro_init_stacks (pTHX) 854coro_init_stacks (pTHX)
842{ 855{
843 PL_curstackinfo = new_stackinfo(32, 8); 856 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; 857 PL_curstackinfo->si_type = PERLSI_MAIN;
845 PL_curstack = PL_curstackinfo->si_stack; 858 PL_curstack = PL_curstackinfo->si_stack;
846 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 859 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
847 860
848 PL_stack_base = AvARRAY(PL_curstack); 861 PL_stack_base = AvARRAY(PL_curstack);
955#endif 968#endif
956 969
957/* 970/*
958 * This overrides the default magic get method of %SIG elements. 971 * 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 972 * 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 973 * and instead of trying to save and restore the hash elements (extremely slow),
961 * readback here. 974 * we just provide our own readback here.
962 */ 975 */
963static int 976static int ecb_cold
964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 977coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
965{ 978{
966 const char *s = MgPV_nolen_const (mg); 979 const char *s = MgPV_nolen_const (mg);
967 980
968 if (*s == '_') 981 if (*s == '_')
980 } 993 }
981 994
982 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 995 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
983} 996}
984 997
985static int 998static int ecb_cold
986coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 999coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
987{ 1000{
988 const char *s = MgPV_nolen_const (mg); 1001 const char *s = MgPV_nolen_const (mg);
989 1002
990 if (*s == '_') 1003 if (*s == '_')
1004 } 1017 }
1005 1018
1006 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1019 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1007} 1020}
1008 1021
1009static int 1022static int ecb_cold
1010coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1023coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1011{ 1024{
1012 const char *s = MgPV_nolen_const (mg); 1025 const char *s = MgPV_nolen_const (mg);
1013 1026
1014 if (*s == '_') 1027 if (*s == '_')
1049 return 1; 1062 return 1;
1050} 1063}
1051 1064
1052static UNOP init_perl_op; 1065static UNOP init_perl_op;
1053 1066
1054static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1067ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1055init_perl (pTHX_ struct coro *coro) 1068init_perl (pTHX_ struct coro *coro)
1056{ 1069{
1057 /* 1070 /*
1058 * emulate part of the perl startup here. 1071 * emulate part of the perl startup here.
1059 */ 1072 */
1074 PL_parser = 0; 1087 PL_parser = 0;
1075#endif 1088#endif
1076 PL_hints = 0; 1089 PL_hints = 0;
1077 1090
1078 /* recreate the die/warn hooks */ 1091 /* recreate the die/warn hooks */
1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1092 PL_diehook = SvREFCNT_inc (rv_diehook);
1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1093 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1081 1094
1082 GvSV (PL_defgv) = newSV (0); 1095 GvSV (PL_defgv) = newSV (0);
1083 GvAV (PL_defgv) = coro->args; coro->args = 0; 1096 GvAV (PL_defgv) = coro->args; coro->args = 0;
1084 GvSV (PL_errgv) = newSV (0); 1097 GvSV (PL_errgv) = newSV (0);
1085 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1098 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 1119 /* 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. 1120 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1108 */ 1121 */
1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1122 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 */ 1123 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1124 slf_frame.destroy = 0;
1111 1125
1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1126 /* 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; 1127 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1128 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1129 init_perl_op.op_ppaddr = pp_slf;
1120 /* copy throw, in case it was set before init_perl */ 1134 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1135 CORO_THROW = coro->except;
1122 1136
1123 SWAP_SVS (coro); 1137 SWAP_SVS (coro);
1124 1138
1125 if (expect_false (enable_times)) 1139 if (ecb_expect_false (enable_times))
1126 { 1140 {
1127 coro_times_update (); 1141 coro_times_update ();
1128 coro_times_sub (coro); 1142 coro_times_sub (coro);
1129 } 1143 }
1130} 1144}
1167 SvRV_set (coro_current, (SV *)coro->hv); 1181 SvRV_set (coro_current, (SV *)coro->hv);
1168 1182
1169 load_perl (aTHX_ coro); 1183 load_perl (aTHX_ coro);
1170 1184
1171 coro_unwind_stacks (aTHX); 1185 coro_unwind_stacks (aTHX);
1172 coro_destruct_stacks (aTHX);
1173 1186
1174 /* restore swapped sv's */ 1187 /* restore swapped sv's */
1175 SWAP_SVS (coro); 1188 SWAP_SVS (coro);
1189
1190 coro_destruct_stacks (aTHX);
1176 1191
1177 // now save some sv's to be free'd later 1192 // now save some sv's to be free'd later
1178 svf [0] = GvSV (PL_defgv); 1193 svf [0] = GvSV (PL_defgv);
1179 svf [1] = (SV *)GvAV (PL_defgv); 1194 svf [1] = (SV *)GvAV (PL_defgv);
1180 svf [2] = GvSV (PL_errgv); 1195 svf [2] = GvSV (PL_errgv);
1202 SvREFCNT_dec (coro->invoke_cb); 1217 SvREFCNT_dec (coro->invoke_cb);
1203 SvREFCNT_dec (coro->invoke_av); 1218 SvREFCNT_dec (coro->invoke_av);
1204 } 1219 }
1205} 1220}
1206 1221
1207INLINE void 1222ECB_INLINE void
1208free_coro_mortal (pTHX) 1223free_coro_mortal (pTHX)
1209{ 1224{
1210 if (expect_true (coro_mortal)) 1225 if (ecb_expect_true (coro_mortal))
1211 { 1226 {
1212 SvREFCNT_dec (coro_mortal); 1227 SvREFCNT_dec ((SV *)coro_mortal);
1213 coro_mortal = 0; 1228 coro_mortal = 0;
1214 } 1229 }
1215} 1230}
1216 1231
1217static int 1232static int
1350 1365
1351 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1366 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1352} 1367}
1353 1368
1354/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1369/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1355static void NOINLINE 1370static void ecb_noinline
1356cctx_prepare (pTHX) 1371cctx_prepare (pTHX)
1357{ 1372{
1358 PL_top_env = &PL_start_env; 1373 PL_top_env = &PL_start_env;
1359 1374
1360 if (cctx_current->flags & CC_TRACE) 1375 if (cctx_current->flags & CC_TRACE)
1371 slf_frame.prepare = slf_prepare_set_stacklevel; 1386 slf_frame.prepare = slf_prepare_set_stacklevel;
1372 slf_frame.check = slf_check_set_stacklevel; 1387 slf_frame.check = slf_check_set_stacklevel;
1373} 1388}
1374 1389
1375/* the tail of transfer: execute stuff we can only do after a transfer */ 1390/* the tail of transfer: execute stuff we can only do after a transfer */
1376INLINE void 1391ECB_INLINE void
1377transfer_tail (pTHX) 1392transfer_tail (pTHX)
1378{ 1393{
1379 free_coro_mortal (aTHX); 1394 free_coro_mortal (aTHX);
1380} 1395}
1381 1396
1533#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1548#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1534 1549
1535static coro_cctx * 1550static coro_cctx *
1536cctx_get (pTHX) 1551cctx_get (pTHX)
1537{ 1552{
1538 while (expect_true (cctx_first)) 1553 while (ecb_expect_true (cctx_first))
1539 { 1554 {
1540 coro_cctx *cctx = cctx_first; 1555 coro_cctx *cctx = cctx_first;
1541 cctx_first = cctx->next; 1556 cctx_first = cctx->next;
1542 --cctx_idle; 1557 --cctx_idle;
1543 1558
1544 if (expect_true (!CCTX_EXPIRED (cctx))) 1559 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1545 return cctx; 1560 return cctx;
1546 1561
1547 cctx_destroy (cctx); 1562 cctx_destroy (cctx);
1548 } 1563 }
1549 1564
1554cctx_put (coro_cctx *cctx) 1569cctx_put (coro_cctx *cctx)
1555{ 1570{
1556 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1571 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1557 1572
1558 /* free another cctx if overlimit */ 1573 /* free another cctx if overlimit */
1559 if (expect_false (cctx_idle >= cctx_max_idle)) 1574 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1560 { 1575 {
1561 coro_cctx *first = cctx_first; 1576 coro_cctx *first = cctx_first;
1562 cctx_first = first->next; 1577 cctx_first = first->next;
1563 --cctx_idle; 1578 --cctx_idle;
1564 1579
1575static void 1590static void
1576transfer_check (pTHX_ struct coro *prev, struct coro *next) 1591transfer_check (pTHX_ struct coro *prev, struct coro *next)
1577{ 1592{
1578 /* TODO: throwing up here is considered harmful */ 1593 /* TODO: throwing up here is considered harmful */
1579 1594
1580 if (expect_true (prev != next)) 1595 if (ecb_expect_true (prev != next))
1581 { 1596 {
1582 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1597 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,"); 1598 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1584 1599
1585 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1600 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,"); 1601 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1587 1602
1588#if !PERL_VERSION_ATLEAST (5,10,0) 1603#if !PERL_VERSION_ATLEAST (5,10,0)
1589 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1604 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,"); 1605 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1591#endif 1606#endif
1592 } 1607 }
1593} 1608}
1594 1609
1595/* always use the TRANSFER macro */ 1610/* always use the TRANSFER macro */
1596static void NOINLINE /* noinline so we have a fixed stackframe */ 1611static void ecb_noinline /* noinline so we have a fixed stackframe */
1597transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1612transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1598{ 1613{
1599 dSTACKLEVEL; 1614 dSTACKLEVEL;
1600 1615
1601 /* sometimes transfer is only called to set idle_sp */ 1616 /* sometimes transfer is only called to set idle_sp */
1602 if (expect_false (!prev)) 1617 if (ecb_expect_false (!prev))
1603 { 1618 {
1604 cctx_current->idle_sp = STACKLEVEL; 1619 cctx_current->idle_sp = STACKLEVEL;
1605 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1620 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1606 } 1621 }
1607 else if (expect_true (prev != next)) 1622 else if (ecb_expect_true (prev != next))
1608 { 1623 {
1609 coro_cctx *cctx_prev; 1624 coro_cctx *cctx_prev;
1610 1625
1611 if (expect_false (prev->flags & CF_NEW)) 1626 if (ecb_expect_false (prev->flags & CF_NEW))
1612 { 1627 {
1613 /* create a new empty/source context */ 1628 /* create a new empty/source context */
1614 prev->flags &= ~CF_NEW; 1629 prev->flags &= ~CF_NEW;
1615 prev->flags |= CF_RUNNING; 1630 prev->flags |= CF_RUNNING;
1616 } 1631 }
1619 next->flags |= CF_RUNNING; 1634 next->flags |= CF_RUNNING;
1620 1635
1621 /* first get rid of the old state */ 1636 /* first get rid of the old state */
1622 save_perl (aTHX_ prev); 1637 save_perl (aTHX_ prev);
1623 1638
1624 if (expect_false (next->flags & CF_NEW)) 1639 if (ecb_expect_false (next->flags & CF_NEW))
1625 { 1640 {
1626 /* need to start coroutine */ 1641 /* need to start coroutine */
1627 next->flags &= ~CF_NEW; 1642 next->flags &= ~CF_NEW;
1628 /* setup coroutine call */ 1643 /* setup coroutine call */
1629 init_perl (aTHX_ next); 1644 init_perl (aTHX_ next);
1630 } 1645 }
1631 else 1646 else
1632 load_perl (aTHX_ next); 1647 load_perl (aTHX_ next);
1633 1648
1634 /* possibly untie and reuse the cctx */ 1649 /* possibly untie and reuse the cctx */
1635 if (expect_true ( 1650 if (ecb_expect_true (
1636 cctx_current->idle_sp == STACKLEVEL 1651 cctx_current->idle_sp == STACKLEVEL
1637 && !(cctx_current->flags & CC_TRACE) 1652 && !(cctx_current->flags & CC_TRACE)
1638 && !force_cctx 1653 && !force_cctx
1639 )) 1654 ))
1640 { 1655 {
1641 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1656 /* 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)); 1657 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1643 1658
1644 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1659 /* 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 */ 1660 /* without this the next cctx_get might destroy the running cctx while still in use */
1646 if (expect_false (CCTX_EXPIRED (cctx_current))) 1661 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1647 if (expect_true (!next->cctx)) 1662 if (ecb_expect_true (!next->cctx))
1648 next->cctx = cctx_get (aTHX); 1663 next->cctx = cctx_get (aTHX);
1649 1664
1650 cctx_put (cctx_current); 1665 cctx_put (cctx_current);
1651 } 1666 }
1652 else 1667 else
1653 prev->cctx = cctx_current; 1668 prev->cctx = cctx_current;
1654 1669
1655 ++next->usecount; 1670 ++next->usecount;
1656 1671
1657 cctx_prev = cctx_current; 1672 cctx_prev = cctx_current;
1658 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1673 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1659 1674
1660 next->cctx = 0; 1675 next->cctx = 0;
1661 1676
1662 if (expect_false (cctx_prev != cctx_current)) 1677 if (ecb_expect_false (cctx_prev != cctx_current))
1663 { 1678 {
1664 cctx_prev->top_env = PL_top_env; 1679 cctx_prev->top_env = PL_top_env;
1665 PL_top_env = cctx_current->top_env; 1680 PL_top_env = cctx_current->top_env;
1666 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1681 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1667 } 1682 }
1673#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1688#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) 1689#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1675 1690
1676/** high level stuff ********************************************************/ 1691/** high level stuff ********************************************************/
1677 1692
1693/* this function is actually Coro, not Coro::State, but we call it from here */
1694/* because it is convenient - but it hasn't been declared yet for that reason */
1695static void
1696coro_call_on_destroy (pTHX_ struct coro *coro);
1697
1678static void 1698static void
1679coro_state_destroy (pTHX_ struct coro *coro) 1699coro_state_destroy (pTHX_ struct coro *coro)
1680{ 1700{
1681 if (coro->flags & CF_DESTROYED) 1701 if (coro->flags & CF_ZOMBIE)
1682 return; 1702 return;
1683 1703
1684 slf_destroy (aTHX_ coro); 1704 slf_destroy (aTHX_ coro);
1685 1705
1686 coro->flags |= CF_DESTROYED; 1706 coro->flags |= CF_ZOMBIE;
1687 1707
1688 if (coro->flags & CF_READY) 1708 if (coro->flags & CF_READY)
1689 { 1709 {
1690 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1710 /* reduce nready, as destroying a ready coro effectively unreadies it */
1691 /* alternative: look through all ready queues and remove the coro */ 1711 /* alternative: look through all ready queues and remove the coro */
1692 --coro_nready; 1712 --coro_nready;
1693 } 1713 }
1694 else 1714 else
1695 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1715 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1716
1717 if (coro->next) coro->next->prev = coro->prev;
1718 if (coro->prev) coro->prev->next = coro->next;
1719 if (coro == coro_first) coro_first = coro->next;
1696 1720
1697 if (coro->mainstack 1721 if (coro->mainstack
1698 && coro->mainstack != main_mainstack 1722 && coro->mainstack != main_mainstack
1699 && coro->slot 1723 && coro->slot
1700 && !PL_dirty) 1724 && !PL_dirty)
1701 destroy_perl (aTHX_ coro); 1725 destroy_perl (aTHX_ coro);
1702 1726
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); 1727 cctx_destroy (coro->cctx);
1708 SvREFCNT_dec (coro->startcv); 1728 SvREFCNT_dec (coro->startcv);
1709 SvREFCNT_dec (coro->args); 1729 SvREFCNT_dec (coro->args);
1710 SvREFCNT_dec (coro->swap_sv); 1730 SvREFCNT_dec (coro->swap_sv);
1711 SvREFCNT_dec (CORO_THROW); 1731 SvREFCNT_dec (CORO_THROW);
1732
1733 coro_call_on_destroy (aTHX_ coro);
1734
1735 /* more destruction mayhem in coro_state_free */
1712} 1736}
1713 1737
1714static int 1738static int
1715coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1739coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1716{ 1740{
1717 struct coro *coro = (struct coro *)mg->mg_ptr; 1741 struct coro *coro = (struct coro *)mg->mg_ptr;
1718 mg->mg_ptr = 0; 1742 mg->mg_ptr = 0;
1719 1743
1720 coro->hv = 0;
1721
1722 if (--coro->refcnt < 0)
1723 {
1724 coro_state_destroy (aTHX_ coro); 1744 coro_state_destroy (aTHX_ coro);
1745 SvREFCNT_dec (coro->on_destroy);
1746 SvREFCNT_dec (coro->status);
1747
1725 Safefree (coro); 1748 Safefree (coro);
1726 }
1727 1749
1728 return 0; 1750 return 0;
1729} 1751}
1730 1752
1731static int 1753static int ecb_cold
1732coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1754coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1733{ 1755{
1734 struct coro *coro = (struct coro *)mg->mg_ptr; 1756 /* called when perl clones the current process the slow way (windows process emulation) */
1735 1757 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1736 ++coro->refcnt; 1758 mg->mg_ptr = 0;
1759 mg->mg_virtual = 0;
1737 1760
1738 return 0; 1761 return 0;
1739} 1762}
1740 1763
1741static MGVTBL coro_state_vtbl = { 1764static MGVTBL coro_state_vtbl = {
1766 TRANSFER (ta, 1); 1789 TRANSFER (ta, 1);
1767} 1790}
1768 1791
1769/** Coro ********************************************************************/ 1792/** Coro ********************************************************************/
1770 1793
1771INLINE void 1794ECB_INLINE void
1772coro_enq (pTHX_ struct coro *coro) 1795coro_enq (pTHX_ struct coro *coro)
1773{ 1796{
1774 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1797 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1775 1798
1776 SvREFCNT_inc_NN (coro->hv); 1799 SvREFCNT_inc_NN (coro->hv);
1778 coro->next_ready = 0; 1801 coro->next_ready = 0;
1779 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1802 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1780 ready [1] = coro; 1803 ready [1] = coro;
1781} 1804}
1782 1805
1783INLINE struct coro * 1806ECB_INLINE struct coro *
1784coro_deq (pTHX) 1807coro_deq (pTHX)
1785{ 1808{
1786 int prio; 1809 int prio;
1787 1810
1788 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1811 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1841{ 1864{
1842 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1865 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1843} 1866}
1844 1867
1845/* expects to own a reference to next->hv */ 1868/* expects to own a reference to next->hv */
1846INLINE void 1869ECB_INLINE void
1847prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1870prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1848{ 1871{
1849 SV *prev_sv = SvRV (coro_current); 1872 SV *prev_sv = SvRV (coro_current);
1850 1873
1851 ta->prev = SvSTATE_hv (prev_sv); 1874 ta->prev = SvSTATE_hv (prev_sv);
1864{ 1887{
1865 for (;;) 1888 for (;;)
1866 { 1889 {
1867 struct coro *next = coro_deq (aTHX); 1890 struct coro *next = coro_deq (aTHX);
1868 1891
1869 if (expect_true (next)) 1892 if (ecb_expect_true (next))
1870 { 1893 {
1871 /* cannot transfer to destroyed coros, skip and look for next */ 1894 /* cannot transfer to destroyed coros, skip and look for next */
1872 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1895 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 */ 1896 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1874 else 1897 else
1875 { 1898 {
1876 next->flags &= ~CF_READY; 1899 next->flags &= ~CF_READY;
1877 --coro_nready; 1900 --coro_nready;
1910 } 1933 }
1911 } 1934 }
1912 } 1935 }
1913} 1936}
1914 1937
1915INLINE void 1938ECB_INLINE void
1916prepare_cede (pTHX_ struct coro_transfer_args *ta) 1939prepare_cede (pTHX_ struct coro_transfer_args *ta)
1917{ 1940{
1918 api_ready (aTHX_ coro_current); 1941 api_ready (aTHX_ coro_current);
1919 prepare_schedule (aTHX_ ta); 1942 prepare_schedule (aTHX_ ta);
1920} 1943}
1921 1944
1922INLINE void 1945ECB_INLINE void
1923prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1946prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1924{ 1947{
1925 SV *prev = SvRV (coro_current); 1948 SV *prev = SvRV (coro_current);
1926 1949
1927 if (coro_nready) 1950 if (coro_nready)
1957{ 1980{
1958 struct coro_transfer_args ta; 1981 struct coro_transfer_args ta;
1959 1982
1960 prepare_cede (aTHX_ &ta); 1983 prepare_cede (aTHX_ &ta);
1961 1984
1962 if (expect_true (ta.prev != ta.next)) 1985 if (ecb_expect_true (ta.prev != ta.next))
1963 { 1986 {
1964 TRANSFER (ta, 1); 1987 TRANSFER (ta, 1);
1965 return 1; 1988 return 1;
1966 } 1989 }
1967 else 1990 else
2010 coro->slot->runops = RUNOPS_DEFAULT; 2033 coro->slot->runops = RUNOPS_DEFAULT;
2011 } 2034 }
2012} 2035}
2013 2036
2014static void 2037static void
2038coro_push_av (pTHX_ AV *av, I32 gimme_v)
2039{
2040 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2041 {
2042 dSP;
2043
2044 if (gimme_v == G_SCALAR)
2045 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2046 else
2047 {
2048 int i;
2049 EXTEND (SP, AvFILLp (av) + 1);
2050
2051 for (i = 0; i <= AvFILLp (av); ++i)
2052 PUSHs (AvARRAY (av)[i]);
2053 }
2054
2055 PUTBACK;
2056 }
2057}
2058
2059static void
2060coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2061{
2062 if (!coro->on_destroy)
2063 coro->on_destroy = newAV ();
2064
2065 av_push (coro->on_destroy, cb);
2066}
2067
2068static void
2069slf_destroy_join (pTHX_ struct CoroSLF *frame)
2070{
2071 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2072}
2073
2074static int
2075slf_check_join (pTHX_ struct CoroSLF *frame)
2076{
2077 struct coro *coro = (struct coro *)frame->data;
2078
2079 if (!coro->status)
2080 return 1;
2081
2082 frame->destroy = 0;
2083
2084 coro_push_av (aTHX_ coro->status, GIMME_V);
2085
2086 SvREFCNT_dec ((SV *)coro->hv);
2087
2088 return 0;
2089}
2090
2091static void
2092slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2093{
2094 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2095
2096 if (items > 1)
2097 croak ("join called with too many arguments");
2098
2099 if (coro->status)
2100 frame->prepare = prepare_nop;
2101 else
2102 {
2103 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2104 frame->prepare = prepare_schedule;
2105 }
2106
2107 frame->check = slf_check_join;
2108 frame->destroy = slf_destroy_join;
2109 frame->data = (void *)coro;
2110 SvREFCNT_inc (coro->hv);
2111}
2112
2113static void
2015coro_call_on_destroy (pTHX_ struct coro *coro) 2114coro_call_on_destroy (pTHX_ struct coro *coro)
2016{ 2115{
2017 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2116 AV *od = coro->on_destroy;
2018 2117
2019 if (on_destroyp) 2118 if (!od)
2020 { 2119 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 2120
2025 while (AvFILLp (on_destroy) >= 0) 2121 while (AvFILLp (od) >= 0)
2122 {
2123 SV *cb = sv_2mortal (av_pop (od));
2124
2125 /* coro hv's (and only hv's at the moment) are supported as well */
2126 if (SvSTATEhv_p (aTHX_ cb))
2127 api_ready (aTHX_ cb);
2128 else
2026 { 2129 {
2027 dSP; /* don't disturb outer sp */ 2130 dSP; /* don't disturb outer sp */
2028 SV *cb = av_pop (on_destroy);
2029
2030 PUSHMARK (SP); 2131 PUSHMARK (SP);
2031 2132
2032 if (statusp) 2133 if (coro->status)
2033 { 2134 {
2034 int i; 2135 PUTBACK;
2035 EXTEND (SP, AvFILLp (status) + 1); 2136 coro_push_av (aTHX_ coro->status, G_ARRAY);
2036 2137 SPAGAIN;
2037 for (i = 0; i <= AvFILLp (status); ++i)
2038 PUSHs (AvARRAY (status)[i]);
2039 } 2138 }
2040 2139
2041 PUTBACK; 2140 PUTBACK;
2042 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2141 call_sv (cb, G_VOID | G_DISCARD);
2043 } 2142 }
2044 } 2143 }
2045} 2144}
2046 2145
2047static void 2146static void
2048coro_set_status (HV *coro_hv, SV **arg, int items) 2147coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2049{ 2148{
2050 AV *av = newAV (); 2149 AV *av;
2150
2151 if (coro->status)
2152 {
2153 av = coro->status;
2154 av_clear (av);
2155 }
2156 else
2157 av = coro->status = newAV ();
2051 2158
2052 /* items are actually not so common, so optimise for this case */ 2159 /* items are actually not so common, so optimise for this case */
2053 if (items) 2160 if (items)
2054 { 2161 {
2055 int i; 2162 int i;
2057 av_extend (av, items - 1); 2164 av_extend (av, items - 1);
2058 2165
2059 for (i = 0; i < items; ++i) 2166 for (i = 0; i < items; ++i)
2060 av_push (av, SvREFCNT_inc_NN (arg [i])); 2167 av_push (av, SvREFCNT_inc_NN (arg [i]));
2061 } 2168 }
2062
2063 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2064} 2169}
2065 2170
2066static void 2171static void
2067slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2172slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2068{ 2173{
2080static void 2185static void
2081slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2186slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2082{ 2187{
2083 HV *coro_hv = (HV *)SvRV (coro_current); 2188 HV *coro_hv = (HV *)SvRV (coro_current);
2084 2189
2085 coro_set_status (coro_hv, arg, items); 2190 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2086 slf_init_terminate_cancel_common (frame, coro_hv); 2191 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2087} 2192}
2088 2193
2089static void 2194static void
2090slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2195slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2091{ 2196{
2096 croak ("Coro::cancel called without coro object,"); 2201 croak ("Coro::cancel called without coro object,");
2097 2202
2098 coro = SvSTATE (arg [0]); 2203 coro = SvSTATE (arg [0]);
2099 coro_hv = coro->hv; 2204 coro_hv = coro->hv;
2100 2205
2101 coro_set_status (coro_hv, arg + 1, items - 1); 2206 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2102 2207
2103 if (expect_false (coro->flags & CF_NOCANCEL)) 2208 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2104 { 2209 {
2105 /* coro currently busy cancelling something, so just notify it */ 2210 /* coro currently busy cancelling something, so just notify it */
2106 coro->slf_frame.data = (void *)coro; 2211 coro->slf_frame.data = (void *)coro;
2107 2212
2108 frame->prepare = prepare_nop; 2213 frame->prepare = prepare_nop;
2109 frame->check = slf_check_nop; 2214 frame->check = slf_check_nop;
2110 } 2215 }
2111 else if (coro_hv == (HV *)SvRV (coro_current)) 2216 else if (coro_hv == (HV *)SvRV (coro_current))
2112 { 2217 {
2113 /* cancelling the current coro is allowed, and equals terminate */ 2218 /* cancelling the current coro is allowed, and equals terminate */
2114 slf_init_terminate_cancel_common (frame, coro_hv); 2219 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2115 } 2220 }
2116 else 2221 else
2117 { 2222 {
2118 struct coro *self = SvSTATE_current; 2223 struct coro *self = SvSTATE_current;
2119 2224
2123 * this is ugly, and hopefully fully worth the extra speed. 2228 * this is ugly, and hopefully fully worth the extra speed.
2124 * besides, I can't get the slow-but-safe version working... 2229 * besides, I can't get the slow-but-safe version working...
2125 */ 2230 */
2126 slf_frame.data = 0; 2231 slf_frame.data = 0;
2127 self->flags |= CF_NOCANCEL; 2232 self->flags |= CF_NOCANCEL;
2128
2129 coro_state_destroy (aTHX_ coro); 2233 coro_state_destroy (aTHX_ coro);
2130 coro_call_on_destroy (aTHX_ coro);
2131
2132 self->flags &= ~CF_NOCANCEL; 2234 self->flags &= ~CF_NOCANCEL;
2133 2235
2134 if (slf_frame.data) 2236 if (slf_frame.data)
2135 { 2237 {
2136 /* while we were busy we have been cancelled, so terminate */ 2238 /* while we were busy we have been cancelled, so terminate */
2137 slf_init_terminate_cancel_common (frame, self->hv); 2239 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2138 } 2240 }
2139 else 2241 else
2140 { 2242 {
2141 frame->prepare = prepare_nop; 2243 frame->prepare = prepare_nop;
2142 frame->check = slf_check_nop; 2244 frame->check = slf_check_nop;
2146 2248
2147static int 2249static int
2148slf_check_safe_cancel (pTHX_ struct CoroSLF *frame) 2250slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2149{ 2251{
2150 frame->prepare = 0; 2252 frame->prepare = 0;
2151 coro_unwind_stacks (); 2253 coro_unwind_stacks (aTHX);
2152 2254
2153 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current)); 2255 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2154 2256
2155 return 1; 2257 return 1;
2156} 2258}
2161 if (coro->cctx) 2263 if (coro->cctx)
2162 croak ("coro inside C callback, unable to cancel at this time, caught"); 2264 croak ("coro inside C callback, unable to cancel at this time, caught");
2163 2265
2164 if (coro->flags & CF_NEW) 2266 if (coro->flags & CF_NEW)
2165 { 2267 {
2166 coro_set_status (coro->hv, arg, items); 2268 coro_set_status (aTHX_ coro, arg, items);
2167 coro_state_destroy (aTHX_ coro); 2269 coro_state_destroy (aTHX_ coro);
2168 coro_call_on_destroy (aTHX_ coro);
2169 } 2270 }
2170 else 2271 else
2171 { 2272 {
2172 if (!coro->slf_frame.prepare) 2273 if (!coro->slf_frame.prepare)
2173 croak ("coro outside an SLF function, unable to cancel at this time, caught"); 2274 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2174 2275
2175 slf_destroy (coro); 2276 slf_destroy (aTHX_ coro);
2176 2277
2177 coro_set_status (coro->hv, arg, items); 2278 coro_set_status (aTHX_ coro, arg, items);
2178 coro->slf_frame.prepare = prepare_nop; 2279 coro->slf_frame.prepare = prepare_nop;
2179 coro->slf_frame.check = slf_check_safe_cancel; 2280 coro->slf_frame.check = slf_check_safe_cancel;
2180 2281
2181 api_ready (aTHX_ coro->hv); 2282 api_ready (aTHX_ (SV *)coro->hv);
2182 } 2283 }
2183 2284
2184 return 1; 2285 return 1;
2185} 2286}
2186 2287
2220slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2321slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2221{ 2322{
2222 HV *hv = (HV *)SvRV (coro_current); 2323 HV *hv = (HV *)SvRV (coro_current);
2223 struct coro *coro = SvSTATE_hv ((SV *)hv); 2324 struct coro *coro = SvSTATE_hv ((SV *)hv);
2224 2325
2225 if (expect_true (coro->saved_deffh)) 2326 if (ecb_expect_true (coro->saved_deffh))
2226 { 2327 {
2227 /* subsequent iteration */ 2328 /* subsequent iteration */
2228 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2329 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2229 coro->saved_deffh = 0; 2330 coro->saved_deffh = 0;
2230 2331
2471static void 2572static void
2472slf_destroy (pTHX_ struct coro *coro) 2573slf_destroy (pTHX_ struct coro *coro)
2473{ 2574{
2474 /* this callback is reserved for slf functions needing to do cleanup */ 2575 /* this callback is reserved for slf functions needing to do cleanup */
2475 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty) 2576 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2476 coro->slf_frame.destroy (aTHX_ coro); 2577 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2477 2578
2478 /* 2579 /*
2479 * The on_destroy above most likely is from an SLF call. 2580 * The on_destroy above most likely is from an SLF call.
2480 * Since by definition the SLF call will not finish when we destroy 2581 * Since by definition the SLF call will not finish when we destroy
2481 * the coro, we will have to force-finish it here, otherwise 2582 * the coro, we will have to force-finish it here, otherwise
2496 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2597 I32 checkmark; /* mark SP to see how many elements check has pushed */
2497 2598
2498 /* set up the slf frame, unless it has already been set-up */ 2599 /* set up the slf frame, unless it has already been set-up */
2499 /* the latter happens when a new coro has been started */ 2600 /* the latter happens when a new coro has been started */
2500 /* or when a new cctx was attached to an existing coroutine */ 2601 /* or when a new cctx was attached to an existing coroutine */
2501 if (expect_true (!slf_frame.prepare)) 2602 if (ecb_expect_true (!slf_frame.prepare))
2502 { 2603 {
2503 /* first iteration */ 2604 /* first iteration */
2504 dSP; 2605 dSP;
2505 SV **arg = PL_stack_base + TOPMARK + 1; 2606 SV **arg = PL_stack_base + TOPMARK + 1;
2506 int items = SP - arg; /* args without function object */ 2607 int items = SP - arg; /* args without function object */
2547 while (slf_frame.check (aTHX_ &slf_frame)); 2648 while (slf_frame.check (aTHX_ &slf_frame));
2548 2649
2549 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2650 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2550 2651
2551 /* exception handling */ 2652 /* exception handling */
2552 if (expect_false (CORO_THROW)) 2653 if (ecb_expect_false (CORO_THROW))
2553 { 2654 {
2554 SV *exception = sv_2mortal (CORO_THROW); 2655 SV *exception = sv_2mortal (CORO_THROW);
2555 2656
2556 CORO_THROW = 0; 2657 CORO_THROW = 0;
2557 sv_setsv (ERRSV, exception); 2658 sv_setsv (ERRSV, exception);
2558 croak (0); 2659 croak (0);
2559 } 2660 }
2560 2661
2561 /* return value handling - mostly like entersub */ 2662 /* return value handling - mostly like entersub */
2562 /* make sure we put something on the stack in scalar context */ 2663 /* make sure we put something on the stack in scalar context */
2563 if (GIMME_V == G_SCALAR) 2664 if (GIMME_V == G_SCALAR
2665 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2564 { 2666 {
2565 dSP; 2667 dSP;
2566 SV **bot = PL_stack_base + checkmark; 2668 SV **bot = PL_stack_base + checkmark;
2567 2669
2568 if (sp == bot) /* too few, push undef */ 2670 if (sp == bot) /* too few, push undef */
2569 bot [1] = &PL_sv_undef; 2671 bot [1] = &PL_sv_undef;
2570 else if (sp != bot + 1) /* too many, take last one */ 2672 else /* too many, take last one */
2571 bot [1] = *sp; 2673 bot [1] = *sp;
2572 2674
2573 SP = bot + 1; 2675 SP = bot + 1;
2574 2676
2575 PUTBACK; 2677 PUTBACK;
2682{ 2784{
2683 PerlIOBuf base; 2785 PerlIOBuf base;
2684 NV next, every; 2786 NV next, every;
2685} PerlIOCede; 2787} PerlIOCede;
2686 2788
2687static IV 2789static IV ecb_cold
2688PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2790PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2689{ 2791{
2690 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2792 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2691 2793
2692 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2794 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2693 self->next = nvtime () + self->every; 2795 self->next = nvtime () + self->every;
2694 2796
2695 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2797 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2696} 2798}
2697 2799
2698static SV * 2800static SV * ecb_cold
2699PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2801PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2700{ 2802{
2701 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2803 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2702 2804
2703 return newSVnv (self->every); 2805 return newSVnv (self->every);
2815 SvREFCNT_dec (cb); 2917 SvREFCNT_dec (cb);
2816 } 2918 }
2817} 2919}
2818 2920
2819static void 2921static void
2820coro_semaphore_destroy (pTHX_ struct coro *coro) 2922coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2821{ 2923{
2822 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2924 /* call $sem->adjust (0) to possibly wake up some other waiters */
2823 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2925 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2824} 2926}
2825 2927
2826static int 2928static int
2827slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2929slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2828{ 2930{
2829 AV *av = (AV *)frame->data; 2931 AV *av = (AV *)frame->data;
2830 SV *count_sv = AvARRAY (av)[0]; 2932 SV *count_sv = AvARRAY (av)[0];
2933 SV *coro_hv = SvRV (coro_current);
2831 2934
2832 /* if we are about to throw, don't actually acquire the lock, just throw */ 2935 /* if we are about to throw, don't actually acquire the lock, just throw */
2833 if (CORO_THROW) 2936 if (CORO_THROW)
2834 return 0; 2937 return 0;
2835 else if (SvIVX (count_sv) > 0) 2938 else if (SvIVX (count_sv) > 0)
2847 { 2950 {
2848 int i; 2951 int i;
2849 /* if we were woken up but can't down, we look through the whole */ 2952 /* 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 */ 2953 /* waiters list and only add us if we aren't in there already */
2851 /* this avoids some degenerate memory usage cases */ 2954 /* this avoids some degenerate memory usage cases */
2852 2955 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)) 2956 if (AvARRAY (av)[i] == coro_hv)
2855 return 1; 2957 return 1;
2856 2958
2857 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2959 av_push (av, SvREFCNT_inc (coro_hv));
2858 return 1; 2960 return 1;
2859 } 2961 }
2860} 2962}
2861 2963
2862static int 2964static int
3115 dSP; 3217 dSP;
3116 3218
3117 static SV *prio_cv; 3219 static SV *prio_cv;
3118 static SV *prio_sv; 3220 static SV *prio_sv;
3119 3221
3120 if (expect_false (!prio_cv)) 3222 if (ecb_expect_false (!prio_cv))
3121 { 3223 {
3122 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3224 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3123 prio_sv = newSViv (0); 3225 prio_sv = newSViv (0);
3124 } 3226 }
3125 3227
3231 } 3333 }
3232 3334
3233 return coro_sv; 3335 return coro_sv;
3234} 3336}
3235 3337
3338#ifndef __cplusplus
3339ecb_cold XS(boot_Coro__State);
3340#endif
3341
3342#if CORO_JIT
3343
3344static void ecb_noinline ecb_cold
3345pushav_3uv (pTHX_ UV a, UV b, UV c)
3346{
3347 dSP;
3348 AV *av = newAV ();
3349
3350 av_store (av, 2, newSVuv (c));
3351 av_store (av, 1, newSVuv (b));
3352 av_store (av, 0, newSVuv (a));
3353
3354 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3355
3356 PUTBACK;
3357}
3358
3359static void ecb_noinline ecb_cold
3360jit_init (pTHX)
3361{
3362 dSP;
3363 SV *load, *save;
3364 char *map_base;
3365 char *load_ptr, *save_ptr;
3366 STRLEN load_len, save_len;
3367 int count;
3368
3369 PUSHMARK (SP);
3370 PUTBACK;
3371#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type));
3372# include "state.h"
3373#undef VARx
3374 count = call_pv ("Coro::State::_jit", G_ARRAY);
3375 SPAGAIN;
3376
3377 save = POPs; save_ptr = SvPVbyte (save, save_len);
3378 load = POPs; load_ptr = SvPVbyte (load, load_len);
3379
3380 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3381
3382 assert (("Coro: unable mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3383
3384 load_perl_slots = (load_save_perl_slots_type)map_base;
3385 memcpy (map_base, load_ptr, load_len);
3386
3387 map_base += (load_len + 15) & ~15;
3388
3389 save_perl_slots = (load_save_perl_slots_type)map_base;
3390 memcpy (map_base, save_ptr, save_len);
3391}
3392
3393#endif
3394
3236MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3395MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3237 3396
3238PROTOTYPES: DISABLE 3397PROTOTYPES: DISABLE
3239 3398
3240BOOT: 3399BOOT:
3244 coro_thx = PERL_GET_CONTEXT; 3403 coro_thx = PERL_GET_CONTEXT;
3245# endif 3404# endif
3246#endif 3405#endif
3247 BOOT_PAGESIZE; 3406 BOOT_PAGESIZE;
3248 3407
3408 /* perl defines these to check for existance first, but why it doesn't */
3409 /* just create them one at init time is not clear to me, except for */
3410 /* programs trying to delete them, but... */
3411 /* anyway, we declare this as invalid and make sure they are initialised here */
3412 DEFSV;
3413 ERRSV;
3414
3249 cctx_current = cctx_new_empty (); 3415 cctx_current = cctx_new_empty ();
3250 3416
3251 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3417 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3252 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3418 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3253 3419
3295 coroapi.prepare_cede_notself = prepare_cede_notself; 3461 coroapi.prepare_cede_notself = prepare_cede_notself;
3296 3462
3297 time_init (aTHX); 3463 time_init (aTHX);
3298 3464
3299 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3465 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3466#if CORO_JIT
3467 PUTBACK;
3468 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3469 jit_init (aTHX);
3470 perl_eval_pv ("undef &Coro::State::_jit", 1);
3471 SPAGAIN;
3472#endif
3300} 3473}
3301 3474
3302SV * 3475SV *
3303new (SV *klass, ...) 3476new (SV *klass, ...)
3304 ALIAS: 3477 ALIAS:
3446 PROTOTYPE: $ 3619 PROTOTYPE: $
3447 ALIAS: 3620 ALIAS:
3448 is_ready = CF_READY 3621 is_ready = CF_READY
3449 is_running = CF_RUNNING 3622 is_running = CF_RUNNING
3450 is_new = CF_NEW 3623 is_new = CF_NEW
3451 is_destroyed = CF_DESTROYED 3624 is_destroyed = CF_ZOMBIE
3625 is_zombie = CF_ZOMBIE
3452 is_suspended = CF_SUSPENDED 3626 is_suspended = CF_SUSPENDED
3453 CODE: 3627 CODE:
3454 RETVAL = boolSV (coro->flags & ix); 3628 RETVAL = boolSV (coro->flags & ix);
3455 OUTPUT: 3629 OUTPUT:
3456 RETVAL 3630 RETVAL
3551times (Coro::State self) 3725times (Coro::State self)
3552 PPCODE: 3726 PPCODE:
3553{ 3727{
3554 struct coro *current = SvSTATE (coro_current); 3728 struct coro *current = SvSTATE (coro_current);
3555 3729
3556 if (expect_false (current == self)) 3730 if (ecb_expect_false (current == self))
3557 { 3731 {
3558 coro_times_update (); 3732 coro_times_update ();
3559 coro_times_add (SvSTATE (coro_current)); 3733 coro_times_add (SvSTATE (coro_current));
3560 } 3734 }
3561 3735
3562 EXTEND (SP, 2); 3736 EXTEND (SP, 2);
3563 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3737 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))); 3738 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3565 3739
3566 if (expect_false (current == self)) 3740 if (ecb_expect_false (current == self))
3567 coro_times_sub (SvSTATE (coro_current)); 3741 coro_times_sub (SvSTATE (coro_current));
3568} 3742}
3569 3743
3570void 3744void
3571swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3745swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3644void 3818void
3645_destroy (Coro::State coro) 3819_destroy (Coro::State coro)
3646 CODE: 3820 CODE:
3647 /* used by the manager thread */ 3821 /* used by the manager thread */
3648 coro_state_destroy (aTHX_ coro); 3822 coro_state_destroy (aTHX_ coro);
3823
3824void
3825on_destroy (Coro::State coro, SV *cb)
3826 CODE:
3649 coro_call_on_destroy (aTHX_ coro); 3827 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3828
3829void
3830join (...)
3831 CODE:
3832 CORO_EXECUTE_SLF_XS (slf_init_join);
3650 3833
3651void 3834void
3652terminate (...) 3835terminate (...)
3653 CODE: 3836 CODE:
3654 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3837 CORO_EXECUTE_SLF_XS (slf_init_terminate);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines