From a2a2e499e511d23fb1e0f2ca003baea2cf0937c5 Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Mon, 14 May 2018 17:27:40 +0100 Subject: [PATCH] mem: rename function returning hugepage data path The original name for this path was not too descriptive and confusing. Rename it to a more appropriate and descriptive name: it stores data about hugepages, so name it eal_hugepage_data_path(). Signed-off-by: Anatoly Burakov Reviewed-by: Reshma Pattan --- lib/librte_eal/common/eal_filesystem.h | 2 +- lib/librte_eal/linuxapp/eal/eal_memory.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/librte_eal/common/eal_filesystem.h b/lib/librte_eal/common/eal_filesystem.h index 078e2eb6b4..060ac2b137 100644 --- a/lib/librte_eal/common/eal_filesystem.h +++ b/lib/librte_eal/common/eal_filesystem.h @@ -89,7 +89,7 @@ eal_hugepage_info_path(void) #define HUGEPAGE_FILE_FMT "%s/.%s_hugepage_file" static inline const char * -eal_hugepage_file_path(void) +eal_hugepage_data_path(void) { static char buffer[PATH_MAX]; /* static so auto-zeroed */ const char *directory = default_config_dir; diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c index e0baabbebe..c917de1c26 100644 --- a/lib/librte_eal/linuxapp/eal/eal_memory.c +++ b/lib/librte_eal/linuxapp/eal/eal_memory.c @@ -1499,7 +1499,7 @@ eal_legacy_hugepage_init(void) } /* create shared memory */ - hugepage = create_shared_memory(eal_hugepage_file_path(), + hugepage = create_shared_memory(eal_hugepage_data_path(), nr_hugefiles * sizeof(struct hugepage_file)); if (hugepage == NULL) { @@ -1727,16 +1727,18 @@ eal_legacy_hugepage_attach(void) test_phys_addrs_available(); - fd_hugepage = open(eal_hugepage_file_path(), O_RDONLY); + fd_hugepage = open(eal_hugepage_data_path(), O_RDONLY); if (fd_hugepage < 0) { - RTE_LOG(ERR, EAL, "Could not open %s\n", eal_hugepage_file_path()); + RTE_LOG(ERR, EAL, "Could not open %s\n", + eal_hugepage_data_path()); goto error; } size = getFileSize(fd_hugepage); hp = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd_hugepage, 0); if (hp == MAP_FAILED) { - RTE_LOG(ERR, EAL, "Could not mmap %s\n", eal_hugepage_file_path()); + RTE_LOG(ERR, EAL, "Could not mmap %s\n", + eal_hugepage_data_path()); goto error; } -- 2.20.1