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.403 by root, Sun May 22 20:13:33 2011 UTC vs.
Revision 1.471 by root, Fri Jul 14 23:20:07 2017 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7 7
8#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 9#define PERL_EXT
… …
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#define ECB_NO_LIBM 1
20#include "ecb.h"
21
18#include <stddef.h> 22#include <stddef.h>
19#include <stdio.h> 23#include <stdio.h>
20#include <errno.h> 24#include <errno.h>
21#include <assert.h> 25#include <assert.h>
22 26
27#ifndef SvREFCNT_dec_NN
28 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
29#endif
30
31#ifndef SvREFCNT_inc_NN
32 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
33#endif
34
23#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
24# define SVs_PADSTALE 0 36# define SVs_PADSTALE 0
37#endif
38
39#ifdef PadARRAY
40# define NEWPADAPI 1
41# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
42#else
43typedef AV PADNAMELIST;
44# if !PERL_VERSION_ATLEAST(5,8,0)
45typedef AV PADLIST;
46typedef AV PAD;
47# endif
48# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
49# define PadlistMAX(pl) AvFILLp (pl)
50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
51# define PadARRAY AvARRAY
52# define PadMAX AvFILLp
53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
54#endif
55#ifndef PadnamelistREFCNT
56# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
57#endif
58#ifndef PadnamelistREFCNT_dec
59# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
60#endif
61
62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
64#if PERL_VERSION_ATLEAST(5,19,0)
65# define SVt_BIND SVt_IV
25#endif 66#endif
26 67
27#if defined(_WIN32) 68#if defined(_WIN32)
28# undef HAS_GETTIMEOFDAY 69# undef HAS_GETTIMEOFDAY
29# undef setjmp 70# undef setjmp
… …
32# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
33#else 74#else
34# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
35#endif 76#endif
36 77
37#ifdef HAVE_MMAP
38# include <unistd.h>
39# include <sys/mman.h>
40# ifndef MAP_ANONYMOUS
41# ifdef MAP_ANON
42# define MAP_ANONYMOUS MAP_ANON
43# else
44# undef HAVE_MMAP
45# endif
46# endif
47# include <limits.h>
48# ifndef PAGESIZE
49# define PAGESIZE pagesize
50# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
51static long pagesize;
52# else
53# define BOOT_PAGESIZE (void)0
54# endif
55#else
56# define PAGESIZE 0
57# define BOOT_PAGESIZE (void)0
58#endif
59
60#if CORO_USE_VALGRIND
61# include <valgrind/valgrind.h>
62#endif
63
64/* the maximum number of idle cctx that will be pooled */ 78/* the maximum number of idle cctx that will be pooled */
65static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
66 80
67#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
68# undef CORO_STACKGUARD 82# define HAS_SCOPESTACK_NAME 1
69#endif
70
71#ifndef CORO_STACKGUARD
72# define CORO_STACKGUARD 0
73#endif 83#endif
74 84
75/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
76#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
77# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
87# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
88#endif 98#endif
89 99
90#define IN_DESTRUCT PL_dirty 100#define IN_DESTRUCT PL_dirty
91 101
92#if __GNUC__ >= 3
93# define attribute(x) __attribute__(x)
94# define expect(expr,value) __builtin_expect ((expr), (value))
95# define INLINE static inline
96#else
97# define attribute(x)
98# define expect(expr,value) (expr)
99# define INLINE static
100#endif
101
102#define expect_false(expr) expect ((expr) != 0, 0)
103#define expect_true(expr) expect ((expr) != 0, 1)
104
105#define NOINLINE attribute ((noinline))
106
107#include "CoroAPI.h" 102#include "CoroAPI.h"
108#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
109 104
110#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
111# if CORO_PTHREAD 106# if CORO_PTHREAD
… …
121# define CORO_CLOCK_MONOTONIC 1 116# define CORO_CLOCK_MONOTONIC 1
122# define CORO_CLOCK_THREAD_CPUTIME_ID 3 117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
123# endif 118# endif
124#endif 119#endif
125 120
121/* one off bugfix for perl 5.22 */
122#if PERL_VERSION_ATLEAST(5,22,0) && !PERL_VERSION_ATLEAST(5,24,0)
123# undef PadlistNAMES
124# define PadlistNAMES(pl) *((PADNAMELIST **)PadlistARRAY (pl))
125#endif
126
127#if PERL_VERSION_ATLEAST(5,24,0)
128# define SUB_ARGARRAY PL_curpad[0]
129#else
130# define SUB_ARGARRAY (SV *)cx->blk_sub.argarray
131#endif
132
133/* perl usually suppresses asserts. for debugging, we sometimes force it to be on */
134#if 0
135# undef NDEBUG
136# include <assert.h>
137#endif
138
126static double (*nvtime)(); /* so why doesn't it take void? */ 139static double (*nvtime)(); /* so why doesn't it take void? */
127static void (*u2time)(pTHX_ UV ret[2]); 140static void (*u2time)(pTHX_ UV ret[2]);
128 141
129/* we hijack an hopefully unused CV flag for our purposes */ 142/* we hijack an hopefully unused CV flag for our purposes */
130#define CVf_SLF 0x4000 143#define CVf_SLF 0x4000
… …
145 158
146static GV *irsgv; /* $/ */ 159static GV *irsgv; /* $/ */
147static GV *stdoutgv; /* *STDOUT */ 160static GV *stdoutgv; /* *STDOUT */
148static SV *rv_diehook; 161static SV *rv_diehook;
149static SV *rv_warnhook; 162static SV *rv_warnhook;
150static HV *hv_sig; /* %SIG */
151 163
152/* async_pool helper stuff */ 164/* async_pool helper stuff */
153static SV *sv_pool_rss; 165static SV *sv_pool_rss;
154static SV *sv_pool_size; 166static SV *sv_pool_size;
155static SV *sv_async_pool_idle; /* description string */ 167static SV *sv_async_pool_idle; /* description string */
… …
183typedef struct coro_cctx 195typedef struct coro_cctx
184{ 196{
185 struct coro_cctx *next; 197 struct coro_cctx *next;
186 198
187 /* the stack */ 199 /* the stack */
188 void *sptr; 200 struct coro_stack stack;
189 size_t ssize;
190 201
191 /* cpu state */ 202 /* cpu state */
192 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 203 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
204#ifndef NDEBUG
193 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 205 JMPENV *idle_te; /* same as idle_sp, but for top_env */
206#endif
194 JMPENV *top_env; 207 JMPENV *top_env;
195 coro_context cctx; 208 coro_context cctx;
196 209
197 U32 gen; 210 U32 gen;
198#if CORO_USE_VALGRIND 211#if CORO_USE_VALGRIND
… …
218}; 231};
219 232
220/* the structure where most of the perl state is stored, overlaid on the cxstack */ 233/* the structure where most of the perl state is stored, overlaid on the cxstack */
221typedef struct 234typedef struct
222{ 235{
223 SV *defsv;
224 AV *defav;
225 SV *errsv;
226 SV *irsgv;
227 HV *hinthv;
228#define VAR(name,type) type name; 236 #define VARx(name,expr,type) type name;
229# include "state.h" 237 #include "state.h"
230#undef VAR
231} perl_slots; 238} perl_slots;
232 239
233// how many context stack entries do we need for perl_slots 240/* how many context stack entries do we need for perl_slots */
234#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 241#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
235 242
236/* this is a structure representing a perl-level coroutine */ 243/* this is a structure representing a perl-level coroutine */
237struct coro 244struct coro
238{ 245{
… …
266 SV *saved_deffh; 273 SV *saved_deffh;
267 SV *invoke_cb; 274 SV *invoke_cb;
268 AV *invoke_av; 275 AV *invoke_av;
269 276
270 /* on_enter/on_leave */ 277 /* on_enter/on_leave */
271 AV *on_enter; 278 AV *on_enter; AV *on_enter_xs;
272 AV *on_leave; 279 AV *on_leave; AV *on_leave_xs;
273 280
274 /* swap_sv */ 281 /* swap_sv */
275 AV *swap_sv; 282 AV *swap_sv;
276 283
277 /* times */ 284 /* times */
… …
304static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 311static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
305static CV *cv_coro_run; 312static CV *cv_coro_run;
306static struct coro *coro_first; 313static struct coro *coro_first;
307#define coro_nready coroapi.nready 314#define coro_nready coroapi.nready
308 315
316/** JIT *********************************************************************/
317
318#if CORO_JIT
319 /* APPLE doesn't have mmap though */
320 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
321 #ifndef CORO_JIT_TYPE
322 #if ECB_AMD64 && CORO_JIT_UNIXY
323 #define CORO_JIT_TYPE "amd64-unix"
324 #elif __i386 && CORO_JIT_UNIXY
325 #define CORO_JIT_TYPE "x86-unix"
326 #endif
327 #endif
328#endif
329
330#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
331 #undef CORO_JIT
332#endif
333
334#if CORO_JIT
335 typedef void (*load_save_perl_slots_type)(perl_slots *);
336 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
337#endif
338
309/** Coro::Select ************************************************************/ 339/** Coro::Select ************************************************************/
310 340
311static OP *(*coro_old_pp_sselect) (pTHX); 341static OP *(*coro_old_pp_sselect) (pTHX);
312static SV *coro_select_select; 342static SV *coro_select_select;
313 343
… …
328 358
329/** time stuff **************************************************************/ 359/** time stuff **************************************************************/
330 360
331#ifdef HAS_GETTIMEOFDAY 361#ifdef HAS_GETTIMEOFDAY
332 362
333static void 363ecb_inline void
334coro_u2time (pTHX_ UV ret[2]) 364coro_u2time (pTHX_ UV ret[2])
335{ 365{
336 struct timeval tv; 366 struct timeval tv;
337 gettimeofday (&tv, 0); 367 gettimeofday (&tv, 0);
338 368
339 ret [0] = tv.tv_sec; 369 ret [0] = tv.tv_sec;
340 ret [1] = tv.tv_usec; 370 ret [1] = tv.tv_usec;
341} 371}
342 372
343static double 373ecb_inline double
344coro_nvtime () 374coro_nvtime (void)
345{ 375{
346 struct timeval tv; 376 struct timeval tv;
347 gettimeofday (&tv, 0); 377 gettimeofday (&tv, 0);
348 378
349 return tv.tv_sec + tv.tv_usec * 1e-6; 379 return tv.tv_sec + tv.tv_usec * 1e-6;
350} 380}
351 381
352static void 382ecb_inline void
353time_init (pTHX) 383time_init (pTHX)
354{ 384{
355 nvtime = coro_nvtime; 385 nvtime = coro_nvtime;
356 u2time = coro_u2time; 386 u2time = coro_u2time;
357} 387}
358 388
359#else 389#else
360 390
361static void 391ecb_inline void
362time_init (pTHX) 392time_init (pTHX)
363{ 393{
364 SV **svp; 394 SV **svp;
365 395
366 require_pv ("Time/HiRes.pm"); 396 require_pv ("Time/HiRes.pm");
367 397
368 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 398 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
369 399
370 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 400 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
371 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 401 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
372 402
… …
378 408
379#endif 409#endif
380 410
381/** lowlevel stuff **********************************************************/ 411/** lowlevel stuff **********************************************************/
382 412
383static SV * 413static SV * ecb_noinline
384coro_get_sv (pTHX_ const char *name, int create) 414coro_get_sv (pTHX_ const char *name, int create)
385{ 415{
386#if PERL_VERSION_ATLEAST (5,10,0) 416#if PERL_VERSION_ATLEAST (5,10,0)
387 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 417 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
388 get_sv (name, create); 418 get_sv (name, create);
389#endif 419#endif
390 return get_sv (name, create); 420 return get_sv (name, create);
391} 421}
392 422
393static AV * 423static AV * ecb_noinline
394coro_get_av (pTHX_ const char *name, int create) 424coro_get_av (pTHX_ const char *name, int create)
395{ 425{
396#if PERL_VERSION_ATLEAST (5,10,0) 426#if PERL_VERSION_ATLEAST (5,10,0)
397 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 427 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
398 get_av (name, create); 428 get_av (name, create);
399#endif 429#endif
400 return get_av (name, create); 430 return get_av (name, create);
401} 431}
402 432
403static HV * 433static HV * ecb_noinline
404coro_get_hv (pTHX_ const char *name, int create) 434coro_get_hv (pTHX_ const char *name, int create)
405{ 435{
406#if PERL_VERSION_ATLEAST (5,10,0) 436#if PERL_VERSION_ATLEAST (5,10,0)
407 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 437 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
408 get_hv (name, create); 438 get_hv (name, create);
409#endif 439#endif
410 return get_hv (name, create); 440 return get_hv (name, create);
411} 441}
412 442
413INLINE void 443ecb_inline void
414coro_times_update () 444coro_times_update (void)
415{ 445{
416#ifdef coro_clock_gettime 446#ifdef coro_clock_gettime
417 struct timespec ts; 447 struct timespec ts;
418 448
419 ts.tv_sec = ts.tv_nsec = 0; 449 ts.tv_sec = ts.tv_nsec = 0;
… …
431 time_real [0] = tv [0]; 461 time_real [0] = tv [0];
432 time_real [1] = tv [1] * 1000; 462 time_real [1] = tv [1] * 1000;
433#endif 463#endif
434} 464}
435 465
436INLINE void 466ecb_inline void
437coro_times_add (struct coro *c) 467coro_times_add (struct coro *c)
438{ 468{
439 c->t_real [1] += time_real [1]; 469 c->t_real [1] += time_real [1];
440 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 470 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
441 c->t_real [0] += time_real [0]; 471 c->t_real [0] += time_real [0];
… …
443 c->t_cpu [1] += time_cpu [1]; 473 c->t_cpu [1] += time_cpu [1];
444 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 474 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
445 c->t_cpu [0] += time_cpu [0]; 475 c->t_cpu [0] += time_cpu [0];
446} 476}
447 477
448INLINE void 478ecb_inline void
449coro_times_sub (struct coro *c) 479coro_times_sub (struct coro *c)
450{ 480{
451 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 481 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
452 c->t_real [1] -= time_real [1]; 482 c->t_real [1] -= time_real [1];
453 c->t_real [0] -= time_real [0]; 483 c->t_real [0] -= time_real [0];
… …
461/* magic glue */ 491/* magic glue */
462 492
463#define CORO_MAGIC_type_cv 26 493#define CORO_MAGIC_type_cv 26
464#define CORO_MAGIC_type_state PERL_MAGIC_ext 494#define CORO_MAGIC_type_state PERL_MAGIC_ext
465 495
466#define CORO_MAGIC_NN(sv, type) \ 496#define CORO_MAGIC_NN(sv, type) \
467 (expect_true (SvMAGIC (sv)->mg_type == type) \ 497 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
468 ? SvMAGIC (sv) \ 498 ? SvMAGIC (sv) \
469 : mg_find (sv, type)) 499 : mg_find (sv, type))
470 500
471#define CORO_MAGIC(sv, type) \ 501#define CORO_MAGIC(sv, type) \
472 (expect_true (SvMAGIC (sv)) \ 502 (ecb_expect_true (SvMAGIC (sv)) \
473 ? CORO_MAGIC_NN (sv, type) \ 503 ? CORO_MAGIC_NN (sv, type) \
474 : 0) 504 : 0)
475 505
476#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 506#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
477#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 507#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
478 508
479INLINE MAGIC * 509ecb_inline MAGIC *
480SvSTATEhv_p (pTHX_ SV *coro) 510SvSTATEhv_p (pTHX_ SV *coro)
481{ 511{
482 MAGIC *mg; 512 MAGIC *mg;
483 513
484 if (expect_true ( 514 if (ecb_expect_true (
485 SvTYPE (coro) == SVt_PVHV 515 SvTYPE (coro) == SVt_PVHV
486 && (mg = CORO_MAGIC_state (coro)) 516 && (mg = CORO_MAGIC_state (coro))
487 && mg->mg_virtual == &coro_state_vtbl 517 && mg->mg_virtual == &coro_state_vtbl
488 )) 518 ))
489 return mg; 519 return mg;
490 520
491 return 0; 521 return 0;
492} 522}
493 523
494INLINE struct coro * 524ecb_inline struct coro *
495SvSTATE_ (pTHX_ SV *coro) 525SvSTATE_ (pTHX_ SV *coro_sv)
496{ 526{
497 MAGIC *mg; 527 MAGIC *mg;
498 528
499 if (SvROK (coro)) 529 if (SvROK (coro_sv))
500 coro = SvRV (coro); 530 coro_sv = SvRV (coro_sv);
501 531
502 mg = SvSTATEhv_p (aTHX_ coro); 532 mg = SvSTATEhv_p (aTHX_ coro_sv);
503 if (!mg) 533 if (!mg)
504 croak ("Coro::State object required"); 534 croak ("Coro::State object required");
505 535
506 return (struct coro *)mg->mg_ptr; 536 return (struct coro *)mg->mg_ptr;
507} 537}
… …
513#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 543#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
514 544
515/*****************************************************************************/ 545/*****************************************************************************/
516/* padlist management and caching */ 546/* padlist management and caching */
517 547
518static AV * 548ecb_inline PADLIST *
519coro_derive_padlist (pTHX_ CV *cv) 549coro_derive_padlist (pTHX_ CV *cv)
520{ 550{
521 AV *padlist = CvPADLIST (cv); 551 PADLIST *padlist = CvPADLIST (cv);
522 AV *newpadlist, *newpad; 552 PADLIST *newpadlist;
553 PADNAMELIST *padnames;
554 PAD *newpad;
555 PADOFFSET off = PadlistMAX (padlist) + 1;
523 556
524 newpadlist = newAV (); 557#if NEWPADAPI
558
559 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
560 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
561 while (!PadlistARRAY (padlist)[off - 1])
562 --off;
563
564 Perl_pad_push (aTHX_ padlist, off);
565
566 newpad = PadlistARRAY (padlist)[off];
567 PadlistARRAY (padlist)[off] = 0;
568
569#else
570
571#if PERL_VERSION_ATLEAST (5,10,0)
572 Perl_pad_push (aTHX_ padlist, off);
573#else
574 Perl_pad_push (aTHX_ padlist, off, 1);
575#endif
576
577 newpad = PadlistARRAY (padlist)[off];
578 PadlistMAX (padlist) = off - 1;
579
580#endif
581
582 newPADLIST (newpadlist);
583#if !PERL_VERSION_ATLEAST(5,15,3)
584 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
525 AvREAL_off (newpadlist); 585 AvREAL_off (newpadlist);
526#if PERL_VERSION_ATLEAST (5,10,0)
527 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
528#else
529 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
530#endif 586#endif
531 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
532 --AvFILLp (padlist);
533 587
534 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 588 /* Already extended to 2 elements by newPADLIST. */
535 av_store (newpadlist, 1, (SV *)newpad); 589 PadlistMAX (newpadlist) = 1;
590
591 padnames = PadlistNAMES (padlist);
592 ++PadnamelistREFCNT (padnames);
593 PadlistNAMES (newpadlist) = padnames;
594
595 PadlistARRAY (newpadlist)[1] = newpad;
536 596
537 return newpadlist; 597 return newpadlist;
538} 598}
539 599
540static void 600ecb_inline void
541free_padlist (pTHX_ AV *padlist) 601free_padlist (pTHX_ PADLIST *padlist)
542{ 602{
543 /* may be during global destruction */ 603 /* may be during global destruction */
544 if (!IN_DESTRUCT) 604 if (!IN_DESTRUCT)
545 { 605 {
546 I32 i = AvFILLp (padlist); 606 I32 i = PadlistMAX (padlist);
547 607
548 while (i > 0) /* special-case index 0 */ 608 while (i > 0) /* special-case index 0 */
549 { 609 {
550 /* we try to be extra-careful here */ 610 /* we try to be extra-careful here */
551 AV *av = (AV *)AvARRAY (padlist)[i--]; 611 PAD *pad = PadlistARRAY (padlist)[i--];
552 I32 j = AvFILLp (av);
553 612
613 if (pad)
614 {
615 I32 j = PadMAX (pad);
616
554 while (j >= 0) 617 while (j >= 0)
555 SvREFCNT_dec (AvARRAY (av)[j--]); 618 SvREFCNT_dec (PadARRAY (pad)[j--]);
556 619
557 AvFILLp (av) = -1; 620 PadMAX (pad) = -1;
558 SvREFCNT_dec (av); 621 SvREFCNT_dec (pad);
622 }
559 } 623 }
560 624
561 SvREFCNT_dec (AvARRAY (padlist)[0]); 625 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
562 626
627#if NEWPADAPI
628 Safefree (PadlistARRAY (padlist));
629 Safefree (padlist);
630#else
563 AvFILLp (padlist) = -1; 631 AvFILLp (padlist) = -1;
632 AvREAL_off (padlist);
564 SvREFCNT_dec ((SV*)padlist); 633 SvREFCNT_dec ((SV*)padlist);
634#endif
565 } 635 }
566} 636}
567 637
568static int 638static int
569coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 639coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
570{ 640{
571 AV *padlist; 641 PADLIST *padlist;
572 AV *av = (AV *)mg->mg_obj; 642 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
643 size_t len = *(size_t *)mg->mg_ptr;
573 644
574 /* perl manages to free our internal AV and _then_ call us */ 645 /* perl manages to free our internal AV and _then_ call us */
575 if (IN_DESTRUCT) 646 if (IN_DESTRUCT)
576 return 0; 647 return 0;
577 648
578 /* casting is fun. */ 649 while (len--)
579 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
580 free_padlist (aTHX_ padlist); 650 free_padlist (aTHX_ padlists[len]);
581
582 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
583 651
584 return 0; 652 return 0;
585} 653}
586 654
587static MGVTBL coro_cv_vtbl = { 655static MGVTBL coro_cv_vtbl = {
588 0, 0, 0, 0, 656 0, 0, 0, 0,
589 coro_cv_free 657 coro_cv_free
590}; 658};
591 659
592/* the next two functions merely cache the padlists */ 660/* the next two functions merely cache the padlists */
593static void 661ecb_inline void
594get_padlist (pTHX_ CV *cv) 662get_padlist (pTHX_ CV *cv)
595{ 663{
596 MAGIC *mg = CORO_MAGIC_cv (cv); 664 MAGIC *mg = CORO_MAGIC_cv (cv);
597 AV *av; 665 size_t *lenp;
598 666
599 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 667 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
600 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 668 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
601 else 669 else
602 { 670 {
603#if CORO_PREFER_PERL_FUNCTIONS 671#if CORO_PREFER_PERL_FUNCTIONS
604 /* this is probably cleaner? but also slower! */ 672 /* this is probably cleaner? but also slower! */
605 /* in practise, it seems to be less stable */ 673 /* in practise, it seems to be less stable */
… …
611 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 679 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
612#endif 680#endif
613 } 681 }
614} 682}
615 683
616static void 684ecb_inline void
617put_padlist (pTHX_ CV *cv) 685put_padlist (pTHX_ CV *cv)
618{ 686{
619 MAGIC *mg = CORO_MAGIC_cv (cv); 687 MAGIC *mg = CORO_MAGIC_cv (cv);
620 AV *av;
621 688
622 if (expect_false (!mg)) 689 if (ecb_expect_false (!mg))
690 {
623 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 691 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
692 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
693 mg->mg_len = 1; /* so mg_free frees mg_ptr */
694 }
695 else
696 Renew (mg->mg_ptr,
697 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
698 char);
624 699
625 av = (AV *)mg->mg_obj; 700 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
626
627 if (expect_false (AvFILLp (av) >= AvMAX (av)))
628 av_extend (av, AvFILLp (av) + 1);
629
630 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
631} 701}
632 702
633/** load & save, init *******************************************************/ 703/** load & save, init *******************************************************/
634 704
705ecb_inline void
706swap_sv (SV *a, SV *b)
707{
708 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
709 SV tmp;
710
711 /* swap sv_any */
712 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
713
714 /* swap sv_flags */
715 SvFLAGS (&tmp) = SvFLAGS (a);
716 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
717 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
718
719#if PERL_VERSION_ATLEAST (5,10,0)
720 /* perl 5.10 and later complicates this _quite_ a bit, but it also
721 * is much faster, so no quarrels here. alternatively, we could
722 * sv_upgrade to avoid this.
723 */
724 {
725 /* swap sv_u */
726 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
727
728 /* if SvANY points to the head, we need to adjust the pointers,
729 * as the pointer for a still points to b, and maybe vice versa.
730 */
731 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
732 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
733 svany_in_head_set |= 1 << SVt_NV;
734 #endif
735
736 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
737
738 if (svany_in_head (SvTYPE (a)))
739 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
740
741 if (svany_in_head (SvTYPE (b)))
742 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
743 }
744#endif
745}
746
635/* swap sv heads, at least logically */ 747/* swap sv heads, at least logically */
636static void 748static void
637swap_svs (pTHX_ Coro__State c) 749swap_svs_enter (pTHX_ Coro__State c)
638{ 750{
639 int i; 751 int i;
640 752
641 for (i = 0; i <= AvFILLp (c->swap_sv); ) 753 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
642 { 754 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
643 SV *a = AvARRAY (c->swap_sv)[i++];
644 SV *b = AvARRAY (c->swap_sv)[i++];
645
646 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
647 SV tmp;
648
649 /* swap sv_any */
650 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
651
652 /* swap sv_flags */
653 SvFLAGS (&tmp) = SvFLAGS (a);
654 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
655 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
656
657#if PERL_VERSION_ATLEAST (5,10,0)
658 /* perl 5.10 complicates this _quite_ a bit, but it also is
659 * much faster, so no quarrels here. alternatively, we could
660 * sv_upgrade to avoid this.
661 */
662 {
663 /* swap sv_u */
664 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
665
666 /* if SvANY points to the head, we need to adjust the pointers,
667 * as the pointer for a still points to b, and maybe vice versa.
668 */
669 #define svany_in_head(type) \
670 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
671
672 if (svany_in_head (SvTYPE (a)))
673 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
674
675 if (svany_in_head (SvTYPE (b)))
676 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
677 }
678#endif
679 }
680} 755}
681 756
757static void
758swap_svs_leave (pTHX_ Coro__State c)
759{
760 int i;
761
762 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
763 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
764}
765
682#define SWAP_SVS(coro) \ 766#define SWAP_SVS_ENTER(coro) \
683 if (expect_false ((coro)->swap_sv)) \ 767 if (ecb_expect_false ((coro)->swap_sv)) \
684 swap_svs (aTHX_ (coro)) 768 swap_svs_enter (aTHX_ (coro))
769
770#define SWAP_SVS_LEAVE(coro) \
771 if (ecb_expect_false ((coro)->swap_sv)) \
772 swap_svs_leave (aTHX_ (coro))
685 773
686static void 774static void
687on_enterleave_call (pTHX_ SV *cb); 775on_enterleave_call (pTHX_ SV *cb);
688 776
689static void 777static void
… …
692 perl_slots *slot = c->slot; 780 perl_slots *slot = c->slot;
693 c->slot = 0; 781 c->slot = 0;
694 782
695 PL_mainstack = c->mainstack; 783 PL_mainstack = c->mainstack;
696 784
697 GvSV (PL_defgv) = slot->defsv; 785#if CORO_JIT
698 GvAV (PL_defgv) = slot->defav; 786 load_perl_slots (slot);
699 GvSV (PL_errgv) = slot->errsv; 787#else
700 GvSV (irsgv) = slot->irsgv;
701 GvHV (PL_hintgv) = slot->hinthv;
702
703 #define VAR(name,type) PL_ ## name = slot->name; 788 #define VARx(name,expr,type) expr = slot->name;
704 # include "state.h" 789 #include "state.h"
705 #undef VAR 790#endif
706 791
707 { 792 {
708 dSP; 793 dSP;
709 794
710 CV *cv; 795 CV *cv;
711 796
712 /* now do the ugly restore mess */ 797 /* now do the ugly restore mess */
713 while (expect_true (cv = (CV *)POPs)) 798 while (ecb_expect_true (cv = (CV *)POPs))
714 { 799 {
715 put_padlist (aTHX_ cv); /* mark this padlist as available */ 800 put_padlist (aTHX_ cv); /* mark this padlist as available */
716 CvDEPTH (cv) = PTR2IV (POPs); 801 CvDEPTH (cv) = PTR2IV (POPs);
717 CvPADLIST (cv) = (AV *)POPs; 802 CvPADLIST (cv) = (PADLIST *)POPs;
718 } 803 }
719 804
720 PUTBACK; 805 PUTBACK;
721 } 806 }
722 807
723 slf_frame = c->slf_frame; 808 slf_frame = c->slf_frame;
724 CORO_THROW = c->except; 809 CORO_THROW = c->except;
725 810
726 if (expect_false (enable_times)) 811 if (ecb_expect_false (enable_times))
727 { 812 {
728 if (expect_false (!times_valid)) 813 if (ecb_expect_false (!times_valid))
729 coro_times_update (); 814 coro_times_update ();
730 815
731 coro_times_sub (c); 816 coro_times_sub (c);
732 } 817 }
733 818
734 if (expect_false (c->on_enter)) 819 if (ecb_expect_false (c->on_enter))
735 { 820 {
736 int i; 821 int i;
737 822
738 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 823 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
739 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 824 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
740 } 825 }
741 826
827 if (ecb_expect_false (c->on_enter_xs))
828 {
829 int i;
830
831 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
832 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
833 }
834
742 SWAP_SVS (c); 835 SWAP_SVS_ENTER (c);
743} 836}
744 837
745static void 838static void
746save_perl (pTHX_ Coro__State c) 839save_perl (pTHX_ Coro__State c)
747{ 840{
748 SWAP_SVS (c); 841 SWAP_SVS_LEAVE (c);
749 842
843 if (ecb_expect_false (c->on_leave_xs))
844 {
845 int i;
846
847 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
848 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
849 }
850
750 if (expect_false (c->on_leave)) 851 if (ecb_expect_false (c->on_leave))
751 { 852 {
752 int i; 853 int i;
753 854
754 for (i = AvFILLp (c->on_leave); i >= 0; --i) 855 for (i = AvFILLp (c->on_leave); i >= 0; --i)
755 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 856 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
756 } 857 }
757 858
758 times_valid = 0; 859 times_valid = 0;
759 860
760 if (expect_false (enable_times)) 861 if (ecb_expect_false (enable_times))
761 { 862 {
762 coro_times_update (); times_valid = 1; 863 coro_times_update (); times_valid = 1;
763 coro_times_add (c); 864 coro_times_add (c);
764 } 865 }
765 866
… …
779 880
780 XPUSHs (Nullsv); 881 XPUSHs (Nullsv);
781 /* this loop was inspired by pp_caller */ 882 /* this loop was inspired by pp_caller */
782 for (;;) 883 for (;;)
783 { 884 {
784 while (expect_true (cxix >= 0)) 885 while (ecb_expect_true (cxix >= 0))
785 { 886 {
786 PERL_CONTEXT *cx = &ccstk[cxix--]; 887 PERL_CONTEXT *cx = &ccstk[cxix--];
787 888
788 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 889 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
789 { 890 {
790 CV *cv = cx->blk_sub.cv; 891 CV *cv = cx->blk_sub.cv;
791 892
792 if (expect_true (CvDEPTH (cv))) 893 if (ecb_expect_true (CvDEPTH (cv)))
793 { 894 {
794 EXTEND (SP, 3); 895 EXTEND (SP, 3);
795 PUSHs ((SV *)CvPADLIST (cv)); 896 PUSHs ((SV *)CvPADLIST (cv));
796 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 897 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
797 PUSHs ((SV *)cv); 898 PUSHs ((SV *)cv);
… …
800 get_padlist (aTHX_ cv); 901 get_padlist (aTHX_ cv);
801 } 902 }
802 } 903 }
803 } 904 }
804 905
805 if (expect_true (top_si->si_type == PERLSI_MAIN)) 906 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
806 break; 907 break;
807 908
808 top_si = top_si->si_prev; 909 top_si = top_si->si_prev;
809 ccstk = top_si->si_cxstack; 910 ccstk = top_si->si_cxstack;
810 cxix = top_si->si_cxix; 911 cxix = top_si->si_cxix;
… …
812 913
813 PUTBACK; 914 PUTBACK;
814 } 915 }
815 916
816 /* allocate some space on the context stack for our purposes */ 917 /* allocate some space on the context stack for our purposes */
817 if (expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 918 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
818 { 919 {
819 unsigned int i; 920 unsigned int i;
820 921
821 for (i = 0; i < SLOT_COUNT; ++i) 922 for (i = 0; i < SLOT_COUNT; ++i)
822 CXINC; 923 CXINC;
… …
827 c->mainstack = PL_mainstack; 928 c->mainstack = PL_mainstack;
828 929
829 { 930 {
830 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 931 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
831 932
832 slot->defav = GvAV (PL_defgv); 933#if CORO_JIT
833 slot->defsv = DEFSV; 934 save_perl_slots (slot);
834 slot->errsv = ERRSV; 935#else
835 slot->irsgv = GvSV (irsgv);
836 slot->hinthv = GvHV (PL_hintgv);
837
838 #define VAR(name,type) slot->name = PL_ ## name; 936 #define VARx(name,expr,type) slot->name = expr;
839 # include "state.h" 937 #include "state.h"
840 #undef VAR 938#endif
841 } 939 }
842} 940}
843 941
844/* 942/*
845 * allocate various perl stacks. This is almost an exact copy 943 * allocate various perl stacks. This is almost an exact copy
… …
876#endif 974#endif
877 975
878 New(54,PL_scopestack,8,I32); 976 New(54,PL_scopestack,8,I32);
879 PL_scopestack_ix = 0; 977 PL_scopestack_ix = 0;
880 PL_scopestack_max = 8; 978 PL_scopestack_max = 8;
979#if HAS_SCOPESTACK_NAME
980 New(54,PL_scopestack_name,8,const char*);
981#endif
881 982
882 New(54,PL_savestack,24,ANY); 983 New(54,PL_savestack,24,ANY);
883 PL_savestack_ix = 0; 984 PL_savestack_ix = 0;
884 PL_savestack_max = 24; 985 PL_savestack_max = 24;
986#if PERL_VERSION_ATLEAST (5,24,0)
987 /* perl 5.24 moves SS_MAXPUSH optimisation from */
988 /* the header macros to PL_savestack_max */
989 PL_savestack_max -= SS_MAXPUSH;
990#endif
885 991
886#if !PERL_VERSION_ATLEAST (5,10,0) 992#if !PERL_VERSION_ATLEAST (5,10,0)
887 New(54,PL_retstack,4,OP*); 993 New(54,PL_retstack,4,OP*);
888 PL_retstack_ix = 0; 994 PL_retstack_ix = 0;
889 PL_retstack_max = 4; 995 PL_retstack_max = 4;
… …
913 } 1019 }
914 1020
915 Safefree (PL_tmps_stack); 1021 Safefree (PL_tmps_stack);
916 Safefree (PL_markstack); 1022 Safefree (PL_markstack);
917 Safefree (PL_scopestack); 1023 Safefree (PL_scopestack);
1024#if HAS_SCOPESTACK_NAME
1025 Safefree (PL_scopestack_name);
1026#endif
918 Safefree (PL_savestack); 1027 Safefree (PL_savestack);
919#if !PERL_VERSION_ATLEAST (5,10,0) 1028#if !PERL_VERSION_ATLEAST (5,10,0)
920 Safefree (PL_retstack); 1029 Safefree (PL_retstack);
921#endif 1030#endif
922} 1031}
… …
952 } 1061 }
953 1062
954 return rss; 1063 return rss;
955} 1064}
956 1065
957/** coroutine stack handling ************************************************/ 1066/** provide custom get/set/clear methods for %SIG elements ******************/
958
959static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
960static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
961static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
962 1067
963/* apparently < 5.8.8 */ 1068/* apparently < 5.8.8 */
964#ifndef MgPV_nolen_const 1069#ifndef MgPV_nolen_const
965#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1070#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
966 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1071 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
967 (const char*)(mg)->mg_ptr) 1072 (const char*)(mg)->mg_ptr)
968#endif 1073#endif
1074
1075/* this will be a patched copy of PL_vtbl_sigelem */
1076static MGVTBL coro_sigelem_vtbl;
1077
1078static int ecb_cold
1079coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1080{
1081 char *key = SvPV_nolen ((SV *)name);
1082
1083 /* do what mg_copy normally does */
1084 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1085 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1086
1087 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1088 if (*key == '_'
1089 && (strEQ (key, "__DIE__")
1090 || strEQ (key, "__WARN__")))
1091 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1092
1093 return 1;
1094}
1095
1096/* perl does not have a %SIG vtbl, we provide one so we can override */
1097/* the magic vtbl for the __DIE__ and __WARN__ members */
1098static const MGVTBL coro_sig_vtbl = {
1099 0, 0, 0, 0, 0,
1100 coro_sig_copy
1101};
969 1102
970/* 1103/*
971 * This overrides the default magic get method of %SIG elements. 1104 * This overrides the default magic get method of %SIG elements.
972 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1105 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
973 * and instead of trying to save and restore the hash elements (extremely slow), 1106 * and instead of trying to save and restore the hash elements (extremely slow),
974 * we just provide our own readback here. 1107 * we just provide our own readback here.
975 */ 1108 */
976static int 1109static int ecb_cold
977coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1110coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
978{ 1111{
979 const char *s = MgPV_nolen_const (mg); 1112 const char *s = MgPV_nolen_const (mg);
1113 /* the key must be either __DIE__ or __WARN__ here */
1114 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
980 1115
981 if (*s == '_') 1116 SV *ssv;
982 {
983 SV **svp = 0;
984 1117
985 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
986 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
987
988 if (svp) 1118 if (!*svp)
989 { 1119 ssv = &PL_sv_undef;
990 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1120 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
991 return 0; 1121 ssv = sv_2mortal (newRV_inc (*svp));
992 } 1122 else
993 } 1123 ssv = *svp;
994 1124
995 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1125 sv_setsv (sv, ssv);
1126 return 0;
996} 1127}
997 1128
998static int 1129static int ecb_cold
999coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1000{ 1131{
1001 const char *s = MgPV_nolen_const (mg); 1132 const char *s = MgPV_nolen_const (mg);
1133 /* the key must be either __DIE__ or __WARN__ here */
1134 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1002 1135
1003 if (*s == '_')
1004 {
1005 SV **svp = 0;
1006
1007 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1008 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1009
1010 if (svp)
1011 {
1012 SV *old = *svp; 1136 SV *old = *svp;
1013 *svp = 0; 1137 *svp = 0;
1014 SvREFCNT_dec (old); 1138 SvREFCNT_dec (old);
1015 return 0; 1139 return 0;
1016 }
1017 }
1018
1019 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1020} 1140}
1021 1141
1022static int 1142static int ecb_cold
1023coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1143coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1024{ 1144{
1025 const char *s = MgPV_nolen_const (mg); 1145 const char *s = MgPV_nolen_const (mg);
1146 /* the key must be either __DIE__ or __WARN__ here */
1147 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1026 1148
1027 if (*s == '_')
1028 {
1029 SV **svp = 0;
1030
1031 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1032 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1033
1034 if (svp)
1035 {
1036 SV *old = *svp; 1149 SV *old = *svp;
1037 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1150 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1038 SvREFCNT_dec (old); 1151 SvREFCNT_dec (old);
1039 return 0; 1152 return 0;
1040 }
1041 }
1042
1043 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1044} 1153}
1045 1154
1046static void 1155static void
1047prepare_nop (pTHX_ struct coro_transfer_args *ta) 1156prepare_nop (pTHX_ struct coro_transfer_args *ta)
1048{ 1157{
… …
1060slf_check_repeat (pTHX_ struct CoroSLF *frame) 1169slf_check_repeat (pTHX_ struct CoroSLF *frame)
1061{ 1170{
1062 return 1; 1171 return 1;
1063} 1172}
1064 1173
1174/** coroutine stack handling ************************************************/
1175
1065static UNOP init_perl_op; 1176static UNOP init_perl_op;
1066 1177
1067static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1178ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1068init_perl (pTHX_ struct coro *coro) 1179init_perl (pTHX_ struct coro *coro)
1069{ 1180{
1070 /* 1181 /*
1071 * emulate part of the perl startup here. 1182 * emulate part of the perl startup here.
1072 */ 1183 */
… …
1089 PL_hints = 0; 1200 PL_hints = 0;
1090 1201
1091 /* recreate the die/warn hooks */ 1202 /* recreate the die/warn hooks */
1092 PL_diehook = SvREFCNT_inc (rv_diehook); 1203 PL_diehook = SvREFCNT_inc (rv_diehook);
1093 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1204 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1094 1205
1095 GvSV (PL_defgv) = newSV (0); 1206 GvSV (PL_defgv) = newSV (0);
1096 GvAV (PL_defgv) = coro->args; coro->args = 0; 1207 GvAV (PL_defgv) = coro->args; coro->args = 0;
1097 GvSV (PL_errgv) = newSV (0); 1208 GvSV (PL_errgv) = newSV (0);
1098 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1209 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1099 GvHV (PL_hintgv) = 0; 1210 GvHV (PL_hintgv) = newHV ();
1211#if PERL_VERSION_ATLEAST (5,10,0)
1212 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1213#endif
1100 PL_rs = newSVsv (GvSV (irsgv)); 1214 PL_rs = newSVsv (GvSV (irsgv));
1101 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1215 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1102 1216
1103 { 1217 {
1104 dSP; 1218 dSP;
… …
1132 PL_op = (OP *)&init_perl_op; 1246 PL_op = (OP *)&init_perl_op;
1133 1247
1134 /* copy throw, in case it was set before init_perl */ 1248 /* copy throw, in case it was set before init_perl */
1135 CORO_THROW = coro->except; 1249 CORO_THROW = coro->except;
1136 1250
1137 SWAP_SVS (coro); 1251 SWAP_SVS_ENTER (coro);
1138 1252
1139 if (expect_false (enable_times)) 1253 if (ecb_expect_false (enable_times))
1140 { 1254 {
1141 coro_times_update (); 1255 coro_times_update ();
1142 coro_times_sub (coro); 1256 coro_times_sub (coro);
1143 } 1257 }
1144} 1258}
… …
1180 /* this will cause transfer_check to croak on block*/ 1294 /* this will cause transfer_check to croak on block*/
1181 SvRV_set (coro_current, (SV *)coro->hv); 1295 SvRV_set (coro_current, (SV *)coro->hv);
1182 1296
1183 load_perl (aTHX_ coro); 1297 load_perl (aTHX_ coro);
1184 1298
1299 /* restore swapped sv's */
1300 SWAP_SVS_LEAVE (coro);
1301
1185 coro_unwind_stacks (aTHX); 1302 coro_unwind_stacks (aTHX);
1186 1303
1187 /* restore swapped sv's */
1188 SWAP_SVS (coro);
1189
1190 coro_destruct_stacks (aTHX); 1304 coro_destruct_stacks (aTHX);
1191 1305
1192 // now save some sv's to be free'd later 1306 /* now save some sv's to be free'd later */
1193 svf [0] = GvSV (PL_defgv); 1307 svf [0] = GvSV (PL_defgv);
1194 svf [1] = (SV *)GvAV (PL_defgv); 1308 svf [1] = (SV *)GvAV (PL_defgv);
1195 svf [2] = GvSV (PL_errgv); 1309 svf [2] = GvSV (PL_errgv);
1196 svf [3] = (SV *)PL_defoutgv; 1310 svf [3] = (SV *)PL_defoutgv;
1197 svf [4] = PL_rs; 1311 svf [4] = PL_rs;
… …
1214 1328
1215 SvREFCNT_dec (coro->saved_deffh); 1329 SvREFCNT_dec (coro->saved_deffh);
1216 SvREFCNT_dec (coro->rouse_cb); 1330 SvREFCNT_dec (coro->rouse_cb);
1217 SvREFCNT_dec (coro->invoke_cb); 1331 SvREFCNT_dec (coro->invoke_cb);
1218 SvREFCNT_dec (coro->invoke_av); 1332 SvREFCNT_dec (coro->invoke_av);
1333 SvREFCNT_dec (coro->on_enter_xs);
1334 SvREFCNT_dec (coro->on_leave_xs);
1219 } 1335 }
1220} 1336}
1221 1337
1222INLINE void 1338ecb_inline void
1223free_coro_mortal (pTHX) 1339free_coro_mortal (pTHX)
1224{ 1340{
1225 if (expect_true (coro_mortal)) 1341 if (ecb_expect_true (coro_mortal))
1226 { 1342 {
1227 SvREFCNT_dec ((SV *)coro_mortal); 1343 SvREFCNT_dec ((SV *)coro_mortal);
1228 coro_mortal = 0; 1344 coro_mortal = 0;
1229 } 1345 }
1230} 1346}
… …
1286 1402
1287 if (PL_curcop != &PL_compiling) 1403 if (PL_curcop != &PL_compiling)
1288 { 1404 {
1289 SV **cb; 1405 SV **cb;
1290 1406
1291 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1407 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1292 { 1408 {
1293 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1409 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1294 1410
1295 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1411 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1296 { 1412 {
… …
1306 SAVETMPS; 1422 SAVETMPS;
1307 EXTEND (SP, 3); 1423 EXTEND (SP, 3);
1308 PUSHMARK (SP); 1424 PUSHMARK (SP);
1309 PUSHs (&PL_sv_yes); 1425 PUSHs (&PL_sv_yes);
1310 PUSHs (fullname); 1426 PUSHs (fullname);
1311 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1427 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (SUB_ARGARRAY)) : &PL_sv_undef);
1312 PUTBACK; 1428 PUTBACK;
1313 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1429 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1314 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1430 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1315 SPAGAIN; 1431 SPAGAIN;
1316 FREETMPS; 1432 FREETMPS;
… …
1365 1481
1366 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1482 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1367} 1483}
1368 1484
1369/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1485/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1370static void NOINLINE 1486static void ecb_noinline
1371cctx_prepare (pTHX) 1487cctx_prepare (pTHX)
1372{ 1488{
1373 PL_top_env = &PL_start_env; 1489 PL_top_env = &PL_start_env;
1374 1490
1375 if (cctx_current->flags & CC_TRACE) 1491 if (cctx_current->flags & CC_TRACE)
… …
1386 slf_frame.prepare = slf_prepare_set_stacklevel; 1502 slf_frame.prepare = slf_prepare_set_stacklevel;
1387 slf_frame.check = slf_check_set_stacklevel; 1503 slf_frame.check = slf_check_set_stacklevel;
1388} 1504}
1389 1505
1390/* the tail of transfer: execute stuff we can only do after a transfer */ 1506/* the tail of transfer: execute stuff we can only do after a transfer */
1391INLINE void 1507ecb_inline void
1392transfer_tail (pTHX) 1508transfer_tail (pTHX)
1393{ 1509{
1394 free_coro_mortal (aTHX); 1510 free_coro_mortal (aTHX);
1511}
1512
1513/* try to exit the same way perl's main function would do */
1514/* we do not bother resetting the environment or other things *7
1515/* that are not, uhm, essential */
1516/* this obviously also doesn't work when perl is embedded */
1517static void ecb_noinline ecb_cold
1518perlish_exit (pTHX)
1519{
1520 int exitstatus = perl_destruct (PL_curinterp);
1521 perl_free (PL_curinterp);
1522 exit (exitstatus);
1395} 1523}
1396 1524
1397/* 1525/*
1398 * this is a _very_ stripped down perl interpreter ;) 1526 * this is a _very_ stripped down perl interpreter ;)
1399 */ 1527 */
… …
1426 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1554 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1427 * runtime errors here, as this is just a random interpreter, not a thread. 1555 * runtime errors here, as this is just a random interpreter, not a thread.
1428 */ 1556 */
1429 1557
1430 /* 1558 /*
1559 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1560 * requires PL_scopestack_ix, so do it here if required.
1561 */
1562 if (!PL_scopestack_ix)
1563 ENTER;
1564
1565 /*
1431 * If perl-run returns we assume exit() was being called or the coro 1566 * If perl-run returns we assume exit() was being called or the coro
1432 * fell off the end, which seems to be the only valid (non-bug) 1567 * fell off the end, which seems to be the only valid (non-bug)
1433 * reason for perl_run to return. We try to exit by jumping to the 1568 * reason for perl_run to return. We try to mimic whatever perl is normally
1434 * bootstrap-time "top" top_env, as we cannot restore the "main" 1569 * doing in that case. YMMV.
1435 * coroutine as Coro has no such concept.
1436 * This actually isn't valid with the pthread backend, but OSes requiring
1437 * that backend are too broken to do it in a standards-compliant way.
1438 */ 1570 */
1439 PL_top_env = main_top_env; 1571 perlish_exit (aTHX);
1440 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1441 } 1572 }
1442} 1573}
1443 1574
1444static coro_cctx * 1575static coro_cctx *
1445cctx_new () 1576cctx_new (void)
1446{ 1577{
1447 coro_cctx *cctx; 1578 coro_cctx *cctx;
1448 1579
1449 ++cctx_count; 1580 ++cctx_count;
1450 New (0, cctx, 1, coro_cctx); 1581 New (0, cctx, 1, coro_cctx);
… …
1456 return cctx; 1587 return cctx;
1457} 1588}
1458 1589
1459/* create a new cctx only suitable as source */ 1590/* create a new cctx only suitable as source */
1460static coro_cctx * 1591static coro_cctx *
1461cctx_new_empty () 1592cctx_new_empty (void)
1462{ 1593{
1463 coro_cctx *cctx = cctx_new (); 1594 coro_cctx *cctx = cctx_new ();
1464 1595
1465 cctx->sptr = 0; 1596 cctx->stack.sptr = 0;
1466 coro_create (&cctx->cctx, 0, 0, 0, 0); 1597 coro_create (&cctx->cctx, 0, 0, 0, 0);
1467 1598
1468 return cctx; 1599 return cctx;
1469} 1600}
1470 1601
1471/* create a new cctx suitable as destination/running a perl interpreter */ 1602/* create a new cctx suitable as destination/running a perl interpreter */
1472static coro_cctx * 1603static coro_cctx *
1473cctx_new_run () 1604cctx_new_run (void)
1474{ 1605{
1475 coro_cctx *cctx = cctx_new (); 1606 coro_cctx *cctx = cctx_new ();
1476 void *stack_start;
1477 size_t stack_size;
1478 1607
1479#if HAVE_MMAP 1608 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1480 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1481 /* mmap supposedly does allocate-on-write for us */
1482 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1483
1484 if (cctx->sptr != (void *)-1)
1485 {
1486 #if CORO_STACKGUARD
1487 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1488 #endif
1489 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1490 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1491 cctx->flags |= CC_MAPPED;
1492 } 1609 {
1493 else
1494#endif
1495 {
1496 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1497 New (0, cctx->sptr, cctx_stacksize, long);
1498
1499 if (!cctx->sptr)
1500 {
1501 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1610 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1502 _exit (EXIT_FAILURE); 1611 _exit (EXIT_FAILURE);
1503 }
1504
1505 stack_start = cctx->sptr;
1506 stack_size = cctx->ssize;
1507 } 1612 }
1508 1613
1509 #if CORO_USE_VALGRIND
1510 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1511 #endif
1512
1513 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1614 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1514 1615
1515 return cctx; 1616 return cctx;
1516} 1617}
1517 1618
1518static void 1619static void
… …
1524 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1625 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1525 1626
1526 --cctx_count; 1627 --cctx_count;
1527 coro_destroy (&cctx->cctx); 1628 coro_destroy (&cctx->cctx);
1528 1629
1529 /* coro_transfer creates new, empty cctx's */ 1630 coro_stack_free (&cctx->stack);
1530 if (cctx->sptr)
1531 {
1532 #if CORO_USE_VALGRIND
1533 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1534 #endif
1535
1536#if HAVE_MMAP
1537 if (cctx->flags & CC_MAPPED)
1538 munmap (cctx->sptr, cctx->ssize);
1539 else
1540#endif
1541 Safefree (cctx->sptr);
1542 }
1543 1631
1544 Safefree (cctx); 1632 Safefree (cctx);
1545} 1633}
1546 1634
1547/* wether this cctx should be destructed */ 1635/* wether this cctx should be destructed */
1548#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1636#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1549 1637
1550static coro_cctx * 1638static coro_cctx *
1551cctx_get (pTHX) 1639cctx_get (pTHX)
1552{ 1640{
1553 while (expect_true (cctx_first)) 1641 while (ecb_expect_true (cctx_first))
1554 { 1642 {
1555 coro_cctx *cctx = cctx_first; 1643 coro_cctx *cctx = cctx_first;
1556 cctx_first = cctx->next; 1644 cctx_first = cctx->next;
1557 --cctx_idle; 1645 --cctx_idle;
1558 1646
1559 if (expect_true (!CCTX_EXPIRED (cctx))) 1647 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1560 return cctx; 1648 return cctx;
1561 1649
1562 cctx_destroy (cctx); 1650 cctx_destroy (cctx);
1563 } 1651 }
1564 1652
… …
1566} 1654}
1567 1655
1568static void 1656static void
1569cctx_put (coro_cctx *cctx) 1657cctx_put (coro_cctx *cctx)
1570{ 1658{
1571 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1659 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1572 1660
1573 /* free another cctx if overlimit */ 1661 /* free another cctx if overlimit */
1574 if (expect_false (cctx_idle >= cctx_max_idle)) 1662 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1575 { 1663 {
1576 coro_cctx *first = cctx_first; 1664 coro_cctx *first = cctx_first;
1577 cctx_first = first->next; 1665 cctx_first = first->next;
1578 --cctx_idle; 1666 --cctx_idle;
1579 1667
… …
1590static void 1678static void
1591transfer_check (pTHX_ struct coro *prev, struct coro *next) 1679transfer_check (pTHX_ struct coro *prev, struct coro *next)
1592{ 1680{
1593 /* TODO: throwing up here is considered harmful */ 1681 /* TODO: throwing up here is considered harmful */
1594 1682
1595 if (expect_true (prev != next)) 1683 if (ecb_expect_true (prev != next))
1596 { 1684 {
1597 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1685 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1598 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1686 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1599 1687
1600 if (expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED))) 1688 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1601 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1689 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1602 1690
1603#if !PERL_VERSION_ATLEAST (5,10,0) 1691#if !PERL_VERSION_ATLEAST (5,10,0)
1604 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1692 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1605 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1693 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1606#endif 1694#endif
1607 } 1695 }
1608} 1696}
1609 1697
1610/* always use the TRANSFER macro */ 1698/* always use the TRANSFER macro */
1611static void NOINLINE /* noinline so we have a fixed stackframe */ 1699static void ecb_noinline /* noinline so we have a fixed stackframe */
1612transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1700transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1613{ 1701{
1614 dSTACKLEVEL; 1702 dSTACKLEVEL;
1615 1703
1616 /* sometimes transfer is only called to set idle_sp */ 1704 /* sometimes transfer is only called to set idle_sp */
1617 if (expect_false (!prev)) 1705 if (ecb_expect_false (!prev))
1618 { 1706 {
1619 cctx_current->idle_sp = STACKLEVEL; 1707 cctx_current->idle_sp = STACKLEVEL;
1620 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1708 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1621 } 1709 }
1622 else if (expect_true (prev != next)) 1710 else if (ecb_expect_true (prev != next))
1623 { 1711 {
1624 coro_cctx *cctx_prev; 1712 coro_cctx *cctx_prev;
1625 1713
1626 if (expect_false (prev->flags & CF_NEW)) 1714 if (ecb_expect_false (prev->flags & CF_NEW))
1627 { 1715 {
1628 /* create a new empty/source context */ 1716 /* create a new empty/source context */
1629 prev->flags &= ~CF_NEW; 1717 prev->flags &= ~CF_NEW;
1630 prev->flags |= CF_RUNNING; 1718 prev->flags |= CF_RUNNING;
1631 } 1719 }
… …
1634 next->flags |= CF_RUNNING; 1722 next->flags |= CF_RUNNING;
1635 1723
1636 /* first get rid of the old state */ 1724 /* first get rid of the old state */
1637 save_perl (aTHX_ prev); 1725 save_perl (aTHX_ prev);
1638 1726
1639 if (expect_false (next->flags & CF_NEW)) 1727 if (ecb_expect_false (next->flags & CF_NEW))
1640 { 1728 {
1641 /* need to start coroutine */ 1729 /* need to start coroutine */
1642 next->flags &= ~CF_NEW; 1730 next->flags &= ~CF_NEW;
1643 /* setup coroutine call */ 1731 /* setup coroutine call */
1644 init_perl (aTHX_ next); 1732 init_perl (aTHX_ next);
1645 } 1733 }
1646 else 1734 else
1647 load_perl (aTHX_ next); 1735 load_perl (aTHX_ next);
1648 1736
1649 /* possibly untie and reuse the cctx */ 1737 /* possibly untie and reuse the cctx */
1650 if (expect_true ( 1738 if (ecb_expect_true (
1651 cctx_current->idle_sp == STACKLEVEL 1739 cctx_current->idle_sp == STACKLEVEL
1652 && !(cctx_current->flags & CC_TRACE) 1740 && !(cctx_current->flags & CC_TRACE)
1653 && !force_cctx 1741 && !force_cctx
1654 )) 1742 ))
1655 { 1743 {
1656 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1744 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1657 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1745 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1658 1746
1659 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1747 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1660 /* without this the next cctx_get might destroy the running cctx while still in use */ 1748 /* without this the next cctx_get might destroy the running cctx while still in use */
1661 if (expect_false (CCTX_EXPIRED (cctx_current))) 1749 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1662 if (expect_true (!next->cctx)) 1750 if (ecb_expect_true (!next->cctx))
1663 next->cctx = cctx_get (aTHX); 1751 next->cctx = cctx_get (aTHX);
1664 1752
1665 cctx_put (cctx_current); 1753 cctx_put (cctx_current);
1666 } 1754 }
1667 else 1755 else
1668 prev->cctx = cctx_current; 1756 prev->cctx = cctx_current;
1669 1757
1670 ++next->usecount; 1758 ++next->usecount;
1671 1759
1672 cctx_prev = cctx_current; 1760 cctx_prev = cctx_current;
1673 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1761 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1674 1762
1675 next->cctx = 0; 1763 next->cctx = 0;
1676 1764
1677 if (expect_false (cctx_prev != cctx_current)) 1765 if (ecb_expect_false (cctx_prev != cctx_current))
1678 { 1766 {
1679 cctx_prev->top_env = PL_top_env; 1767 cctx_prev->top_env = PL_top_env;
1680 PL_top_env = cctx_current->top_env; 1768 PL_top_env = cctx_current->top_env;
1681 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1769 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1682 } 1770 }
… …
1702 return; 1790 return;
1703 1791
1704 slf_destroy (aTHX_ coro); 1792 slf_destroy (aTHX_ coro);
1705 1793
1706 coro->flags |= CF_ZOMBIE; 1794 coro->flags |= CF_ZOMBIE;
1707 1795
1708 if (coro->flags & CF_READY) 1796 if (coro->flags & CF_READY)
1709 { 1797 {
1710 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1798 /* reduce nready, as destroying a ready coro effectively unreadies it */
1711 /* alternative: look through all ready queues and remove the coro */ 1799 /* alternative: look through all ready queues and remove the coro */
1712 --coro_nready; 1800 --coro_nready;
… …
1748 Safefree (coro); 1836 Safefree (coro);
1749 1837
1750 return 0; 1838 return 0;
1751} 1839}
1752 1840
1753static int 1841static int ecb_cold
1754coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1842coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1755{ 1843{
1756 /* called when perl clones the current process the slow way (windows process emulation) */ 1844 /* called when perl clones the current process the slow way (windows process emulation) */
1757 /* WE SIMply nuke the pointers in the copy, causing perl to croak */ 1845 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1758 mg->mg_ptr = 0; 1846 mg->mg_ptr = 0;
… …
1789 TRANSFER (ta, 1); 1877 TRANSFER (ta, 1);
1790} 1878}
1791 1879
1792/** Coro ********************************************************************/ 1880/** Coro ********************************************************************/
1793 1881
1794INLINE void 1882ecb_inline void
1795coro_enq (pTHX_ struct coro *coro) 1883coro_enq (pTHX_ struct coro *coro)
1796{ 1884{
1797 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1885 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1798 1886
1799 SvREFCNT_inc_NN (coro->hv); 1887 SvREFCNT_inc_NN (coro->hv);
… …
1801 coro->next_ready = 0; 1889 coro->next_ready = 0;
1802 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1890 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1803 ready [1] = coro; 1891 ready [1] = coro;
1804} 1892}
1805 1893
1806INLINE struct coro * 1894ecb_inline struct coro *
1807coro_deq (pTHX) 1895coro_deq (pTHX)
1808{ 1896{
1809 int prio; 1897 int prio;
1810 1898
1811 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1899 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1864{ 1952{
1865 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1953 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1866} 1954}
1867 1955
1868/* expects to own a reference to next->hv */ 1956/* expects to own a reference to next->hv */
1869INLINE void 1957ecb_inline void
1870prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1958prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1871{ 1959{
1872 SV *prev_sv = SvRV (coro_current); 1960 SV *prev_sv = SvRV (coro_current);
1873 1961
1874 ta->prev = SvSTATE_hv (prev_sv); 1962 ta->prev = SvSTATE_hv (prev_sv);
… …
1887{ 1975{
1888 for (;;) 1976 for (;;)
1889 { 1977 {
1890 struct coro *next = coro_deq (aTHX); 1978 struct coro *next = coro_deq (aTHX);
1891 1979
1892 if (expect_true (next)) 1980 if (ecb_expect_true (next))
1893 { 1981 {
1894 /* cannot transfer to destroyed coros, skip and look for next */ 1982 /* cannot transfer to destroyed coros, skip and look for next */
1895 if (expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED))) 1983 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1896 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1984 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1897 else 1985 else
1898 { 1986 {
1899 next->flags &= ~CF_READY; 1987 next->flags &= ~CF_READY;
1900 --coro_nready; 1988 --coro_nready;
… …
1908 /* nothing to schedule: call the idle handler */ 1996 /* nothing to schedule: call the idle handler */
1909 if (SvROK (sv_idle) 1997 if (SvROK (sv_idle)
1910 && SvOBJECT (SvRV (sv_idle))) 1998 && SvOBJECT (SvRV (sv_idle)))
1911 { 1999 {
1912 if (SvRV (sv_idle) == SvRV (coro_current)) 2000 if (SvRV (sv_idle) == SvRV (coro_current))
2001 {
2002 require_pv ("Carp");
2003
2004 {
2005 dSP;
2006
2007 ENTER;
2008 SAVETMPS;
2009
2010 PUSHMARK (SP);
1913 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2011 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2012 PUTBACK;
2013 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2014
2015 FREETMPS;
2016 LEAVE;
2017 }
2018 }
1914 2019
1915 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2020 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1916 api_ready (aTHX_ SvRV (sv_idle)); 2021 api_ready (aTHX_ SvRV (sv_idle));
1917 --coro_nready; 2022 --coro_nready;
1918 } 2023 }
… …
1933 } 2038 }
1934 } 2039 }
1935 } 2040 }
1936} 2041}
1937 2042
1938INLINE void 2043ecb_inline void
1939prepare_cede (pTHX_ struct coro_transfer_args *ta) 2044prepare_cede (pTHX_ struct coro_transfer_args *ta)
1940{ 2045{
1941 api_ready (aTHX_ coro_current); 2046 api_ready (aTHX_ coro_current);
1942 prepare_schedule (aTHX_ ta); 2047 prepare_schedule (aTHX_ ta);
1943} 2048}
1944 2049
1945INLINE void 2050ecb_inline void
1946prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2051prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1947{ 2052{
1948 SV *prev = SvRV (coro_current); 2053 SV *prev = SvRV (coro_current);
1949 2054
1950 if (coro_nready) 2055 if (coro_nready)
… …
1980{ 2085{
1981 struct coro_transfer_args ta; 2086 struct coro_transfer_args ta;
1982 2087
1983 prepare_cede (aTHX_ &ta); 2088 prepare_cede (aTHX_ &ta);
1984 2089
1985 if (expect_true (ta.prev != ta.next)) 2090 if (ecb_expect_true (ta.prev != ta.next))
1986 { 2091 {
1987 TRANSFER (ta, 1); 2092 TRANSFER (ta, 1);
1988 return 1; 2093 return 1;
1989 } 2094 }
1990 else 2095 else
… …
2115{ 2220{
2116 AV *od = coro->on_destroy; 2221 AV *od = coro->on_destroy;
2117 2222
2118 if (!od) 2223 if (!od)
2119 return; 2224 return;
2225
2226 coro->on_destroy = 0;
2227 sv_2mortal ((SV *)od);
2120 2228
2121 while (AvFILLp (od) >= 0) 2229 while (AvFILLp (od) >= 0)
2122 { 2230 {
2123 SV *cb = sv_2mortal (av_pop (od)); 2231 SV *cb = sv_2mortal (av_pop (od));
2124 2232
… …
2145 2253
2146static void 2254static void
2147coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2255coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2148{ 2256{
2149 AV *av; 2257 AV *av;
2150 2258
2151 if (coro->status) 2259 if (coro->status)
2152 { 2260 {
2153 av = coro->status; 2261 av = coro->status;
2154 av_clear (av); 2262 av_clear (av);
2155 } 2263 }
… …
2202 2310
2203 coro = SvSTATE (arg [0]); 2311 coro = SvSTATE (arg [0]);
2204 coro_hv = coro->hv; 2312 coro_hv = coro->hv;
2205 2313
2206 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2314 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2207 2315
2208 if (expect_false (coro->flags & CF_NOCANCEL)) 2316 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2209 { 2317 {
2210 /* coro currently busy cancelling something, so just notify it */ 2318 /* coro currently busy cancelling something, so just notify it */
2211 coro->slf_frame.data = (void *)coro; 2319 coro->slf_frame.data = (void *)coro;
2212 2320
2213 frame->prepare = prepare_nop; 2321 frame->prepare = prepare_nop;
… …
2219 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2327 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2220 } 2328 }
2221 else 2329 else
2222 { 2330 {
2223 struct coro *self = SvSTATE_current; 2331 struct coro *self = SvSTATE_current;
2332
2333 if (!self)
2334 croak ("Coro::cancel called outside of thread content,");
2224 2335
2225 /* otherwise we cancel directly, purely for speed reasons 2336 /* otherwise we cancel directly, purely for speed reasons
2226 * unfortunately, this requires some magic trickery, as 2337 * unfortunately, this requires some magic trickery, as
2227 * somebody else could cancel us, so we have to fight the cancellation. 2338 * somebody else could cancel us, so we have to fight the cancellation.
2228 * this is ugly, and hopefully fully worth the extra speed. 2339 * this is ugly, and hopefully fully worth the extra speed.
… …
2321slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2432slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2322{ 2433{
2323 HV *hv = (HV *)SvRV (coro_current); 2434 HV *hv = (HV *)SvRV (coro_current);
2324 struct coro *coro = SvSTATE_hv ((SV *)hv); 2435 struct coro *coro = SvSTATE_hv ((SV *)hv);
2325 2436
2326 if (expect_true (coro->saved_deffh)) 2437 if (ecb_expect_true (coro->saved_deffh))
2327 { 2438 {
2328 /* subsequent iteration */ 2439 /* subsequent iteration */
2329 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2440 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2330 coro->saved_deffh = 0; 2441 coro->saved_deffh = 0;
2331 2442
… …
2338 else 2449 else
2339 { 2450 {
2340 av_clear (GvAV (PL_defgv)); 2451 av_clear (GvAV (PL_defgv));
2341 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2452 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2342 2453
2454 if (ecb_expect_false (coro->swap_sv))
2455 {
2456 SWAP_SVS_LEAVE (coro);
2457 SvREFCNT_dec_NN (coro->swap_sv);
2458 coro->swap_sv = 0;
2459 }
2460
2343 coro->prio = 0; 2461 coro->prio = 0;
2344 2462
2345 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2463 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2346 api_trace (aTHX_ coro_current, 0); 2464 api_trace (aTHX_ coro_current, 0);
2347 2465
2348 frame->prepare = prepare_schedule; 2466 frame->prepare = prepare_schedule;
2349 av_push (av_async_pool, SvREFCNT_inc (hv)); 2467 av_push (av_async_pool, SvREFCNT_inc (hv));
2350 } 2468 }
… …
2391 2509
2392static int 2510static int
2393slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2511slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2394{ 2512{
2395 SV *data = (SV *)frame->data; 2513 SV *data = (SV *)frame->data;
2396 2514
2397 if (CORO_THROW) 2515 if (CORO_THROW)
2398 return 0; 2516 return 0;
2399 2517
2400 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2518 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2401 return 1; 2519 return 1;
… …
2437 cb = sv_2mortal (coro->rouse_cb); 2555 cb = sv_2mortal (coro->rouse_cb);
2438 coro->rouse_cb = 0; 2556 coro->rouse_cb = 0;
2439 } 2557 }
2440 2558
2441 if (!SvROK (cb) 2559 if (!SvROK (cb)
2442 || SvTYPE (SvRV (cb)) != SVt_PVCV 2560 || SvTYPE (SvRV (cb)) != SVt_PVCV
2443 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2561 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2444 croak ("Coro::rouse_wait called with illegal callback argument,"); 2562 croak ("Coro::rouse_wait called with illegal callback argument,");
2445 2563
2446 { 2564 {
2447 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2565 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2570 2688
2571/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2689/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2572static void 2690static void
2573slf_destroy (pTHX_ struct coro *coro) 2691slf_destroy (pTHX_ struct coro *coro)
2574{ 2692{
2575 /* this callback is reserved for slf functions needing to do cleanup */ 2693 struct CoroSLF frame = coro->slf_frame;
2576 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2577 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2578 2694
2579 /* 2695 /*
2580 * The on_destroy above most likely is from an SLF call. 2696 * The on_destroy below most likely is from an SLF call.
2581 * Since by definition the SLF call will not finish when we destroy 2697 * Since by definition the SLF call will not finish when we destroy
2582 * the coro, we will have to force-finish it here, otherwise 2698 * the coro, we will have to force-finish it here, otherwise
2583 * cleanup functions cannot call SLF functions. 2699 * cleanup functions cannot call SLF functions.
2584 */ 2700 */
2585 coro->slf_frame.prepare = 0; 2701 coro->slf_frame.prepare = 0;
2702
2703 /* this callback is reserved for slf functions needing to do cleanup */
2704 if (frame.destroy && frame.prepare && !PL_dirty)
2705 frame.destroy (aTHX_ &frame);
2586} 2706}
2587 2707
2588/* 2708/*
2589 * these not obviously related functions are all rolled into one 2709 * these not obviously related functions are all rolled into one
2590 * function to increase chances that they all will call transfer with the same 2710 * function to increase chances that they all will call transfer with the same
… …
2597 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2717 I32 checkmark; /* mark SP to see how many elements check has pushed */
2598 2718
2599 /* set up the slf frame, unless it has already been set-up */ 2719 /* set up the slf frame, unless it has already been set-up */
2600 /* the latter happens when a new coro has been started */ 2720 /* the latter happens when a new coro has been started */
2601 /* or when a new cctx was attached to an existing coroutine */ 2721 /* or when a new cctx was attached to an existing coroutine */
2602 if (expect_true (!slf_frame.prepare)) 2722 if (ecb_expect_true (!slf_frame.prepare))
2603 { 2723 {
2604 /* first iteration */ 2724 /* first iteration */
2605 dSP; 2725 dSP;
2606 SV **arg = PL_stack_base + TOPMARK + 1; 2726 SV **arg = PL_stack_base + TOPMARK + 1;
2607 int items = SP - arg; /* args without function object */ 2727 int items = SP - arg; /* args without function object */
… …
2648 while (slf_frame.check (aTHX_ &slf_frame)); 2768 while (slf_frame.check (aTHX_ &slf_frame));
2649 2769
2650 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2770 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2651 2771
2652 /* exception handling */ 2772 /* exception handling */
2653 if (expect_false (CORO_THROW)) 2773 if (ecb_expect_false (CORO_THROW))
2654 { 2774 {
2655 SV *exception = sv_2mortal (CORO_THROW); 2775 SV *exception = sv_2mortal (CORO_THROW);
2656 2776
2657 CORO_THROW = 0; 2777 CORO_THROW = 0;
2658 sv_setsv (ERRSV, exception); 2778 sv_setsv (ERRSV, exception);
… …
2660 } 2780 }
2661 2781
2662 /* return value handling - mostly like entersub */ 2782 /* return value handling - mostly like entersub */
2663 /* make sure we put something on the stack in scalar context */ 2783 /* make sure we put something on the stack in scalar context */
2664 if (GIMME_V == G_SCALAR 2784 if (GIMME_V == G_SCALAR
2665 && expect_false (PL_stack_sp != PL_stack_base + checkmark + 1)) 2785 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2666 { 2786 {
2667 dSP; 2787 dSP;
2668 SV **bot = PL_stack_base + checkmark; 2788 SV **bot = PL_stack_base + checkmark;
2669 2789
2670 if (sp == bot) /* too few, push undef */ 2790 if (sp == bot) /* too few, push undef */
… …
2775{ 2895{
2776 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2896 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2777 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2897 on_enterleave_call (aTHX_ sv_2mortal (cb));
2778} 2898}
2779 2899
2900static void
2901enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2902{
2903 if (!hook)
2904 return;
2905
2906 if (!*avp)
2907 {
2908 *avp = newAV ();
2909 AvREAL_off (*avp);
2910 }
2911
2912 av_push (*avp, (SV *)hook);
2913 av_push (*avp, (SV *)arg);
2914}
2915
2916static void
2917enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2918{
2919 AV *av = *avp;
2920 int i;
2921
2922 if (!av)
2923 return;
2924
2925 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2926 if (AvARRAY (av)[i] == (SV *)hook)
2927 {
2928 if (execute)
2929 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2930
2931 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2932 av_pop (av);
2933 av_pop (av);
2934 break;
2935 }
2936
2937 if (AvFILLp (av) >= 0)
2938 {
2939 *avp = 0;
2940 SvREFCNT_dec_NN (av);
2941 }
2942}
2943
2944static void
2945api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2946{
2947 struct coro *coro = SvSTATE (coro_sv);
2948
2949 if (SvSTATE_current == coro)
2950 if (enter)
2951 enter (aTHX_ enter_arg);
2952
2953 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2954 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2955}
2956
2957static void
2958api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2959{
2960 struct coro *coro = SvSTATE (coro_sv);
2961
2962 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2963 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2964}
2965
2966static void
2967savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2968{
2969 struct coro *coro = SvSTATE_current;
2970
2971 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2972}
2973
2974static void
2975savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2976{
2977 struct coro *coro = SvSTATE_current;
2978
2979 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2980}
2981
2982static void
2983api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2984{
2985 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2986
2987 /* this ought to be much cheaper than malloc + a single destructor call */
2988 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2989 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2990}
2991
2780/*****************************************************************************/ 2992/*****************************************************************************/
2781/* PerlIO::cede */ 2993/* PerlIO::cede */
2782 2994
2783typedef struct 2995typedef struct
2784{ 2996{
2785 PerlIOBuf base; 2997 PerlIOBuf base;
2786 NV next, every; 2998 NV next, every;
2787} PerlIOCede; 2999} PerlIOCede;
2788 3000
2789static IV 3001static IV ecb_cold
2790PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 3002PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2791{ 3003{
2792 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3004 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2793 3005
2794 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 3006 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2795 self->next = nvtime () + self->every; 3007 self->next = nvtime () + self->every;
2796 3008
2797 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 3009 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2798} 3010}
2799 3011
2800static SV * 3012static SV * ecb_cold
2801PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3013PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2802{ 3014{
2803 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3015 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2804 3016
2805 return newSVnv (self->every); 3017 return newSVnv (self->every);
… …
2912 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3124 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2913 PUTBACK; 3125 PUTBACK;
2914 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3126 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2915 } 3127 }
2916 3128
2917 SvREFCNT_dec (cb); 3129 SvREFCNT_dec_NN (cb);
2918 } 3130 }
2919} 3131}
2920 3132
2921static void 3133static void
2922coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3134coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
2930{ 3142{
2931 AV *av = (AV *)frame->data; 3143 AV *av = (AV *)frame->data;
2932 SV *count_sv = AvARRAY (av)[0]; 3144 SV *count_sv = AvARRAY (av)[0];
2933 SV *coro_hv = SvRV (coro_current); 3145 SV *coro_hv = SvRV (coro_current);
2934 3146
3147 frame->destroy = 0;
3148
2935 /* if we are about to throw, don't actually acquire the lock, just throw */ 3149 /* if we are about to throw, don't actually acquire the lock, just throw */
2936 if (CORO_THROW) 3150 if (ecb_expect_false (CORO_THROW))
3151 {
3152 /* we still might be responsible for the semaphore, so wake up others */
3153 coro_semaphore_adjust (aTHX_ av, 0);
3154
2937 return 0; 3155 return 0;
3156 }
2938 else if (SvIVX (count_sv) > 0) 3157 else if (SvIVX (count_sv) > 0)
2939 { 3158 {
2940 frame->destroy = 0;
2941
2942 if (acquire) 3159 if (acquire)
2943 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3160 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2944 else 3161 else
2945 coro_semaphore_adjust (aTHX_ av, 0); 3162 coro_semaphore_adjust (aTHX_ av, 0);
2946 3163
… …
2950 { 3167 {
2951 int i; 3168 int i;
2952 /* if we were woken up but can't down, we look through the whole */ 3169 /* if we were woken up but can't down, we look through the whole */
2953 /* waiters list and only add us if we aren't in there already */ 3170 /* waiters list and only add us if we aren't in there already */
2954 /* this avoids some degenerate memory usage cases */ 3171 /* this avoids some degenerate memory usage cases */
2955 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 3172 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2956 if (AvARRAY (av)[i] == coro_hv) 3173 if (AvARRAY (av)[i] == coro_hv)
2957 return 1; 3174 return 1;
2958 3175
2959 av_push (av, SvREFCNT_inc (coro_hv)); 3176 av_push (av, SvREFCNT_inc (coro_hv));
2960 return 1; 3177 return 1;
… …
3057 { 3274 {
3058 api_ready (aTHX_ cb); 3275 api_ready (aTHX_ cb);
3059 sv_setiv (cb, 0); /* signal waiter */ 3276 sv_setiv (cb, 0); /* signal waiter */
3060 } 3277 }
3061 3278
3062 SvREFCNT_dec (cb); 3279 SvREFCNT_dec_NN (cb);
3063 3280
3064 --count; 3281 --count;
3065 } 3282 }
3066} 3283}
3067 3284
… …
3152 } 3369 }
3153 3370
3154 av_push (state, data_sv); 3371 av_push (state, data_sv);
3155 3372
3156 api_ready (aTHX_ coro); 3373 api_ready (aTHX_ coro);
3157 SvREFCNT_dec (coro); 3374 SvREFCNT_dec_NN (coro);
3158 SvREFCNT_dec ((AV *)state); 3375 SvREFCNT_dec_NN ((AV *)state);
3159} 3376}
3160 3377
3161static int 3378static int
3162slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3379slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3163{ 3380{
… …
3168 /* it quickly returns */ 3385 /* it quickly returns */
3169 if (CORO_THROW) 3386 if (CORO_THROW)
3170 return 0; 3387 return 0;
3171 3388
3172 /* one element that is an RV? repeat! */ 3389 /* one element that is an RV? repeat! */
3173 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3390 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3174 return 1; 3391 return 1;
3175 3392
3176 /* restore status */ 3393 /* restore status */
3177 { 3394 {
3178 SV *data_sv = av_pop (state); 3395 SV *data_sv = av_pop (state);
… …
3181 errno = data->errorno; 3398 errno = data->errorno;
3182 PL_laststype = data->laststype; 3399 PL_laststype = data->laststype;
3183 PL_laststatval = data->laststatval; 3400 PL_laststatval = data->laststatval;
3184 PL_statcache = data->statcache; 3401 PL_statcache = data->statcache;
3185 3402
3186 SvREFCNT_dec (data_sv); 3403 SvREFCNT_dec_NN (data_sv);
3187 } 3404 }
3188 3405
3189 /* push result values */ 3406 /* push result values */
3190 { 3407 {
3191 dSP; 3408 dSP;
… …
3217 dSP; 3434 dSP;
3218 3435
3219 static SV *prio_cv; 3436 static SV *prio_cv;
3220 static SV *prio_sv; 3437 static SV *prio_sv;
3221 3438
3222 if (expect_false (!prio_cv)) 3439 if (ecb_expect_false (!prio_cv))
3223 { 3440 {
3224 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3441 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3225 prio_sv = newSViv (0); 3442 prio_sv = newSViv (0);
3226 } 3443 }
3227 3444
… …
3333 } 3550 }
3334 3551
3335 return coro_sv; 3552 return coro_sv;
3336} 3553}
3337 3554
3555#ifndef __cplusplus
3556ecb_cold XS(boot_Coro__State);
3557#endif
3558
3559#if CORO_JIT
3560
3561static void ecb_noinline ecb_cold
3562pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3563{
3564 dSP;
3565 AV *av = newAV ();
3566
3567 av_store (av, 3, newSVuv (d));
3568 av_store (av, 2, newSVuv (c));
3569 av_store (av, 1, newSVuv (b));
3570 av_store (av, 0, newSVuv (a));
3571
3572 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3573
3574 PUTBACK;
3575}
3576
3577static void ecb_noinline ecb_cold
3578jit_init (pTHX)
3579{
3580 dSP;
3581 SV *load, *save;
3582 char *map_base;
3583 char *load_ptr, *save_ptr;
3584 STRLEN load_len, save_len, map_len;
3585 int count;
3586
3587 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3588
3589 PUSHMARK (SP);
3590 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3591 #include "state.h"
3592 count = call_pv ("Coro::State::_jit", G_ARRAY);
3593 SPAGAIN;
3594
3595 save = POPs; save_ptr = SvPVbyte (save, save_len);
3596 load = POPs; load_ptr = SvPVbyte (load, load_len);
3597
3598 map_len = load_len + save_len + 16;
3599
3600 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3601
3602 if (map_base == (char *)MAP_FAILED)
3603 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3604
3605 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3606
3607 load_perl_slots = (load_save_perl_slots_type)map_base;
3608 memcpy (map_base, load_ptr, load_len);
3609
3610 map_base += (load_len + 15) & ~15;
3611
3612 save_perl_slots = (load_save_perl_slots_type)map_base;
3613 memcpy (map_base, save_ptr, save_len);
3614
3615 /* we are good citizens and try to make the page read-only, so the evil evil */
3616 /* hackers might have it a bit more difficult */
3617 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3618
3619 PUTBACK;
3620 eval_pv ("undef &Coro::State::_jit", 1);
3621}
3622
3623#endif
3624
3338MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3625MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3339 3626
3340PROTOTYPES: DISABLE 3627PROTOTYPES: DISABLE
3341 3628
3342BOOT: 3629BOOT:
3343{ 3630{
3631#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3632#include "state.h"
3344#ifdef USE_ITHREADS 3633#ifdef USE_ITHREADS
3345# if CORO_PTHREAD 3634# if CORO_PTHREAD
3346 coro_thx = PERL_GET_CONTEXT; 3635 coro_thx = PERL_GET_CONTEXT;
3347# endif 3636# endif
3348#endif 3637#endif
3349 BOOT_PAGESIZE; 3638 /* perl defines these to check for existance first, but why it doesn't */
3639 /* just create them one at init time is not clear to me, except for */
3640 /* programs trying to delete them, but... */
3641 /* anyway, we declare this as invalid and make sure they are initialised here */
3642 DEFSV;
3643 ERRSV;
3350 3644
3351 cctx_current = cctx_new_empty (); 3645 cctx_current = cctx_new_empty ();
3352 3646
3353 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3647 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3354 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3648 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3355 3649
3356 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3650 {
3357 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3651 /*
3358 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3652 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3653 * by coro_sig_vtbl in hash values.
3654 */
3655 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3656
3657 /* this only works if perl doesn't have a vtbl for %SIG */
3658 assert (!mg->mg_virtual);
3659
3660 /*
3661 * The irony is that the perl API itself asserts that mg_virtual
3662 * must be non-const, yet perl5porters insisted on marking their
3663 * vtbls as read-only, just to thwart perl modules from patching
3664 * them.
3665 */
3666 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3667 mg->mg_flags |= MGf_COPY;
3668
3669 coro_sigelem_vtbl = PL_vtbl_sigelem;
3670 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3671 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3672 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3673 }
3359 3674
3360 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3361 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3675 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3362 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3676 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3363 3677
3364 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3678 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3365 3679
… …
3397 coroapi.prepare_cede_notself = prepare_cede_notself; 3711 coroapi.prepare_cede_notself = prepare_cede_notself;
3398 3712
3399 time_init (aTHX); 3713 time_init (aTHX);
3400 3714
3401 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3715 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3716#if CORO_JIT
3717 PUTBACK;
3718 jit_init (aTHX);
3719 SPAGAIN;
3720#endif
3402} 3721}
3403 3722
3404SV * 3723SV *
3405new (SV *klass, ...) 3724new (SV *klass, ...)
3406 ALIAS: 3725 ALIAS:
… …
3413void 3732void
3414transfer (...) 3733transfer (...)
3415 PROTOTYPE: $$ 3734 PROTOTYPE: $$
3416 CODE: 3735 CODE:
3417 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3736 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3418
3419void
3420_exit (int code)
3421 PROTOTYPE: $
3422 CODE:
3423 _exit (code);
3424 3737
3425SV * 3738SV *
3426clone (Coro::State coro) 3739clone (Coro::State coro)
3427 CODE: 3740 CODE:
3428{ 3741{
… …
3483void 3796void
3484list () 3797list ()
3485 PROTOTYPE: 3798 PROTOTYPE:
3486 PPCODE: 3799 PPCODE:
3487{ 3800{
3488 struct coro *coro; 3801 struct coro *coro;
3489 for (coro = coro_first; coro; coro = coro->next) 3802 for (coro = coro_first; coro; coro = coro->next)
3490 if (coro->hv) 3803 if (coro->hv)
3491 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3804 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3492} 3805}
3493 3806
… …
3557 RETVAL = boolSV (coro->flags & ix); 3870 RETVAL = boolSV (coro->flags & ix);
3558 OUTPUT: 3871 OUTPUT:
3559 RETVAL 3872 RETVAL
3560 3873
3561void 3874void
3562throw (Coro::State self, SV *exception = &PL_sv_undef) 3875throw (SV *self, SV *exception = &PL_sv_undef)
3563 PROTOTYPE: $;$ 3876 PROTOTYPE: $;$
3564 CODE: 3877 CODE:
3565{ 3878{
3879 struct coro *coro = SvSTATE (self);
3566 struct coro *current = SvSTATE_current; 3880 struct coro *current = SvSTATE_current;
3567 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3881 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3568 SvREFCNT_dec (*exceptionp); 3882 SvREFCNT_dec (*exceptionp);
3569 SvGETMAGIC (exception); 3883 SvGETMAGIC (exception);
3570 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3884 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3885
3886 api_ready (aTHX_ self);
3571} 3887}
3572 3888
3573void 3889void
3574api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3890api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3575 PROTOTYPE: $;$ 3891 PROTOTYPE: $;$
… …
3652 3968
3653void 3969void
3654times (Coro::State self) 3970times (Coro::State self)
3655 PPCODE: 3971 PPCODE:
3656{ 3972{
3657 struct coro *current = SvSTATE (coro_current); 3973 struct coro *current = SvSTATE (coro_current);
3658 3974
3659 if (expect_false (current == self)) 3975 if (ecb_expect_false (current == self))
3660 { 3976 {
3661 coro_times_update (); 3977 coro_times_update ();
3662 coro_times_add (SvSTATE (coro_current)); 3978 coro_times_add (SvSTATE (coro_current));
3663 } 3979 }
3664 3980
3665 EXTEND (SP, 2); 3981 EXTEND (SP, 2);
3666 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3982 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3667 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3983 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3668 3984
3669 if (expect_false (current == self)) 3985 if (ecb_expect_false (current == self))
3670 coro_times_sub (SvSTATE (coro_current)); 3986 coro_times_sub (SvSTATE (coro_current));
3671} 3987}
3672 3988
3673void 3989void
3674swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3990swap_sv (Coro::State coro, SV *sva, SV *svb)
3675 CODE: 3991 CODE:
3676{ 3992{
3677 struct coro *current = SvSTATE_current; 3993 struct coro *current = SvSTATE_current;
3994 AV *swap_sv;
3995 int i;
3996
3997 sva = SvRV (sva);
3998 svb = SvRV (svb);
3678 3999
3679 if (current == coro) 4000 if (current == coro)
3680 SWAP_SVS (current); 4001 SWAP_SVS_LEAVE (current);
3681 4002
3682 if (!coro->swap_sv) 4003 if (!coro->swap_sv)
3683 coro->swap_sv = newAV (); 4004 coro->swap_sv = newAV ();
3684 4005
4006 swap_sv = coro->swap_sv;
4007
4008 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4009 {
4010 SV *a = AvARRAY (swap_sv)[i ];
4011 SV *b = AvARRAY (swap_sv)[i + 1];
4012
4013 if (a == sva && b == svb)
4014 {
4015 SvREFCNT_dec_NN (a);
4016 SvREFCNT_dec_NN (b);
4017
4018 for (; i <= AvFILLp (swap_sv) - 2; i++)
4019 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4020
4021 AvFILLp (swap_sv) -= 2;
4022
4023 goto removed;
4024 }
4025 }
4026
3685 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4027 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3686 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4028 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4029
4030 removed:
3687 4031
3688 if (current == coro) 4032 if (current == coro)
3689 SWAP_SVS (current); 4033 SWAP_SVS_ENTER (current);
3690} 4034}
3691 4035
3692 4036
3693MODULE = Coro::State PACKAGE = Coro 4037MODULE = Coro::State PACKAGE = Coro
3694 4038
3695BOOT: 4039BOOT:
3696{ 4040{
4041 if (SVt_LAST > 32)
4042 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4043
3697 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4044 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3698 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4045 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3699 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4046 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3700 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4047 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3701 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4048 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3705 4052
3706 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4053 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3707 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4054 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3708 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4055 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3709 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 4056 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3710 4057
3711 coro_stash = gv_stashpv ("Coro", TRUE); 4058 coro_stash = gv_stashpv ("Coro", TRUE);
3712 4059
3713 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4060 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3714 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4061 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3715 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4062 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3727 coroapi.ready = api_ready; 4074 coroapi.ready = api_ready;
3728 coroapi.is_ready = api_is_ready; 4075 coroapi.is_ready = api_is_ready;
3729 coroapi.nready = coro_nready; 4076 coroapi.nready = coro_nready;
3730 coroapi.current = coro_current; 4077 coroapi.current = coro_current;
3731 4078
4079 coroapi.enterleave_hook = api_enterleave_hook;
4080 coroapi.enterleave_unhook = api_enterleave_unhook;
4081 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4082
3732 /*GCoroAPI = &coroapi;*/ 4083 /*GCoroAPI = &coroapi;*/
3733 sv_setiv (sv, (IV)&coroapi); 4084 sv_setiv (sv, PTR2IV (&coroapi));
3734 SvREADONLY_on (sv); 4085 SvREADONLY_on (sv);
3735 } 4086 }
3736} 4087}
3737 4088
3738SV * 4089SV *
… …
3801 4152
3802void 4153void
3803_set_current (SV *current) 4154_set_current (SV *current)
3804 PROTOTYPE: $ 4155 PROTOTYPE: $
3805 CODE: 4156 CODE:
3806 SvREFCNT_dec (SvRV (coro_current)); 4157 SvREFCNT_dec_NN (SvRV (coro_current));
3807 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4158 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3808 4159
3809void 4160void
3810_set_readyhook (SV *hook) 4161_set_readyhook (SV *hook)
3811 PROTOTYPE: $ 4162 PROTOTYPE: $
… …
3895 4246
3896 if ((SV *)hv == &PL_sv_undef) 4247 if ((SV *)hv == &PL_sv_undef)
3897 { 4248 {
3898 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4249 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3899 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4250 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3900 SvREFCNT_dec (sv); 4251 SvREFCNT_dec_NN (sv);
3901 } 4252 }
3902 4253
3903 { 4254 {
3904 struct coro *coro = SvSTATE_hv (hv); 4255 struct coro *coro = SvSTATE_hv (hv);
3905 4256
… …
3912 api_ready (aTHX_ (SV *)hv); 4263 api_ready (aTHX_ (SV *)hv);
3913 4264
3914 if (GIMME_V != G_VOID) 4265 if (GIMME_V != G_VOID)
3915 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4266 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3916 else 4267 else
3917 SvREFCNT_dec (hv); 4268 SvREFCNT_dec_NN (hv);
3918} 4269}
3919 4270
3920SV * 4271SV *
3921rouse_cb () 4272rouse_cb ()
3922 PROTOTYPE: 4273 PROTOTYPE:
… …
3937 on_leave = 1 4288 on_leave = 1
3938 PROTOTYPE: & 4289 PROTOTYPE: &
3939 CODE: 4290 CODE:
3940{ 4291{
3941 struct coro *coro = SvSTATE_current; 4292 struct coro *coro = SvSTATE_current;
3942 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4293 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3943 4294
3944 block = s_get_cv_croak (block); 4295 block = s_get_cv_croak (block);
3945 4296
3946 if (!*avp) 4297 if (!*avp)
3947 *avp = newAV (); 4298 *avp = newAV ();
… …
3967 4318
3968SV * 4319SV *
3969new (SV *klass, SV *count = 0) 4320new (SV *klass, SV *count = 0)
3970 CODE: 4321 CODE:
3971{ 4322{
3972 int semcnt = 1; 4323 int semcnt = 1;
3973 4324
3974 if (count) 4325 if (count)
3975 { 4326 {
3976 SvGETMAGIC (count); 4327 SvGETMAGIC (count);
3977 4328
… …
4001 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4352 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4002 OUTPUT: 4353 OUTPUT:
4003 RETVAL 4354 RETVAL
4004 4355
4005void 4356void
4006up (SV *self, int adjust = 1) 4357up (SV *self)
4007 ALIAS:
4008 adjust = 1
4009 CODE: 4358 CODE:
4359 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4360
4361void
4362adjust (SV *self, int adjust)
4363 CODE:
4010 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4364 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4011 4365
4012void 4366void
4013down (...) 4367down (...)
4014 CODE: 4368 CODE:
4015 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4369 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
4037 XSRETURN_NO; 4391 XSRETURN_NO;
4038} 4392}
4039 4393
4040void 4394void
4041waiters (SV *self) 4395waiters (SV *self)
4042 PPCODE: 4396 PPCODE:
4043{ 4397{
4044 AV *av = (AV *)SvRV (self); 4398 AV *av = (AV *)SvRV (self);
4045 int wcount = AvFILLp (av) + 1 - 1; 4399 int wcount = AvFILLp (av) + 1 - 1;
4046 4400
4047 if (GIMME_V == G_SCALAR) 4401 if (GIMME_V == G_SCALAR)
… …
4056} 4410}
4057 4411
4058MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4412MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4059 4413
4060void 4414void
4061_may_delete (SV *sem, int count, int extra_refs) 4415_may_delete (SV *sem, int count, unsigned int extra_refs)
4062 PPCODE: 4416 PPCODE:
4063{ 4417{
4064 AV *av = (AV *)SvRV (sem); 4418 AV *av = (AV *)SvRV (sem);
4065 4419
4066 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4420 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4067 && AvFILLp (av) == 0 /* no waiters, just count */ 4421 && AvFILLp (av) == 0 /* no waiters, just count */
4068 && SvIV (AvARRAY (av)[0]) == count) 4422 && SvIV (AvARRAY (av)[0]) == count)
4069 XSRETURN_YES; 4423 XSRETURN_YES;
… …
4090 4444
4091void 4445void
4092broadcast (SV *self) 4446broadcast (SV *self)
4093 CODE: 4447 CODE:
4094{ 4448{
4095 AV *av = (AV *)SvRV (self); 4449 AV *av = (AV *)SvRV (self);
4096 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4450 coro_signal_wake (aTHX_ av, AvFILLp (av));
4097} 4451}
4098 4452
4099void 4453void
4100send (SV *self) 4454send (SV *self)
… …
4108 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4462 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4109} 4463}
4110 4464
4111IV 4465IV
4112awaited (SV *self) 4466awaited (SV *self)
4113 CODE: 4467 CODE:
4114 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4468 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4115 OUTPUT: 4469 OUTPUT:
4116 RETVAL 4470 RETVAL
4117 4471
4118 4472
… …
4123 4477
4124void 4478void
4125_schedule (...) 4479_schedule (...)
4126 CODE: 4480 CODE:
4127{ 4481{
4128 static int incede; 4482 static int incede;
4129 4483
4130 api_cede_notself (aTHX); 4484 api_cede_notself (aTHX);
4131 4485
4132 ++incede; 4486 ++incede;
4133 while (coro_nready >= incede && api_cede (aTHX)) 4487 while (coro_nready >= incede && api_cede (aTHX))
… …
4177 { 4531 {
4178 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4532 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4179 coro_old_pp_sselect = 0; 4533 coro_old_pp_sselect = 0;
4180 } 4534 }
4181 4535
4536MODULE = Coro::State PACKAGE = Coro::Util
4537
4538void
4539_exit (int code)
4540 CODE:
4541 _exit (code);
4542
4543NV
4544time ()
4545 CODE:
4546 RETVAL = nvtime (aTHX);
4547 OUTPUT:
4548 RETVAL
4549
4550NV
4551gettimeofday ()
4552 PPCODE:
4553{
4554 UV tv [2];
4555 u2time (aTHX_ tv);
4556 EXTEND (SP, 2);
4557 PUSHs (sv_2mortal (newSVuv (tv [0])));
4558 PUSHs (sv_2mortal (newSVuv (tv [1])));
4559}
4560

Diff Legend

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