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.396 by root, Fri May 6 18:01:13 2011 UTC vs.
Revision 1.423 by root, Mon Oct 8 23:13:36 2012 UTC

… …
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 17
18#define ECB_NO_THREADS 1
19#include "ecb.h"
20
21#include <stddef.h>
18#include <stdio.h> 22#include <stdio.h>
19#include <errno.h> 23#include <errno.h>
20#include <assert.h> 24#include <assert.h>
21 25
22#ifndef SVs_PADSTALE 26#ifndef SVs_PADSTALE
… …
31# define setjmp _setjmp /* deep magic */ 35# define setjmp _setjmp /* deep magic */
32#else 36#else
33# include <inttypes.h> /* most portable stdint.h */ 37# include <inttypes.h> /* most portable stdint.h */
34#endif 38#endif
35 39
36#ifdef HAVE_MMAP 40#if HAVE_MMAP
37# include <unistd.h> 41# include <unistd.h>
38# include <sys/mman.h> 42# include <sys/mman.h>
39# ifndef MAP_ANONYMOUS 43# ifndef MAP_ANONYMOUS
40# ifdef MAP_ANON 44# ifdef MAP_ANON
41# define MAP_ANONYMOUS MAP_ANON 45# define MAP_ANONYMOUS MAP_ANON
… …
61#endif 65#endif
62 66
63/* the maximum number of idle cctx that will be pooled */ 67/* the maximum number of idle cctx that will be pooled */
64static int cctx_max_idle = 4; 68static int cctx_max_idle = 4;
65 69
70#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
71# define HAS_SCOPESTACK_NAME 1
72#endif
73
66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 74#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
67# undef CORO_STACKGUARD 75# undef CORO_STACKGUARD
68#endif 76#endif
69 77
70#ifndef CORO_STACKGUARD 78#ifndef CORO_STACKGUARD
… …
86# define STACKLEVEL ((void *)&stacklevel) 94# define STACKLEVEL ((void *)&stacklevel)
87#endif 95#endif
88 96
89#define IN_DESTRUCT PL_dirty 97#define IN_DESTRUCT PL_dirty
90 98
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" 99#include "CoroAPI.h"
107#define GCoroAPI (&coroapi) /* very sneaky */ 100#define GCoroAPI (&coroapi) /* very sneaky */
108 101
109#ifdef USE_ITHREADS 102#ifdef USE_ITHREADS
110# if CORO_PTHREAD 103# if CORO_PTHREAD
… …
126static void (*u2time)(pTHX_ UV ret[2]); 119static void (*u2time)(pTHX_ UV ret[2]);
127 120
128/* we hijack an hopefully unused CV flag for our purposes */ 121/* we hijack an hopefully unused CV flag for our purposes */
129#define CVf_SLF 0x4000 122#define CVf_SLF 0x4000
130static OP *pp_slf (pTHX); 123static OP *pp_slf (pTHX);
124static void slf_destroy (pTHX_ struct coro *coro);
131 125
132static U32 cctx_gen; 126static U32 cctx_gen;
133static size_t cctx_stacksize = CORO_STACKSIZE; 127static size_t cctx_stacksize = CORO_STACKSIZE;
134static struct CoroAPI coroapi; 128static struct CoroAPI coroapi;
135static AV *main_mainstack; /* used to differentiate between $main and others */ 129static AV *main_mainstack; /* used to differentiate between $main and others */
… …
165static char times_valid; 159static char times_valid;
166 160
167static struct coro_cctx *cctx_first; 161static struct coro_cctx *cctx_first;
168static int cctx_count, cctx_idle; 162static int cctx_count, cctx_idle;
169 163
170enum { 164enum
165{
171 CC_MAPPED = 0x01, 166 CC_MAPPED = 0x01,
172 CC_NOREUSE = 0x02, /* throw this away after tracing */ 167 CC_NOREUSE = 0x02, /* throw this away after tracing */
173 CC_TRACE = 0x04, 168 CC_TRACE = 0x04,
174 CC_TRACE_SUB = 0x08, /* trace sub calls */ 169 CC_TRACE_SUB = 0x08, /* trace sub calls */
175 CC_TRACE_LINE = 0x10, /* trace each statement */ 170 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
185 void *sptr; 180 void *sptr;
186 size_t ssize; 181 size_t ssize;
187 182
188 /* cpu state */ 183 /* cpu state */
189 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 184 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
185#ifndef NDEBUG
190 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 186 JMPENV *idle_te; /* same as idle_sp, but for top_env */
187#endif
191 JMPENV *top_env; 188 JMPENV *top_env;
192 coro_context cctx; 189 coro_context cctx;
193 190
194 U32 gen; 191 U32 gen;
195#if CORO_USE_VALGRIND 192#if CORO_USE_VALGRIND
… …
200 197
201static coro_cctx *cctx_current; /* the currently running cctx */ 198static coro_cctx *cctx_current; /* the currently running cctx */
202 199
203/*****************************************************************************/ 200/*****************************************************************************/
204 201
202static MGVTBL coro_state_vtbl;
203
205enum { 204enum
205{
206 CF_RUNNING = 0x0001, /* coroutine is running */ 206 CF_RUNNING = 0x0001, /* coroutine is running */
207 CF_READY = 0x0002, /* coroutine is ready */ 207 CF_READY = 0x0002, /* coroutine is ready */
208 CF_NEW = 0x0004, /* has never been switched to */ 208 CF_NEW = 0x0004, /* has never been switched to */
209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 209 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
211 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */ 211 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
212}; 212};
213 213
214/* the structure where most of the perl state is stored, overlaid on the cxstack */ 214/* the structure where most of the perl state is stored, overlaid on the cxstack */
215typedef struct 215typedef struct
216{ 216{
217 SV *defsv;
218 AV *defav;
219 SV *errsv;
220 SV *irsgv;
221 HV *hinthv;
222#define VAR(name,type) type name; 217 #define VARx(name,expr,type) type name;
223# include "state.h" 218 #include "state.h"
224#undef VAR
225} perl_slots; 219} perl_slots;
226 220
221/* 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)) 222#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
228 223
229/* this is a structure representing a perl-level coroutine */ 224/* this is a structure representing a perl-level coroutine */
230struct coro { 225struct coro
226{
231 /* the C coroutine allocated to this perl coroutine, if any */ 227 /* the C coroutine allocated to this perl coroutine, if any */
232 coro_cctx *cctx; 228 coro_cctx *cctx;
233 229
234 /* ready queue */ 230 /* ready queue */
235 struct coro *next_ready; 231 struct coro *next_ready;
… …
237 /* state data */ 233 /* state data */
238 struct CoroSLF slf_frame; /* saved slf frame */ 234 struct CoroSLF slf_frame; /* saved slf frame */
239 AV *mainstack; 235 AV *mainstack;
240 perl_slots *slot; /* basically the saved sp */ 236 perl_slots *slot; /* basically the saved sp */
241 237
242 CV *startcv; /* the CV to execute */ 238 CV *startcv; /* the CV to execute */
243 AV *args; /* data associated with this coroutine (initial args) */ 239 AV *args; /* data associated with this coroutine (initial args) */
244 int refcnt; /* coroutines are refcounted, yes */
245 int flags; /* CF_ flags */ 240 int flags; /* CF_ flags */
246 HV *hv; /* the perl hash associated with this coro, if any */ 241 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 242
249 /* statistics */ 243 /* statistics */
250 int usecount; /* number of transfers to this coro */ 244 int usecount; /* number of transfers to this coro */
251 245
252 /* coro process data */ 246 /* coro process data */
253 int prio; 247 int prio;
254 SV *except; /* exception to be thrown */ 248 SV *except; /* exception to be thrown */
255 SV *rouse_cb; 249 SV *rouse_cb; /* last rouse callback */
250 AV *on_destroy; /* callbacks or coros to notify on destroy */
251 AV *status; /* the exit status list */
256 252
257 /* async_pool */ 253 /* async_pool */
258 SV *saved_deffh; 254 SV *saved_deffh;
259 SV *invoke_cb; 255 SV *invoke_cb;
260 AV *invoke_av; 256 AV *invoke_av;
… …
292 288
293/* for Coro.pm */ 289/* for Coro.pm */
294static SV *coro_current; 290static SV *coro_current;
295static SV *coro_readyhook; 291static SV *coro_readyhook;
296static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 292static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
297static CV *cv_coro_run, *cv_coro_terminate; 293static CV *cv_coro_run;
298static struct coro *coro_first; 294static struct coro *coro_first;
299#define coro_nready coroapi.nready 295#define coro_nready coroapi.nready
296
297/** JIT *********************************************************************/
298
299#if CORO_JIT
300 /* APPLE doesn't have HAVE_MMAP though */
301 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
302 #ifndef CORO_JIT_TYPE
303 #if __x86_64 && CORO_JIT_UNIXY
304 #define CORO_JIT_TYPE "amd64-unix"
305 #elif __i386 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "x86-unix"
307 #endif
308 #endif
309#endif
310
311#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP
312 #undef CORO_JIT
313#endif
314
315#if CORO_JIT
316 typedef void (*load_save_perl_slots_type)(perl_slots *);
317 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
318#endif
300 319
301/** Coro::Select ************************************************************/ 320/** Coro::Select ************************************************************/
302 321
303static OP *(*coro_old_pp_sselect) (pTHX); 322static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select; 323static SV *coro_select_select;
… …
320 339
321/** time stuff **************************************************************/ 340/** time stuff **************************************************************/
322 341
323#ifdef HAS_GETTIMEOFDAY 342#ifdef HAS_GETTIMEOFDAY
324 343
325static void 344ecb_inline void
326coro_u2time (pTHX_ UV ret[2]) 345coro_u2time (pTHX_ UV ret[2])
327{ 346{
328 struct timeval tv; 347 struct timeval tv;
329 gettimeofday (&tv, 0); 348 gettimeofday (&tv, 0);
330 349
331 ret [0] = tv.tv_sec; 350 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec; 351 ret [1] = tv.tv_usec;
333} 352}
334 353
335static double 354ecb_inline double
336coro_nvtime () 355coro_nvtime (void)
337{ 356{
338 struct timeval tv; 357 struct timeval tv;
339 gettimeofday (&tv, 0); 358 gettimeofday (&tv, 0);
340 359
341 return tv.tv_sec + tv.tv_usec * 1e-6; 360 return tv.tv_sec + tv.tv_usec * 1e-6;
342} 361}
343 362
344static void 363ecb_inline void
345time_init (pTHX) 364time_init (pTHX)
346{ 365{
347 nvtime = coro_nvtime; 366 nvtime = coro_nvtime;
348 u2time = coro_u2time; 367 u2time = coro_u2time;
349} 368}
350 369
351#else 370#else
352 371
353static void 372ecb_inline void
354time_init (pTHX) 373time_init (pTHX)
355{ 374{
356 SV **svp; 375 SV **svp;
357 376
358 require_pv ("Time/HiRes.pm"); 377 require_pv ("Time/HiRes.pm");
… …
370 389
371#endif 390#endif
372 391
373/** lowlevel stuff **********************************************************/ 392/** lowlevel stuff **********************************************************/
374 393
375static SV * 394static SV * ecb_noinline
376coro_get_sv (pTHX_ const char *name, int create) 395coro_get_sv (pTHX_ const char *name, int create)
377{ 396{
378#if PERL_VERSION_ATLEAST (5,10,0) 397#if PERL_VERSION_ATLEAST (5,10,0)
379 /* 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 */
380 get_sv (name, create); 399 get_sv (name, create);
381#endif 400#endif
382 return get_sv (name, create); 401 return get_sv (name, create);
383} 402}
384 403
385static AV * 404static AV * ecb_noinline
386coro_get_av (pTHX_ const char *name, int create) 405coro_get_av (pTHX_ const char *name, int create)
387{ 406{
388#if PERL_VERSION_ATLEAST (5,10,0) 407#if PERL_VERSION_ATLEAST (5,10,0)
389 /* 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 */
390 get_av (name, create); 409 get_av (name, create);
391#endif 410#endif
392 return get_av (name, create); 411 return get_av (name, create);
393} 412}
394 413
395static HV * 414static HV * ecb_noinline
396coro_get_hv (pTHX_ const char *name, int create) 415coro_get_hv (pTHX_ const char *name, int create)
397{ 416{
398#if PERL_VERSION_ATLEAST (5,10,0) 417#if PERL_VERSION_ATLEAST (5,10,0)
399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 418 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
400 get_hv (name, create); 419 get_hv (name, create);
401#endif 420#endif
402 return get_hv (name, create); 421 return get_hv (name, create);
403} 422}
404 423
405INLINE void 424ecb_inline void
406coro_times_update () 425coro_times_update (void)
407{ 426{
408#ifdef coro_clock_gettime 427#ifdef coro_clock_gettime
409 struct timespec ts; 428 struct timespec ts;
410 429
411 ts.tv_sec = ts.tv_nsec = 0; 430 ts.tv_sec = ts.tv_nsec = 0;
… …
423 time_real [0] = tv [0]; 442 time_real [0] = tv [0];
424 time_real [1] = tv [1] * 1000; 443 time_real [1] = tv [1] * 1000;
425#endif 444#endif
426} 445}
427 446
428INLINE void 447ecb_inline void
429coro_times_add (struct coro *c) 448coro_times_add (struct coro *c)
430{ 449{
431 c->t_real [1] += time_real [1]; 450 c->t_real [1] += time_real [1];
432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 451 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
433 c->t_real [0] += time_real [0]; 452 c->t_real [0] += time_real [0];
… …
435 c->t_cpu [1] += time_cpu [1]; 454 c->t_cpu [1] += time_cpu [1];
436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 455 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
437 c->t_cpu [0] += time_cpu [0]; 456 c->t_cpu [0] += time_cpu [0];
438} 457}
439 458
440INLINE void 459ecb_inline void
441coro_times_sub (struct coro *c) 460coro_times_sub (struct coro *c)
442{ 461{
443 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 462 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]; 463 c->t_real [1] -= time_real [1];
445 c->t_real [0] -= time_real [0]; 464 c->t_real [0] -= time_real [0];
… …
453/* magic glue */ 472/* magic glue */
454 473
455#define CORO_MAGIC_type_cv 26 474#define CORO_MAGIC_type_cv 26
456#define CORO_MAGIC_type_state PERL_MAGIC_ext 475#define CORO_MAGIC_type_state PERL_MAGIC_ext
457 476
458#define CORO_MAGIC_NN(sv, type) \ 477#define CORO_MAGIC_NN(sv, type) \
459 (expect_true (SvMAGIC (sv)->mg_type == type) \ 478 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
460 ? SvMAGIC (sv) \ 479 ? SvMAGIC (sv) \
461 : mg_find (sv, type)) 480 : mg_find (sv, type))
462 481
463#define CORO_MAGIC(sv, type) \ 482#define CORO_MAGIC(sv, type) \
464 (expect_true (SvMAGIC (sv)) \ 483 (ecb_expect_true (SvMAGIC (sv)) \
465 ? CORO_MAGIC_NN (sv, type) \ 484 ? CORO_MAGIC_NN (sv, type) \
466 : 0) 485 : 0)
467 486
468#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 487#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) 488#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
470 489
471INLINE struct coro * 490ecb_inline MAGIC *
491SvSTATEhv_p (pTHX_ SV *coro)
492{
493 MAGIC *mg;
494
495 if (ecb_expect_true (
496 SvTYPE (coro) == SVt_PVHV
497 && (mg = CORO_MAGIC_state (coro))
498 && mg->mg_virtual == &coro_state_vtbl
499 ))
500 return mg;
501
502 return 0;
503}
504
505ecb_inline struct coro *
472SvSTATE_ (pTHX_ SV *coro) 506SvSTATE_ (pTHX_ SV *coro)
473{ 507{
474 HV *stash;
475 MAGIC *mg; 508 MAGIC *mg;
476 509
477 if (SvROK (coro)) 510 if (SvROK (coro))
478 coro = SvRV (coro); 511 coro = SvRV (coro);
479 512
480 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 513 mg = SvSTATEhv_p (aTHX_ coro);
514 if (!mg)
481 croak ("Coro::State object required"); 515 croak ("Coro::State object required");
482 516
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; 517 return (struct coro *)mg->mg_ptr;
493} 518}
494 519
495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 520#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
496 521
… …
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 524#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500 525
501/*****************************************************************************/ 526/*****************************************************************************/
502/* padlist management and caching */ 527/* padlist management and caching */
503 528
504static AV * 529ecb_inline AV *
505coro_derive_padlist (pTHX_ CV *cv) 530coro_derive_padlist (pTHX_ CV *cv)
506{ 531{
507 AV *padlist = CvPADLIST (cv); 532 AV *padlist = CvPADLIST (cv);
508 AV *newpadlist, *newpad; 533 AV *newpadlist, *newpad;
509 534
… …
521 av_store (newpadlist, 1, (SV *)newpad); 546 av_store (newpadlist, 1, (SV *)newpad);
522 547
523 return newpadlist; 548 return newpadlist;
524} 549}
525 550
526static void 551ecb_inline void
527free_padlist (pTHX_ AV *padlist) 552free_padlist (pTHX_ AV *padlist)
528{ 553{
529 /* may be during global destruction */ 554 /* may be during global destruction */
530 if (!IN_DESTRUCT) 555 if (!IN_DESTRUCT)
531 { 556 {
… …
574 0, 0, 0, 0, 599 0, 0, 0, 0,
575 coro_cv_free 600 coro_cv_free
576}; 601};
577 602
578/* the next two functions merely cache the padlists */ 603/* the next two functions merely cache the padlists */
579static void 604ecb_inline void
580get_padlist (pTHX_ CV *cv) 605get_padlist (pTHX_ CV *cv)
581{ 606{
582 MAGIC *mg = CORO_MAGIC_cv (cv); 607 MAGIC *mg = CORO_MAGIC_cv (cv);
583 AV *av; 608 AV *av;
584 609
585 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 610 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 611 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
587 else 612 else
588 { 613 {
589#if CORO_PREFER_PERL_FUNCTIONS 614#if CORO_PREFER_PERL_FUNCTIONS
590 /* this is probably cleaner? but also slower! */ 615 /* this is probably cleaner? but also slower! */
… …
597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 622 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
598#endif 623#endif
599 } 624 }
600} 625}
601 626
602static void 627ecb_inline void
603put_padlist (pTHX_ CV *cv) 628put_padlist (pTHX_ CV *cv)
604{ 629{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 630 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av; 631 AV *av;
607 632
608 if (expect_false (!mg)) 633 if (ecb_expect_false (!mg))
609 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 634 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
610 635
611 av = (AV *)mg->mg_obj; 636 av = (AV *)mg->mg_obj;
612 637
613 if (expect_false (AvFILLp (av) >= AvMAX (av))) 638 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
614 av_extend (av, AvFILLp (av) + 1); 639 av_extend (av, AvFILLp (av) + 1);
615 640
616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 641 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
617} 642}
618 643
619/** load & save, init *******************************************************/ 644/** load & save, init *******************************************************/
620 645
646ecb_inline void
647swap_sv (SV *a, SV *b)
648{
649 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
650 SV tmp;
651
652 /* swap sv_any */
653 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
654
655 /* swap sv_flags */
656 SvFLAGS (&tmp) = SvFLAGS (a);
657 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
658 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
659
660#if PERL_VERSION_ATLEAST (5,10,0)
661 /* perl 5.10 and later complicates this _quite_ a bit, but it also
662 * is much faster, so no quarrels here. alternatively, we could
663 * sv_upgrade to avoid this.
664 */
665 {
666 /* swap sv_u */
667 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
668
669 /* if SvANY points to the head, we need to adjust the pointers,
670 * as the pointer for a still points to b, and maybe vice versa.
671 */
672 #define svany_in_head(type) \
673 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
674
675 if (svany_in_head (SvTYPE (a)))
676 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
677
678 if (svany_in_head (SvTYPE (b)))
679 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
680 }
681#endif
682}
683
621/* swap sv heads, at least logically */ 684/* swap sv heads, at least logically */
622static void 685static void
623swap_svs (pTHX_ Coro__State c) 686swap_svs (pTHX_ Coro__State c)
624{ 687{
625 int i; 688 int i;
626 689
627 for (i = 0; i <= AvFILLp (c->swap_sv); ) 690 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
628 { 691 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
629 SV *a = AvARRAY (c->swap_sv)[i++];
630 SV *b = AvARRAY (c->swap_sv)[i++];
631
632 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
633 SV tmp;
634
635 /* swap sv_any */
636 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
637
638 /* swap sv_flags */
639 SvFLAGS (&tmp) = SvFLAGS (a);
640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
642
643#if PERL_VERSION_ATLEAST (5,10,0)
644 /* perl 5.10 complicates this _quite_ a bit, but it also is
645 * much faster, so no quarrels here. alternatively, we could
646 * sv_upgrade to avoid this.
647 */
648 {
649 /* swap sv_u */
650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
651
652 /* if SvANY points to the head, we need to adjust the pointers,
653 * as the pointer for a still points to b, and maybe vice versa.
654 */
655 #define svany_in_head(type) \
656 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
657
658 if (svany_in_head (SvTYPE (a)))
659 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
660
661 if (svany_in_head (SvTYPE (b)))
662 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
663 }
664#endif
665 }
666} 692}
667 693
668#define SWAP_SVS(coro) \ 694#define SWAP_SVS(coro) \
669 if (expect_false ((coro)->swap_sv)) \ 695 if (ecb_expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro)) 696 swap_svs (aTHX_ (coro))
671 697
672static void 698static void
673on_enterleave_call (pTHX_ SV *cb); 699on_enterleave_call (pTHX_ SV *cb);
674 700
… …
678 perl_slots *slot = c->slot; 704 perl_slots *slot = c->slot;
679 c->slot = 0; 705 c->slot = 0;
680 706
681 PL_mainstack = c->mainstack; 707 PL_mainstack = c->mainstack;
682 708
683 GvSV (PL_defgv) = slot->defsv; 709#if CORO_JIT
684 GvAV (PL_defgv) = slot->defav; 710 load_perl_slots (slot);
685 GvSV (PL_errgv) = slot->errsv; 711#else
686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
688
689 #define VAR(name,type) PL_ ## name = slot->name; 712 #define VARx(name,expr,type) expr = slot->name;
690 # include "state.h" 713 #include "state.h"
691 #undef VAR 714#endif
692 715
693 { 716 {
694 dSP; 717 dSP;
695 718
696 CV *cv; 719 CV *cv;
697 720
698 /* now do the ugly restore mess */ 721 /* now do the ugly restore mess */
699 while (expect_true (cv = (CV *)POPs)) 722 while (ecb_expect_true (cv = (CV *)POPs))
700 { 723 {
701 put_padlist (aTHX_ cv); /* mark this padlist as available */ 724 put_padlist (aTHX_ cv); /* mark this padlist as available */
702 CvDEPTH (cv) = PTR2IV (POPs); 725 CvDEPTH (cv) = PTR2IV (POPs);
703 CvPADLIST (cv) = (AV *)POPs; 726 CvPADLIST (cv) = (AV *)POPs;
704 } 727 }
… …
707 } 730 }
708 731
709 slf_frame = c->slf_frame; 732 slf_frame = c->slf_frame;
710 CORO_THROW = c->except; 733 CORO_THROW = c->except;
711 734
712 if (expect_false (enable_times)) 735 if (ecb_expect_false (enable_times))
713 { 736 {
714 if (expect_false (!times_valid)) 737 if (ecb_expect_false (!times_valid))
715 coro_times_update (); 738 coro_times_update ();
716 739
717 coro_times_sub (c); 740 coro_times_sub (c);
718 } 741 }
719 742
720 if (expect_false (c->on_enter)) 743 if (ecb_expect_false (c->on_enter))
721 { 744 {
722 int i; 745 int i;
723 746
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 747 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 748 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
731static void 754static void
732save_perl (pTHX_ Coro__State c) 755save_perl (pTHX_ Coro__State c)
733{ 756{
734 SWAP_SVS (c); 757 SWAP_SVS (c);
735 758
736 if (expect_false (c->on_leave)) 759 if (ecb_expect_false (c->on_leave))
737 { 760 {
738 int i; 761 int i;
739 762
740 for (i = AvFILLp (c->on_leave); i >= 0; --i) 763 for (i = AvFILLp (c->on_leave); i >= 0; --i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 764 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 } 765 }
743 766
744 times_valid = 0; 767 times_valid = 0;
745 768
746 if (expect_false (enable_times)) 769 if (ecb_expect_false (enable_times))
747 { 770 {
748 coro_times_update (); times_valid = 1; 771 coro_times_update (); times_valid = 1;
749 coro_times_add (c); 772 coro_times_add (c);
750 } 773 }
751 774
… …
765 788
766 XPUSHs (Nullsv); 789 XPUSHs (Nullsv);
767 /* this loop was inspired by pp_caller */ 790 /* this loop was inspired by pp_caller */
768 for (;;) 791 for (;;)
769 { 792 {
770 while (expect_true (cxix >= 0)) 793 while (ecb_expect_true (cxix >= 0))
771 { 794 {
772 PERL_CONTEXT *cx = &ccstk[cxix--]; 795 PERL_CONTEXT *cx = &ccstk[cxix--];
773 796
774 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 797 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
775 { 798 {
776 CV *cv = cx->blk_sub.cv; 799 CV *cv = cx->blk_sub.cv;
777 800
778 if (expect_true (CvDEPTH (cv))) 801 if (ecb_expect_true (CvDEPTH (cv)))
779 { 802 {
780 EXTEND (SP, 3); 803 EXTEND (SP, 3);
781 PUSHs ((SV *)CvPADLIST (cv)); 804 PUSHs ((SV *)CvPADLIST (cv));
782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 805 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
783 PUSHs ((SV *)cv); 806 PUSHs ((SV *)cv);
… …
786 get_padlist (aTHX_ cv); 809 get_padlist (aTHX_ cv);
787 } 810 }
788 } 811 }
789 } 812 }
790 813
791 if (expect_true (top_si->si_type == PERLSI_MAIN)) 814 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
792 break; 815 break;
793 816
794 top_si = top_si->si_prev; 817 top_si = top_si->si_prev;
795 ccstk = top_si->si_cxstack; 818 ccstk = top_si->si_cxstack;
796 cxix = top_si->si_cxix; 819 cxix = top_si->si_cxix;
… …
798 821
799 PUTBACK; 822 PUTBACK;
800 } 823 }
801 824
802 /* allocate some space on the context stack for our purposes */ 825 /* allocate some space on the context stack for our purposes */
803 /* we manually unroll here, as usually 2 slots is enough */ 826 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
804 if (SLOT_COUNT >= 1) CXINC;
805 if (SLOT_COUNT >= 2) CXINC;
806 if (SLOT_COUNT >= 3) CXINC;
807 { 827 {
808 unsigned int i; 828 unsigned int i;
829
809 for (i = 3; i < SLOT_COUNT; ++i) 830 for (i = 0; i < SLOT_COUNT; ++i)
810 CXINC; 831 CXINC;
811 } 832
812 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 833 cxstack_ix -= SLOT_COUNT; /* undo allocation */
834 }
813 835
814 c->mainstack = PL_mainstack; 836 c->mainstack = PL_mainstack;
815 837
816 { 838 {
817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 839 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
818 840
819 slot->defav = GvAV (PL_defgv); 841#if CORO_JIT
820 slot->defsv = DEFSV; 842 save_perl_slots (slot);
821 slot->errsv = ERRSV; 843#else
822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
824
825 #define VAR(name,type) slot->name = PL_ ## name; 844 #define VARx(name,expr,type) slot->name = expr;
826 # include "state.h" 845 #include "state.h"
827 #undef VAR 846#endif
828 } 847 }
829} 848}
830 849
831/* 850/*
832 * allocate various perl stacks. This is almost an exact copy 851 * allocate various perl stacks. This is almost an exact copy
… …
838# define coro_init_stacks(thx) init_stacks () 857# define coro_init_stacks(thx) init_stacks ()
839#else 858#else
840static void 859static void
841coro_init_stacks (pTHX) 860coro_init_stacks (pTHX)
842{ 861{
843 PL_curstackinfo = new_stackinfo(32, 8); 862 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; 863 PL_curstackinfo->si_type = PERLSI_MAIN;
845 PL_curstack = PL_curstackinfo->si_stack; 864 PL_curstack = PL_curstackinfo->si_stack;
846 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 865 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
847 866
848 PL_stack_base = AvARRAY(PL_curstack); 867 PL_stack_base = AvARRAY(PL_curstack);
… …
863#endif 882#endif
864 883
865 New(54,PL_scopestack,8,I32); 884 New(54,PL_scopestack,8,I32);
866 PL_scopestack_ix = 0; 885 PL_scopestack_ix = 0;
867 PL_scopestack_max = 8; 886 PL_scopestack_max = 8;
887#if HAS_SCOPESTACK_NAME
888 New(54,PL_scopestack_name,8,const char*);
889#endif
868 890
869 New(54,PL_savestack,24,ANY); 891 New(54,PL_savestack,24,ANY);
870 PL_savestack_ix = 0; 892 PL_savestack_ix = 0;
871 PL_savestack_max = 24; 893 PL_savestack_max = 24;
872 894
… …
900 } 922 }
901 923
902 Safefree (PL_tmps_stack); 924 Safefree (PL_tmps_stack);
903 Safefree (PL_markstack); 925 Safefree (PL_markstack);
904 Safefree (PL_scopestack); 926 Safefree (PL_scopestack);
927#if HAS_SCOPESTACK_NAME
928 Safefree (PL_scopestack_name);
929#endif
905 Safefree (PL_savestack); 930 Safefree (PL_savestack);
906#if !PERL_VERSION_ATLEAST (5,10,0) 931#if !PERL_VERSION_ATLEAST (5,10,0)
907 Safefree (PL_retstack); 932 Safefree (PL_retstack);
908#endif 933#endif
909} 934}
… …
955#endif 980#endif
956 981
957/* 982/*
958 * This overrides the default magic get method of %SIG elements. 983 * 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 984 * 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 985 * and instead of trying to save and restore the hash elements (extremely slow),
961 * readback here. 986 * we just provide our own readback here.
962 */ 987 */
963static int 988static int ecb_cold
964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 989coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
965{ 990{
966 const char *s = MgPV_nolen_const (mg); 991 const char *s = MgPV_nolen_const (mg);
967 992
968 if (*s == '_') 993 if (*s == '_')
… …
972 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 997 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
973 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 998 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
974 999
975 if (svp) 1000 if (svp)
976 { 1001 {
977 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1002 SV *ssv;
1003
1004 if (!*svp)
1005 ssv = &PL_sv_undef;
1006 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1007 ssv = sv_2mortal (newRV_inc (*svp));
1008 else
1009 ssv = *svp;
1010
1011 sv_setsv (sv, ssv);
978 return 0; 1012 return 0;
979 } 1013 }
980 } 1014 }
981 1015
982 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1016 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
983} 1017}
984 1018
985static int 1019static int ecb_cold
986coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1020coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
987{ 1021{
988 const char *s = MgPV_nolen_const (mg); 1022 const char *s = MgPV_nolen_const (mg);
989 1023
990 if (*s == '_') 1024 if (*s == '_')
… …
1004 } 1038 }
1005 1039
1006 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1040 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1007} 1041}
1008 1042
1009static int 1043static int ecb_cold
1010coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1044coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1011{ 1045{
1012 const char *s = MgPV_nolen_const (mg); 1046 const char *s = MgPV_nolen_const (mg);
1013 1047
1014 if (*s == '_') 1048 if (*s == '_')
… …
1049 return 1; 1083 return 1;
1050} 1084}
1051 1085
1052static UNOP init_perl_op; 1086static UNOP init_perl_op;
1053 1087
1054static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1088ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1055init_perl (pTHX_ struct coro *coro) 1089init_perl (pTHX_ struct coro *coro)
1056{ 1090{
1057 /* 1091 /*
1058 * emulate part of the perl startup here. 1092 * emulate part of the perl startup here.
1059 */ 1093 */
… …
1074 PL_parser = 0; 1108 PL_parser = 0;
1075#endif 1109#endif
1076 PL_hints = 0; 1110 PL_hints = 0;
1077 1111
1078 /* recreate the die/warn hooks */ 1112 /* recreate the die/warn hooks */
1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1113 PL_diehook = SvREFCNT_inc (rv_diehook);
1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1114 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1081 1115
1082 GvSV (PL_defgv) = newSV (0); 1116 GvSV (PL_defgv) = newSV (0);
1083 GvAV (PL_defgv) = coro->args; coro->args = 0; 1117 GvAV (PL_defgv) = coro->args; coro->args = 0;
1084 GvSV (PL_errgv) = newSV (0); 1118 GvSV (PL_errgv) = newSV (0);
1085 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1119 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 1140 /* 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. 1141 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1108 */ 1142 */
1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1143 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 */ 1144 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1145 slf_frame.destroy = 0;
1111 1146
1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1147 /* 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; 1148 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1149 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1150 init_perl_op.op_ppaddr = pp_slf;
… …
1120 /* copy throw, in case it was set before init_perl */ 1155 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1156 CORO_THROW = coro->except;
1122 1157
1123 SWAP_SVS (coro); 1158 SWAP_SVS (coro);
1124 1159
1125 if (expect_false (enable_times)) 1160 if (ecb_expect_false (enable_times))
1126 { 1161 {
1127 coro_times_update (); 1162 coro_times_update ();
1128 coro_times_sub (coro); 1163 coro_times_sub (coro);
1129 } 1164 }
1130} 1165}
… …
1154destroy_perl (pTHX_ struct coro *coro) 1189destroy_perl (pTHX_ struct coro *coro)
1155{ 1190{
1156 SV *svf [9]; 1191 SV *svf [9];
1157 1192
1158 { 1193 {
1194 SV *old_current = SvRV (coro_current);
1159 struct coro *current = SvSTATE_current; 1195 struct coro *current = SvSTATE (old_current);
1160 1196
1161 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1197 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1162 1198
1163 save_perl (aTHX_ current); 1199 save_perl (aTHX_ current);
1164 SvRV_set (coro_current, (SV *)coro->hv); /* this will cause acroak in transfer_check */ 1200
1201 /* this will cause transfer_check to croak on block*/
1202 SvRV_set (coro_current, (SV *)coro->hv);
1203
1165 load_perl (aTHX_ coro); 1204 load_perl (aTHX_ coro);
1166 1205
1167 coro_unwind_stacks (aTHX); 1206 coro_unwind_stacks (aTHX);
1168 coro_destruct_stacks (aTHX);
1169 1207
1170 /* restore swapped sv's */ 1208 /* restore swapped sv's */
1171 SWAP_SVS (coro); 1209 SWAP_SVS (coro);
1172 1210
1211 coro_destruct_stacks (aTHX);
1212
1173 // now save some sv's to be free'd later 1213 /* now save some sv's to be free'd later */
1174 svf [0] = GvSV (PL_defgv); 1214 svf [0] = GvSV (PL_defgv);
1175 svf [1] = (SV *)GvAV (PL_defgv); 1215 svf [1] = (SV *)GvAV (PL_defgv);
1176 svf [2] = GvSV (PL_errgv); 1216 svf [2] = GvSV (PL_errgv);
1177 svf [3] = (SV *)PL_defoutgv; 1217 svf [3] = (SV *)PL_defoutgv;
1178 svf [4] = PL_rs; 1218 svf [4] = PL_rs;
… …
1180 svf [6] = (SV *)GvHV (PL_hintgv); 1220 svf [6] = (SV *)GvHV (PL_hintgv);
1181 svf [7] = PL_diehook; 1221 svf [7] = PL_diehook;
1182 svf [8] = PL_warnhook; 1222 svf [8] = PL_warnhook;
1183 assert (9 == sizeof (svf) / sizeof (*svf)); 1223 assert (9 == sizeof (svf) / sizeof (*svf));
1184 1224
1185 SvRV_set (coro_current, (SV *)current->hv); 1225 SvRV_set (coro_current, old_current);
1226
1186 load_perl (aTHX_ current); 1227 load_perl (aTHX_ current);
1187 } 1228 }
1188 1229
1189 { 1230 {
1190 unsigned int i; 1231 unsigned int i;
… …
1197 SvREFCNT_dec (coro->invoke_cb); 1238 SvREFCNT_dec (coro->invoke_cb);
1198 SvREFCNT_dec (coro->invoke_av); 1239 SvREFCNT_dec (coro->invoke_av);
1199 } 1240 }
1200} 1241}
1201 1242
1202INLINE void 1243ecb_inline void
1203free_coro_mortal (pTHX) 1244free_coro_mortal (pTHX)
1204{ 1245{
1205 if (expect_true (coro_mortal)) 1246 if (ecb_expect_true (coro_mortal))
1206 { 1247 {
1207 SvREFCNT_dec (coro_mortal); 1248 SvREFCNT_dec ((SV *)coro_mortal);
1208 coro_mortal = 0; 1249 coro_mortal = 0;
1209 } 1250 }
1210} 1251}
1211 1252
1212static int 1253static int
… …
1345 1386
1346 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1387 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1347} 1388}
1348 1389
1349/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1390/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1350static void NOINLINE 1391static void ecb_noinline
1351cctx_prepare (pTHX) 1392cctx_prepare (pTHX)
1352{ 1393{
1353 PL_top_env = &PL_start_env; 1394 PL_top_env = &PL_start_env;
1354 1395
1355 if (cctx_current->flags & CC_TRACE) 1396 if (cctx_current->flags & CC_TRACE)
… …
1366 slf_frame.prepare = slf_prepare_set_stacklevel; 1407 slf_frame.prepare = slf_prepare_set_stacklevel;
1367 slf_frame.check = slf_check_set_stacklevel; 1408 slf_frame.check = slf_check_set_stacklevel;
1368} 1409}
1369 1410
1370/* the tail of transfer: execute stuff we can only do after a transfer */ 1411/* the tail of transfer: execute stuff we can only do after a transfer */
1371INLINE void 1412ecb_inline void
1372transfer_tail (pTHX) 1413transfer_tail (pTHX)
1373{ 1414{
1374 free_coro_mortal (aTHX); 1415 free_coro_mortal (aTHX);
1416}
1417
1418/* try to exit the same way perl's main function would do */
1419/* we do not bother resetting the environment or other things *7
1420/* that are not, uhm, essential */
1421/* this obviously also doesn't work when perl is embedded */
1422static void ecb_noinline ecb_cold
1423perlish_exit (pTHX)
1424{
1425 int exitstatus = perl_destruct (PL_curinterp);
1426 perl_free (PL_curinterp);
1427 exit (exitstatus);
1375} 1428}
1376 1429
1377/* 1430/*
1378 * this is a _very_ stripped down perl interpreter ;) 1431 * this is a _very_ stripped down perl interpreter ;)
1379 */ 1432 */
… …
1408 */ 1461 */
1409 1462
1410 /* 1463 /*
1411 * If perl-run returns we assume exit() was being called or the coro 1464 * If perl-run returns we assume exit() was being called or the coro
1412 * fell off the end, which seems to be the only valid (non-bug) 1465 * fell off the end, which seems to be the only valid (non-bug)
1413 * reason for perl_run to return. We try to exit by jumping to the 1466 * reason for perl_run to return. We try to mimic whatever perl is normally
1414 * bootstrap-time "top" top_env, as we cannot restore the "main" 1467 * doing in that case. YMMV.
1415 * coroutine as Coro has no such concept.
1416 * This actually isn't valid with the pthread backend, but OSes requiring
1417 * that backend are too broken to do it in a standards-compliant way.
1418 */ 1468 */
1419 PL_top_env = main_top_env; 1469 perlish_exit (aTHX);
1420 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1421 } 1470 }
1422} 1471}
1423 1472
1424static coro_cctx * 1473static coro_cctx *
1425cctx_new () 1474cctx_new (void)
1426{ 1475{
1427 coro_cctx *cctx; 1476 coro_cctx *cctx;
1428 1477
1429 ++cctx_count; 1478 ++cctx_count;
1430 New (0, cctx, 1, coro_cctx); 1479 New (0, cctx, 1, coro_cctx);
… …
1436 return cctx; 1485 return cctx;
1437} 1486}
1438 1487
1439/* create a new cctx only suitable as source */ 1488/* create a new cctx only suitable as source */
1440static coro_cctx * 1489static coro_cctx *
1441cctx_new_empty () 1490cctx_new_empty (void)
1442{ 1491{
1443 coro_cctx *cctx = cctx_new (); 1492 coro_cctx *cctx = cctx_new ();
1444 1493
1445 cctx->sptr = 0; 1494 cctx->sptr = 0;
1446 coro_create (&cctx->cctx, 0, 0, 0, 0); 1495 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1448 return cctx; 1497 return cctx;
1449} 1498}
1450 1499
1451/* create a new cctx suitable as destination/running a perl interpreter */ 1500/* create a new cctx suitable as destination/running a perl interpreter */
1452static coro_cctx * 1501static coro_cctx *
1453cctx_new_run () 1502cctx_new_run (void)
1454{ 1503{
1455 coro_cctx *cctx = cctx_new (); 1504 coro_cctx *cctx = cctx_new ();
1456 void *stack_start; 1505 void *stack_start;
1457 size_t stack_size; 1506 size_t stack_size;
1458 1507
1459#if HAVE_MMAP 1508#if HAVE_MMAP
1460 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1509 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1461 /* mmap supposedly does allocate-on-write for us */ 1510 /* mmap supposedly does allocate-on-write for us */
1462 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1511 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, -1, 0);
1463 1512
1464 if (cctx->sptr != (void *)-1) 1513 if (cctx->sptr != (void *)-1)
1465 { 1514 {
1466 #if CORO_STACKGUARD 1515 #if CORO_STACKGUARD
1467 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1516 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1528#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1577#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1529 1578
1530static coro_cctx * 1579static coro_cctx *
1531cctx_get (pTHX) 1580cctx_get (pTHX)
1532{ 1581{
1533 while (expect_true (cctx_first)) 1582 while (ecb_expect_true (cctx_first))
1534 { 1583 {
1535 coro_cctx *cctx = cctx_first; 1584 coro_cctx *cctx = cctx_first;
1536 cctx_first = cctx->next; 1585 cctx_first = cctx->next;
1537 --cctx_idle; 1586 --cctx_idle;
1538 1587
1539 if (expect_true (!CCTX_EXPIRED (cctx))) 1588 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1540 return cctx; 1589 return cctx;
1541 1590
1542 cctx_destroy (cctx); 1591 cctx_destroy (cctx);
1543 } 1592 }
1544 1593
… …
1549cctx_put (coro_cctx *cctx) 1598cctx_put (coro_cctx *cctx)
1550{ 1599{
1551 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1600 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1552 1601
1553 /* free another cctx if overlimit */ 1602 /* free another cctx if overlimit */
1554 if (expect_false (cctx_idle >= cctx_max_idle)) 1603 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1555 { 1604 {
1556 coro_cctx *first = cctx_first; 1605 coro_cctx *first = cctx_first;
1557 cctx_first = first->next; 1606 cctx_first = first->next;
1558 --cctx_idle; 1607 --cctx_idle;
1559 1608
… …
1570static void 1619static void
1571transfer_check (pTHX_ struct coro *prev, struct coro *next) 1620transfer_check (pTHX_ struct coro *prev, struct coro *next)
1572{ 1621{
1573 /* TODO: throwing up here is considered harmful */ 1622 /* TODO: throwing up here is considered harmful */
1574 1623
1575 if (expect_true (prev != next)) 1624 if (ecb_expect_true (prev != next))
1576 { 1625 {
1577 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1626 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1578 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1627 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1579 1628
1580 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1629 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1581 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1630 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1582 1631
1583#if !PERL_VERSION_ATLEAST (5,10,0) 1632#if !PERL_VERSION_ATLEAST (5,10,0)
1584 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1633 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1585 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1634 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1586#endif 1635#endif
1587 } 1636 }
1588} 1637}
1589 1638
1590/* always use the TRANSFER macro */ 1639/* always use the TRANSFER macro */
1591static void NOINLINE /* noinline so we have a fixed stackframe */ 1640static void ecb_noinline /* noinline so we have a fixed stackframe */
1592transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1641transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1593{ 1642{
1594 dSTACKLEVEL; 1643 dSTACKLEVEL;
1595 1644
1596 /* sometimes transfer is only called to set idle_sp */ 1645 /* sometimes transfer is only called to set idle_sp */
1597 if (expect_false (!prev)) 1646 if (ecb_expect_false (!prev))
1598 { 1647 {
1599 cctx_current->idle_sp = STACKLEVEL; 1648 cctx_current->idle_sp = STACKLEVEL;
1600 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1649 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1601 } 1650 }
1602 else if (expect_true (prev != next)) 1651 else if (ecb_expect_true (prev != next))
1603 { 1652 {
1604 coro_cctx *cctx_prev; 1653 coro_cctx *cctx_prev;
1605 1654
1606 if (expect_false (prev->flags & CF_NEW)) 1655 if (ecb_expect_false (prev->flags & CF_NEW))
1607 { 1656 {
1608 /* create a new empty/source context */ 1657 /* create a new empty/source context */
1609 prev->flags &= ~CF_NEW; 1658 prev->flags &= ~CF_NEW;
1610 prev->flags |= CF_RUNNING; 1659 prev->flags |= CF_RUNNING;
1611 } 1660 }
… …
1614 next->flags |= CF_RUNNING; 1663 next->flags |= CF_RUNNING;
1615 1664
1616 /* first get rid of the old state */ 1665 /* first get rid of the old state */
1617 save_perl (aTHX_ prev); 1666 save_perl (aTHX_ prev);
1618 1667
1619 if (expect_false (next->flags & CF_NEW)) 1668 if (ecb_expect_false (next->flags & CF_NEW))
1620 { 1669 {
1621 /* need to start coroutine */ 1670 /* need to start coroutine */
1622 next->flags &= ~CF_NEW; 1671 next->flags &= ~CF_NEW;
1623 /* setup coroutine call */ 1672 /* setup coroutine call */
1624 init_perl (aTHX_ next); 1673 init_perl (aTHX_ next);
1625 } 1674 }
1626 else 1675 else
1627 load_perl (aTHX_ next); 1676 load_perl (aTHX_ next);
1628 1677
1629 /* possibly untie and reuse the cctx */ 1678 /* possibly untie and reuse the cctx */
1630 if (expect_true ( 1679 if (ecb_expect_true (
1631 cctx_current->idle_sp == STACKLEVEL 1680 cctx_current->idle_sp == STACKLEVEL
1632 && !(cctx_current->flags & CC_TRACE) 1681 && !(cctx_current->flags & CC_TRACE)
1633 && !force_cctx 1682 && !force_cctx
1634 )) 1683 ))
1635 { 1684 {
1636 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1685 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1637 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1686 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1638 1687
1639 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1688 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1640 /* without this the next cctx_get might destroy the running cctx while still in use */ 1689 /* without this the next cctx_get might destroy the running cctx while still in use */
1641 if (expect_false (CCTX_EXPIRED (cctx_current))) 1690 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1642 if (expect_true (!next->cctx)) 1691 if (ecb_expect_true (!next->cctx))
1643 next->cctx = cctx_get (aTHX); 1692 next->cctx = cctx_get (aTHX);
1644 1693
1645 cctx_put (cctx_current); 1694 cctx_put (cctx_current);
1646 } 1695 }
1647 else 1696 else
1648 prev->cctx = cctx_current; 1697 prev->cctx = cctx_current;
1649 1698
1650 ++next->usecount; 1699 ++next->usecount;
1651 1700
1652 cctx_prev = cctx_current; 1701 cctx_prev = cctx_current;
1653 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1702 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1654 1703
1655 next->cctx = 0; 1704 next->cctx = 0;
1656 1705
1657 if (expect_false (cctx_prev != cctx_current)) 1706 if (ecb_expect_false (cctx_prev != cctx_current))
1658 { 1707 {
1659 cctx_prev->top_env = PL_top_env; 1708 cctx_prev->top_env = PL_top_env;
1660 PL_top_env = cctx_current->top_env; 1709 PL_top_env = cctx_current->top_env;
1661 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1710 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1662 } 1711 }
… …
1668#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1717#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1669#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1718#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1670 1719
1671/** high level stuff ********************************************************/ 1720/** high level stuff ********************************************************/
1672 1721
1722/* this function is actually Coro, not Coro::State, but we call it from here */
1723/* because it is convenient - but it hasn't been declared yet for that reason */
1724static void
1725coro_call_on_destroy (pTHX_ struct coro *coro);
1726
1673static void 1727static void
1674coro_state_destroy (pTHX_ struct coro *coro) 1728coro_state_destroy (pTHX_ struct coro *coro)
1675{ 1729{
1676 if (coro->flags & CF_DESTROYED) 1730 if (coro->flags & CF_ZOMBIE)
1677 return; 1731 return;
1678 1732
1679 /* this callback is reserved for slf functions needing to do cleanup */
1680 if (coro->on_destroy && !PL_dirty)
1681 coro->on_destroy (aTHX_ coro); 1733 slf_destroy (aTHX_ coro);
1682 1734
1683 /*
1684 * The on_destroy above most likely is from an SLF call.
1685 * Since by definition the SLF call will not finish when we destroy
1686 * the coro, we will have to force-finish it here, otherwise
1687 * cleanup functions cannot call SLF functions.
1688 */
1689 coro->slf_frame.prepare = 0;
1690
1691 coro->flags |= CF_DESTROYED; 1735 coro->flags |= CF_ZOMBIE;
1692 1736
1693 if (coro->flags & CF_READY) 1737 if (coro->flags & CF_READY)
1694 { 1738 {
1695 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1739 /* reduce nready, as destroying a ready coro effectively unreadies it */
1696 /* alternative: look through all ready queues and remove the coro */ 1740 /* alternative: look through all ready queues and remove the coro */
1697 --coro_nready; 1741 --coro_nready;
1698 } 1742 }
1699 else 1743 else
1700 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1744 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1745
1746 if (coro->next) coro->next->prev = coro->prev;
1747 if (coro->prev) coro->prev->next = coro->next;
1748 if (coro == coro_first) coro_first = coro->next;
1701 1749
1702 if (coro->mainstack 1750 if (coro->mainstack
1703 && coro->mainstack != main_mainstack 1751 && coro->mainstack != main_mainstack
1704 && coro->slot 1752 && coro->slot
1705 && !PL_dirty) 1753 && !PL_dirty)
1706 destroy_perl (aTHX_ coro); 1754 destroy_perl (aTHX_ coro);
1707 1755
1708 if (coro->next) coro->next->prev = coro->prev;
1709 if (coro->prev) coro->prev->next = coro->next;
1710 if (coro == coro_first) coro_first = coro->next;
1711
1712 cctx_destroy (coro->cctx); 1756 cctx_destroy (coro->cctx);
1713 SvREFCNT_dec (coro->startcv); 1757 SvREFCNT_dec (coro->startcv);
1714 SvREFCNT_dec (coro->args); 1758 SvREFCNT_dec (coro->args);
1715 SvREFCNT_dec (coro->swap_sv); 1759 SvREFCNT_dec (coro->swap_sv);
1716 SvREFCNT_dec (CORO_THROW); 1760 SvREFCNT_dec (CORO_THROW);
1761
1762 coro_call_on_destroy (aTHX_ coro);
1763
1764 /* more destruction mayhem in coro_state_free */
1717} 1765}
1718 1766
1719static int 1767static int
1720coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1768coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1721{ 1769{
1722 struct coro *coro = (struct coro *)mg->mg_ptr; 1770 struct coro *coro = (struct coro *)mg->mg_ptr;
1723 mg->mg_ptr = 0; 1771 mg->mg_ptr = 0;
1724 1772
1725 coro->hv = 0;
1726
1727 if (--coro->refcnt < 0)
1728 {
1729 coro_state_destroy (aTHX_ coro); 1773 coro_state_destroy (aTHX_ coro);
1774 SvREFCNT_dec (coro->on_destroy);
1775 SvREFCNT_dec (coro->status);
1776
1730 Safefree (coro); 1777 Safefree (coro);
1731 }
1732 1778
1733 return 0; 1779 return 0;
1734} 1780}
1735 1781
1736static int 1782static int ecb_cold
1737coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1783coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1738{ 1784{
1739 struct coro *coro = (struct coro *)mg->mg_ptr; 1785 /* called when perl clones the current process the slow way (windows process emulation) */
1740 1786 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1741 ++coro->refcnt; 1787 mg->mg_ptr = 0;
1788 mg->mg_virtual = 0;
1742 1789
1743 return 0; 1790 return 0;
1744} 1791}
1745 1792
1746static MGVTBL coro_state_vtbl = { 1793static MGVTBL coro_state_vtbl = {
… …
1771 TRANSFER (ta, 1); 1818 TRANSFER (ta, 1);
1772} 1819}
1773 1820
1774/** Coro ********************************************************************/ 1821/** Coro ********************************************************************/
1775 1822
1776INLINE void 1823ecb_inline void
1777coro_enq (pTHX_ struct coro *coro) 1824coro_enq (pTHX_ struct coro *coro)
1778{ 1825{
1779 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1826 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1780 1827
1781 SvREFCNT_inc_NN (coro->hv); 1828 SvREFCNT_inc_NN (coro->hv);
… …
1783 coro->next_ready = 0; 1830 coro->next_ready = 0;
1784 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1831 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1785 ready [1] = coro; 1832 ready [1] = coro;
1786} 1833}
1787 1834
1788INLINE struct coro * 1835ecb_inline struct coro *
1789coro_deq (pTHX) 1836coro_deq (pTHX)
1790{ 1837{
1791 int prio; 1838 int prio;
1792 1839
1793 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1840 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1846{ 1893{
1847 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1894 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1848} 1895}
1849 1896
1850/* expects to own a reference to next->hv */ 1897/* expects to own a reference to next->hv */
1851INLINE void 1898ecb_inline void
1852prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1899prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1853{ 1900{
1854 SV *prev_sv = SvRV (coro_current); 1901 SV *prev_sv = SvRV (coro_current);
1855 1902
1856 ta->prev = SvSTATE_hv (prev_sv); 1903 ta->prev = SvSTATE_hv (prev_sv);
… …
1869{ 1916{
1870 for (;;) 1917 for (;;)
1871 { 1918 {
1872 struct coro *next = coro_deq (aTHX); 1919 struct coro *next = coro_deq (aTHX);
1873 1920
1874 if (expect_true (next)) 1921 if (ecb_expect_true (next))
1875 { 1922 {
1876 /* cannot transfer to destroyed coros, skip and look for next */ 1923 /* cannot transfer to destroyed coros, skip and look for next */
1877 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1924 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1878 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1925 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1879 else 1926 else
1880 { 1927 {
1881 next->flags &= ~CF_READY; 1928 next->flags &= ~CF_READY;
1882 --coro_nready; 1929 --coro_nready;
… …
1915 } 1962 }
1916 } 1963 }
1917 } 1964 }
1918} 1965}
1919 1966
1920INLINE void 1967ecb_inline void
1921prepare_cede (pTHX_ struct coro_transfer_args *ta) 1968prepare_cede (pTHX_ struct coro_transfer_args *ta)
1922{ 1969{
1923 api_ready (aTHX_ coro_current); 1970 api_ready (aTHX_ coro_current);
1924 prepare_schedule (aTHX_ ta); 1971 prepare_schedule (aTHX_ ta);
1925} 1972}
1926 1973
1927INLINE void 1974ecb_inline void
1928prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1975prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1929{ 1976{
1930 SV *prev = SvRV (coro_current); 1977 SV *prev = SvRV (coro_current);
1931 1978
1932 if (coro_nready) 1979 if (coro_nready)
… …
1962{ 2009{
1963 struct coro_transfer_args ta; 2010 struct coro_transfer_args ta;
1964 2011
1965 prepare_cede (aTHX_ &ta); 2012 prepare_cede (aTHX_ &ta);
1966 2013
1967 if (expect_true (ta.prev != ta.next)) 2014 if (ecb_expect_true (ta.prev != ta.next))
1968 { 2015 {
1969 TRANSFER (ta, 1); 2016 TRANSFER (ta, 1);
1970 return 1; 2017 return 1;
1971 } 2018 }
1972 else 2019 else
… …
2015 coro->slot->runops = RUNOPS_DEFAULT; 2062 coro->slot->runops = RUNOPS_DEFAULT;
2016 } 2063 }
2017} 2064}
2018 2065
2019static void 2066static void
2067coro_push_av (pTHX_ AV *av, I32 gimme_v)
2068{
2069 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2070 {
2071 dSP;
2072
2073 if (gimme_v == G_SCALAR)
2074 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2075 else
2076 {
2077 int i;
2078 EXTEND (SP, AvFILLp (av) + 1);
2079
2080 for (i = 0; i <= AvFILLp (av); ++i)
2081 PUSHs (AvARRAY (av)[i]);
2082 }
2083
2084 PUTBACK;
2085 }
2086}
2087
2088static void
2089coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2090{
2091 if (!coro->on_destroy)
2092 coro->on_destroy = newAV ();
2093
2094 av_push (coro->on_destroy, cb);
2095}
2096
2097static void
2098slf_destroy_join (pTHX_ struct CoroSLF *frame)
2099{
2100 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2101}
2102
2103static int
2104slf_check_join (pTHX_ struct CoroSLF *frame)
2105{
2106 struct coro *coro = (struct coro *)frame->data;
2107
2108 if (!coro->status)
2109 return 1;
2110
2111 frame->destroy = 0;
2112
2113 coro_push_av (aTHX_ coro->status, GIMME_V);
2114
2115 SvREFCNT_dec ((SV *)coro->hv);
2116
2117 return 0;
2118}
2119
2120static void
2121slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2122{
2123 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2124
2125 if (items > 1)
2126 croak ("join called with too many arguments");
2127
2128 if (coro->status)
2129 frame->prepare = prepare_nop;
2130 else
2131 {
2132 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2133 frame->prepare = prepare_schedule;
2134 }
2135
2136 frame->check = slf_check_join;
2137 frame->destroy = slf_destroy_join;
2138 frame->data = (void *)coro;
2139 SvREFCNT_inc (coro->hv);
2140}
2141
2142static void
2020coro_call_on_destroy (pTHX_ struct coro *coro) 2143coro_call_on_destroy (pTHX_ struct coro *coro)
2021{ 2144{
2022 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2145 AV *od = coro->on_destroy;
2023 2146
2024 if (on_destroyp) 2147 if (!od)
2025 { 2148 return;
2026 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2027 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2028 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2029 2149
2030 while (AvFILLp (on_destroy) >= 0) 2150 while (AvFILLp (od) >= 0)
2151 {
2152 SV *cb = sv_2mortal (av_pop (od));
2153
2154 /* coro hv's (and only hv's at the moment) are supported as well */
2155 if (SvSTATEhv_p (aTHX_ cb))
2156 api_ready (aTHX_ cb);
2157 else
2031 { 2158 {
2032 dSP; /* don't disturb outer sp */ 2159 dSP; /* don't disturb outer sp */
2033 SV *cb = av_pop (on_destroy);
2034
2035 PUSHMARK (SP); 2160 PUSHMARK (SP);
2036 2161
2037 if (statusp) 2162 if (coro->status)
2038 { 2163 {
2039 int i; 2164 PUTBACK;
2040 EXTEND (SP, AvFILLp (status) + 1); 2165 coro_push_av (aTHX_ coro->status, G_ARRAY);
2041 2166 SPAGAIN;
2042 for (i = 0; i <= AvFILLp (status); ++i)
2043 PUSHs (AvARRAY (status)[i]);
2044 } 2167 }
2045 2168
2046 PUTBACK; 2169 PUTBACK;
2047 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2170 call_sv (cb, G_VOID | G_DISCARD);
2048 } 2171 }
2049 } 2172 }
2050} 2173}
2051 2174
2052static void 2175static void
2053coro_set_status (HV *coro_hv, SV **arg, int items) 2176coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2054{ 2177{
2055 AV *av = newAV (); 2178 AV *av;
2179
2180 if (coro->status)
2181 {
2182 av = coro->status;
2183 av_clear (av);
2184 }
2185 else
2186 av = coro->status = newAV ();
2056 2187
2057 /* items are actually not so common, so optimise for this case */ 2188 /* items are actually not so common, so optimise for this case */
2058 if (items) 2189 if (items)
2059 { 2190 {
2060 int i; 2191 int i;
… …
2062 av_extend (av, items - 1); 2193 av_extend (av, items - 1);
2063 2194
2064 for (i = 0; i < items; ++i) 2195 for (i = 0; i < items; ++i)
2065 av_push (av, SvREFCNT_inc_NN (arg [i])); 2196 av_push (av, SvREFCNT_inc_NN (arg [i]));
2066 } 2197 }
2067
2068 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2069} 2198}
2070 2199
2071static void 2200static void
2072slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2201slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2073{ 2202{
… …
2085static void 2214static void
2086slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2215slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2087{ 2216{
2088 HV *coro_hv = (HV *)SvRV (coro_current); 2217 HV *coro_hv = (HV *)SvRV (coro_current);
2089 2218
2090 coro_set_status (coro_hv, arg, items); 2219 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2091 slf_init_terminate_cancel_common (frame, coro_hv); 2220 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2092} 2221}
2093 2222
2094static void 2223static void
2095slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2224slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2096{ 2225{
… …
2101 croak ("Coro::cancel called without coro object,"); 2230 croak ("Coro::cancel called without coro object,");
2102 2231
2103 coro = SvSTATE (arg [0]); 2232 coro = SvSTATE (arg [0]);
2104 coro_hv = coro->hv; 2233 coro_hv = coro->hv;
2105 2234
2106 coro_set_status (coro_hv, arg + 1, items - 1); 2235 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2107 2236
2108 if (expect_false (coro->flags & CF_NOCANCEL)) 2237 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2109 { 2238 {
2110 /* coro currently busy cancelling something, so just notify it */ 2239 /* coro currently busy cancelling something, so just notify it */
2111 coro->slf_frame.data = (void *)coro; 2240 coro->slf_frame.data = (void *)coro;
2112 2241
2113 frame->prepare = prepare_nop; 2242 frame->prepare = prepare_nop;
2114 frame->check = slf_check_nop; 2243 frame->check = slf_check_nop;
2115 } 2244 }
2116 else if (coro_hv == (HV *)SvRV (coro_current)) 2245 else if (coro_hv == (HV *)SvRV (coro_current))
2117 { 2246 {
2118 /* cancelling the current coro is allowed, and equals terminate */ 2247 /* cancelling the current coro is allowed, and equals terminate */
2119 slf_init_terminate_cancel_common (frame, coro_hv); 2248 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2120 } 2249 }
2121 else 2250 else
2122 { 2251 {
2123 struct coro *self = SvSTATE_current; 2252 struct coro *self = SvSTATE_current;
2124 2253
… …
2128 * this is ugly, and hopefully fully worth the extra speed. 2257 * this is ugly, and hopefully fully worth the extra speed.
2129 * besides, I can't get the slow-but-safe version working... 2258 * besides, I can't get the slow-but-safe version working...
2130 */ 2259 */
2131 slf_frame.data = 0; 2260 slf_frame.data = 0;
2132 self->flags |= CF_NOCANCEL; 2261 self->flags |= CF_NOCANCEL;
2133
2134 coro_state_destroy (aTHX_ coro); 2262 coro_state_destroy (aTHX_ coro);
2135 coro_call_on_destroy (aTHX_ coro);
2136
2137 self->flags &= ~CF_NOCANCEL; 2263 self->flags &= ~CF_NOCANCEL;
2138 2264
2139 if (slf_frame.data) 2265 if (slf_frame.data)
2140 { 2266 {
2141 /* while we were busy we have been cancelled, so terminate */ 2267 /* while we were busy we have been cancelled, so terminate */
2142 slf_init_terminate_cancel_common (frame, self->hv); 2268 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2143 } 2269 }
2144 else 2270 else
2145 { 2271 {
2146 frame->prepare = prepare_nop; 2272 frame->prepare = prepare_nop;
2147 frame->check = slf_check_nop; 2273 frame->check = slf_check_nop;
2148 } 2274 }
2149 } 2275 }
2150} 2276}
2151 2277
2278static int
2279slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2280{
2281 frame->prepare = 0;
2282 coro_unwind_stacks (aTHX);
2283
2284 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2285
2286 return 1;
2287}
2288
2289static int
2290safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2291{
2292 if (coro->cctx)
2293 croak ("coro inside C callback, unable to cancel at this time, caught");
2294
2295 if (coro->flags & CF_NEW)
2296 {
2297 coro_set_status (aTHX_ coro, arg, items);
2298 coro_state_destroy (aTHX_ coro);
2299 }
2300 else
2301 {
2302 if (!coro->slf_frame.prepare)
2303 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2304
2305 slf_destroy (aTHX_ coro);
2306
2307 coro_set_status (aTHX_ coro, arg, items);
2308 coro->slf_frame.prepare = prepare_nop;
2309 coro->slf_frame.check = slf_check_safe_cancel;
2310
2311 api_ready (aTHX_ (SV *)coro->hv);
2312 }
2313
2314 return 1;
2315}
2316
2152/*****************************************************************************/ 2317/*****************************************************************************/
2153/* async pool handler */ 2318/* async pool handler */
2154 2319
2155static int 2320static int
2156slf_check_pool_handler (pTHX_ struct CoroSLF *frame) 2321slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
… …
2185slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2350slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2186{ 2351{
2187 HV *hv = (HV *)SvRV (coro_current); 2352 HV *hv = (HV *)SvRV (coro_current);
2188 struct coro *coro = SvSTATE_hv ((SV *)hv); 2353 struct coro *coro = SvSTATE_hv ((SV *)hv);
2189 2354
2190 if (expect_true (coro->saved_deffh)) 2355 if (ecb_expect_true (coro->saved_deffh))
2191 { 2356 {
2192 /* subsequent iteration */ 2357 /* subsequent iteration */
2193 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2358 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2194 coro->saved_deffh = 0; 2359 coro->saved_deffh = 0;
2195 2360
2196 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2361 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2197 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2362 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2198 { 2363 {
2199 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2364 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2200 coro->invoke_av = newAV (); 2365 return;
2201
2202 frame->prepare = prepare_nop;
2203 } 2366 }
2204 else 2367 else
2205 { 2368 {
2206 av_clear (GvAV (PL_defgv)); 2369 av_clear (GvAV (PL_defgv));
2207 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2370 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2430static void 2593static void
2431slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2594slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2432{ 2595{
2433 frame->prepare = prepare_cede_notself; 2596 frame->prepare = prepare_cede_notself;
2434 frame->check = slf_check_nop; 2597 frame->check = slf_check_nop;
2598}
2599
2600/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2601static void
2602slf_destroy (pTHX_ struct coro *coro)
2603{
2604 /* this callback is reserved for slf functions needing to do cleanup */
2605 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2606 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2607
2608 /*
2609 * The on_destroy above most likely is from an SLF call.
2610 * Since by definition the SLF call will not finish when we destroy
2611 * the coro, we will have to force-finish it here, otherwise
2612 * cleanup functions cannot call SLF functions.
2613 */
2614 coro->slf_frame.prepare = 0;
2435} 2615}
2436 2616
2437/* 2617/*
2438 * these not obviously related functions are all rolled into one 2618 * these not obviously related functions are all rolled into one
2439 * function to increase chances that they all will call transfer with the same 2619 * function to increase chances that they all will call transfer with the same
… …
2446 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2626 I32 checkmark; /* mark SP to see how many elements check has pushed */
2447 2627
2448 /* set up the slf frame, unless it has already been set-up */ 2628 /* set up the slf frame, unless it has already been set-up */
2449 /* the latter happens when a new coro has been started */ 2629 /* the latter happens when a new coro has been started */
2450 /* or when a new cctx was attached to an existing coroutine */ 2630 /* or when a new cctx was attached to an existing coroutine */
2451 if (expect_true (!slf_frame.prepare)) 2631 if (ecb_expect_true (!slf_frame.prepare))
2452 { 2632 {
2453 /* first iteration */ 2633 /* first iteration */
2454 dSP; 2634 dSP;
2455 SV **arg = PL_stack_base + TOPMARK + 1; 2635 SV **arg = PL_stack_base + TOPMARK + 1;
2456 int items = SP - arg; /* args without function object */ 2636 int items = SP - arg; /* args without function object */
… …
2497 while (slf_frame.check (aTHX_ &slf_frame)); 2677 while (slf_frame.check (aTHX_ &slf_frame));
2498 2678
2499 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2679 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2500 2680
2501 /* exception handling */ 2681 /* exception handling */
2502 if (expect_false (CORO_THROW)) 2682 if (ecb_expect_false (CORO_THROW))
2503 { 2683 {
2504 SV *exception = sv_2mortal (CORO_THROW); 2684 SV *exception = sv_2mortal (CORO_THROW);
2505 2685
2506 CORO_THROW = 0; 2686 CORO_THROW = 0;
2507 sv_setsv (ERRSV, exception); 2687 sv_setsv (ERRSV, exception);
2508 croak (0); 2688 croak (0);
2509 } 2689 }
2510 2690
2511 /* return value handling - mostly like entersub */ 2691 /* return value handling - mostly like entersub */
2512 /* make sure we put something on the stack in scalar context */ 2692 /* make sure we put something on the stack in scalar context */
2513 if (GIMME_V == G_SCALAR) 2693 if (GIMME_V == G_SCALAR
2694 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2514 { 2695 {
2515 dSP; 2696 dSP;
2516 SV **bot = PL_stack_base + checkmark; 2697 SV **bot = PL_stack_base + checkmark;
2517 2698
2518 if (sp == bot) /* too few, push undef */ 2699 if (sp == bot) /* too few, push undef */
2519 bot [1] = &PL_sv_undef; 2700 bot [1] = &PL_sv_undef;
2520 else if (sp != bot + 1) /* too many, take last one */ 2701 else /* too many, take last one */
2521 bot [1] = *sp; 2702 bot [1] = *sp;
2522 2703
2523 SP = bot + 1; 2704 SP = bot + 1;
2524 2705
2525 PUTBACK; 2706 PUTBACK;
… …
2632{ 2813{
2633 PerlIOBuf base; 2814 PerlIOBuf base;
2634 NV next, every; 2815 NV next, every;
2635} PerlIOCede; 2816} PerlIOCede;
2636 2817
2637static IV 2818static IV ecb_cold
2638PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2819PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2639{ 2820{
2640 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2821 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2641 2822
2642 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2823 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2643 self->next = nvtime () + self->every; 2824 self->next = nvtime () + self->every;
2644 2825
2645 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2826 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2646} 2827}
2647 2828
2648static SV * 2829static SV * ecb_cold
2649PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2830PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2650{ 2831{
2651 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2832 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2652 2833
2653 return newSVnv (self->every); 2834 return newSVnv (self->every);
… …
2765 SvREFCNT_dec (cb); 2946 SvREFCNT_dec (cb);
2766 } 2947 }
2767} 2948}
2768 2949
2769static void 2950static void
2770coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2951coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2771{ 2952{
2772 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2953 /* call $sem->adjust (0) to possibly wake up some other waiters */
2773 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2954 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2774} 2955}
2775 2956
2776static int 2957static int
2777slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2958slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2778{ 2959{
2779 AV *av = (AV *)frame->data; 2960 AV *av = (AV *)frame->data;
2780 SV *count_sv = AvARRAY (av)[0]; 2961 SV *count_sv = AvARRAY (av)[0];
2962 SV *coro_hv = SvRV (coro_current);
2781 2963
2782 /* if we are about to throw, don't actually acquire the lock, just throw */ 2964 /* if we are about to throw, don't actually acquire the lock, just throw */
2783 if (CORO_THROW) 2965 if (CORO_THROW)
2784 return 0; 2966 return 0;
2785 else if (SvIVX (count_sv) > 0) 2967 else if (SvIVX (count_sv) > 0)
2786 { 2968 {
2787 SvSTATE_current->on_destroy = 0; 2969 frame->destroy = 0;
2788 2970
2789 if (acquire) 2971 if (acquire)
2790 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2972 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2791 else 2973 else
2792 coro_semaphore_adjust (aTHX_ av, 0); 2974 coro_semaphore_adjust (aTHX_ av, 0);
… …
2797 { 2979 {
2798 int i; 2980 int i;
2799 /* if we were woken up but can't down, we look through the whole */ 2981 /* if we were woken up but can't down, we look through the whole */
2800 /* waiters list and only add us if we aren't in there already */ 2982 /* waiters list and only add us if we aren't in there already */
2801 /* this avoids some degenerate memory usage cases */ 2983 /* this avoids some degenerate memory usage cases */
2802 2984 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2803 for (i = 1; i <= AvFILLp (av); ++i)
2804 if (AvARRAY (av)[i] == SvRV (coro_current)) 2985 if (AvARRAY (av)[i] == coro_hv)
2805 return 1; 2986 return 1;
2806 2987
2807 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2988 av_push (av, SvREFCNT_inc (coro_hv));
2808 return 1; 2989 return 1;
2809 } 2990 }
2810} 2991}
2811 2992
2812static int 2993static int
… …
2835 { 3016 {
2836 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3017 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2837 3018
2838 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3019 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2839 frame->prepare = prepare_schedule; 3020 frame->prepare = prepare_schedule;
2840
2841 /* to avoid race conditions when a woken-up coro gets terminated */ 3021 /* to avoid race conditions when a woken-up coro gets terminated */
2842 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3022 /* we arrange for a temporary on_destroy that calls adjust (0) */
2843 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3023 frame->destroy = coro_semaphore_destroy;
2844 } 3024 }
2845} 3025}
2846 3026
2847static void 3027static void
2848slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3028slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
3066 dSP; 3246 dSP;
3067 3247
3068 static SV *prio_cv; 3248 static SV *prio_cv;
3069 static SV *prio_sv; 3249 static SV *prio_sv;
3070 3250
3071 if (expect_false (!prio_cv)) 3251 if (ecb_expect_false (!prio_cv))
3072 { 3252 {
3073 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3253 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3074 prio_sv = newSViv (0); 3254 prio_sv = newSViv (0);
3075 } 3255 }
3076 3256
… …
3182 } 3362 }
3183 3363
3184 return coro_sv; 3364 return coro_sv;
3185} 3365}
3186 3366
3367#ifndef __cplusplus
3368ecb_cold XS(boot_Coro__State);
3369#endif
3370
3371#if CORO_JIT
3372
3373static void ecb_noinline ecb_cold
3374pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3375{
3376 dSP;
3377 AV *av = newAV ();
3378
3379 av_store (av, 3, newSVuv (d));
3380 av_store (av, 2, newSVuv (c));
3381 av_store (av, 1, newSVuv (b));
3382 av_store (av, 0, newSVuv (a));
3383
3384 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3385
3386 PUTBACK;
3387}
3388
3389static void ecb_noinline ecb_cold
3390jit_init (pTHX)
3391{
3392 dSP;
3393 SV *load, *save;
3394 char *map_base;
3395 char *load_ptr, *save_ptr;
3396 STRLEN load_len, save_len, map_len;
3397 int count;
3398
3399 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3400
3401 PUSHMARK (SP);
3402 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3403 #include "state.h"
3404 count = call_pv ("Coro::State::_jit", G_ARRAY);
3405 SPAGAIN;
3406
3407 save = POPs; save_ptr = SvPVbyte (save, save_len);
3408 load = POPs; load_ptr = SvPVbyte (load, load_len);
3409
3410 map_len = load_len + save_len + 16;
3411
3412 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3413
3414 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3415
3416 load_perl_slots = (load_save_perl_slots_type)map_base;
3417 memcpy (map_base, load_ptr, load_len);
3418
3419 map_base += (load_len + 15) & ~15;
3420
3421 save_perl_slots = (load_save_perl_slots_type)map_base;
3422 memcpy (map_base, save_ptr, save_len);
3423
3424 /* we are good citizens and try to make the page read-only, so the evil evil */
3425 /* hackers might have it a bit more difficult */
3426 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3427
3428 PUTBACK;
3429 eval_pv ("undef &Coro::State::_jit", 1);
3430}
3431
3432#endif
3433
3187MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3434MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3188 3435
3189PROTOTYPES: DISABLE 3436PROTOTYPES: DISABLE
3190 3437
3191BOOT: 3438BOOT:
… …
3194# if CORO_PTHREAD 3441# if CORO_PTHREAD
3195 coro_thx = PERL_GET_CONTEXT; 3442 coro_thx = PERL_GET_CONTEXT;
3196# endif 3443# endif
3197#endif 3444#endif
3198 BOOT_PAGESIZE; 3445 BOOT_PAGESIZE;
3446
3447 /* perl defines these to check for existance first, but why it doesn't */
3448 /* just create them one at init time is not clear to me, except for */
3449 /* programs trying to delete them, but... */
3450 /* anyway, we declare this as invalid and make sure they are initialised here */
3451 DEFSV;
3452 ERRSV;
3199 3453
3200 cctx_current = cctx_new_empty (); 3454 cctx_current = cctx_new_empty ();
3201 3455
3202 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3456 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3203 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3457 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3246 coroapi.prepare_cede_notself = prepare_cede_notself; 3500 coroapi.prepare_cede_notself = prepare_cede_notself;
3247 3501
3248 time_init (aTHX); 3502 time_init (aTHX);
3249 3503
3250 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3504 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3505#if CORO_JIT
3506 PUTBACK;
3507 jit_init (aTHX);
3508 SPAGAIN;
3509#endif
3251} 3510}
3252 3511
3253SV * 3512SV *
3254new (SV *klass, ...) 3513new (SV *klass, ...)
3255 ALIAS: 3514 ALIAS:
… …
3397 PROTOTYPE: $ 3656 PROTOTYPE: $
3398 ALIAS: 3657 ALIAS:
3399 is_ready = CF_READY 3658 is_ready = CF_READY
3400 is_running = CF_RUNNING 3659 is_running = CF_RUNNING
3401 is_new = CF_NEW 3660 is_new = CF_NEW
3402 is_destroyed = CF_DESTROYED 3661 is_destroyed = CF_ZOMBIE
3662 is_zombie = CF_ZOMBIE
3403 is_suspended = CF_SUSPENDED 3663 is_suspended = CF_SUSPENDED
3404 CODE: 3664 CODE:
3405 RETVAL = boolSV (coro->flags & ix); 3665 RETVAL = boolSV (coro->flags & ix);
3406 OUTPUT: 3666 OUTPUT:
3407 RETVAL 3667 RETVAL
3408 3668
3409void 3669void
3410throw (Coro::State self, SV *exception = &PL_sv_undef) 3670throw (SV *self, SV *exception = &PL_sv_undef)
3411 PROTOTYPE: $;$ 3671 PROTOTYPE: $;$
3412 CODE: 3672 CODE:
3413{ 3673{
3674 struct coro *coro = SvSTATE (self);
3414 struct coro *current = SvSTATE_current; 3675 struct coro *current = SvSTATE_current;
3415 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3676 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3416 SvREFCNT_dec (*exceptionp); 3677 SvREFCNT_dec (*exceptionp);
3417 SvGETMAGIC (exception); 3678 SvGETMAGIC (exception);
3418 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3679 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3680
3681 api_ready (aTHX_ self);
3419} 3682}
3420 3683
3421void 3684void
3422api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3685api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3423 PROTOTYPE: $;$ 3686 PROTOTYPE: $;$
… …
3502times (Coro::State self) 3765times (Coro::State self)
3503 PPCODE: 3766 PPCODE:
3504{ 3767{
3505 struct coro *current = SvSTATE (coro_current); 3768 struct coro *current = SvSTATE (coro_current);
3506 3769
3507 if (expect_false (current == self)) 3770 if (ecb_expect_false (current == self))
3508 { 3771 {
3509 coro_times_update (); 3772 coro_times_update ();
3510 coro_times_add (SvSTATE (coro_current)); 3773 coro_times_add (SvSTATE (coro_current));
3511 } 3774 }
3512 3775
3513 EXTEND (SP, 2); 3776 EXTEND (SP, 2);
3514 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3777 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3515 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3778 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3516 3779
3517 if (expect_false (current == self)) 3780 if (ecb_expect_false (current == self))
3518 coro_times_sub (SvSTATE (coro_current)); 3781 coro_times_sub (SvSTATE (coro_current));
3519} 3782}
3520 3783
3521void 3784void
3522swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3785swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3543BOOT: 3806BOOT:
3544{ 3807{
3545 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3808 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3546 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3809 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3547 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3810 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3548 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3549 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3811 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3550 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3812 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3551 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3813 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3552 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3814 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3553 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3815 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
… …
3596void 3858void
3597_destroy (Coro::State coro) 3859_destroy (Coro::State coro)
3598 CODE: 3860 CODE:
3599 /* used by the manager thread */ 3861 /* used by the manager thread */
3600 coro_state_destroy (aTHX_ coro); 3862 coro_state_destroy (aTHX_ coro);
3863
3864void
3865on_destroy (Coro::State coro, SV *cb)
3866 CODE:
3601 coro_call_on_destroy (aTHX_ coro); 3867 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3868
3869void
3870join (...)
3871 CODE:
3872 CORO_EXECUTE_SLF_XS (slf_init_join);
3602 3873
3603void 3874void
3604terminate (...) 3875terminate (...)
3605 CODE: 3876 CODE:
3606 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3877 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3607 3878
3608void 3879void
3609cancel (...) 3880cancel (...)
3610 CODE: 3881 CODE:
3611 CORO_EXECUTE_SLF_XS (slf_init_cancel); 3882 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3883
3884int
3885safe_cancel (Coro::State self, ...)
3886 C_ARGS: aTHX_ self, &ST (1), items - 1
3612 3887
3613void 3888void
3614schedule (...) 3889schedule (...)
3615 CODE: 3890 CODE:
3616 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3891 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3892} 4167}
3893 4168
3894MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4169MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3895 4170
3896void 4171void
3897_may_delete (SV *sem, int count, int extra_refs) 4172_may_delete (SV *sem, int count, unsigned int extra_refs)
3898 PPCODE: 4173 PPCODE:
3899{ 4174{
3900 AV *av = (AV *)SvRV (sem); 4175 AV *av = (AV *)SvRV (sem);
3901 4176
3902 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4177 if (SvREFCNT ((SV *)av) == 1 + extra_refs

Diff Legend

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