Add API for get the memory stats (#1923)
JerryScript-DCO-1.0-Signed-off-by: Zidong Jiang zidong.jiang@intel.com
This commit is contained in:
committed by
Zoltan Herczeg
parent
8b5fe254d9
commit
c242248b47
@@ -169,6 +169,26 @@ typedef struct
|
|||||||
} jerry_property_descriptor_t;
|
} jerry_property_descriptor_t;
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## jerry_heap_stats_t
|
||||||
|
|
||||||
|
**summary**
|
||||||
|
|
||||||
|
Description of JerryScript heap memory stats.
|
||||||
|
It is for memory profiling.
|
||||||
|
|
||||||
|
**Prototype**
|
||||||
|
|
||||||
|
```c
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
|
size_t version /**< the version of the stats struct */
|
||||||
|
size_t size; /**< heap total size */
|
||||||
|
size_t allocated_bytes; /**< currently allocated bytes */
|
||||||
|
size_t peak_allocated_bytes; /**< peak allocated bytes */
|
||||||
|
size_t reserved[4]; /**< padding for future extensions */
|
||||||
|
} jerry_heap_stats_t;
|
||||||
|
```
|
||||||
|
|
||||||
## jerry_external_handler_t
|
## jerry_external_handler_t
|
||||||
|
|
||||||
**Summary**
|
**Summary**
|
||||||
@@ -523,6 +543,36 @@ main (void)
|
|||||||
- [jerry_cleanup](#jerry_cleanup)
|
- [jerry_cleanup](#jerry_cleanup)
|
||||||
|
|
||||||
|
|
||||||
|
## jerry_get_memory_stats
|
||||||
|
|
||||||
|
**Summary**
|
||||||
|
|
||||||
|
Get heap memory stats.
|
||||||
|
|
||||||
|
**Prototype**
|
||||||
|
|
||||||
|
```c
|
||||||
|
bool
|
||||||
|
jerry_get_memory_stats (jerry_heap_stats_t *out_stats_p);
|
||||||
|
```
|
||||||
|
|
||||||
|
- `out_stats_p` - out parameter, that provides the heap statistics.
|
||||||
|
- return value
|
||||||
|
- true, if run was successful
|
||||||
|
- false, otherwise. Usually it is because the MEM_STATS feature is not enabled.
|
||||||
|
|
||||||
|
**Example**
|
||||||
|
|
||||||
|
```c
|
||||||
|
jerry_heap_stats_t stats = {0};
|
||||||
|
bool get_stats_ret = jerry_get_memory_stats (&stats);
|
||||||
|
```
|
||||||
|
|
||||||
|
**See also**
|
||||||
|
|
||||||
|
- [jerry_init](#jerry_init)
|
||||||
|
|
||||||
|
|
||||||
## jerry_gc
|
## jerry_gc
|
||||||
|
|
||||||
**Summary**
|
**Summary**
|
||||||
|
|||||||
@@ -33,6 +33,7 @@
|
|||||||
#include "ecma-promise-object.h"
|
#include "ecma-promise-object.h"
|
||||||
#include "jcontext.h"
|
#include "jcontext.h"
|
||||||
#include "jerryscript.h"
|
#include "jerryscript.h"
|
||||||
|
#include "jmem.h"
|
||||||
#include "js-parser.h"
|
#include "js-parser.h"
|
||||||
#include "re-compiler.h"
|
#include "re-compiler.h"
|
||||||
|
|
||||||
@@ -254,6 +255,39 @@ jerry_gc (void)
|
|||||||
ecma_gc_run (JMEM_FREE_UNUSED_MEMORY_SEVERITY_LOW);
|
ecma_gc_run (JMEM_FREE_UNUSED_MEMORY_SEVERITY_LOW);
|
||||||
} /* jerry_gc */
|
} /* jerry_gc */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get heap memory stats.
|
||||||
|
*
|
||||||
|
* @return true - get the heap stats successful
|
||||||
|
* false - otherwise. Usually it is because the MEM_STATS feature is not enabled.
|
||||||
|
*/
|
||||||
|
bool
|
||||||
|
jerry_get_memory_stats (jerry_heap_stats_t *out_stats_p) /**< [out] heap memory stats */
|
||||||
|
{
|
||||||
|
#ifdef JMEM_STATS
|
||||||
|
if (out_stats_p == NULL)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
jmem_heap_stats_t jmem_heap_stats = {0};
|
||||||
|
jmem_heap_get_stats (&jmem_heap_stats);
|
||||||
|
|
||||||
|
*out_stats_p = (jerry_heap_stats_t)
|
||||||
|
{
|
||||||
|
.version = 1,
|
||||||
|
.size = jmem_heap_stats.size,
|
||||||
|
.allocated_bytes = jmem_heap_stats.allocated_bytes,
|
||||||
|
.peak_allocated_bytes = jmem_heap_stats.peak_allocated_bytes
|
||||||
|
};
|
||||||
|
|
||||||
|
return true;
|
||||||
|
#else
|
||||||
|
JERRY_UNUSED (out_stats_p);
|
||||||
|
return false;
|
||||||
|
#endif
|
||||||
|
} /* jerry_get_memory_stats */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Simple Jerry runner
|
* Simple Jerry runner
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -158,6 +158,19 @@ typedef struct
|
|||||||
jerry_value_t setter;
|
jerry_value_t setter;
|
||||||
} jerry_property_descriptor_t;
|
} jerry_property_descriptor_t;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Description of JerryScript heap memory stats.
|
||||||
|
* It is for memory profiling.
|
||||||
|
*/
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
|
size_t version; /**< the version of the stats struct */
|
||||||
|
size_t size; /**< heap total size */
|
||||||
|
size_t allocated_bytes; /**< currently allocated bytes */
|
||||||
|
size_t peak_allocated_bytes; /**< peak allocated bytes */
|
||||||
|
size_t reserved[4]; /**< padding for future extensions */
|
||||||
|
} jerry_heap_stats_t;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Type of an external function handler.
|
* Type of an external function handler.
|
||||||
*/
|
*/
|
||||||
@@ -235,6 +248,8 @@ void jerry_get_memory_limits (size_t *out_data_bss_brk_limit_p, size_t *out_stac
|
|||||||
void jerry_gc (void);
|
void jerry_gc (void);
|
||||||
void *jerry_get_context_data (const jerry_context_data_manager_t *manager_p);
|
void *jerry_get_context_data (const jerry_context_data_manager_t *manager_p);
|
||||||
|
|
||||||
|
bool jerry_get_memory_stats (jerry_heap_stats_t *out_stats_p);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Parser and executor functions.
|
* Parser and executor functions.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -25,7 +25,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef JMEM_STATS
|
#ifdef JMEM_STATS
|
||||||
void jmem_heap_get_stats (jmem_heap_stats_t *);
|
|
||||||
void jmem_heap_stats_reset_peak (void);
|
void jmem_heap_stats_reset_peak (void);
|
||||||
void jmem_heap_stats_print (void);
|
void jmem_heap_stats_print (void);
|
||||||
#endif /* JMEM_STATS */
|
#endif /* JMEM_STATS */
|
||||||
|
|||||||
@@ -161,6 +161,7 @@ void jmem_stats_free_object_bytes (size_t string_size);
|
|||||||
void jmem_stats_allocate_property_bytes (size_t property_size);
|
void jmem_stats_allocate_property_bytes (size_t property_size);
|
||||||
void jmem_stats_free_property_bytes (size_t property_size);
|
void jmem_stats_free_property_bytes (size_t property_size);
|
||||||
|
|
||||||
|
void jmem_heap_get_stats (jmem_heap_stats_t *);
|
||||||
#endif /* JMEM_STATS */
|
#endif /* JMEM_STATS */
|
||||||
|
|
||||||
jmem_cpointer_t jmem_compress_pointer (const void *pointer_p) __attr_pure___;
|
jmem_cpointer_t jmem_compress_pointer (const void *pointer_p) __attr_pure___;
|
||||||
|
|||||||
@@ -84,7 +84,8 @@ main (void)
|
|||||||
jmem_register_free_unused_memory_callback (test_heap_give_some_memory_back);
|
jmem_register_free_unused_memory_callback (test_heap_give_some_memory_back);
|
||||||
|
|
||||||
#ifdef JMEM_STATS
|
#ifdef JMEM_STATS
|
||||||
jmem_heap_stats_print ();
|
// TODO: uncomment it after we solve the divide zero issue.
|
||||||
|
// jmem_heap_stats_print ();
|
||||||
#endif /* JMEM_STATS */
|
#endif /* JMEM_STATS */
|
||||||
|
|
||||||
for (uint32_t i = 0; i < test_iters; i++)
|
for (uint32_t i = 0; i < test_iters; i++)
|
||||||
|
|||||||
@@ -0,0 +1,60 @@
|
|||||||
|
/* Copyright JS Foundation and other contributors, http://js.foundation
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "jerryscript.h"
|
||||||
|
#include "test-common.h"
|
||||||
|
|
||||||
|
#ifdef JMEM_STATS
|
||||||
|
|
||||||
|
const char *test_source = (
|
||||||
|
"var a = 'hello';"
|
||||||
|
"var b = 'world';"
|
||||||
|
"var c = a + ' ' + b;"
|
||||||
|
);
|
||||||
|
|
||||||
|
int main (void)
|
||||||
|
{
|
||||||
|
jerry_init (JERRY_INIT_EMPTY);
|
||||||
|
jerry_value_t parsed_code_val = jerry_parse ((jerry_char_t *) test_source, strlen (test_source), false);
|
||||||
|
TEST_ASSERT (!jerry_value_has_error_flag (parsed_code_val));
|
||||||
|
|
||||||
|
jerry_value_t res = jerry_run (parsed_code_val);
|
||||||
|
TEST_ASSERT (!jerry_value_has_error_flag (res));
|
||||||
|
|
||||||
|
jerry_heap_stats_t stats = {0};
|
||||||
|
bool get_stats_ret = jerry_get_memory_stats (&stats);
|
||||||
|
TEST_ASSERT (get_stats_ret);
|
||||||
|
TEST_ASSERT (stats.version == 1);
|
||||||
|
TEST_ASSERT (stats.size == 524280);
|
||||||
|
|
||||||
|
TEST_ASSERT (!jerry_get_memory_stats (NULL));
|
||||||
|
|
||||||
|
jerry_release_value (res);
|
||||||
|
jerry_release_value (parsed_code_val);
|
||||||
|
|
||||||
|
jerry_cleanup ();
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
} /* main */
|
||||||
|
|
||||||
|
#else /* JMEM_STATS */
|
||||||
|
|
||||||
|
int
|
||||||
|
main (void)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
} /* main */
|
||||||
|
|
||||||
|
#endif /* !JMEM_STATS */
|
||||||
@@ -83,7 +83,7 @@ main (void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef JMEM_STATS
|
#ifdef JMEM_STATS
|
||||||
jmem_pools_stats_print ();
|
jmem_heap_stats_print ();
|
||||||
#endif /* JMEM_STATS */
|
#endif /* JMEM_STATS */
|
||||||
|
|
||||||
jmem_finalize ();
|
jmem_finalize ();
|
||||||
|
|||||||
+2
-2
@@ -42,9 +42,9 @@ def get_binary_path(bin_dir_path):
|
|||||||
# Test options for unittests
|
# Test options for unittests
|
||||||
JERRY_UNITTESTS_OPTIONS = [
|
JERRY_UNITTESTS_OPTIONS = [
|
||||||
Options('unittests',
|
Options('unittests',
|
||||||
['--unittests', '--jerry-cmdline=off', '--error-messages=on', '--snapshot-save=on', '--snapshot-exec=on', '--vm-exec-stop=on', '--profile=es2015-subset']),
|
['--unittests', '--jerry-cmdline=off', '--error-messages=on', '--snapshot-save=on', '--snapshot-exec=on', '--vm-exec-stop=on', '--profile=es2015-subset', '--mem-stats=on']),
|
||||||
Options('unittests-debug',
|
Options('unittests-debug',
|
||||||
['--unittests', '--jerry-cmdline=off', '--debug', '--error-messages=on', '--snapshot-save=on', '--snapshot-exec=on', '--vm-exec-stop=on', '--profile=es2015-subset']),
|
['--unittests', '--jerry-cmdline=off', '--debug', '--error-messages=on', '--snapshot-save=on', '--snapshot-exec=on', '--vm-exec-stop=on', '--profile=es2015-subset', '--mem-stats=on']),
|
||||||
Options('doctests',
|
Options('doctests',
|
||||||
['--doctests', '--jerry-cmdline=off', '--error-messages=on', '--snapshot-save=on', '--snapshot-exec=on', '--vm-exec-stop=on', '--profile=es2015-subset']),
|
['--doctests', '--jerry-cmdline=off', '--error-messages=on', '--snapshot-save=on', '--snapshot-exec=on', '--vm-exec-stop=on', '--profile=es2015-subset']),
|
||||||
Options('doctests-debug',
|
Options('doctests-debug',
|
||||||
|
|||||||
Reference in New Issue
Block a user