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.405 by root, Sat Jun 11 13:01:26 2011 UTC vs.
Revision 1.481 by root, Thu Aug 19 22:43:02 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 __linux && __amd64 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 #else 345 #define CORO_JIT_TYPE "x86-unix"
301 #undef CORO_JIT
302 #endif 346 #endif
303 #endif 347 #endif
304#endif 348#endif
305 349
350#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
351 #undef CORO_JIT
352#endif
353
306#if CORO_JIT 354#if CORO_JIT
307 355 typedef void (*load_save_perl_slots_type)(perl_slots *);
308static load_save_perl_slots_type load_perl_slots, save_perl_slots; 356 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
309
310#endif 357#endif
311 358
312/** Coro::Select ************************************************************/ 359/** Coro::Select ************************************************************/
313 360
314static OP *(*coro_old_pp_sselect) (pTHX); 361static OP *(*coro_old_pp_sselect) (pTHX);
… …
331 378
332/** time stuff **************************************************************/ 379/** time stuff **************************************************************/
333 380
334#ifdef HAS_GETTIMEOFDAY 381#ifdef HAS_GETTIMEOFDAY
335 382
336ECB_INLINE void 383ecb_inline void
337coro_u2time (pTHX_ UV ret[2]) 384coro_u2time (pTHX_ UV ret[2])
338{ 385{
339 struct timeval tv; 386 struct timeval tv;
340 gettimeofday (&tv, 0); 387 gettimeofday (&tv, 0);
341 388
342 ret [0] = tv.tv_sec; 389 ret [0] = tv.tv_sec;
343 ret [1] = tv.tv_usec; 390 ret [1] = tv.tv_usec;
344} 391}
345 392
346ECB_INLINE double 393ecb_inline double
347coro_nvtime () 394coro_nvtime (void)
348{ 395{
349 struct timeval tv; 396 struct timeval tv;
350 gettimeofday (&tv, 0); 397 gettimeofday (&tv, 0);
351 398
352 return tv.tv_sec + tv.tv_usec * 1e-6; 399 return tv.tv_sec + tv.tv_usec * 1e-6;
353} 400}
354 401
355ECB_INLINE void 402ecb_inline void
356time_init (pTHX) 403time_init (pTHX)
357{ 404{
358 nvtime = coro_nvtime; 405 nvtime = coro_nvtime;
359 u2time = coro_u2time; 406 u2time = coro_u2time;
360} 407}
361 408
362#else 409#else
363 410
364ECB_INLINE void 411ecb_inline void
365time_init (pTHX) 412time_init (pTHX)
366{ 413{
367 SV **svp; 414 SV **svp;
368 415
369 require_pv ("Time/HiRes.pm"); 416 require_pv ("Time/HiRes.pm");
370 417
371 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 418 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
372 419
373 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 420 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
374 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");
375 422
… …
411 get_hv (name, create); 458 get_hv (name, create);
412#endif 459#endif
413 return get_hv (name, create); 460 return get_hv (name, create);
414} 461}
415 462
416ECB_INLINE void 463ecb_inline void
417coro_times_update () 464coro_times_update (void)
418{ 465{
419#ifdef coro_clock_gettime 466#ifdef coro_clock_gettime
420 struct timespec ts; 467 struct timespec ts;
421 468
422 ts.tv_sec = ts.tv_nsec = 0; 469 ts.tv_sec = ts.tv_nsec = 0;
… …
434 time_real [0] = tv [0]; 481 time_real [0] = tv [0];
435 time_real [1] = tv [1] * 1000; 482 time_real [1] = tv [1] * 1000;
436#endif 483#endif
437} 484}
438 485
439ECB_INLINE void 486ecb_inline void
440coro_times_add (struct coro *c) 487coro_times_add (struct coro *c)
441{ 488{
442 c->t_real [1] += time_real [1]; 489 c->t_real [1] += time_real [1];
443 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]; }
444 c->t_real [0] += time_real [0]; 491 c->t_real [0] += time_real [0];
… …
446 c->t_cpu [1] += time_cpu [1]; 493 c->t_cpu [1] += time_cpu [1];
447 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]; }
448 c->t_cpu [0] += time_cpu [0]; 495 c->t_cpu [0] += time_cpu [0];
449} 496}
450 497
451ECB_INLINE void 498ecb_inline void
452coro_times_sub (struct coro *c) 499coro_times_sub (struct coro *c)
453{ 500{
454 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]; }
455 c->t_real [1] -= time_real [1]; 502 c->t_real [1] -= time_real [1];
456 c->t_real [0] -= time_real [0]; 503 c->t_real [0] -= time_real [0];
… …
477 : 0) 524 : 0)
478 525
479#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)
480#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)
481 528
482ECB_INLINE MAGIC * 529ecb_inline MAGIC *
483SvSTATEhv_p (pTHX_ SV *coro) 530SvSTATEhv_p (pTHX_ SV *coro)
484{ 531{
485 MAGIC *mg; 532 MAGIC *mg;
486 533
487 if (ecb_expect_true ( 534 if (ecb_expect_true (
… …
492 return mg; 539 return mg;
493 540
494 return 0; 541 return 0;
495} 542}
496 543
497ECB_INLINE struct coro * 544ecb_inline struct coro *
498SvSTATE_ (pTHX_ SV *coro) 545SvSTATE_ (pTHX_ SV *coro_sv)
499{ 546{
500 MAGIC *mg; 547 MAGIC *mg;
501 548
502 if (SvROK (coro)) 549 if (SvROK (coro_sv))
503 coro = SvRV (coro); 550 coro_sv = SvRV (coro_sv);
504 551
505 mg = SvSTATEhv_p (aTHX_ coro); 552 mg = SvSTATEhv_p (aTHX_ coro_sv);
506 if (!mg) 553 if (!mg)
507 croak ("Coro::State object required"); 554 croak ("Coro::State object required");
508 555
509 return (struct coro *)mg->mg_ptr; 556 return (struct coro *)mg->mg_ptr;
510} 557}
… …
516#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 563#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
517 564
518/*****************************************************************************/ 565/*****************************************************************************/
519/* padlist management and caching */ 566/* padlist management and caching */
520 567
521ECB_INLINE AV * 568ecb_inline PADLIST *
522coro_derive_padlist (pTHX_ CV *cv) 569coro_derive_padlist (pTHX_ CV *cv)
523{ 570{
524 AV *padlist = CvPADLIST (cv); 571 PADLIST *padlist = CvPADLIST (cv);
525 AV *newpadlist, *newpad; 572 PADLIST *newpadlist;
573 PADNAMELIST *padnames;
574 PAD *newpad;
575 PADOFFSET off = PadlistMAX (padlist) + 1;
526 576
527 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. */
528 AvREAL_off (newpadlist); 605 AvREAL_off (newpadlist);
529#if PERL_VERSION_ATLEAST (5,10,0)
530 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
531#else
532 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
533#endif 606#endif
534 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
535 --AvFILLp (padlist);
536 607
537 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 608 /* Already extended to 2 elements by newPADLIST. */
538 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;
539 616
540 return newpadlist; 617 return newpadlist;
541} 618}
542 619
543ECB_INLINE void 620ecb_inline void
544free_padlist (pTHX_ AV *padlist) 621free_padlist (pTHX_ PADLIST *padlist)
545{ 622{
546 /* may be during global destruction */ 623 /* may be during global destruction */
547 if (!IN_DESTRUCT) 624 if (!IN_DESTRUCT)
548 { 625 {
549 I32 i = AvFILLp (padlist); 626 I32 i = PadlistMAX (padlist);
550 627
551 while (i > 0) /* special-case index 0 */ 628 while (i > 0) /* special-case index 0 */
552 { 629 {
553 /* we try to be extra-careful here */ 630 /* we try to be extra-careful here */
554 AV *av = (AV *)AvARRAY (padlist)[i--]; 631 PAD *pad = PadlistARRAY (padlist)[i--];
555 I32 j = AvFILLp (av);
556 632
633 if (pad)
634 {
635 I32 j = PadMAX (pad);
636
557 while (j >= 0) 637 while (j >= 0)
558 SvREFCNT_dec (AvARRAY (av)[j--]); 638 SvREFCNT_dec (PadARRAY (pad)[j--]);
559 639
560 AvFILLp (av) = -1; 640 PadMAX (pad) = -1;
561 SvREFCNT_dec (av); 641 SvREFCNT_dec (pad);
642 }
562 } 643 }
563 644
564 SvREFCNT_dec (AvARRAY (padlist)[0]); 645 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
565 646
647#if NEWPADAPI
648 Safefree (PadlistARRAY (padlist));
649 Safefree (padlist);
650#else
566 AvFILLp (padlist) = -1; 651 AvFILLp (padlist) = -1;
652 AvREAL_off (padlist);
567 SvREFCNT_dec ((SV*)padlist); 653 SvREFCNT_dec ((SV*)padlist);
654#endif
568 } 655 }
569} 656}
570 657
571static int 658static int
572coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 659coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
573{ 660{
574 AV *padlist; 661 PADLIST *padlist;
575 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;
576 664
577 /* perl manages to free our internal AV and _then_ call us */ 665 /* perl manages to free our internal AV and _then_ call us */
578 if (IN_DESTRUCT) 666 if (IN_DESTRUCT)
579 return 0; 667 return 0;
580 668
581 /* casting is fun. */ 669 while (len--)
582 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
583 free_padlist (aTHX_ padlist); 670 free_padlist (aTHX_ padlists[len]);
584
585 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
586 671
587 return 0; 672 return 0;
588} 673}
589 674
590static MGVTBL coro_cv_vtbl = { 675static MGVTBL coro_cv_vtbl = {
591 0, 0, 0, 0, 676 0, 0, 0, 0,
592 coro_cv_free 677 coro_cv_free
593}; 678};
594 679
595/* the next two functions merely cache the padlists */ 680/* the next two functions merely cache the padlists */
596ECB_INLINE void 681ecb_inline void
597get_padlist (pTHX_ CV *cv) 682get_padlist (pTHX_ CV *cv)
598{ 683{
599 MAGIC *mg = CORO_MAGIC_cv (cv); 684 MAGIC *mg = CORO_MAGIC_cv (cv);
600 AV *av; 685 size_t *lenp;
601 686
602 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 687 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
603 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 688 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
604 else 689 else
605 { 690 {
606#if CORO_PREFER_PERL_FUNCTIONS 691#if CORO_PREFER_PERL_FUNCTIONS
607 /* this is probably cleaner? but also slower! */ 692 /* this is probably cleaner? but also slower! */
608 /* in practise, it seems to be less stable */ 693 /* in practise, it seems to be less stable */
… …
614 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 699 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
615#endif 700#endif
616 } 701 }
617} 702}
618 703
619ECB_INLINE void 704ecb_inline void
620put_padlist (pTHX_ CV *cv) 705put_padlist (pTHX_ CV *cv)
621{ 706{
622 MAGIC *mg = CORO_MAGIC_cv (cv); 707 MAGIC *mg = CORO_MAGIC_cv (cv);
623 AV *av;
624 708
625 if (ecb_expect_false (!mg)) 709 if (ecb_expect_false (!mg))
710 {
626 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);
627 719
628 av = (AV *)mg->mg_obj; 720 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
629
630 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
631 av_extend (av, AvFILLp (av) + 1);
632
633 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
634} 721}
635 722
636/** load & save, init *******************************************************/ 723/** load & save, init *******************************************************/
637 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
638/* swap sv heads, at least logically */ 767/* swap sv heads, at least logically */
639static void 768static void
640swap_svs (pTHX_ Coro__State c) 769swap_svs_enter (pTHX_ Coro__State c)
641{ 770{
642 int i; 771 int i;
643 772
644 for (i = 0; i <= AvFILLp (c->swap_sv); ) 773 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
645 { 774 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
646 SV *a = AvARRAY (c->swap_sv)[i++];
647 SV *b = AvARRAY (c->swap_sv)[i++];
648
649 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
650 SV tmp;
651
652 /* swap sv_any */
653 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
654
655 /* swap sv_flags */
656 SvFLAGS (&tmp) = SvFLAGS (a);
657 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
658 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
659
660#if PERL_VERSION_ATLEAST (5,10,0)
661 /* perl 5.10 complicates this _quite_ a bit, but it also is
662 * much faster, so no quarrels here. alternatively, we could
663 * sv_upgrade to avoid this.
664 */
665 {
666 /* swap sv_u */
667 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
668
669 /* if SvANY points to the head, we need to adjust the pointers,
670 * as the pointer for a still points to b, and maybe vice versa.
671 */
672 #define svany_in_head(type) \
673 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
674
675 if (svany_in_head (SvTYPE (a)))
676 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
677
678 if (svany_in_head (SvTYPE (b)))
679 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
680 }
681#endif
682 }
683} 775}
684 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
685#define SWAP_SVS(coro) \ 786#define SWAP_SVS_ENTER(coro) \
686 if (ecb_expect_false ((coro)->swap_sv)) \ 787 if (ecb_expect_false ((coro)->swap_sv)) \
687 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))
688 793
689static void 794static void
690on_enterleave_call (pTHX_ SV *cb); 795on_enterleave_call (pTHX_ SV *cb);
691 796
692static void 797static void
… …
699 804
700#if CORO_JIT 805#if CORO_JIT
701 load_perl_slots (slot); 806 load_perl_slots (slot);
702#else 807#else
703 #define VARx(name,expr,type) expr = slot->name; 808 #define VARx(name,expr,type) expr = slot->name;
704 # include "state.h" 809 #include "state.h"
705 #undef VARx
706#endif 810#endif
707 811
708 { 812 {
709 dSP; 813 dSP;
710 814
… …
713 /* now do the ugly restore mess */ 817 /* now do the ugly restore mess */
714 while (ecb_expect_true (cv = (CV *)POPs)) 818 while (ecb_expect_true (cv = (CV *)POPs))
715 { 819 {
716 put_padlist (aTHX_ cv); /* mark this padlist as available */ 820 put_padlist (aTHX_ cv); /* mark this padlist as available */
717 CvDEPTH (cv) = PTR2IV (POPs); 821 CvDEPTH (cv) = PTR2IV (POPs);
718 CvPADLIST (cv) = (AV *)POPs; 822 CvPADLIST (cv) = (PADLIST *)POPs;
719 } 823 }
720 824
721 PUTBACK; 825 PUTBACK;
722 } 826 }
723 827
… …
738 842
739 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 843 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
740 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 844 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
741 } 845 }
742 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
743 SWAP_SVS (c); 855 SWAP_SVS_ENTER (c);
744} 856}
745 857
746static void 858static void
747save_perl (pTHX_ Coro__State c) 859save_perl (pTHX_ Coro__State c)
748{ 860{
749 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 }
750 870
751 if (ecb_expect_false (c->on_leave)) 871 if (ecb_expect_false (c->on_leave))
752 { 872 {
753 int i; 873 int i;
754 874
… …
813 933
814 PUTBACK; 934 PUTBACK;
815 } 935 }
816 936
817 /* allocate some space on the context stack for our purposes */ 937 /* allocate some space on the context stack for our purposes */
818 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 938 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
819 { 939 {
820 unsigned int i; 940 unsigned int i;
821 941
822 for (i = 0; i < SLOT_COUNT; ++i) 942 for (i = 0; i < SLOT_COUNT; ++i)
823 CXINC; 943 CXINC;
… …
832 952
833#if CORO_JIT 953#if CORO_JIT
834 save_perl_slots (slot); 954 save_perl_slots (slot);
835#else 955#else
836 #define VARx(name,expr,type) slot->name = expr; 956 #define VARx(name,expr,type) slot->name = expr;
837 # include "state.h" 957 #include "state.h"
838 #undef VARx
839#endif 958#endif
840 } 959 }
841} 960}
842 961
843/* 962/*
… …
875#endif 994#endif
876 995
877 New(54,PL_scopestack,8,I32); 996 New(54,PL_scopestack,8,I32);
878 PL_scopestack_ix = 0; 997 PL_scopestack_ix = 0;
879 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
880 1002
881 New(54,PL_savestack,24,ANY); 1003 New(54,PL_savestack,24,ANY);
882 PL_savestack_ix = 0; 1004 PL_savestack_ix = 0;
883 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
884 1011
885#if !PERL_VERSION_ATLEAST (5,10,0) 1012#if !PERL_VERSION_ATLEAST (5,10,0)
886 New(54,PL_retstack,4,OP*); 1013 New(54,PL_retstack,4,OP*);
887 PL_retstack_ix = 0; 1014 PL_retstack_ix = 0;
888 PL_retstack_max = 4; 1015 PL_retstack_max = 4;
… …
912 } 1039 }
913 1040
914 Safefree (PL_tmps_stack); 1041 Safefree (PL_tmps_stack);
915 Safefree (PL_markstack); 1042 Safefree (PL_markstack);
916 Safefree (PL_scopestack); 1043 Safefree (PL_scopestack);
1044#if HAS_SCOPESTACK_NAME
1045 Safefree (PL_scopestack_name);
1046#endif
917 Safefree (PL_savestack); 1047 Safefree (PL_savestack);
918#if !PERL_VERSION_ATLEAST (5,10,0) 1048#if !PERL_VERSION_ATLEAST (5,10,0)
919 Safefree (PL_retstack); 1049 Safefree (PL_retstack);
920#endif 1050#endif
921} 1051}
… …
951 } 1081 }
952 1082
953 return rss; 1083 return rss;
954} 1084}
955 1085
956/** coroutine stack handling ************************************************/ 1086/** provide custom get/set/clear methods for %SIG elements ******************/
957
958static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
959static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
960static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
961 1087
962/* apparently < 5.8.8 */ 1088/* apparently < 5.8.8 */
963#ifndef MgPV_nolen_const 1089#ifndef MgPV_nolen_const
964#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1090#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
965 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1091 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
966 (const char*)(mg)->mg_ptr) 1092 (const char*)(mg)->mg_ptr)
967#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};
968 1122
969/* 1123/*
970 * This overrides the default magic get method of %SIG elements. 1124 * This overrides the default magic get method of %SIG elements.
971 * 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
972 * 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),
… …
974 */ 1128 */
975static int ecb_cold 1129static int ecb_cold
976coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
977{ 1131{
978 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;
979 1135
980 if (*s == '_') 1136 SV *ssv;
981 {
982 SV **svp = 0;
983 1137
984 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
985 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
986
987 if (svp) 1138 if (!*svp)
988 { 1139 ssv = &PL_sv_undef;
989 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1140 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
990 return 0; 1141 ssv = sv_2mortal (newRV_inc (*svp));
991 } 1142 else
992 } 1143 ssv = *svp;
993 1144
994 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1145 sv_setsv (sv, ssv);
1146 return 0;
995} 1147}
996 1148
997static int ecb_cold 1149static int ecb_cold
998coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1150coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
999{ 1151{
1000 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;
1001 1155
1002 if (*s == '_')
1003 {
1004 SV **svp = 0;
1005
1006 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1007 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1008
1009 if (svp)
1010 {
1011 SV *old = *svp; 1156 SV *old = *svp;
1012 *svp = 0; 1157 *svp = 0;
1013 SvREFCNT_dec (old); 1158 SvREFCNT_dec (old);
1014 return 0; 1159 return 0;
1015 }
1016 }
1017
1018 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1019} 1160}
1020 1161
1021static int ecb_cold 1162static int ecb_cold
1022coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1163coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1023{ 1164{
1024 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;
1025 1168
1026 if (*s == '_')
1027 {
1028 SV **svp = 0;
1029
1030 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1031 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1032
1033 if (svp)
1034 {
1035 SV *old = *svp; 1169 SV *old = *svp;
1036 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1170 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1037 SvREFCNT_dec (old); 1171 SvREFCNT_dec (old);
1038 return 0; 1172 return 0;
1039 }
1040 }
1041
1042 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1043} 1173}
1044 1174
1045static void 1175static void
1046prepare_nop (pTHX_ struct coro_transfer_args *ta) 1176prepare_nop (pTHX_ struct coro_transfer_args *ta)
1047{ 1177{
… …
1058static int 1188static int
1059slf_check_repeat (pTHX_ struct CoroSLF *frame) 1189slf_check_repeat (pTHX_ struct CoroSLF *frame)
1060{ 1190{
1061 return 1; 1191 return 1;
1062} 1192}
1193
1194/** coroutine stack handling ************************************************/
1063 1195
1064static UNOP init_perl_op; 1196static UNOP init_perl_op;
1065 1197
1066ecb_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 */
1067init_perl (pTHX_ struct coro *coro) 1199init_perl (pTHX_ struct coro *coro)
… …
1088 PL_hints = 0; 1220 PL_hints = 0;
1089 1221
1090 /* recreate the die/warn hooks */ 1222 /* recreate the die/warn hooks */
1091 PL_diehook = SvREFCNT_inc (rv_diehook); 1223 PL_diehook = SvREFCNT_inc (rv_diehook);
1092 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1224 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1093 1225
1094 GvSV (PL_defgv) = newSV (0); 1226 GvSV (PL_defgv) = newSV (0);
1095 GvAV (PL_defgv) = coro->args; coro->args = 0; 1227 GvAV (PL_defgv) = coro->args; coro->args = 0;
1096 GvSV (PL_errgv) = newSV (0); 1228 GvSV (PL_errgv) = newSV (0);
1097 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);
1098 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
1099 PL_rs = newSVsv (GvSV (irsgv)); 1234 PL_rs = newSVsv (GvSV (irsgv));
1100 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1235 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1101 1236
1102 { 1237 {
1103 dSP; 1238 dSP;
… …
1107 myop.op_next = Nullop; 1242 myop.op_next = Nullop;
1108 myop.op_type = OP_ENTERSUB; 1243 myop.op_type = OP_ENTERSUB;
1109 myop.op_flags = OPf_WANT_VOID; 1244 myop.op_flags = OPf_WANT_VOID;
1110 1245
1111 PUSHMARK (SP); 1246 PUSHMARK (SP);
1112 PUSHs ((SV *)coro->startcv); 1247 XPUSHs ((SV *)coro->startcv);
1113 PUTBACK; 1248 PUTBACK;
1114 PL_op = (OP *)&myop; 1249 PL_op = (OP *)&myop;
1115 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1250 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1116 } 1251 }
1117 1252
… …
1131 PL_op = (OP *)&init_perl_op; 1266 PL_op = (OP *)&init_perl_op;
1132 1267
1133 /* copy throw, in case it was set before init_perl */ 1268 /* copy throw, in case it was set before init_perl */
1134 CORO_THROW = coro->except; 1269 CORO_THROW = coro->except;
1135 1270
1136 SWAP_SVS (coro); 1271 SWAP_SVS_ENTER (coro);
1137 1272
1138 if (ecb_expect_false (enable_times)) 1273 if (ecb_expect_false (enable_times))
1139 { 1274 {
1140 coro_times_update (); 1275 coro_times_update ();
1141 coro_times_sub (coro); 1276 coro_times_sub (coro);
… …
1174 1309
1175 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));
1176 1311
1177 save_perl (aTHX_ current); 1312 save_perl (aTHX_ current);
1178 1313
1179 /* this will cause transfer_check to croak on block*/ 1314 /* this will cause transfer_check to croak on block */
1180 SvRV_set (coro_current, (SV *)coro->hv); 1315 SvRV_set (coro_current, (SV *)coro->hv);
1181 1316
1182 load_perl (aTHX_ coro); 1317 load_perl (aTHX_ coro);
1183 1318
1319 /* restore swapped sv's */
1320 SWAP_SVS_LEAVE (coro);
1321
1184 coro_unwind_stacks (aTHX); 1322 coro_unwind_stacks (aTHX);
1185 1323
1186 /* restore swapped sv's */
1187 SWAP_SVS (coro);
1188
1189 coro_destruct_stacks (aTHX); 1324 coro_destruct_stacks (aTHX);
1190 1325
1191 // now save some sv's to be free'd later 1326 /* now save some sv's to be free'd later */
1192 svf [0] = GvSV (PL_defgv); 1327 svf [0] = GvSV (PL_defgv);
1193 svf [1] = (SV *)GvAV (PL_defgv); 1328 svf [1] = (SV *)GvAV (PL_defgv);
1194 svf [2] = GvSV (PL_errgv); 1329 svf [2] = GvSV (PL_errgv);
1195 svf [3] = (SV *)PL_defoutgv; 1330 svf [3] = (SV *)PL_defoutgv;
1196 svf [4] = PL_rs; 1331 svf [4] = PL_rs;
… …
1213 1348
1214 SvREFCNT_dec (coro->saved_deffh); 1349 SvREFCNT_dec (coro->saved_deffh);
1215 SvREFCNT_dec (coro->rouse_cb); 1350 SvREFCNT_dec (coro->rouse_cb);
1216 SvREFCNT_dec (coro->invoke_cb); 1351 SvREFCNT_dec (coro->invoke_cb);
1217 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);
1218 } 1355 }
1219} 1356}
1220 1357
1221ECB_INLINE void 1358ecb_inline void
1222free_coro_mortal (pTHX) 1359free_coro_mortal (pTHX)
1223{ 1360{
1224 if (ecb_expect_true (coro_mortal)) 1361 if (ecb_expect_true (coro_mortal))
1225 { 1362 {
1226 SvREFCNT_dec ((SV *)coro_mortal); 1363 SvREFCNT_dec ((SV *)coro_mortal);
… …
1263 av_push (av, SvREFCNT_inc_NN (*bot++)); 1400 av_push (av, SvREFCNT_inc_NN (*bot++));
1264 1401
1265 PL_runops = RUNOPS_DEFAULT; 1402 PL_runops = RUNOPS_DEFAULT;
1266 ENTER; 1403 ENTER;
1267 SAVETMPS; 1404 SAVETMPS;
1405 PUSHMARK (SP);
1268 EXTEND (SP, 3); 1406 EXTEND (SP, 3);
1269 PUSHMARK (SP);
1270 PUSHs (&PL_sv_no); 1407 PUSHs (&PL_sv_no);
1271 PUSHs (fullname); 1408 PUSHs (fullname);
1272 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1409 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1273 PUTBACK; 1410 PUTBACK;
1274 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);
… …
1285 1422
1286 if (PL_curcop != &PL_compiling) 1423 if (PL_curcop != &PL_compiling)
1287 { 1424 {
1288 SV **cb; 1425 SV **cb;
1289 1426
1290 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1427 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1291 { 1428 {
1292 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1429 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1293 1430
1294 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1431 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1295 { 1432 {
… …
1301 gv_efullname3 (fullname, gv, 0); 1438 gv_efullname3 (fullname, gv, 0);
1302 1439
1303 PL_runops = RUNOPS_DEFAULT; 1440 PL_runops = RUNOPS_DEFAULT;
1304 ENTER; 1441 ENTER;
1305 SAVETMPS; 1442 SAVETMPS;
1443 PUSHMARK (SP);
1306 EXTEND (SP, 3); 1444 EXTEND (SP, 3);
1307 PUSHMARK (SP);
1308 PUSHs (&PL_sv_yes); 1445 PUSHs (&PL_sv_yes);
1309 PUSHs (fullname); 1446 PUSHs (fullname);
1310 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);
1311 PUTBACK; 1448 PUTBACK;
1312 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);
1313 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);
1314 SPAGAIN; 1451 SPAGAIN;
1315 FREETMPS; 1452 FREETMPS;
… …
1325 dSP; 1462 dSP;
1326 1463
1327 PL_runops = RUNOPS_DEFAULT; 1464 PL_runops = RUNOPS_DEFAULT;
1328 ENTER; 1465 ENTER;
1329 SAVETMPS; 1466 SAVETMPS;
1330 EXTEND (SP, 3);
1331 PL_runops = RUNOPS_DEFAULT;
1332 PUSHMARK (SP); 1467 PUSHMARK (SP);
1468 EXTEND (SP, 2);
1333 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1469 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1334 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1470 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1335 PUTBACK; 1471 PUTBACK;
1336 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);
1337 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);
… …
1385 slf_frame.prepare = slf_prepare_set_stacklevel; 1521 slf_frame.prepare = slf_prepare_set_stacklevel;
1386 slf_frame.check = slf_check_set_stacklevel; 1522 slf_frame.check = slf_check_set_stacklevel;
1387} 1523}
1388 1524
1389/* 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 */
1390ECB_INLINE void 1526ecb_inline void
1391transfer_tail (pTHX) 1527transfer_tail (pTHX)
1392{ 1528{
1393 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);
1394} 1542}
1395 1543
1396/* 1544/*
1397 * this is a _very_ stripped down perl interpreter ;) 1545 * this is a _very_ stripped down perl interpreter ;)
1398 */ 1546 */
… …
1425 * 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
1426 * 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.
1427 */ 1575 */
1428 1576
1429 /* 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 /*
1430 * 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
1431 * 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)
1432 * 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
1433 * bootstrap-time "top" top_env, as we cannot restore the "main" 1588 * doing in that case. YMMV.
1434 * coroutine as Coro has no such concept.
1435 * This actually isn't valid with the pthread backend, but OSes requiring
1436 * that backend are too broken to do it in a standards-compliant way.
1437 */ 1589 */
1438 PL_top_env = main_top_env; 1590 perlish_exit (aTHX);
1439 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1440 } 1591 }
1441} 1592}
1442 1593
1443static coro_cctx * 1594static coro_cctx *
1444cctx_new () 1595cctx_new (void)
1445{ 1596{
1446 coro_cctx *cctx; 1597 coro_cctx *cctx;
1447 1598
1448 ++cctx_count; 1599 ++cctx_count;
1449 New (0, cctx, 1, coro_cctx); 1600 New (0, cctx, 1, coro_cctx);
… …
1455 return cctx; 1606 return cctx;
1456} 1607}
1457 1608
1458/* create a new cctx only suitable as source */ 1609/* create a new cctx only suitable as source */
1459static coro_cctx * 1610static coro_cctx *
1460cctx_new_empty () 1611cctx_new_empty (void)
1461{ 1612{
1462 coro_cctx *cctx = cctx_new (); 1613 coro_cctx *cctx = cctx_new ();
1463 1614
1464 cctx->sptr = 0; 1615 cctx->stack.sptr = 0;
1465 coro_create (&cctx->cctx, 0, 0, 0, 0); 1616 coro_create (&cctx->cctx, 0, 0, 0, 0);
1466 1617
1467 return cctx; 1618 return cctx;
1468} 1619}
1469 1620
1470/* create a new cctx suitable as destination/running a perl interpreter */ 1621/* create a new cctx suitable as destination/running a perl interpreter */
1471static coro_cctx * 1622static coro_cctx *
1472cctx_new_run () 1623cctx_new_run (void)
1473{ 1624{
1474 coro_cctx *cctx = cctx_new (); 1625 coro_cctx *cctx = cctx_new ();
1475 void *stack_start;
1476 size_t stack_size;
1477 1626
1478#if HAVE_MMAP 1627 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1479 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1480 /* mmap supposedly does allocate-on-write for us */
1481 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1482
1483 if (cctx->sptr != (void *)-1)
1484 {
1485 #if CORO_STACKGUARD
1486 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1487 #endif
1488 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1489 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1490 cctx->flags |= CC_MAPPED;
1491 } 1628 {
1492 else
1493#endif
1494 {
1495 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1496 New (0, cctx->sptr, cctx_stacksize, long);
1497
1498 if (!cctx->sptr)
1499 {
1500 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1629 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1501 _exit (EXIT_FAILURE); 1630 _exit (EXIT_FAILURE);
1502 }
1503
1504 stack_start = cctx->sptr;
1505 stack_size = cctx->ssize;
1506 } 1631 }
1507 1632
1508 #if CORO_USE_VALGRIND
1509 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1510 #endif
1511
1512 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);
1513 1634
1514 return cctx; 1635 return cctx;
1515} 1636}
1516 1637
1517static void 1638static void
… …
1523 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1644 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1524 1645
1525 --cctx_count; 1646 --cctx_count;
1526 coro_destroy (&cctx->cctx); 1647 coro_destroy (&cctx->cctx);
1527 1648
1528 /* coro_transfer creates new, empty cctx's */ 1649 coro_stack_free (&cctx->stack);
1529 if (cctx->sptr)
1530 {
1531 #if CORO_USE_VALGRIND
1532 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1533 #endif
1534
1535#if HAVE_MMAP
1536 if (cctx->flags & CC_MAPPED)
1537 munmap (cctx->sptr, cctx->ssize);
1538 else
1539#endif
1540 Safefree (cctx->sptr);
1541 }
1542 1650
1543 Safefree (cctx); 1651 Safefree (cctx);
1544} 1652}
1545 1653
1546/* wether this cctx should be destructed */ 1654/* wether this cctx should be destructed */
… …
1565} 1673}
1566 1674
1567static void 1675static void
1568cctx_put (coro_cctx *cctx) 1676cctx_put (coro_cctx *cctx)
1569{ 1677{
1570 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));
1571 1679
1572 /* free another cctx if overlimit */ 1680 /* free another cctx if overlimit */
1573 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1681 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1574 { 1682 {
1575 coro_cctx *first = cctx_first; 1683 coro_cctx *first = cctx_first;
… …
1701 return; 1809 return;
1702 1810
1703 slf_destroy (aTHX_ coro); 1811 slf_destroy (aTHX_ coro);
1704 1812
1705 coro->flags |= CF_ZOMBIE; 1813 coro->flags |= CF_ZOMBIE;
1706 1814
1707 if (coro->flags & CF_READY) 1815 if (coro->flags & CF_READY)
1708 { 1816 {
1709 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1817 /* reduce nready, as destroying a ready coro effectively unreadies it */
1710 /* alternative: look through all ready queues and remove the coro */ 1818 /* alternative: look through all ready queues and remove the coro */
1711 --coro_nready; 1819 --coro_nready;
… …
1736 1844
1737static int 1845static int
1738coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1846coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1739{ 1847{
1740 struct coro *coro = (struct coro *)mg->mg_ptr; 1848 struct coro *coro = (struct coro *)mg->mg_ptr;
1849
1850 coro_state_destroy (aTHX_ coro);
1741 mg->mg_ptr = 0; 1851 mg->mg_ptr = 0;
1742 1852
1743 coro_state_destroy (aTHX_ coro);
1744 SvREFCNT_dec (coro->on_destroy); 1853 SvREFCNT_dec (coro->on_destroy);
1745 SvREFCNT_dec (coro->status); 1854 SvREFCNT_dec (coro->status);
1746 1855
1747 Safefree (coro); 1856 Safefree (coro);
1748 1857
… …
1751 1860
1752static int ecb_cold 1861static int ecb_cold
1753coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1862coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1754{ 1863{
1755 /* called when perl clones the current process the slow way (windows process emulation) */ 1864 /* called when perl clones the current process the slow way (windows process emulation) */
1756 /* WE SIMply nuke the pointers in the copy, causing perl to croak */ 1865 /* we simply nuke the pointers in the copy, causing perl to croak */
1757 mg->mg_ptr = 0; 1866 mg->mg_ptr = 0;
1758 mg->mg_virtual = 0; 1867 mg->mg_virtual = 0;
1759 1868
1760 return 0; 1869 return 0;
1761} 1870}
… …
1788 TRANSFER (ta, 1); 1897 TRANSFER (ta, 1);
1789} 1898}
1790 1899
1791/** Coro ********************************************************************/ 1900/** Coro ********************************************************************/
1792 1901
1793ECB_INLINE void 1902ecb_inline void
1794coro_enq (pTHX_ struct coro *coro) 1903coro_enq (pTHX_ struct coro *coro)
1795{ 1904{
1796 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1905 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1797 1906
1798 SvREFCNT_inc_NN (coro->hv); 1907 SvREFCNT_inc_NN (coro->hv);
… …
1800 coro->next_ready = 0; 1909 coro->next_ready = 0;
1801 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1910 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1802 ready [1] = coro; 1911 ready [1] = coro;
1803} 1912}
1804 1913
1805ECB_INLINE struct coro * 1914ecb_inline struct coro *
1806coro_deq (pTHX) 1915coro_deq (pTHX)
1807{ 1916{
1808 int prio; 1917 int prio;
1809 1918
1810 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1919 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1863{ 1972{
1864 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1973 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1865} 1974}
1866 1975
1867/* expects to own a reference to next->hv */ 1976/* expects to own a reference to next->hv */
1868ECB_INLINE void 1977ecb_inline void
1869prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1978prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1870{ 1979{
1871 SV *prev_sv = SvRV (coro_current); 1980 SV *prev_sv = SvRV (coro_current);
1872 1981
1873 ta->prev = SvSTATE_hv (prev_sv); 1982 ta->prev = SvSTATE_hv (prev_sv);
… …
1907 /* nothing to schedule: call the idle handler */ 2016 /* nothing to schedule: call the idle handler */
1908 if (SvROK (sv_idle) 2017 if (SvROK (sv_idle)
1909 && SvOBJECT (SvRV (sv_idle))) 2018 && SvOBJECT (SvRV (sv_idle)))
1910 { 2019 {
1911 if (SvRV (sv_idle) == SvRV (coro_current)) 2020 if (SvRV (sv_idle) == SvRV (coro_current))
2021 {
2022 require_pv ("Carp");
2023
2024 {
2025 dSP;
2026
2027 ENTER;
2028 SAVETMPS;
2029
2030 PUSHMARK (SP);
1912 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2031 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2032 PUTBACK;
2033 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2034
2035 FREETMPS;
2036 LEAVE;
2037 }
2038 }
1913 2039
1914 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2040 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1915 api_ready (aTHX_ SvRV (sv_idle)); 2041 api_ready (aTHX_ SvRV (sv_idle));
1916 --coro_nready; 2042 --coro_nready;
1917 } 2043 }
… …
1932 } 2058 }
1933 } 2059 }
1934 } 2060 }
1935} 2061}
1936 2062
1937ECB_INLINE void 2063ecb_inline void
1938prepare_cede (pTHX_ struct coro_transfer_args *ta) 2064prepare_cede (pTHX_ struct coro_transfer_args *ta)
1939{ 2065{
1940 api_ready (aTHX_ coro_current); 2066 api_ready (aTHX_ coro_current);
1941 prepare_schedule (aTHX_ ta); 2067 prepare_schedule (aTHX_ ta);
1942} 2068}
1943 2069
1944ECB_INLINE void 2070ecb_inline void
1945prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2071prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1946{ 2072{
1947 SV *prev = SvRV (coro_current); 2073 SV *prev = SvRV (coro_current);
1948 2074
1949 if (coro_nready) 2075 if (coro_nready)
… …
2114{ 2240{
2115 AV *od = coro->on_destroy; 2241 AV *od = coro->on_destroy;
2116 2242
2117 if (!od) 2243 if (!od)
2118 return; 2244 return;
2245
2246 coro->on_destroy = 0;
2247 sv_2mortal ((SV *)od);
2119 2248
2120 while (AvFILLp (od) >= 0) 2249 while (AvFILLp (od) >= 0)
2121 { 2250 {
2122 SV *cb = sv_2mortal (av_pop (od)); 2251 SV *cb = sv_2mortal (av_pop (od));
2123 2252
… …
2144 2273
2145static void 2274static void
2146coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2275coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2147{ 2276{
2148 AV *av; 2277 AV *av;
2149 2278
2150 if (coro->status) 2279 if (coro->status)
2151 { 2280 {
2152 av = coro->status; 2281 av = coro->status;
2153 av_clear (av); 2282 av_clear (av);
2154 } 2283 }
… …
2201 2330
2202 coro = SvSTATE (arg [0]); 2331 coro = SvSTATE (arg [0]);
2203 coro_hv = coro->hv; 2332 coro_hv = coro->hv;
2204 2333
2205 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2334 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2206 2335
2207 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2336 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2208 { 2337 {
2209 /* coro currently busy cancelling something, so just notify it */ 2338 /* coro currently busy cancelling something, so just notify it */
2210 coro->slf_frame.data = (void *)coro; 2339 coro->slf_frame.data = (void *)coro;
2211 2340
… …
2218 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2347 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2219 } 2348 }
2220 else 2349 else
2221 { 2350 {
2222 struct coro *self = SvSTATE_current; 2351 struct coro *self = SvSTATE_current;
2352
2353 if (!self)
2354 croak ("Coro::cancel called outside of thread content,");
2223 2355
2224 /* otherwise we cancel directly, purely for speed reasons 2356 /* otherwise we cancel directly, purely for speed reasons
2225 * unfortunately, this requires some magic trickery, as 2357 * unfortunately, this requires some magic trickery, as
2226 * somebody else could cancel us, so we have to fight the cancellation. 2358 * somebody else could cancel us, so we have to fight the cancellation.
2227 * this is ugly, and hopefully fully worth the extra speed. 2359 * this is ugly, and hopefully fully worth the extra speed.
… …
2260safe_cancel (pTHX_ struct coro *coro, SV **arg, int items) 2392safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2261{ 2393{
2262 if (coro->cctx) 2394 if (coro->cctx)
2263 croak ("coro inside C callback, unable to cancel at this time, caught"); 2395 croak ("coro inside C callback, unable to cancel at this time, caught");
2264 2396
2265 if (coro->flags & CF_NEW) 2397 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2266 { 2398 {
2267 coro_set_status (aTHX_ coro, arg, items); 2399 coro_set_status (aTHX_ coro, arg, items);
2268 coro_state_destroy (aTHX_ coro); 2400 coro_state_destroy (aTHX_ coro);
2269 } 2401 }
2270 else 2402 else
… …
2337 else 2469 else
2338 { 2470 {
2339 av_clear (GvAV (PL_defgv)); 2471 av_clear (GvAV (PL_defgv));
2340 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2472 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2341 2473
2474 if (ecb_expect_false (coro->swap_sv))
2475 {
2476 SWAP_SVS_LEAVE (coro);
2477 SvREFCNT_dec_NN (coro->swap_sv);
2478 coro->swap_sv = 0;
2479 }
2480
2342 coro->prio = 0; 2481 coro->prio = 0;
2343 2482
2344 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2483 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2345 api_trace (aTHX_ coro_current, 0); 2484 api_trace (aTHX_ coro_current, 0);
2346 2485
2347 frame->prepare = prepare_schedule; 2486 frame->prepare = prepare_schedule;
2348 av_push (av_async_pool, SvREFCNT_inc (hv)); 2487 av_push (av_async_pool, SvREFCNT_inc_NN (hv));
2349 } 2488 }
2350 } 2489 }
2351 else 2490 else
2352 { 2491 {
2353 /* first iteration, simply fall through */ 2492 /* first iteration, simply fall through */
… …
2366static void 2505static void
2367coro_rouse_callback (pTHX_ CV *cv) 2506coro_rouse_callback (pTHX_ CV *cv)
2368{ 2507{
2369 dXSARGS; 2508 dXSARGS;
2370 SV *data = (SV *)S_GENSUB_ARG; 2509 SV *data = (SV *)S_GENSUB_ARG;
2510 SV *coro = SvRV (data);
2371 2511
2512 /* data starts being either undef or a coro, and is replaced by the results when done */
2372 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2513 if (SvTYPE (coro) != SVt_PVAV)
2373 { 2514 {
2374 /* first call, set args */ 2515 /* first call, set args */
2375 SV *coro = SvRV (data);
2376 AV *av = newAV ();
2377 2516
2378 SvRV_set (data, (SV *)av); 2517 assert (&ST (0) < &ST (1)); /* ensure the stack is in the order we expect it to be */
2518 SvRV_set (data, (SV *)av_make (items, &ST (0))); /* av_make copies the SVs */
2379 2519
2380 /* better take a full copy of the arguments */ 2520 if (coro != &PL_sv_undef)
2381 while (items--) 2521 {
2382 av_store (av, items, newSVsv (ST (items)));
2383
2384 api_ready (aTHX_ coro); 2522 api_ready (aTHX_ coro);
2385 SvREFCNT_dec (coro); 2523 SvREFCNT_dec_NN (coro);
2524 }
2386 } 2525 }
2387 2526
2388 XSRETURN_EMPTY; 2527 XSRETURN_EMPTY;
2389} 2528}
2390 2529
2391static int 2530static int
2392slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2531slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2393{ 2532{
2394 SV *data = (SV *)frame->data; 2533 SV *data = (SV *)frame->data;
2395 2534
2396 if (CORO_THROW) 2535 if (CORO_THROW)
2397 return 0; 2536 return 0;
2398 2537
2399 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2538 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2400 return 1; 2539 return 1;
… …
2407 2546
2408 EXTEND (SP, AvFILLp (av) + 1); 2547 EXTEND (SP, AvFILLp (av) + 1);
2409 for (i = 0; i <= AvFILLp (av); ++i) 2548 for (i = 0; i <= AvFILLp (av); ++i)
2410 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2549 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2411 2550
2412 /* we have stolen the elements, so set length to zero and free */ 2551 /* we have stolen the elements, make it unreal and free */
2413 AvFILLp (av) = -1; 2552 AvREAL_off (av);
2414 av_undef (av); 2553 av_undef (av);
2415 2554
2416 PUTBACK; 2555 PUTBACK;
2417 } 2556 }
2418 2557
… …
2436 cb = sv_2mortal (coro->rouse_cb); 2575 cb = sv_2mortal (coro->rouse_cb);
2437 coro->rouse_cb = 0; 2576 coro->rouse_cb = 0;
2438 } 2577 }
2439 2578
2440 if (!SvROK (cb) 2579 if (!SvROK (cb)
2441 || SvTYPE (SvRV (cb)) != SVt_PVCV 2580 || SvTYPE (SvRV (cb)) != SVt_PVCV
2442 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2581 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2443 croak ("Coro::rouse_wait called with illegal callback argument,"); 2582 croak ("Coro::rouse_wait called with illegal callback argument,");
2444 2583
2445 { 2584 {
2446 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2585 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2447 SV *data = (SV *)S_GENSUB_ARG; 2586 SV *data = (SV *)S_GENSUB_ARG;
2587 int data_ready = SvTYPE (SvRV (data)) == SVt_PVAV;
2588
2589 /* if there is no data, we need to store the current coro in the reference so we can be woken up */
2590 if (!data_ready)
2591 if (SvRV (data) != &PL_sv_undef)
2592 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");
2593 else
2594 SvRV_set (data, SvREFCNT_inc_NN (SvRV (coro_current)));
2448 2595
2449 frame->data = (void *)data; 2596 frame->data = (void *)data;
2450 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2597 frame->prepare = data_ready ? prepare_nop : prepare_schedule;
2451 frame->check = slf_check_rouse_wait; 2598 frame->check = slf_check_rouse_wait;
2452 } 2599 }
2453} 2600}
2454 2601
2455static SV * 2602static SV *
2456coro_new_rouse_cb (pTHX) 2603coro_new_rouse_cb (pTHX)
2457{ 2604{
2458 HV *hv = (HV *)SvRV (coro_current); 2605 HV *hv = (HV *)SvRV (coro_current);
2459 struct coro *coro = SvSTATE_hv (hv); 2606 struct coro *coro = SvSTATE_hv (hv);
2460 SV *data = newRV_inc ((SV *)hv); 2607 SV *data = newRV_noinc (&PL_sv_undef);
2461 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data); 2608 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2462 2609
2463 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2610 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2464 SvREFCNT_dec (data); /* magicext increases the refcount */ 2611 SvREFCNT_dec_NN (data); /* magicext increases the refcount */
2465 2612
2466 SvREFCNT_dec (coro->rouse_cb); 2613 SvREFCNT_dec (coro->rouse_cb);
2467 coro->rouse_cb = SvREFCNT_inc_NN (cb); 2614 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2468 2615
2469 return cb; 2616 return cb;
… …
2569 2716
2570/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2717/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2571static void 2718static void
2572slf_destroy (pTHX_ struct coro *coro) 2719slf_destroy (pTHX_ struct coro *coro)
2573{ 2720{
2574 /* this callback is reserved for slf functions needing to do cleanup */ 2721 struct CoroSLF frame = coro->slf_frame;
2575 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2576 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2577 2722
2578 /* 2723 /*
2579 * The on_destroy above most likely is from an SLF call. 2724 * The on_destroy below most likely is from an SLF call.
2580 * Since by definition the SLF call will not finish when we destroy 2725 * Since by definition the SLF call will not finish when we destroy
2581 * the coro, we will have to force-finish it here, otherwise 2726 * the coro, we will have to force-finish it here, otherwise
2582 * cleanup functions cannot call SLF functions. 2727 * cleanup functions cannot call SLF functions.
2583 */ 2728 */
2584 coro->slf_frame.prepare = 0; 2729 coro->slf_frame.prepare = 0;
2730
2731 /* this callback is reserved for slf functions needing to do cleanup */
2732 if (frame.destroy && frame.prepare && !PL_dirty)
2733 frame.destroy (aTHX_ &frame);
2585} 2734}
2586 2735
2587/* 2736/*
2588 * these not obviously related functions are all rolled into one 2737 * these not obviously related functions are all rolled into one
2589 * function to increase chances that they all will call transfer with the same 2738 * function to increase chances that they all will call transfer with the same
… …
2772static void 2921static void
2773coro_pop_on_leave (pTHX_ void *coro) 2922coro_pop_on_leave (pTHX_ void *coro)
2774{ 2923{
2775 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2924 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2776 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2925 on_enterleave_call (aTHX_ sv_2mortal (cb));
2926}
2927
2928static void
2929enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2930{
2931 if (!hook)
2932 return;
2933
2934 if (!*avp)
2935 {
2936 *avp = newAV ();
2937 AvREAL_off (*avp);
2938 }
2939
2940 av_push (*avp, (SV *)hook);
2941 av_push (*avp, (SV *)arg);
2942}
2943
2944static void
2945enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2946{
2947 AV *av = *avp;
2948 int i;
2949
2950 if (!av)
2951 return;
2952
2953 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2954 if (AvARRAY (av)[i] == (SV *)hook)
2955 {
2956 if (execute)
2957 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2958
2959 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2960 av_pop (av);
2961 av_pop (av);
2962 break;
2963 }
2964
2965 if (AvFILLp (av) >= 0)
2966 {
2967 *avp = 0;
2968 SvREFCNT_dec_NN (av);
2969 }
2970}
2971
2972static void
2973api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2974{
2975 struct coro *coro = SvSTATE (coro_sv);
2976
2977 if (SvSTATE_current == coro)
2978 if (enter)
2979 enter (aTHX_ enter_arg);
2980
2981 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2982 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2983}
2984
2985static void
2986api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2987{
2988 struct coro *coro = SvSTATE (coro_sv);
2989
2990 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2991 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2992}
2993
2994static void
2995savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2996{
2997 struct coro *coro = SvSTATE_current;
2998
2999 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
3000}
3001
3002static void
3003savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
3004{
3005 struct coro *coro = SvSTATE_current;
3006
3007 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
3008}
3009
3010static void
3011api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
3012{
3013 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
3014
3015 /* this ought to be much cheaper than malloc + a single destructor call */
3016 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
3017 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2777} 3018}
2778 3019
2779/*****************************************************************************/ 3020/*****************************************************************************/
2780/* PerlIO::cede */ 3021/* PerlIO::cede */
2781 3022
… …
2911 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3152 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2912 PUTBACK; 3153 PUTBACK;
2913 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3154 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2914 } 3155 }
2915 3156
2916 SvREFCNT_dec (cb); 3157 SvREFCNT_dec_NN (cb);
2917 } 3158 }
2918} 3159}
2919 3160
2920static void 3161static void
2921coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3162coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
2929{ 3170{
2930 AV *av = (AV *)frame->data; 3171 AV *av = (AV *)frame->data;
2931 SV *count_sv = AvARRAY (av)[0]; 3172 SV *count_sv = AvARRAY (av)[0];
2932 SV *coro_hv = SvRV (coro_current); 3173 SV *coro_hv = SvRV (coro_current);
2933 3174
3175 frame->destroy = 0;
3176
2934 /* if we are about to throw, don't actually acquire the lock, just throw */ 3177 /* if we are about to throw, don't actually acquire the lock, just throw */
2935 if (CORO_THROW) 3178 if (ecb_expect_false (CORO_THROW))
3179 {
3180 /* we still might be responsible for the semaphore, so wake up others */
3181 coro_semaphore_adjust (aTHX_ av, 0);
3182
2936 return 0; 3183 return 0;
3184 }
2937 else if (SvIVX (count_sv) > 0) 3185 else if (SvIVX (count_sv) > 0)
2938 { 3186 {
2939 frame->destroy = 0;
2940
2941 if (acquire) 3187 if (acquire)
2942 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3188 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2943 else 3189 else
2944 coro_semaphore_adjust (aTHX_ av, 0); 3190 coro_semaphore_adjust (aTHX_ av, 0);
2945 3191
… …
2949 { 3195 {
2950 int i; 3196 int i;
2951 /* if we were woken up but can't down, we look through the whole */ 3197 /* if we were woken up but can't down, we look through the whole */
2952 /* waiters list and only add us if we aren't in there already */ 3198 /* waiters list and only add us if we aren't in there already */
2953 /* this avoids some degenerate memory usage cases */ 3199 /* this avoids some degenerate memory usage cases */
2954 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 3200 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2955 if (AvARRAY (av)[i] == coro_hv) 3201 if (AvARRAY (av)[i] == coro_hv)
2956 return 1; 3202 return 1;
2957 3203
2958 av_push (av, SvREFCNT_inc (coro_hv)); 3204 av_push (av, SvREFCNT_inc (coro_hv));
2959 return 1; 3205 return 1;
… …
3056 { 3302 {
3057 api_ready (aTHX_ cb); 3303 api_ready (aTHX_ cb);
3058 sv_setiv (cb, 0); /* signal waiter */ 3304 sv_setiv (cb, 0); /* signal waiter */
3059 } 3305 }
3060 3306
3061 SvREFCNT_dec (cb); 3307 SvREFCNT_dec_NN (cb);
3062 3308
3063 --count; 3309 --count;
3064 } 3310 }
3065} 3311}
3066 3312
… …
3151 } 3397 }
3152 3398
3153 av_push (state, data_sv); 3399 av_push (state, data_sv);
3154 3400
3155 api_ready (aTHX_ coro); 3401 api_ready (aTHX_ coro);
3156 SvREFCNT_dec (coro); 3402 SvREFCNT_dec_NN (coro);
3157 SvREFCNT_dec ((AV *)state); 3403 SvREFCNT_dec_NN ((AV *)state);
3158} 3404}
3159 3405
3160static int 3406static int
3161slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3407slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3162{ 3408{
… …
3167 /* it quickly returns */ 3413 /* it quickly returns */
3168 if (CORO_THROW) 3414 if (CORO_THROW)
3169 return 0; 3415 return 0;
3170 3416
3171 /* one element that is an RV? repeat! */ 3417 /* one element that is an RV? repeat! */
3172 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3418 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3173 return 1; 3419 return 1;
3174 3420
3175 /* restore status */ 3421 /* restore status */
3176 { 3422 {
3177 SV *data_sv = av_pop (state); 3423 SV *data_sv = av_pop (state);
… …
3180 errno = data->errorno; 3426 errno = data->errorno;
3181 PL_laststype = data->laststype; 3427 PL_laststype = data->laststype;
3182 PL_laststatval = data->laststatval; 3428 PL_laststatval = data->laststatval;
3183 PL_statcache = data->statcache; 3429 PL_statcache = data->statcache;
3184 3430
3185 SvREFCNT_dec (data_sv); 3431 SvREFCNT_dec_NN (data_sv);
3186 } 3432 }
3187 3433
3188 /* push result values */ 3434 /* push result values */
3189 { 3435 {
3190 dSP; 3436 dSP;
… …
3339#endif 3585#endif
3340 3586
3341#if CORO_JIT 3587#if CORO_JIT
3342 3588
3343static void ecb_noinline ecb_cold 3589static void ecb_noinline ecb_cold
3344pushav_3uv (pTHX_ UV a, UV b, UV c) 3590pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3345{ 3591{
3346 dSP; 3592 dSP;
3347 AV *av = newAV (); 3593 AV *av = newAV ();
3348 3594
3595 av_store (av, 3, newSVuv (d));
3349 av_store (av, 2, newSVuv (c)); 3596 av_store (av, 2, newSVuv (c));
3350 av_store (av, 1, newSVuv (b)); 3597 av_store (av, 1, newSVuv (b));
3351 av_store (av, 0, newSVuv (a)); 3598 av_store (av, 0, newSVuv (a));
3352 3599
3353 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 3600 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
… …
3360{ 3607{
3361 dSP; 3608 dSP;
3362 SV *load, *save; 3609 SV *load, *save;
3363 char *map_base; 3610 char *map_base;
3364 char *load_ptr, *save_ptr; 3611 char *load_ptr, *save_ptr;
3365 STRLEN load_len, save_len; 3612 STRLEN load_len, save_len, map_len;
3366 int count; 3613 int count;
3367 3614
3615 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3616
3368 PUSHMARK (SP); 3617 PUSHMARK (SP);
3369 PUTBACK;
3370#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type)); 3618 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3371# include "state.h" 3619 #include "state.h"
3372#undef VARx
3373 count = call_pv ("Coro::State::_jit", G_ARRAY); 3620 count = call_pv ("Coro::State::_jit", G_ARRAY);
3374 SPAGAIN; 3621 SPAGAIN;
3375 3622
3376 save = POPs; save_ptr = SvPVbyte (save, save_len); 3623 save = POPs; save_ptr = SvPVbyte (save, save_len);
3377 load = POPs; load_ptr = SvPVbyte (load, load_len); 3624 load = POPs; load_ptr = SvPVbyte (load, load_len);
3378 3625
3626 map_len = load_len + save_len + 16;
3627
3379 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3628 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3380 3629
3381 assert (("Coro: unable mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3630 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3382 3631
3383 load_perl_slots = (load_save_perl_slots_type)map_base; 3632 load_perl_slots = (load_save_perl_slots_type)map_base;
3384 memcpy (map_base, load_ptr, load_len); 3633 memcpy (load_perl_slots, load_ptr, load_len);
3385 3634
3386 map_base += (load_len + 15) & ~15;
3387
3388 save_perl_slots = (load_save_perl_slots_type)map_base; 3635 save_perl_slots = (load_save_perl_slots_type)(map_base + ((load_len + 15) & ~15));
3389 memcpy (map_base, save_ptr, save_len); 3636 memcpy (save_perl_slots, save_ptr, save_len);
3637
3638 /* we are good citizens and try to make the page read-only, so the evil evil */
3639 /* hackers might have it a bit more difficult */
3640 /* we do this in two steps, to potentially appease some security frameworks */
3641 mprotect (map_base, map_len, PROT_READ);
3642 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3643
3644 PUTBACK;
3645 eval_pv ("undef &Coro::State::_jit", 1);
3390} 3646}
3391 3647
3392#endif 3648#endif
3393 3649
3394MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3650MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3395 3651
3396PROTOTYPES: DISABLE 3652PROTOTYPES: DISABLE
3397 3653
3398BOOT: 3654BOOT:
3399{ 3655{
3656#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3657#include "state.h"
3400#ifdef USE_ITHREADS 3658#ifdef USE_ITHREADS
3401# if CORO_PTHREAD 3659# if CORO_PTHREAD
3402 coro_thx = PERL_GET_CONTEXT; 3660 coro_thx = PERL_GET_CONTEXT;
3403# endif 3661# endif
3404#endif 3662#endif
3405 BOOT_PAGESIZE;
3406
3407 /* perl defines these to check for existance first, but why it doesn't */ 3663 /* perl defines these to check for existance first, but why it doesn't */
3408 /* just create them one at init time is not clear to me, except for */ 3664 /* just create them one at init time is not clear to me, except for */
3409 /* programs trying to delete them, but... */ 3665 /* programs trying to delete them, but... */
3410 /* anyway, we declare this as invalid and make sure they are initialised here */ 3666 /* anyway, we declare this as invalid and make sure they are initialised here */
3411 DEFSV; 3667 DEFSV;
… …
3414 cctx_current = cctx_new_empty (); 3670 cctx_current = cctx_new_empty ();
3415 3671
3416 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3672 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3417 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3673 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3418 3674
3419 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3675 {
3420 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3676 /*
3421 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3677 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3678 * by coro_sig_vtbl in hash values.
3679 */
3680 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3681
3682 /* this only works if perl doesn't have a vtbl for %SIG */
3683 assert (!mg->mg_virtual);
3684
3685 /*
3686 * The irony is that the perl API itself asserts that mg_virtual
3687 * must be non-const, yet perl5porters insisted on marking their
3688 * vtbls as read-only, just to thwart perl modules from patching
3689 * them.
3690 */
3691 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3692 mg->mg_flags |= MGf_COPY;
3693
3694 coro_sigelem_vtbl = PL_vtbl_sigelem;
3695 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3696 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3697 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3698 }
3422 3699
3423 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3424 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3700 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3425 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3701 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3426 3702
3427 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3703 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3704
3705 newCONSTSUB (coro_state_stash, "BACKEND", newSVpv (CORO_BACKEND, 0)); /* undocumented */
3428 3706
3429 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 3707 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
3430 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 3708 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
3431 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 3709 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
3432 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 3710 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
… …
3462 time_init (aTHX); 3740 time_init (aTHX);
3463 3741
3464 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3742 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3465#if CORO_JIT 3743#if CORO_JIT
3466 PUTBACK; 3744 PUTBACK;
3467 require_pv ("Coro/jit-" CORO_JIT_TYPE ".pl");
3468 jit_init (aTHX); 3745 jit_init (aTHX);
3469 perl_eval_pv ("undef &Coro::State::_jit", 1);
3470 SPAGAIN; 3746 SPAGAIN;
3471#endif 3747#endif
3472} 3748}
3473 3749
3474SV * 3750SV *
… …
3483void 3759void
3484transfer (...) 3760transfer (...)
3485 PROTOTYPE: $$ 3761 PROTOTYPE: $$
3486 CODE: 3762 CODE:
3487 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3763 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3488
3489void
3490_exit (int code)
3491 PROTOTYPE: $
3492 CODE:
3493 _exit (code);
3494 3764
3495SV * 3765SV *
3496clone (Coro::State coro) 3766clone (Coro::State coro)
3497 CODE: 3767 CODE:
3498{ 3768{
… …
3553void 3823void
3554list () 3824list ()
3555 PROTOTYPE: 3825 PROTOTYPE:
3556 PPCODE: 3826 PPCODE:
3557{ 3827{
3558 struct coro *coro; 3828 struct coro *coro;
3559 for (coro = coro_first; coro; coro = coro->next) 3829 for (coro = coro_first; coro; coro = coro->next)
3560 if (coro->hv) 3830 if (coro->hv)
3561 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3831 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3562} 3832}
3563 3833
… …
3565call (Coro::State coro, SV *coderef) 3835call (Coro::State coro, SV *coderef)
3566 ALIAS: 3836 ALIAS:
3567 eval = 1 3837 eval = 1
3568 CODE: 3838 CODE:
3569{ 3839{
3840 struct coro *current = SvSTATE_current;
3841
3570 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3842 if ((coro == current) || (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)))
3571 { 3843 {
3572 struct coro *current = SvSTATE_current;
3573 struct CoroSLF slf_save; 3844 struct CoroSLF slf_save;
3574 3845
3575 if (current != coro) 3846 if (current != coro)
3576 { 3847 {
3577 PUTBACK; 3848 PUTBACK;
… …
3627 RETVAL = boolSV (coro->flags & ix); 3898 RETVAL = boolSV (coro->flags & ix);
3628 OUTPUT: 3899 OUTPUT:
3629 RETVAL 3900 RETVAL
3630 3901
3631void 3902void
3632throw (Coro::State self, SV *exception = &PL_sv_undef) 3903throw (SV *self, SV *exception = &PL_sv_undef)
3633 PROTOTYPE: $;$ 3904 PROTOTYPE: $;$
3634 CODE: 3905 CODE:
3635{ 3906{
3907 struct coro *coro = SvSTATE (self);
3636 struct coro *current = SvSTATE_current; 3908 struct coro *current = SvSTATE_current;
3637 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3909 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3638 SvREFCNT_dec (*exceptionp); 3910 SvREFCNT_dec (*exceptionp);
3639 SvGETMAGIC (exception); 3911 SvGETMAGIC (exception);
3640 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3912 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3913
3914 api_ready (aTHX_ self);
3641} 3915}
3642 3916
3643void 3917void
3644api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3918api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3645 PROTOTYPE: $;$ 3919 PROTOTYPE: $;$
… …
3722 3996
3723void 3997void
3724times (Coro::State self) 3998times (Coro::State self)
3725 PPCODE: 3999 PPCODE:
3726{ 4000{
3727 struct coro *current = SvSTATE (coro_current); 4001 struct coro *current = SvSTATE (coro_current);
3728 4002
3729 if (ecb_expect_false (current == self)) 4003 if (ecb_expect_false (current == self))
3730 { 4004 {
3731 coro_times_update (); 4005 coro_times_update ();
3732 coro_times_add (SvSTATE (coro_current)); 4006 coro_times_add (SvSTATE (coro_current));
… …
3739 if (ecb_expect_false (current == self)) 4013 if (ecb_expect_false (current == self))
3740 coro_times_sub (SvSTATE (coro_current)); 4014 coro_times_sub (SvSTATE (coro_current));
3741} 4015}
3742 4016
3743void 4017void
3744swap_sv (Coro::State coro, SV *sv, SV *swapsv) 4018swap_sv (Coro::State coro, SV *sva, SV *svb)
3745 CODE: 4019 CODE:
3746{ 4020{
3747 struct coro *current = SvSTATE_current; 4021 struct coro *current = SvSTATE_current;
4022 AV *swap_sv;
4023 int i;
4024
4025 sva = SvRV (sva);
4026 svb = SvRV (svb);
3748 4027
3749 if (current == coro) 4028 if (current == coro)
3750 SWAP_SVS (current); 4029 SWAP_SVS_LEAVE (current);
3751 4030
3752 if (!coro->swap_sv) 4031 if (!coro->swap_sv)
3753 coro->swap_sv = newAV (); 4032 coro->swap_sv = newAV ();
3754 4033
4034 swap_sv = coro->swap_sv;
4035
4036 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4037 {
4038 SV *a = AvARRAY (swap_sv)[i ];
4039 SV *b = AvARRAY (swap_sv)[i + 1];
4040
4041 if (a == sva && b == svb)
4042 {
4043 SvREFCNT_dec_NN (a);
4044 SvREFCNT_dec_NN (b);
4045
4046 for (; i <= AvFILLp (swap_sv) - 2; i++)
4047 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4048
4049 AvFILLp (swap_sv) -= 2;
4050
4051 goto removed;
4052 }
4053 }
4054
3755 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4055 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3756 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4056 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4057
4058 removed:
3757 4059
3758 if (current == coro) 4060 if (current == coro)
3759 SWAP_SVS (current); 4061 SWAP_SVS_ENTER (current);
3760} 4062}
3761 4063
3762 4064
3763MODULE = Coro::State PACKAGE = Coro 4065MODULE = Coro::State PACKAGE = Coro
3764 4066
3765BOOT: 4067BOOT:
3766{ 4068{
4069 if (SVt_LAST > 32)
4070 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4071
3767 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4072 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3768 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4073 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3769 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4074 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3770 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4075 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3771 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4076 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3775 4080
3776 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4081 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3777 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4082 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3778 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4083 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3779 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 4084 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3780 4085
3781 coro_stash = gv_stashpv ("Coro", TRUE); 4086 coro_stash = gv_stashpv ("Coro", TRUE);
3782 4087
3783 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4088 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3784 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4089 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3785 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4090 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3797 coroapi.ready = api_ready; 4102 coroapi.ready = api_ready;
3798 coroapi.is_ready = api_is_ready; 4103 coroapi.is_ready = api_is_ready;
3799 coroapi.nready = coro_nready; 4104 coroapi.nready = coro_nready;
3800 coroapi.current = coro_current; 4105 coroapi.current = coro_current;
3801 4106
4107 coroapi.enterleave_hook = api_enterleave_hook;
4108 coroapi.enterleave_unhook = api_enterleave_unhook;
4109 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4110
3802 /*GCoroAPI = &coroapi;*/ 4111 /*GCoroAPI = &coroapi;*/
3803 sv_setiv (sv, (IV)&coroapi); 4112 sv_setiv (sv, PTR2IV (&coroapi));
3804 SvREADONLY_on (sv); 4113 SvREADONLY_on (sv);
3805 } 4114 }
3806} 4115}
3807 4116
3808SV * 4117SV *
… …
3871 4180
3872void 4181void
3873_set_current (SV *current) 4182_set_current (SV *current)
3874 PROTOTYPE: $ 4183 PROTOTYPE: $
3875 CODE: 4184 CODE:
3876 SvREFCNT_dec (SvRV (coro_current)); 4185 SvREFCNT_dec_NN (SvRV (coro_current));
3877 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4186 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3878 4187
3879void 4188void
3880_set_readyhook (SV *hook) 4189_set_readyhook (SV *hook)
3881 PROTOTYPE: $ 4190 PROTOTYPE: $
… …
3965 4274
3966 if ((SV *)hv == &PL_sv_undef) 4275 if ((SV *)hv == &PL_sv_undef)
3967 { 4276 {
3968 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4277 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3969 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4278 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3970 SvREFCNT_dec (sv); 4279 SvREFCNT_dec_NN (sv);
3971 } 4280 }
3972 4281
3973 { 4282 {
3974 struct coro *coro = SvSTATE_hv (hv); 4283 struct coro *coro = SvSTATE_hv (hv);
3975 4284
… …
3982 api_ready (aTHX_ (SV *)hv); 4291 api_ready (aTHX_ (SV *)hv);
3983 4292
3984 if (GIMME_V != G_VOID) 4293 if (GIMME_V != G_VOID)
3985 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4294 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3986 else 4295 else
3987 SvREFCNT_dec (hv); 4296 SvREFCNT_dec_NN (hv);
3988} 4297}
3989 4298
3990SV * 4299SV *
3991rouse_cb () 4300rouse_cb ()
3992 PROTOTYPE: 4301 PROTOTYPE:
… …
4007 on_leave = 1 4316 on_leave = 1
4008 PROTOTYPE: & 4317 PROTOTYPE: &
4009 CODE: 4318 CODE:
4010{ 4319{
4011 struct coro *coro = SvSTATE_current; 4320 struct coro *coro = SvSTATE_current;
4012 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4321 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4013 4322
4014 block = s_get_cv_croak (block); 4323 block = s_get_cv_croak (block);
4015 4324
4016 if (!*avp) 4325 if (!*avp)
4017 *avp = newAV (); 4326 *avp = newAV ();
… …
4037 4346
4038SV * 4347SV *
4039new (SV *klass, SV *count = 0) 4348new (SV *klass, SV *count = 0)
4040 CODE: 4349 CODE:
4041{ 4350{
4042 int semcnt = 1; 4351 int semcnt = 1;
4043 4352
4044 if (count) 4353 if (count)
4045 { 4354 {
4046 SvGETMAGIC (count); 4355 SvGETMAGIC (count);
4047 4356
… …
4071 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4380 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4072 OUTPUT: 4381 OUTPUT:
4073 RETVAL 4382 RETVAL
4074 4383
4075void 4384void
4076up (SV *self, int adjust = 1) 4385up (SV *self)
4077 ALIAS:
4078 adjust = 1
4079 CODE: 4386 CODE:
4387 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4388
4389void
4390adjust (SV *self, int adjust)
4391 CODE:
4080 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4392 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4081 4393
4082void 4394void
4083down (...) 4395down (...)
4084 CODE: 4396 CODE:
4085 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4397 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
4107 XSRETURN_NO; 4419 XSRETURN_NO;
4108} 4420}
4109 4421
4110void 4422void
4111waiters (SV *self) 4423waiters (SV *self)
4112 PPCODE: 4424 PPCODE:
4113{ 4425{
4114 AV *av = (AV *)SvRV (self); 4426 AV *av = (AV *)SvRV (self);
4115 int wcount = AvFILLp (av) + 1 - 1; 4427 int wcount = AvFILLp (av) + 1 - 1;
4116 4428
4117 if (GIMME_V == G_SCALAR) 4429 if (GIMME_V == G_SCALAR)
… …
4126} 4438}
4127 4439
4128MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4440MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4129 4441
4130void 4442void
4131_may_delete (SV *sem, int count, int extra_refs) 4443_may_delete (SV *sem, int count, unsigned int extra_refs)
4132 PPCODE: 4444 PPCODE:
4133{ 4445{
4134 AV *av = (AV *)SvRV (sem); 4446 AV *av = (AV *)SvRV (sem);
4135 4447
4136 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4448 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4137 && AvFILLp (av) == 0 /* no waiters, just count */ 4449 && AvFILLp (av) == 0 /* no waiters, just count */
4138 && SvIV (AvARRAY (av)[0]) == count) 4450 && SvIV (AvARRAY (av)[0]) == count)
4139 XSRETURN_YES; 4451 XSRETURN_YES;
… …
4160 4472
4161void 4473void
4162broadcast (SV *self) 4474broadcast (SV *self)
4163 CODE: 4475 CODE:
4164{ 4476{
4165 AV *av = (AV *)SvRV (self); 4477 AV *av = (AV *)SvRV (self);
4166 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4478 coro_signal_wake (aTHX_ av, AvFILLp (av));
4167} 4479}
4168 4480
4169void 4481void
4170send (SV *self) 4482send (SV *self)
… …
4178 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4490 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4179} 4491}
4180 4492
4181IV 4493IV
4182awaited (SV *self) 4494awaited (SV *self)
4183 CODE: 4495 CODE:
4184 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4496 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4185 OUTPUT: 4497 OUTPUT:
4186 RETVAL 4498 RETVAL
4187 4499
4188 4500
… …
4193 4505
4194void 4506void
4195_schedule (...) 4507_schedule (...)
4196 CODE: 4508 CODE:
4197{ 4509{
4198 static int incede; 4510 static int incede;
4199 4511
4200 api_cede_notself (aTHX); 4512 api_cede_notself (aTHX);
4201 4513
4202 ++incede; 4514 ++incede;
4203 while (coro_nready >= incede && api_cede (aTHX)) 4515 while (coro_nready >= incede && api_cede (aTHX))
… …
4247 { 4559 {
4248 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4560 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4249 coro_old_pp_sselect = 0; 4561 coro_old_pp_sselect = 0;
4250 } 4562 }
4251 4563
4564MODULE = Coro::State PACKAGE = Coro::Util
4565
4566void
4567_exit (int code)
4568 CODE:
4569 _exit (code);
4570
4571NV
4572time ()
4573 CODE:
4574 RETVAL = nvtime (aTHX);
4575 OUTPUT:
4576 RETVAL
4577
4578NV
4579gettimeofday ()
4580 PPCODE:
4581{
4582 UV tv [2];
4583 u2time (aTHX_ tv);
4584 EXTEND (SP, 2);
4585 PUSHs (sv_2mortal (newSVuv (tv [0])));
4586 PUSHs (sv_2mortal (newSVuv (tv [1])));
4587}
4588

Diff Legend

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