Adding valgrind's memcheck support in mem-heap. Adding valgrind's headers valgrind.h and memcheck.h to third-party/valgrind directory.
This commit is contained in:
@@ -61,6 +61,7 @@ export todo
|
||||
export fixme
|
||||
export color
|
||||
export sanitize
|
||||
export valgrind
|
||||
export musl
|
||||
export libc_raw
|
||||
|
||||
|
||||
+32
-4
@@ -105,6 +105,10 @@ else
|
||||
endif
|
||||
|
||||
ifeq ($(libc_raw),1)
|
||||
ifeq ($(OPTION_LIBC_MUSL),enable)
|
||||
$(error LIBC_RAW and LIBC_MUSL are mutually exclusive)
|
||||
endif
|
||||
|
||||
OPTION_LIBC_RAW := enable
|
||||
else
|
||||
OPTION_LIBC_RAW := disable
|
||||
@@ -117,11 +121,28 @@ else
|
||||
endif
|
||||
|
||||
ifeq ($(sanitize),1)
|
||||
ifeq ($(OPTION_LIBC_MUSL),enable)
|
||||
$(error ASAN and LIBC_MUSL are mutually exclusive)
|
||||
endif
|
||||
ifeq ($(OPTION_LIBC_RAW),enable)
|
||||
$(error ASAN and LIBC_RAW are mutually exclusive)
|
||||
endif
|
||||
|
||||
OPTION_SANITIZE := enable
|
||||
else
|
||||
OPTION_SANITIZE := disable
|
||||
endif
|
||||
|
||||
ifeq ($(valgrind),1)
|
||||
OPTION_VALGRIND := enable
|
||||
|
||||
ifeq ($(OPTION_SANITIZE),enable)
|
||||
$(error ASAN and Valgrind are mutually exclusive)
|
||||
endif
|
||||
else
|
||||
OPTION_VALGRIND := disable
|
||||
endif
|
||||
|
||||
#
|
||||
# Target CPU
|
||||
#
|
||||
@@ -278,12 +299,19 @@ ifeq ($(OPTION_FIXME),enable)
|
||||
DEFINES_JERRY += -DJERRY_PRINT_FIXME
|
||||
endif
|
||||
|
||||
ifeq ($(OPTION_VALGRIND),enable)
|
||||
VALGRIND_CMD := "valgrind --track-origins=yes"
|
||||
else
|
||||
VALGRIND_CMD :=
|
||||
DEFINES_JERRY += -DJERRY_NVALGRIND
|
||||
endif
|
||||
|
||||
#
|
||||
# Third-party sources, headers, includes, cflags, ldflags
|
||||
#
|
||||
|
||||
SOURCES_THIRDPARTY =
|
||||
INCLUDES_THIRDPARTY =
|
||||
INCLUDES_THIRDPARTY = -I third-party/valgrind/
|
||||
CFLAGS_THIRDPARTY =
|
||||
|
||||
ifeq ($(TARGET_SYSTEM),stm32f4)
|
||||
@@ -368,7 +396,7 @@ $(TESTS_TARGET):
|
||||
done
|
||||
@ rm -rf $(TARGET_DIR)/obj
|
||||
@ echo "=== Running unit tests ==="
|
||||
@ ./tools/jerry_unittest.sh $(TARGET_DIR)
|
||||
@ VALGRIND=$(VALGRIND_CMD) ./tools/jerry_unittest.sh $(TARGET_DIR)
|
||||
@ echo Done
|
||||
@ echo
|
||||
|
||||
@@ -376,7 +404,7 @@ $(PARSER_TESTS_TARGET): debug_release.$(TARGET_SYSTEM)
|
||||
@ mkdir -p $(TARGET_DIR)/check
|
||||
@ echo "=== Running parser tests ==="
|
||||
@ if [ -f $(TARGET_DIR)/$(ENGINE_NAME) ]; then \
|
||||
./tools/jerry_test.sh $(TARGET_DIR)/$(ENGINE_NAME) $(TARGET_DIR)/check --parse-only; \
|
||||
VALGRIND=$(VALGRIND_CMD) ./tools/jerry_test.sh $(TARGET_DIR)/$(ENGINE_NAME) $(TARGET_DIR)/check --parse-only; \
|
||||
fi
|
||||
|
||||
$(CHECK_TARGETS): $(TARGET_OF_ACTION)
|
||||
@@ -389,7 +417,7 @@ $(CHECK_TARGETS): $(TARGET_OF_ACTION)
|
||||
@ echo
|
||||
@ echo "=== Running js tests ==="
|
||||
@ if [ -f $(TARGET_DIR)/$(ENGINE_NAME) ]; then \
|
||||
./tools/jerry_test.sh $(TARGET_DIR)/$(ENGINE_NAME) $(TARGET_DIR)/check; \
|
||||
VALGRIND=$(VALGRIND_CMD) ./tools/jerry_test.sh $(TARGET_DIR)/$(ENGINE_NAME) $(TARGET_DIR)/check; \
|
||||
fi
|
||||
|
||||
@echo Done
|
||||
|
||||
+99
-14
@@ -29,6 +29,27 @@
|
||||
#include "mem-allocator.h"
|
||||
#include "mem-heap.h"
|
||||
|
||||
/*
|
||||
* Valgrind-related options and headers
|
||||
*/
|
||||
#ifndef JERRY_NVALGRIND
|
||||
# define VALGRIND_NOACCESS_STRUCT( s)
|
||||
# define VALGRIND_UNDEFINED_STRUCT( s)
|
||||
# define VALGRIND_DEFINED_STRUCT( s)
|
||||
# define VALGRIND_NOACCESS_SPACE( p, s)
|
||||
# define VALGRIND_UNDEFINED_SPACE( p, s)
|
||||
# define VALGRIND_DEFINED_SPACET( p, s)
|
||||
#else /* !JERRRY_NVALGRIND */
|
||||
# include "memcheck.h"
|
||||
|
||||
# define VALGRIND_NOACCESS_STRUCT( s) VALGRIND_MAKE_MEM_NOACCESS( ( s ), sizeof( *( s ) ) )
|
||||
# define VALGRIND_UNDEFINED_STRUCT( s) VALGRIND_MAKE_MEM_UNDEFINED( ( s ), sizeof( *( s ) ) )
|
||||
# define VALGRIND_DEFINED_STRUCT( s) VALGRIND_MAKE_MEM_DEFINED( ( s ), sizeof( *( s ) ) )
|
||||
# define VALGRIND_NOACCESS_SPACE( p, s) VALGRIND_MAKE_MEM_NOACCESS( ( p ), ( s ) )
|
||||
# define VALGRIND_UNDEFINED_SPACE( p, s) VALGRIND_MAKE_MEM_UNDEFINED( ( p ), ( s ) )
|
||||
# define VALGRIND_DEFINED_SPACET( p, s) VALGRIND_MAKE_MEM_DEFINED( ( p ), ( s ) )
|
||||
#endif /* !JERRY_NVALGRIND */
|
||||
|
||||
/**
|
||||
* Magic numbers for heap memory blocks
|
||||
*/
|
||||
@@ -190,6 +211,8 @@ mem_heap_init(uint8_t *heap_start, /**< first address of heap space */
|
||||
mem_heap.heap_start = heap_start;
|
||||
mem_heap.heap_size = heap_size;
|
||||
|
||||
VALGRIND_NOACCESS_SPACE( heap_start, heap_size);
|
||||
|
||||
mem_init_block_header(mem_heap.heap_start,
|
||||
0,
|
||||
MEM_BLOCK_FREE,
|
||||
@@ -214,6 +237,8 @@ mem_init_block_header( uint8_t *first_chunk_p, /**< address of the first
|
||||
{
|
||||
mem_block_header_t *block_header_p = (mem_block_header_t*) first_chunk_p;
|
||||
|
||||
VALGRIND_UNDEFINED_STRUCT( block_header_p);
|
||||
|
||||
if ( block_state == MEM_BLOCK_FREE )
|
||||
{
|
||||
block_header_p->magic_num = MEM_MAGIC_NUM_OF_FREE_BLOCK;
|
||||
@@ -228,6 +253,8 @@ mem_init_block_header( uint8_t *first_chunk_p, /**< address of the first
|
||||
block_header_p->neighbours[ MEM_DIRECTION_NEXT ] = next_block_p;
|
||||
block_header_p->allocated_bytes = allocated_bytes;
|
||||
|
||||
VALGRIND_NOACCESS_STRUCT( block_header_p);
|
||||
|
||||
JERRY_ASSERT( allocated_bytes <= mem_get_block_data_space_size( block_header_p) );
|
||||
} /* mem_init_block_header */
|
||||
|
||||
@@ -266,6 +293,8 @@ mem_heap_alloc_block( size_t size_in_bytes, /**< size of region to all
|
||||
/* searching for appropriate block */
|
||||
while ( block_p != NULL )
|
||||
{
|
||||
VALGRIND_DEFINED_STRUCT( block_p);
|
||||
|
||||
if ( block_p->magic_num == MEM_MAGIC_NUM_OF_FREE_BLOCK )
|
||||
{
|
||||
if ( mem_get_block_data_space_size( block_p) >= size_in_bytes )
|
||||
@@ -277,7 +306,11 @@ mem_heap_alloc_block( size_t size_in_bytes, /**< size of region to all
|
||||
JERRY_ASSERT( block_p->magic_num == MEM_MAGIC_NUM_OF_ALLOCATED_BLOCK );
|
||||
}
|
||||
|
||||
block_p = block_p->neighbours[ direction ];
|
||||
mem_block_header_t *next_block_p = block_p->neighbours[ direction ];
|
||||
|
||||
VALGRIND_NOACCESS_STRUCT( block_p);
|
||||
|
||||
block_p = next_block_p;
|
||||
}
|
||||
|
||||
if ( block_p == NULL )
|
||||
@@ -322,16 +355,22 @@ mem_heap_alloc_block( size_t size_in_bytes, /**< size of region to all
|
||||
prev_block_p,
|
||||
next_block_p);
|
||||
|
||||
VALGRIND_DEFINED_STRUCT( block_p);
|
||||
|
||||
mem_heap_stat_alloc_block( block_p);
|
||||
|
||||
JERRY_ASSERT( mem_get_block_data_space_size( block_p) >= size_in_bytes );
|
||||
|
||||
VALGRIND_NOACCESS_STRUCT( block_p);
|
||||
|
||||
mem_check_heap();
|
||||
|
||||
/* return data space beginning address */
|
||||
uint8_t *data_space_p = (uint8_t*) (block_p + 1);
|
||||
JERRY_ASSERT( (uintptr_t) data_space_p % MEM_ALIGNMENT == 0);
|
||||
|
||||
VALGRIND_UNDEFINED_SPACE( data_space_p, size_in_bytes);
|
||||
|
||||
return data_space_p;
|
||||
} /* mem_heap_alloc_block */
|
||||
|
||||
@@ -348,40 +387,66 @@ mem_heap_free_block( uint8_t *ptr) /**< pointer to beginning of data space of th
|
||||
mem_check_heap();
|
||||
|
||||
mem_block_header_t *block_p = (mem_block_header_t*) ptr - 1;
|
||||
|
||||
VALGRIND_DEFINED_STRUCT( block_p);
|
||||
|
||||
mem_block_header_t *prev_block_p = block_p->neighbours[ MEM_DIRECTION_PREV ];
|
||||
mem_block_header_t *next_block_p = block_p->neighbours[ MEM_DIRECTION_NEXT ];
|
||||
|
||||
mem_heap_stat_free_block( block_p);
|
||||
|
||||
VALGRIND_NOACCESS_SPACE( ptr, block_p->allocated_bytes);
|
||||
|
||||
/* checking magic nums that are neighbour to data space */
|
||||
JERRY_ASSERT( block_p->magic_num == MEM_MAGIC_NUM_OF_ALLOCATED_BLOCK );
|
||||
if ( next_block_p != NULL )
|
||||
{
|
||||
VALGRIND_DEFINED_STRUCT( next_block_p);
|
||||
|
||||
JERRY_ASSERT( next_block_p->magic_num == MEM_MAGIC_NUM_OF_ALLOCATED_BLOCK
|
||||
|| next_block_p->magic_num == MEM_MAGIC_NUM_OF_FREE_BLOCK );
|
||||
|
||||
VALGRIND_NOACCESS_STRUCT( next_block_p);
|
||||
}
|
||||
|
||||
block_p->magic_num = MEM_MAGIC_NUM_OF_FREE_BLOCK;
|
||||
|
||||
if ( next_block_p != NULL
|
||||
&& next_block_p->magic_num == MEM_MAGIC_NUM_OF_FREE_BLOCK )
|
||||
if ( next_block_p != NULL )
|
||||
{
|
||||
VALGRIND_DEFINED_STRUCT( next_block_p);
|
||||
|
||||
if (next_block_p->magic_num == MEM_MAGIC_NUM_OF_FREE_BLOCK )
|
||||
{
|
||||
/* merge with the next block */
|
||||
mem_heap_stat_free_block_merge();
|
||||
|
||||
next_block_p = next_block_p->neighbours[ MEM_DIRECTION_NEXT ];
|
||||
mem_block_header_t *next_next_block_p = next_block_p->neighbours[ MEM_DIRECTION_NEXT ];
|
||||
|
||||
VALGRIND_NOACCESS_STRUCT( next_block_p);
|
||||
|
||||
next_block_p = next_next_block_p;
|
||||
|
||||
VALGRIND_DEFINED_STRUCT( next_block_p);
|
||||
|
||||
block_p->neighbours[ MEM_DIRECTION_NEXT ] = next_block_p;
|
||||
if ( next_block_p != NULL )
|
||||
{
|
||||
next_block_p->neighbours[ MEM_DIRECTION_PREV ] = block_p;
|
||||
} else
|
||||
}
|
||||
else
|
||||
{
|
||||
mem_heap.last_block_p = block_p;
|
||||
}
|
||||
}
|
||||
|
||||
if ( prev_block_p != NULL
|
||||
&& prev_block_p->magic_num == MEM_MAGIC_NUM_OF_FREE_BLOCK )
|
||||
VALGRIND_NOACCESS_STRUCT( next_block_p);
|
||||
}
|
||||
|
||||
if ( prev_block_p != NULL )
|
||||
{
|
||||
VALGRIND_DEFINED_STRUCT( prev_block_p);
|
||||
|
||||
if ( prev_block_p->magic_num == MEM_MAGIC_NUM_OF_FREE_BLOCK )
|
||||
{
|
||||
/* merge with the previous block */
|
||||
mem_heap_stat_free_block_merge();
|
||||
@@ -389,13 +454,23 @@ mem_heap_free_block( uint8_t *ptr) /**< pointer to beginning of data space of th
|
||||
prev_block_p->neighbours[ MEM_DIRECTION_NEXT ] = next_block_p;
|
||||
if ( next_block_p != NULL )
|
||||
{
|
||||
VALGRIND_DEFINED_STRUCT( next_block_p);
|
||||
|
||||
next_block_p->neighbours[ MEM_DIRECTION_PREV ] = block_p->neighbours[ MEM_DIRECTION_PREV ];
|
||||
} else
|
||||
|
||||
VALGRIND_NOACCESS_STRUCT( next_block_p);
|
||||
}
|
||||
else
|
||||
{
|
||||
mem_heap.last_block_p = prev_block_p;
|
||||
}
|
||||
}
|
||||
|
||||
VALGRIND_NOACCESS_STRUCT( prev_block_p);
|
||||
}
|
||||
|
||||
VALGRIND_NOACCESS_STRUCT( block_p);
|
||||
|
||||
mem_check_heap();
|
||||
} /* mem_heap_free_block */
|
||||
|
||||
@@ -434,10 +509,12 @@ mem_heap_print( bool dump_block_headers, /**< print block headers */
|
||||
(void*) mem_heap.first_block_p,
|
||||
(void*) mem_heap.last_block_p);
|
||||
|
||||
for ( mem_block_header_t *block_p = mem_heap.first_block_p;
|
||||
for ( mem_block_header_t *block_p = mem_heap.first_block_p, *next_block_p;
|
||||
block_p != NULL;
|
||||
block_p = block_p->neighbours[ MEM_DIRECTION_NEXT ] )
|
||||
block_p = next_block_p )
|
||||
{
|
||||
VALGRIND_DEFINED_STRUCT( block_p);
|
||||
|
||||
__printf("Block (%p): magic num=0x%08x, size in chunks=%lu, previous block->%p next block->%p\n",
|
||||
(void*) block_p,
|
||||
block_p->magic_num,
|
||||
@@ -456,6 +533,10 @@ mem_heap_print( bool dump_block_headers, /**< print block headers */
|
||||
}
|
||||
__printf("\n");
|
||||
}
|
||||
|
||||
next_block_p = block_p->neighbours[ MEM_DIRECTION_NEXT ];
|
||||
|
||||
VALGRIND_NOACCESS_STRUCT( block_p);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -502,15 +583,17 @@ mem_check_heap( void)
|
||||
JERRY_ASSERT( mem_heap.heap_size % MEM_HEAP_CHUNK_SIZE == 0 );
|
||||
|
||||
bool is_last_block_was_met = false;
|
||||
for ( mem_block_header_t *block_p = mem_heap.first_block_p;
|
||||
for ( mem_block_header_t *block_p = mem_heap.first_block_p, *next_block_p;
|
||||
block_p != NULL;
|
||||
block_p = block_p->neighbours[ MEM_DIRECTION_NEXT ] )
|
||||
block_p = next_block_p )
|
||||
{
|
||||
JERRY_ASSERT( block_p != NULL );
|
||||
VALGRIND_DEFINED_STRUCT( block_p);
|
||||
|
||||
JERRY_ASSERT( block_p->magic_num == MEM_MAGIC_NUM_OF_FREE_BLOCK
|
||||
|| block_p->magic_num == MEM_MAGIC_NUM_OF_ALLOCATED_BLOCK );
|
||||
|
||||
mem_block_header_t *next_block_p = block_p->neighbours[ MEM_DIRECTION_NEXT ];
|
||||
next_block_p = block_p->neighbours[ MEM_DIRECTION_NEXT ];
|
||||
|
||||
if ( block_p == mem_heap.last_block_p )
|
||||
{
|
||||
is_last_block_was_met = true;
|
||||
@@ -520,6 +603,8 @@ mem_check_heap( void)
|
||||
{
|
||||
JERRY_ASSERT( next_block_p != NULL );
|
||||
}
|
||||
|
||||
VALGRIND_NOACCESS_STRUCT( block_p);
|
||||
}
|
||||
|
||||
JERRY_ASSERT( is_last_block_was_met );
|
||||
|
||||
Vendored
+287
@@ -0,0 +1,287 @@
|
||||
|
||||
/*
|
||||
----------------------------------------------------------------
|
||||
|
||||
Notice that the following BSD-style license applies to this one
|
||||
file (memcheck.h) only. The rest of Valgrind is licensed under the
|
||||
terms of the GNU General Public License, version 2, unless
|
||||
otherwise indicated. See the COPYING file in the source
|
||||
distribution for details.
|
||||
|
||||
----------------------------------------------------------------
|
||||
|
||||
This file is part of MemCheck, a heavyweight Valgrind tool for
|
||||
detecting memory errors.
|
||||
|
||||
Copyright (C) 2000-2011 Julian Seward. All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions
|
||||
are met:
|
||||
|
||||
1. Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
|
||||
2. The origin of this software must not be misrepresented; you must
|
||||
not claim that you wrote the original software. If you use this
|
||||
software in a product, an acknowledgment in the product
|
||||
documentation would be appreciated but is not required.
|
||||
|
||||
3. Altered source versions must be plainly marked as such, and must
|
||||
not be misrepresented as being the original software.
|
||||
|
||||
4. The name of the author may not be used to endorse or promote
|
||||
products derived from this software without specific prior written
|
||||
permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
|
||||
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
|
||||
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
|
||||
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
||||
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
----------------------------------------------------------------
|
||||
|
||||
Notice that the above BSD-style license applies to this one file
|
||||
(memcheck.h) only. The entire rest of Valgrind is licensed under
|
||||
the terms of the GNU General Public License, version 2. See the
|
||||
COPYING file in the source distribution for details.
|
||||
|
||||
----------------------------------------------------------------
|
||||
*/
|
||||
|
||||
|
||||
#ifndef __MEMCHECK_H
|
||||
#define __MEMCHECK_H
|
||||
|
||||
|
||||
/* This file is for inclusion into client (your!) code.
|
||||
|
||||
You can use these macros to manipulate and query memory permissions
|
||||
inside your own programs.
|
||||
|
||||
See comment near the top of valgrind.h on how to use them.
|
||||
*/
|
||||
|
||||
#include "valgrind.h"
|
||||
|
||||
/* !! ABIWARNING !! ABIWARNING !! ABIWARNING !! ABIWARNING !!
|
||||
This enum comprises an ABI exported by Valgrind to programs
|
||||
which use client requests. DO NOT CHANGE THE ORDER OF THESE
|
||||
ENTRIES, NOR DELETE ANY -- add new ones at the end. */
|
||||
typedef
|
||||
enum {
|
||||
VG_USERREQ__MAKE_MEM_NOACCESS = VG_USERREQ_TOOL_BASE('M','C'),
|
||||
VG_USERREQ__MAKE_MEM_UNDEFINED,
|
||||
VG_USERREQ__MAKE_MEM_DEFINED,
|
||||
VG_USERREQ__DISCARD,
|
||||
VG_USERREQ__CHECK_MEM_IS_ADDRESSABLE,
|
||||
VG_USERREQ__CHECK_MEM_IS_DEFINED,
|
||||
VG_USERREQ__DO_LEAK_CHECK,
|
||||
VG_USERREQ__COUNT_LEAKS,
|
||||
|
||||
VG_USERREQ__GET_VBITS,
|
||||
VG_USERREQ__SET_VBITS,
|
||||
|
||||
VG_USERREQ__CREATE_BLOCK,
|
||||
|
||||
VG_USERREQ__MAKE_MEM_DEFINED_IF_ADDRESSABLE,
|
||||
|
||||
/* Not next to VG_USERREQ__COUNT_LEAKS because it was added later. */
|
||||
VG_USERREQ__COUNT_LEAK_BLOCKS,
|
||||
|
||||
/* This is just for memcheck's internal use - don't use it */
|
||||
_VG_USERREQ__MEMCHECK_RECORD_OVERLAP_ERROR
|
||||
= VG_USERREQ_TOOL_BASE('M','C') + 256
|
||||
} Vg_MemCheckClientRequest;
|
||||
|
||||
|
||||
|
||||
/* Client-code macros to manipulate the state of memory. */
|
||||
|
||||
/* Mark memory at _qzz_addr as unaddressable for _qzz_len bytes. */
|
||||
#define VALGRIND_MAKE_MEM_NOACCESS(_qzz_addr,_qzz_len) \
|
||||
VALGRIND_DO_CLIENT_REQUEST_EXPR(0 /* default return */, \
|
||||
VG_USERREQ__MAKE_MEM_NOACCESS, \
|
||||
(_qzz_addr), (_qzz_len), 0, 0, 0)
|
||||
|
||||
/* Similarly, mark memory at _qzz_addr as addressable but undefined
|
||||
for _qzz_len bytes. */
|
||||
#define VALGRIND_MAKE_MEM_UNDEFINED(_qzz_addr,_qzz_len) \
|
||||
VALGRIND_DO_CLIENT_REQUEST_EXPR(0 /* default return */, \
|
||||
VG_USERREQ__MAKE_MEM_UNDEFINED, \
|
||||
(_qzz_addr), (_qzz_len), 0, 0, 0)
|
||||
|
||||
/* Similarly, mark memory at _qzz_addr as addressable and defined
|
||||
for _qzz_len bytes. */
|
||||
#define VALGRIND_MAKE_MEM_DEFINED(_qzz_addr,_qzz_len) \
|
||||
VALGRIND_DO_CLIENT_REQUEST_EXPR(0 /* default return */, \
|
||||
VG_USERREQ__MAKE_MEM_DEFINED, \
|
||||
(_qzz_addr), (_qzz_len), 0, 0, 0)
|
||||
|
||||
/* Similar to VALGRIND_MAKE_MEM_DEFINED except that addressability is
|
||||
not altered: bytes which are addressable are marked as defined,
|
||||
but those which are not addressable are left unchanged. */
|
||||
#define VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE(_qzz_addr,_qzz_len) \
|
||||
VALGRIND_DO_CLIENT_REQUEST_EXPR(0 /* default return */, \
|
||||
VG_USERREQ__MAKE_MEM_DEFINED_IF_ADDRESSABLE, \
|
||||
(_qzz_addr), (_qzz_len), 0, 0, 0)
|
||||
|
||||
/* Create a block-description handle. The description is an ascii
|
||||
string which is included in any messages pertaining to addresses
|
||||
within the specified memory range. Has no other effect on the
|
||||
properties of the memory range. */
|
||||
#define VALGRIND_CREATE_BLOCK(_qzz_addr,_qzz_len, _qzz_desc) \
|
||||
VALGRIND_DO_CLIENT_REQUEST_EXPR(0 /* default return */, \
|
||||
VG_USERREQ__CREATE_BLOCK, \
|
||||
(_qzz_addr), (_qzz_len), (_qzz_desc), \
|
||||
0, 0)
|
||||
|
||||
/* Discard a block-description-handle. Returns 1 for an
|
||||
invalid handle, 0 for a valid handle. */
|
||||
#define VALGRIND_DISCARD(_qzz_blkindex) \
|
||||
VALGRIND_DO_CLIENT_REQUEST_EXPR(0 /* default return */, \
|
||||
VG_USERREQ__DISCARD, \
|
||||
0, (_qzz_blkindex), 0, 0, 0)
|
||||
|
||||
|
||||
/* Client-code macros to check the state of memory. */
|
||||
|
||||
/* Check that memory at _qzz_addr is addressable for _qzz_len bytes.
|
||||
If suitable addressibility is not established, Valgrind prints an
|
||||
error message and returns the address of the first offending byte.
|
||||
Otherwise it returns zero. */
|
||||
#define VALGRIND_CHECK_MEM_IS_ADDRESSABLE(_qzz_addr,_qzz_len) \
|
||||
VALGRIND_DO_CLIENT_REQUEST_EXPR(0, \
|
||||
VG_USERREQ__CHECK_MEM_IS_ADDRESSABLE, \
|
||||
(_qzz_addr), (_qzz_len), 0, 0, 0)
|
||||
|
||||
/* Check that memory at _qzz_addr is addressable and defined for
|
||||
_qzz_len bytes. If suitable addressibility and definedness are not
|
||||
established, Valgrind prints an error message and returns the
|
||||
address of the first offending byte. Otherwise it returns zero. */
|
||||
#define VALGRIND_CHECK_MEM_IS_DEFINED(_qzz_addr,_qzz_len) \
|
||||
VALGRIND_DO_CLIENT_REQUEST_EXPR(0, \
|
||||
VG_USERREQ__CHECK_MEM_IS_DEFINED, \
|
||||
(_qzz_addr), (_qzz_len), 0, 0, 0)
|
||||
|
||||
/* Use this macro to force the definedness and addressibility of an
|
||||
lvalue to be checked. If suitable addressibility and definedness
|
||||
are not established, Valgrind prints an error message and returns
|
||||
the address of the first offending byte. Otherwise it returns
|
||||
zero. */
|
||||
#define VALGRIND_CHECK_VALUE_IS_DEFINED(__lvalue) \
|
||||
VALGRIND_CHECK_MEM_IS_DEFINED( \
|
||||
(volatile unsigned char *)&(__lvalue), \
|
||||
(unsigned long)(sizeof (__lvalue)))
|
||||
|
||||
|
||||
/* Do a full memory leak check (like --leak-check=full) mid-execution. */
|
||||
#define VALGRIND_DO_LEAK_CHECK \
|
||||
VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__DO_LEAK_CHECK, \
|
||||
0, 0, 0, 0, 0)
|
||||
|
||||
/* Same as VALGRIND_DO_LEAK_CHECK but only showing the entries for
|
||||
which there was an increase in leaked bytes or leaked nr of blocks
|
||||
since the previous leak search. */
|
||||
#define VALGRIND_DO_ADDED_LEAK_CHECK \
|
||||
VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__DO_LEAK_CHECK, \
|
||||
0, 1, 0, 0, 0)
|
||||
|
||||
/* Same as VALGRIND_DO_ADDED_LEAK_CHECK but showing entries with
|
||||
increased or decreased leaked bytes/blocks since previous leak
|
||||
search. */
|
||||
#define VALGRIND_DO_CHANGED_LEAK_CHECK \
|
||||
VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__DO_LEAK_CHECK, \
|
||||
0, 2, 0, 0, 0)
|
||||
|
||||
/* Do a summary memory leak check (like --leak-check=summary) mid-execution. */
|
||||
#define VALGRIND_DO_QUICK_LEAK_CHECK \
|
||||
VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__DO_LEAK_CHECK, \
|
||||
1, 0, 0, 0, 0)
|
||||
|
||||
/* Return number of leaked, dubious, reachable and suppressed bytes found by
|
||||
all previous leak checks. They must be lvalues. */
|
||||
#define VALGRIND_COUNT_LEAKS(leaked, dubious, reachable, suppressed) \
|
||||
/* For safety on 64-bit platforms we assign the results to private
|
||||
unsigned long variables, then assign these to the lvalues the user
|
||||
specified, which works no matter what type 'leaked', 'dubious', etc
|
||||
are. We also initialise '_qzz_leaked', etc because
|
||||
VG_USERREQ__COUNT_LEAKS doesn't mark the values returned as
|
||||
defined. */ \
|
||||
{ \
|
||||
unsigned long _qzz_leaked = 0, _qzz_dubious = 0; \
|
||||
unsigned long _qzz_reachable = 0, _qzz_suppressed = 0; \
|
||||
VALGRIND_DO_CLIENT_REQUEST_STMT( \
|
||||
VG_USERREQ__COUNT_LEAKS, \
|
||||
&_qzz_leaked, &_qzz_dubious, \
|
||||
&_qzz_reachable, &_qzz_suppressed, 0); \
|
||||
leaked = _qzz_leaked; \
|
||||
dubious = _qzz_dubious; \
|
||||
reachable = _qzz_reachable; \
|
||||
suppressed = _qzz_suppressed; \
|
||||
}
|
||||
|
||||
/* Return number of leaked, dubious, reachable and suppressed bytes found by
|
||||
all previous leak checks. They must be lvalues. */
|
||||
#define VALGRIND_COUNT_LEAK_BLOCKS(leaked, dubious, reachable, suppressed) \
|
||||
/* For safety on 64-bit platforms we assign the results to private
|
||||
unsigned long variables, then assign these to the lvalues the user
|
||||
specified, which works no matter what type 'leaked', 'dubious', etc
|
||||
are. We also initialise '_qzz_leaked', etc because
|
||||
VG_USERREQ__COUNT_LEAKS doesn't mark the values returned as
|
||||
defined. */ \
|
||||
{ \
|
||||
unsigned long _qzz_leaked = 0, _qzz_dubious = 0; \
|
||||
unsigned long _qzz_reachable = 0, _qzz_suppressed = 0; \
|
||||
VALGRIND_DO_CLIENT_REQUEST_STMT( \
|
||||
VG_USERREQ__COUNT_LEAK_BLOCKS, \
|
||||
&_qzz_leaked, &_qzz_dubious, \
|
||||
&_qzz_reachable, &_qzz_suppressed, 0); \
|
||||
leaked = _qzz_leaked; \
|
||||
dubious = _qzz_dubious; \
|
||||
reachable = _qzz_reachable; \
|
||||
suppressed = _qzz_suppressed; \
|
||||
}
|
||||
|
||||
|
||||
/* Get the validity data for addresses [zza..zza+zznbytes-1] and copy it
|
||||
into the provided zzvbits array. Return values:
|
||||
0 if not running on valgrind
|
||||
1 success
|
||||
2 [previously indicated unaligned arrays; these are now allowed]
|
||||
3 if any parts of zzsrc/zzvbits are not addressable.
|
||||
The metadata is not copied in cases 0, 2 or 3 so it should be
|
||||
impossible to segfault your system by using this call.
|
||||
*/
|
||||
#define VALGRIND_GET_VBITS(zza,zzvbits,zznbytes) \
|
||||
(unsigned)VALGRIND_DO_CLIENT_REQUEST_EXPR(0, \
|
||||
VG_USERREQ__GET_VBITS, \
|
||||
(const char*)(zza), \
|
||||
(char*)(zzvbits), \
|
||||
(zznbytes), 0, 0)
|
||||
|
||||
/* Set the validity data for addresses [zza..zza+zznbytes-1], copying it
|
||||
from the provided zzvbits array. Return values:
|
||||
0 if not running on valgrind
|
||||
1 success
|
||||
2 [previously indicated unaligned arrays; these are now allowed]
|
||||
3 if any parts of zza/zzvbits are not addressable.
|
||||
The metadata is not copied in cases 0, 2 or 3 so it should be
|
||||
impossible to segfault your system by using this call.
|
||||
*/
|
||||
#define VALGRIND_SET_VBITS(zza,zzvbits,zznbytes) \
|
||||
(unsigned)VALGRIND_DO_CLIENT_REQUEST_EXPR(0, \
|
||||
VG_USERREQ__SET_VBITS, \
|
||||
(const char*)(zza), \
|
||||
(const char*)(zzvbits), \
|
||||
(zznbytes), 0, 0 )
|
||||
|
||||
#endif
|
||||
|
||||
Vendored
+4060
File diff suppressed because it is too large
Load Diff
@@ -24,8 +24,12 @@ for unit_test in $UNITTESTS;
|
||||
do
|
||||
echo -n "Running $unit_test... ";
|
||||
|
||||
$DIR/$unit_test 2>&1 >> $DIR/unit_tests_run.log;
|
||||
if [ $? -eq 0 ];
|
||||
$VALGRIND $DIR/$unit_test >&$DIR/unit_tests_run.log.tmp;
|
||||
status_code=$?
|
||||
cat $DIR/unit_tests_run.log.tmp >> $DIR/unit_tests_run.log
|
||||
rm $DIR/unit_tests_run.log.tmp
|
||||
|
||||
if [ $status_code -eq 0 ];
|
||||
then
|
||||
echo OK;
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user