From 0d22db6d521a645a7d6a8968702d1fb842668a11 Mon Sep 17 00:00:00 2001 From: Wook Song Date: Mon, 16 Sep 2019 17:00:40 +0900 Subject: [PATCH] [Mem] Refactor mem_alloc() This patch refactors the mem_alloc function to improve readability. Signed-off-by: Wook Song --- src/core/ne-mem.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/core/ne-mem.c b/src/core/ne-mem.c index 2166695..08fb4ce 100644 --- a/src/core/ne-mem.c +++ b/src/core/ne-mem.c @@ -1160,21 +1160,22 @@ mem_alloc (uint64_t size, hwmem **hwmem_p) MEM_LOCK(); new_hwmem = hwmem_alloc (size, HWMEM_TYPE_MODEL); - - if (mpriv.cmode == COMPACT_MODE_INTERNAL) { - if (!new_hwmem && chunk_compact (size)) { - /** try again after compaction */ + /* Fallback */ + if (!new_hwmem) { + if ((mpriv.cmode == COMPACT_MODE_INTERNAL) && (chunk_compact (size))) { + /** try again after compaction */ new_hwmem = hwmem_alloc (size, HWMEM_TYPE_MODEL); } } MEM_UNLOCK(); - if (new_hwmem) { - *hwmem_p = new_hwmem; - return 0; - } else + if (!new_hwmem) return -ENOMEM; + + *hwmem_p = new_hwmem; + + return 0; } /** -- 2.7.4