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.393 by root, Fri Apr 29 17:38:56 2011 UTC vs.
Revision 1.406 by root, Sat Jun 11 13:49:00 2011 UTC

12#include "perl.h" 12#include "perl.h"
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17#include "ecb.h"
17 18
19#include <stddef.h>
18#include <stdio.h> 20#include <stdio.h>
19#include <errno.h> 21#include <errno.h>
20#include <assert.h> 22#include <assert.h>
21 23
22#ifndef SVs_PADSTALE 24#ifndef SVs_PADSTALE
86# define STACKLEVEL ((void *)&stacklevel) 88# define STACKLEVEL ((void *)&stacklevel)
87#endif 89#endif
88 90
89#define IN_DESTRUCT PL_dirty 91#define IN_DESTRUCT PL_dirty
90 92
91#if __GNUC__ >= 3
92# define attribute(x) __attribute__(x)
93# define expect(expr,value) __builtin_expect ((expr), (value))
94# define INLINE static inline
95#else
96# define attribute(x)
97# define expect(expr,value) (expr)
98# define INLINE static
99#endif
100
101#define expect_false(expr) expect ((expr) != 0, 0)
102#define expect_true(expr) expect ((expr) != 0, 1)
103
104#define NOINLINE attribute ((noinline))
105
106#include "CoroAPI.h" 93#include "CoroAPI.h"
107#define GCoroAPI (&coroapi) /* very sneaky */ 94#define GCoroAPI (&coroapi) /* very sneaky */
108 95
109#ifdef USE_ITHREADS 96#ifdef USE_ITHREADS
110# if CORO_PTHREAD 97# if CORO_PTHREAD
111static void *coro_thx; 98static void *coro_thx;
112# endif 99# endif
113#endif 100#endif
101
102/* used in state.h */
103#define VAR(name,type) VARx(name, PL_ ## name, type)
114 104
115#ifdef __linux 105#ifdef __linux
116# include <time.h> /* for timespec */ 106# include <time.h> /* for timespec */
117# include <syscall.h> /* for SYS_* */ 107# include <syscall.h> /* for SYS_* */
118# ifdef SYS_clock_gettime 108# ifdef SYS_clock_gettime
126static void (*u2time)(pTHX_ UV ret[2]); 116static void (*u2time)(pTHX_ UV ret[2]);
127 117
128/* we hijack an hopefully unused CV flag for our purposes */ 118/* we hijack an hopefully unused CV flag for our purposes */
129#define CVf_SLF 0x4000 119#define CVf_SLF 0x4000
130static OP *pp_slf (pTHX); 120static OP *pp_slf (pTHX);
121static void slf_destroy (pTHX_ struct coro *coro);
131 122
132static U32 cctx_gen; 123static U32 cctx_gen;
133static size_t cctx_stacksize = CORO_STACKSIZE; 124static size_t cctx_stacksize = CORO_STACKSIZE;
134static struct CoroAPI coroapi; 125static struct CoroAPI coroapi;
135static AV *main_mainstack; /* used to differentiate between $main and others */ 126static AV *main_mainstack; /* used to differentiate between $main and others */
165static char times_valid; 156static char times_valid;
166 157
167static struct coro_cctx *cctx_first; 158static struct coro_cctx *cctx_first;
168static int cctx_count, cctx_idle; 159static int cctx_count, cctx_idle;
169 160
170enum { 161enum
162{
171 CC_MAPPED = 0x01, 163 CC_MAPPED = 0x01,
172 CC_NOREUSE = 0x02, /* throw this away after tracing */ 164 CC_NOREUSE = 0x02, /* throw this away after tracing */
173 CC_TRACE = 0x04, 165 CC_TRACE = 0x04,
174 CC_TRACE_SUB = 0x08, /* trace sub calls */ 166 CC_TRACE_SUB = 0x08, /* trace sub calls */
175 CC_TRACE_LINE = 0x10, /* trace each statement */ 167 CC_TRACE_LINE = 0x10, /* trace each statement */
200 192
201static coro_cctx *cctx_current; /* the currently running cctx */ 193static coro_cctx *cctx_current; /* the currently running cctx */
202 194
203/*****************************************************************************/ 195/*****************************************************************************/
204 196
197static MGVTBL coro_state_vtbl;
198
205enum { 199enum
200{
206 CF_RUNNING = 0x0001, /* coroutine is running */ 201 CF_RUNNING = 0x0001, /* coroutine is running */
207 CF_READY = 0x0002, /* coroutine is ready */ 202 CF_READY = 0x0002, /* coroutine is ready */
208 CF_NEW = 0x0004, /* has never been switched to */ 203 CF_NEW = 0x0004, /* has never been switched to */
209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 204 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 205 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
211 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) */
212}; 207};
213 208
214/* 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 */
215typedef struct 210typedef struct
216{ 211{
217 SV *defsv;
218 AV *defav;
219 SV *errsv;
220 SV *irsgv;
221 HV *hinthv;
222#define VAR(name,type) type name; 212#define VARx(name,expr,type) type name;
223# include "state.h" 213# include "state.h"
224#undef VAR 214#undef VARx
225} perl_slots; 215} perl_slots;
226 216
217// how many context stack entries do we need for perl_slots
227#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))
228 219
229/* this is a structure representing a perl-level coroutine */ 220/* this is a structure representing a perl-level coroutine */
230struct coro { 221struct coro
222{
231 /* the C coroutine allocated to this perl coroutine, if any */ 223 /* the C coroutine allocated to this perl coroutine, if any */
232 coro_cctx *cctx; 224 coro_cctx *cctx;
233 225
234 /* ready queue */ 226 /* ready queue */
235 struct coro *next_ready; 227 struct coro *next_ready;
237 /* state data */ 229 /* state data */
238 struct CoroSLF slf_frame; /* saved slf frame */ 230 struct CoroSLF slf_frame; /* saved slf frame */
239 AV *mainstack; 231 AV *mainstack;
240 perl_slots *slot; /* basically the saved sp */ 232 perl_slots *slot; /* basically the saved sp */
241 233
242 CV *startcv; /* the CV to execute */ 234 CV *startcv; /* the CV to execute */
243 AV *args; /* data associated with this coroutine (initial args) */ 235 AV *args; /* data associated with this coroutine (initial args) */
244 int refcnt; /* coroutines are refcounted, yes */
245 int flags; /* CF_ flags */ 236 int flags; /* CF_ flags */
246 HV *hv; /* the perl hash associated with this coro, if any */ 237 HV *hv; /* the perl hash associated with this coro, if any */
247 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
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;
292 284
293/* for Coro.pm */ 285/* for Coro.pm */
294static SV *coro_current; 286static SV *coro_current;
295static SV *coro_readyhook; 287static SV *coro_readyhook;
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, *cv_coro_terminate; 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
292
293/** JIT *********************************************************************/
294
295#if CORO_JIT
296 #ifndef CORO_JIT_TYPE
297 #if __x86_64 && (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris)
298 #define CORO_JIT_TYPE "amd64-unix"
299 typedef void (*load_save_perl_slots_type)(perl_slots *);
300 #else
301 #undef CORO_JIT
302 #endif
303 #endif
304#endif
305
306#if CORO_JIT
307static load_save_perl_slots_type load_perl_slots, save_perl_slots;
308#endif
300 309
301/** Coro::Select ************************************************************/ 310/** Coro::Select ************************************************************/
302 311
303static OP *(*coro_old_pp_sselect) (pTHX); 312static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select; 313static SV *coro_select_select;
320 329
321/** time stuff **************************************************************/ 330/** time stuff **************************************************************/
322 331
323#ifdef HAS_GETTIMEOFDAY 332#ifdef HAS_GETTIMEOFDAY
324 333
325static void 334ECB_INLINE void
326coro_u2time (pTHX_ UV ret[2]) 335coro_u2time (pTHX_ UV ret[2])
327{ 336{
328 struct timeval tv; 337 struct timeval tv;
329 gettimeofday (&tv, 0); 338 gettimeofday (&tv, 0);
330 339
331 ret [0] = tv.tv_sec; 340 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec; 341 ret [1] = tv.tv_usec;
333} 342}
334 343
335static double 344ECB_INLINE double
336coro_nvtime () 345coro_nvtime ()
337{ 346{
338 struct timeval tv; 347 struct timeval tv;
339 gettimeofday (&tv, 0); 348 gettimeofday (&tv, 0);
340 349
341 return tv.tv_sec + tv.tv_usec * 1e-6; 350 return tv.tv_sec + tv.tv_usec * 1e-6;
342} 351}
343 352
344static void 353ECB_INLINE void
345time_init (pTHX) 354time_init (pTHX)
346{ 355{
347 nvtime = coro_nvtime; 356 nvtime = coro_nvtime;
348 u2time = coro_u2time; 357 u2time = coro_u2time;
349} 358}
350 359
351#else 360#else
352 361
353static void 362ECB_INLINE void
354time_init (pTHX) 363time_init (pTHX)
355{ 364{
356 SV **svp; 365 SV **svp;
357 366
358 require_pv ("Time/HiRes.pm"); 367 require_pv ("Time/HiRes.pm");
370 379
371#endif 380#endif
372 381
373/** lowlevel stuff **********************************************************/ 382/** lowlevel stuff **********************************************************/
374 383
375static SV * 384static SV * ecb_noinline
376coro_get_sv (pTHX_ const char *name, int create) 385coro_get_sv (pTHX_ const char *name, int create)
377{ 386{
378#if PERL_VERSION_ATLEAST (5,10,0) 387#if PERL_VERSION_ATLEAST (5,10,0)
379 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 388 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
380 get_sv (name, create); 389 get_sv (name, create);
381#endif 390#endif
382 return get_sv (name, create); 391 return get_sv (name, create);
383} 392}
384 393
385static AV * 394static AV * ecb_noinline
386coro_get_av (pTHX_ const char *name, int create) 395coro_get_av (pTHX_ const char *name, int create)
387{ 396{
388#if PERL_VERSION_ATLEAST (5,10,0) 397#if PERL_VERSION_ATLEAST (5,10,0)
389 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 398 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
390 get_av (name, create); 399 get_av (name, create);
391#endif 400#endif
392 return get_av (name, create); 401 return get_av (name, create);
393} 402}
394 403
395static HV * 404static HV * ecb_noinline
396coro_get_hv (pTHX_ const char *name, int create) 405coro_get_hv (pTHX_ const char *name, int create)
397{ 406{
398#if PERL_VERSION_ATLEAST (5,10,0) 407#if PERL_VERSION_ATLEAST (5,10,0)
399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 408 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
400 get_hv (name, create); 409 get_hv (name, create);
401#endif 410#endif
402 return get_hv (name, create); 411 return get_hv (name, create);
403} 412}
404 413
405INLINE void 414ECB_INLINE void
406coro_times_update () 415coro_times_update ()
407{ 416{
408#ifdef coro_clock_gettime 417#ifdef coro_clock_gettime
409 struct timespec ts; 418 struct timespec ts;
410 419
423 time_real [0] = tv [0]; 432 time_real [0] = tv [0];
424 time_real [1] = tv [1] * 1000; 433 time_real [1] = tv [1] * 1000;
425#endif 434#endif
426} 435}
427 436
428INLINE void 437ECB_INLINE void
429coro_times_add (struct coro *c) 438coro_times_add (struct coro *c)
430{ 439{
431 c->t_real [1] += time_real [1]; 440 c->t_real [1] += time_real [1];
432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 441 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
433 c->t_real [0] += time_real [0]; 442 c->t_real [0] += time_real [0];
435 c->t_cpu [1] += time_cpu [1]; 444 c->t_cpu [1] += time_cpu [1];
436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 445 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
437 c->t_cpu [0] += time_cpu [0]; 446 c->t_cpu [0] += time_cpu [0];
438} 447}
439 448
440INLINE void 449ECB_INLINE void
441coro_times_sub (struct coro *c) 450coro_times_sub (struct coro *c)
442{ 451{
443 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 452 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
444 c->t_real [1] -= time_real [1]; 453 c->t_real [1] -= time_real [1];
445 c->t_real [0] -= time_real [0]; 454 c->t_real [0] -= time_real [0];
453/* magic glue */ 462/* magic glue */
454 463
455#define CORO_MAGIC_type_cv 26 464#define CORO_MAGIC_type_cv 26
456#define CORO_MAGIC_type_state PERL_MAGIC_ext 465#define CORO_MAGIC_type_state PERL_MAGIC_ext
457 466
458#define CORO_MAGIC_NN(sv, type) \ 467#define CORO_MAGIC_NN(sv, type) \
459 (expect_true (SvMAGIC (sv)->mg_type == type) \ 468 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
460 ? SvMAGIC (sv) \ 469 ? SvMAGIC (sv) \
461 : mg_find (sv, type)) 470 : mg_find (sv, type))
462 471
463#define CORO_MAGIC(sv, type) \ 472#define CORO_MAGIC(sv, type) \
464 (expect_true (SvMAGIC (sv)) \ 473 (ecb_expect_true (SvMAGIC (sv)) \
465 ? CORO_MAGIC_NN (sv, type) \ 474 ? CORO_MAGIC_NN (sv, type) \
466 : 0) 475 : 0)
467 476
468#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 477#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
469#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 478#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
470 479
480ECB_INLINE MAGIC *
481SvSTATEhv_p (pTHX_ SV *coro)
482{
483 MAGIC *mg;
484
485 if (ecb_expect_true (
486 SvTYPE (coro) == SVt_PVHV
487 && (mg = CORO_MAGIC_state (coro))
488 && mg->mg_virtual == &coro_state_vtbl
489 ))
490 return mg;
491
492 return 0;
493}
494
471INLINE struct coro * 495ECB_INLINE struct coro *
472SvSTATE_ (pTHX_ SV *coro) 496SvSTATE_ (pTHX_ SV *coro)
473{ 497{
474 HV *stash;
475 MAGIC *mg; 498 MAGIC *mg;
476 499
477 if (SvROK (coro)) 500 if (SvROK (coro))
478 coro = SvRV (coro); 501 coro = SvRV (coro);
479 502
480 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 503 mg = SvSTATEhv_p (aTHX_ coro);
504 if (!mg)
481 croak ("Coro::State object required"); 505 croak ("Coro::State object required");
482 506
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; 507 return (struct coro *)mg->mg_ptr;
493} 508}
494 509
495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 510#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
496 511
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 514#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500 515
501/*****************************************************************************/ 516/*****************************************************************************/
502/* padlist management and caching */ 517/* padlist management and caching */
503 518
504static AV * 519ECB_INLINE AV *
505coro_derive_padlist (pTHX_ CV *cv) 520coro_derive_padlist (pTHX_ CV *cv)
506{ 521{
507 AV *padlist = CvPADLIST (cv); 522 AV *padlist = CvPADLIST (cv);
508 AV *newpadlist, *newpad; 523 AV *newpadlist, *newpad;
509 524
521 av_store (newpadlist, 1, (SV *)newpad); 536 av_store (newpadlist, 1, (SV *)newpad);
522 537
523 return newpadlist; 538 return newpadlist;
524} 539}
525 540
526static void 541ECB_INLINE void
527free_padlist (pTHX_ AV *padlist) 542free_padlist (pTHX_ AV *padlist)
528{ 543{
529 /* may be during global destruction */ 544 /* may be during global destruction */
530 if (!IN_DESTRUCT) 545 if (!IN_DESTRUCT)
531 { 546 {
574 0, 0, 0, 0, 589 0, 0, 0, 0,
575 coro_cv_free 590 coro_cv_free
576}; 591};
577 592
578/* the next two functions merely cache the padlists */ 593/* the next two functions merely cache the padlists */
579static void 594ECB_INLINE void
580get_padlist (pTHX_ CV *cv) 595get_padlist (pTHX_ CV *cv)
581{ 596{
582 MAGIC *mg = CORO_MAGIC_cv (cv); 597 MAGIC *mg = CORO_MAGIC_cv (cv);
583 AV *av; 598 AV *av;
584 599
585 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 600 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 601 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
587 else 602 else
588 { 603 {
589#if CORO_PREFER_PERL_FUNCTIONS 604#if CORO_PREFER_PERL_FUNCTIONS
590 /* this is probably cleaner? but also slower! */ 605 /* this is probably cleaner? but also slower! */
597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 612 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
598#endif 613#endif
599 } 614 }
600} 615}
601 616
602static void 617ECB_INLINE void
603put_padlist (pTHX_ CV *cv) 618put_padlist (pTHX_ CV *cv)
604{ 619{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 620 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av; 621 AV *av;
607 622
608 if (expect_false (!mg)) 623 if (ecb_expect_false (!mg))
609 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 624 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
610 625
611 av = (AV *)mg->mg_obj; 626 av = (AV *)mg->mg_obj;
612 627
613 if (expect_false (AvFILLp (av) >= AvMAX (av))) 628 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
614 av_extend (av, AvFILLp (av) + 1); 629 av_extend (av, AvFILLp (av) + 1);
615 630
616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 631 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
617} 632}
618 633
663 } 678 }
664#endif 679#endif
665 } 680 }
666} 681}
667 682
668#define SWAP_SVS(coro) \ 683#define SWAP_SVS(coro) \
669 if (expect_false ((coro)->swap_sv)) \ 684 if (ecb_expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro)) 685 swap_svs (aTHX_ (coro))
671 686
672static void 687static void
673on_enterleave_call (pTHX_ SV *cb); 688on_enterleave_call (pTHX_ SV *cb);
674 689
678 perl_slots *slot = c->slot; 693 perl_slots *slot = c->slot;
679 c->slot = 0; 694 c->slot = 0;
680 695
681 PL_mainstack = c->mainstack; 696 PL_mainstack = c->mainstack;
682 697
683 GvSV (PL_defgv) = slot->defsv; 698#if CORO_JIT
684 GvAV (PL_defgv) = slot->defav; 699 load_perl_slots (slot);
685 GvSV (PL_errgv) = slot->errsv; 700#else
686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
688
689 #define VAR(name,type) PL_ ## name = slot->name; 701 #define VARx(name,expr,type) expr = slot->name;
690 # include "state.h" 702 # include "state.h"
691 #undef VAR 703 #undef VARx
704#endif
692 705
693 { 706 {
694 dSP; 707 dSP;
695 708
696 CV *cv; 709 CV *cv;
697 710
698 /* now do the ugly restore mess */ 711 /* now do the ugly restore mess */
699 while (expect_true (cv = (CV *)POPs)) 712 while (ecb_expect_true (cv = (CV *)POPs))
700 { 713 {
701 put_padlist (aTHX_ cv); /* mark this padlist as available */ 714 put_padlist (aTHX_ cv); /* mark this padlist as available */
702 CvDEPTH (cv) = PTR2IV (POPs); 715 CvDEPTH (cv) = PTR2IV (POPs);
703 CvPADLIST (cv) = (AV *)POPs; 716 CvPADLIST (cv) = (AV *)POPs;
704 } 717 }
707 } 720 }
708 721
709 slf_frame = c->slf_frame; 722 slf_frame = c->slf_frame;
710 CORO_THROW = c->except; 723 CORO_THROW = c->except;
711 724
712 if (expect_false (enable_times)) 725 if (ecb_expect_false (enable_times))
713 { 726 {
714 if (expect_false (!times_valid)) 727 if (ecb_expect_false (!times_valid))
715 coro_times_update (); 728 coro_times_update ();
716 729
717 coro_times_sub (c); 730 coro_times_sub (c);
718 } 731 }
719 732
720 if (expect_false (c->on_enter)) 733 if (ecb_expect_false (c->on_enter))
721 { 734 {
722 int i; 735 int i;
723 736
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 737 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 738 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
731static void 744static void
732save_perl (pTHX_ Coro__State c) 745save_perl (pTHX_ Coro__State c)
733{ 746{
734 SWAP_SVS (c); 747 SWAP_SVS (c);
735 748
736 if (expect_false (c->on_leave)) 749 if (ecb_expect_false (c->on_leave))
737 { 750 {
738 int i; 751 int i;
739 752
740 for (i = AvFILLp (c->on_leave); i >= 0; --i) 753 for (i = AvFILLp (c->on_leave); i >= 0; --i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 754 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 } 755 }
743 756
744 times_valid = 0; 757 times_valid = 0;
745 758
746 if (expect_false (enable_times)) 759 if (ecb_expect_false (enable_times))
747 { 760 {
748 coro_times_update (); times_valid = 1; 761 coro_times_update (); times_valid = 1;
749 coro_times_add (c); 762 coro_times_add (c);
750 } 763 }
751 764
765 778
766 XPUSHs (Nullsv); 779 XPUSHs (Nullsv);
767 /* this loop was inspired by pp_caller */ 780 /* this loop was inspired by pp_caller */
768 for (;;) 781 for (;;)
769 { 782 {
770 while (expect_true (cxix >= 0)) 783 while (ecb_expect_true (cxix >= 0))
771 { 784 {
772 PERL_CONTEXT *cx = &ccstk[cxix--]; 785 PERL_CONTEXT *cx = &ccstk[cxix--];
773 786
774 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 787 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
775 { 788 {
776 CV *cv = cx->blk_sub.cv; 789 CV *cv = cx->blk_sub.cv;
777 790
778 if (expect_true (CvDEPTH (cv))) 791 if (ecb_expect_true (CvDEPTH (cv)))
779 { 792 {
780 EXTEND (SP, 3); 793 EXTEND (SP, 3);
781 PUSHs ((SV *)CvPADLIST (cv)); 794 PUSHs ((SV *)CvPADLIST (cv));
782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 795 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
783 PUSHs ((SV *)cv); 796 PUSHs ((SV *)cv);
786 get_padlist (aTHX_ cv); 799 get_padlist (aTHX_ cv);
787 } 800 }
788 } 801 }
789 } 802 }
790 803
791 if (expect_true (top_si->si_type == PERLSI_MAIN)) 804 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
792 break; 805 break;
793 806
794 top_si = top_si->si_prev; 807 top_si = top_si->si_prev;
795 ccstk = top_si->si_cxstack; 808 ccstk = top_si->si_cxstack;
796 cxix = top_si->si_cxix; 809 cxix = top_si->si_cxix;
798 811
799 PUTBACK; 812 PUTBACK;
800 } 813 }
801 814
802 /* allocate some space on the context stack for our purposes */ 815 /* allocate some space on the context stack for our purposes */
803 /* we manually unroll here, as usually 2 slots is enough */ 816 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 { 817 {
808 unsigned int i; 818 unsigned int i;
819
809 for (i = 3; i < SLOT_COUNT; ++i) 820 for (i = 0; i < SLOT_COUNT; ++i)
810 CXINC; 821 CXINC;
811 } 822
812 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 823 cxstack_ix -= SLOT_COUNT; /* undo allocation */
824 }
813 825
814 c->mainstack = PL_mainstack; 826 c->mainstack = PL_mainstack;
815 827
816 { 828 {
817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 829 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
818 830
819 slot->defav = GvAV (PL_defgv); 831#if CORO_JIT
820 slot->defsv = DEFSV; 832 save_perl_slots (slot);
821 slot->errsv = ERRSV; 833#else
822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
824
825 #define VAR(name,type) slot->name = PL_ ## name; 834 #define VARx(name,expr,type) slot->name = expr;
826 # include "state.h" 835 # include "state.h"
827 #undef VAR 836 #undef VARx
837#endif
828 } 838 }
829} 839}
830 840
831/* 841/*
832 * allocate various perl stacks. This is almost an exact copy 842 * allocate various perl stacks. This is almost an exact copy
838# define coro_init_stacks(thx) init_stacks () 848# define coro_init_stacks(thx) init_stacks ()
839#else 849#else
840static void 850static void
841coro_init_stacks (pTHX) 851coro_init_stacks (pTHX)
842{ 852{
843 PL_curstackinfo = new_stackinfo(32, 8); 853 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
844 PL_curstackinfo->si_type = PERLSI_MAIN; 854 PL_curstackinfo->si_type = PERLSI_MAIN;
845 PL_curstack = PL_curstackinfo->si_stack; 855 PL_curstack = PL_curstackinfo->si_stack;
846 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 856 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
847 857
848 PL_stack_base = AvARRAY(PL_curstack); 858 PL_stack_base = AvARRAY(PL_curstack);
955#endif 965#endif
956 966
957/* 967/*
958 * This overrides the default magic get method of %SIG elements. 968 * 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 969 * 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 970 * and instead of trying to save and restore the hash elements (extremely slow),
961 * readback here. 971 * we just provide our own readback here.
962 */ 972 */
963static int 973static int ecb_cold
964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 974coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
965{ 975{
966 const char *s = MgPV_nolen_const (mg); 976 const char *s = MgPV_nolen_const (mg);
967 977
968 if (*s == '_') 978 if (*s == '_')
980 } 990 }
981 991
982 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 992 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
983} 993}
984 994
985static int 995static int ecb_cold
986coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 996coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
987{ 997{
988 const char *s = MgPV_nolen_const (mg); 998 const char *s = MgPV_nolen_const (mg);
989 999
990 if (*s == '_') 1000 if (*s == '_')
1004 } 1014 }
1005 1015
1006 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1016 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1007} 1017}
1008 1018
1009static int 1019static int ecb_cold
1010coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1020coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1011{ 1021{
1012 const char *s = MgPV_nolen_const (mg); 1022 const char *s = MgPV_nolen_const (mg);
1013 1023
1014 if (*s == '_') 1024 if (*s == '_')
1049 return 1; 1059 return 1;
1050} 1060}
1051 1061
1052static UNOP init_perl_op; 1062static UNOP init_perl_op;
1053 1063
1054static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1064ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1055init_perl (pTHX_ struct coro *coro) 1065init_perl (pTHX_ struct coro *coro)
1056{ 1066{
1057 /* 1067 /*
1058 * emulate part of the perl startup here. 1068 * emulate part of the perl startup here.
1059 */ 1069 */
1074 PL_parser = 0; 1084 PL_parser = 0;
1075#endif 1085#endif
1076 PL_hints = 0; 1086 PL_hints = 0;
1077 1087
1078 /* recreate the die/warn hooks */ 1088 /* recreate the die/warn hooks */
1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1089 PL_diehook = SvREFCNT_inc (rv_diehook);
1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1090 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1081 1091
1082 GvSV (PL_defgv) = newSV (0); 1092 GvSV (PL_defgv) = newSV (0);
1083 GvAV (PL_defgv) = coro->args; coro->args = 0; 1093 GvAV (PL_defgv) = coro->args; coro->args = 0;
1084 GvSV (PL_errgv) = newSV (0); 1094 GvSV (PL_errgv) = newSV (0);
1085 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1095 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1106 /* this newly created coroutine might be run on an existing cctx which most 1116 /* this newly created coroutine might be run on an existing cctx which most
1107 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1117 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1108 */ 1118 */
1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1119 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1110 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1120 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1121 slf_frame.destroy = 0;
1111 1122
1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1123 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1113 init_perl_op.op_next = PL_op; 1124 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1125 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1126 init_perl_op.op_ppaddr = pp_slf;
1120 /* copy throw, in case it was set before init_perl */ 1131 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1132 CORO_THROW = coro->except;
1122 1133
1123 SWAP_SVS (coro); 1134 SWAP_SVS (coro);
1124 1135
1125 if (expect_false (enable_times)) 1136 if (ecb_expect_false (enable_times))
1126 { 1137 {
1127 coro_times_update (); 1138 coro_times_update ();
1128 coro_times_sub (coro); 1139 coro_times_sub (coro);
1129 } 1140 }
1130} 1141}
1154destroy_perl (pTHX_ struct coro *coro) 1165destroy_perl (pTHX_ struct coro *coro)
1155{ 1166{
1156 SV *svf [9]; 1167 SV *svf [9];
1157 1168
1158 { 1169 {
1170 SV *old_current = SvRV (coro_current);
1159 struct coro *current = SvSTATE_current; 1171 struct coro *current = SvSTATE (old_current);
1160 1172
1161 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1173 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1162 1174
1163 save_perl (aTHX_ current); 1175 save_perl (aTHX_ current);
1176
1177 /* this will cause transfer_check to croak on block*/
1178 SvRV_set (coro_current, (SV *)coro->hv);
1179
1164 load_perl (aTHX_ coro); 1180 load_perl (aTHX_ coro);
1165 1181
1166 coro_unwind_stacks (aTHX); 1182 coro_unwind_stacks (aTHX);
1167 coro_destruct_stacks (aTHX);
1168 1183
1169 /* restore swapped sv's */ 1184 /* restore swapped sv's */
1170 SWAP_SVS (coro); 1185 SWAP_SVS (coro);
1186
1187 coro_destruct_stacks (aTHX);
1171 1188
1172 // now save some sv's to be free'd later 1189 // now save some sv's to be free'd later
1173 svf [0] = GvSV (PL_defgv); 1190 svf [0] = GvSV (PL_defgv);
1174 svf [1] = (SV *)GvAV (PL_defgv); 1191 svf [1] = (SV *)GvAV (PL_defgv);
1175 svf [2] = GvSV (PL_errgv); 1192 svf [2] = GvSV (PL_errgv);
1179 svf [6] = (SV *)GvHV (PL_hintgv); 1196 svf [6] = (SV *)GvHV (PL_hintgv);
1180 svf [7] = PL_diehook; 1197 svf [7] = PL_diehook;
1181 svf [8] = PL_warnhook; 1198 svf [8] = PL_warnhook;
1182 assert (9 == sizeof (svf) / sizeof (*svf)); 1199 assert (9 == sizeof (svf) / sizeof (*svf));
1183 1200
1201 SvRV_set (coro_current, old_current);
1202
1184 load_perl (aTHX_ current); 1203 load_perl (aTHX_ current);
1185 } 1204 }
1186 1205
1187 { 1206 {
1188 unsigned int i; 1207 unsigned int i;
1195 SvREFCNT_dec (coro->invoke_cb); 1214 SvREFCNT_dec (coro->invoke_cb);
1196 SvREFCNT_dec (coro->invoke_av); 1215 SvREFCNT_dec (coro->invoke_av);
1197 } 1216 }
1198} 1217}
1199 1218
1200INLINE void 1219ECB_INLINE void
1201free_coro_mortal (pTHX) 1220free_coro_mortal (pTHX)
1202{ 1221{
1203 if (expect_true (coro_mortal)) 1222 if (ecb_expect_true (coro_mortal))
1204 { 1223 {
1205 SvREFCNT_dec (coro_mortal); 1224 SvREFCNT_dec ((SV *)coro_mortal);
1206 coro_mortal = 0; 1225 coro_mortal = 0;
1207 } 1226 }
1208} 1227}
1209 1228
1210static int 1229static int
1343 1362
1344 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1363 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1345} 1364}
1346 1365
1347/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1366/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1348static void NOINLINE 1367static void ecb_noinline
1349cctx_prepare (pTHX) 1368cctx_prepare (pTHX)
1350{ 1369{
1351 PL_top_env = &PL_start_env; 1370 PL_top_env = &PL_start_env;
1352 1371
1353 if (cctx_current->flags & CC_TRACE) 1372 if (cctx_current->flags & CC_TRACE)
1364 slf_frame.prepare = slf_prepare_set_stacklevel; 1383 slf_frame.prepare = slf_prepare_set_stacklevel;
1365 slf_frame.check = slf_check_set_stacklevel; 1384 slf_frame.check = slf_check_set_stacklevel;
1366} 1385}
1367 1386
1368/* the tail of transfer: execute stuff we can only do after a transfer */ 1387/* the tail of transfer: execute stuff we can only do after a transfer */
1369INLINE void 1388ECB_INLINE void
1370transfer_tail (pTHX) 1389transfer_tail (pTHX)
1371{ 1390{
1372 free_coro_mortal (aTHX); 1391 free_coro_mortal (aTHX);
1373} 1392}
1374 1393
1526#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1545#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1527 1546
1528static coro_cctx * 1547static coro_cctx *
1529cctx_get (pTHX) 1548cctx_get (pTHX)
1530{ 1549{
1531 while (expect_true (cctx_first)) 1550 while (ecb_expect_true (cctx_first))
1532 { 1551 {
1533 coro_cctx *cctx = cctx_first; 1552 coro_cctx *cctx = cctx_first;
1534 cctx_first = cctx->next; 1553 cctx_first = cctx->next;
1535 --cctx_idle; 1554 --cctx_idle;
1536 1555
1537 if (expect_true (!CCTX_EXPIRED (cctx))) 1556 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1538 return cctx; 1557 return cctx;
1539 1558
1540 cctx_destroy (cctx); 1559 cctx_destroy (cctx);
1541 } 1560 }
1542 1561
1547cctx_put (coro_cctx *cctx) 1566cctx_put (coro_cctx *cctx)
1548{ 1567{
1549 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1568 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1550 1569
1551 /* free another cctx if overlimit */ 1570 /* free another cctx if overlimit */
1552 if (expect_false (cctx_idle >= cctx_max_idle)) 1571 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1553 { 1572 {
1554 coro_cctx *first = cctx_first; 1573 coro_cctx *first = cctx_first;
1555 cctx_first = first->next; 1574 cctx_first = first->next;
1556 --cctx_idle; 1575 --cctx_idle;
1557 1576
1568static void 1587static void
1569transfer_check (pTHX_ struct coro *prev, struct coro *next) 1588transfer_check (pTHX_ struct coro *prev, struct coro *next)
1570{ 1589{
1571 /* TODO: throwing up here is considered harmful */ 1590 /* TODO: throwing up here is considered harmful */
1572 1591
1573 if (expect_true (prev != next)) 1592 if (ecb_expect_true (prev != next))
1574 { 1593 {
1575 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1594 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1576 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1595 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1577 1596
1578 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1597 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1579 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1598 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1580 1599
1581#if !PERL_VERSION_ATLEAST (5,10,0) 1600#if !PERL_VERSION_ATLEAST (5,10,0)
1582 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1601 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1583 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1602 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1584#endif 1603#endif
1585 } 1604 }
1586} 1605}
1587 1606
1588/* always use the TRANSFER macro */ 1607/* always use the TRANSFER macro */
1589static void NOINLINE /* noinline so we have a fixed stackframe */ 1608static void ecb_noinline /* noinline so we have a fixed stackframe */
1590transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1609transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1591{ 1610{
1592 dSTACKLEVEL; 1611 dSTACKLEVEL;
1593 1612
1594 /* sometimes transfer is only called to set idle_sp */ 1613 /* sometimes transfer is only called to set idle_sp */
1595 if (expect_false (!prev)) 1614 if (ecb_expect_false (!prev))
1596 { 1615 {
1597 cctx_current->idle_sp = STACKLEVEL; 1616 cctx_current->idle_sp = STACKLEVEL;
1598 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1617 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1599 } 1618 }
1600 else if (expect_true (prev != next)) 1619 else if (ecb_expect_true (prev != next))
1601 { 1620 {
1602 coro_cctx *cctx_prev; 1621 coro_cctx *cctx_prev;
1603 1622
1604 if (expect_false (prev->flags & CF_NEW)) 1623 if (ecb_expect_false (prev->flags & CF_NEW))
1605 { 1624 {
1606 /* create a new empty/source context */ 1625 /* create a new empty/source context */
1607 prev->flags &= ~CF_NEW; 1626 prev->flags &= ~CF_NEW;
1608 prev->flags |= CF_RUNNING; 1627 prev->flags |= CF_RUNNING;
1609 } 1628 }
1612 next->flags |= CF_RUNNING; 1631 next->flags |= CF_RUNNING;
1613 1632
1614 /* first get rid of the old state */ 1633 /* first get rid of the old state */
1615 save_perl (aTHX_ prev); 1634 save_perl (aTHX_ prev);
1616 1635
1617 if (expect_false (next->flags & CF_NEW)) 1636 if (ecb_expect_false (next->flags & CF_NEW))
1618 { 1637 {
1619 /* need to start coroutine */ 1638 /* need to start coroutine */
1620 next->flags &= ~CF_NEW; 1639 next->flags &= ~CF_NEW;
1621 /* setup coroutine call */ 1640 /* setup coroutine call */
1622 init_perl (aTHX_ next); 1641 init_perl (aTHX_ next);
1623 } 1642 }
1624 else 1643 else
1625 load_perl (aTHX_ next); 1644 load_perl (aTHX_ next);
1626 1645
1627 /* possibly untie and reuse the cctx */ 1646 /* possibly untie and reuse the cctx */
1628 if (expect_true ( 1647 if (ecb_expect_true (
1629 cctx_current->idle_sp == STACKLEVEL 1648 cctx_current->idle_sp == STACKLEVEL
1630 && !(cctx_current->flags & CC_TRACE) 1649 && !(cctx_current->flags & CC_TRACE)
1631 && !force_cctx 1650 && !force_cctx
1632 )) 1651 ))
1633 { 1652 {
1634 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1653 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1635 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1654 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1636 1655
1637 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1656 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1638 /* without this the next cctx_get might destroy the running cctx while still in use */ 1657 /* without this the next cctx_get might destroy the running cctx while still in use */
1639 if (expect_false (CCTX_EXPIRED (cctx_current))) 1658 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1640 if (expect_true (!next->cctx)) 1659 if (ecb_expect_true (!next->cctx))
1641 next->cctx = cctx_get (aTHX); 1660 next->cctx = cctx_get (aTHX);
1642 1661
1643 cctx_put (cctx_current); 1662 cctx_put (cctx_current);
1644 } 1663 }
1645 else 1664 else
1646 prev->cctx = cctx_current; 1665 prev->cctx = cctx_current;
1647 1666
1648 ++next->usecount; 1667 ++next->usecount;
1649 1668
1650 cctx_prev = cctx_current; 1669 cctx_prev = cctx_current;
1651 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1670 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1652 1671
1653 next->cctx = 0; 1672 next->cctx = 0;
1654 1673
1655 if (expect_false (cctx_prev != cctx_current)) 1674 if (ecb_expect_false (cctx_prev != cctx_current))
1656 { 1675 {
1657 cctx_prev->top_env = PL_top_env; 1676 cctx_prev->top_env = PL_top_env;
1658 PL_top_env = cctx_current->top_env; 1677 PL_top_env = cctx_current->top_env;
1659 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1678 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1660 } 1679 }
1666#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1685#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1667#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1686#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1668 1687
1669/** high level stuff ********************************************************/ 1688/** high level stuff ********************************************************/
1670 1689
1690/* this function is actually Coro, not Coro::State, but we call it from here */
1691/* because it is convenient - but it hasn't been declared yet for that reason */
1671static int 1692static void
1693coro_call_on_destroy (pTHX_ struct coro *coro);
1694
1695static void
1672coro_state_destroy (pTHX_ struct coro *coro) 1696coro_state_destroy (pTHX_ struct coro *coro)
1673{ 1697{
1674 if (coro->flags & CF_DESTROYED) 1698 if (coro->flags & CF_ZOMBIE)
1675 return 0; 1699 return;
1676 1700
1677 if (coro->on_destroy && !PL_dirty)
1678 coro->on_destroy (aTHX_ coro); 1701 slf_destroy (aTHX_ coro);
1679 1702
1680 /*
1681 * The on_destroy above most likely is from an SLF call.
1682 * Since by definition the SLF call will not finish when we destroy
1683 * the coro, we will have to force-finish it here, otherwise
1684 * cleanup functions cannot call SLF functions.
1685 */
1686 coro->slf_frame.prepare = 0;
1687
1688 coro->flags |= CF_DESTROYED; 1703 coro->flags |= CF_ZOMBIE;
1689 1704
1690 if (coro->flags & CF_READY) 1705 if (coro->flags & CF_READY)
1691 { 1706 {
1692 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1707 /* reduce nready, as destroying a ready coro effectively unreadies it */
1693 /* alternative: look through all ready queues and remove the coro */ 1708 /* alternative: look through all ready queues and remove the coro */
1694 --coro_nready; 1709 --coro_nready;
1695 } 1710 }
1696 else 1711 else
1697 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1712 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1713
1714 if (coro->next) coro->next->prev = coro->prev;
1715 if (coro->prev) coro->prev->next = coro->next;
1716 if (coro == coro_first) coro_first = coro->next;
1698 1717
1699 if (coro->mainstack 1718 if (coro->mainstack
1700 && coro->mainstack != main_mainstack 1719 && coro->mainstack != main_mainstack
1701 && coro->slot 1720 && coro->slot
1702 && !PL_dirty) 1721 && !PL_dirty)
1703 destroy_perl (aTHX_ coro); 1722 destroy_perl (aTHX_ coro);
1704 1723
1705 if (coro->next) coro->next->prev = coro->prev;
1706 if (coro->prev) coro->prev->next = coro->next;
1707 if (coro == coro_first) coro_first = coro->next;
1708
1709 cctx_destroy (coro->cctx); 1724 cctx_destroy (coro->cctx);
1710 SvREFCNT_dec (coro->startcv); 1725 SvREFCNT_dec (coro->startcv);
1711 SvREFCNT_dec (coro->args); 1726 SvREFCNT_dec (coro->args);
1712 SvREFCNT_dec (coro->swap_sv); 1727 SvREFCNT_dec (coro->swap_sv);
1713 SvREFCNT_dec (CORO_THROW); 1728 SvREFCNT_dec (CORO_THROW);
1714 1729
1715 return 1; 1730 coro_call_on_destroy (aTHX_ coro);
1731
1732 /* more destruction mayhem in coro_state_free */
1716} 1733}
1717 1734
1718static int 1735static int
1719coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1736coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1720{ 1737{
1721 struct coro *coro = (struct coro *)mg->mg_ptr; 1738 struct coro *coro = (struct coro *)mg->mg_ptr;
1722 mg->mg_ptr = 0; 1739 mg->mg_ptr = 0;
1723 1740
1724 coro->hv = 0;
1725
1726 if (--coro->refcnt < 0)
1727 {
1728 coro_state_destroy (aTHX_ coro); 1741 coro_state_destroy (aTHX_ coro);
1742 SvREFCNT_dec (coro->on_destroy);
1743 SvREFCNT_dec (coro->status);
1744
1729 Safefree (coro); 1745 Safefree (coro);
1730 }
1731 1746
1732 return 0; 1747 return 0;
1733} 1748}
1734 1749
1735static int 1750static int ecb_cold
1736coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1751coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1737{ 1752{
1738 struct coro *coro = (struct coro *)mg->mg_ptr; 1753 /* called when perl clones the current process the slow way (windows process emulation) */
1739 1754 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1740 ++coro->refcnt; 1755 mg->mg_ptr = 0;
1756 mg->mg_virtual = 0;
1741 1757
1742 return 0; 1758 return 0;
1743} 1759}
1744 1760
1745static MGVTBL coro_state_vtbl = { 1761static MGVTBL coro_state_vtbl = {
1770 TRANSFER (ta, 1); 1786 TRANSFER (ta, 1);
1771} 1787}
1772 1788
1773/** Coro ********************************************************************/ 1789/** Coro ********************************************************************/
1774 1790
1775INLINE void 1791ECB_INLINE void
1776coro_enq (pTHX_ struct coro *coro) 1792coro_enq (pTHX_ struct coro *coro)
1777{ 1793{
1778 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1794 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1779 1795
1780 SvREFCNT_inc_NN (coro->hv); 1796 SvREFCNT_inc_NN (coro->hv);
1782 coro->next_ready = 0; 1798 coro->next_ready = 0;
1783 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1799 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1784 ready [1] = coro; 1800 ready [1] = coro;
1785} 1801}
1786 1802
1787INLINE struct coro * 1803ECB_INLINE struct coro *
1788coro_deq (pTHX) 1804coro_deq (pTHX)
1789{ 1805{
1790 int prio; 1806 int prio;
1791 1807
1792 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1808 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1845{ 1861{
1846 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1862 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1847} 1863}
1848 1864
1849/* expects to own a reference to next->hv */ 1865/* expects to own a reference to next->hv */
1850INLINE void 1866ECB_INLINE void
1851prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1867prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1852{ 1868{
1853 SV *prev_sv = SvRV (coro_current); 1869 SV *prev_sv = SvRV (coro_current);
1854 1870
1855 ta->prev = SvSTATE_hv (prev_sv); 1871 ta->prev = SvSTATE_hv (prev_sv);
1868{ 1884{
1869 for (;;) 1885 for (;;)
1870 { 1886 {
1871 struct coro *next = coro_deq (aTHX); 1887 struct coro *next = coro_deq (aTHX);
1872 1888
1873 if (expect_true (next)) 1889 if (ecb_expect_true (next))
1874 { 1890 {
1875 /* cannot transfer to destroyed coros, skip and look for next */ 1891 /* cannot transfer to destroyed coros, skip and look for next */
1876 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1892 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1877 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1893 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1878 else 1894 else
1879 { 1895 {
1880 next->flags &= ~CF_READY; 1896 next->flags &= ~CF_READY;
1881 --coro_nready; 1897 --coro_nready;
1914 } 1930 }
1915 } 1931 }
1916 } 1932 }
1917} 1933}
1918 1934
1919INLINE void 1935ECB_INLINE void
1920prepare_cede (pTHX_ struct coro_transfer_args *ta) 1936prepare_cede (pTHX_ struct coro_transfer_args *ta)
1921{ 1937{
1922 api_ready (aTHX_ coro_current); 1938 api_ready (aTHX_ coro_current);
1923 prepare_schedule (aTHX_ ta); 1939 prepare_schedule (aTHX_ ta);
1924} 1940}
1925 1941
1926INLINE void 1942ECB_INLINE void
1927prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1943prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1928{ 1944{
1929 SV *prev = SvRV (coro_current); 1945 SV *prev = SvRV (coro_current);
1930 1946
1931 if (coro_nready) 1947 if (coro_nready)
1961{ 1977{
1962 struct coro_transfer_args ta; 1978 struct coro_transfer_args ta;
1963 1979
1964 prepare_cede (aTHX_ &ta); 1980 prepare_cede (aTHX_ &ta);
1965 1981
1966 if (expect_true (ta.prev != ta.next)) 1982 if (ecb_expect_true (ta.prev != ta.next))
1967 { 1983 {
1968 TRANSFER (ta, 1); 1984 TRANSFER (ta, 1);
1969 return 1; 1985 return 1;
1970 } 1986 }
1971 else 1987 else
2014 coro->slot->runops = RUNOPS_DEFAULT; 2030 coro->slot->runops = RUNOPS_DEFAULT;
2015 } 2031 }
2016} 2032}
2017 2033
2018static void 2034static void
2035coro_push_av (pTHX_ AV *av, I32 gimme_v)
2036{
2037 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2038 {
2039 dSP;
2040
2041 if (gimme_v == G_SCALAR)
2042 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2043 else
2044 {
2045 int i;
2046 EXTEND (SP, AvFILLp (av) + 1);
2047
2048 for (i = 0; i <= AvFILLp (av); ++i)
2049 PUSHs (AvARRAY (av)[i]);
2050 }
2051
2052 PUTBACK;
2053 }
2054}
2055
2056static void
2057coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2058{
2059 if (!coro->on_destroy)
2060 coro->on_destroy = newAV ();
2061
2062 av_push (coro->on_destroy, cb);
2063}
2064
2065static void
2066slf_destroy_join (pTHX_ struct CoroSLF *frame)
2067{
2068 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2069}
2070
2071static int
2072slf_check_join (pTHX_ struct CoroSLF *frame)
2073{
2074 struct coro *coro = (struct coro *)frame->data;
2075
2076 if (!coro->status)
2077 return 1;
2078
2079 frame->destroy = 0;
2080
2081 coro_push_av (aTHX_ coro->status, GIMME_V);
2082
2083 SvREFCNT_dec ((SV *)coro->hv);
2084
2085 return 0;
2086}
2087
2088static void
2089slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2090{
2091 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2092
2093 if (items > 1)
2094 croak ("join called with too many arguments");
2095
2096 if (coro->status)
2097 frame->prepare = prepare_nop;
2098 else
2099 {
2100 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2101 frame->prepare = prepare_schedule;
2102 }
2103
2104 frame->check = slf_check_join;
2105 frame->destroy = slf_destroy_join;
2106 frame->data = (void *)coro;
2107 SvREFCNT_inc (coro->hv);
2108}
2109
2110static void
2019coro_call_on_destroy (pTHX_ struct coro *coro) 2111coro_call_on_destroy (pTHX_ struct coro *coro)
2020{ 2112{
2021 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2113 AV *od = coro->on_destroy;
2022 2114
2023 if (on_destroyp) 2115 if (!od)
2024 { 2116 return;
2025 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2026 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2027 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2028 2117
2029 while (AvFILLp (on_destroy) >= 0) 2118 while (AvFILLp (od) >= 0)
2119 {
2120 SV *cb = sv_2mortal (av_pop (od));
2121
2122 /* coro hv's (and only hv's at the moment) are supported as well */
2123 if (SvSTATEhv_p (aTHX_ cb))
2124 api_ready (aTHX_ cb);
2125 else
2030 { 2126 {
2031 dSP; /* don't disturb outer sp */ 2127 dSP; /* don't disturb outer sp */
2032 SV *cb = av_pop (on_destroy);
2033
2034 PUSHMARK (SP); 2128 PUSHMARK (SP);
2035 2129
2036 if (statusp) 2130 if (coro->status)
2037 { 2131 {
2038 int i; 2132 PUTBACK;
2039 EXTEND (SP, AvFILLp (status) + 1); 2133 coro_push_av (aTHX_ coro->status, G_ARRAY);
2040 2134 SPAGAIN;
2041 for (i = 0; i <= AvFILLp (status); ++i)
2042 PUSHs (AvARRAY (status)[i]);
2043 } 2135 }
2044 2136
2045 PUTBACK; 2137 PUTBACK;
2046 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2138 call_sv (cb, G_VOID | G_DISCARD);
2047 } 2139 }
2048 } 2140 }
2049} 2141}
2050 2142
2051static void 2143static void
2052coro_set_status (HV *coro_hv, SV **arg, int items) 2144coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2053{ 2145{
2054 AV *av = newAV (); 2146 AV *av;
2147
2148 if (coro->status)
2149 {
2150 av = coro->status;
2151 av_clear (av);
2152 }
2153 else
2154 av = coro->status = newAV ();
2055 2155
2056 /* items are actually not so common, so optimise for this case */ 2156 /* items are actually not so common, so optimise for this case */
2057 if (items) 2157 if (items)
2058 { 2158 {
2059 int i; 2159 int i;
2061 av_extend (av, items - 1); 2161 av_extend (av, items - 1);
2062 2162
2063 for (i = 0; i < items; ++i) 2163 for (i = 0; i < items; ++i)
2064 av_push (av, SvREFCNT_inc_NN (arg [i])); 2164 av_push (av, SvREFCNT_inc_NN (arg [i]));
2065 } 2165 }
2066
2067 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2068} 2166}
2069 2167
2070static void 2168static void
2071slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2169slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2072{ 2170{
2084static void 2182static void
2085slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2183slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2086{ 2184{
2087 HV *coro_hv = (HV *)SvRV (coro_current); 2185 HV *coro_hv = (HV *)SvRV (coro_current);
2088 2186
2089 coro_set_status (coro_hv, arg, items); 2187 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2090 slf_init_terminate_cancel_common (frame, coro_hv); 2188 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2091} 2189}
2092 2190
2093static void 2191static void
2094slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2192slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2095{ 2193{
2100 croak ("Coro::cancel called without coro object,"); 2198 croak ("Coro::cancel called without coro object,");
2101 2199
2102 coro = SvSTATE (arg [0]); 2200 coro = SvSTATE (arg [0]);
2103 coro_hv = coro->hv; 2201 coro_hv = coro->hv;
2104 2202
2105 coro_set_status (coro_hv, arg + 1, items - 1); 2203 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2106 2204
2107 if (expect_false (coro->flags & CF_NOCANCEL)) 2205 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2108 { 2206 {
2109 /* coro currently busy cancelling something, so just notify it */ 2207 /* coro currently busy cancelling something, so just notify it */
2110 coro->slf_frame.data = (void *)coro; 2208 coro->slf_frame.data = (void *)coro;
2111 2209
2112 frame->prepare = prepare_nop; 2210 frame->prepare = prepare_nop;
2113 frame->check = slf_check_nop; 2211 frame->check = slf_check_nop;
2114 } 2212 }
2115 else if (coro_hv == (HV *)SvRV (coro_current)) 2213 else if (coro_hv == (HV *)SvRV (coro_current))
2116 { 2214 {
2117 /* cancelling the current coro is allowed, and equals terminate */ 2215 /* cancelling the current coro is allowed, and equals terminate */
2118 slf_init_terminate_cancel_common (frame, coro_hv); 2216 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2119 } 2217 }
2120 else 2218 else
2121 { 2219 {
2122 struct coro *self = SvSTATE_current; 2220 struct coro *self = SvSTATE_current;
2123 2221
2127 * this is ugly, and hopefully fully worth the extra speed. 2225 * this is ugly, and hopefully fully worth the extra speed.
2128 * besides, I can't get the slow-but-safe version working... 2226 * besides, I can't get the slow-but-safe version working...
2129 */ 2227 */
2130 slf_frame.data = 0; 2228 slf_frame.data = 0;
2131 self->flags |= CF_NOCANCEL; 2229 self->flags |= CF_NOCANCEL;
2132
2133 coro_state_destroy (aTHX_ coro); 2230 coro_state_destroy (aTHX_ coro);
2134 coro_call_on_destroy (aTHX_ coro);
2135
2136 self->flags &= ~CF_NOCANCEL; 2231 self->flags &= ~CF_NOCANCEL;
2137 2232
2138 if (slf_frame.data) 2233 if (slf_frame.data)
2139 { 2234 {
2140 /* while we were busy we have been cancelled, so terminate */ 2235 /* while we were busy we have been cancelled, so terminate */
2141 slf_init_terminate_cancel_common (frame, self->hv); 2236 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2142 } 2237 }
2143 else 2238 else
2144 { 2239 {
2145 frame->prepare = prepare_nop; 2240 frame->prepare = prepare_nop;
2146 frame->check = slf_check_nop; 2241 frame->check = slf_check_nop;
2147 } 2242 }
2148 } 2243 }
2149} 2244}
2150 2245
2246static int
2247slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2248{
2249 frame->prepare = 0;
2250 coro_unwind_stacks (aTHX);
2251
2252 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2253
2254 return 1;
2255}
2256
2257static int
2258safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2259{
2260 if (coro->cctx)
2261 croak ("coro inside C callback, unable to cancel at this time, caught");
2262
2263 if (coro->flags & CF_NEW)
2264 {
2265 coro_set_status (aTHX_ coro, arg, items);
2266 coro_state_destroy (aTHX_ coro);
2267 }
2268 else
2269 {
2270 if (!coro->slf_frame.prepare)
2271 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2272
2273 slf_destroy (aTHX_ coro);
2274
2275 coro_set_status (aTHX_ coro, arg, items);
2276 coro->slf_frame.prepare = prepare_nop;
2277 coro->slf_frame.check = slf_check_safe_cancel;
2278
2279 api_ready (aTHX_ (SV *)coro->hv);
2280 }
2281
2282 return 1;
2283}
2284
2151/*****************************************************************************/ 2285/*****************************************************************************/
2152/* async pool handler */ 2286/* async pool handler */
2153 2287
2154static int 2288static int
2155slf_check_pool_handler (pTHX_ struct CoroSLF *frame) 2289slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
2184slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2318slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2185{ 2319{
2186 HV *hv = (HV *)SvRV (coro_current); 2320 HV *hv = (HV *)SvRV (coro_current);
2187 struct coro *coro = SvSTATE_hv ((SV *)hv); 2321 struct coro *coro = SvSTATE_hv ((SV *)hv);
2188 2322
2189 if (expect_true (coro->saved_deffh)) 2323 if (ecb_expect_true (coro->saved_deffh))
2190 { 2324 {
2191 /* subsequent iteration */ 2325 /* subsequent iteration */
2192 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2326 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2193 coro->saved_deffh = 0; 2327 coro->saved_deffh = 0;
2194 2328
2195 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2329 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2196 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2330 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2197 { 2331 {
2198 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2332 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2199 coro->invoke_av = newAV (); 2333 return;
2200
2201 frame->prepare = prepare_nop;
2202 } 2334 }
2203 else 2335 else
2204 { 2336 {
2205 av_clear (GvAV (PL_defgv)); 2337 av_clear (GvAV (PL_defgv));
2206 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2338 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2429static void 2561static void
2430slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2562slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2431{ 2563{
2432 frame->prepare = prepare_cede_notself; 2564 frame->prepare = prepare_cede_notself;
2433 frame->check = slf_check_nop; 2565 frame->check = slf_check_nop;
2566}
2567
2568/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2569static void
2570slf_destroy (pTHX_ struct coro *coro)
2571{
2572 /* this callback is reserved for slf functions needing to do cleanup */
2573 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2574 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2575
2576 /*
2577 * The on_destroy above most likely is from an SLF call.
2578 * Since by definition the SLF call will not finish when we destroy
2579 * the coro, we will have to force-finish it here, otherwise
2580 * cleanup functions cannot call SLF functions.
2581 */
2582 coro->slf_frame.prepare = 0;
2434} 2583}
2435 2584
2436/* 2585/*
2437 * these not obviously related functions are all rolled into one 2586 * these not obviously related functions are all rolled into one
2438 * function to increase chances that they all will call transfer with the same 2587 * function to increase chances that they all will call transfer with the same
2445 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2594 I32 checkmark; /* mark SP to see how many elements check has pushed */
2446 2595
2447 /* set up the slf frame, unless it has already been set-up */ 2596 /* set up the slf frame, unless it has already been set-up */
2448 /* the latter happens when a new coro has been started */ 2597 /* the latter happens when a new coro has been started */
2449 /* or when a new cctx was attached to an existing coroutine */ 2598 /* or when a new cctx was attached to an existing coroutine */
2450 if (expect_true (!slf_frame.prepare)) 2599 if (ecb_expect_true (!slf_frame.prepare))
2451 { 2600 {
2452 /* first iteration */ 2601 /* first iteration */
2453 dSP; 2602 dSP;
2454 SV **arg = PL_stack_base + TOPMARK + 1; 2603 SV **arg = PL_stack_base + TOPMARK + 1;
2455 int items = SP - arg; /* args without function object */ 2604 int items = SP - arg; /* args without function object */
2496 while (slf_frame.check (aTHX_ &slf_frame)); 2645 while (slf_frame.check (aTHX_ &slf_frame));
2497 2646
2498 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2647 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2499 2648
2500 /* exception handling */ 2649 /* exception handling */
2501 if (expect_false (CORO_THROW)) 2650 if (ecb_expect_false (CORO_THROW))
2502 { 2651 {
2503 SV *exception = sv_2mortal (CORO_THROW); 2652 SV *exception = sv_2mortal (CORO_THROW);
2504 2653
2505 CORO_THROW = 0; 2654 CORO_THROW = 0;
2506 sv_setsv (ERRSV, exception); 2655 sv_setsv (ERRSV, exception);
2507 croak (0); 2656 croak (0);
2508 } 2657 }
2509 2658
2510 /* return value handling - mostly like entersub */ 2659 /* return value handling - mostly like entersub */
2511 /* make sure we put something on the stack in scalar context */ 2660 /* make sure we put something on the stack in scalar context */
2512 if (GIMME_V == G_SCALAR) 2661 if (GIMME_V == G_SCALAR
2662 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2513 { 2663 {
2514 dSP; 2664 dSP;
2515 SV **bot = PL_stack_base + checkmark; 2665 SV **bot = PL_stack_base + checkmark;
2516 2666
2517 if (sp == bot) /* too few, push undef */ 2667 if (sp == bot) /* too few, push undef */
2518 bot [1] = &PL_sv_undef; 2668 bot [1] = &PL_sv_undef;
2519 else if (sp != bot + 1) /* too many, take last one */ 2669 else /* too many, take last one */
2520 bot [1] = *sp; 2670 bot [1] = *sp;
2521 2671
2522 SP = bot + 1; 2672 SP = bot + 1;
2523 2673
2524 PUTBACK; 2674 PUTBACK;
2631{ 2781{
2632 PerlIOBuf base; 2782 PerlIOBuf base;
2633 NV next, every; 2783 NV next, every;
2634} PerlIOCede; 2784} PerlIOCede;
2635 2785
2636static IV 2786static IV ecb_cold
2637PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2787PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2638{ 2788{
2639 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2789 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2640 2790
2641 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2791 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2642 self->next = nvtime () + self->every; 2792 self->next = nvtime () + self->every;
2643 2793
2644 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2794 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2645} 2795}
2646 2796
2647static SV * 2797static SV * ecb_cold
2648PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2798PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2649{ 2799{
2650 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2800 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2651 2801
2652 return newSVnv (self->every); 2802 return newSVnv (self->every);
2764 SvREFCNT_dec (cb); 2914 SvREFCNT_dec (cb);
2765 } 2915 }
2766} 2916}
2767 2917
2768static void 2918static void
2769coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2919coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2770{ 2920{
2771 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2921 /* call $sem->adjust (0) to possibly wake up some other waiters */
2772 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2922 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2773} 2923}
2774 2924
2775static int 2925static int
2776slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2926slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2777{ 2927{
2778 AV *av = (AV *)frame->data; 2928 AV *av = (AV *)frame->data;
2779 SV *count_sv = AvARRAY (av)[0]; 2929 SV *count_sv = AvARRAY (av)[0];
2930 SV *coro_hv = SvRV (coro_current);
2780 2931
2781 /* if we are about to throw, don't actually acquire the lock, just throw */ 2932 /* if we are about to throw, don't actually acquire the lock, just throw */
2782 if (CORO_THROW) 2933 if (CORO_THROW)
2783 return 0; 2934 return 0;
2784 else if (SvIVX (count_sv) > 0) 2935 else if (SvIVX (count_sv) > 0)
2785 { 2936 {
2786 SvSTATE_current->on_destroy = 0; 2937 frame->destroy = 0;
2787 2938
2788 if (acquire) 2939 if (acquire)
2789 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2940 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2790 else 2941 else
2791 coro_semaphore_adjust (aTHX_ av, 0); 2942 coro_semaphore_adjust (aTHX_ av, 0);
2796 { 2947 {
2797 int i; 2948 int i;
2798 /* if we were woken up but can't down, we look through the whole */ 2949 /* if we were woken up but can't down, we look through the whole */
2799 /* waiters list and only add us if we aren't in there already */ 2950 /* waiters list and only add us if we aren't in there already */
2800 /* this avoids some degenerate memory usage cases */ 2951 /* this avoids some degenerate memory usage cases */
2801 2952 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug
2802 for (i = 1; i <= AvFILLp (av); ++i)
2803 if (AvARRAY (av)[i] == SvRV (coro_current)) 2953 if (AvARRAY (av)[i] == coro_hv)
2804 return 1; 2954 return 1;
2805 2955
2806 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2956 av_push (av, SvREFCNT_inc (coro_hv));
2807 return 1; 2957 return 1;
2808 } 2958 }
2809} 2959}
2810 2960
2811static int 2961static int
2834 { 2984 {
2835 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2985 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2836 2986
2837 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2987 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2838 frame->prepare = prepare_schedule; 2988 frame->prepare = prepare_schedule;
2839
2840 /* to avoid race conditions when a woken-up coro gets terminated */ 2989 /* to avoid race conditions when a woken-up coro gets terminated */
2841 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2990 /* we arrange for a temporary on_destroy that calls adjust (0) */
2842 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2991 frame->destroy = coro_semaphore_destroy;
2843 } 2992 }
2844} 2993}
2845 2994
2846static void 2995static void
2847slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2996slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
3065 dSP; 3214 dSP;
3066 3215
3067 static SV *prio_cv; 3216 static SV *prio_cv;
3068 static SV *prio_sv; 3217 static SV *prio_sv;
3069 3218
3070 if (expect_false (!prio_cv)) 3219 if (ecb_expect_false (!prio_cv))
3071 { 3220 {
3072 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3221 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3073 prio_sv = newSViv (0); 3222 prio_sv = newSViv (0);
3074 } 3223 }
3075 3224
3181 } 3330 }
3182 3331
3183 return coro_sv; 3332 return coro_sv;
3184} 3333}
3185 3334
3335#ifndef __cplusplus
3336ecb_cold XS(boot_Coro__State);
3337#endif
3338
3339#if CORO_JIT
3340
3341static void ecb_noinline ecb_cold
3342pushav_3uv (pTHX_ UV a, UV b, UV c)
3343{
3344 dSP;
3345 AV *av = newAV ();
3346
3347 av_store (av, 2, newSVuv (c));
3348 av_store (av, 1, newSVuv (b));
3349 av_store (av, 0, newSVuv (a));
3350
3351 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3352
3353 PUTBACK;
3354}
3355
3356static void ecb_noinline ecb_cold
3357jit_init (pTHX)
3358{
3359 dSP;
3360 SV *load, *save;
3361 char *map_base;
3362 char *load_ptr, *save_ptr;
3363 STRLEN load_len, save_len;
3364 int count;
3365
3366 PUSHMARK (SP);
3367 PUTBACK;
3368#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type));
3369# include "state.h"
3370#undef VARx
3371 count = call_pv ("Coro::State::_jit", G_ARRAY);
3372 SPAGAIN;
3373
3374 save = POPs; save_ptr = SvPVbyte (save, save_len);
3375 load = POPs; load_ptr = SvPVbyte (load, load_len);
3376
3377 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3378
3379 assert (("Coro: unable mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3380
3381 load_perl_slots = (load_save_perl_slots_type)map_base;
3382 memcpy (map_base, load_ptr, load_len);
3383
3384 map_base += (load_len + 15) & ~15;
3385
3386 save_perl_slots = (load_save_perl_slots_type)map_base;
3387 memcpy (map_base, save_ptr, save_len);
3388}
3389
3390#endif
3391
3186MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3392MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3187 3393
3188PROTOTYPES: DISABLE 3394PROTOTYPES: DISABLE
3189 3395
3190BOOT: 3396BOOT:
3194 coro_thx = PERL_GET_CONTEXT; 3400 coro_thx = PERL_GET_CONTEXT;
3195# endif 3401# endif
3196#endif 3402#endif
3197 BOOT_PAGESIZE; 3403 BOOT_PAGESIZE;
3198 3404
3405 /* perl defines these to check for existance first, but why it doesn't */
3406 /* just create them one at init time is not clear to me, except for */
3407 /* programs trying to delete them, but... */
3408 /* anyway, we declare this as invalid and make sure they are initialised here */
3409 DEFSV;
3410 ERRSV;
3411
3199 cctx_current = cctx_new_empty (); 3412 cctx_current = cctx_new_empty ();
3200 3413
3201 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3414 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3202 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3415 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3203 3416
3245 coroapi.prepare_cede_notself = prepare_cede_notself; 3458 coroapi.prepare_cede_notself = prepare_cede_notself;
3246 3459
3247 time_init (aTHX); 3460 time_init (aTHX);
3248 3461
3249 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3462 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3463#if CORO_JIT
3464 PUTBACK;
3465 require_pv ("Coro/jit-" CORO_JIT_TYPE ".pl");
3466 jit_init (aTHX);
3467 perl_eval_pv ("undef &Coro::State::_jit", 1);
3468 SPAGAIN;
3469#endif
3250} 3470}
3251 3471
3252SV * 3472SV *
3253new (SV *klass, ...) 3473new (SV *klass, ...)
3254 ALIAS: 3474 ALIAS:
3396 PROTOTYPE: $ 3616 PROTOTYPE: $
3397 ALIAS: 3617 ALIAS:
3398 is_ready = CF_READY 3618 is_ready = CF_READY
3399 is_running = CF_RUNNING 3619 is_running = CF_RUNNING
3400 is_new = CF_NEW 3620 is_new = CF_NEW
3401 is_destroyed = CF_DESTROYED 3621 is_destroyed = CF_ZOMBIE
3622 is_zombie = CF_ZOMBIE
3402 is_suspended = CF_SUSPENDED 3623 is_suspended = CF_SUSPENDED
3403 CODE: 3624 CODE:
3404 RETVAL = boolSV (coro->flags & ix); 3625 RETVAL = boolSV (coro->flags & ix);
3405 OUTPUT: 3626 OUTPUT:
3406 RETVAL 3627 RETVAL
3501times (Coro::State self) 3722times (Coro::State self)
3502 PPCODE: 3723 PPCODE:
3503{ 3724{
3504 struct coro *current = SvSTATE (coro_current); 3725 struct coro *current = SvSTATE (coro_current);
3505 3726
3506 if (expect_false (current == self)) 3727 if (ecb_expect_false (current == self))
3507 { 3728 {
3508 coro_times_update (); 3729 coro_times_update ();
3509 coro_times_add (SvSTATE (coro_current)); 3730 coro_times_add (SvSTATE (coro_current));
3510 } 3731 }
3511 3732
3512 EXTEND (SP, 2); 3733 EXTEND (SP, 2);
3513 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3734 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3514 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3735 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3515 3736
3516 if (expect_false (current == self)) 3737 if (ecb_expect_false (current == self))
3517 coro_times_sub (SvSTATE (coro_current)); 3738 coro_times_sub (SvSTATE (coro_current));
3518} 3739}
3519 3740
3520void 3741void
3521swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3742swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3542BOOT: 3763BOOT:
3543{ 3764{
3544 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3765 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3545 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3766 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3546 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3767 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3547 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3548 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3768 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3549 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3769 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3550 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3770 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3551 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3771 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3552 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3772 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3595void 3815void
3596_destroy (Coro::State coro) 3816_destroy (Coro::State coro)
3597 CODE: 3817 CODE:
3598 /* used by the manager thread */ 3818 /* used by the manager thread */
3599 coro_state_destroy (aTHX_ coro); 3819 coro_state_destroy (aTHX_ coro);
3820
3821void
3822on_destroy (Coro::State coro, SV *cb)
3823 CODE:
3600 coro_call_on_destroy (aTHX_ coro); 3824 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3825
3826void
3827join (...)
3828 CODE:
3829 CORO_EXECUTE_SLF_XS (slf_init_join);
3601 3830
3602void 3831void
3603terminate (...) 3832terminate (...)
3604 CODE: 3833 CODE:
3605 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3834 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3606 3835
3607void 3836void
3608cancel (...) 3837cancel (...)
3609 CODE: 3838 CODE:
3610 CORO_EXECUTE_SLF_XS (slf_init_cancel); 3839 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3840
3841int
3842safe_cancel (Coro::State self, ...)
3843 C_ARGS: aTHX_ self, &ST (1), items - 1
3611 3844
3612void 3845void
3613schedule (...) 3846schedule (...)
3614 CODE: 3847 CODE:
3615 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3848 CORO_EXECUTE_SLF_XS (slf_init_schedule);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines