From: David Marchand <david.marchand@6wind.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH 2/6] eal/linux: remove useless casts
Date: Tue, 7 Jul 2015 11:00:30 +0200 [thread overview]
Message-ID: <1436259634-7077-3-git-send-email-david.marchand@6wind.com> (raw)
In-Reply-To: <1436259634-7077-1-git-send-email-david.marchand@6wind.com>
Rather than cast the huge pages number returned by get_num_hugepages, rework
this function so that it returns 0 when something goes wrong.
And no need for casts in log.
Signed-off-by: David Marchand <david.marchand@6wind.com>
---
lib/librte_eal/linuxapp/eal/eal_hugepage_info.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
index 6dd8a0b..0b6ece7 100644
--- a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
+++ b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
@@ -63,7 +63,7 @@ static const char sys_dir_path[] = "/sys/kernel/mm/hugepages";
/* this function is only called from eal_hugepage_info_init which itself
* is only called from a primary process */
-static int32_t
+static unsigned long
get_num_hugepages(const char *subdir)
{
char path[PATH_MAX];
@@ -87,10 +87,12 @@ get_num_hugepages(const char *subdir)
subdir);
/* adjust num_pages */
- if (num_pages > 0)
+ if (num_pages >= resv_pages)
num_pages -= resv_pages;
+ else if (resv_pages)
+ num_pages = 0;
- return (int32_t)num_pages;
+ return num_pages;
}
static uint64_t
@@ -288,12 +290,13 @@ eal_hugepage_info_init(void)
/* first, check if we have a mountpoint */
if (hpi->hugedir == NULL){
- int32_t num_pages;
- if ((num_pages = get_num_hugepages(dirent->d_name)) > 0)
- RTE_LOG(INFO, EAL, "%u hugepages of size %llu reserved, "\
- "but no mounted hugetlbfs found for that size\n",
- (unsigned)num_pages,
- (unsigned long long)hpi->hugepage_sz);
+ unsigned long num_pages;
+
+ num_pages = get_num_hugepages(dirent->d_name);
+ if (num_pages > 0)
+ RTE_LOG(INFO, EAL, "%lu hugepages of size %lu reserved, "
+ "but no mounted hugetlbfs found for that size\n",
+ num_pages, hpi->hugepage_sz);
} else {
/* try to obtain a writelock */
hpi->lock_descriptor = open(hpi->hugedir, O_RDONLY);
--
1.7.10.4
next prev parent reply other threads:[~2015-07-07 9:00 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-07 9:00 [dpdk-dev] [PATCH 0/6] eal/linux: cleanup hugepage code David Marchand
2015-07-07 9:00 ` [dpdk-dev] [PATCH 1/6] eal/linux: remove useless check on process type David Marchand
2015-07-07 9:00 ` David Marchand [this message]
2015-07-09 2:04 ` [dpdk-dev] [PATCH 2/6] eal/linux: remove useless casts Thomas Monjalon
2015-07-07 9:00 ` [dpdk-dev] [PATCH 3/6] eal/linux: cosmetic change David Marchand
2015-07-07 9:00 ` [dpdk-dev] [PATCH 4/6] eal/linux: rework while loop David Marchand
2015-07-07 9:00 ` [dpdk-dev] [PATCH 5/6] eal/linux: indent file David Marchand
2015-07-07 9:00 ` [dpdk-dev] [PATCH 6/6] eal/linux: avoid out of bound access David Marchand
2015-07-08 11:03 ` [dpdk-dev] [PATCH 0/6] eal/linux: cleanup hugepage code Gonzalez Monroy, Sergio
2015-07-09 9:19 ` [dpdk-dev] [PATCH v2 " David Marchand
2015-07-09 9:19 ` [dpdk-dev] [PATCH v2 1/6] eal/linux: remove useless check on process type David Marchand
2015-07-09 9:19 ` [dpdk-dev] [PATCH v2 2/6] eal/linux: remove useless casts David Marchand
2015-07-09 9:19 ` [dpdk-dev] [PATCH v2 3/6] eal/linux: cosmetic change David Marchand
2015-07-09 9:19 ` [dpdk-dev] [PATCH v2 4/6] eal/linux: rework while loop David Marchand
2015-07-09 9:19 ` [dpdk-dev] [PATCH v2 5/6] eal/linux: indent file David Marchand
2015-07-09 9:19 ` [dpdk-dev] [PATCH v2 6/6] eal/linux: avoid out of bound access David Marchand
2015-07-09 12:21 ` [dpdk-dev] [PATCH v2 0/6] eal/linux: cleanup hugepage code Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1436259634-7077-3-git-send-email-david.marchand@6wind.com \
--to=david.marchand@6wind.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).