From: David Marchand <david.marchand@6wind.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v2 5/6] eal/linux: indent file
Date: Thu, 9 Jul 2015 11:19:25 +0200 [thread overview]
Message-ID: <1436433566-328-6-git-send-email-david.marchand@6wind.com> (raw)
In-Reply-To: <1436433566-328-1-git-send-email-david.marchand@6wind.com>
With this, we should be checkpatch compliant.
Signed-off-by: David Marchand <david.marchand@6wind.com>
Acked-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
---
lib/librte_eal/linuxapp/eal/eal_hugepage_info.c | 73 ++++++++++++-----------
1 file changed, 39 insertions(+), 34 deletions(-)
diff --git a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
index d602350..f097e71 100644
--- a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
+++ b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
@@ -294,45 +294,50 @@ eal_hugepage_info_init(void)
dirent_start_len) != 0)
continue;
- hpi = &internal_config.hugepage_info[num_sizes];
- hpi->hugepage_sz = rte_str_to_size(&dirent->d_name[dirent_start_len]);
- hpi->hugedir = get_hugepage_dir(hpi->hugepage_sz);
-
- /* first, check if we have a mountpoint */
- if (hpi->hugedir == NULL) {
- uint32_t num_pages;
-
- num_pages = get_num_hugepages(dirent->d_name);
- if (num_pages > 0)
- RTE_LOG(INFO, EAL, "%" PRIu32 " hugepages of size %" PRIu64 " reserved, "
- "but no mounted hugetlbfs found for that size\n",
- num_pages, hpi->hugepage_sz);
- continue;
- }
+ hpi = &internal_config.hugepage_info[num_sizes];
+ hpi->hugepage_sz =
+ rte_str_to_size(&dirent->d_name[dirent_start_len]);
+ hpi->hugedir = get_hugepage_dir(hpi->hugepage_sz);
+
+ /* first, check if we have a mountpoint */
+ if (hpi->hugedir == NULL) {
+ uint32_t num_pages;
+
+ num_pages = get_num_hugepages(dirent->d_name);
+ if (num_pages > 0)
+ RTE_LOG(INFO, EAL,
+ "%" PRIu32 " hugepages of size "
+ "%" PRIu64 " reserved, but no mounted "
+ "hugetlbfs found for that size\n",
+ num_pages, hpi->hugepage_sz);
+ continue;
+ }
- /* try to obtain a writelock */
- hpi->lock_descriptor = open(hpi->hugedir, O_RDONLY);
+ /* try to obtain a writelock */
+ hpi->lock_descriptor = open(hpi->hugedir, O_RDONLY);
- /* if blocking lock failed */
- if (flock(hpi->lock_descriptor, LOCK_EX) == -1) {
- RTE_LOG(CRIT, EAL, "Failed to lock hugepage directory!\n");
- break;
- }
- /* clear out the hugepages dir from unused pages */
- if (clear_hugedir(hpi->hugedir) == -1)
- break;
+ /* if blocking lock failed */
+ if (flock(hpi->lock_descriptor, LOCK_EX) == -1) {
+ RTE_LOG(CRIT, EAL,
+ "Failed to lock hugepage directory!\n");
+ break;
+ }
+ /* clear out the hugepages dir from unused pages */
+ if (clear_hugedir(hpi->hugedir) == -1)
+ break;
- /* for now, put all pages into socket 0,
- * later they will be sorted */
- hpi->num_pages[0] = get_num_hugepages(dirent->d_name);
+ /* for now, put all pages into socket 0,
+ * later they will be sorted */
+ hpi->num_pages[0] = get_num_hugepages(dirent->d_name);
#ifndef RTE_ARCH_64
- /* for 32-bit systems, limit number of hugepages to 1GB per page size */
- hpi->num_pages[0] = RTE_MIN(hpi->num_pages[0],
- RTE_PGSIZE_1G / hpi->hugepage_sz);
+ /* for 32-bit systems, limit number of hugepages to
+ * 1GB per page size */
+ hpi->num_pages[0] = RTE_MIN(hpi->num_pages[0],
+ RTE_PGSIZE_1G / hpi->hugepage_sz);
#endif
- num_sizes++;
+ num_sizes++;
}
closedir(dir);
@@ -347,9 +352,9 @@ eal_hugepage_info_init(void)
unsigned j;
for (j = i+1; j < num_sizes; j++)
if (internal_config.hugepage_info[j-1].hugepage_sz <
- internal_config.hugepage_info[j].hugepage_sz)
+ internal_config.hugepage_info[j].hugepage_sz)
swap_hpi(&internal_config.hugepage_info[j-1],
- &internal_config.hugepage_info[j]);
+ &internal_config.hugepage_info[j]);
}
/* now we have all info, check we have at least one valid size */
--
1.7.10.4
next prev parent reply other threads:[~2015-07-09 9:19 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 ` [dpdk-dev] [PATCH 2/6] eal/linux: remove useless casts David Marchand
2015-07-09 2:04 ` 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 ` David Marchand [this message]
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=1436433566-328-6-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).