Add context support for memory allocator.

JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg [email protected]

Author: zherczeg

jerry-core/CMakeLists.txt

@@ -105,16 +105,16 @@ project (JerryCore C ASM)
 # Include directories
  set(INCLUDE_CORE
      ${CMAKE_SOURCE_DIR}/jerry-core
-     ${CMAKE_SOURCE_DIR}/jerry-core/lit
-     ${CMAKE_SOURCE_DIR}/jerry-core/rcs
-     ${CMAKE_SOURCE_DIR}/jerry-core/mem
-     ${CMAKE_SOURCE_DIR}/jerry-core/vm
-     ${CMAKE_SOURCE_DIR}/jerry-core/ecma/builtin-objects
+     ${CMAKE_SOURCE_DIR}/jerry-core/context
      ${CMAKE_SOURCE_DIR}/jerry-core/ecma/base
+     ${CMAKE_SOURCE_DIR}/jerry-core/ecma/builtin-objects
      ${CMAKE_SOURCE_DIR}/jerry-core/ecma/operations
+     ${CMAKE_SOURCE_DIR}/jerry-core/jrt
+     ${CMAKE_SOURCE_DIR}/jerry-core/lit
+     ${CMAKE_SOURCE_DIR}/jerry-core/mem
      ${CMAKE_SOURCE_DIR}/jerry-core/parser/js
      ${CMAKE_SOURCE_DIR}/jerry-core/parser/regexp
-     ${CMAKE_SOURCE_DIR}/jerry-core/jrt)
+     ${CMAKE_SOURCE_DIR}/jerry-core/vm)
 
  # Third-party
   # Valgrind
@@ -123,29 +123,29 @@ project (JerryCore C ASM)
 # Sources
  # Jerry core
   file(GLOB SOURCE_CORE_API                   *.c)
-  file(GLOB SOURCE_CORE_LIT                   lit/*.c)
-  file(GLOB SOURCE_CORE_RCS                   rcs/*.c)
-  file(GLOB SOURCE_CORE_MEM                   mem/*.c)
-  file(GLOB SOURCE_CORE_VM                    vm/*.c)
-  file(GLOB SOURCE_CORE_ECMA_BUILTINS         ecma/builtin-objects/*.c)
+  file(GLOB SOURCE_CORE_CONTEXT               context/*.c)
   file(GLOB SOURCE_CORE_ECMA_BASE             ecma/base/*.c)
+  file(GLOB SOURCE_CORE_ECMA_BUILTINS         ecma/builtin-objects/*.c)
   file(GLOB SOURCE_CORE_ECMA_OPERATIONS       ecma/operations/*.c)
+  file(GLOB SOURCE_CORE_JRT                   jrt/*.c)
+  file(GLOB SOURCE_CORE_LIT                   lit/*.c)
+  file(GLOB SOURCE_CORE_MEM                   mem/*.c)
   file(GLOB SOURCE_CORE_PARSER_JS             parser/js/*.c)
   file(GLOB SOURCE_CORE_PARSER_REGEXP         parser/regexp/*.c)
-  file(GLOB SOURCE_CORE_JRT                   jrt/*.c)
+  file(GLOB SOURCE_CORE_VM                    vm/*.c)
 
   set(SOURCE_CORE_FILES
       ${SOURCE_CORE_API}
-      ${SOURCE_CORE_LIT}
-      ${SOURCE_CORE_RCS}
-      ${SOURCE_CORE_MEM}
-      ${SOURCE_CORE_VM}
-      ${SOURCE_CORE_ECMA_BUILTINS}
+      ${SOURCE_CORE_CONTEXT}
       ${SOURCE_CORE_ECMA_BASE}
+      ${SOURCE_CORE_ECMA_BUILTINS}
       ${SOURCE_CORE_ECMA_OPERATIONS}
+      ${SOURCE_CORE_JRT}
+      ${SOURCE_CORE_LIT}
+      ${SOURCE_CORE_MEM}
       ${SOURCE_CORE_PARSER_JS}
       ${SOURCE_CORE_PARSER_REGEXP}
-      ${SOURCE_CORE_JRT})
+      ${SOURCE_CORE_VM})
 
  # Jerry port
  file(GLOB SOURCE_PORT_FILES ${PORT_DIR}/*.c)

jerry-core/context/context.c

@@ -0,0 +1,48 @@
+/* Copyright 2016 Samsung Electronics Co., Ltd.
+ * Copyright 2016 University of Szeged.
+ *
+ * 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 "context.h"
+
+/** \addtogroup context Jerry context
+ * @{
+ *
+ * \addtogroup context Context
+ * @{
+ */
+
+/**
+ * Global context.
+ */
+jerry_context_t jerry_global_context;
+
+/**
+ * Jerry global heap section attribute.
+ */
+#ifndef JERRY_HEAP_SECTION_ATTR
+#define JERRY_GLOBAL_HEAP_SECTION
+#else /* JERRY_HEAP_SECTION_ATTR */
+#define JERRY_GLOBAL_HEAP_SECTION __attribute__ ((section (JERRY_HEAP_SECTION_ATTR)))
+#endif /* !JERRY_HEAP_SECTION_ATTR */
+
+/**
+ * Global heap.
+ */
+mem_heap_t jerry_global_heap __attribute__ ((aligned (MEM_ALIGNMENT))) JERRY_GLOBAL_HEAP_SECTION;
+
+/**
+ * @}
+ * @}
+ */

jerry-core/context/context.h

@@ -0,0 +1,102 @@
+/* Copyright 2016 Samsung Electronics Co., Ltd.
+ * Copyright 2016 University of Szeged.
+ *
+ * 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.
+ */
+
+/**
+ * Memory context for JerryScript
+ */
+#ifndef CONTEXT_H
+#define CONTEXT_H
+
+#include "jrt.h"
+#include "mem-allocator.h"
+#include "mem-config.h"
+
+/** \addtogroup context Jerry context
+ * @{
+ *
+ * \addtogroup context Context
+ * @{
+ */
+
+/**
+ * Calculate heap area size, leaving space for a pointer to the free list
+ */
+#define MEM_HEAP_AREA_SIZE (MEM_HEAP_SIZE - MEM_ALIGNMENT)
+
+/**
+ * Heap structure
+ */
+typedef struct
+{
+  mem_heap_free_t first; /**< first node in free region list */
+  uint8_t area[MEM_HEAP_AREA_SIZE]; /**< heap area */
+} mem_heap_t;
+
+/**
+ * JerryScript context
+ *
+ * The purpose of this header is storing
+ * all global variables for Jerry
+ */
+typedef struct
+{
+  /**
+   * Memory manager part.
+   */
+  size_t mem_heap_allocated_size; /**< size of allocated regions */
+  size_t mem_heap_limit; /**< current limit of heap usage, that is upon being reached,
+                          *   causes call of "try give memory back" callbacks */
+  mem_heap_free_t *mem_heap_list_skip_p; /**< This is used to speed up deallocation. */
+  mem_pools_chunk_t *mem_free_chunk_p; /**< list of free pool chunks */
+  mem_try_give_memory_back_callback_t mem_try_give_memory_back_callback; /**< The 'try to give memory back' callback */
+
+#ifdef MEM_STATS
+  mem_heap_stats_t mem_heap_stats; /**< heap's memory usage statistics */
+  mem_pools_stats_t mem_pools_stats; /**< pools' memory usage statistics */
+#endif /* MEM_STATS */
+
+#ifdef JERRY_VALGRIND_FREYA
+  bool valgrind_freya_mempool_request; /**< Tells whether a pool manager
+                                        *   allocator request is in progress */
+#endif /* JERRY_VALGRIND_FREYA */
+} jerry_context_t;
+
+/**
+ * Jerry global context.
+ */
+extern jerry_context_t jerry_global_context;
+
+/**
+ * Jerry global heap.
+ */
+extern mem_heap_t jerry_global_heap;
+
+/**
+ * Provides a reference to a field in the current context.
+ */
+#define JERRY_CONTEXT(field) (jerry_global_context.field)
+
+/**
+ * Provides a reference to the area field of the heap.
+ */
+#define MEM_HEAP_CONTEXT(field) (jerry_global_heap.field)
+
+/**
+ * @}
+ * @}
+ */
+
+#endif /* !CONTEXT_H */

jerry-core/mem/mem-allocator.c

@@ -18,6 +18,7 @@
  * Allocator implementation
  */
 
+#include "context.h"
 #include "jrt.h"
 #include "jrt-libc-includes.h"
 #include "mem-allocator.h"
@@ -27,11 +28,6 @@
 #define MEM_ALLOCATOR_INTERNAL
 #include "mem-allocator-internal.h"
 
-/**
- * The 'try to give memory back' callback
- */
-static mem_try_give_memory_back_callback_t mem_try_give_memory_back_callback = NULL;
-
 /**
  * Initialize memory allocators.
  */
@@ -94,9 +90,9 @@ void
 mem_register_a_try_give_memory_back_callback (mem_try_give_memory_back_callback_t callback) /* callback routine */
 {
   /* Currently only one callback is supported */
-  JERRY_ASSERT (mem_try_give_memory_back_callback == NULL);
+  JERRY_ASSERT (JERRY_CONTEXT (mem_try_give_memory_back_callback) == NULL);
 
-  mem_try_give_memory_back_callback = callback;
+  JERRY_CONTEXT (mem_try_give_memory_back_callback) = callback;
 } /* mem_register_a_try_give_memory_back_callback */
 
 /**
@@ -106,9 +102,9 @@ void
 mem_unregister_a_try_give_memory_back_callback (mem_try_give_memory_back_callback_t callback) /* callback routine */
 {
   /* Currently only one callback is supported */
-  JERRY_ASSERT (mem_try_give_memory_back_callback == callback);
+  JERRY_ASSERT (JERRY_CONTEXT (mem_try_give_memory_back_callback) == callback);
 
-  mem_try_give_memory_back_callback = NULL;
+  JERRY_CONTEXT (mem_try_give_memory_back_callback) = NULL;
 } /* mem_unregister_a_try_give_memory_back_callback */
 
 /**
@@ -118,9 +114,9 @@ void
 mem_run_try_to_give_memory_back_callbacks (mem_try_give_memory_back_severity_t severity) /**< severity of
                                                                                               the request */
 {
-  if (mem_try_give_memory_back_callback != NULL)
+  if (JERRY_CONTEXT (mem_try_give_memory_back_callback) != NULL)
   {
-    mem_try_give_memory_back_callback (severity);
+    JERRY_CONTEXT (mem_try_give_memory_back_callback) (severity);
   }
 
   mem_pools_collect_empty ();

jerry-core/mem/mem-allocator.h

@@ -68,6 +68,23 @@ typedef enum
   MEM_TRY_GIVE_MEMORY_BACK_SEVERITY_HIGH, /* 'high' severity */
 } mem_try_give_memory_back_severity_t;
 
+/**
+ *  Free region node
+ */
+typedef struct
+{
+  uint32_t next_offset; /* Offset of next region in list */
+  uint32_t size; /* Size of region */
+} mem_heap_free_t;
+
+/**
+ * Node for free chunk list
+ */
+typedef struct mem_pools_chunk
+{
+  struct mem_pools_chunk *next_p; /* pointer to next pool chunk */
+} mem_pools_chunk_t;
+
 /**
  * A 'try give memory back' callback routine type.
  */