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.470 by root, Fri Jul 14 13:14:32 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#if PERL_VERSION_ATLEAST(5,24,0)
122# define SUB_ARGARRAY PL_curpad[0]
123#else
124# define SUB_ARGARRAY (SV *)cx->blk_sub.argarray
125#endif
126
127/* perl usually suppresses asserts. for debugging, we sometimes force it to be on */
128#if 0
129# undef NDEBUG
130# include <assert.h>
131#endif
132
115static double (*nvtime)(); /* so why doesn't it take void? */ 133static double (*nvtime)(); /* so why doesn't it take void? */
116static void (*u2time)(pTHX_ UV ret[2]); 134static void (*u2time)(pTHX_ UV ret[2]);
117 135
118/* we hijack an hopefully unused CV flag for our purposes */ 136/* we hijack an hopefully unused CV flag for our purposes */
119#define CVf_SLF 0x4000 137#define CVf_SLF 0x4000
… …
134 152
135static GV *irsgv; /* $/ */ 153static GV *irsgv; /* $/ */
136static GV *stdoutgv; /* *STDOUT */ 154static GV *stdoutgv; /* *STDOUT */
137static SV *rv_diehook; 155static SV *rv_diehook;
138static SV *rv_warnhook; 156static SV *rv_warnhook;
139static HV *hv_sig; /* %SIG */
140 157
141/* async_pool helper stuff */ 158/* async_pool helper stuff */
142static SV *sv_pool_rss; 159static SV *sv_pool_rss;
143static SV *sv_pool_size; 160static SV *sv_pool_size;
144static SV *sv_async_pool_idle; /* description string */ 161static SV *sv_async_pool_idle; /* description string */
… …
172typedef struct coro_cctx 189typedef struct coro_cctx
173{ 190{
174 struct coro_cctx *next; 191 struct coro_cctx *next;
175 192
176 /* the stack */ 193 /* the stack */
177 void *sptr; 194 struct coro_stack stack;
178 size_t ssize;
179 195
180 /* cpu state */ 196 /* cpu state */
181 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 197 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
198#ifndef NDEBUG
182 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 199 JMPENV *idle_te; /* same as idle_sp, but for top_env */
200#endif
183 JMPENV *top_env; 201 JMPENV *top_env;
184 coro_context cctx; 202 coro_context cctx;
185 203
186 U32 gen; 204 U32 gen;
187#if CORO_USE_VALGRIND 205#if CORO_USE_VALGRIND
… …
207}; 225};
208 226
209/* the structure where most of the perl state is stored, overlaid on the cxstack */ 227/* the structure where most of the perl state is stored, overlaid on the cxstack */
210typedef struct 228typedef struct
211{ 229{
212#define VARx(name,expr,type) type name; 230 #define VARx(name,expr,type) type name;
213# include "state.h" 231 #include "state.h"
214#undef VARx
215} perl_slots; 232} perl_slots;
216 233
217// how many context stack entries do we need for perl_slots 234/* 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)) 235#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
219 236
220/* this is a structure representing a perl-level coroutine */ 237/* this is a structure representing a perl-level coroutine */
221struct coro 238struct coro
222{ 239{
… …
250 SV *saved_deffh; 267 SV *saved_deffh;
251 SV *invoke_cb; 268 SV *invoke_cb;
252 AV *invoke_av; 269 AV *invoke_av;
253 270
254 /* on_enter/on_leave */ 271 /* on_enter/on_leave */
255 AV *on_enter; 272 AV *on_enter; AV *on_enter_xs;
256 AV *on_leave; 273 AV *on_leave; AV *on_leave_xs;
257 274
258 /* swap_sv */ 275 /* swap_sv */
259 AV *swap_sv; 276 AV *swap_sv;
260 277
261 /* times */ 278 /* times */
… …
291#define coro_nready coroapi.nready 308#define coro_nready coroapi.nready
292 309
293/** JIT *********************************************************************/ 310/** JIT *********************************************************************/
294 311
295#if CORO_JIT 312#if CORO_JIT
313 /* APPLE doesn't have mmap though */
314 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
296 #ifndef CORO_JIT_TYPE 315 #ifndef CORO_JIT_TYPE
297 #if __linux && __amd64 316 #if ECB_AMD64 && CORO_JIT_UNIXY
298 #define CORO_JIT_TYPE "amd64-unix" 317 #define CORO_JIT_TYPE "amd64-unix"
299 typedef void (*load_save_perl_slots_type)(perl_slots *); 318 #elif __i386 && CORO_JIT_UNIXY
300 #else 319 #define CORO_JIT_TYPE "x86-unix"
301 #undef CORO_JIT
302 #endif 320 #endif
303 #endif 321 #endif
304#endif 322#endif
305 323
324#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
325 #undef CORO_JIT
326#endif
327
306#if CORO_JIT 328#if CORO_JIT
307 329 typedef void (*load_save_perl_slots_type)(perl_slots *);
308static load_save_perl_slots_type load_perl_slots, save_perl_slots; 330 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
309
310#endif 331#endif
311 332
312/** Coro::Select ************************************************************/ 333/** Coro::Select ************************************************************/
313 334
314static OP *(*coro_old_pp_sselect) (pTHX); 335static OP *(*coro_old_pp_sselect) (pTHX);
… …
331 352
332/** time stuff **************************************************************/ 353/** time stuff **************************************************************/
333 354
334#ifdef HAS_GETTIMEOFDAY 355#ifdef HAS_GETTIMEOFDAY
335 356
336ECB_INLINE void 357ecb_inline void
337coro_u2time (pTHX_ UV ret[2]) 358coro_u2time (pTHX_ UV ret[2])
338{ 359{
339 struct timeval tv; 360 struct timeval tv;
340 gettimeofday (&tv, 0); 361 gettimeofday (&tv, 0);
341 362
342 ret [0] = tv.tv_sec; 363 ret [0] = tv.tv_sec;
343 ret [1] = tv.tv_usec; 364 ret [1] = tv.tv_usec;
344} 365}
345 366
346ECB_INLINE double 367ecb_inline double
347coro_nvtime () 368coro_nvtime (void)
348{ 369{
349 struct timeval tv; 370 struct timeval tv;
350 gettimeofday (&tv, 0); 371 gettimeofday (&tv, 0);
351 372
352 return tv.tv_sec + tv.tv_usec * 1e-6; 373 return tv.tv_sec + tv.tv_usec * 1e-6;
353} 374}
354 375
355ECB_INLINE void 376ecb_inline void
356time_init (pTHX) 377time_init (pTHX)
357{ 378{
358 nvtime = coro_nvtime; 379 nvtime = coro_nvtime;
359 u2time = coro_u2time; 380 u2time = coro_u2time;
360} 381}
361 382
362#else 383#else
363 384
364ECB_INLINE void 385ecb_inline void
365time_init (pTHX) 386time_init (pTHX)
366{ 387{
367 SV **svp; 388 SV **svp;
368 389
369 require_pv ("Time/HiRes.pm"); 390 require_pv ("Time/HiRes.pm");
370 391
371 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 392 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
372 393
373 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 394 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
374 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 395 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
375 396
… …
411 get_hv (name, create); 432 get_hv (name, create);
412#endif 433#endif
413 return get_hv (name, create); 434 return get_hv (name, create);
414} 435}
415 436
416ECB_INLINE void 437ecb_inline void
417coro_times_update () 438coro_times_update (void)
418{ 439{
419#ifdef coro_clock_gettime 440#ifdef coro_clock_gettime
420 struct timespec ts; 441 struct timespec ts;
421 442
422 ts.tv_sec = ts.tv_nsec = 0; 443 ts.tv_sec = ts.tv_nsec = 0;
… …
434 time_real [0] = tv [0]; 455 time_real [0] = tv [0];
435 time_real [1] = tv [1] * 1000; 456 time_real [1] = tv [1] * 1000;
436#endif 457#endif
437} 458}
438 459
439ECB_INLINE void 460ecb_inline void
440coro_times_add (struct coro *c) 461coro_times_add (struct coro *c)
441{ 462{
442 c->t_real [1] += time_real [1]; 463 c->t_real [1] += time_real [1];
443 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 464 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
444 c->t_real [0] += time_real [0]; 465 c->t_real [0] += time_real [0];
… …
446 c->t_cpu [1] += time_cpu [1]; 467 c->t_cpu [1] += time_cpu [1];
447 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 468 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
448 c->t_cpu [0] += time_cpu [0]; 469 c->t_cpu [0] += time_cpu [0];
449} 470}
450 471
451ECB_INLINE void 472ecb_inline void
452coro_times_sub (struct coro *c) 473coro_times_sub (struct coro *c)
453{ 474{
454 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 475 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]; 476 c->t_real [1] -= time_real [1];
456 c->t_real [0] -= time_real [0]; 477 c->t_real [0] -= time_real [0];
… …
477 : 0) 498 : 0)
478 499
479#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 500#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) 501#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
481 502
482ECB_INLINE MAGIC * 503ecb_inline MAGIC *
483SvSTATEhv_p (pTHX_ SV *coro) 504SvSTATEhv_p (pTHX_ SV *coro)
484{ 505{
485 MAGIC *mg; 506 MAGIC *mg;
486 507
487 if (ecb_expect_true ( 508 if (ecb_expect_true (
… …
492 return mg; 513 return mg;
493 514
494 return 0; 515 return 0;
495} 516}
496 517
497ECB_INLINE struct coro * 518ecb_inline struct coro *
498SvSTATE_ (pTHX_ SV *coro) 519SvSTATE_ (pTHX_ SV *coro_sv)
499{ 520{
500 MAGIC *mg; 521 MAGIC *mg;
501 522
502 if (SvROK (coro)) 523 if (SvROK (coro_sv))
503 coro = SvRV (coro); 524 coro_sv = SvRV (coro_sv);
504 525
505 mg = SvSTATEhv_p (aTHX_ coro); 526 mg = SvSTATEhv_p (aTHX_ coro_sv);
506 if (!mg) 527 if (!mg)
507 croak ("Coro::State object required"); 528 croak ("Coro::State object required");
508 529
509 return (struct coro *)mg->mg_ptr; 530 return (struct coro *)mg->mg_ptr;
510} 531}
… …
516#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 537#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
517 538
518/*****************************************************************************/ 539/*****************************************************************************/
519/* padlist management and caching */ 540/* padlist management and caching */
520 541
521ECB_INLINE AV * 542ecb_inline PADLIST *
522coro_derive_padlist (pTHX_ CV *cv) 543coro_derive_padlist (pTHX_ CV *cv)
523{ 544{
524 AV *padlist = CvPADLIST (cv); 545 PADLIST *padlist = CvPADLIST (cv);
525 AV *newpadlist, *newpad; 546 PADLIST *newpadlist;
547 PADNAMELIST *padnames;
548 PAD *newpad;
549 PADOFFSET off = PadlistMAX (padlist) + 1;
526 550
527 newpadlist = newAV (); 551#if NEWPADAPI
552
553 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
554 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
555 while (!PadlistARRAY (padlist)[off - 1])
556 --off;
557
558 Perl_pad_push (aTHX_ padlist, off);
559
560 newpad = PadlistARRAY (padlist)[off];
561 PadlistARRAY (padlist)[off] = 0;
562
563#else
564
565#if PERL_VERSION_ATLEAST (5,10,0)
566 Perl_pad_push (aTHX_ padlist, off);
567#else
568 Perl_pad_push (aTHX_ padlist, off, 1);
569#endif
570
571 newpad = PadlistARRAY (padlist)[off];
572 PadlistMAX (padlist) = off - 1;
573
574#endif
575
576 newPADLIST (newpadlist);
577#if !PERL_VERSION_ATLEAST(5,15,3)
578 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
528 AvREAL_off (newpadlist); 579 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 580#endif
534 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
535 --AvFILLp (padlist);
536 581
537 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 582 /* Already extended to 2 elements by newPADLIST. */
538 av_store (newpadlist, 1, (SV *)newpad); 583 PadlistMAX (newpadlist) = 1;
584
585 padnames = PadlistNAMES (padlist);
586 ++PadnamelistREFCNT (padnames);
587 PadlistNAMES (newpadlist) = padnames;
588
589 PadlistARRAY (newpadlist)[1] = newpad;
539 590
540 return newpadlist; 591 return newpadlist;
541} 592}
542 593
543ECB_INLINE void 594ecb_inline void
544free_padlist (pTHX_ AV *padlist) 595free_padlist (pTHX_ PADLIST *padlist)
545{ 596{
546 /* may be during global destruction */ 597 /* may be during global destruction */
547 if (!IN_DESTRUCT) 598 if (!IN_DESTRUCT)
548 { 599 {
549 I32 i = AvFILLp (padlist); 600 I32 i = PadlistMAX (padlist);
550 601
551 while (i > 0) /* special-case index 0 */ 602 while (i > 0) /* special-case index 0 */
552 { 603 {
553 /* we try to be extra-careful here */ 604 /* we try to be extra-careful here */
554 AV *av = (AV *)AvARRAY (padlist)[i--]; 605 PAD *pad = PadlistARRAY (padlist)[i--];
555 I32 j = AvFILLp (av);
556 606
607 if (pad)
608 {
609 I32 j = PadMAX (pad);
610
557 while (j >= 0) 611 while (j >= 0)
558 SvREFCNT_dec (AvARRAY (av)[j--]); 612 SvREFCNT_dec (PadARRAY (pad)[j--]);
559 613
560 AvFILLp (av) = -1; 614 PadMAX (pad) = -1;
561 SvREFCNT_dec (av); 615 SvREFCNT_dec (pad);
616 }
562 } 617 }
563 618
564 SvREFCNT_dec (AvARRAY (padlist)[0]); 619 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
565 620
621#if NEWPADAPI
622 Safefree (PadlistARRAY (padlist));
623 Safefree (padlist);
624#else
566 AvFILLp (padlist) = -1; 625 AvFILLp (padlist) = -1;
626 AvREAL_off (padlist);
567 SvREFCNT_dec ((SV*)padlist); 627 SvREFCNT_dec ((SV*)padlist);
628#endif
568 } 629 }
569} 630}
570 631
571static int 632static int
572coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 633coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
573{ 634{
574 AV *padlist; 635 PADLIST *padlist;
575 AV *av = (AV *)mg->mg_obj; 636 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
637 size_t len = *(size_t *)mg->mg_ptr;
576 638
577 /* perl manages to free our internal AV and _then_ call us */ 639 /* perl manages to free our internal AV and _then_ call us */
578 if (IN_DESTRUCT) 640 if (IN_DESTRUCT)
579 return 0; 641 return 0;
580 642
581 /* casting is fun. */ 643 while (len--)
582 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
583 free_padlist (aTHX_ padlist); 644 free_padlist (aTHX_ padlists[len]);
584
585 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
586 645
587 return 0; 646 return 0;
588} 647}
589 648
590static MGVTBL coro_cv_vtbl = { 649static MGVTBL coro_cv_vtbl = {
591 0, 0, 0, 0, 650 0, 0, 0, 0,
592 coro_cv_free 651 coro_cv_free
593}; 652};
594 653
595/* the next two functions merely cache the padlists */ 654/* the next two functions merely cache the padlists */
596ECB_INLINE void 655ecb_inline void
597get_padlist (pTHX_ CV *cv) 656get_padlist (pTHX_ CV *cv)
598{ 657{
599 MAGIC *mg = CORO_MAGIC_cv (cv); 658 MAGIC *mg = CORO_MAGIC_cv (cv);
600 AV *av; 659 size_t *lenp;
601 660
602 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 661 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
603 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 662 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
604 else 663 else
605 { 664 {
606#if CORO_PREFER_PERL_FUNCTIONS 665#if CORO_PREFER_PERL_FUNCTIONS
607 /* this is probably cleaner? but also slower! */ 666 /* this is probably cleaner? but also slower! */
608 /* in practise, it seems to be less stable */ 667 /* in practise, it seems to be less stable */
… …
614 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 673 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
615#endif 674#endif
616 } 675 }
617} 676}
618 677
619ECB_INLINE void 678ecb_inline void
620put_padlist (pTHX_ CV *cv) 679put_padlist (pTHX_ CV *cv)
621{ 680{
622 MAGIC *mg = CORO_MAGIC_cv (cv); 681 MAGIC *mg = CORO_MAGIC_cv (cv);
623 AV *av;
624 682
625 if (ecb_expect_false (!mg)) 683 if (ecb_expect_false (!mg))
684 {
626 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 685 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
686 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
687 mg->mg_len = 1; /* so mg_free frees mg_ptr */
688 }
689 else
690 Renew (mg->mg_ptr,
691 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
692 char);
627 693
628 av = (AV *)mg->mg_obj; 694 ((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} 695}
635 696
636/** load & save, init *******************************************************/ 697/** load & save, init *******************************************************/
637 698
699ecb_inline void
700swap_sv (SV *a, SV *b)
701{
702 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
703 SV tmp;
704
705 /* swap sv_any */
706 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
707
708 /* swap sv_flags */
709 SvFLAGS (&tmp) = SvFLAGS (a);
710 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
711 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
712
713#if PERL_VERSION_ATLEAST (5,10,0)
714 /* perl 5.10 and later complicates this _quite_ a bit, but it also
715 * is much faster, so no quarrels here. alternatively, we could
716 * sv_upgrade to avoid this.
717 */
718 {
719 /* swap sv_u */
720 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
721
722 /* if SvANY points to the head, we need to adjust the pointers,
723 * as the pointer for a still points to b, and maybe vice versa.
724 */
725 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
726 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
727 svany_in_head_set |= 1 << SVt_NV;
728 #endif
729
730 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
731
732 if (svany_in_head (SvTYPE (a)))
733 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
734
735 if (svany_in_head (SvTYPE (b)))
736 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
737 }
738#endif
739}
740
638/* swap sv heads, at least logically */ 741/* swap sv heads, at least logically */
639static void 742static void
640swap_svs (pTHX_ Coro__State c) 743swap_svs_enter (pTHX_ Coro__State c)
641{ 744{
642 int i; 745 int i;
643 746
644 for (i = 0; i <= AvFILLp (c->swap_sv); ) 747 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
645 { 748 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} 749}
684 750
751static void
752swap_svs_leave (pTHX_ Coro__State c)
753{
754 int i;
755
756 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
757 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
758}
759
685#define SWAP_SVS(coro) \ 760#define SWAP_SVS_ENTER(coro) \
686 if (ecb_expect_false ((coro)->swap_sv)) \ 761 if (ecb_expect_false ((coro)->swap_sv)) \
687 swap_svs (aTHX_ (coro)) 762 swap_svs_enter (aTHX_ (coro))
763
764#define SWAP_SVS_LEAVE(coro) \
765 if (ecb_expect_false ((coro)->swap_sv)) \
766 swap_svs_leave (aTHX_ (coro))
688 767
689static void 768static void
690on_enterleave_call (pTHX_ SV *cb); 769on_enterleave_call (pTHX_ SV *cb);
691 770
692static void 771static void
… …
699 778
700#if CORO_JIT 779#if CORO_JIT
701 load_perl_slots (slot); 780 load_perl_slots (slot);
702#else 781#else
703 #define VARx(name,expr,type) expr = slot->name; 782 #define VARx(name,expr,type) expr = slot->name;
704 # include "state.h" 783 #include "state.h"
705 #undef VARx
706#endif 784#endif
707 785
708 { 786 {
709 dSP; 787 dSP;
710 788
… …
713 /* now do the ugly restore mess */ 791 /* now do the ugly restore mess */
714 while (ecb_expect_true (cv = (CV *)POPs)) 792 while (ecb_expect_true (cv = (CV *)POPs))
715 { 793 {
716 put_padlist (aTHX_ cv); /* mark this padlist as available */ 794 put_padlist (aTHX_ cv); /* mark this padlist as available */
717 CvDEPTH (cv) = PTR2IV (POPs); 795 CvDEPTH (cv) = PTR2IV (POPs);
718 CvPADLIST (cv) = (AV *)POPs; 796 CvPADLIST (cv) = (PADLIST *)POPs;
719 } 797 }
720 798
721 PUTBACK; 799 PUTBACK;
722 } 800 }
723 801
… …
738 816
739 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 817 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
740 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 818 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
741 } 819 }
742 820
821 if (ecb_expect_false (c->on_enter_xs))
822 {
823 int i;
824
825 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
826 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
827 }
828
743 SWAP_SVS (c); 829 SWAP_SVS_ENTER (c);
744} 830}
745 831
746static void 832static void
747save_perl (pTHX_ Coro__State c) 833save_perl (pTHX_ Coro__State c)
748{ 834{
749 SWAP_SVS (c); 835 SWAP_SVS_LEAVE (c);
836
837 if (ecb_expect_false (c->on_leave_xs))
838 {
839 int i;
840
841 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
842 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
843 }
750 844
751 if (ecb_expect_false (c->on_leave)) 845 if (ecb_expect_false (c->on_leave))
752 { 846 {
753 int i; 847 int i;
754 848
… …
813 907
814 PUTBACK; 908 PUTBACK;
815 } 909 }
816 910
817 /* allocate some space on the context stack for our purposes */ 911 /* allocate some space on the context stack for our purposes */
818 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 912 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
819 { 913 {
820 unsigned int i; 914 unsigned int i;
821 915
822 for (i = 0; i < SLOT_COUNT; ++i) 916 for (i = 0; i < SLOT_COUNT; ++i)
823 CXINC; 917 CXINC;
… …
832 926
833#if CORO_JIT 927#if CORO_JIT
834 save_perl_slots (slot); 928 save_perl_slots (slot);
835#else 929#else
836 #define VARx(name,expr,type) slot->name = expr; 930 #define VARx(name,expr,type) slot->name = expr;
837 # include "state.h" 931 #include "state.h"
838 #undef VARx
839#endif 932#endif
840 } 933 }
841} 934}
842 935
843/* 936/*
… …
875#endif 968#endif
876 969
877 New(54,PL_scopestack,8,I32); 970 New(54,PL_scopestack,8,I32);
878 PL_scopestack_ix = 0; 971 PL_scopestack_ix = 0;
879 PL_scopestack_max = 8; 972 PL_scopestack_max = 8;
973#if HAS_SCOPESTACK_NAME
974 New(54,PL_scopestack_name,8,const char*);
975#endif
880 976
881 New(54,PL_savestack,24,ANY); 977 New(54,PL_savestack,24,ANY);
882 PL_savestack_ix = 0; 978 PL_savestack_ix = 0;
883 PL_savestack_max = 24; 979 PL_savestack_max = 24;
980#if PERL_VERSION_ATLEAST (5,24,0)
981 /* perl 5.24 moves SS_MAXPUSH optimisation from */
982 /* the header macros to PL_savestack_max */
983 PL_savestack_max -= SS_MAXPUSH;
984#endif
884 985
885#if !PERL_VERSION_ATLEAST (5,10,0) 986#if !PERL_VERSION_ATLEAST (5,10,0)
886 New(54,PL_retstack,4,OP*); 987 New(54,PL_retstack,4,OP*);
887 PL_retstack_ix = 0; 988 PL_retstack_ix = 0;
888 PL_retstack_max = 4; 989 PL_retstack_max = 4;
… …
912 } 1013 }
913 1014
914 Safefree (PL_tmps_stack); 1015 Safefree (PL_tmps_stack);
915 Safefree (PL_markstack); 1016 Safefree (PL_markstack);
916 Safefree (PL_scopestack); 1017 Safefree (PL_scopestack);
1018#if HAS_SCOPESTACK_NAME
1019 Safefree (PL_scopestack_name);
1020#endif
917 Safefree (PL_savestack); 1021 Safefree (PL_savestack);
918#if !PERL_VERSION_ATLEAST (5,10,0) 1022#if !PERL_VERSION_ATLEAST (5,10,0)
919 Safefree (PL_retstack); 1023 Safefree (PL_retstack);
920#endif 1024#endif
921} 1025}
… …
951 } 1055 }
952 1056
953 return rss; 1057 return rss;
954} 1058}
955 1059
956/** coroutine stack handling ************************************************/ 1060/** 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 1061
962/* apparently < 5.8.8 */ 1062/* apparently < 5.8.8 */
963#ifndef MgPV_nolen_const 1063#ifndef MgPV_nolen_const
964#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1064#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
965 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1065 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
966 (const char*)(mg)->mg_ptr) 1066 (const char*)(mg)->mg_ptr)
967#endif 1067#endif
1068
1069/* this will be a patched copy of PL_vtbl_sigelem */
1070static MGVTBL coro_sigelem_vtbl;
1071
1072static int ecb_cold
1073coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1074{
1075 char *key = SvPV_nolen ((SV *)name);
1076
1077 /* do what mg_copy normally does */
1078 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1079 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1080
1081 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1082 if (*key == '_'
1083 && (strEQ (key, "__DIE__")
1084 || strEQ (key, "__WARN__")))
1085 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1086
1087 return 1;
1088}
1089
1090/* perl does not have a %SIG vtbl, we provide one so we can override */
1091/* the magic vtbl for the __DIE__ and __WARN__ members */
1092static const MGVTBL coro_sig_vtbl = {
1093 0, 0, 0, 0, 0,
1094 coro_sig_copy
1095};
968 1096
969/* 1097/*
970 * This overrides the default magic get method of %SIG elements. 1098 * 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 1099 * 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), 1100 * and instead of trying to save and restore the hash elements (extremely slow),
… …
974 */ 1102 */
975static int ecb_cold 1103static int ecb_cold
976coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1104coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
977{ 1105{
978 const char *s = MgPV_nolen_const (mg); 1106 const char *s = MgPV_nolen_const (mg);
1107 /* the key must be either __DIE__ or __WARN__ here */
1108 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
979 1109
980 if (*s == '_') 1110 SV *ssv;
981 {
982 SV **svp = 0;
983 1111
984 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
985 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
986
987 if (svp) 1112 if (!*svp)
988 { 1113 ssv = &PL_sv_undef;
989 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1114 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
990 return 0; 1115 ssv = sv_2mortal (newRV_inc (*svp));
991 } 1116 else
992 } 1117 ssv = *svp;
993 1118
994 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1119 sv_setsv (sv, ssv);
1120 return 0;
995} 1121}
996 1122
997static int ecb_cold 1123static int ecb_cold
998coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1124coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
999{ 1125{
1000 const char *s = MgPV_nolen_const (mg); 1126 const char *s = MgPV_nolen_const (mg);
1127 /* the key must be either __DIE__ or __WARN__ here */
1128 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1001 1129
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; 1130 SV *old = *svp;
1012 *svp = 0; 1131 *svp = 0;
1013 SvREFCNT_dec (old); 1132 SvREFCNT_dec (old);
1014 return 0; 1133 return 0;
1015 }
1016 }
1017
1018 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1019} 1134}
1020 1135
1021static int ecb_cold 1136static int ecb_cold
1022coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1137coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1023{ 1138{
1024 const char *s = MgPV_nolen_const (mg); 1139 const char *s = MgPV_nolen_const (mg);
1140 /* the key must be either __DIE__ or __WARN__ here */
1141 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1025 1142
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; 1143 SV *old = *svp;
1036 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1144 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1037 SvREFCNT_dec (old); 1145 SvREFCNT_dec (old);
1038 return 0; 1146 return 0;
1039 }
1040 }
1041
1042 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1043} 1147}
1044 1148
1045static void 1149static void
1046prepare_nop (pTHX_ struct coro_transfer_args *ta) 1150prepare_nop (pTHX_ struct coro_transfer_args *ta)
1047{ 1151{
… …
1058static int 1162static int
1059slf_check_repeat (pTHX_ struct CoroSLF *frame) 1163slf_check_repeat (pTHX_ struct CoroSLF *frame)
1060{ 1164{
1061 return 1; 1165 return 1;
1062} 1166}
1167
1168/** coroutine stack handling ************************************************/
1063 1169
1064static UNOP init_perl_op; 1170static UNOP init_perl_op;
1065 1171
1066ecb_noinline static void /* noinline to keep it out of the transfer fast path */ 1172ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1067init_perl (pTHX_ struct coro *coro) 1173init_perl (pTHX_ struct coro *coro)
… …
1088 PL_hints = 0; 1194 PL_hints = 0;
1089 1195
1090 /* recreate the die/warn hooks */ 1196 /* recreate the die/warn hooks */
1091 PL_diehook = SvREFCNT_inc (rv_diehook); 1197 PL_diehook = SvREFCNT_inc (rv_diehook);
1092 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1198 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1093 1199
1094 GvSV (PL_defgv) = newSV (0); 1200 GvSV (PL_defgv) = newSV (0);
1095 GvAV (PL_defgv) = coro->args; coro->args = 0; 1201 GvAV (PL_defgv) = coro->args; coro->args = 0;
1096 GvSV (PL_errgv) = newSV (0); 1202 GvSV (PL_errgv) = newSV (0);
1097 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1203 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1098 GvHV (PL_hintgv) = 0; 1204 GvHV (PL_hintgv) = newHV ();
1205#if PERL_VERSION_ATLEAST (5,10,0)
1206 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1207#endif
1099 PL_rs = newSVsv (GvSV (irsgv)); 1208 PL_rs = newSVsv (GvSV (irsgv));
1100 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1209 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1101 1210
1102 { 1211 {
1103 dSP; 1212 dSP;
… …
1131 PL_op = (OP *)&init_perl_op; 1240 PL_op = (OP *)&init_perl_op;
1132 1241
1133 /* copy throw, in case it was set before init_perl */ 1242 /* copy throw, in case it was set before init_perl */
1134 CORO_THROW = coro->except; 1243 CORO_THROW = coro->except;
1135 1244
1136 SWAP_SVS (coro); 1245 SWAP_SVS_ENTER (coro);
1137 1246
1138 if (ecb_expect_false (enable_times)) 1247 if (ecb_expect_false (enable_times))
1139 { 1248 {
1140 coro_times_update (); 1249 coro_times_update ();
1141 coro_times_sub (coro); 1250 coro_times_sub (coro);
… …
1179 /* this will cause transfer_check to croak on block*/ 1288 /* this will cause transfer_check to croak on block*/
1180 SvRV_set (coro_current, (SV *)coro->hv); 1289 SvRV_set (coro_current, (SV *)coro->hv);
1181 1290
1182 load_perl (aTHX_ coro); 1291 load_perl (aTHX_ coro);
1183 1292
1293 /* restore swapped sv's */
1294 SWAP_SVS_LEAVE (coro);
1295
1184 coro_unwind_stacks (aTHX); 1296 coro_unwind_stacks (aTHX);
1185 1297
1186 /* restore swapped sv's */
1187 SWAP_SVS (coro);
1188
1189 coro_destruct_stacks (aTHX); 1298 coro_destruct_stacks (aTHX);
1190 1299
1191 // now save some sv's to be free'd later 1300 /* now save some sv's to be free'd later */
1192 svf [0] = GvSV (PL_defgv); 1301 svf [0] = GvSV (PL_defgv);
1193 svf [1] = (SV *)GvAV (PL_defgv); 1302 svf [1] = (SV *)GvAV (PL_defgv);
1194 svf [2] = GvSV (PL_errgv); 1303 svf [2] = GvSV (PL_errgv);
1195 svf [3] = (SV *)PL_defoutgv; 1304 svf [3] = (SV *)PL_defoutgv;
1196 svf [4] = PL_rs; 1305 svf [4] = PL_rs;
… …
1213 1322
1214 SvREFCNT_dec (coro->saved_deffh); 1323 SvREFCNT_dec (coro->saved_deffh);
1215 SvREFCNT_dec (coro->rouse_cb); 1324 SvREFCNT_dec (coro->rouse_cb);
1216 SvREFCNT_dec (coro->invoke_cb); 1325 SvREFCNT_dec (coro->invoke_cb);
1217 SvREFCNT_dec (coro->invoke_av); 1326 SvREFCNT_dec (coro->invoke_av);
1327 SvREFCNT_dec (coro->on_enter_xs);
1328 SvREFCNT_dec (coro->on_leave_xs);
1218 } 1329 }
1219} 1330}
1220 1331
1221ECB_INLINE void 1332ecb_inline void
1222free_coro_mortal (pTHX) 1333free_coro_mortal (pTHX)
1223{ 1334{
1224 if (ecb_expect_true (coro_mortal)) 1335 if (ecb_expect_true (coro_mortal))
1225 { 1336 {
1226 SvREFCNT_dec ((SV *)coro_mortal); 1337 SvREFCNT_dec ((SV *)coro_mortal);
… …
1285 1396
1286 if (PL_curcop != &PL_compiling) 1397 if (PL_curcop != &PL_compiling)
1287 { 1398 {
1288 SV **cb; 1399 SV **cb;
1289 1400
1290 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1401 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1291 { 1402 {
1292 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1403 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1293 1404
1294 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1405 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1295 { 1406 {
… …
1305 SAVETMPS; 1416 SAVETMPS;
1306 EXTEND (SP, 3); 1417 EXTEND (SP, 3);
1307 PUSHMARK (SP); 1418 PUSHMARK (SP);
1308 PUSHs (&PL_sv_yes); 1419 PUSHs (&PL_sv_yes);
1309 PUSHs (fullname); 1420 PUSHs (fullname);
1310 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1421 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (SUB_ARGARRAY)) : &PL_sv_undef);
1311 PUTBACK; 1422 PUTBACK;
1312 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1423 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); 1424 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1314 SPAGAIN; 1425 SPAGAIN;
1315 FREETMPS; 1426 FREETMPS;
… …
1385 slf_frame.prepare = slf_prepare_set_stacklevel; 1496 slf_frame.prepare = slf_prepare_set_stacklevel;
1386 slf_frame.check = slf_check_set_stacklevel; 1497 slf_frame.check = slf_check_set_stacklevel;
1387} 1498}
1388 1499
1389/* the tail of transfer: execute stuff we can only do after a transfer */ 1500/* the tail of transfer: execute stuff we can only do after a transfer */
1390ECB_INLINE void 1501ecb_inline void
1391transfer_tail (pTHX) 1502transfer_tail (pTHX)
1392{ 1503{
1393 free_coro_mortal (aTHX); 1504 free_coro_mortal (aTHX);
1505}
1506
1507/* try to exit the same way perl's main function would do */
1508/* we do not bother resetting the environment or other things *7
1509/* that are not, uhm, essential */
1510/* this obviously also doesn't work when perl is embedded */
1511static void ecb_noinline ecb_cold
1512perlish_exit (pTHX)
1513{
1514 int exitstatus = perl_destruct (PL_curinterp);
1515 perl_free (PL_curinterp);
1516 exit (exitstatus);
1394} 1517}
1395 1518
1396/* 1519/*
1397 * this is a _very_ stripped down perl interpreter ;) 1520 * this is a _very_ stripped down perl interpreter ;)
1398 */ 1521 */
… …
1425 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1548 * 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. 1549 * runtime errors here, as this is just a random interpreter, not a thread.
1427 */ 1550 */
1428 1551
1429 /* 1552 /*
1553 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1554 * requires PL_scopestack_ix, so do it here if required.
1555 */
1556 if (!PL_scopestack_ix)
1557 ENTER;
1558
1559 /*
1430 * If perl-run returns we assume exit() was being called or the coro 1560 * 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) 1561 * 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 1562 * 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" 1563 * 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 */ 1564 */
1438 PL_top_env = main_top_env; 1565 perlish_exit (aTHX);
1439 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1440 } 1566 }
1441} 1567}
1442 1568
1443static coro_cctx * 1569static coro_cctx *
1444cctx_new () 1570cctx_new (void)
1445{ 1571{
1446 coro_cctx *cctx; 1572 coro_cctx *cctx;
1447 1573
1448 ++cctx_count; 1574 ++cctx_count;
1449 New (0, cctx, 1, coro_cctx); 1575 New (0, cctx, 1, coro_cctx);
… …
1455 return cctx; 1581 return cctx;
1456} 1582}
1457 1583
1458/* create a new cctx only suitable as source */ 1584/* create a new cctx only suitable as source */
1459static coro_cctx * 1585static coro_cctx *
1460cctx_new_empty () 1586cctx_new_empty (void)
1461{ 1587{
1462 coro_cctx *cctx = cctx_new (); 1588 coro_cctx *cctx = cctx_new ();
1463 1589
1464 cctx->sptr = 0; 1590 cctx->stack.sptr = 0;
1465 coro_create (&cctx->cctx, 0, 0, 0, 0); 1591 coro_create (&cctx->cctx, 0, 0, 0, 0);
1466 1592
1467 return cctx; 1593 return cctx;
1468} 1594}
1469 1595
1470/* create a new cctx suitable as destination/running a perl interpreter */ 1596/* create a new cctx suitable as destination/running a perl interpreter */
1471static coro_cctx * 1597static coro_cctx *
1472cctx_new_run () 1598cctx_new_run (void)
1473{ 1599{
1474 coro_cctx *cctx = cctx_new (); 1600 coro_cctx *cctx = cctx_new ();
1475 void *stack_start;
1476 size_t stack_size;
1477 1601
1478#if HAVE_MMAP 1602 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 } 1603 {
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."); 1604 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1501 _exit (EXIT_FAILURE); 1605 _exit (EXIT_FAILURE);
1502 }
1503
1504 stack_start = cctx->sptr;
1505 stack_size = cctx->ssize;
1506 } 1606 }
1507 1607
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); 1608 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1513 1609
1514 return cctx; 1610 return cctx;
1515} 1611}
1516 1612
1517static void 1613static void
… …
1523 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1619 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1524 1620
1525 --cctx_count; 1621 --cctx_count;
1526 coro_destroy (&cctx->cctx); 1622 coro_destroy (&cctx->cctx);
1527 1623
1528 /* coro_transfer creates new, empty cctx's */ 1624 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 1625
1543 Safefree (cctx); 1626 Safefree (cctx);
1544} 1627}
1545 1628
1546/* wether this cctx should be destructed */ 1629/* wether this cctx should be destructed */
… …
1565} 1648}
1566 1649
1567static void 1650static void
1568cctx_put (coro_cctx *cctx) 1651cctx_put (coro_cctx *cctx)
1569{ 1652{
1570 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1653 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1571 1654
1572 /* free another cctx if overlimit */ 1655 /* free another cctx if overlimit */
1573 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1656 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1574 { 1657 {
1575 coro_cctx *first = cctx_first; 1658 coro_cctx *first = cctx_first;
… …
1701 return; 1784 return;
1702 1785
1703 slf_destroy (aTHX_ coro); 1786 slf_destroy (aTHX_ coro);
1704 1787
1705 coro->flags |= CF_ZOMBIE; 1788 coro->flags |= CF_ZOMBIE;
1706 1789
1707 if (coro->flags & CF_READY) 1790 if (coro->flags & CF_READY)
1708 { 1791 {
1709 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1792 /* reduce nready, as destroying a ready coro effectively unreadies it */
1710 /* alternative: look through all ready queues and remove the coro */ 1793 /* alternative: look through all ready queues and remove the coro */
1711 --coro_nready; 1794 --coro_nready;
… …
1788 TRANSFER (ta, 1); 1871 TRANSFER (ta, 1);
1789} 1872}
1790 1873
1791/** Coro ********************************************************************/ 1874/** Coro ********************************************************************/
1792 1875
1793ECB_INLINE void 1876ecb_inline void
1794coro_enq (pTHX_ struct coro *coro) 1877coro_enq (pTHX_ struct coro *coro)
1795{ 1878{
1796 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1879 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1797 1880
1798 SvREFCNT_inc_NN (coro->hv); 1881 SvREFCNT_inc_NN (coro->hv);
… …
1800 coro->next_ready = 0; 1883 coro->next_ready = 0;
1801 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1884 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1802 ready [1] = coro; 1885 ready [1] = coro;
1803} 1886}
1804 1887
1805ECB_INLINE struct coro * 1888ecb_inline struct coro *
1806coro_deq (pTHX) 1889coro_deq (pTHX)
1807{ 1890{
1808 int prio; 1891 int prio;
1809 1892
1810 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1893 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1863{ 1946{
1864 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1947 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1865} 1948}
1866 1949
1867/* expects to own a reference to next->hv */ 1950/* expects to own a reference to next->hv */
1868ECB_INLINE void 1951ecb_inline void
1869prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1952prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1870{ 1953{
1871 SV *prev_sv = SvRV (coro_current); 1954 SV *prev_sv = SvRV (coro_current);
1872 1955
1873 ta->prev = SvSTATE_hv (prev_sv); 1956 ta->prev = SvSTATE_hv (prev_sv);
… …
1907 /* nothing to schedule: call the idle handler */ 1990 /* nothing to schedule: call the idle handler */
1908 if (SvROK (sv_idle) 1991 if (SvROK (sv_idle)
1909 && SvOBJECT (SvRV (sv_idle))) 1992 && SvOBJECT (SvRV (sv_idle)))
1910 { 1993 {
1911 if (SvRV (sv_idle) == SvRV (coro_current)) 1994 if (SvRV (sv_idle) == SvRV (coro_current))
1995 {
1996 require_pv ("Carp");
1997
1998 {
1999 dSP;
2000
2001 ENTER;
2002 SAVETMPS;
2003
2004 PUSHMARK (SP);
1912 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2005 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2006 PUTBACK;
2007 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2008
2009 FREETMPS;
2010 LEAVE;
2011 }
2012 }
1913 2013
1914 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2014 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1915 api_ready (aTHX_ SvRV (sv_idle)); 2015 api_ready (aTHX_ SvRV (sv_idle));
1916 --coro_nready; 2016 --coro_nready;
1917 } 2017 }
… …
1932 } 2032 }
1933 } 2033 }
1934 } 2034 }
1935} 2035}
1936 2036
1937ECB_INLINE void 2037ecb_inline void
1938prepare_cede (pTHX_ struct coro_transfer_args *ta) 2038prepare_cede (pTHX_ struct coro_transfer_args *ta)
1939{ 2039{
1940 api_ready (aTHX_ coro_current); 2040 api_ready (aTHX_ coro_current);
1941 prepare_schedule (aTHX_ ta); 2041 prepare_schedule (aTHX_ ta);
1942} 2042}
1943 2043
1944ECB_INLINE void 2044ecb_inline void
1945prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2045prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1946{ 2046{
1947 SV *prev = SvRV (coro_current); 2047 SV *prev = SvRV (coro_current);
1948 2048
1949 if (coro_nready) 2049 if (coro_nready)
… …
2114{ 2214{
2115 AV *od = coro->on_destroy; 2215 AV *od = coro->on_destroy;
2116 2216
2117 if (!od) 2217 if (!od)
2118 return; 2218 return;
2219
2220 coro->on_destroy = 0;
2221 sv_2mortal ((SV *)od);
2119 2222
2120 while (AvFILLp (od) >= 0) 2223 while (AvFILLp (od) >= 0)
2121 { 2224 {
2122 SV *cb = sv_2mortal (av_pop (od)); 2225 SV *cb = sv_2mortal (av_pop (od));
2123 2226
… …
2144 2247
2145static void 2248static void
2146coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2249coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2147{ 2250{
2148 AV *av; 2251 AV *av;
2149 2252
2150 if (coro->status) 2253 if (coro->status)
2151 { 2254 {
2152 av = coro->status; 2255 av = coro->status;
2153 av_clear (av); 2256 av_clear (av);
2154 } 2257 }
… …
2201 2304
2202 coro = SvSTATE (arg [0]); 2305 coro = SvSTATE (arg [0]);
2203 coro_hv = coro->hv; 2306 coro_hv = coro->hv;
2204 2307
2205 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2308 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2206 2309
2207 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2310 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2208 { 2311 {
2209 /* coro currently busy cancelling something, so just notify it */ 2312 /* coro currently busy cancelling something, so just notify it */
2210 coro->slf_frame.data = (void *)coro; 2313 coro->slf_frame.data = (void *)coro;
2211 2314
… …
2218 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2321 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2219 } 2322 }
2220 else 2323 else
2221 { 2324 {
2222 struct coro *self = SvSTATE_current; 2325 struct coro *self = SvSTATE_current;
2326
2327 if (!self)
2328 croak ("Coro::cancel called outside of thread content,");
2223 2329
2224 /* otherwise we cancel directly, purely for speed reasons 2330 /* otherwise we cancel directly, purely for speed reasons
2225 * unfortunately, this requires some magic trickery, as 2331 * unfortunately, this requires some magic trickery, as
2226 * somebody else could cancel us, so we have to fight the cancellation. 2332 * somebody else could cancel us, so we have to fight the cancellation.
2227 * this is ugly, and hopefully fully worth the extra speed. 2333 * this is ugly, and hopefully fully worth the extra speed.
… …
2337 else 2443 else
2338 { 2444 {
2339 av_clear (GvAV (PL_defgv)); 2445 av_clear (GvAV (PL_defgv));
2340 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2446 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2341 2447
2448 if (ecb_expect_false (coro->swap_sv))
2449 {
2450 SWAP_SVS_LEAVE (coro);
2451 SvREFCNT_dec_NN (coro->swap_sv);
2452 coro->swap_sv = 0;
2453 }
2454
2342 coro->prio = 0; 2455 coro->prio = 0;
2343 2456
2344 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2457 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2345 api_trace (aTHX_ coro_current, 0); 2458 api_trace (aTHX_ coro_current, 0);
2346 2459
2347 frame->prepare = prepare_schedule; 2460 frame->prepare = prepare_schedule;
2348 av_push (av_async_pool, SvREFCNT_inc (hv)); 2461 av_push (av_async_pool, SvREFCNT_inc (hv));
2349 } 2462 }
… …
2390 2503
2391static int 2504static int
2392slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2505slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2393{ 2506{
2394 SV *data = (SV *)frame->data; 2507 SV *data = (SV *)frame->data;
2395 2508
2396 if (CORO_THROW) 2509 if (CORO_THROW)
2397 return 0; 2510 return 0;
2398 2511
2399 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2512 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2400 return 1; 2513 return 1;
… …
2436 cb = sv_2mortal (coro->rouse_cb); 2549 cb = sv_2mortal (coro->rouse_cb);
2437 coro->rouse_cb = 0; 2550 coro->rouse_cb = 0;
2438 } 2551 }
2439 2552
2440 if (!SvROK (cb) 2553 if (!SvROK (cb)
2441 || SvTYPE (SvRV (cb)) != SVt_PVCV 2554 || SvTYPE (SvRV (cb)) != SVt_PVCV
2442 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2555 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2443 croak ("Coro::rouse_wait called with illegal callback argument,"); 2556 croak ("Coro::rouse_wait called with illegal callback argument,");
2444 2557
2445 { 2558 {
2446 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2559 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2569 2682
2570/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2683/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2571static void 2684static void
2572slf_destroy (pTHX_ struct coro *coro) 2685slf_destroy (pTHX_ struct coro *coro)
2573{ 2686{
2574 /* this callback is reserved for slf functions needing to do cleanup */ 2687 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 2688
2578 /* 2689 /*
2579 * The on_destroy above most likely is from an SLF call. 2690 * The on_destroy below most likely is from an SLF call.
2580 * Since by definition the SLF call will not finish when we destroy 2691 * Since by definition the SLF call will not finish when we destroy
2581 * the coro, we will have to force-finish it here, otherwise 2692 * the coro, we will have to force-finish it here, otherwise
2582 * cleanup functions cannot call SLF functions. 2693 * cleanup functions cannot call SLF functions.
2583 */ 2694 */
2584 coro->slf_frame.prepare = 0; 2695 coro->slf_frame.prepare = 0;
2696
2697 /* this callback is reserved for slf functions needing to do cleanup */
2698 if (frame.destroy && frame.prepare && !PL_dirty)
2699 frame.destroy (aTHX_ &frame);
2585} 2700}
2586 2701
2587/* 2702/*
2588 * these not obviously related functions are all rolled into one 2703 * these not obviously related functions are all rolled into one
2589 * function to increase chances that they all will call transfer with the same 2704 * function to increase chances that they all will call transfer with the same
… …
2772static void 2887static void
2773coro_pop_on_leave (pTHX_ void *coro) 2888coro_pop_on_leave (pTHX_ void *coro)
2774{ 2889{
2775 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2890 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2776 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2891 on_enterleave_call (aTHX_ sv_2mortal (cb));
2892}
2893
2894static void
2895enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2896{
2897 if (!hook)
2898 return;
2899
2900 if (!*avp)
2901 {
2902 *avp = newAV ();
2903 AvREAL_off (*avp);
2904 }
2905
2906 av_push (*avp, (SV *)hook);
2907 av_push (*avp, (SV *)arg);
2908}
2909
2910static void
2911enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2912{
2913 AV *av = *avp;
2914 int i;
2915
2916 if (!av)
2917 return;
2918
2919 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2920 if (AvARRAY (av)[i] == (SV *)hook)
2921 {
2922 if (execute)
2923 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2924
2925 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2926 av_pop (av);
2927 av_pop (av);
2928 break;
2929 }
2930
2931 if (AvFILLp (av) >= 0)
2932 {
2933 *avp = 0;
2934 SvREFCNT_dec_NN (av);
2935 }
2936}
2937
2938static void
2939api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2940{
2941 struct coro *coro = SvSTATE (coro_sv);
2942
2943 if (SvSTATE_current == coro)
2944 if (enter)
2945 enter (aTHX_ enter_arg);
2946
2947 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2948 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2949}
2950
2951static void
2952api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2953{
2954 struct coro *coro = SvSTATE (coro_sv);
2955
2956 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2957 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2958}
2959
2960static void
2961savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2962{
2963 struct coro *coro = SvSTATE_current;
2964
2965 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2966}
2967
2968static void
2969savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2970{
2971 struct coro *coro = SvSTATE_current;
2972
2973 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2974}
2975
2976static void
2977api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2978{
2979 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2980
2981 /* this ought to be much cheaper than malloc + a single destructor call */
2982 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2983 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2777} 2984}
2778 2985
2779/*****************************************************************************/ 2986/*****************************************************************************/
2780/* PerlIO::cede */ 2987/* PerlIO::cede */
2781 2988
… …
2911 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3118 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2912 PUTBACK; 3119 PUTBACK;
2913 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3120 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2914 } 3121 }
2915 3122
2916 SvREFCNT_dec (cb); 3123 SvREFCNT_dec_NN (cb);
2917 } 3124 }
2918} 3125}
2919 3126
2920static void 3127static void
2921coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3128coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
2929{ 3136{
2930 AV *av = (AV *)frame->data; 3137 AV *av = (AV *)frame->data;
2931 SV *count_sv = AvARRAY (av)[0]; 3138 SV *count_sv = AvARRAY (av)[0];
2932 SV *coro_hv = SvRV (coro_current); 3139 SV *coro_hv = SvRV (coro_current);
2933 3140
3141 frame->destroy = 0;
3142
2934 /* if we are about to throw, don't actually acquire the lock, just throw */ 3143 /* if we are about to throw, don't actually acquire the lock, just throw */
2935 if (CORO_THROW) 3144 if (ecb_expect_false (CORO_THROW))
3145 {
3146 /* we still might be responsible for the semaphore, so wake up others */
3147 coro_semaphore_adjust (aTHX_ av, 0);
3148
2936 return 0; 3149 return 0;
3150 }
2937 else if (SvIVX (count_sv) > 0) 3151 else if (SvIVX (count_sv) > 0)
2938 { 3152 {
2939 frame->destroy = 0;
2940
2941 if (acquire) 3153 if (acquire)
2942 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3154 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2943 else 3155 else
2944 coro_semaphore_adjust (aTHX_ av, 0); 3156 coro_semaphore_adjust (aTHX_ av, 0);
2945 3157
… …
2949 { 3161 {
2950 int i; 3162 int i;
2951 /* if we were woken up but can't down, we look through the whole */ 3163 /* 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 */ 3164 /* waiters list and only add us if we aren't in there already */
2953 /* this avoids some degenerate memory usage cases */ 3165 /* this avoids some degenerate memory usage cases */
2954 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 3166 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2955 if (AvARRAY (av)[i] == coro_hv) 3167 if (AvARRAY (av)[i] == coro_hv)
2956 return 1; 3168 return 1;
2957 3169
2958 av_push (av, SvREFCNT_inc (coro_hv)); 3170 av_push (av, SvREFCNT_inc (coro_hv));
2959 return 1; 3171 return 1;
… …
3056 { 3268 {
3057 api_ready (aTHX_ cb); 3269 api_ready (aTHX_ cb);
3058 sv_setiv (cb, 0); /* signal waiter */ 3270 sv_setiv (cb, 0); /* signal waiter */
3059 } 3271 }
3060 3272
3061 SvREFCNT_dec (cb); 3273 SvREFCNT_dec_NN (cb);
3062 3274
3063 --count; 3275 --count;
3064 } 3276 }
3065} 3277}
3066 3278
… …
3151 } 3363 }
3152 3364
3153 av_push (state, data_sv); 3365 av_push (state, data_sv);
3154 3366
3155 api_ready (aTHX_ coro); 3367 api_ready (aTHX_ coro);
3156 SvREFCNT_dec (coro); 3368 SvREFCNT_dec_NN (coro);
3157 SvREFCNT_dec ((AV *)state); 3369 SvREFCNT_dec_NN ((AV *)state);
3158} 3370}
3159 3371
3160static int 3372static int
3161slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3373slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3162{ 3374{
… …
3167 /* it quickly returns */ 3379 /* it quickly returns */
3168 if (CORO_THROW) 3380 if (CORO_THROW)
3169 return 0; 3381 return 0;
3170 3382
3171 /* one element that is an RV? repeat! */ 3383 /* one element that is an RV? repeat! */
3172 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3384 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3173 return 1; 3385 return 1;
3174 3386
3175 /* restore status */ 3387 /* restore status */
3176 { 3388 {
3177 SV *data_sv = av_pop (state); 3389 SV *data_sv = av_pop (state);
… …
3180 errno = data->errorno; 3392 errno = data->errorno;
3181 PL_laststype = data->laststype; 3393 PL_laststype = data->laststype;
3182 PL_laststatval = data->laststatval; 3394 PL_laststatval = data->laststatval;
3183 PL_statcache = data->statcache; 3395 PL_statcache = data->statcache;
3184 3396
3185 SvREFCNT_dec (data_sv); 3397 SvREFCNT_dec_NN (data_sv);
3186 } 3398 }
3187 3399
3188 /* push result values */ 3400 /* push result values */
3189 { 3401 {
3190 dSP; 3402 dSP;
… …
3339#endif 3551#endif
3340 3552
3341#if CORO_JIT 3553#if CORO_JIT
3342 3554
3343static void ecb_noinline ecb_cold 3555static void ecb_noinline ecb_cold
3344pushav_3uv (pTHX_ UV a, UV b, UV c) 3556pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3345{ 3557{
3346 dSP; 3558 dSP;
3347 AV *av = newAV (); 3559 AV *av = newAV ();
3348 3560
3561 av_store (av, 3, newSVuv (d));
3349 av_store (av, 2, newSVuv (c)); 3562 av_store (av, 2, newSVuv (c));
3350 av_store (av, 1, newSVuv (b)); 3563 av_store (av, 1, newSVuv (b));
3351 av_store (av, 0, newSVuv (a)); 3564 av_store (av, 0, newSVuv (a));
3352 3565
3353 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 3566 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
… …
3360{ 3573{
3361 dSP; 3574 dSP;
3362 SV *load, *save; 3575 SV *load, *save;
3363 char *map_base; 3576 char *map_base;
3364 char *load_ptr, *save_ptr; 3577 char *load_ptr, *save_ptr;
3365 STRLEN load_len, save_len; 3578 STRLEN load_len, save_len, map_len;
3366 int count; 3579 int count;
3367 3580
3581 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3582
3368 PUSHMARK (SP); 3583 PUSHMARK (SP);
3369 PUTBACK;
3370#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type)); 3584 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3371# include "state.h" 3585 #include "state.h"
3372#undef VARx
3373 count = call_pv ("Coro::State::_jit", G_ARRAY); 3586 count = call_pv ("Coro::State::_jit", G_ARRAY);
3374 SPAGAIN; 3587 SPAGAIN;
3375 3588
3376 save = POPs; save_ptr = SvPVbyte (save, save_len); 3589 save = POPs; save_ptr = SvPVbyte (save, save_len);
3377 load = POPs; load_ptr = SvPVbyte (load, load_len); 3590 load = POPs; load_ptr = SvPVbyte (load, load_len);
3378 3591
3592 map_len = load_len + save_len + 16;
3593
3594 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3595
3596 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); 3597 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3380 3598
3381 assert (("Coro: unable mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3599 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3382 3600
3383 load_perl_slots = (load_save_perl_slots_type)map_base; 3601 load_perl_slots = (load_save_perl_slots_type)map_base;
3384 memcpy (map_base, load_ptr, load_len); 3602 memcpy (map_base, load_ptr, load_len);
3385 3603
3386 map_base += (load_len + 15) & ~15; 3604 map_base += (load_len + 15) & ~15;
3387 3605
3388 save_perl_slots = (load_save_perl_slots_type)map_base; 3606 save_perl_slots = (load_save_perl_slots_type)map_base;
3389 memcpy (map_base, save_ptr, save_len); 3607 memcpy (map_base, save_ptr, save_len);
3608
3609 /* we are good citizens and try to make the page read-only, so the evil evil */
3610 /* hackers might have it a bit more difficult */
3611 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3612
3613 PUTBACK;
3614 eval_pv ("undef &Coro::State::_jit", 1);
3390} 3615}
3391 3616
3392#endif 3617#endif
3393 3618
3394MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3619MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3395 3620
3396PROTOTYPES: DISABLE 3621PROTOTYPES: DISABLE
3397 3622
3398BOOT: 3623BOOT:
3399{ 3624{
3625#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3626#include "state.h"
3400#ifdef USE_ITHREADS 3627#ifdef USE_ITHREADS
3401# if CORO_PTHREAD 3628# if CORO_PTHREAD
3402 coro_thx = PERL_GET_CONTEXT; 3629 coro_thx = PERL_GET_CONTEXT;
3403# endif 3630# endif
3404#endif 3631#endif
3405 BOOT_PAGESIZE;
3406
3407 /* perl defines these to check for existance first, but why it doesn't */ 3632 /* 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 */ 3633 /* just create them one at init time is not clear to me, except for */
3409 /* programs trying to delete them, but... */ 3634 /* programs trying to delete them, but... */
3410 /* anyway, we declare this as invalid and make sure they are initialised here */ 3635 /* anyway, we declare this as invalid and make sure they are initialised here */
3411 DEFSV; 3636 DEFSV;
… …
3414 cctx_current = cctx_new_empty (); 3639 cctx_current = cctx_new_empty ();
3415 3640
3416 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3641 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3417 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3642 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3418 3643
3419 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3644 {
3420 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3645 /*
3421 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3646 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3647 * by coro_sig_vtbl in hash values.
3648 */
3649 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3650
3651 /* this only works if perl doesn't have a vtbl for %SIG */
3652 assert (!mg->mg_virtual);
3653
3654 /*
3655 * The irony is that the perl API itself asserts that mg_virtual
3656 * must be non-const, yet perl5porters insisted on marking their
3657 * vtbls as read-only, just to thwart perl modules from patching
3658 * them.
3659 */
3660 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3661 mg->mg_flags |= MGf_COPY;
3662
3663 coro_sigelem_vtbl = PL_vtbl_sigelem;
3664 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3665 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3666 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3667 }
3422 3668
3423 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3424 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3669 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)); 3670 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3426 3671
3427 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3672 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3428 3673
… …
3462 time_init (aTHX); 3707 time_init (aTHX);
3463 3708
3464 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3709 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3465#if CORO_JIT 3710#if CORO_JIT
3466 PUTBACK; 3711 PUTBACK;
3467 require_pv ("Coro/jit-" CORO_JIT_TYPE ".pl");
3468 jit_init (aTHX); 3712 jit_init (aTHX);
3469 perl_eval_pv ("undef &Coro::State::_jit", 1);
3470 SPAGAIN; 3713 SPAGAIN;
3471#endif 3714#endif
3472} 3715}
3473 3716
3474SV * 3717SV *
… …
3483void 3726void
3484transfer (...) 3727transfer (...)
3485 PROTOTYPE: $$ 3728 PROTOTYPE: $$
3486 CODE: 3729 CODE:
3487 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3730 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3488
3489void
3490_exit (int code)
3491 PROTOTYPE: $
3492 CODE:
3493 _exit (code);
3494 3731
3495SV * 3732SV *
3496clone (Coro::State coro) 3733clone (Coro::State coro)
3497 CODE: 3734 CODE:
3498{ 3735{
… …
3553void 3790void
3554list () 3791list ()
3555 PROTOTYPE: 3792 PROTOTYPE:
3556 PPCODE: 3793 PPCODE:
3557{ 3794{
3558 struct coro *coro; 3795 struct coro *coro;
3559 for (coro = coro_first; coro; coro = coro->next) 3796 for (coro = coro_first; coro; coro = coro->next)
3560 if (coro->hv) 3797 if (coro->hv)
3561 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3798 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3562} 3799}
3563 3800
… …
3627 RETVAL = boolSV (coro->flags & ix); 3864 RETVAL = boolSV (coro->flags & ix);
3628 OUTPUT: 3865 OUTPUT:
3629 RETVAL 3866 RETVAL
3630 3867
3631void 3868void
3632throw (Coro::State self, SV *exception = &PL_sv_undef) 3869throw (SV *self, SV *exception = &PL_sv_undef)
3633 PROTOTYPE: $;$ 3870 PROTOTYPE: $;$
3634 CODE: 3871 CODE:
3635{ 3872{
3873 struct coro *coro = SvSTATE (self);
3636 struct coro *current = SvSTATE_current; 3874 struct coro *current = SvSTATE_current;
3637 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3875 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3638 SvREFCNT_dec (*exceptionp); 3876 SvREFCNT_dec (*exceptionp);
3639 SvGETMAGIC (exception); 3877 SvGETMAGIC (exception);
3640 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3878 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3879
3880 api_ready (aTHX_ self);
3641} 3881}
3642 3882
3643void 3883void
3644api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3884api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3645 PROTOTYPE: $;$ 3885 PROTOTYPE: $;$
… …
3722 3962
3723void 3963void
3724times (Coro::State self) 3964times (Coro::State self)
3725 PPCODE: 3965 PPCODE:
3726{ 3966{
3727 struct coro *current = SvSTATE (coro_current); 3967 struct coro *current = SvSTATE (coro_current);
3728 3968
3729 if (ecb_expect_false (current == self)) 3969 if (ecb_expect_false (current == self))
3730 { 3970 {
3731 coro_times_update (); 3971 coro_times_update ();
3732 coro_times_add (SvSTATE (coro_current)); 3972 coro_times_add (SvSTATE (coro_current));
… …
3739 if (ecb_expect_false (current == self)) 3979 if (ecb_expect_false (current == self))
3740 coro_times_sub (SvSTATE (coro_current)); 3980 coro_times_sub (SvSTATE (coro_current));
3741} 3981}
3742 3982
3743void 3983void
3744swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3984swap_sv (Coro::State coro, SV *sva, SV *svb)
3745 CODE: 3985 CODE:
3746{ 3986{
3747 struct coro *current = SvSTATE_current; 3987 struct coro *current = SvSTATE_current;
3988 AV *swap_sv;
3989 int i;
3990
3991 sva = SvRV (sva);
3992 svb = SvRV (svb);
3748 3993
3749 if (current == coro) 3994 if (current == coro)
3750 SWAP_SVS (current); 3995 SWAP_SVS_LEAVE (current);
3751 3996
3752 if (!coro->swap_sv) 3997 if (!coro->swap_sv)
3753 coro->swap_sv = newAV (); 3998 coro->swap_sv = newAV ();
3754 3999
4000 swap_sv = coro->swap_sv;
4001
4002 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4003 {
4004 SV *a = AvARRAY (swap_sv)[i ];
4005 SV *b = AvARRAY (swap_sv)[i + 1];
4006
4007 if (a == sva && b == svb)
4008 {
4009 SvREFCNT_dec_NN (a);
4010 SvREFCNT_dec_NN (b);
4011
4012 for (; i <= AvFILLp (swap_sv) - 2; i++)
4013 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4014
4015 AvFILLp (swap_sv) -= 2;
4016
4017 goto removed;
4018 }
4019 }
4020
3755 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4021 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3756 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4022 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4023
4024 removed:
3757 4025
3758 if (current == coro) 4026 if (current == coro)
3759 SWAP_SVS (current); 4027 SWAP_SVS_ENTER (current);
3760} 4028}
3761 4029
3762 4030
3763MODULE = Coro::State PACKAGE = Coro 4031MODULE = Coro::State PACKAGE = Coro
3764 4032
3765BOOT: 4033BOOT:
3766{ 4034{
4035 if (SVt_LAST > 32)
4036 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4037
3767 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4038 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3768 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4039 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3769 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4040 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3770 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4041 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); 4042 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3775 4046
3776 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4047 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); 4048 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); 4049 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 */ 4050 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3780 4051
3781 coro_stash = gv_stashpv ("Coro", TRUE); 4052 coro_stash = gv_stashpv ("Coro", TRUE);
3782 4053
3783 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4054 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3784 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4055 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3785 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4056 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3797 coroapi.ready = api_ready; 4068 coroapi.ready = api_ready;
3798 coroapi.is_ready = api_is_ready; 4069 coroapi.is_ready = api_is_ready;
3799 coroapi.nready = coro_nready; 4070 coroapi.nready = coro_nready;
3800 coroapi.current = coro_current; 4071 coroapi.current = coro_current;
3801 4072
4073 coroapi.enterleave_hook = api_enterleave_hook;
4074 coroapi.enterleave_unhook = api_enterleave_unhook;
4075 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4076
3802 /*GCoroAPI = &coroapi;*/ 4077 /*GCoroAPI = &coroapi;*/
3803 sv_setiv (sv, (IV)&coroapi); 4078 sv_setiv (sv, (IV)&coroapi);
3804 SvREADONLY_on (sv); 4079 SvREADONLY_on (sv);
3805 } 4080 }
3806} 4081}
… …
3871 4146
3872void 4147void
3873_set_current (SV *current) 4148_set_current (SV *current)
3874 PROTOTYPE: $ 4149 PROTOTYPE: $
3875 CODE: 4150 CODE:
3876 SvREFCNT_dec (SvRV (coro_current)); 4151 SvREFCNT_dec_NN (SvRV (coro_current));
3877 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4152 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3878 4153
3879void 4154void
3880_set_readyhook (SV *hook) 4155_set_readyhook (SV *hook)
3881 PROTOTYPE: $ 4156 PROTOTYPE: $
… …
3965 4240
3966 if ((SV *)hv == &PL_sv_undef) 4241 if ((SV *)hv == &PL_sv_undef)
3967 { 4242 {
3968 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4243 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3969 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4244 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3970 SvREFCNT_dec (sv); 4245 SvREFCNT_dec_NN (sv);
3971 } 4246 }
3972 4247
3973 { 4248 {
3974 struct coro *coro = SvSTATE_hv (hv); 4249 struct coro *coro = SvSTATE_hv (hv);
3975 4250
… …
3982 api_ready (aTHX_ (SV *)hv); 4257 api_ready (aTHX_ (SV *)hv);
3983 4258
3984 if (GIMME_V != G_VOID) 4259 if (GIMME_V != G_VOID)
3985 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4260 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3986 else 4261 else
3987 SvREFCNT_dec (hv); 4262 SvREFCNT_dec_NN (hv);
3988} 4263}
3989 4264
3990SV * 4265SV *
3991rouse_cb () 4266rouse_cb ()
3992 PROTOTYPE: 4267 PROTOTYPE:
… …
4007 on_leave = 1 4282 on_leave = 1
4008 PROTOTYPE: & 4283 PROTOTYPE: &
4009 CODE: 4284 CODE:
4010{ 4285{
4011 struct coro *coro = SvSTATE_current; 4286 struct coro *coro = SvSTATE_current;
4012 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4287 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4013 4288
4014 block = s_get_cv_croak (block); 4289 block = s_get_cv_croak (block);
4015 4290
4016 if (!*avp) 4291 if (!*avp)
4017 *avp = newAV (); 4292 *avp = newAV ();
… …
4037 4312
4038SV * 4313SV *
4039new (SV *klass, SV *count = 0) 4314new (SV *klass, SV *count = 0)
4040 CODE: 4315 CODE:
4041{ 4316{
4042 int semcnt = 1; 4317 int semcnt = 1;
4043 4318
4044 if (count) 4319 if (count)
4045 { 4320 {
4046 SvGETMAGIC (count); 4321 SvGETMAGIC (count);
4047 4322
… …
4071 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4346 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4072 OUTPUT: 4347 OUTPUT:
4073 RETVAL 4348 RETVAL
4074 4349
4075void 4350void
4076up (SV *self, int adjust = 1) 4351up (SV *self)
4077 ALIAS:
4078 adjust = 1
4079 CODE: 4352 CODE:
4353 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4354
4355void
4356adjust (SV *self, int adjust)
4357 CODE:
4080 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4358 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4081 4359
4082void 4360void
4083down (...) 4361down (...)
4084 CODE: 4362 CODE:
4085 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4363 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
4107 XSRETURN_NO; 4385 XSRETURN_NO;
4108} 4386}
4109 4387
4110void 4388void
4111waiters (SV *self) 4389waiters (SV *self)
4112 PPCODE: 4390 PPCODE:
4113{ 4391{
4114 AV *av = (AV *)SvRV (self); 4392 AV *av = (AV *)SvRV (self);
4115 int wcount = AvFILLp (av) + 1 - 1; 4393 int wcount = AvFILLp (av) + 1 - 1;
4116 4394
4117 if (GIMME_V == G_SCALAR) 4395 if (GIMME_V == G_SCALAR)
… …
4126} 4404}
4127 4405
4128MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4406MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4129 4407
4130void 4408void
4131_may_delete (SV *sem, int count, int extra_refs) 4409_may_delete (SV *sem, int count, unsigned int extra_refs)
4132 PPCODE: 4410 PPCODE:
4133{ 4411{
4134 AV *av = (AV *)SvRV (sem); 4412 AV *av = (AV *)SvRV (sem);
4135 4413
4136 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4414 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4137 && AvFILLp (av) == 0 /* no waiters, just count */ 4415 && AvFILLp (av) == 0 /* no waiters, just count */
4138 && SvIV (AvARRAY (av)[0]) == count) 4416 && SvIV (AvARRAY (av)[0]) == count)
4139 XSRETURN_YES; 4417 XSRETURN_YES;
… …
4160 4438
4161void 4439void
4162broadcast (SV *self) 4440broadcast (SV *self)
4163 CODE: 4441 CODE:
4164{ 4442{
4165 AV *av = (AV *)SvRV (self); 4443 AV *av = (AV *)SvRV (self);
4166 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4444 coro_signal_wake (aTHX_ av, AvFILLp (av));
4167} 4445}
4168 4446
4169void 4447void
4170send (SV *self) 4448send (SV *self)
… …
4178 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4456 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4179} 4457}
4180 4458
4181IV 4459IV
4182awaited (SV *self) 4460awaited (SV *self)
4183 CODE: 4461 CODE:
4184 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4462 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4185 OUTPUT: 4463 OUTPUT:
4186 RETVAL 4464 RETVAL
4187 4465
4188 4466
… …
4193 4471
4194void 4472void
4195_schedule (...) 4473_schedule (...)
4196 CODE: 4474 CODE:
4197{ 4475{
4198 static int incede; 4476 static int incede;
4199 4477
4200 api_cede_notself (aTHX); 4478 api_cede_notself (aTHX);
4201 4479
4202 ++incede; 4480 ++incede;
4203 while (coro_nready >= incede && api_cede (aTHX)) 4481 while (coro_nready >= incede && api_cede (aTHX))
… …
4247 { 4525 {
4248 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4526 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4249 coro_old_pp_sselect = 0; 4527 coro_old_pp_sselect = 0;
4250 } 4528 }
4251 4529
4530MODULE = Coro::State PACKAGE = Coro::Util
4531
4532void
4533_exit (int code)
4534 CODE:
4535 _exit (code);
4536
4537NV
4538time ()
4539 CODE:
4540 RETVAL = nvtime (aTHX);
4541 OUTPUT:
4542 RETVAL
4543
4544NV
4545gettimeofday ()
4546 PPCODE:
4547{
4548 UV tv [2];
4549 u2time (aTHX_ tv);
4550 EXTEND (SP, 2);
4551 PUSHs (sv_2mortal (newSVuv (tv [0])));
4552 PUSHs (sv_2mortal (newSVuv (tv [1])));
4553}
4554

Diff Legend

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