YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replacing JERRY_NVALGRIND with the opposite JERRY_VALGRIND.

Browse Source
This commit is contained in:
Ruben Ayrapetyan
2015-02-05 17:58:55 +03:00
parent fb6e205d0d
commit 5a2d6f4308
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.mk
+1 -1
View File
@@ -394,9 +394,9 @@ endif
ifeq ($(OPTION_VALGRIND),enable) ifeq ($(OPTION_VALGRIND),enable)
VALGRIND_CMD := "valgrind --error-exitcode=254 --track-origins=yes" VALGRIND_CMD := "valgrind --error-exitcode=254 --track-origins=yes"
VALGRIND_TIMEOUT := 60 VALGRIND_TIMEOUT := 60
DEFINES_JERRY += -DJERRY_VALGRIND
else else
VALGRIND_CMD := VALGRIND_CMD :=
DEFINES_JERRY += -DJERRY_NVALGRIND
VALGRIND_TIMEOUT := VALGRIND_TIMEOUT :=
endif endif
src/liballocator/mem-heap.c
+3 -3
View File
@@ -37,7 +37,7 @@
/* /*
* Valgrind-related options and headers * Valgrind-related options and headers
*/ */
#ifndef JERRY_NVALGRIND #ifdef JERRY_VALGRIND
# include "memcheck.h" # include "memcheck.h"
# define VALGRIND_NOACCESS_STRUCT(s) (void)VALGRIND_MAKE_MEM_NOACCESS((s), sizeof (*(s))) # define VALGRIND_NOACCESS_STRUCT(s) (void)VALGRIND_MAKE_MEM_NOACCESS((s), sizeof (*(s)))
@@ -46,14 +46,14 @@
# define VALGRIND_NOACCESS_SPACE(p, s) (void)VALGRIND_MAKE_MEM_NOACCESS((p), (s)) # define VALGRIND_NOACCESS_SPACE(p, s) (void)VALGRIND_MAKE_MEM_NOACCESS((p), (s))
# define VALGRIND_UNDEFINED_SPACE(p, s) (void)VALGRIND_MAKE_MEM_UNDEFINED((p), (s)) # define VALGRIND_UNDEFINED_SPACE(p, s) (void)VALGRIND_MAKE_MEM_UNDEFINED((p), (s))
# define VALGRIND_DEFINED_SPACE(p, s) (void)VALGRIND_MAKE_MEM_DEFINED((p), (s)) # define VALGRIND_DEFINED_SPACE(p, s) (void)VALGRIND_MAKE_MEM_DEFINED((p), (s))
#else /* !JERRRY_NVALGRIND */ #else /* JERRY_VALGRIND */
# define VALGRIND_NOACCESS_STRUCT(s) # define VALGRIND_NOACCESS_STRUCT(s)
# define VALGRIND_UNDEFINED_STRUCT(s) # define VALGRIND_UNDEFINED_STRUCT(s)
# define VALGRIND_DEFINED_STRUCT(s) # define VALGRIND_DEFINED_STRUCT(s)
# define VALGRIND_NOACCESS_SPACE(p, s) # define VALGRIND_NOACCESS_SPACE(p, s)
# define VALGRIND_UNDEFINED_SPACE(p, s) # define VALGRIND_UNDEFINED_SPACE(p, s)
# define VALGRIND_DEFINED_SPACE(p, s) # define VALGRIND_DEFINED_SPACE(p, s)
#endif /* !JERRY_NVALGRIND */ #endif /* JERRY_VALGRIND */
/** /**
* Magic numbers for heap memory blocks * Magic numbers for heap memory blocks
src/liballocator/mem-pool.c
+3 -3
View File
@@ -34,17 +34,17 @@
/* /*
* Valgrind-related options and headers * Valgrind-related options and headers
*/ */
#ifndef JERRY_NVALGRIND #ifdef JERRY_VALGRIND
# include "memcheck.h" # include "memcheck.h"
# define VALGRIND_NOACCESS_SPACE(p, s) (void)VALGRIND_MAKE_MEM_NOACCESS((p), (s)) # define VALGRIND_NOACCESS_SPACE(p, s) (void)VALGRIND_MAKE_MEM_NOACCESS((p), (s))
# define VALGRIND_UNDEFINED_SPACE(p, s) (void)VALGRIND_MAKE_MEM_UNDEFINED((p), (s)) # define VALGRIND_UNDEFINED_SPACE(p, s) (void)VALGRIND_MAKE_MEM_UNDEFINED((p), (s))
# define VALGRIND_DEFINED_SPACE(p, s) (void)VALGRIND_MAKE_MEM_DEFINED((p), (s)) # define VALGRIND_DEFINED_SPACE(p, s) (void)VALGRIND_MAKE_MEM_DEFINED((p), (s))
#else /* !JERRRY_NVALGRIND */ #else /* JERRY_VALGRIND */
# define VALGRIND_NOACCESS_SPACE(p, s) # define VALGRIND_NOACCESS_SPACE(p, s)
# define VALGRIND_UNDEFINED_SPACE(p, s) # define VALGRIND_UNDEFINED_SPACE(p, s)
# define VALGRIND_DEFINED_SPACE(p, s) # define VALGRIND_DEFINED_SPACE(p, s)
#endif /* !JERRY_NVALGRIND */ #endif /* JERRY_VALGRIND */
static void mem_check_pool (mem_pool_state_t *pool_p); static void mem_check_pool (mem_pool_state_t *pool_p);