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.408 by root, Sat Jun 11 16:58:40 2011 UTC vs.
Revision 1.479 by root, Thu Jun 24 19:10:06 2021 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
8#if CORO_UCONTEXT
9 #define CORO_BACKEND "ucontext"
10#elif CORO_SJLJ
11 #define CORO_BACKEND "sjlj"
12#elif CORO_LINUX
13 #define CORO_BACKEND "linux"
14#elif CORO_LOSER
15 #define CORO_BACKEND "loser"
16#elif CORO_FIBER
17 #define CORO_BACKEND "fiber"
18#elif CORO_IRIX
19 #define CORO_BACKEND "irix"
20#elif CORO_ASM
21 #define CORO_BACKEND "asm"
22#elif CORO_PTHREAD
23 #define CORO_BACKEND "pthread"
24#else
25 #define CORO_BACKEND "unknown"
26#endif
7 27
8#define PERL_NO_GET_CONTEXT 28#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 29#define PERL_EXT
10 30
11#include "EXTERN.h" 31#include "EXTERN.h"
12#include "perl.h" 32#include "perl.h"
13#include "XSUB.h" 33#include "XSUB.h"
14#include "perliol.h" 34#include "perliol.h"
15 35
16#include "schmorp.h" 36#include "schmorp.h"
37
38#define ECB_NO_THREADS 1
39#define ECB_NO_LIBM 1
17#include "ecb.h" 40#include "ecb.h"
18 41
19#include <stddef.h> 42#include <stddef.h>
20#include <stdio.h> 43#include <stdio.h>
21#include <errno.h> 44#include <errno.h>
22#include <assert.h> 45#include <assert.h>
23 46
47#ifndef SvREFCNT_dec_NN
48 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
49#endif
50
51#ifndef SvREFCNT_inc_NN
52 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
53#endif
54
24#ifndef SVs_PADSTALE 55#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0 56# define SVs_PADSTALE 0
57#endif
58
59#ifdef PadARRAY
60# define NEWPADAPI 1
61# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
62#else
63typedef AV PADNAMELIST;
64# if !PERL_VERSION_ATLEAST(5,8,0)
65typedef AV PADLIST;
66typedef AV PAD;
67# endif
68# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
69# define PadlistMAX(pl) AvFILLp (pl)
70# define PadlistNAMES(pl) (*PadlistARRAY (pl))
71# define PadARRAY AvARRAY
72# define PadMAX AvFILLp
73# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
74#endif
75#ifndef PadnamelistREFCNT
76# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
77#endif
78#ifndef PadnamelistREFCNT_dec
79# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
80#endif
81
82/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
83/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
84#if PERL_VERSION_ATLEAST(5,19,0)
85# define SVt_BIND SVt_IV
26#endif 86#endif
27 87
28#if defined(_WIN32) 88#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY 89# undef HAS_GETTIMEOFDAY
30# undef setjmp 90# undef setjmp
33# define setjmp _setjmp /* deep magic */ 93# define setjmp _setjmp /* deep magic */
34#else 94#else
35# include <inttypes.h> /* most portable stdint.h */ 95# include <inttypes.h> /* most portable stdint.h */
36#endif 96#endif
37 97
38#ifdef HAVE_MMAP
39# include <unistd.h>
40# include <sys/mman.h>
41# ifndef MAP_ANONYMOUS
42# ifdef MAP_ANON
43# define MAP_ANONYMOUS MAP_ANON
44# else
45# undef HAVE_MMAP
46# endif
47# endif
48# include <limits.h>
49# ifndef PAGESIZE
50# define PAGESIZE pagesize
51# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
52static long pagesize;
53# else
54# define BOOT_PAGESIZE (void)0
55# endif
56#else
57# define PAGESIZE 0
58# define BOOT_PAGESIZE (void)0
59#endif
60
61#if CORO_USE_VALGRIND
62# include <valgrind/valgrind.h>
63#endif
64
65/* the maximum number of idle cctx that will be pooled */ 98/* the maximum number of idle cctx that will be pooled */
66static int cctx_max_idle = 4; 99static int cctx_max_idle = 4;
67 100
68#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 101#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# undef CORO_STACKGUARD 102# define HAS_SCOPESTACK_NAME 1
70#endif
71
72#ifndef CORO_STACKGUARD
73# define CORO_STACKGUARD 0
74#endif 103#endif
75 104
76/* prefer perl internal functions over our own? */ 105/* prefer perl internal functions over our own? */
77#ifndef CORO_PREFER_PERL_FUNCTIONS 106#ifndef CORO_PREFER_PERL_FUNCTIONS
78# define CORO_PREFER_PERL_FUNCTIONS 0 107# define CORO_PREFER_PERL_FUNCTIONS 0
97# if CORO_PTHREAD 126# if CORO_PTHREAD
98static void *coro_thx; 127static void *coro_thx;
99# endif 128# endif
100#endif 129#endif
101 130
102/* used in state.h */
103#define VAR(name,type) VARx(name, PL_ ## name, type)
104
105#ifdef __linux 131#ifdef __linux
106# include <time.h> /* for timespec */ 132# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */ 133# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime 134# ifdef SYS_clock_gettime
109# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 135# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
110# define CORO_CLOCK_MONOTONIC 1 136# define CORO_CLOCK_MONOTONIC 1
111# define CORO_CLOCK_THREAD_CPUTIME_ID 3 137# define CORO_CLOCK_THREAD_CPUTIME_ID 3
112# endif 138# endif
113#endif 139#endif
114 140
141/* one off bugfix for perl 5.22 */
142#if PERL_VERSION_ATLEAST(5,22,0) && !PERL_VERSION_ATLEAST(5,24,0)
143# undef PadlistNAMES
144# define PadlistNAMES(pl) *((PADNAMELIST **)PadlistARRAY (pl))
145#endif
146
147#if PERL_VERSION_ATLEAST(5,24,0)
148# define SUB_ARGARRAY PL_curpad[0]
149#else
150# define SUB_ARGARRAY (SV *)cx->blk_sub.argarray
151#endif
152
153/* perl usually suppresses asserts. for debugging, we sometimes force it to be on */
154#if 0
155# undef NDEBUG
156# include <assert.h>
157#endif
158
115static double (*nvtime)(); /* so why doesn't it take void? */ 159static double (*nvtime)(); /* so why doesn't it take void? */
116static void (*u2time)(pTHX_ UV ret[2]); 160static void (*u2time)(pTHX_ UV ret[2]);
117 161
118/* we hijack an hopefully unused CV flag for our purposes */ 162/* we hijack an hopefully unused CV flag for our purposes */
119#define CVf_SLF 0x4000 163#define CVf_SLF 0x4000
134 178
135static GV *irsgv; /* $/ */ 179static GV *irsgv; /* $/ */
136static GV *stdoutgv; /* *STDOUT */ 180static GV *stdoutgv; /* *STDOUT */
137static SV *rv_diehook; 181static SV *rv_diehook;
138static SV *rv_warnhook; 182static SV *rv_warnhook;
139static HV *hv_sig; /* %SIG */
140 183
141/* async_pool helper stuff */ 184/* async_pool helper stuff */
142static SV *sv_pool_rss; 185static SV *sv_pool_rss;
143static SV *sv_pool_size; 186static SV *sv_pool_size;
144static SV *sv_async_pool_idle; /* description string */ 187static SV *sv_async_pool_idle; /* description string */
172typedef struct coro_cctx 215typedef struct coro_cctx
173{ 216{
174 struct coro_cctx *next; 217 struct coro_cctx *next;
175 218
176 /* the stack */ 219 /* the stack */
177 void *sptr; 220 struct coro_stack stack;
178 size_t ssize;
179 221
180 /* cpu state */ 222 /* cpu state */
181 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 223 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
224#ifndef NDEBUG
182 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 225 JMPENV *idle_te; /* same as idle_sp, but for top_env */
226#endif
183 JMPENV *top_env; 227 JMPENV *top_env;
184 coro_context cctx; 228 coro_context cctx;
185 229
186 U32 gen; 230 U32 gen;
187#if CORO_USE_VALGRIND 231#if CORO_USE_VALGRIND
207}; 251};
208 252
209/* the structure where most of the perl state is stored, overlaid on the cxstack */ 253/* the structure where most of the perl state is stored, overlaid on the cxstack */
210typedef struct 254typedef struct
211{ 255{
212#define VARx(name,expr,type) type name; 256 #define VARx(name,expr,type) type name;
213# include "state.h" 257 #include "state.h"
214#undef VARx
215} perl_slots; 258} perl_slots;
216 259
217// how many context stack entries do we need for perl_slots 260/* how many context stack entries do we need for perl_slots */
218#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 261#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
219 262
220/* this is a structure representing a perl-level coroutine */ 263/* this is a structure representing a perl-level coroutine */
221struct coro 264struct coro
222{ 265{
240 int usecount; /* number of transfers to this coro */ 283 int usecount; /* number of transfers to this coro */
241 284
242 /* coro process data */ 285 /* coro process data */
243 int prio; 286 int prio;
244 SV *except; /* exception to be thrown */ 287 SV *except; /* exception to be thrown */
245 SV *rouse_cb; /* last rouse callback */ 288 SV *rouse_cb; /* most recently created rouse callback */
246 AV *on_destroy; /* callbacks or coros to notify on destroy */ 289 AV *on_destroy; /* callbacks or coros to notify on destroy */
247 AV *status; /* the exit status list */ 290 AV *status; /* the exit status list */
248 291
249 /* async_pool */ 292 /* async_pool */
250 SV *saved_deffh; 293 SV *saved_deffh;
251 SV *invoke_cb; 294 SV *invoke_cb;
252 AV *invoke_av; 295 AV *invoke_av;
253 296
254 /* on_enter/on_leave */ 297 /* on_enter/on_leave */
255 AV *on_enter; 298 AV *on_enter; AV *on_enter_xs;
256 AV *on_leave; 299 AV *on_leave; AV *on_leave_xs;
257 300
258 /* swap_sv */ 301 /* swap_sv */
259 AV *swap_sv; 302 AV *swap_sv;
260 303
261 /* times */ 304 /* times */
291#define coro_nready coroapi.nready 334#define coro_nready coroapi.nready
292 335
293/** JIT *********************************************************************/ 336/** JIT *********************************************************************/
294 337
295#if CORO_JIT 338#if CORO_JIT
339 /* APPLE doesn't have mmap though */
340 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
296 #ifndef CORO_JIT_TYPE 341 #ifndef CORO_JIT_TYPE
297 #if __x86_64 && (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris) 342 #if ECB_AMD64 && CORO_JIT_UNIXY
298 #define CORO_JIT_TYPE "amd64-unix" 343 #define CORO_JIT_TYPE "amd64-unix"
299 typedef void (*load_save_perl_slots_type)(perl_slots *); 344 #elif __i386 && CORO_JIT_UNIXY
300 #elif __i386 && (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris)
301 #define CORO_JIT_TYPE "x86-unix" 345 #define CORO_JIT_TYPE "x86-unix"
302 typedef void (*load_save_perl_slots_type)(perl_slots *);
303 #else
304 #undef CORO_JIT
305 #endif 346 #endif
306 #endif 347 #endif
307#endif 348#endif
308 349
350#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
351 #undef CORO_JIT
352#endif
353
309#if CORO_JIT 354#if CORO_JIT
355 typedef void (*load_save_perl_slots_type)(perl_slots *);
310static load_save_perl_slots_type load_perl_slots, save_perl_slots; 356 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
311#endif 357#endif
312 358
313/** Coro::Select ************************************************************/ 359/** Coro::Select ************************************************************/
314 360
315static OP *(*coro_old_pp_sselect) (pTHX); 361static OP *(*coro_old_pp_sselect) (pTHX);
332 378
333/** time stuff **************************************************************/ 379/** time stuff **************************************************************/
334 380
335#ifdef HAS_GETTIMEOFDAY 381#ifdef HAS_GETTIMEOFDAY
336 382
337ECB_INLINE void 383ecb_inline void
338coro_u2time (pTHX_ UV ret[2]) 384coro_u2time (pTHX_ UV ret[2])
339{ 385{
340 struct timeval tv; 386 struct timeval tv;
341 gettimeofday (&tv, 0); 387 gettimeofday (&tv, 0);
342 388
343 ret [0] = tv.tv_sec; 389 ret [0] = tv.tv_sec;
344 ret [1] = tv.tv_usec; 390 ret [1] = tv.tv_usec;
345} 391}
346 392
347ECB_INLINE double 393ecb_inline double
348coro_nvtime () 394coro_nvtime (void)
349{ 395{
350 struct timeval tv; 396 struct timeval tv;
351 gettimeofday (&tv, 0); 397 gettimeofday (&tv, 0);
352 398
353 return tv.tv_sec + tv.tv_usec * 1e-6; 399 return tv.tv_sec + tv.tv_usec * 1e-6;
354} 400}
355 401
356ECB_INLINE void 402ecb_inline void
357time_init (pTHX) 403time_init (pTHX)
358{ 404{
359 nvtime = coro_nvtime; 405 nvtime = coro_nvtime;
360 u2time = coro_u2time; 406 u2time = coro_u2time;
361} 407}
362 408
363#else 409#else
364 410
365ECB_INLINE void 411ecb_inline void
366time_init (pTHX) 412time_init (pTHX)
367{ 413{
368 SV **svp; 414 SV **svp;
369 415
370 require_pv ("Time/HiRes.pm"); 416 require_pv ("Time/HiRes.pm");
371 417
372 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 418 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
373 419
374 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 420 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
375 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 421 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
376 422
412 get_hv (name, create); 458 get_hv (name, create);
413#endif 459#endif
414 return get_hv (name, create); 460 return get_hv (name, create);
415} 461}
416 462
417ECB_INLINE void 463ecb_inline void
418coro_times_update () 464coro_times_update (void)
419{ 465{
420#ifdef coro_clock_gettime 466#ifdef coro_clock_gettime
421 struct timespec ts; 467 struct timespec ts;
422 468
423 ts.tv_sec = ts.tv_nsec = 0; 469 ts.tv_sec = ts.tv_nsec = 0;
435 time_real [0] = tv [0]; 481 time_real [0] = tv [0];
436 time_real [1] = tv [1] * 1000; 482 time_real [1] = tv [1] * 1000;
437#endif 483#endif
438} 484}
439 485
440ECB_INLINE void 486ecb_inline void
441coro_times_add (struct coro *c) 487coro_times_add (struct coro *c)
442{ 488{
443 c->t_real [1] += time_real [1]; 489 c->t_real [1] += time_real [1];
444 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 490 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
445 c->t_real [0] += time_real [0]; 491 c->t_real [0] += time_real [0];
447 c->t_cpu [1] += time_cpu [1]; 493 c->t_cpu [1] += time_cpu [1];
448 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 494 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
449 c->t_cpu [0] += time_cpu [0]; 495 c->t_cpu [0] += time_cpu [0];
450} 496}
451 497
452ECB_INLINE void 498ecb_inline void
453coro_times_sub (struct coro *c) 499coro_times_sub (struct coro *c)
454{ 500{
455 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 501 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
456 c->t_real [1] -= time_real [1]; 502 c->t_real [1] -= time_real [1];
457 c->t_real [0] -= time_real [0]; 503 c->t_real [0] -= time_real [0];
478 : 0) 524 : 0)
479 525
480#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 526#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
481#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 527#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
482 528
483ECB_INLINE MAGIC * 529ecb_inline MAGIC *
484SvSTATEhv_p (pTHX_ SV *coro) 530SvSTATEhv_p (pTHX_ SV *coro)
485{ 531{
486 MAGIC *mg; 532 MAGIC *mg;
487 533
488 if (ecb_expect_true ( 534 if (ecb_expect_true (
493 return mg; 539 return mg;
494 540
495 return 0; 541 return 0;
496} 542}
497 543
498ECB_INLINE struct coro * 544ecb_inline struct coro *
499SvSTATE_ (pTHX_ SV *coro) 545SvSTATE_ (pTHX_ SV *coro_sv)
500{ 546{
501 MAGIC *mg; 547 MAGIC *mg;
502 548
503 if (SvROK (coro)) 549 if (SvROK (coro_sv))
504 coro = SvRV (coro); 550 coro_sv = SvRV (coro_sv);
505 551
506 mg = SvSTATEhv_p (aTHX_ coro); 552 mg = SvSTATEhv_p (aTHX_ coro_sv);
507 if (!mg) 553 if (!mg)
508 croak ("Coro::State object required"); 554 croak ("Coro::State object required");
509 555
510 return (struct coro *)mg->mg_ptr; 556 return (struct coro *)mg->mg_ptr;
511} 557}
517#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 563#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
518 564
519/*****************************************************************************/ 565/*****************************************************************************/
520/* padlist management and caching */ 566/* padlist management and caching */
521 567
522ECB_INLINE AV * 568ecb_inline PADLIST *
523coro_derive_padlist (pTHX_ CV *cv) 569coro_derive_padlist (pTHX_ CV *cv)
524{ 570{
525 AV *padlist = CvPADLIST (cv); 571 PADLIST *padlist = CvPADLIST (cv);
526 AV *newpadlist, *newpad; 572 PADLIST *newpadlist;
573 PADNAMELIST *padnames;
574 PAD *newpad;
575 PADOFFSET off = PadlistMAX (padlist) + 1;
527 576
528 newpadlist = newAV (); 577#if NEWPADAPI
578
579 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
580 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
581 while (!PadlistARRAY (padlist)[off - 1])
582 --off;
583
584 Perl_pad_push (aTHX_ padlist, off);
585
586 newpad = PadlistARRAY (padlist)[off];
587 PadlistARRAY (padlist)[off] = 0;
588
589#else
590
591#if PERL_VERSION_ATLEAST (5,10,0)
592 Perl_pad_push (aTHX_ padlist, off);
593#else
594 Perl_pad_push (aTHX_ padlist, off, 1);
595#endif
596
597 newpad = PadlistARRAY (padlist)[off];
598 PadlistMAX (padlist) = off - 1;
599
600#endif
601
602 newPADLIST (newpadlist);
603#if !PERL_VERSION_ATLEAST(5,15,3)
604 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
529 AvREAL_off (newpadlist); 605 AvREAL_off (newpadlist);
530#if PERL_VERSION_ATLEAST (5,10,0)
531 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
532#else
533 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
534#endif 606#endif
535 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
536 --AvFILLp (padlist);
537 607
538 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 608 /* Already extended to 2 elements by newPADLIST. */
539 av_store (newpadlist, 1, (SV *)newpad); 609 PadlistMAX (newpadlist) = 1;
610
611 padnames = PadlistNAMES (padlist);
612 ++PadnamelistREFCNT (padnames);
613 PadlistNAMES (newpadlist) = padnames;
614
615 PadlistARRAY (newpadlist)[1] = newpad;
540 616
541 return newpadlist; 617 return newpadlist;
542} 618}
543 619
544ECB_INLINE void 620ecb_inline void
545free_padlist (pTHX_ AV *padlist) 621free_padlist (pTHX_ PADLIST *padlist)
546{ 622{
547 /* may be during global destruction */ 623 /* may be during global destruction */
548 if (!IN_DESTRUCT) 624 if (!IN_DESTRUCT)
549 { 625 {
550 I32 i = AvFILLp (padlist); 626 I32 i = PadlistMAX (padlist);
551 627
552 while (i > 0) /* special-case index 0 */ 628 while (i > 0) /* special-case index 0 */
553 { 629 {
554 /* we try to be extra-careful here */ 630 /* we try to be extra-careful here */
555 AV *av = (AV *)AvARRAY (padlist)[i--]; 631 PAD *pad = PadlistARRAY (padlist)[i--];
556 I32 j = AvFILLp (av);
557 632
633 if (pad)
634 {
635 I32 j = PadMAX (pad);
636
558 while (j >= 0) 637 while (j >= 0)
559 SvREFCNT_dec (AvARRAY (av)[j--]); 638 SvREFCNT_dec (PadARRAY (pad)[j--]);
560 639
561 AvFILLp (av) = -1; 640 PadMAX (pad) = -1;
562 SvREFCNT_dec (av); 641 SvREFCNT_dec (pad);
642 }
563 } 643 }
564 644
565 SvREFCNT_dec (AvARRAY (padlist)[0]); 645 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
566 646
647#if NEWPADAPI
648 Safefree (PadlistARRAY (padlist));
649 Safefree (padlist);
650#else
567 AvFILLp (padlist) = -1; 651 AvFILLp (padlist) = -1;
652 AvREAL_off (padlist);
568 SvREFCNT_dec ((SV*)padlist); 653 SvREFCNT_dec ((SV*)padlist);
654#endif
569 } 655 }
570} 656}
571 657
572static int 658static int
573coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 659coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
574{ 660{
575 AV *padlist; 661 PADLIST *padlist;
576 AV *av = (AV *)mg->mg_obj; 662 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
663 size_t len = *(size_t *)mg->mg_ptr;
577 664
578 /* perl manages to free our internal AV and _then_ call us */ 665 /* perl manages to free our internal AV and _then_ call us */
579 if (IN_DESTRUCT) 666 if (IN_DESTRUCT)
580 return 0; 667 return 0;
581 668
582 /* casting is fun. */ 669 while (len--)
583 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
584 free_padlist (aTHX_ padlist); 670 free_padlist (aTHX_ padlists[len]);
585
586 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
587 671
588 return 0; 672 return 0;
589} 673}
590 674
591static MGVTBL coro_cv_vtbl = { 675static MGVTBL coro_cv_vtbl = {
592 0, 0, 0, 0, 676 0, 0, 0, 0,
593 coro_cv_free 677 coro_cv_free
594}; 678};
595 679
596/* the next two functions merely cache the padlists */ 680/* the next two functions merely cache the padlists */
597ECB_INLINE void 681ecb_inline void
598get_padlist (pTHX_ CV *cv) 682get_padlist (pTHX_ CV *cv)
599{ 683{
600 MAGIC *mg = CORO_MAGIC_cv (cv); 684 MAGIC *mg = CORO_MAGIC_cv (cv);
601 AV *av; 685 size_t *lenp;
602 686
603 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 687 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
604 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 688 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
605 else 689 else
606 { 690 {
607#if CORO_PREFER_PERL_FUNCTIONS 691#if CORO_PREFER_PERL_FUNCTIONS
608 /* this is probably cleaner? but also slower! */ 692 /* this is probably cleaner? but also slower! */
609 /* in practise, it seems to be less stable */ 693 /* in practise, it seems to be less stable */
615 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 699 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
616#endif 700#endif
617 } 701 }
618} 702}
619 703
620ECB_INLINE void 704ecb_inline void
621put_padlist (pTHX_ CV *cv) 705put_padlist (pTHX_ CV *cv)
622{ 706{
623 MAGIC *mg = CORO_MAGIC_cv (cv); 707 MAGIC *mg = CORO_MAGIC_cv (cv);
624 AV *av;
625 708
626 if (ecb_expect_false (!mg)) 709 if (ecb_expect_false (!mg))
710 {
627 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 711 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
712 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
713 mg->mg_len = 1; /* so mg_free frees mg_ptr */
714 }
715 else
716 Renew (mg->mg_ptr,
717 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
718 char);
628 719
629 av = (AV *)mg->mg_obj; 720 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
630
631 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
632 av_extend (av, AvFILLp (av) + 1);
633
634 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
635} 721}
636 722
637/** load & save, init *******************************************************/ 723/** load & save, init *******************************************************/
638 724
725ecb_inline void
726swap_sv (SV *a, SV *b)
727{
728 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
729 SV tmp;
730
731 /* swap sv_any */
732 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
733
734 /* swap sv_flags */
735 SvFLAGS (&tmp) = SvFLAGS (a);
736 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
737 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
738
739#if PERL_VERSION_ATLEAST (5,10,0)
740 /* perl 5.10 and later complicates this _quite_ a bit, but it also
741 * is much faster, so no quarrels here. alternatively, we could
742 * sv_upgrade to avoid this.
743 */
744 {
745 /* swap sv_u */
746 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
747
748 /* if SvANY points to the head, we need to adjust the pointers,
749 * as the pointer for a still points to b, and maybe vice versa.
750 */
751 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
752 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
753 svany_in_head_set |= 1 << SVt_NV;
754 #endif
755
756 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
757
758 if (svany_in_head (SvTYPE (a)))
759 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
760
761 if (svany_in_head (SvTYPE (b)))
762 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
763 }
764#endif
765}
766
639/* swap sv heads, at least logically */ 767/* swap sv heads, at least logically */
640static void 768static void
641swap_svs (pTHX_ Coro__State c) 769swap_svs_enter (pTHX_ Coro__State c)
642{ 770{
643 int i; 771 int i;
644 772
645 for (i = 0; i <= AvFILLp (c->swap_sv); ) 773 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
646 { 774 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
647 SV *a = AvARRAY (c->swap_sv)[i++];
648 SV *b = AvARRAY (c->swap_sv)[i++];
649
650 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
651 SV tmp;
652
653 /* swap sv_any */
654 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
655
656 /* swap sv_flags */
657 SvFLAGS (&tmp) = SvFLAGS (a);
658 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
659 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
660
661#if PERL_VERSION_ATLEAST (5,10,0)
662 /* perl 5.10 complicates this _quite_ a bit, but it also is
663 * much faster, so no quarrels here. alternatively, we could
664 * sv_upgrade to avoid this.
665 */
666 {
667 /* swap sv_u */
668 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
669
670 /* if SvANY points to the head, we need to adjust the pointers,
671 * as the pointer for a still points to b, and maybe vice versa.
672 */
673 #define svany_in_head(type) \
674 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
675
676 if (svany_in_head (SvTYPE (a)))
677 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
678
679 if (svany_in_head (SvTYPE (b)))
680 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
681 }
682#endif
683 }
684} 775}
685 776
777static void
778swap_svs_leave (pTHX_ Coro__State c)
779{
780 int i;
781
782 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
783 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
784}
785
686#define SWAP_SVS(coro) \ 786#define SWAP_SVS_ENTER(coro) \
687 if (ecb_expect_false ((coro)->swap_sv)) \ 787 if (ecb_expect_false ((coro)->swap_sv)) \
688 swap_svs (aTHX_ (coro)) 788 swap_svs_enter (aTHX_ (coro))
789
790#define SWAP_SVS_LEAVE(coro) \
791 if (ecb_expect_false ((coro)->swap_sv)) \
792 swap_svs_leave (aTHX_ (coro))
689 793
690static void 794static void
691on_enterleave_call (pTHX_ SV *cb); 795on_enterleave_call (pTHX_ SV *cb);
692 796
693static void 797static void
700 804
701#if CORO_JIT 805#if CORO_JIT
702 load_perl_slots (slot); 806 load_perl_slots (slot);
703#else 807#else
704 #define VARx(name,expr,type) expr = slot->name; 808 #define VARx(name,expr,type) expr = slot->name;
705 # include "state.h" 809 #include "state.h"
706 #undef VARx
707#endif 810#endif
708 811
709 { 812 {
710 dSP; 813 dSP;
711 814
714 /* now do the ugly restore mess */ 817 /* now do the ugly restore mess */
715 while (ecb_expect_true (cv = (CV *)POPs)) 818 while (ecb_expect_true (cv = (CV *)POPs))
716 { 819 {
717 put_padlist (aTHX_ cv); /* mark this padlist as available */ 820 put_padlist (aTHX_ cv); /* mark this padlist as available */
718 CvDEPTH (cv) = PTR2IV (POPs); 821 CvDEPTH (cv) = PTR2IV (POPs);
719 CvPADLIST (cv) = (AV *)POPs; 822 CvPADLIST (cv) = (PADLIST *)POPs;
720 } 823 }
721 824
722 PUTBACK; 825 PUTBACK;
723 } 826 }
724 827
739 842
740 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 843 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 844 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
742 } 845 }
743 846
847 if (ecb_expect_false (c->on_enter_xs))
848 {
849 int i;
850
851 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
852 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
853 }
854
744 SWAP_SVS (c); 855 SWAP_SVS_ENTER (c);
745} 856}
746 857
747static void 858static void
748save_perl (pTHX_ Coro__State c) 859save_perl (pTHX_ Coro__State c)
749{ 860{
750 SWAP_SVS (c); 861 SWAP_SVS_LEAVE (c);
862
863 if (ecb_expect_false (c->on_leave_xs))
864 {
865 int i;
866
867 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
868 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
869 }
751 870
752 if (ecb_expect_false (c->on_leave)) 871 if (ecb_expect_false (c->on_leave))
753 { 872 {
754 int i; 873 int i;
755 874
814 933
815 PUTBACK; 934 PUTBACK;
816 } 935 }
817 936
818 /* allocate some space on the context stack for our purposes */ 937 /* allocate some space on the context stack for our purposes */
819 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 938 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
820 { 939 {
821 unsigned int i; 940 unsigned int i;
822 941
823 for (i = 0; i < SLOT_COUNT; ++i) 942 for (i = 0; i < SLOT_COUNT; ++i)
824 CXINC; 943 CXINC;
833 952
834#if CORO_JIT 953#if CORO_JIT
835 save_perl_slots (slot); 954 save_perl_slots (slot);
836#else 955#else
837 #define VARx(name,expr,type) slot->name = expr; 956 #define VARx(name,expr,type) slot->name = expr;
838 # include "state.h" 957 #include "state.h"
839 #undef VARx
840#endif 958#endif
841 } 959 }
842} 960}
843 961
844/* 962/*
876#endif 994#endif
877 995
878 New(54,PL_scopestack,8,I32); 996 New(54,PL_scopestack,8,I32);
879 PL_scopestack_ix = 0; 997 PL_scopestack_ix = 0;
880 PL_scopestack_max = 8; 998 PL_scopestack_max = 8;
999#if HAS_SCOPESTACK_NAME
1000 New(54,PL_scopestack_name,8,const char*);
1001#endif
881 1002
882 New(54,PL_savestack,24,ANY); 1003 New(54,PL_savestack,24,ANY);
883 PL_savestack_ix = 0; 1004 PL_savestack_ix = 0;
884 PL_savestack_max = 24; 1005 PL_savestack_max = 24;
1006#if PERL_VERSION_ATLEAST (5,24,0)
1007 /* perl 5.24 moves SS_MAXPUSH optimisation from */
1008 /* the header macros to PL_savestack_max */
1009 PL_savestack_max -= SS_MAXPUSH;
1010#endif
885 1011
886#if !PERL_VERSION_ATLEAST (5,10,0) 1012#if !PERL_VERSION_ATLEAST (5,10,0)
887 New(54,PL_retstack,4,OP*); 1013 New(54,PL_retstack,4,OP*);
888 PL_retstack_ix = 0; 1014 PL_retstack_ix = 0;
889 PL_retstack_max = 4; 1015 PL_retstack_max = 4;
913 } 1039 }
914 1040
915 Safefree (PL_tmps_stack); 1041 Safefree (PL_tmps_stack);
916 Safefree (PL_markstack); 1042 Safefree (PL_markstack);
917 Safefree (PL_scopestack); 1043 Safefree (PL_scopestack);
1044#if HAS_SCOPESTACK_NAME
1045 Safefree (PL_scopestack_name);
1046#endif
918 Safefree (PL_savestack); 1047 Safefree (PL_savestack);
919#if !PERL_VERSION_ATLEAST (5,10,0) 1048#if !PERL_VERSION_ATLEAST (5,10,0)
920 Safefree (PL_retstack); 1049 Safefree (PL_retstack);
921#endif 1050#endif
922} 1051}
952 } 1081 }
953 1082
954 return rss; 1083 return rss;
955} 1084}
956 1085
957/** coroutine stack handling ************************************************/ 1086/** 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 1087
963/* apparently < 5.8.8 */ 1088/* apparently < 5.8.8 */
964#ifndef MgPV_nolen_const 1089#ifndef MgPV_nolen_const
965#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1090#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
966 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1091 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
967 (const char*)(mg)->mg_ptr) 1092 (const char*)(mg)->mg_ptr)
968#endif 1093#endif
1094
1095/* this will be a patched copy of PL_vtbl_sigelem */
1096static MGVTBL coro_sigelem_vtbl;
1097
1098static int ecb_cold
1099coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1100{
1101 char *key = SvPV_nolen ((SV *)name);
1102
1103 /* do what mg_copy normally does */
1104 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1105 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1106
1107 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1108 if (*key == '_'
1109 && (strEQ (key, "__DIE__")
1110 || strEQ (key, "__WARN__")))
1111 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1112
1113 return 1;
1114}
1115
1116/* perl does not have a %SIG vtbl, we provide one so we can override */
1117/* the magic vtbl for the __DIE__ and __WARN__ members */
1118static const MGVTBL coro_sig_vtbl = {
1119 0, 0, 0, 0, 0,
1120 coro_sig_copy
1121};
969 1122
970/* 1123/*
971 * This overrides the default magic get method of %SIG elements. 1124 * 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 1125 * 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), 1126 * and instead of trying to save and restore the hash elements (extremely slow),
975 */ 1128 */
976static int ecb_cold 1129static int ecb_cold
977coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
978{ 1131{
979 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;
980 1135
981 if (*s == '_') 1136 SV *ssv;
982 {
983 SV **svp = 0;
984 1137
985 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
986 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
987
988 if (svp) 1138 if (!*svp)
989 { 1139 ssv = &PL_sv_undef;
990 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1140 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
991 return 0; 1141 ssv = sv_2mortal (newRV_inc (*svp));
992 } 1142 else
993 } 1143 ssv = *svp;
994 1144
995 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1145 sv_setsv (sv, ssv);
1146 return 0;
996} 1147}
997 1148
998static int ecb_cold 1149static int ecb_cold
999coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1150coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1000{ 1151{
1001 const char *s = MgPV_nolen_const (mg); 1152 const char *s = MgPV_nolen_const (mg);
1153 /* the key must be either __DIE__ or __WARN__ here */
1154 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1002 1155
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; 1156 SV *old = *svp;
1013 *svp = 0; 1157 *svp = 0;
1014 SvREFCNT_dec (old); 1158 SvREFCNT_dec (old);
1015 return 0; 1159 return 0;
1016 }
1017 }
1018
1019 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1020} 1160}
1021 1161
1022static int ecb_cold 1162static int ecb_cold
1023coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1163coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1024{ 1164{
1025 const char *s = MgPV_nolen_const (mg); 1165 const char *s = MgPV_nolen_const (mg);
1166 /* the key must be either __DIE__ or __WARN__ here */
1167 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1026 1168
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; 1169 SV *old = *svp;
1037 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1170 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1038 SvREFCNT_dec (old); 1171 SvREFCNT_dec (old);
1039 return 0; 1172 return 0;
1040 }
1041 }
1042
1043 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1044} 1173}
1045 1174
1046static void 1175static void
1047prepare_nop (pTHX_ struct coro_transfer_args *ta) 1176prepare_nop (pTHX_ struct coro_transfer_args *ta)
1048{ 1177{
1059static int 1188static int
1060slf_check_repeat (pTHX_ struct CoroSLF *frame) 1189slf_check_repeat (pTHX_ struct CoroSLF *frame)
1061{ 1190{
1062 return 1; 1191 return 1;
1063} 1192}
1193
1194/** coroutine stack handling ************************************************/
1064 1195
1065static UNOP init_perl_op; 1196static UNOP init_perl_op;
1066 1197
1067ecb_noinline static void /* noinline to keep it out of the transfer fast path */ 1198ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1068init_perl (pTHX_ struct coro *coro) 1199init_perl (pTHX_ struct coro *coro)
1089 PL_hints = 0; 1220 PL_hints = 0;
1090 1221
1091 /* recreate the die/warn hooks */ 1222 /* recreate the die/warn hooks */
1092 PL_diehook = SvREFCNT_inc (rv_diehook); 1223 PL_diehook = SvREFCNT_inc (rv_diehook);
1093 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1224 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1094 1225
1095 GvSV (PL_defgv) = newSV (0); 1226 GvSV (PL_defgv) = newSV (0);
1096 GvAV (PL_defgv) = coro->args; coro->args = 0; 1227 GvAV (PL_defgv) = coro->args; coro->args = 0;
1097 GvSV (PL_errgv) = newSV (0); 1228 GvSV (PL_errgv) = newSV (0);
1098 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1229 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1099 GvHV (PL_hintgv) = 0; 1230 GvHV (PL_hintgv) = newHV ();
1231#if PERL_VERSION_ATLEAST (5,10,0)
1232 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1233#endif
1100 PL_rs = newSVsv (GvSV (irsgv)); 1234 PL_rs = newSVsv (GvSV (irsgv));
1101 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1235 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1102 1236
1103 { 1237 {
1104 dSP; 1238 dSP;
1108 myop.op_next = Nullop; 1242 myop.op_next = Nullop;
1109 myop.op_type = OP_ENTERSUB; 1243 myop.op_type = OP_ENTERSUB;
1110 myop.op_flags = OPf_WANT_VOID; 1244 myop.op_flags = OPf_WANT_VOID;
1111 1245
1112 PUSHMARK (SP); 1246 PUSHMARK (SP);
1113 PUSHs ((SV *)coro->startcv); 1247 XPUSHs ((SV *)coro->startcv);
1114 PUTBACK; 1248 PUTBACK;
1115 PL_op = (OP *)&myop; 1249 PL_op = (OP *)&myop;
1116 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1250 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1117 } 1251 }
1118 1252
1132 PL_op = (OP *)&init_perl_op; 1266 PL_op = (OP *)&init_perl_op;
1133 1267
1134 /* copy throw, in case it was set before init_perl */ 1268 /* copy throw, in case it was set before init_perl */
1135 CORO_THROW = coro->except; 1269 CORO_THROW = coro->except;
1136 1270
1137 SWAP_SVS (coro); 1271 SWAP_SVS_ENTER (coro);
1138 1272
1139 if (ecb_expect_false (enable_times)) 1273 if (ecb_expect_false (enable_times))
1140 { 1274 {
1141 coro_times_update (); 1275 coro_times_update ();
1142 coro_times_sub (coro); 1276 coro_times_sub (coro);
1175 1309
1176 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1310 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1177 1311
1178 save_perl (aTHX_ current); 1312 save_perl (aTHX_ current);
1179 1313
1180 /* this will cause transfer_check to croak on block*/ 1314 /* this will cause transfer_check to croak on block */
1181 SvRV_set (coro_current, (SV *)coro->hv); 1315 SvRV_set (coro_current, (SV *)coro->hv);
1182 1316
1183 load_perl (aTHX_ coro); 1317 load_perl (aTHX_ coro);
1184 1318
1319 /* restore swapped sv's */
1320 SWAP_SVS_LEAVE (coro);
1321
1185 coro_unwind_stacks (aTHX); 1322 coro_unwind_stacks (aTHX);
1186 1323
1187 /* restore swapped sv's */
1188 SWAP_SVS (coro);
1189
1190 coro_destruct_stacks (aTHX); 1324 coro_destruct_stacks (aTHX);
1191 1325
1192 // now save some sv's to be free'd later 1326 /* now save some sv's to be free'd later */
1193 svf [0] = GvSV (PL_defgv); 1327 svf [0] = GvSV (PL_defgv);
1194 svf [1] = (SV *)GvAV (PL_defgv); 1328 svf [1] = (SV *)GvAV (PL_defgv);
1195 svf [2] = GvSV (PL_errgv); 1329 svf [2] = GvSV (PL_errgv);
1196 svf [3] = (SV *)PL_defoutgv; 1330 svf [3] = (SV *)PL_defoutgv;
1197 svf [4] = PL_rs; 1331 svf [4] = PL_rs;
1214 1348
1215 SvREFCNT_dec (coro->saved_deffh); 1349 SvREFCNT_dec (coro->saved_deffh);
1216 SvREFCNT_dec (coro->rouse_cb); 1350 SvREFCNT_dec (coro->rouse_cb);
1217 SvREFCNT_dec (coro->invoke_cb); 1351 SvREFCNT_dec (coro->invoke_cb);
1218 SvREFCNT_dec (coro->invoke_av); 1352 SvREFCNT_dec (coro->invoke_av);
1353 SvREFCNT_dec (coro->on_enter_xs);
1354 SvREFCNT_dec (coro->on_leave_xs);
1219 } 1355 }
1220} 1356}
1221 1357
1222ECB_INLINE void 1358ecb_inline void
1223free_coro_mortal (pTHX) 1359free_coro_mortal (pTHX)
1224{ 1360{
1225 if (ecb_expect_true (coro_mortal)) 1361 if (ecb_expect_true (coro_mortal))
1226 { 1362 {
1227 SvREFCNT_dec ((SV *)coro_mortal); 1363 SvREFCNT_dec ((SV *)coro_mortal);
1264 av_push (av, SvREFCNT_inc_NN (*bot++)); 1400 av_push (av, SvREFCNT_inc_NN (*bot++));
1265 1401
1266 PL_runops = RUNOPS_DEFAULT; 1402 PL_runops = RUNOPS_DEFAULT;
1267 ENTER; 1403 ENTER;
1268 SAVETMPS; 1404 SAVETMPS;
1405 PUSHMARK (SP);
1269 EXTEND (SP, 3); 1406 EXTEND (SP, 3);
1270 PUSHMARK (SP);
1271 PUSHs (&PL_sv_no); 1407 PUSHs (&PL_sv_no);
1272 PUSHs (fullname); 1408 PUSHs (fullname);
1273 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1409 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1274 PUTBACK; 1410 PUTBACK;
1275 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1411 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1286 1422
1287 if (PL_curcop != &PL_compiling) 1423 if (PL_curcop != &PL_compiling)
1288 { 1424 {
1289 SV **cb; 1425 SV **cb;
1290 1426
1291 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1427 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1292 { 1428 {
1293 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1429 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1294 1430
1295 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1431 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1296 { 1432 {
1302 gv_efullname3 (fullname, gv, 0); 1438 gv_efullname3 (fullname, gv, 0);
1303 1439
1304 PL_runops = RUNOPS_DEFAULT; 1440 PL_runops = RUNOPS_DEFAULT;
1305 ENTER; 1441 ENTER;
1306 SAVETMPS; 1442 SAVETMPS;
1443 PUSHMARK (SP);
1307 EXTEND (SP, 3); 1444 EXTEND (SP, 3);
1308 PUSHMARK (SP);
1309 PUSHs (&PL_sv_yes); 1445 PUSHs (&PL_sv_yes);
1310 PUSHs (fullname); 1446 PUSHs (fullname);
1311 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1447 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (SUB_ARGARRAY)) : &PL_sv_undef);
1312 PUTBACK; 1448 PUTBACK;
1313 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1449 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); 1450 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1315 SPAGAIN; 1451 SPAGAIN;
1316 FREETMPS; 1452 FREETMPS;
1326 dSP; 1462 dSP;
1327 1463
1328 PL_runops = RUNOPS_DEFAULT; 1464 PL_runops = RUNOPS_DEFAULT;
1329 ENTER; 1465 ENTER;
1330 SAVETMPS; 1466 SAVETMPS;
1331 EXTEND (SP, 3);
1332 PL_runops = RUNOPS_DEFAULT;
1333 PUSHMARK (SP); 1467 PUSHMARK (SP);
1468 EXTEND (SP, 2);
1334 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1469 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1335 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1470 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1336 PUTBACK; 1471 PUTBACK;
1337 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0); 1472 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
1338 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1473 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1386 slf_frame.prepare = slf_prepare_set_stacklevel; 1521 slf_frame.prepare = slf_prepare_set_stacklevel;
1387 slf_frame.check = slf_check_set_stacklevel; 1522 slf_frame.check = slf_check_set_stacklevel;
1388} 1523}
1389 1524
1390/* the tail of transfer: execute stuff we can only do after a transfer */ 1525/* the tail of transfer: execute stuff we can only do after a transfer */
1391ECB_INLINE void 1526ecb_inline void
1392transfer_tail (pTHX) 1527transfer_tail (pTHX)
1393{ 1528{
1394 free_coro_mortal (aTHX); 1529 free_coro_mortal (aTHX);
1530}
1531
1532/* try to exit the same way perl's main function would do */
1533/* we do not bother resetting the environment or other things *7
1534/* that are not, uhm, essential */
1535/* this obviously also doesn't work when perl is embedded */
1536static void ecb_noinline ecb_cold
1537perlish_exit (pTHX)
1538{
1539 int exitstatus = perl_destruct (PL_curinterp);
1540 perl_free (PL_curinterp);
1541 exit (exitstatus);
1395} 1542}
1396 1543
1397/* 1544/*
1398 * this is a _very_ stripped down perl interpreter ;) 1545 * this is a _very_ stripped down perl interpreter ;)
1399 */ 1546 */
1426 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1573 * 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. 1574 * runtime errors here, as this is just a random interpreter, not a thread.
1428 */ 1575 */
1429 1576
1430 /* 1577 /*
1578 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1579 * requires PL_scopestack_ix, so do it here if required.
1580 */
1581 if (!PL_scopestack_ix)
1582 ENTER;
1583
1584 /*
1431 * If perl-run returns we assume exit() was being called or the coro 1585 * 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) 1586 * 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 1587 * 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" 1588 * 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 */ 1589 */
1439 PL_top_env = main_top_env; 1590 perlish_exit (aTHX);
1440 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1441 } 1591 }
1442} 1592}
1443 1593
1444static coro_cctx * 1594static coro_cctx *
1445cctx_new () 1595cctx_new (void)
1446{ 1596{
1447 coro_cctx *cctx; 1597 coro_cctx *cctx;
1448 1598
1449 ++cctx_count; 1599 ++cctx_count;
1450 New (0, cctx, 1, coro_cctx); 1600 New (0, cctx, 1, coro_cctx);
1456 return cctx; 1606 return cctx;
1457} 1607}
1458 1608
1459/* create a new cctx only suitable as source */ 1609/* create a new cctx only suitable as source */
1460static coro_cctx * 1610static coro_cctx *
1461cctx_new_empty () 1611cctx_new_empty (void)
1462{ 1612{
1463 coro_cctx *cctx = cctx_new (); 1613 coro_cctx *cctx = cctx_new ();
1464 1614
1465 cctx->sptr = 0; 1615 cctx->stack.sptr = 0;
1466 coro_create (&cctx->cctx, 0, 0, 0, 0); 1616 coro_create (&cctx->cctx, 0, 0, 0, 0);
1467 1617
1468 return cctx; 1618 return cctx;
1469} 1619}
1470 1620
1471/* create a new cctx suitable as destination/running a perl interpreter */ 1621/* create a new cctx suitable as destination/running a perl interpreter */
1472static coro_cctx * 1622static coro_cctx *
1473cctx_new_run () 1623cctx_new_run (void)
1474{ 1624{
1475 coro_cctx *cctx = cctx_new (); 1625 coro_cctx *cctx = cctx_new ();
1476 void *stack_start;
1477 size_t stack_size;
1478 1626
1479#if HAVE_MMAP 1627 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 } 1628 {
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."); 1629 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1502 _exit (EXIT_FAILURE); 1630 _exit (EXIT_FAILURE);
1503 }
1504
1505 stack_start = cctx->sptr;
1506 stack_size = cctx->ssize;
1507 } 1631 }
1508 1632
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); 1633 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1514 1634
1515 return cctx; 1635 return cctx;
1516} 1636}
1517 1637
1518static void 1638static void
1524 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1644 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1525 1645
1526 --cctx_count; 1646 --cctx_count;
1527 coro_destroy (&cctx->cctx); 1647 coro_destroy (&cctx->cctx);
1528 1648
1529 /* coro_transfer creates new, empty cctx's */ 1649 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 1650
1544 Safefree (cctx); 1651 Safefree (cctx);
1545} 1652}
1546 1653
1547/* wether this cctx should be destructed */ 1654/* wether this cctx should be destructed */
1566} 1673}
1567 1674
1568static void 1675static void
1569cctx_put (coro_cctx *cctx) 1676cctx_put (coro_cctx *cctx)
1570{ 1677{
1571 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1678 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1572 1679
1573 /* free another cctx if overlimit */ 1680 /* free another cctx if overlimit */
1574 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1681 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1575 { 1682 {
1576 coro_cctx *first = cctx_first; 1683 coro_cctx *first = cctx_first;
1702 return; 1809 return;
1703 1810
1704 slf_destroy (aTHX_ coro); 1811 slf_destroy (aTHX_ coro);
1705 1812
1706 coro->flags |= CF_ZOMBIE; 1813 coro->flags |= CF_ZOMBIE;
1707 1814
1708 if (coro->flags & CF_READY) 1815 if (coro->flags & CF_READY)
1709 { 1816 {
1710 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1817 /* reduce nready, as destroying a ready coro effectively unreadies it */
1711 /* alternative: look through all ready queues and remove the coro */ 1818 /* alternative: look through all ready queues and remove the coro */
1712 --coro_nready; 1819 --coro_nready;
1752 1859
1753static int ecb_cold 1860static int ecb_cold
1754coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1861coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1755{ 1862{
1756 /* called when perl clones the current process the slow way (windows process emulation) */ 1863 /* 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 */ 1864 /* we simply nuke the pointers in the copy, causing perl to croak */
1758 mg->mg_ptr = 0; 1865 mg->mg_ptr = 0;
1759 mg->mg_virtual = 0; 1866 mg->mg_virtual = 0;
1760 1867
1761 return 0; 1868 return 0;
1762} 1869}
1789 TRANSFER (ta, 1); 1896 TRANSFER (ta, 1);
1790} 1897}
1791 1898
1792/** Coro ********************************************************************/ 1899/** Coro ********************************************************************/
1793 1900
1794ECB_INLINE void 1901ecb_inline void
1795coro_enq (pTHX_ struct coro *coro) 1902coro_enq (pTHX_ struct coro *coro)
1796{ 1903{
1797 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1904 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1798 1905
1799 SvREFCNT_inc_NN (coro->hv); 1906 SvREFCNT_inc_NN (coro->hv);
1801 coro->next_ready = 0; 1908 coro->next_ready = 0;
1802 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1909 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1803 ready [1] = coro; 1910 ready [1] = coro;
1804} 1911}
1805 1912
1806ECB_INLINE struct coro * 1913ecb_inline struct coro *
1807coro_deq (pTHX) 1914coro_deq (pTHX)
1808{ 1915{
1809 int prio; 1916 int prio;
1810 1917
1811 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1918 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1864{ 1971{
1865 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1972 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1866} 1973}
1867 1974
1868/* expects to own a reference to next->hv */ 1975/* expects to own a reference to next->hv */
1869ECB_INLINE void 1976ecb_inline void
1870prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1977prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1871{ 1978{
1872 SV *prev_sv = SvRV (coro_current); 1979 SV *prev_sv = SvRV (coro_current);
1873 1980
1874 ta->prev = SvSTATE_hv (prev_sv); 1981 ta->prev = SvSTATE_hv (prev_sv);
1908 /* nothing to schedule: call the idle handler */ 2015 /* nothing to schedule: call the idle handler */
1909 if (SvROK (sv_idle) 2016 if (SvROK (sv_idle)
1910 && SvOBJECT (SvRV (sv_idle))) 2017 && SvOBJECT (SvRV (sv_idle)))
1911 { 2018 {
1912 if (SvRV (sv_idle) == SvRV (coro_current)) 2019 if (SvRV (sv_idle) == SvRV (coro_current))
2020 {
2021 require_pv ("Carp");
2022
2023 {
2024 dSP;
2025
2026 ENTER;
2027 SAVETMPS;
2028
2029 PUSHMARK (SP);
1913 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2030 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2031 PUTBACK;
2032 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2033
2034 FREETMPS;
2035 LEAVE;
2036 }
2037 }
1914 2038
1915 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2039 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1916 api_ready (aTHX_ SvRV (sv_idle)); 2040 api_ready (aTHX_ SvRV (sv_idle));
1917 --coro_nready; 2041 --coro_nready;
1918 } 2042 }
1933 } 2057 }
1934 } 2058 }
1935 } 2059 }
1936} 2060}
1937 2061
1938ECB_INLINE void 2062ecb_inline void
1939prepare_cede (pTHX_ struct coro_transfer_args *ta) 2063prepare_cede (pTHX_ struct coro_transfer_args *ta)
1940{ 2064{
1941 api_ready (aTHX_ coro_current); 2065 api_ready (aTHX_ coro_current);
1942 prepare_schedule (aTHX_ ta); 2066 prepare_schedule (aTHX_ ta);
1943} 2067}
1944 2068
1945ECB_INLINE void 2069ecb_inline void
1946prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2070prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1947{ 2071{
1948 SV *prev = SvRV (coro_current); 2072 SV *prev = SvRV (coro_current);
1949 2073
1950 if (coro_nready) 2074 if (coro_nready)
2115{ 2239{
2116 AV *od = coro->on_destroy; 2240 AV *od = coro->on_destroy;
2117 2241
2118 if (!od) 2242 if (!od)
2119 return; 2243 return;
2244
2245 coro->on_destroy = 0;
2246 sv_2mortal ((SV *)od);
2120 2247
2121 while (AvFILLp (od) >= 0) 2248 while (AvFILLp (od) >= 0)
2122 { 2249 {
2123 SV *cb = sv_2mortal (av_pop (od)); 2250 SV *cb = sv_2mortal (av_pop (od));
2124 2251
2145 2272
2146static void 2273static void
2147coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2274coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2148{ 2275{
2149 AV *av; 2276 AV *av;
2150 2277
2151 if (coro->status) 2278 if (coro->status)
2152 { 2279 {
2153 av = coro->status; 2280 av = coro->status;
2154 av_clear (av); 2281 av_clear (av);
2155 } 2282 }
2202 2329
2203 coro = SvSTATE (arg [0]); 2330 coro = SvSTATE (arg [0]);
2204 coro_hv = coro->hv; 2331 coro_hv = coro->hv;
2205 2332
2206 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2333 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2207 2334
2208 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2335 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2209 { 2336 {
2210 /* coro currently busy cancelling something, so just notify it */ 2337 /* coro currently busy cancelling something, so just notify it */
2211 coro->slf_frame.data = (void *)coro; 2338 coro->slf_frame.data = (void *)coro;
2212 2339
2219 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2346 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2220 } 2347 }
2221 else 2348 else
2222 { 2349 {
2223 struct coro *self = SvSTATE_current; 2350 struct coro *self = SvSTATE_current;
2351
2352 if (!self)
2353 croak ("Coro::cancel called outside of thread content,");
2224 2354
2225 /* otherwise we cancel directly, purely for speed reasons 2355 /* otherwise we cancel directly, purely for speed reasons
2226 * unfortunately, this requires some magic trickery, as 2356 * unfortunately, this requires some magic trickery, as
2227 * somebody else could cancel us, so we have to fight the cancellation. 2357 * somebody else could cancel us, so we have to fight the cancellation.
2228 * this is ugly, and hopefully fully worth the extra speed. 2358 * this is ugly, and hopefully fully worth the extra speed.
2261safe_cancel (pTHX_ struct coro *coro, SV **arg, int items) 2391safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2262{ 2392{
2263 if (coro->cctx) 2393 if (coro->cctx)
2264 croak ("coro inside C callback, unable to cancel at this time, caught"); 2394 croak ("coro inside C callback, unable to cancel at this time, caught");
2265 2395
2266 if (coro->flags & CF_NEW) 2396 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2267 { 2397 {
2268 coro_set_status (aTHX_ coro, arg, items); 2398 coro_set_status (aTHX_ coro, arg, items);
2269 coro_state_destroy (aTHX_ coro); 2399 coro_state_destroy (aTHX_ coro);
2270 } 2400 }
2271 else 2401 else
2338 else 2468 else
2339 { 2469 {
2340 av_clear (GvAV (PL_defgv)); 2470 av_clear (GvAV (PL_defgv));
2341 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2471 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2342 2472
2473 if (ecb_expect_false (coro->swap_sv))
2474 {
2475 SWAP_SVS_LEAVE (coro);
2476 SvREFCNT_dec_NN (coro->swap_sv);
2477 coro->swap_sv = 0;
2478 }
2479
2343 coro->prio = 0; 2480 coro->prio = 0;
2344 2481
2345 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2482 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2346 api_trace (aTHX_ coro_current, 0); 2483 api_trace (aTHX_ coro_current, 0);
2347 2484
2348 frame->prepare = prepare_schedule; 2485 frame->prepare = prepare_schedule;
2349 av_push (av_async_pool, SvREFCNT_inc (hv)); 2486 av_push (av_async_pool, SvREFCNT_inc_NN (hv));
2350 } 2487 }
2351 } 2488 }
2352 else 2489 else
2353 { 2490 {
2354 /* first iteration, simply fall through */ 2491 /* first iteration, simply fall through */
2367static void 2504static void
2368coro_rouse_callback (pTHX_ CV *cv) 2505coro_rouse_callback (pTHX_ CV *cv)
2369{ 2506{
2370 dXSARGS; 2507 dXSARGS;
2371 SV *data = (SV *)S_GENSUB_ARG; 2508 SV *data = (SV *)S_GENSUB_ARG;
2509 SV *coro = SvRV (data);
2372 2510
2511 /* data starts being either undef or a coro, and is replaced by the results when done */
2373 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2512 if (SvTYPE (coro) != SVt_PVAV)
2374 { 2513 {
2375 /* first call, set args */ 2514 /* first call, set args */
2376 SV *coro = SvRV (data);
2377 AV *av = newAV ();
2378 2515
2379 SvRV_set (data, (SV *)av); 2516 assert (&ST (0) < &ST (1)); /* ensure the stack is in the order we expect it to be */
2517 SvRV_set (data, (SV *)av_make (items, &ST (0))); /* av_make copies the SVs */
2380 2518
2381 /* better take a full copy of the arguments */ 2519 if (coro != &PL_sv_undef)
2382 while (items--) 2520 {
2383 av_store (av, items, newSVsv (ST (items)));
2384
2385 api_ready (aTHX_ coro); 2521 api_ready (aTHX_ coro);
2386 SvREFCNT_dec (coro); 2522 SvREFCNT_dec_NN (coro);
2523 }
2387 } 2524 }
2388 2525
2389 XSRETURN_EMPTY; 2526 XSRETURN_EMPTY;
2390} 2527}
2391 2528
2392static int 2529static int
2393slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2530slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2394{ 2531{
2395 SV *data = (SV *)frame->data; 2532 SV *data = (SV *)frame->data;
2396 2533
2397 if (CORO_THROW) 2534 if (CORO_THROW)
2398 return 0; 2535 return 0;
2399 2536
2400 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2537 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2401 return 1; 2538 return 1;
2408 2545
2409 EXTEND (SP, AvFILLp (av) + 1); 2546 EXTEND (SP, AvFILLp (av) + 1);
2410 for (i = 0; i <= AvFILLp (av); ++i) 2547 for (i = 0; i <= AvFILLp (av); ++i)
2411 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2548 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2412 2549
2413 /* we have stolen the elements, so set length to zero and free */ 2550 /* we have stolen the elements, make it unreal and free */
2414 AvFILLp (av) = -1; 2551 AvREAL_off (av);
2415 av_undef (av); 2552 av_undef (av);
2416 2553
2417 PUTBACK; 2554 PUTBACK;
2418 } 2555 }
2419 2556
2437 cb = sv_2mortal (coro->rouse_cb); 2574 cb = sv_2mortal (coro->rouse_cb);
2438 coro->rouse_cb = 0; 2575 coro->rouse_cb = 0;
2439 } 2576 }
2440 2577
2441 if (!SvROK (cb) 2578 if (!SvROK (cb)
2442 || SvTYPE (SvRV (cb)) != SVt_PVCV 2579 || SvTYPE (SvRV (cb)) != SVt_PVCV
2443 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2580 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2444 croak ("Coro::rouse_wait called with illegal callback argument,"); 2581 croak ("Coro::rouse_wait called with illegal callback argument,");
2445 2582
2446 { 2583 {
2447 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2584 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2448 SV *data = (SV *)S_GENSUB_ARG; 2585 SV *data = (SV *)S_GENSUB_ARG;
2586 int data_ready = SvTYPE (SvRV (data)) == SVt_PVAV;
2587
2588 /* if there is no data, we need to store the current coro in the reference so we can be woken up */
2589 if (!data_ready)
2590 if (SvRV (data) != &PL_sv_undef)
2591 croak ("Coro::rouse_wait was called on a calback that is already being waited for - only one thread can wait for a rouse callback, caught");
2592 else
2593 SvRV_set (data, SvREFCNT_inc_NN (SvRV (coro_current)));
2449 2594
2450 frame->data = (void *)data; 2595 frame->data = (void *)data;
2451 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2596 frame->prepare = data_ready ? prepare_nop : prepare_schedule;
2452 frame->check = slf_check_rouse_wait; 2597 frame->check = slf_check_rouse_wait;
2453 } 2598 }
2454} 2599}
2455 2600
2456static SV * 2601static SV *
2457coro_new_rouse_cb (pTHX) 2602coro_new_rouse_cb (pTHX)
2458{ 2603{
2459 HV *hv = (HV *)SvRV (coro_current); 2604 HV *hv = (HV *)SvRV (coro_current);
2460 struct coro *coro = SvSTATE_hv (hv); 2605 struct coro *coro = SvSTATE_hv (hv);
2461 SV *data = newRV_inc ((SV *)hv); 2606 SV *data = newRV_noinc (&PL_sv_undef);
2462 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data); 2607 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2463 2608
2464 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2609 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2465 SvREFCNT_dec (data); /* magicext increases the refcount */ 2610 SvREFCNT_dec_NN (data); /* magicext increases the refcount */
2466 2611
2467 SvREFCNT_dec (coro->rouse_cb); 2612 SvREFCNT_dec (coro->rouse_cb);
2468 coro->rouse_cb = SvREFCNT_inc_NN (cb); 2613 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2469 2614
2470 return cb; 2615 return cb;
2570 2715
2571/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2716/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2572static void 2717static void
2573slf_destroy (pTHX_ struct coro *coro) 2718slf_destroy (pTHX_ struct coro *coro)
2574{ 2719{
2575 /* this callback is reserved for slf functions needing to do cleanup */ 2720 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 2721
2579 /* 2722 /*
2580 * The on_destroy above most likely is from an SLF call. 2723 * The on_destroy below most likely is from an SLF call.
2581 * Since by definition the SLF call will not finish when we destroy 2724 * Since by definition the SLF call will not finish when we destroy
2582 * the coro, we will have to force-finish it here, otherwise 2725 * the coro, we will have to force-finish it here, otherwise
2583 * cleanup functions cannot call SLF functions. 2726 * cleanup functions cannot call SLF functions.
2584 */ 2727 */
2585 coro->slf_frame.prepare = 0; 2728 coro->slf_frame.prepare = 0;
2729
2730 /* this callback is reserved for slf functions needing to do cleanup */
2731 if (frame.destroy && frame.prepare && !PL_dirty)
2732 frame.destroy (aTHX_ &frame);
2586} 2733}
2587 2734
2588/* 2735/*
2589 * these not obviously related functions are all rolled into one 2736 * these not obviously related functions are all rolled into one
2590 * function to increase chances that they all will call transfer with the same 2737 * function to increase chances that they all will call transfer with the same
2773static void 2920static void
2774coro_pop_on_leave (pTHX_ void *coro) 2921coro_pop_on_leave (pTHX_ void *coro)
2775{ 2922{
2776 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2923 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2777 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2924 on_enterleave_call (aTHX_ sv_2mortal (cb));
2925}
2926
2927static void
2928enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2929{
2930 if (!hook)
2931 return;
2932
2933 if (!*avp)
2934 {
2935 *avp = newAV ();
2936 AvREAL_off (*avp);
2937 }
2938
2939 av_push (*avp, (SV *)hook);
2940 av_push (*avp, (SV *)arg);
2941}
2942
2943static void
2944enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2945{
2946 AV *av = *avp;
2947 int i;
2948
2949 if (!av)
2950 return;
2951
2952 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2953 if (AvARRAY (av)[i] == (SV *)hook)
2954 {
2955 if (execute)
2956 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2957
2958 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2959 av_pop (av);
2960 av_pop (av);
2961 break;
2962 }
2963
2964 if (AvFILLp (av) >= 0)
2965 {
2966 *avp = 0;
2967 SvREFCNT_dec_NN (av);
2968 }
2969}
2970
2971static void
2972api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2973{
2974 struct coro *coro = SvSTATE (coro_sv);
2975
2976 if (SvSTATE_current == coro)
2977 if (enter)
2978 enter (aTHX_ enter_arg);
2979
2980 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2981 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2982}
2983
2984static void
2985api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2986{
2987 struct coro *coro = SvSTATE (coro_sv);
2988
2989 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2990 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2991}
2992
2993static void
2994savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2995{
2996 struct coro *coro = SvSTATE_current;
2997
2998 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2999}
3000
3001static void
3002savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
3003{
3004 struct coro *coro = SvSTATE_current;
3005
3006 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
3007}
3008
3009static void
3010api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
3011{
3012 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
3013
3014 /* this ought to be much cheaper than malloc + a single destructor call */
3015 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
3016 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2778} 3017}
2779 3018
2780/*****************************************************************************/ 3019/*****************************************************************************/
2781/* PerlIO::cede */ 3020/* PerlIO::cede */
2782 3021
2912 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3151 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2913 PUTBACK; 3152 PUTBACK;
2914 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3153 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2915 } 3154 }
2916 3155
2917 SvREFCNT_dec (cb); 3156 SvREFCNT_dec_NN (cb);
2918 } 3157 }
2919} 3158}
2920 3159
2921static void 3160static void
2922coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3161coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2930{ 3169{
2931 AV *av = (AV *)frame->data; 3170 AV *av = (AV *)frame->data;
2932 SV *count_sv = AvARRAY (av)[0]; 3171 SV *count_sv = AvARRAY (av)[0];
2933 SV *coro_hv = SvRV (coro_current); 3172 SV *coro_hv = SvRV (coro_current);
2934 3173
3174 frame->destroy = 0;
3175
2935 /* if we are about to throw, don't actually acquire the lock, just throw */ 3176 /* if we are about to throw, don't actually acquire the lock, just throw */
2936 if (CORO_THROW) 3177 if (ecb_expect_false (CORO_THROW))
3178 {
3179 /* we still might be responsible for the semaphore, so wake up others */
3180 coro_semaphore_adjust (aTHX_ av, 0);
3181
2937 return 0; 3182 return 0;
3183 }
2938 else if (SvIVX (count_sv) > 0) 3184 else if (SvIVX (count_sv) > 0)
2939 { 3185 {
2940 frame->destroy = 0;
2941
2942 if (acquire) 3186 if (acquire)
2943 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3187 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2944 else 3188 else
2945 coro_semaphore_adjust (aTHX_ av, 0); 3189 coro_semaphore_adjust (aTHX_ av, 0);
2946 3190
2950 { 3194 {
2951 int i; 3195 int i;
2952 /* if we were woken up but can't down, we look through the whole */ 3196 /* 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 */ 3197 /* waiters list and only add us if we aren't in there already */
2954 /* this avoids some degenerate memory usage cases */ 3198 /* this avoids some degenerate memory usage cases */
2955 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 3199 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2956 if (AvARRAY (av)[i] == coro_hv) 3200 if (AvARRAY (av)[i] == coro_hv)
2957 return 1; 3201 return 1;
2958 3202
2959 av_push (av, SvREFCNT_inc (coro_hv)); 3203 av_push (av, SvREFCNT_inc (coro_hv));
2960 return 1; 3204 return 1;
3057 { 3301 {
3058 api_ready (aTHX_ cb); 3302 api_ready (aTHX_ cb);
3059 sv_setiv (cb, 0); /* signal waiter */ 3303 sv_setiv (cb, 0); /* signal waiter */
3060 } 3304 }
3061 3305
3062 SvREFCNT_dec (cb); 3306 SvREFCNT_dec_NN (cb);
3063 3307
3064 --count; 3308 --count;
3065 } 3309 }
3066} 3310}
3067 3311
3152 } 3396 }
3153 3397
3154 av_push (state, data_sv); 3398 av_push (state, data_sv);
3155 3399
3156 api_ready (aTHX_ coro); 3400 api_ready (aTHX_ coro);
3157 SvREFCNT_dec (coro); 3401 SvREFCNT_dec_NN (coro);
3158 SvREFCNT_dec ((AV *)state); 3402 SvREFCNT_dec_NN ((AV *)state);
3159} 3403}
3160 3404
3161static int 3405static int
3162slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3406slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3163{ 3407{
3168 /* it quickly returns */ 3412 /* it quickly returns */
3169 if (CORO_THROW) 3413 if (CORO_THROW)
3170 return 0; 3414 return 0;
3171 3415
3172 /* one element that is an RV? repeat! */ 3416 /* one element that is an RV? repeat! */
3173 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3417 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3174 return 1; 3418 return 1;
3175 3419
3176 /* restore status */ 3420 /* restore status */
3177 { 3421 {
3178 SV *data_sv = av_pop (state); 3422 SV *data_sv = av_pop (state);
3181 errno = data->errorno; 3425 errno = data->errorno;
3182 PL_laststype = data->laststype; 3426 PL_laststype = data->laststype;
3183 PL_laststatval = data->laststatval; 3427 PL_laststatval = data->laststatval;
3184 PL_statcache = data->statcache; 3428 PL_statcache = data->statcache;
3185 3429
3186 SvREFCNT_dec (data_sv); 3430 SvREFCNT_dec_NN (data_sv);
3187 } 3431 }
3188 3432
3189 /* push result values */ 3433 /* push result values */
3190 { 3434 {
3191 dSP; 3435 dSP;
3340#endif 3584#endif
3341 3585
3342#if CORO_JIT 3586#if CORO_JIT
3343 3587
3344static void ecb_noinline ecb_cold 3588static void ecb_noinline ecb_cold
3345pushav_3uv (pTHX_ UV a, UV b, UV c) 3589pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3346{ 3590{
3347 dSP; 3591 dSP;
3348 AV *av = newAV (); 3592 AV *av = newAV ();
3349 3593
3594 av_store (av, 3, newSVuv (d));
3350 av_store (av, 2, newSVuv (c)); 3595 av_store (av, 2, newSVuv (c));
3351 av_store (av, 1, newSVuv (b)); 3596 av_store (av, 1, newSVuv (b));
3352 av_store (av, 0, newSVuv (a)); 3597 av_store (av, 0, newSVuv (a));
3353 3598
3354 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 3599 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3361{ 3606{
3362 dSP; 3607 dSP;
3363 SV *load, *save; 3608 SV *load, *save;
3364 char *map_base; 3609 char *map_base;
3365 char *load_ptr, *save_ptr; 3610 char *load_ptr, *save_ptr;
3366 STRLEN load_len, save_len; 3611 STRLEN load_len, save_len, map_len;
3367 int count; 3612 int count;
3368 3613
3614 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3615
3369 PUSHMARK (SP); 3616 PUSHMARK (SP);
3370 PUTBACK;
3371#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type)); 3617 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3372# include "state.h" 3618 #include "state.h"
3373#undef VARx
3374 count = call_pv ("Coro::State::_jit", G_ARRAY); 3619 count = call_pv ("Coro::State::_jit", G_ARRAY);
3375 SPAGAIN; 3620 SPAGAIN;
3376 3621
3377 save = POPs; save_ptr = SvPVbyte (save, save_len); 3622 save = POPs; save_ptr = SvPVbyte (save, save_len);
3378 load = POPs; load_ptr = SvPVbyte (load, load_len); 3623 load = POPs; load_ptr = SvPVbyte (load, load_len);
3379 3624
3625 map_len = load_len + save_len + 16;
3626
3627 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3628
3629 if (map_base == (char *)MAP_FAILED)
3380 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3630 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3381 3631
3382 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3632 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3383 3633
3384 load_perl_slots = (load_save_perl_slots_type)map_base; 3634 load_perl_slots = (load_save_perl_slots_type)map_base;
3385 memcpy (map_base, load_ptr, load_len); 3635 memcpy (map_base, load_ptr, load_len);
3386 3636
3387 map_base += (load_len + 15) & ~15; 3637 map_base += (load_len + 15) & ~15;
3388 3638
3389 save_perl_slots = (load_save_perl_slots_type)map_base; 3639 save_perl_slots = (load_save_perl_slots_type)map_base;
3390 memcpy (map_base, save_ptr, save_len); 3640 memcpy (map_base, save_ptr, save_len);
3641
3642 /* we are good citizens and try to make the page read-only, so the evil evil */
3643 /* hackers might have it a bit more difficult */
3644 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3645
3646 PUTBACK;
3647 eval_pv ("undef &Coro::State::_jit", 1);
3391} 3648}
3392 3649
3393#endif 3650#endif
3394 3651
3395MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3652MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3396 3653
3397PROTOTYPES: DISABLE 3654PROTOTYPES: DISABLE
3398 3655
3399BOOT: 3656BOOT:
3400{ 3657{
3658#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3659#include "state.h"
3401#ifdef USE_ITHREADS 3660#ifdef USE_ITHREADS
3402# if CORO_PTHREAD 3661# if CORO_PTHREAD
3403 coro_thx = PERL_GET_CONTEXT; 3662 coro_thx = PERL_GET_CONTEXT;
3404# endif 3663# endif
3405#endif 3664#endif
3406 BOOT_PAGESIZE;
3407
3408 /* perl defines these to check for existance first, but why it doesn't */ 3665 /* perl defines these to check for existance first, but why it doesn't */
3409 /* just create them one at init time is not clear to me, except for */ 3666 /* just create them one at init time is not clear to me, except for */
3410 /* programs trying to delete them, but... */ 3667 /* programs trying to delete them, but... */
3411 /* anyway, we declare this as invalid and make sure they are initialised here */ 3668 /* anyway, we declare this as invalid and make sure they are initialised here */
3412 DEFSV; 3669 DEFSV;
3415 cctx_current = cctx_new_empty (); 3672 cctx_current = cctx_new_empty ();
3416 3673
3417 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3674 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3418 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3675 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3419 3676
3420 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3677 {
3421 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3678 /*
3422 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3679 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3680 * by coro_sig_vtbl in hash values.
3681 */
3682 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3683
3684 /* this only works if perl doesn't have a vtbl for %SIG */
3685 assert (!mg->mg_virtual);
3686
3687 /*
3688 * The irony is that the perl API itself asserts that mg_virtual
3689 * must be non-const, yet perl5porters insisted on marking their
3690 * vtbls as read-only, just to thwart perl modules from patching
3691 * them.
3692 */
3693 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3694 mg->mg_flags |= MGf_COPY;
3695
3696 coro_sigelem_vtbl = PL_vtbl_sigelem;
3697 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3698 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3699 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3700 }
3423 3701
3424 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3425 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3702 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3426 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3703 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3427 3704
3428 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3705 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3706
3707 newCONSTSUB (coro_state_stash, "BACKEND", newSVpv (CORO_BACKEND, 0)); /* undocumented */
3429 3708
3430 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 3709 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
3431 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 3710 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
3432 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 3711 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
3433 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 3712 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
3463 time_init (aTHX); 3742 time_init (aTHX);
3464 3743
3465 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3744 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3466#if CORO_JIT 3745#if CORO_JIT
3467 PUTBACK; 3746 PUTBACK;
3468 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3469 jit_init (aTHX); 3747 jit_init (aTHX);
3470 perl_eval_pv ("undef &Coro::State::_jit", 1);
3471 SPAGAIN; 3748 SPAGAIN;
3472#endif 3749#endif
3473} 3750}
3474 3751
3475SV * 3752SV *
3484void 3761void
3485transfer (...) 3762transfer (...)
3486 PROTOTYPE: $$ 3763 PROTOTYPE: $$
3487 CODE: 3764 CODE:
3488 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3765 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3489
3490void
3491_exit (int code)
3492 PROTOTYPE: $
3493 CODE:
3494 _exit (code);
3495 3766
3496SV * 3767SV *
3497clone (Coro::State coro) 3768clone (Coro::State coro)
3498 CODE: 3769 CODE:
3499{ 3770{
3554void 3825void
3555list () 3826list ()
3556 PROTOTYPE: 3827 PROTOTYPE:
3557 PPCODE: 3828 PPCODE:
3558{ 3829{
3559 struct coro *coro; 3830 struct coro *coro;
3560 for (coro = coro_first; coro; coro = coro->next) 3831 for (coro = coro_first; coro; coro = coro->next)
3561 if (coro->hv) 3832 if (coro->hv)
3562 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3833 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3563} 3834}
3564 3835
3566call (Coro::State coro, SV *coderef) 3837call (Coro::State coro, SV *coderef)
3567 ALIAS: 3838 ALIAS:
3568 eval = 1 3839 eval = 1
3569 CODE: 3840 CODE:
3570{ 3841{
3842 struct coro *current = SvSTATE_current;
3843
3571 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3844 if ((coro == current) || (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)))
3572 { 3845 {
3573 struct coro *current = SvSTATE_current;
3574 struct CoroSLF slf_save; 3846 struct CoroSLF slf_save;
3575 3847
3576 if (current != coro) 3848 if (current != coro)
3577 { 3849 {
3578 PUTBACK; 3850 PUTBACK;
3628 RETVAL = boolSV (coro->flags & ix); 3900 RETVAL = boolSV (coro->flags & ix);
3629 OUTPUT: 3901 OUTPUT:
3630 RETVAL 3902 RETVAL
3631 3903
3632void 3904void
3633throw (Coro::State self, SV *exception = &PL_sv_undef) 3905throw (SV *self, SV *exception = &PL_sv_undef)
3634 PROTOTYPE: $;$ 3906 PROTOTYPE: $;$
3635 CODE: 3907 CODE:
3636{ 3908{
3909 struct coro *coro = SvSTATE (self);
3637 struct coro *current = SvSTATE_current; 3910 struct coro *current = SvSTATE_current;
3638 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3911 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3639 SvREFCNT_dec (*exceptionp); 3912 SvREFCNT_dec (*exceptionp);
3640 SvGETMAGIC (exception); 3913 SvGETMAGIC (exception);
3641 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3914 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3915
3916 api_ready (aTHX_ self);
3642} 3917}
3643 3918
3644void 3919void
3645api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3920api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3646 PROTOTYPE: $;$ 3921 PROTOTYPE: $;$
3723 3998
3724void 3999void
3725times (Coro::State self) 4000times (Coro::State self)
3726 PPCODE: 4001 PPCODE:
3727{ 4002{
3728 struct coro *current = SvSTATE (coro_current); 4003 struct coro *current = SvSTATE (coro_current);
3729 4004
3730 if (ecb_expect_false (current == self)) 4005 if (ecb_expect_false (current == self))
3731 { 4006 {
3732 coro_times_update (); 4007 coro_times_update ();
3733 coro_times_add (SvSTATE (coro_current)); 4008 coro_times_add (SvSTATE (coro_current));
3740 if (ecb_expect_false (current == self)) 4015 if (ecb_expect_false (current == self))
3741 coro_times_sub (SvSTATE (coro_current)); 4016 coro_times_sub (SvSTATE (coro_current));
3742} 4017}
3743 4018
3744void 4019void
3745swap_sv (Coro::State coro, SV *sv, SV *swapsv) 4020swap_sv (Coro::State coro, SV *sva, SV *svb)
3746 CODE: 4021 CODE:
3747{ 4022{
3748 struct coro *current = SvSTATE_current; 4023 struct coro *current = SvSTATE_current;
4024 AV *swap_sv;
4025 int i;
4026
4027 sva = SvRV (sva);
4028 svb = SvRV (svb);
3749 4029
3750 if (current == coro) 4030 if (current == coro)
3751 SWAP_SVS (current); 4031 SWAP_SVS_LEAVE (current);
3752 4032
3753 if (!coro->swap_sv) 4033 if (!coro->swap_sv)
3754 coro->swap_sv = newAV (); 4034 coro->swap_sv = newAV ();
3755 4035
4036 swap_sv = coro->swap_sv;
4037
4038 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4039 {
4040 SV *a = AvARRAY (swap_sv)[i ];
4041 SV *b = AvARRAY (swap_sv)[i + 1];
4042
4043 if (a == sva && b == svb)
4044 {
4045 SvREFCNT_dec_NN (a);
4046 SvREFCNT_dec_NN (b);
4047
4048 for (; i <= AvFILLp (swap_sv) - 2; i++)
4049 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4050
4051 AvFILLp (swap_sv) -= 2;
4052
4053 goto removed;
4054 }
4055 }
4056
3756 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4057 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3757 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4058 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4059
4060 removed:
3758 4061
3759 if (current == coro) 4062 if (current == coro)
3760 SWAP_SVS (current); 4063 SWAP_SVS_ENTER (current);
3761} 4064}
3762 4065
3763 4066
3764MODULE = Coro::State PACKAGE = Coro 4067MODULE = Coro::State PACKAGE = Coro
3765 4068
3766BOOT: 4069BOOT:
3767{ 4070{
4071 if (SVt_LAST > 32)
4072 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4073
3768 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4074 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3769 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4075 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3770 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4076 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3771 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4077 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3772 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4078 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3776 4082
3777 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4083 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3778 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4084 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3779 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4085 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3780 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 4086 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3781 4087
3782 coro_stash = gv_stashpv ("Coro", TRUE); 4088 coro_stash = gv_stashpv ("Coro", TRUE);
3783 4089
3784 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4090 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3785 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4091 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3786 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4092 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3798 coroapi.ready = api_ready; 4104 coroapi.ready = api_ready;
3799 coroapi.is_ready = api_is_ready; 4105 coroapi.is_ready = api_is_ready;
3800 coroapi.nready = coro_nready; 4106 coroapi.nready = coro_nready;
3801 coroapi.current = coro_current; 4107 coroapi.current = coro_current;
3802 4108
4109 coroapi.enterleave_hook = api_enterleave_hook;
4110 coroapi.enterleave_unhook = api_enterleave_unhook;
4111 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4112
3803 /*GCoroAPI = &coroapi;*/ 4113 /*GCoroAPI = &coroapi;*/
3804 sv_setiv (sv, (IV)&coroapi); 4114 sv_setiv (sv, PTR2IV (&coroapi));
3805 SvREADONLY_on (sv); 4115 SvREADONLY_on (sv);
3806 } 4116 }
3807} 4117}
3808 4118
3809SV * 4119SV *
3872 4182
3873void 4183void
3874_set_current (SV *current) 4184_set_current (SV *current)
3875 PROTOTYPE: $ 4185 PROTOTYPE: $
3876 CODE: 4186 CODE:
3877 SvREFCNT_dec (SvRV (coro_current)); 4187 SvREFCNT_dec_NN (SvRV (coro_current));
3878 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4188 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3879 4189
3880void 4190void
3881_set_readyhook (SV *hook) 4191_set_readyhook (SV *hook)
3882 PROTOTYPE: $ 4192 PROTOTYPE: $
3966 4276
3967 if ((SV *)hv == &PL_sv_undef) 4277 if ((SV *)hv == &PL_sv_undef)
3968 { 4278 {
3969 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4279 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3970 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4280 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3971 SvREFCNT_dec (sv); 4281 SvREFCNT_dec_NN (sv);
3972 } 4282 }
3973 4283
3974 { 4284 {
3975 struct coro *coro = SvSTATE_hv (hv); 4285 struct coro *coro = SvSTATE_hv (hv);
3976 4286
3983 api_ready (aTHX_ (SV *)hv); 4293 api_ready (aTHX_ (SV *)hv);
3984 4294
3985 if (GIMME_V != G_VOID) 4295 if (GIMME_V != G_VOID)
3986 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4296 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3987 else 4297 else
3988 SvREFCNT_dec (hv); 4298 SvREFCNT_dec_NN (hv);
3989} 4299}
3990 4300
3991SV * 4301SV *
3992rouse_cb () 4302rouse_cb ()
3993 PROTOTYPE: 4303 PROTOTYPE:
4008 on_leave = 1 4318 on_leave = 1
4009 PROTOTYPE: & 4319 PROTOTYPE: &
4010 CODE: 4320 CODE:
4011{ 4321{
4012 struct coro *coro = SvSTATE_current; 4322 struct coro *coro = SvSTATE_current;
4013 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4323 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4014 4324
4015 block = s_get_cv_croak (block); 4325 block = s_get_cv_croak (block);
4016 4326
4017 if (!*avp) 4327 if (!*avp)
4018 *avp = newAV (); 4328 *avp = newAV ();
4038 4348
4039SV * 4349SV *
4040new (SV *klass, SV *count = 0) 4350new (SV *klass, SV *count = 0)
4041 CODE: 4351 CODE:
4042{ 4352{
4043 int semcnt = 1; 4353 int semcnt = 1;
4044 4354
4045 if (count) 4355 if (count)
4046 { 4356 {
4047 SvGETMAGIC (count); 4357 SvGETMAGIC (count);
4048 4358
4072 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4382 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4073 OUTPUT: 4383 OUTPUT:
4074 RETVAL 4384 RETVAL
4075 4385
4076void 4386void
4077up (SV *self, int adjust = 1) 4387up (SV *self)
4078 ALIAS:
4079 adjust = 1
4080 CODE: 4388 CODE:
4389 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4390
4391void
4392adjust (SV *self, int adjust)
4393 CODE:
4081 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4394 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4082 4395
4083void 4396void
4084down (...) 4397down (...)
4085 CODE: 4398 CODE:
4086 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4399 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
4108 XSRETURN_NO; 4421 XSRETURN_NO;
4109} 4422}
4110 4423
4111void 4424void
4112waiters (SV *self) 4425waiters (SV *self)
4113 PPCODE: 4426 PPCODE:
4114{ 4427{
4115 AV *av = (AV *)SvRV (self); 4428 AV *av = (AV *)SvRV (self);
4116 int wcount = AvFILLp (av) + 1 - 1; 4429 int wcount = AvFILLp (av) + 1 - 1;
4117 4430
4118 if (GIMME_V == G_SCALAR) 4431 if (GIMME_V == G_SCALAR)
4127} 4440}
4128 4441
4129MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4442MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4130 4443
4131void 4444void
4132_may_delete (SV *sem, int count, int extra_refs) 4445_may_delete (SV *sem, int count, unsigned int extra_refs)
4133 PPCODE: 4446 PPCODE:
4134{ 4447{
4135 AV *av = (AV *)SvRV (sem); 4448 AV *av = (AV *)SvRV (sem);
4136 4449
4137 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4450 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4138 && AvFILLp (av) == 0 /* no waiters, just count */ 4451 && AvFILLp (av) == 0 /* no waiters, just count */
4139 && SvIV (AvARRAY (av)[0]) == count) 4452 && SvIV (AvARRAY (av)[0]) == count)
4140 XSRETURN_YES; 4453 XSRETURN_YES;
4161 4474
4162void 4475void
4163broadcast (SV *self) 4476broadcast (SV *self)
4164 CODE: 4477 CODE:
4165{ 4478{
4166 AV *av = (AV *)SvRV (self); 4479 AV *av = (AV *)SvRV (self);
4167 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4480 coro_signal_wake (aTHX_ av, AvFILLp (av));
4168} 4481}
4169 4482
4170void 4483void
4171send (SV *self) 4484send (SV *self)
4179 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4492 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4180} 4493}
4181 4494
4182IV 4495IV
4183awaited (SV *self) 4496awaited (SV *self)
4184 CODE: 4497 CODE:
4185 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4498 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4186 OUTPUT: 4499 OUTPUT:
4187 RETVAL 4500 RETVAL
4188 4501
4189 4502
4194 4507
4195void 4508void
4196_schedule (...) 4509_schedule (...)
4197 CODE: 4510 CODE:
4198{ 4511{
4199 static int incede; 4512 static int incede;
4200 4513
4201 api_cede_notself (aTHX); 4514 api_cede_notself (aTHX);
4202 4515
4203 ++incede; 4516 ++incede;
4204 while (coro_nready >= incede && api_cede (aTHX)) 4517 while (coro_nready >= incede && api_cede (aTHX))
4248 { 4561 {
4249 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4562 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4250 coro_old_pp_sselect = 0; 4563 coro_old_pp_sselect = 0;
4251 } 4564 }
4252 4565
4566MODULE = Coro::State PACKAGE = Coro::Util
4567
4568void
4569_exit (int code)
4570 CODE:
4571 _exit (code);
4572
4573NV
4574time ()
4575 CODE:
4576 RETVAL = nvtime (aTHX);
4577 OUTPUT:
4578 RETVAL
4579
4580NV
4581gettimeofday ()
4582 PPCODE:
4583{
4584 UV tv [2];
4585 u2time (aTHX_ tv);
4586 EXTEND (SP, 2);
4587 PUSHs (sv_2mortal (newSVuv (tv [0])));
4588 PUSHs (sv_2mortal (newSVuv (tv [1])));
4589}
4590

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines