Rework memory statistics to provide useful user information. (#1812)

Obsolote statistics is also removed.

JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com

jerry-core/ecma/base/ecma-alloc.c

@@ -80,12 +80,37 @@ JERRY_STATIC_ASSERT (sizeof (ecma_extended_object_t) - sizeof (ecma_object_t) <=
   ALLOC (ecma_type) \
   DEALLOC (ecma_type)
 
-DECLARE_ROUTINES_FOR (object)
 DECLARE_ROUTINES_FOR (number)
 DECLARE_ROUTINES_FOR (collection_header)
 DECLARE_ROUTINES_FOR (collection_chunk)
-DECLARE_ROUTINES_FOR (string)
-DECLARE_ROUTINES_FOR (getter_setter_pointers)
+
+/**
+ * Allocate memory for ecma-object
+ *
+ * @return pointer to allocated memory
+ */
+inline ecma_object_t * __attr_always_inline___
+ecma_alloc_object (void)
+{
+#ifdef JMEM_STATS
+  jmem_stats_allocate_object_bytes (sizeof (ecma_object_t));
+#endif /* JMEM_STATS */
+
+  return (ecma_object_t *) jmem_pools_alloc (sizeof (ecma_object_t));
+} /* ecma_alloc_object */
+
+/**
+ * Dealloc memory from an ecma-object
+ */
+inline void __attr_always_inline___
+ecma_dealloc_object (ecma_object_t *object_p) /**< object to be freed */
+{
+#ifdef JMEM_STATS
+  jmem_stats_free_object_bytes (sizeof (ecma_object_t));
+#endif /* JMEM_STATS */
+
+  jmem_pools_free (object_p, sizeof (ecma_object_t));
+} /* ecma_dealloc_object */
 
 /**
  * Allocate memory for extended object
@@ -95,6 +120,10 @@ DECLARE_ROUTINES_FOR (getter_setter_pointers)
 inline ecma_extended_object_t * __attr_always_inline___
 ecma_alloc_extended_object (size_t size) /**< size of object */
 {
+#ifdef JMEM_STATS
+  jmem_stats_allocate_object_bytes (size);
+#endif /* JMEM_STATS */
+
   return jmem_heap_alloc_block (size);
 } /* ecma_alloc_extended_object */
 
@@ -105,9 +134,99 @@ inline void __attr_always_inline___
 ecma_dealloc_extended_object (ecma_extended_object_t *ext_object_p, /**< property pair to be freed */
                               size_t size) /**< size of object */
 {
+#ifdef JMEM_STATS
+  jmem_stats_free_object_bytes (size);
+#endif /* JMEM_STATS */
+
   jmem_heap_free_block (ext_object_p, size);
 } /* ecma_dealloc_extended_object */
 
+/**
+ * Allocate memory for ecma-string descriptor
+ *
+ * @return pointer to allocated memory
+ */
+inline ecma_string_t * __attr_always_inline___
+ecma_alloc_string (void)
+{
+#ifdef JMEM_STATS
+  jmem_stats_allocate_string_bytes (sizeof (ecma_string_t));
+#endif /* JMEM_STATS */
+
+  return (ecma_string_t *) jmem_pools_alloc (sizeof (ecma_string_t));
+} /* ecma_alloc_string */
+
+/**
+ * Dealloc memory from ecma-string descriptor
+ */
+inline void __attr_always_inline___
+ecma_dealloc_string (ecma_string_t *string_p) /**< string to be freed */
+{
+#ifdef JMEM_STATS
+  jmem_stats_free_string_bytes (sizeof (ecma_string_t));
+#endif /* JMEM_STATS */
+
+  jmem_pools_free (string_p, sizeof (ecma_string_t));
+} /* ecma_dealloc_string */
+
+/**
+ * Allocate memory for string with character data
+ *
+ * @return pointer to allocated memory
+ */
+inline ecma_string_t * __attr_always_inline___
+ecma_alloc_string_buffer (size_t size) /**< size of string */
+{
+#ifdef JMEM_STATS
+  jmem_stats_allocate_string_bytes (size);
+#endif /* JMEM_STATS */
+
+  return jmem_heap_alloc_block (size);
+} /* ecma_alloc_string_buffer */
+
+/**
+ * Dealloc memory of a string with character data
+ */
+inline void __attr_always_inline___
+ecma_dealloc_string_buffer (ecma_string_t *string_p, /**< string with data */
+                            size_t size) /**< size of string */
+{
+#ifdef JMEM_STATS
+  jmem_stats_free_string_bytes (size);
+#endif /* JMEM_STATS */
+
+  jmem_heap_free_block (string_p, size);
+} /* ecma_dealloc_string_buffer */
+
+/**
+ * Allocate memory for getter-setter pointer pair
+ *
+ * @return pointer to allocated memory
+ */
+inline ecma_getter_setter_pointers_t * __attr_always_inline___
+ecma_alloc_getter_setter_pointers (void)
+{
+#ifdef JMEM_STATS
+  jmem_stats_allocate_property_bytes (sizeof (ecma_property_pair_t));
+#endif /* JMEM_STATS */
+
+  return (ecma_getter_setter_pointers_t *) jmem_pools_alloc (sizeof (ecma_getter_setter_pointers_t));
+} /* ecma_alloc_getter_setter_pointers */
+
+/**
+ * Dealloc memory from getter-setter pointer pair
+ */
+inline void __attr_always_inline___
+ecma_dealloc_getter_setter_pointers (ecma_getter_setter_pointers_t *getter_setter_pointers_p) /**< pointer pair
+                                                                                                * to be freed */
+{
+#ifdef JMEM_STATS
+  jmem_stats_free_property_bytes (sizeof (ecma_property_pair_t));
+#endif /* JMEM_STATS */
+
+  jmem_pools_free (getter_setter_pointers_p, sizeof (ecma_getter_setter_pointers_t));
+} /* ecma_dealloc_getter_setter_pointers */
+
 /**
  * Allocate memory for ecma-property pair
  *
@@ -116,6 +235,10 @@ ecma_dealloc_extended_object (ecma_extended_object_t *ext_object_p, /**< propert
 inline ecma_property_pair_t * __attr_always_inline___
 ecma_alloc_property_pair (void)
 {
+#ifdef JMEM_STATS
+  jmem_stats_allocate_property_bytes (sizeof (ecma_property_pair_t));
+#endif /* JMEM_STATS */
+
   return jmem_heap_alloc_block (sizeof (ecma_property_pair_t));
 } /* ecma_alloc_property_pair */
 
@@ -125,6 +248,10 @@ ecma_alloc_property_pair (void)
 inline void __attr_always_inline___
 ecma_dealloc_property_pair (ecma_property_pair_t *property_pair_p) /**< property pair to be freed */
 {
+#ifdef JMEM_STATS
+  jmem_stats_free_property_bytes (sizeof (ecma_property_pair_t));
+#endif /* JMEM_STATS */
+
   jmem_heap_free_block (property_pair_p, sizeof (ecma_property_pair_t));
 } /* ecma_dealloc_property_pair */