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.471 by root, Fri Jul 14 23:20:07 2017 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7 7
8#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 9#define PERL_EXT
… …
12#include "perl.h" 12#include "perl.h"
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
17#include "ecb.h" 20#include "ecb.h"
18 21
19#include <stddef.h> 22#include <stddef.h>
20#include <stdio.h> 23#include <stdio.h>
21#include <errno.h> 24#include <errno.h>
22#include <assert.h> 25#include <assert.h>
23 26
27#ifndef SvREFCNT_dec_NN
28 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
29#endif
30
31#ifndef SvREFCNT_inc_NN
32 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
33#endif
34
24#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0 36# define SVs_PADSTALE 0
37#endif
38
39#ifdef PadARRAY
40# define NEWPADAPI 1
41# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
42#else
43typedef AV PADNAMELIST;
44# if !PERL_VERSION_ATLEAST(5,8,0)
45typedef AV PADLIST;
46typedef AV PAD;
47# endif
48# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
49# define PadlistMAX(pl) AvFILLp (pl)
50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
51# define PadARRAY AvARRAY
52# define PadMAX AvFILLp
53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
54#endif
55#ifndef PadnamelistREFCNT
56# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
57#endif
58#ifndef PadnamelistREFCNT_dec
59# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
60#endif
61
62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
64#if PERL_VERSION_ATLEAST(5,19,0)
65# define SVt_BIND SVt_IV
26#endif 66#endif
27 67
28#if defined(_WIN32) 68#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY 69# undef HAS_GETTIMEOFDAY
30# undef setjmp 70# undef setjmp
… …
33# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
34#else 74#else
35# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
36#endif 76#endif
37 77
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 */ 78/* the maximum number of idle cctx that will be pooled */
66static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
67 80
68#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# undef CORO_STACKGUARD 82# define HAS_SCOPESTACK_NAME 1
70#endif
71
72#ifndef CORO_STACKGUARD
73# define CORO_STACKGUARD 0
74#endif 83#endif
75 84
76/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
77#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
78# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
97# if CORO_PTHREAD 106# if CORO_PTHREAD
98static void *coro_thx; 107static void *coro_thx;
99# endif 108# endif
100#endif 109#endif
101 110
102/* used in state.h */
103#define VAR(name,type) VARx(name, PL_ ## name, type)
104
105#ifdef __linux 111#ifdef __linux
106# include <time.h> /* for timespec */ 112# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */ 113# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime 114# ifdef SYS_clock_gettime
109# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 115# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
110# define CORO_CLOCK_MONOTONIC 1 116# define CORO_CLOCK_MONOTONIC 1
111# define CORO_CLOCK_THREAD_CPUTIME_ID 3 117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
112# endif 118# endif
113#endif 119#endif
114 120
121/* one off bugfix for perl 5.22 */
122#if PERL_VERSION_ATLEAST(5,22,0) && !PERL_VERSION_ATLEAST(5,24,0)
123# undef PadlistNAMES
124# define PadlistNAMES(pl) *((PADNAMELIST **)PadlistARRAY (pl))
125#endif
126
127#if PERL_VERSION_ATLEAST(5,24,0)
128# define SUB_ARGARRAY PL_curpad[0]
129#else
130# define SUB_ARGARRAY (SV *)cx->blk_sub.argarray
131#endif
132
133/* perl usually suppresses asserts. for debugging, we sometimes force it to be on */
134#if 0
135# undef NDEBUG
136# include <assert.h>
137#endif
138
115static double (*nvtime)(); /* so why doesn't it take void? */ 139static double (*nvtime)(); /* so why doesn't it take void? */
116static void (*u2time)(pTHX_ UV ret[2]); 140static void (*u2time)(pTHX_ UV ret[2]);
117 141
118/* we hijack an hopefully unused CV flag for our purposes */ 142/* we hijack an hopefully unused CV flag for our purposes */
119#define CVf_SLF 0x4000 143#define CVf_SLF 0x4000
… …
134 158
135static GV *irsgv; /* $/ */ 159static GV *irsgv; /* $/ */
136static GV *stdoutgv; /* *STDOUT */ 160static GV *stdoutgv; /* *STDOUT */
137static SV *rv_diehook; 161static SV *rv_diehook;
138static SV *rv_warnhook; 162static SV *rv_warnhook;
139static HV *hv_sig; /* %SIG */
140 163
141/* async_pool helper stuff */ 164/* async_pool helper stuff */
142static SV *sv_pool_rss; 165static SV *sv_pool_rss;
143static SV *sv_pool_size; 166static SV *sv_pool_size;
144static SV *sv_async_pool_idle; /* description string */ 167static SV *sv_async_pool_idle; /* description string */
… …
172typedef struct coro_cctx 195typedef struct coro_cctx
173{ 196{
174 struct coro_cctx *next; 197 struct coro_cctx *next;
175 198
176 /* the stack */ 199 /* the stack */
177 void *sptr; 200 struct coro_stack stack;
178 size_t ssize;
179 201
180 /* cpu state */ 202 /* cpu state */
181 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 203 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
204#ifndef NDEBUG
182 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 205 JMPENV *idle_te; /* same as idle_sp, but for top_env */
206#endif
183 JMPENV *top_env; 207 JMPENV *top_env;
184 coro_context cctx; 208 coro_context cctx;
185 209
186 U32 gen; 210 U32 gen;
187#if CORO_USE_VALGRIND 211#if CORO_USE_VALGRIND
… …
207}; 231};
208 232
209/* the structure where most of the perl state is stored, overlaid on the cxstack */ 233/* the structure where most of the perl state is stored, overlaid on the cxstack */
210typedef struct 234typedef struct
211{ 235{
212#define VARx(name,expr,type) type name; 236 #define VARx(name,expr,type) type name;
213# include "state.h" 237 #include "state.h"
214#undef VARx
215} perl_slots; 238} perl_slots;
216 239
217// how many context stack entries do we need for perl_slots 240/* 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)) 241#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
219 242
220/* this is a structure representing a perl-level coroutine */ 243/* this is a structure representing a perl-level coroutine */
221struct coro 244struct coro
222{ 245{
… …
250 SV *saved_deffh; 273 SV *saved_deffh;
251 SV *invoke_cb; 274 SV *invoke_cb;
252 AV *invoke_av; 275 AV *invoke_av;
253 276
254 /* on_enter/on_leave */ 277 /* on_enter/on_leave */
255 AV *on_enter; 278 AV *on_enter; AV *on_enter_xs;
256 AV *on_leave; 279 AV *on_leave; AV *on_leave_xs;
257 280
258 /* swap_sv */ 281 /* swap_sv */
259 AV *swap_sv; 282 AV *swap_sv;
260 283
261 /* times */ 284 /* times */
… …
291#define coro_nready coroapi.nready 314#define coro_nready coroapi.nready
292 315
293/** JIT *********************************************************************/ 316/** JIT *********************************************************************/
294 317
295#if CORO_JIT 318#if CORO_JIT
319 /* APPLE doesn't have mmap though */
320 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
296 #ifndef CORO_JIT_TYPE 321 #ifndef CORO_JIT_TYPE
297 #if __linux && __amd64 322 #if ECB_AMD64 && CORO_JIT_UNIXY
298 #define CORO_JIT_TYPE "amd64-unix" 323 #define CORO_JIT_TYPE "amd64-unix"
299 typedef void (*load_save_perl_slots_type)(perl_slots *); 324 #elif __i386 && CORO_JIT_UNIXY
300 #else 325 #define CORO_JIT_TYPE "x86-unix"
301 #undef CORO_JIT
302 #endif 326 #endif
303 #endif 327 #endif
304#endif 328#endif
305 329
330#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
331 #undef CORO_JIT
332#endif
333
306#if CORO_JIT 334#if CORO_JIT
307 335 typedef void (*load_save_perl_slots_type)(perl_slots *);
308static load_save_perl_slots_type load_perl_slots, save_perl_slots; 336 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
309
310#endif 337#endif
311 338
312/** Coro::Select ************************************************************/ 339/** Coro::Select ************************************************************/
313 340
314static OP *(*coro_old_pp_sselect) (pTHX); 341static OP *(*coro_old_pp_sselect) (pTHX);
… …
331 358
332/** time stuff **************************************************************/ 359/** time stuff **************************************************************/
333 360
334#ifdef HAS_GETTIMEOFDAY 361#ifdef HAS_GETTIMEOFDAY
335 362
336ECB_INLINE void 363ecb_inline void
337coro_u2time (pTHX_ UV ret[2]) 364coro_u2time (pTHX_ UV ret[2])
338{ 365{
339 struct timeval tv; 366 struct timeval tv;
340 gettimeofday (&tv, 0); 367 gettimeofday (&tv, 0);
341 368
342 ret [0] = tv.tv_sec; 369 ret [0] = tv.tv_sec;
343 ret [1] = tv.tv_usec; 370 ret [1] = tv.tv_usec;
344} 371}
345 372
346ECB_INLINE double 373ecb_inline double
347coro_nvtime () 374coro_nvtime (void)
348{ 375{
349 struct timeval tv; 376 struct timeval tv;
350 gettimeofday (&tv, 0); 377 gettimeofday (&tv, 0);
351 378
352 return tv.tv_sec + tv.tv_usec * 1e-6; 379 return tv.tv_sec + tv.tv_usec * 1e-6;
353} 380}
354 381
355ECB_INLINE void 382ecb_inline void
356time_init (pTHX) 383time_init (pTHX)
357{ 384{
358 nvtime = coro_nvtime; 385 nvtime = coro_nvtime;
359 u2time = coro_u2time; 386 u2time = coro_u2time;
360} 387}
361 388
362#else 389#else
363 390
364ECB_INLINE void 391ecb_inline void
365time_init (pTHX) 392time_init (pTHX)
366{ 393{
367 SV **svp; 394 SV **svp;
368 395
369 require_pv ("Time/HiRes.pm"); 396 require_pv ("Time/HiRes.pm");
370 397
371 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 398 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
372 399
373 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 400 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
374 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 401 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
375 402
… …
411 get_hv (name, create); 438 get_hv (name, create);
412#endif 439#endif
413 return get_hv (name, create); 440 return get_hv (name, create);
414} 441}
415 442
416ECB_INLINE void 443ecb_inline void
417coro_times_update () 444coro_times_update (void)
418{ 445{
419#ifdef coro_clock_gettime 446#ifdef coro_clock_gettime
420 struct timespec ts; 447 struct timespec ts;
421 448
422 ts.tv_sec = ts.tv_nsec = 0; 449 ts.tv_sec = ts.tv_nsec = 0;
… …
434 time_real [0] = tv [0]; 461 time_real [0] = tv [0];
435 time_real [1] = tv [1] * 1000; 462 time_real [1] = tv [1] * 1000;
436#endif 463#endif
437} 464}
438 465
439ECB_INLINE void 466ecb_inline void
440coro_times_add (struct coro *c) 467coro_times_add (struct coro *c)
441{ 468{
442 c->t_real [1] += time_real [1]; 469 c->t_real [1] += time_real [1];
443 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 470 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
444 c->t_real [0] += time_real [0]; 471 c->t_real [0] += time_real [0];
… …
446 c->t_cpu [1] += time_cpu [1]; 473 c->t_cpu [1] += time_cpu [1];
447 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 474 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
448 c->t_cpu [0] += time_cpu [0]; 475 c->t_cpu [0] += time_cpu [0];
449} 476}
450 477
451ECB_INLINE void 478ecb_inline void
452coro_times_sub (struct coro *c) 479coro_times_sub (struct coro *c)
453{ 480{
454 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 481 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
455 c->t_real [1] -= time_real [1]; 482 c->t_real [1] -= time_real [1];
456 c->t_real [0] -= time_real [0]; 483 c->t_real [0] -= time_real [0];
… …
477 : 0) 504 : 0)
478 505
479#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 506#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
480#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 507#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
481 508
482ECB_INLINE MAGIC * 509ecb_inline MAGIC *
483SvSTATEhv_p (pTHX_ SV *coro) 510SvSTATEhv_p (pTHX_ SV *coro)
484{ 511{
485 MAGIC *mg; 512 MAGIC *mg;
486 513
487 if (ecb_expect_true ( 514 if (ecb_expect_true (
… …
492 return mg; 519 return mg;
493 520
494 return 0; 521 return 0;
495} 522}
496 523
497ECB_INLINE struct coro * 524ecb_inline struct coro *
498SvSTATE_ (pTHX_ SV *coro) 525SvSTATE_ (pTHX_ SV *coro_sv)
499{ 526{
500 MAGIC *mg; 527 MAGIC *mg;
501 528
502 if (SvROK (coro)) 529 if (SvROK (coro_sv))
503 coro = SvRV (coro); 530 coro_sv = SvRV (coro_sv);
504 531
505 mg = SvSTATEhv_p (aTHX_ coro); 532 mg = SvSTATEhv_p (aTHX_ coro_sv);
506 if (!mg) 533 if (!mg)
507 croak ("Coro::State object required"); 534 croak ("Coro::State object required");
508 535
509 return (struct coro *)mg->mg_ptr; 536 return (struct coro *)mg->mg_ptr;
510} 537}
… …
516#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 543#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
517 544
518/*****************************************************************************/ 545/*****************************************************************************/
519/* padlist management and caching */ 546/* padlist management and caching */
520 547
521ECB_INLINE AV * 548ecb_inline PADLIST *
522coro_derive_padlist (pTHX_ CV *cv) 549coro_derive_padlist (pTHX_ CV *cv)
523{ 550{
524 AV *padlist = CvPADLIST (cv); 551 PADLIST *padlist = CvPADLIST (cv);
525 AV *newpadlist, *newpad; 552 PADLIST *newpadlist;
553 PADNAMELIST *padnames;
554 PAD *newpad;
555 PADOFFSET off = PadlistMAX (padlist) + 1;
526 556
527 newpadlist = newAV (); 557#if NEWPADAPI
558
559 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
560 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
561 while (!PadlistARRAY (padlist)[off - 1])
562 --off;
563
564 Perl_pad_push (aTHX_ padlist, off);
565
566 newpad = PadlistARRAY (padlist)[off];
567 PadlistARRAY (padlist)[off] = 0;
568
569#else
570
571#if PERL_VERSION_ATLEAST (5,10,0)
572 Perl_pad_push (aTHX_ padlist, off);
573#else
574 Perl_pad_push (aTHX_ padlist, off, 1);
575#endif
576
577 newpad = PadlistARRAY (padlist)[off];
578 PadlistMAX (padlist) = off - 1;
579
580#endif
581
582 newPADLIST (newpadlist);
583#if !PERL_VERSION_ATLEAST(5,15,3)
584 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
528 AvREAL_off (newpadlist); 585 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 586#endif
534 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
535 --AvFILLp (padlist);
536 587
537 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 588 /* Already extended to 2 elements by newPADLIST. */
538 av_store (newpadlist, 1, (SV *)newpad); 589 PadlistMAX (newpadlist) = 1;
590
591 padnames = PadlistNAMES (padlist);
592 ++PadnamelistREFCNT (padnames);
593 PadlistNAMES (newpadlist) = padnames;
594
595 PadlistARRAY (newpadlist)[1] = newpad;
539 596
540 return newpadlist; 597 return newpadlist;
541} 598}
542 599
543ECB_INLINE void 600ecb_inline void
544free_padlist (pTHX_ AV *padlist) 601free_padlist (pTHX_ PADLIST *padlist)
545{ 602{
546 /* may be during global destruction */ 603 /* may be during global destruction */
547 if (!IN_DESTRUCT) 604 if (!IN_DESTRUCT)
548 { 605 {
549 I32 i = AvFILLp (padlist); 606 I32 i = PadlistMAX (padlist);
550 607
551 while (i > 0) /* special-case index 0 */ 608 while (i > 0) /* special-case index 0 */
552 { 609 {
553 /* we try to be extra-careful here */ 610 /* we try to be extra-careful here */
554 AV *av = (AV *)AvARRAY (padlist)[i--]; 611 PAD *pad = PadlistARRAY (padlist)[i--];
555 I32 j = AvFILLp (av);
556 612
613 if (pad)
614 {
615 I32 j = PadMAX (pad);
616
557 while (j >= 0) 617 while (j >= 0)
558 SvREFCNT_dec (AvARRAY (av)[j--]); 618 SvREFCNT_dec (PadARRAY (pad)[j--]);
559 619
560 AvFILLp (av) = -1; 620 PadMAX (pad) = -1;
561 SvREFCNT_dec (av); 621 SvREFCNT_dec (pad);
622 }
562 } 623 }
563 624
564 SvREFCNT_dec (AvARRAY (padlist)[0]); 625 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
565 626
627#if NEWPADAPI
628 Safefree (PadlistARRAY (padlist));
629 Safefree (padlist);
630#else
566 AvFILLp (padlist) = -1; 631 AvFILLp (padlist) = -1;
632 AvREAL_off (padlist);
567 SvREFCNT_dec ((SV*)padlist); 633 SvREFCNT_dec ((SV*)padlist);
634#endif
568 } 635 }
569} 636}
570 637
571static int 638static int
572coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 639coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
573{ 640{
574 AV *padlist; 641 PADLIST *padlist;
575 AV *av = (AV *)mg->mg_obj; 642 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
643 size_t len = *(size_t *)mg->mg_ptr;
576 644
577 /* perl manages to free our internal AV and _then_ call us */ 645 /* perl manages to free our internal AV and _then_ call us */
578 if (IN_DESTRUCT) 646 if (IN_DESTRUCT)
579 return 0; 647 return 0;
580 648
581 /* casting is fun. */ 649 while (len--)
582 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
583 free_padlist (aTHX_ padlist); 650 free_padlist (aTHX_ padlists[len]);
584
585 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
586 651
587 return 0; 652 return 0;
588} 653}
589 654
590static MGVTBL coro_cv_vtbl = { 655static MGVTBL coro_cv_vtbl = {
591 0, 0, 0, 0, 656 0, 0, 0, 0,
592 coro_cv_free 657 coro_cv_free
593}; 658};
594 659
595/* the next two functions merely cache the padlists */ 660/* the next two functions merely cache the padlists */
596ECB_INLINE void 661ecb_inline void
597get_padlist (pTHX_ CV *cv) 662get_padlist (pTHX_ CV *cv)
598{ 663{
599 MAGIC *mg = CORO_MAGIC_cv (cv); 664 MAGIC *mg = CORO_MAGIC_cv (cv);
600 AV *av; 665 size_t *lenp;
601 666
602 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 667 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
603 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 668 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
604 else 669 else
605 { 670 {
606#if CORO_PREFER_PERL_FUNCTIONS 671#if CORO_PREFER_PERL_FUNCTIONS
607 /* this is probably cleaner? but also slower! */ 672 /* this is probably cleaner? but also slower! */
608 /* in practise, it seems to be less stable */ 673 /* in practise, it seems to be less stable */
… …
614 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 679 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
615#endif 680#endif
616 } 681 }
617} 682}
618 683
619ECB_INLINE void 684ecb_inline void
620put_padlist (pTHX_ CV *cv) 685put_padlist (pTHX_ CV *cv)
621{ 686{
622 MAGIC *mg = CORO_MAGIC_cv (cv); 687 MAGIC *mg = CORO_MAGIC_cv (cv);
623 AV *av;
624 688
625 if (ecb_expect_false (!mg)) 689 if (ecb_expect_false (!mg))
690 {
626 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 691 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
692 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
693 mg->mg_len = 1; /* so mg_free frees mg_ptr */
694 }
695 else
696 Renew (mg->mg_ptr,
697 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
698 char);
627 699
628 av = (AV *)mg->mg_obj; 700 ((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} 701}
635 702
636/** load & save, init *******************************************************/ 703/** load & save, init *******************************************************/
637 704
705ecb_inline void
706swap_sv (SV *a, SV *b)
707{
708 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
709 SV tmp;
710
711 /* swap sv_any */
712 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
713
714 /* swap sv_flags */
715 SvFLAGS (&tmp) = SvFLAGS (a);
716 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
717 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
718
719#if PERL_VERSION_ATLEAST (5,10,0)
720 /* perl 5.10 and later complicates this _quite_ a bit, but it also
721 * is much faster, so no quarrels here. alternatively, we could
722 * sv_upgrade to avoid this.
723 */
724 {
725 /* swap sv_u */
726 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
727
728 /* if SvANY points to the head, we need to adjust the pointers,
729 * as the pointer for a still points to b, and maybe vice versa.
730 */
731 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
732 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
733 svany_in_head_set |= 1 << SVt_NV;
734 #endif
735
736 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
737
738 if (svany_in_head (SvTYPE (a)))
739 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
740
741 if (svany_in_head (SvTYPE (b)))
742 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
743 }
744#endif
745}
746
638/* swap sv heads, at least logically */ 747/* swap sv heads, at least logically */
639static void 748static void
640swap_svs (pTHX_ Coro__State c) 749swap_svs_enter (pTHX_ Coro__State c)
641{ 750{
642 int i; 751 int i;
643 752
644 for (i = 0; i <= AvFILLp (c->swap_sv); ) 753 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
645 { 754 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} 755}
684 756
757static void
758swap_svs_leave (pTHX_ Coro__State c)
759{
760 int i;
761
762 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
763 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
764}
765
685#define SWAP_SVS(coro) \ 766#define SWAP_SVS_ENTER(coro) \
686 if (ecb_expect_false ((coro)->swap_sv)) \ 767 if (ecb_expect_false ((coro)->swap_sv)) \
687 swap_svs (aTHX_ (coro)) 768 swap_svs_enter (aTHX_ (coro))
769
770#define SWAP_SVS_LEAVE(coro) \
771 if (ecb_expect_false ((coro)->swap_sv)) \
772 swap_svs_leave (aTHX_ (coro))
688 773
689static void 774static void
690on_enterleave_call (pTHX_ SV *cb); 775on_enterleave_call (pTHX_ SV *cb);
691 776
692static void 777static void
… …
699 784
700#if CORO_JIT 785#if CORO_JIT
701 load_perl_slots (slot); 786 load_perl_slots (slot);
702#else 787#else
703 #define VARx(name,expr,type) expr = slot->name; 788 #define VARx(name,expr,type) expr = slot->name;
704 # include "state.h" 789 #include "state.h"
705 #undef VARx
706#endif 790#endif
707 791
708 { 792 {
709 dSP; 793 dSP;
710 794
… …
713 /* now do the ugly restore mess */ 797 /* now do the ugly restore mess */
714 while (ecb_expect_true (cv = (CV *)POPs)) 798 while (ecb_expect_true (cv = (CV *)POPs))
715 { 799 {
716 put_padlist (aTHX_ cv); /* mark this padlist as available */ 800 put_padlist (aTHX_ cv); /* mark this padlist as available */
717 CvDEPTH (cv) = PTR2IV (POPs); 801 CvDEPTH (cv) = PTR2IV (POPs);
718 CvPADLIST (cv) = (AV *)POPs; 802 CvPADLIST (cv) = (PADLIST *)POPs;
719 } 803 }
720 804
721 PUTBACK; 805 PUTBACK;
722 } 806 }
723 807
… …
738 822
739 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 823 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
740 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 824 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
741 } 825 }
742 826
827 if (ecb_expect_false (c->on_enter_xs))
828 {
829 int i;
830
831 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
832 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
833 }
834
743 SWAP_SVS (c); 835 SWAP_SVS_ENTER (c);
744} 836}
745 837
746static void 838static void
747save_perl (pTHX_ Coro__State c) 839save_perl (pTHX_ Coro__State c)
748{ 840{
749 SWAP_SVS (c); 841 SWAP_SVS_LEAVE (c);
842
843 if (ecb_expect_false (c->on_leave_xs))
844 {
845 int i;
846
847 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
848 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
849 }
750 850
751 if (ecb_expect_false (c->on_leave)) 851 if (ecb_expect_false (c->on_leave))
752 { 852 {
753 int i; 853 int i;
754 854
… …
813 913
814 PUTBACK; 914 PUTBACK;
815 } 915 }
816 916
817 /* allocate some space on the context stack for our purposes */ 917 /* allocate some space on the context stack for our purposes */
818 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 918 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
819 { 919 {
820 unsigned int i; 920 unsigned int i;
821 921
822 for (i = 0; i < SLOT_COUNT; ++i) 922 for (i = 0; i < SLOT_COUNT; ++i)
823 CXINC; 923 CXINC;
… …
832 932
833#if CORO_JIT 933#if CORO_JIT
834 save_perl_slots (slot); 934 save_perl_slots (slot);
835#else 935#else
836 #define VARx(name,expr,type) slot->name = expr; 936 #define VARx(name,expr,type) slot->name = expr;
837 # include "state.h" 937 #include "state.h"
838 #undef VARx
839#endif 938#endif
840 } 939 }
841} 940}
842 941
843/* 942/*
… …
875#endif 974#endif
876 975
877 New(54,PL_scopestack,8,I32); 976 New(54,PL_scopestack,8,I32);
878 PL_scopestack_ix = 0; 977 PL_scopestack_ix = 0;
879 PL_scopestack_max = 8; 978 PL_scopestack_max = 8;
979#if HAS_SCOPESTACK_NAME
980 New(54,PL_scopestack_name,8,const char*);
981#endif
880 982
881 New(54,PL_savestack,24,ANY); 983 New(54,PL_savestack,24,ANY);
882 PL_savestack_ix = 0; 984 PL_savestack_ix = 0;
883 PL_savestack_max = 24; 985 PL_savestack_max = 24;
986#if PERL_VERSION_ATLEAST (5,24,0)
987 /* perl 5.24 moves SS_MAXPUSH optimisation from */
988 /* the header macros to PL_savestack_max */
989 PL_savestack_max -= SS_MAXPUSH;
990#endif
884 991
885#if !PERL_VERSION_ATLEAST (5,10,0) 992#if !PERL_VERSION_ATLEAST (5,10,0)
886 New(54,PL_retstack,4,OP*); 993 New(54,PL_retstack,4,OP*);
887 PL_retstack_ix = 0; 994 PL_retstack_ix = 0;
888 PL_retstack_max = 4; 995 PL_retstack_max = 4;
… …
912 } 1019 }
913 1020
914 Safefree (PL_tmps_stack); 1021 Safefree (PL_tmps_stack);
915 Safefree (PL_markstack); 1022 Safefree (PL_markstack);
916 Safefree (PL_scopestack); 1023 Safefree (PL_scopestack);
1024#if HAS_SCOPESTACK_NAME
1025 Safefree (PL_scopestack_name);
1026#endif
917 Safefree (PL_savestack); 1027 Safefree (PL_savestack);
918#if !PERL_VERSION_ATLEAST (5,10,0) 1028#if !PERL_VERSION_ATLEAST (5,10,0)
919 Safefree (PL_retstack); 1029 Safefree (PL_retstack);
920#endif 1030#endif
921} 1031}
… …
951 } 1061 }
952 1062
953 return rss; 1063 return rss;
954} 1064}
955 1065
956/** coroutine stack handling ************************************************/ 1066/** 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 1067
962/* apparently < 5.8.8 */ 1068/* apparently < 5.8.8 */
963#ifndef MgPV_nolen_const 1069#ifndef MgPV_nolen_const
964#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1070#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
965 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1071 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
966 (const char*)(mg)->mg_ptr) 1072 (const char*)(mg)->mg_ptr)
967#endif 1073#endif
1074
1075/* this will be a patched copy of PL_vtbl_sigelem */
1076static MGVTBL coro_sigelem_vtbl;
1077
1078static int ecb_cold
1079coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1080{
1081 char *key = SvPV_nolen ((SV *)name);
1082
1083 /* do what mg_copy normally does */
1084 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1085 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1086
1087 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1088 if (*key == '_'
1089 && (strEQ (key, "__DIE__")
1090 || strEQ (key, "__WARN__")))
1091 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1092
1093 return 1;
1094}
1095
1096/* perl does not have a %SIG vtbl, we provide one so we can override */
1097/* the magic vtbl for the __DIE__ and __WARN__ members */
1098static const MGVTBL coro_sig_vtbl = {
1099 0, 0, 0, 0, 0,
1100 coro_sig_copy
1101};
968 1102
969/* 1103/*
970 * This overrides the default magic get method of %SIG elements. 1104 * 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 1105 * 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), 1106 * and instead of trying to save and restore the hash elements (extremely slow),
… …
974 */ 1108 */
975static int ecb_cold 1109static int ecb_cold
976coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1110coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
977{ 1111{
978 const char *s = MgPV_nolen_const (mg); 1112 const char *s = MgPV_nolen_const (mg);
1113 /* the key must be either __DIE__ or __WARN__ here */
1114 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
979 1115
980 if (*s == '_') 1116 SV *ssv;
981 {
982 SV **svp = 0;
983 1117
984 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
985 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
986
987 if (svp) 1118 if (!*svp)
988 { 1119 ssv = &PL_sv_undef;
989 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1120 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
990 return 0; 1121 ssv = sv_2mortal (newRV_inc (*svp));
991 } 1122 else
992 } 1123 ssv = *svp;
993 1124
994 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1125 sv_setsv (sv, ssv);
1126 return 0;
995} 1127}
996 1128
997static int ecb_cold 1129static int ecb_cold
998coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
999{ 1131{
1000 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;
1001 1135
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; 1136 SV *old = *svp;
1012 *svp = 0; 1137 *svp = 0;
1013 SvREFCNT_dec (old); 1138 SvREFCNT_dec (old);
1014 return 0; 1139 return 0;
1015 }
1016 }
1017
1018 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1019} 1140}
1020 1141
1021static int ecb_cold 1142static int ecb_cold
1022coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1143coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1023{ 1144{
1024 const char *s = MgPV_nolen_const (mg); 1145 const char *s = MgPV_nolen_const (mg);
1146 /* the key must be either __DIE__ or __WARN__ here */
1147 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1025 1148
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; 1149 SV *old = *svp;
1036 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1150 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1037 SvREFCNT_dec (old); 1151 SvREFCNT_dec (old);
1038 return 0; 1152 return 0;
1039 }
1040 }
1041
1042 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1043} 1153}
1044 1154
1045static void 1155static void
1046prepare_nop (pTHX_ struct coro_transfer_args *ta) 1156prepare_nop (pTHX_ struct coro_transfer_args *ta)
1047{ 1157{
… …
1058static int 1168static int
1059slf_check_repeat (pTHX_ struct CoroSLF *frame) 1169slf_check_repeat (pTHX_ struct CoroSLF *frame)
1060{ 1170{
1061 return 1; 1171 return 1;
1062} 1172}
1173
1174/** coroutine stack handling ************************************************/
1063 1175
1064static UNOP init_perl_op; 1176static UNOP init_perl_op;
1065 1177
1066ecb_noinline static void /* noinline to keep it out of the transfer fast path */ 1178ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1067init_perl (pTHX_ struct coro *coro) 1179init_perl (pTHX_ struct coro *coro)
… …
1088 PL_hints = 0; 1200 PL_hints = 0;
1089 1201
1090 /* recreate the die/warn hooks */ 1202 /* recreate the die/warn hooks */
1091 PL_diehook = SvREFCNT_inc (rv_diehook); 1203 PL_diehook = SvREFCNT_inc (rv_diehook);
1092 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1204 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1093 1205
1094 GvSV (PL_defgv) = newSV (0); 1206 GvSV (PL_defgv) = newSV (0);
1095 GvAV (PL_defgv) = coro->args; coro->args = 0; 1207 GvAV (PL_defgv) = coro->args; coro->args = 0;
1096 GvSV (PL_errgv) = newSV (0); 1208 GvSV (PL_errgv) = newSV (0);
1097 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1209 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1098 GvHV (PL_hintgv) = 0; 1210 GvHV (PL_hintgv) = newHV ();
1211#if PERL_VERSION_ATLEAST (5,10,0)
1212 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1213#endif
1099 PL_rs = newSVsv (GvSV (irsgv)); 1214 PL_rs = newSVsv (GvSV (irsgv));
1100 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1215 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1101 1216
1102 { 1217 {
1103 dSP; 1218 dSP;
… …
1131 PL_op = (OP *)&init_perl_op; 1246 PL_op = (OP *)&init_perl_op;
1132 1247
1133 /* copy throw, in case it was set before init_perl */ 1248 /* copy throw, in case it was set before init_perl */
1134 CORO_THROW = coro->except; 1249 CORO_THROW = coro->except;
1135 1250
1136 SWAP_SVS (coro); 1251 SWAP_SVS_ENTER (coro);
1137 1252
1138 if (ecb_expect_false (enable_times)) 1253 if (ecb_expect_false (enable_times))
1139 { 1254 {
1140 coro_times_update (); 1255 coro_times_update ();
1141 coro_times_sub (coro); 1256 coro_times_sub (coro);
… …
1179 /* this will cause transfer_check to croak on block*/ 1294 /* this will cause transfer_check to croak on block*/
1180 SvRV_set (coro_current, (SV *)coro->hv); 1295 SvRV_set (coro_current, (SV *)coro->hv);
1181 1296
1182 load_perl (aTHX_ coro); 1297 load_perl (aTHX_ coro);
1183 1298
1299 /* restore swapped sv's */
1300 SWAP_SVS_LEAVE (coro);
1301
1184 coro_unwind_stacks (aTHX); 1302 coro_unwind_stacks (aTHX);
1185 1303
1186 /* restore swapped sv's */
1187 SWAP_SVS (coro);
1188
1189 coro_destruct_stacks (aTHX); 1304 coro_destruct_stacks (aTHX);
1190 1305
1191 // now save some sv's to be free'd later 1306 /* now save some sv's to be free'd later */
1192 svf [0] = GvSV (PL_defgv); 1307 svf [0] = GvSV (PL_defgv);
1193 svf [1] = (SV *)GvAV (PL_defgv); 1308 svf [1] = (SV *)GvAV (PL_defgv);
1194 svf [2] = GvSV (PL_errgv); 1309 svf [2] = GvSV (PL_errgv);
1195 svf [3] = (SV *)PL_defoutgv; 1310 svf [3] = (SV *)PL_defoutgv;
1196 svf [4] = PL_rs; 1311 svf [4] = PL_rs;
… …
1213 1328
1214 SvREFCNT_dec (coro->saved_deffh); 1329 SvREFCNT_dec (coro->saved_deffh);
1215 SvREFCNT_dec (coro->rouse_cb); 1330 SvREFCNT_dec (coro->rouse_cb);
1216 SvREFCNT_dec (coro->invoke_cb); 1331 SvREFCNT_dec (coro->invoke_cb);
1217 SvREFCNT_dec (coro->invoke_av); 1332 SvREFCNT_dec (coro->invoke_av);
1333 SvREFCNT_dec (coro->on_enter_xs);
1334 SvREFCNT_dec (coro->on_leave_xs);
1218 } 1335 }
1219} 1336}
1220 1337
1221ECB_INLINE void 1338ecb_inline void
1222free_coro_mortal (pTHX) 1339free_coro_mortal (pTHX)
1223{ 1340{
1224 if (ecb_expect_true (coro_mortal)) 1341 if (ecb_expect_true (coro_mortal))
1225 { 1342 {
1226 SvREFCNT_dec ((SV *)coro_mortal); 1343 SvREFCNT_dec ((SV *)coro_mortal);
… …
1285 1402
1286 if (PL_curcop != &PL_compiling) 1403 if (PL_curcop != &PL_compiling)
1287 { 1404 {
1288 SV **cb; 1405 SV **cb;
1289 1406
1290 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1407 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1291 { 1408 {
1292 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1409 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1293 1410
1294 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1411 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1295 { 1412 {
… …
1305 SAVETMPS; 1422 SAVETMPS;
1306 EXTEND (SP, 3); 1423 EXTEND (SP, 3);
1307 PUSHMARK (SP); 1424 PUSHMARK (SP);
1308 PUSHs (&PL_sv_yes); 1425 PUSHs (&PL_sv_yes);
1309 PUSHs (fullname); 1426 PUSHs (fullname);
1310 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1427 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (SUB_ARGARRAY)) : &PL_sv_undef);
1311 PUTBACK; 1428 PUTBACK;
1312 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1429 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1313 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1430 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1314 SPAGAIN; 1431 SPAGAIN;
1315 FREETMPS; 1432 FREETMPS;
… …
1385 slf_frame.prepare = slf_prepare_set_stacklevel; 1502 slf_frame.prepare = slf_prepare_set_stacklevel;
1386 slf_frame.check = slf_check_set_stacklevel; 1503 slf_frame.check = slf_check_set_stacklevel;
1387} 1504}
1388 1505
1389/* the tail of transfer: execute stuff we can only do after a transfer */ 1506/* the tail of transfer: execute stuff we can only do after a transfer */
1390ECB_INLINE void 1507ecb_inline void
1391transfer_tail (pTHX) 1508transfer_tail (pTHX)
1392{ 1509{
1393 free_coro_mortal (aTHX); 1510 free_coro_mortal (aTHX);
1511}
1512
1513/* try to exit the same way perl's main function would do */
1514/* we do not bother resetting the environment or other things *7
1515/* that are not, uhm, essential */
1516/* this obviously also doesn't work when perl is embedded */
1517static void ecb_noinline ecb_cold
1518perlish_exit (pTHX)
1519{
1520 int exitstatus = perl_destruct (PL_curinterp);
1521 perl_free (PL_curinterp);
1522 exit (exitstatus);
1394} 1523}
1395 1524
1396/* 1525/*
1397 * this is a _very_ stripped down perl interpreter ;) 1526 * this is a _very_ stripped down perl interpreter ;)
1398 */ 1527 */
… …
1425 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1554 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1426 * runtime errors here, as this is just a random interpreter, not a thread. 1555 * runtime errors here, as this is just a random interpreter, not a thread.
1427 */ 1556 */
1428 1557
1429 /* 1558 /*
1559 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1560 * requires PL_scopestack_ix, so do it here if required.
1561 */
1562 if (!PL_scopestack_ix)
1563 ENTER;
1564
1565 /*
1430 * If perl-run returns we assume exit() was being called or the coro 1566 * If perl-run returns we assume exit() was being called or the coro
1431 * fell off the end, which seems to be the only valid (non-bug) 1567 * fell off the end, which seems to be the only valid (non-bug)
1432 * reason for perl_run to return. We try to exit by jumping to the 1568 * reason for perl_run to return. We try to mimic whatever perl is normally
1433 * bootstrap-time "top" top_env, as we cannot restore the "main" 1569 * 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 */ 1570 */
1438 PL_top_env = main_top_env; 1571 perlish_exit (aTHX);
1439 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1440 } 1572 }
1441} 1573}
1442 1574
1443static coro_cctx * 1575static coro_cctx *
1444cctx_new () 1576cctx_new (void)
1445{ 1577{
1446 coro_cctx *cctx; 1578 coro_cctx *cctx;
1447 1579
1448 ++cctx_count; 1580 ++cctx_count;
1449 New (0, cctx, 1, coro_cctx); 1581 New (0, cctx, 1, coro_cctx);
… …
1455 return cctx; 1587 return cctx;
1456} 1588}
1457 1589
1458/* create a new cctx only suitable as source */ 1590/* create a new cctx only suitable as source */
1459static coro_cctx * 1591static coro_cctx *
1460cctx_new_empty () 1592cctx_new_empty (void)
1461{ 1593{
1462 coro_cctx *cctx = cctx_new (); 1594 coro_cctx *cctx = cctx_new ();
1463 1595
1464 cctx->sptr = 0; 1596 cctx->stack.sptr = 0;
1465 coro_create (&cctx->cctx, 0, 0, 0, 0); 1597 coro_create (&cctx->cctx, 0, 0, 0, 0);
1466 1598
1467 return cctx; 1599 return cctx;
1468} 1600}
1469 1601
1470/* create a new cctx suitable as destination/running a perl interpreter */ 1602/* create a new cctx suitable as destination/running a perl interpreter */
1471static coro_cctx * 1603static coro_cctx *
1472cctx_new_run () 1604cctx_new_run (void)
1473{ 1605{
1474 coro_cctx *cctx = cctx_new (); 1606 coro_cctx *cctx = cctx_new ();
1475 void *stack_start;
1476 size_t stack_size;
1477 1607
1478#if HAVE_MMAP 1608 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 } 1609 {
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."); 1610 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1501 _exit (EXIT_FAILURE); 1611 _exit (EXIT_FAILURE);
1502 }
1503
1504 stack_start = cctx->sptr;
1505 stack_size = cctx->ssize;
1506 } 1612 }
1507 1613
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); 1614 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1513 1615
1514 return cctx; 1616 return cctx;
1515} 1617}
1516 1618
1517static void 1619static void
… …
1523 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1625 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1524 1626
1525 --cctx_count; 1627 --cctx_count;
1526 coro_destroy (&cctx->cctx); 1628 coro_destroy (&cctx->cctx);
1527 1629
1528 /* coro_transfer creates new, empty cctx's */ 1630 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 1631
1543 Safefree (cctx); 1632 Safefree (cctx);
1544} 1633}
1545 1634
1546/* wether this cctx should be destructed */ 1635/* wether this cctx should be destructed */
… …
1565} 1654}
1566 1655
1567static void 1656static void
1568cctx_put (coro_cctx *cctx) 1657cctx_put (coro_cctx *cctx)
1569{ 1658{
1570 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1659 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1571 1660
1572 /* free another cctx if overlimit */ 1661 /* free another cctx if overlimit */
1573 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1662 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1574 { 1663 {
1575 coro_cctx *first = cctx_first; 1664 coro_cctx *first = cctx_first;
… …
1701 return; 1790 return;
1702 1791
1703 slf_destroy (aTHX_ coro); 1792 slf_destroy (aTHX_ coro);
1704 1793
1705 coro->flags |= CF_ZOMBIE; 1794 coro->flags |= CF_ZOMBIE;
1706 1795
1707 if (coro->flags & CF_READY) 1796 if (coro->flags & CF_READY)
1708 { 1797 {
1709 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1798 /* reduce nready, as destroying a ready coro effectively unreadies it */
1710 /* alternative: look through all ready queues and remove the coro */ 1799 /* alternative: look through all ready queues and remove the coro */
1711 --coro_nready; 1800 --coro_nready;
… …
1788 TRANSFER (ta, 1); 1877 TRANSFER (ta, 1);
1789} 1878}
1790 1879
1791/** Coro ********************************************************************/ 1880/** Coro ********************************************************************/
1792 1881
1793ECB_INLINE void 1882ecb_inline void
1794coro_enq (pTHX_ struct coro *coro) 1883coro_enq (pTHX_ struct coro *coro)
1795{ 1884{
1796 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1885 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1797 1886
1798 SvREFCNT_inc_NN (coro->hv); 1887 SvREFCNT_inc_NN (coro->hv);
… …
1800 coro->next_ready = 0; 1889 coro->next_ready = 0;
1801 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1890 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1802 ready [1] = coro; 1891 ready [1] = coro;
1803} 1892}
1804 1893
1805ECB_INLINE struct coro * 1894ecb_inline struct coro *
1806coro_deq (pTHX) 1895coro_deq (pTHX)
1807{ 1896{
1808 int prio; 1897 int prio;
1809 1898
1810 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1899 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1863{ 1952{
1864 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1953 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1865} 1954}
1866 1955
1867/* expects to own a reference to next->hv */ 1956/* expects to own a reference to next->hv */
1868ECB_INLINE void 1957ecb_inline void
1869prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1958prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1870{ 1959{
1871 SV *prev_sv = SvRV (coro_current); 1960 SV *prev_sv = SvRV (coro_current);
1872 1961
1873 ta->prev = SvSTATE_hv (prev_sv); 1962 ta->prev = SvSTATE_hv (prev_sv);
… …
1907 /* nothing to schedule: call the idle handler */ 1996 /* nothing to schedule: call the idle handler */
1908 if (SvROK (sv_idle) 1997 if (SvROK (sv_idle)
1909 && SvOBJECT (SvRV (sv_idle))) 1998 && SvOBJECT (SvRV (sv_idle)))
1910 { 1999 {
1911 if (SvRV (sv_idle) == SvRV (coro_current)) 2000 if (SvRV (sv_idle) == SvRV (coro_current))
2001 {
2002 require_pv ("Carp");
2003
2004 {
2005 dSP;
2006
2007 ENTER;
2008 SAVETMPS;
2009
2010 PUSHMARK (SP);
1912 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2011 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2012 PUTBACK;
2013 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2014
2015 FREETMPS;
2016 LEAVE;
2017 }
2018 }
1913 2019
1914 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2020 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1915 api_ready (aTHX_ SvRV (sv_idle)); 2021 api_ready (aTHX_ SvRV (sv_idle));
1916 --coro_nready; 2022 --coro_nready;
1917 } 2023 }
… …
1932 } 2038 }
1933 } 2039 }
1934 } 2040 }
1935} 2041}
1936 2042
1937ECB_INLINE void 2043ecb_inline void
1938prepare_cede (pTHX_ struct coro_transfer_args *ta) 2044prepare_cede (pTHX_ struct coro_transfer_args *ta)
1939{ 2045{
1940 api_ready (aTHX_ coro_current); 2046 api_ready (aTHX_ coro_current);
1941 prepare_schedule (aTHX_ ta); 2047 prepare_schedule (aTHX_ ta);
1942} 2048}
1943 2049
1944ECB_INLINE void 2050ecb_inline void
1945prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2051prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1946{ 2052{
1947 SV *prev = SvRV (coro_current); 2053 SV *prev = SvRV (coro_current);
1948 2054
1949 if (coro_nready) 2055 if (coro_nready)
… …
2114{ 2220{
2115 AV *od = coro->on_destroy; 2221 AV *od = coro->on_destroy;
2116 2222
2117 if (!od) 2223 if (!od)
2118 return; 2224 return;
2225
2226 coro->on_destroy = 0;
2227 sv_2mortal ((SV *)od);
2119 2228
2120 while (AvFILLp (od) >= 0) 2229 while (AvFILLp (od) >= 0)
2121 { 2230 {
2122 SV *cb = sv_2mortal (av_pop (od)); 2231 SV *cb = sv_2mortal (av_pop (od));
2123 2232
… …
2144 2253
2145static void 2254static void
2146coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2255coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2147{ 2256{
2148 AV *av; 2257 AV *av;
2149 2258
2150 if (coro->status) 2259 if (coro->status)
2151 { 2260 {
2152 av = coro->status; 2261 av = coro->status;
2153 av_clear (av); 2262 av_clear (av);
2154 } 2263 }
… …
2201 2310
2202 coro = SvSTATE (arg [0]); 2311 coro = SvSTATE (arg [0]);
2203 coro_hv = coro->hv; 2312 coro_hv = coro->hv;
2204 2313
2205 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2314 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2206 2315
2207 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2316 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2208 { 2317 {
2209 /* coro currently busy cancelling something, so just notify it */ 2318 /* coro currently busy cancelling something, so just notify it */
2210 coro->slf_frame.data = (void *)coro; 2319 coro->slf_frame.data = (void *)coro;
2211 2320
… …
2218 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2327 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2219 } 2328 }
2220 else 2329 else
2221 { 2330 {
2222 struct coro *self = SvSTATE_current; 2331 struct coro *self = SvSTATE_current;
2332
2333 if (!self)
2334 croak ("Coro::cancel called outside of thread content,");
2223 2335
2224 /* otherwise we cancel directly, purely for speed reasons 2336 /* otherwise we cancel directly, purely for speed reasons
2225 * unfortunately, this requires some magic trickery, as 2337 * unfortunately, this requires some magic trickery, as
2226 * somebody else could cancel us, so we have to fight the cancellation. 2338 * somebody else could cancel us, so we have to fight the cancellation.
2227 * this is ugly, and hopefully fully worth the extra speed. 2339 * this is ugly, and hopefully fully worth the extra speed.
… …
2337 else 2449 else
2338 { 2450 {
2339 av_clear (GvAV (PL_defgv)); 2451 av_clear (GvAV (PL_defgv));
2340 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2452 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2341 2453
2454 if (ecb_expect_false (coro->swap_sv))
2455 {
2456 SWAP_SVS_LEAVE (coro);
2457 SvREFCNT_dec_NN (coro->swap_sv);
2458 coro->swap_sv = 0;
2459 }
2460
2342 coro->prio = 0; 2461 coro->prio = 0;
2343 2462
2344 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2463 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2345 api_trace (aTHX_ coro_current, 0); 2464 api_trace (aTHX_ coro_current, 0);
2346 2465
2347 frame->prepare = prepare_schedule; 2466 frame->prepare = prepare_schedule;
2348 av_push (av_async_pool, SvREFCNT_inc (hv)); 2467 av_push (av_async_pool, SvREFCNT_inc (hv));
2349 } 2468 }
… …
2390 2509
2391static int 2510static int
2392slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2511slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2393{ 2512{
2394 SV *data = (SV *)frame->data; 2513 SV *data = (SV *)frame->data;
2395 2514
2396 if (CORO_THROW) 2515 if (CORO_THROW)
2397 return 0; 2516 return 0;
2398 2517
2399 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2518 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2400 return 1; 2519 return 1;
… …
2436 cb = sv_2mortal (coro->rouse_cb); 2555 cb = sv_2mortal (coro->rouse_cb);
2437 coro->rouse_cb = 0; 2556 coro->rouse_cb = 0;
2438 } 2557 }
2439 2558
2440 if (!SvROK (cb) 2559 if (!SvROK (cb)
2441 || SvTYPE (SvRV (cb)) != SVt_PVCV 2560 || SvTYPE (SvRV (cb)) != SVt_PVCV
2442 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2561 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2443 croak ("Coro::rouse_wait called with illegal callback argument,"); 2562 croak ("Coro::rouse_wait called with illegal callback argument,");
2444 2563
2445 { 2564 {
2446 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2565 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2569 2688
2570/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2689/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2571static void 2690static void
2572slf_destroy (pTHX_ struct coro *coro) 2691slf_destroy (pTHX_ struct coro *coro)
2573{ 2692{
2574 /* this callback is reserved for slf functions needing to do cleanup */ 2693 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 2694
2578 /* 2695 /*
2579 * The on_destroy above most likely is from an SLF call. 2696 * The on_destroy below most likely is from an SLF call.
2580 * Since by definition the SLF call will not finish when we destroy 2697 * Since by definition the SLF call will not finish when we destroy
2581 * the coro, we will have to force-finish it here, otherwise 2698 * the coro, we will have to force-finish it here, otherwise
2582 * cleanup functions cannot call SLF functions. 2699 * cleanup functions cannot call SLF functions.
2583 */ 2700 */
2584 coro->slf_frame.prepare = 0; 2701 coro->slf_frame.prepare = 0;
2702
2703 /* this callback is reserved for slf functions needing to do cleanup */
2704 if (frame.destroy && frame.prepare && !PL_dirty)
2705 frame.destroy (aTHX_ &frame);
2585} 2706}
2586 2707
2587/* 2708/*
2588 * these not obviously related functions are all rolled into one 2709 * these not obviously related functions are all rolled into one
2589 * function to increase chances that they all will call transfer with the same 2710 * function to increase chances that they all will call transfer with the same
… …
2772static void 2893static void
2773coro_pop_on_leave (pTHX_ void *coro) 2894coro_pop_on_leave (pTHX_ void *coro)
2774{ 2895{
2775 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2896 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2776 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2897 on_enterleave_call (aTHX_ sv_2mortal (cb));
2898}
2899
2900static void
2901enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2902{
2903 if (!hook)
2904 return;
2905
2906 if (!*avp)
2907 {
2908 *avp = newAV ();
2909 AvREAL_off (*avp);
2910 }
2911
2912 av_push (*avp, (SV *)hook);
2913 av_push (*avp, (SV *)arg);
2914}
2915
2916static void
2917enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2918{
2919 AV *av = *avp;
2920 int i;
2921
2922 if (!av)
2923 return;
2924
2925 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2926 if (AvARRAY (av)[i] == (SV *)hook)
2927 {
2928 if (execute)
2929 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2930
2931 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2932 av_pop (av);
2933 av_pop (av);
2934 break;
2935 }
2936
2937 if (AvFILLp (av) >= 0)
2938 {
2939 *avp = 0;
2940 SvREFCNT_dec_NN (av);
2941 }
2942}
2943
2944static void
2945api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2946{
2947 struct coro *coro = SvSTATE (coro_sv);
2948
2949 if (SvSTATE_current == coro)
2950 if (enter)
2951 enter (aTHX_ enter_arg);
2952
2953 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2954 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2955}
2956
2957static void
2958api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2959{
2960 struct coro *coro = SvSTATE (coro_sv);
2961
2962 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2963 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2964}
2965
2966static void
2967savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2968{
2969 struct coro *coro = SvSTATE_current;
2970
2971 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2972}
2973
2974static void
2975savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2976{
2977 struct coro *coro = SvSTATE_current;
2978
2979 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2980}
2981
2982static void
2983api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2984{
2985 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2986
2987 /* this ought to be much cheaper than malloc + a single destructor call */
2988 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2989 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2777} 2990}
2778 2991
2779/*****************************************************************************/ 2992/*****************************************************************************/
2780/* PerlIO::cede */ 2993/* PerlIO::cede */
2781 2994
… …
2911 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3124 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2912 PUTBACK; 3125 PUTBACK;
2913 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3126 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2914 } 3127 }
2915 3128
2916 SvREFCNT_dec (cb); 3129 SvREFCNT_dec_NN (cb);
2917 } 3130 }
2918} 3131}
2919 3132
2920static void 3133static void
2921coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3134coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
2929{ 3142{
2930 AV *av = (AV *)frame->data; 3143 AV *av = (AV *)frame->data;
2931 SV *count_sv = AvARRAY (av)[0]; 3144 SV *count_sv = AvARRAY (av)[0];
2932 SV *coro_hv = SvRV (coro_current); 3145 SV *coro_hv = SvRV (coro_current);
2933 3146
3147 frame->destroy = 0;
3148
2934 /* if we are about to throw, don't actually acquire the lock, just throw */ 3149 /* if we are about to throw, don't actually acquire the lock, just throw */
2935 if (CORO_THROW) 3150 if (ecb_expect_false (CORO_THROW))
3151 {
3152 /* we still might be responsible for the semaphore, so wake up others */
3153 coro_semaphore_adjust (aTHX_ av, 0);
3154
2936 return 0; 3155 return 0;
3156 }
2937 else if (SvIVX (count_sv) > 0) 3157 else if (SvIVX (count_sv) > 0)
2938 { 3158 {
2939 frame->destroy = 0;
2940
2941 if (acquire) 3159 if (acquire)
2942 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3160 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2943 else 3161 else
2944 coro_semaphore_adjust (aTHX_ av, 0); 3162 coro_semaphore_adjust (aTHX_ av, 0);
2945 3163
… …
2949 { 3167 {
2950 int i; 3168 int i;
2951 /* if we were woken up but can't down, we look through the whole */ 3169 /* if we were woken up but can't down, we look through the whole */
2952 /* waiters list and only add us if we aren't in there already */ 3170 /* waiters list and only add us if we aren't in there already */
2953 /* this avoids some degenerate memory usage cases */ 3171 /* this avoids some degenerate memory usage cases */
2954 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 3172 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2955 if (AvARRAY (av)[i] == coro_hv) 3173 if (AvARRAY (av)[i] == coro_hv)
2956 return 1; 3174 return 1;
2957 3175
2958 av_push (av, SvREFCNT_inc (coro_hv)); 3176 av_push (av, SvREFCNT_inc (coro_hv));
2959 return 1; 3177 return 1;
… …
3056 { 3274 {
3057 api_ready (aTHX_ cb); 3275 api_ready (aTHX_ cb);
3058 sv_setiv (cb, 0); /* signal waiter */ 3276 sv_setiv (cb, 0); /* signal waiter */
3059 } 3277 }
3060 3278
3061 SvREFCNT_dec (cb); 3279 SvREFCNT_dec_NN (cb);
3062 3280
3063 --count; 3281 --count;
3064 } 3282 }
3065} 3283}
3066 3284
… …
3151 } 3369 }
3152 3370
3153 av_push (state, data_sv); 3371 av_push (state, data_sv);
3154 3372
3155 api_ready (aTHX_ coro); 3373 api_ready (aTHX_ coro);
3156 SvREFCNT_dec (coro); 3374 SvREFCNT_dec_NN (coro);
3157 SvREFCNT_dec ((AV *)state); 3375 SvREFCNT_dec_NN ((AV *)state);
3158} 3376}
3159 3377
3160static int 3378static int
3161slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3379slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3162{ 3380{
… …
3167 /* it quickly returns */ 3385 /* it quickly returns */
3168 if (CORO_THROW) 3386 if (CORO_THROW)
3169 return 0; 3387 return 0;
3170 3388
3171 /* one element that is an RV? repeat! */ 3389 /* one element that is an RV? repeat! */
3172 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3390 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3173 return 1; 3391 return 1;
3174 3392
3175 /* restore status */ 3393 /* restore status */
3176 { 3394 {
3177 SV *data_sv = av_pop (state); 3395 SV *data_sv = av_pop (state);
… …
3180 errno = data->errorno; 3398 errno = data->errorno;
3181 PL_laststype = data->laststype; 3399 PL_laststype = data->laststype;
3182 PL_laststatval = data->laststatval; 3400 PL_laststatval = data->laststatval;
3183 PL_statcache = data->statcache; 3401 PL_statcache = data->statcache;
3184 3402
3185 SvREFCNT_dec (data_sv); 3403 SvREFCNT_dec_NN (data_sv);
3186 } 3404 }
3187 3405
3188 /* push result values */ 3406 /* push result values */
3189 { 3407 {
3190 dSP; 3408 dSP;
… …
3339#endif 3557#endif
3340 3558
3341#if CORO_JIT 3559#if CORO_JIT
3342 3560
3343static void ecb_noinline ecb_cold 3561static void ecb_noinline ecb_cold
3344pushav_3uv (pTHX_ UV a, UV b, UV c) 3562pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3345{ 3563{
3346 dSP; 3564 dSP;
3347 AV *av = newAV (); 3565 AV *av = newAV ();
3348 3566
3567 av_store (av, 3, newSVuv (d));
3349 av_store (av, 2, newSVuv (c)); 3568 av_store (av, 2, newSVuv (c));
3350 av_store (av, 1, newSVuv (b)); 3569 av_store (av, 1, newSVuv (b));
3351 av_store (av, 0, newSVuv (a)); 3570 av_store (av, 0, newSVuv (a));
3352 3571
3353 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 3572 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
… …
3360{ 3579{
3361 dSP; 3580 dSP;
3362 SV *load, *save; 3581 SV *load, *save;
3363 char *map_base; 3582 char *map_base;
3364 char *load_ptr, *save_ptr; 3583 char *load_ptr, *save_ptr;
3365 STRLEN load_len, save_len; 3584 STRLEN load_len, save_len, map_len;
3366 int count; 3585 int count;
3367 3586
3587 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3588
3368 PUSHMARK (SP); 3589 PUSHMARK (SP);
3369 PUTBACK;
3370#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type)); 3590 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3371# include "state.h" 3591 #include "state.h"
3372#undef VARx
3373 count = call_pv ("Coro::State::_jit", G_ARRAY); 3592 count = call_pv ("Coro::State::_jit", G_ARRAY);
3374 SPAGAIN; 3593 SPAGAIN;
3375 3594
3376 save = POPs; save_ptr = SvPVbyte (save, save_len); 3595 save = POPs; save_ptr = SvPVbyte (save, save_len);
3377 load = POPs; load_ptr = SvPVbyte (load, load_len); 3596 load = POPs; load_ptr = SvPVbyte (load, load_len);
3378 3597
3598 map_len = load_len + save_len + 16;
3599
3600 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3601
3602 if (map_base == (char *)MAP_FAILED)
3379 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3603 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3380 3604
3381 assert (("Coro: unable mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3605 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3382 3606
3383 load_perl_slots = (load_save_perl_slots_type)map_base; 3607 load_perl_slots = (load_save_perl_slots_type)map_base;
3384 memcpy (map_base, load_ptr, load_len); 3608 memcpy (map_base, load_ptr, load_len);
3385 3609
3386 map_base += (load_len + 15) & ~15; 3610 map_base += (load_len + 15) & ~15;
3387 3611
3388 save_perl_slots = (load_save_perl_slots_type)map_base; 3612 save_perl_slots = (load_save_perl_slots_type)map_base;
3389 memcpy (map_base, save_ptr, save_len); 3613 memcpy (map_base, save_ptr, save_len);
3614
3615 /* we are good citizens and try to make the page read-only, so the evil evil */
3616 /* hackers might have it a bit more difficult */
3617 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3618
3619 PUTBACK;
3620 eval_pv ("undef &Coro::State::_jit", 1);
3390} 3621}
3391 3622
3392#endif 3623#endif
3393 3624
3394MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3625MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3395 3626
3396PROTOTYPES: DISABLE 3627PROTOTYPES: DISABLE
3397 3628
3398BOOT: 3629BOOT:
3399{ 3630{
3631#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3632#include "state.h"
3400#ifdef USE_ITHREADS 3633#ifdef USE_ITHREADS
3401# if CORO_PTHREAD 3634# if CORO_PTHREAD
3402 coro_thx = PERL_GET_CONTEXT; 3635 coro_thx = PERL_GET_CONTEXT;
3403# endif 3636# endif
3404#endif 3637#endif
3405 BOOT_PAGESIZE;
3406
3407 /* perl defines these to check for existance first, but why it doesn't */ 3638 /* 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 */ 3639 /* just create them one at init time is not clear to me, except for */
3409 /* programs trying to delete them, but... */ 3640 /* programs trying to delete them, but... */
3410 /* anyway, we declare this as invalid and make sure they are initialised here */ 3641 /* anyway, we declare this as invalid and make sure they are initialised here */
3411 DEFSV; 3642 DEFSV;
… …
3414 cctx_current = cctx_new_empty (); 3645 cctx_current = cctx_new_empty ();
3415 3646
3416 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3647 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3417 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3648 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3418 3649
3419 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3650 {
3420 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3651 /*
3421 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3652 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3653 * by coro_sig_vtbl in hash values.
3654 */
3655 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3656
3657 /* this only works if perl doesn't have a vtbl for %SIG */
3658 assert (!mg->mg_virtual);
3659
3660 /*
3661 * The irony is that the perl API itself asserts that mg_virtual
3662 * must be non-const, yet perl5porters insisted on marking their
3663 * vtbls as read-only, just to thwart perl modules from patching
3664 * them.
3665 */
3666 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3667 mg->mg_flags |= MGf_COPY;
3668
3669 coro_sigelem_vtbl = PL_vtbl_sigelem;
3670 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3671 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3672 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3673 }
3422 3674
3423 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3424 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3675 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3425 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3676 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3426 3677
3427 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3678 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3428 3679
… …
3462 time_init (aTHX); 3713 time_init (aTHX);
3463 3714
3464 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3715 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3465#if CORO_JIT 3716#if CORO_JIT
3466 PUTBACK; 3717 PUTBACK;
3467 require_pv ("Coro/jit-" CORO_JIT_TYPE ".pl");
3468 jit_init (aTHX); 3718 jit_init (aTHX);
3469 perl_eval_pv ("undef &Coro::State::_jit", 1);
3470 SPAGAIN; 3719 SPAGAIN;
3471#endif 3720#endif
3472} 3721}
3473 3722
3474SV * 3723SV *
… …
3483void 3732void
3484transfer (...) 3733transfer (...)
3485 PROTOTYPE: $$ 3734 PROTOTYPE: $$
3486 CODE: 3735 CODE:
3487 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3736 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3488
3489void
3490_exit (int code)
3491 PROTOTYPE: $
3492 CODE:
3493 _exit (code);
3494 3737
3495SV * 3738SV *
3496clone (Coro::State coro) 3739clone (Coro::State coro)
3497 CODE: 3740 CODE:
3498{ 3741{
… …
3553void 3796void
3554list () 3797list ()
3555 PROTOTYPE: 3798 PROTOTYPE:
3556 PPCODE: 3799 PPCODE:
3557{ 3800{
3558 struct coro *coro; 3801 struct coro *coro;
3559 for (coro = coro_first; coro; coro = coro->next) 3802 for (coro = coro_first; coro; coro = coro->next)
3560 if (coro->hv) 3803 if (coro->hv)
3561 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3804 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3562} 3805}
3563 3806
… …
3627 RETVAL = boolSV (coro->flags & ix); 3870 RETVAL = boolSV (coro->flags & ix);
3628 OUTPUT: 3871 OUTPUT:
3629 RETVAL 3872 RETVAL
3630 3873
3631void 3874void
3632throw (Coro::State self, SV *exception = &PL_sv_undef) 3875throw (SV *self, SV *exception = &PL_sv_undef)
3633 PROTOTYPE: $;$ 3876 PROTOTYPE: $;$
3634 CODE: 3877 CODE:
3635{ 3878{
3879 struct coro *coro = SvSTATE (self);
3636 struct coro *current = SvSTATE_current; 3880 struct coro *current = SvSTATE_current;
3637 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3881 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3638 SvREFCNT_dec (*exceptionp); 3882 SvREFCNT_dec (*exceptionp);
3639 SvGETMAGIC (exception); 3883 SvGETMAGIC (exception);
3640 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3884 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3885
3886 api_ready (aTHX_ self);
3641} 3887}
3642 3888
3643void 3889void
3644api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3890api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3645 PROTOTYPE: $;$ 3891 PROTOTYPE: $;$
… …
3722 3968
3723void 3969void
3724times (Coro::State self) 3970times (Coro::State self)
3725 PPCODE: 3971 PPCODE:
3726{ 3972{
3727 struct coro *current = SvSTATE (coro_current); 3973 struct coro *current = SvSTATE (coro_current);
3728 3974
3729 if (ecb_expect_false (current == self)) 3975 if (ecb_expect_false (current == self))
3730 { 3976 {
3731 coro_times_update (); 3977 coro_times_update ();
3732 coro_times_add (SvSTATE (coro_current)); 3978 coro_times_add (SvSTATE (coro_current));
… …
3739 if (ecb_expect_false (current == self)) 3985 if (ecb_expect_false (current == self))
3740 coro_times_sub (SvSTATE (coro_current)); 3986 coro_times_sub (SvSTATE (coro_current));
3741} 3987}
3742 3988
3743void 3989void
3744swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3990swap_sv (Coro::State coro, SV *sva, SV *svb)
3745 CODE: 3991 CODE:
3746{ 3992{
3747 struct coro *current = SvSTATE_current; 3993 struct coro *current = SvSTATE_current;
3994 AV *swap_sv;
3995 int i;
3996
3997 sva = SvRV (sva);
3998 svb = SvRV (svb);
3748 3999
3749 if (current == coro) 4000 if (current == coro)
3750 SWAP_SVS (current); 4001 SWAP_SVS_LEAVE (current);
3751 4002
3752 if (!coro->swap_sv) 4003 if (!coro->swap_sv)
3753 coro->swap_sv = newAV (); 4004 coro->swap_sv = newAV ();
3754 4005
4006 swap_sv = coro->swap_sv;
4007
4008 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4009 {
4010 SV *a = AvARRAY (swap_sv)[i ];
4011 SV *b = AvARRAY (swap_sv)[i + 1];
4012
4013 if (a == sva && b == svb)
4014 {
4015 SvREFCNT_dec_NN (a);
4016 SvREFCNT_dec_NN (b);
4017
4018 for (; i <= AvFILLp (swap_sv) - 2; i++)
4019 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4020
4021 AvFILLp (swap_sv) -= 2;
4022
4023 goto removed;
4024 }
4025 }
4026
3755 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4027 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3756 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4028 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4029
4030 removed:
3757 4031
3758 if (current == coro) 4032 if (current == coro)
3759 SWAP_SVS (current); 4033 SWAP_SVS_ENTER (current);
3760} 4034}
3761 4035
3762 4036
3763MODULE = Coro::State PACKAGE = Coro 4037MODULE = Coro::State PACKAGE = Coro
3764 4038
3765BOOT: 4039BOOT:
3766{ 4040{
4041 if (SVt_LAST > 32)
4042 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4043
3767 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4044 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3768 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4045 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3769 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4046 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3770 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4047 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3771 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4048 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3775 4052
3776 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4053 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3777 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4054 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); 4055 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 */ 4056 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3780 4057
3781 coro_stash = gv_stashpv ("Coro", TRUE); 4058 coro_stash = gv_stashpv ("Coro", TRUE);
3782 4059
3783 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4060 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3784 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4061 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3785 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4062 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3797 coroapi.ready = api_ready; 4074 coroapi.ready = api_ready;
3798 coroapi.is_ready = api_is_ready; 4075 coroapi.is_ready = api_is_ready;
3799 coroapi.nready = coro_nready; 4076 coroapi.nready = coro_nready;
3800 coroapi.current = coro_current; 4077 coroapi.current = coro_current;
3801 4078
4079 coroapi.enterleave_hook = api_enterleave_hook;
4080 coroapi.enterleave_unhook = api_enterleave_unhook;
4081 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4082
3802 /*GCoroAPI = &coroapi;*/ 4083 /*GCoroAPI = &coroapi;*/
3803 sv_setiv (sv, (IV)&coroapi); 4084 sv_setiv (sv, PTR2IV (&coroapi));
3804 SvREADONLY_on (sv); 4085 SvREADONLY_on (sv);
3805 } 4086 }
3806} 4087}
3807 4088
3808SV * 4089SV *
… …
3871 4152
3872void 4153void
3873_set_current (SV *current) 4154_set_current (SV *current)
3874 PROTOTYPE: $ 4155 PROTOTYPE: $
3875 CODE: 4156 CODE:
3876 SvREFCNT_dec (SvRV (coro_current)); 4157 SvREFCNT_dec_NN (SvRV (coro_current));
3877 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4158 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3878 4159
3879void 4160void
3880_set_readyhook (SV *hook) 4161_set_readyhook (SV *hook)
3881 PROTOTYPE: $ 4162 PROTOTYPE: $
… …
3965 4246
3966 if ((SV *)hv == &PL_sv_undef) 4247 if ((SV *)hv == &PL_sv_undef)
3967 { 4248 {
3968 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4249 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3969 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4250 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3970 SvREFCNT_dec (sv); 4251 SvREFCNT_dec_NN (sv);
3971 } 4252 }
3972 4253
3973 { 4254 {
3974 struct coro *coro = SvSTATE_hv (hv); 4255 struct coro *coro = SvSTATE_hv (hv);
3975 4256
… …
3982 api_ready (aTHX_ (SV *)hv); 4263 api_ready (aTHX_ (SV *)hv);
3983 4264
3984 if (GIMME_V != G_VOID) 4265 if (GIMME_V != G_VOID)
3985 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4266 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3986 else 4267 else
3987 SvREFCNT_dec (hv); 4268 SvREFCNT_dec_NN (hv);
3988} 4269}
3989 4270
3990SV * 4271SV *
3991rouse_cb () 4272rouse_cb ()
3992 PROTOTYPE: 4273 PROTOTYPE:
… …
4007 on_leave = 1 4288 on_leave = 1
4008 PROTOTYPE: & 4289 PROTOTYPE: &
4009 CODE: 4290 CODE:
4010{ 4291{
4011 struct coro *coro = SvSTATE_current; 4292 struct coro *coro = SvSTATE_current;
4012 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4293 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4013 4294
4014 block = s_get_cv_croak (block); 4295 block = s_get_cv_croak (block);
4015 4296
4016 if (!*avp) 4297 if (!*avp)
4017 *avp = newAV (); 4298 *avp = newAV ();
… …
4037 4318
4038SV * 4319SV *
4039new (SV *klass, SV *count = 0) 4320new (SV *klass, SV *count = 0)
4040 CODE: 4321 CODE:
4041{ 4322{
4042 int semcnt = 1; 4323 int semcnt = 1;
4043 4324
4044 if (count) 4325 if (count)
4045 { 4326 {
4046 SvGETMAGIC (count); 4327 SvGETMAGIC (count);
4047 4328
… …
4071 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4352 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4072 OUTPUT: 4353 OUTPUT:
4073 RETVAL 4354 RETVAL
4074 4355
4075void 4356void
4076up (SV *self, int adjust = 1) 4357up (SV *self)
4077 ALIAS:
4078 adjust = 1
4079 CODE: 4358 CODE:
4359 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4360
4361void
4362adjust (SV *self, int adjust)
4363 CODE:
4080 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4364 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4081 4365
4082void 4366void
4083down (...) 4367down (...)
4084 CODE: 4368 CODE:
4085 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4369 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
4107 XSRETURN_NO; 4391 XSRETURN_NO;
4108} 4392}
4109 4393
4110void 4394void
4111waiters (SV *self) 4395waiters (SV *self)
4112 PPCODE: 4396 PPCODE:
4113{ 4397{
4114 AV *av = (AV *)SvRV (self); 4398 AV *av = (AV *)SvRV (self);
4115 int wcount = AvFILLp (av) + 1 - 1; 4399 int wcount = AvFILLp (av) + 1 - 1;
4116 4400
4117 if (GIMME_V == G_SCALAR) 4401 if (GIMME_V == G_SCALAR)
… …
4126} 4410}
4127 4411
4128MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4412MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4129 4413
4130void 4414void
4131_may_delete (SV *sem, int count, int extra_refs) 4415_may_delete (SV *sem, int count, unsigned int extra_refs)
4132 PPCODE: 4416 PPCODE:
4133{ 4417{
4134 AV *av = (AV *)SvRV (sem); 4418 AV *av = (AV *)SvRV (sem);
4135 4419
4136 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4420 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4137 && AvFILLp (av) == 0 /* no waiters, just count */ 4421 && AvFILLp (av) == 0 /* no waiters, just count */
4138 && SvIV (AvARRAY (av)[0]) == count) 4422 && SvIV (AvARRAY (av)[0]) == count)
4139 XSRETURN_YES; 4423 XSRETURN_YES;
… …
4160 4444
4161void 4445void
4162broadcast (SV *self) 4446broadcast (SV *self)
4163 CODE: 4447 CODE:
4164{ 4448{
4165 AV *av = (AV *)SvRV (self); 4449 AV *av = (AV *)SvRV (self);
4166 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4450 coro_signal_wake (aTHX_ av, AvFILLp (av));
4167} 4451}
4168 4452
4169void 4453void
4170send (SV *self) 4454send (SV *self)
… …
4178 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4462 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4179} 4463}
4180 4464
4181IV 4465IV
4182awaited (SV *self) 4466awaited (SV *self)
4183 CODE: 4467 CODE:
4184 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4468 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4185 OUTPUT: 4469 OUTPUT:
4186 RETVAL 4470 RETVAL
4187 4471
4188 4472
… …
4193 4477
4194void 4478void
4195_schedule (...) 4479_schedule (...)
4196 CODE: 4480 CODE:
4197{ 4481{
4198 static int incede; 4482 static int incede;
4199 4483
4200 api_cede_notself (aTHX); 4484 api_cede_notself (aTHX);
4201 4485
4202 ++incede; 4486 ++incede;
4203 while (coro_nready >= incede && api_cede (aTHX)) 4487 while (coro_nready >= incede && api_cede (aTHX))
… …
4247 { 4531 {
4248 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4532 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4249 coro_old_pp_sselect = 0; 4533 coro_old_pp_sselect = 0;
4250 } 4534 }
4251 4535
4536MODULE = Coro::State PACKAGE = Coro::Util
4537
4538void
4539_exit (int code)
4540 CODE:
4541 _exit (code);
4542
4543NV
4544time ()
4545 CODE:
4546 RETVAL = nvtime (aTHX);
4547 OUTPUT:
4548 RETVAL
4549
4550NV
4551gettimeofday ()
4552 PPCODE:
4553{
4554 UV tv [2];
4555 u2time (aTHX_ tv);
4556 EXTEND (SP, 2);
4557 PUSHs (sv_2mortal (newSVuv (tv [0])));
4558 PUSHs (sv_2mortal (newSVuv (tv [1])));
4559}
4560

Diff Legend

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