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

Fixed --mem-stats flag.

Browse Source
This commit is contained in:
Andrey Shitov
2015-03-30 11:31:09 +03:00
parent 9746b2fd76
commit ac7edde72e
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+6 -3
View File
@@ -252,6 +252,10 @@ project (Jerry CXX C ASM)
set(LINKER_FLAGS_COMMON "${LINKER_FLAGS_COMMON} ${LINKER_FLAGS_COMMON_${PLATFORM_EXT}}") set(LINKER_FLAGS_COMMON "${LINKER_FLAGS_COMMON} ${LINKER_FLAGS_COMMON_${PLATFORM_EXT}}")
set(SOURCE_JERRY_STANDALONE_MAIN ${SOURCE_JERRY_STANDALONE_MAIN_${PLATFORM_EXT}}) set(SOURCE_JERRY_STANDALONE_MAIN ${SOURCE_JERRY_STANDALONE_MAIN_${PLATFORM_EXT}})
# Definitions
# Memory statistics
set(DEFINES_MEMORY_STATISTICS MEM_STATS)
# Component targets # Component targets
# Jerry's libc # Jerry's libc
if(NOT ${USE_EXTERNAL_LIBC}) if(NOT ${USE_EXTERNAL_LIBC})
@@ -274,16 +278,15 @@ project (Jerry CXX C ASM)
set(LIBC_TARGET_NAME ${BUILD_MODE_PREFIX_${BUILD_MODE}}.jerry-libc.${PLATFORM_L}.lib) set(LIBC_TARGET_NAME ${BUILD_MODE_PREFIX_${BUILD_MODE}}.jerry-libc.${PLATFORM_L}.lib)
function(declare_target_with_modifiers ) # modifiers are passed in ARGN implicit argument function(declare_target_with_modifiers ) # modifiers are passed in ARGN implicit argument
set(DEFINES_JERRY)
set(CORE_TARGET_NAME ${BUILD_MODE_PREFIX_${BUILD_MODE}}) set(CORE_TARGET_NAME ${BUILD_MODE_PREFIX_${BUILD_MODE}})
foreach(MODIFIER ${ARGN}) foreach(MODIFIER ${ARGN})
set(TARGET_NAME ${TARGET_NAME}${MODIFIER_SUFFIX_${MODIFIER}}) set(TARGET_NAME ${TARGET_NAME}${MODIFIER_SUFFIX_${MODIFIER}})
set(CORE_TARGET_NAME ${CORE_TARGET_NAME}${MODIFIER_SUFFIX_${MODIFIER}}) set(CORE_TARGET_NAME ${CORE_TARGET_NAME}${MODIFIER_SUFFIX_${MODIFIER}})
set(DEFINES_JERRY ${DEFINES_JERRY} ${DEFINES_${MODIFIER}})
endforeach() endforeach()
set(CORE_TARGET_NAME ${CORE_TARGET_NAME}.jerry-core) set(CORE_TARGET_NAME ${CORE_TARGET_NAME}.jerry-core)
set(DEFINES_JERRY )
if(NOT ${EXTERNAL_BUILD}) if(NOT ${EXTERNAL_BUILD})
add_executable(${TARGET_NAME} ${SOURCE_JERRY_STANDALONE_MAIN}) add_executable(${TARGET_NAME} ${SOURCE_JERRY_STANDALONE_MAIN})
jerry-core/CMakeLists.txt
-3
View File
@@ -66,9 +66,6 @@ project (JerryCore CXX C ASM)
CONFIG_ECMA_COMPACT_PROFILE_DISABLE_JSON_BUILTIN CONFIG_ECMA_COMPACT_PROFILE_DISABLE_JSON_BUILTIN
CONFIG_ECMA_COMPACT_PROFILE_DISABLE_REGEXP_BUILTIN) CONFIG_ECMA_COMPACT_PROFILE_DISABLE_REGEXP_BUILTIN)
# Memory statistics
set(DEFINES_JERRY_MEMORY_STATISTICS MEM_STATS)
# Valgrind # Valgrind
set(DEFINES_JERRY_VALGRIND JERRY_VALGRIND) set(DEFINES_JERRY_VALGRIND JERRY_VALGRIND)
jerry-core/mem/mem-allocator.cpp
+5 -5
View File
@@ -72,11 +72,11 @@ mem_finalize (bool is_show_mem_stats) /**< show heap memory stats
" Peak pools: %lu\n" " Peak pools: %lu\n"
" Peak allocated chunks: %lu\n\n", " Peak allocated chunks: %lu\n\n",
MEM_POOL_CHUNK_SIZE, MEM_POOL_CHUNK_SIZE,
stats.pools_count, (unsigned long) stats.pools_count,
stats.allocated_chunks, (unsigned long) stats.allocated_chunks,
stats.free_chunks, (unsigned long) stats.free_chunks,
stats.peak_pools_count, (unsigned long) stats.peak_pools_count,
stats.peak_allocated_chunks); (unsigned long) stats.peak_allocated_chunks);
#endif /* MEM_STATS */ #endif /* MEM_STATS */
} }
jerry-core/mem/mem-heap.cpp
+10 -10
View File
@@ -973,17 +973,17 @@ mem_heap_print (bool dump_block_headers, /**< print block headers */
" Peak allocated chunks count = %lu\n" " Peak allocated chunks count = %lu\n"
" Peak allocated= %lu bytes\n" " Peak allocated= %lu bytes\n"
" Peak waste = %lu bytes\n", " Peak waste = %lu bytes\n",
mem_heap_stats.size, (uint64_t) mem_heap_stats.size,
(uint64_t) MEM_HEAP_CHUNK_SIZE, (uint64_t) MEM_HEAP_CHUNK_SIZE,
mem_heap_stats.blocks, (uint64_t) mem_heap_stats.blocks,
mem_heap_stats.allocated_blocks, (uint64_t) mem_heap_stats.allocated_blocks,
mem_heap_stats.allocated_chunks, (uint64_t) mem_heap_stats.allocated_chunks,
mem_heap_stats.allocated_bytes, (uint64_t) mem_heap_stats.allocated_bytes,
mem_heap_stats.waste_bytes, (uint64_t) mem_heap_stats.waste_bytes,
mem_heap_stats.peak_allocated_blocks, (uint64_t) mem_heap_stats.peak_allocated_blocks,
mem_heap_stats.peak_allocated_chunks, (uint64_t) mem_heap_stats.peak_allocated_chunks,
mem_heap_stats.peak_allocated_bytes, (uint64_t) mem_heap_stats.peak_allocated_bytes,
mem_heap_stats.peak_waste_bytes); (uint64_t) mem_heap_stats.peak_waste_bytes);
} }
#else /* MEM_STATS */ #else /* MEM_STATS */
(void) dump_stats; (void) dump_stats;