From ab2fc6d3c36ecfdf8028b6060b6649a9fc6155a5 Mon Sep 17 00:00:00 2001
From: Robert Baldyga <robert.baldyga@intel.com>
Date: Mon, 27 May 2019 13:09:17 +0200
Subject: [PATCH] Rename utils_allocator to utils_realloc

Signed-off-by: Robert Baldyga <robert.baldyga@intel.com>
---
 src/cleaning/alru.c                                    |  2 +-
 src/concurrency/ocf_cache_concurrency.c                |  2 +-
 src/metadata/metadata_io.c                             |  2 +-
 src/metadata/metadata_updater.c                        |  2 +-
 src/utils/{utils_allocator.c => utils_realloc.c}       | 10 +++++-----
 src/utils/{utils_allocator.h => utils_realloc.h}       | 10 +++++-----
 .../alru.c/cleaning_policy_alru_initialize_part_test.c |  2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)
 rename src/utils/{utils_allocator.c => utils_realloc.c} (91%)
 rename src/utils/{utils_allocator.h => utils_realloc.h} (93%)

diff --git a/src/cleaning/alru.c b/src/cleaning/alru.c
index 10ec27b..1c45928 100644
--- a/src/cleaning/alru.c
+++ b/src/cleaning/alru.c
@@ -10,7 +10,7 @@
 #include "../metadata/metadata.h"
 #include "../utils/utils_cleaner.h"
 #include "../utils/utils_part.h"
-#include "../utils/utils_allocator.h"
+#include "../utils/utils_realloc.h"
 #include "../concurrency/ocf_cache_concurrency.h"
 #include "../ocf_def_priv.h"
 #include "cleaning_priv.h"
diff --git a/src/concurrency/ocf_cache_concurrency.c b/src/concurrency/ocf_cache_concurrency.c
index b902b97..9cfc88b 100644
--- a/src/concurrency/ocf_cache_concurrency.c
+++ b/src/concurrency/ocf_cache_concurrency.c
@@ -7,7 +7,7 @@
 #include "../ocf_priv.h"
 #include "../ocf_request.h"
 #include "../utils/utils_cache_line.h"
-#include "../utils/utils_allocator.h"
+#include "../utils/utils_realloc.h"
 
 #define OCF_CACHE_CONCURRENCY_DEBUG 0
 
diff --git a/src/metadata/metadata_io.c b/src/metadata/metadata_io.c
index 4a89c55..56348df 100644
--- a/src/metadata/metadata_io.c
+++ b/src/metadata/metadata_io.c
@@ -9,7 +9,7 @@
 #include "../engine/engine_common.h"
 #include "../engine/engine_bf.h"
 #include "../utils/utils_cache_line.h"
-#include "../utils/utils_allocator.h"
+#include "../utils/utils_realloc.h"
 #include "../utils/utils_io.h"
 #include "../ocf_def_priv.h"
 
diff --git a/src/metadata/metadata_updater.c b/src/metadata/metadata_updater.c
index bd93a7f..4c24475 100644
--- a/src/metadata/metadata_updater.c
+++ b/src/metadata/metadata_updater.c
@@ -11,7 +11,7 @@
 #include "../ocf_cache_priv.h"
 #include "../ocf_ctx_priv.h"
 #include "../utils/utils_io.h"
-#include "../utils/utils_allocator.h"
+#include "../utils/utils_realloc.h"
 
 int ocf_metadata_updater_init(ocf_cache_t cache)
 {
diff --git a/src/utils/utils_allocator.c b/src/utils/utils_realloc.c
similarity index 91%
rename from src/utils/utils_allocator.c
rename to src/utils/utils_realloc.c
index 34580a7..7c805fb 100644
--- a/src/utils/utils_allocator.c
+++ b/src/utils/utils_realloc.c
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: BSD-3-Clause-Clear
  */
 #include "ocf/ocf.h"
-#include "utils_allocator.h"
+#include "utils_realloc.h"
 #include "ocf_env.h"
 
-#define OCF_ALLOCATOR_K_MAX	(128 * KiB)
+#define OCF_REALLOC_K_MAX	(128 * KiB)
 
 static int _ocf_realloc_with_cp(void **mem, size_t size, size_t count,
 		size_t *limit, bool cp)
@@ -24,7 +24,7 @@ static int _ocf_realloc_with_cp(void **mem, size_t size, size_t count,
 
 			void *new_mem;
 
-			if (alloc_size > OCF_ALLOCATOR_K_MAX)
+			if (alloc_size > OCF_REALLOC_K_MAX)
 				new_mem = env_vzalloc(alloc_size);
 			else
 				new_mem = env_zalloc(alloc_size, ENV_MEM_NOIO);
@@ -44,7 +44,7 @@ static int _ocf_realloc_with_cp(void **mem, size_t size, size_t count,
 
 				}
 
-				if (*limit > OCF_ALLOCATOR_K_MAX)
+				if (*limit > OCF_REALLOC_K_MAX)
 					env_vfree(*mem);
 				else
 					env_free(*mem);
@@ -74,7 +74,7 @@ static int _ocf_realloc_with_cp(void **mem, size_t size, size_t count,
 
 		if ((*mem) && (*limit)) {
 			/* Need to free memory */
-			if (*limit > OCF_ALLOCATOR_K_MAX)
+			if (*limit > OCF_REALLOC_K_MAX)
 				env_vfree(*mem);
 			else
 				env_free(*mem);
diff --git a/src/utils/utils_allocator.h b/src/utils/utils_realloc.h
similarity index 93%
rename from src/utils/utils_allocator.h
rename to src/utils/utils_realloc.h
index 9542e9b..ee2fd6f 100644
--- a/src/utils/utils_allocator.h
+++ b/src/utils/utils_realloc.h
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: BSD-3-Clause-Clear
  */
 
-#ifndef UTILS_ALLOCATOR_H_
-#define UTILS_ALLOCATOR_H_
+#ifndef UTILS_REALLOC_H_
+#define UTILS_REALLOC_H_
 
 /**
- * @file utils_allocator.h
- * @brief OCF memory reallocator
+ * @file utils_realloc.h
+ * @brief OCF realloc
  */
 
 void ocf_realloc_init(void **mem, size_t *limit);
@@ -66,4 +66,4 @@ int ocf_realloc_cp(void **mem, size_t size, size_t count, size_t *limit);
 #define OCF_REALLOC_CP(mem, size, count, limit) \
 		ocf_realloc_cp((void **)mem, size, count, limit)
 
-#endif /* UTILS_ALLOCATOR_H_ */
+#endif /* UTILS_REALLOC_H_ */
diff --git a/tests/unit/tests/cleaning/alru.c/cleaning_policy_alru_initialize_part_test.c b/tests/unit/tests/cleaning/alru.c/cleaning_policy_alru_initialize_part_test.c
index ba8f16f..045f63a 100644
--- a/tests/unit/tests/cleaning/alru.c/cleaning_policy_alru_initialize_part_test.c
+++ b/tests/unit/tests/cleaning/alru.c/cleaning_policy_alru_initialize_part_test.c
@@ -31,7 +31,7 @@
 #include "../metadata/metadata.h"
 #include "../utils/utils_cleaner.h"
 #include "../utils/utils_part.h"
-#include "../utils/utils_allocator.h"
+#include "../utils/utils_realloc.h"
 #include "../concurrency/ocf_cache_concurrency.h"
 #include "../ocf_def_priv.h"