eal/linux: fix indent of hugepage init

[dpdk.git] / lib / librte_eal / linuxapp / eal / eal_hugepage_info.c

diff --git a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
index 91e288c..f097e71 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
+++ b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
@@ -279,77 +279,88 @@ eal_hugepage_info_init(void)
        const char dirent_start_text[] = "hugepages-";
        const size_t dirent_start_len = sizeof(dirent_start_text) - 1;
        unsigned i, num_sizes = 0;
+       DIR *dir;
+       struct dirent *dirent;
 
-       DIR *dir = opendir(sys_dir_path);
+       dir = opendir(sys_dir_path);
        if (dir == NULL)
-               rte_panic("Cannot open directory %s to read system hugepage info\n",
-                               sys_dir_path);
+               rte_panic("Cannot open directory %s to read system hugepage "
+                         "info\n", sys_dir_path);
 
-       struct dirent *dirent = readdir(dir);
-       while(dirent != NULL){
-               if (strncmp(dirent->d_name, dirent_start_text, dirent_start_len) == 0){
-                       struct hugepage_info *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);
-                       } else {
-                               /* 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");
-                                       closedir(dir);
-                                       return -1;
-                               }
-                               /* clear out the hugepages dir from unused pages */
-                               if (clear_hugedir(hpi->hugedir) == -1) {
-                                       closedir(dir);
-                                       return -1;
-                               }
+       for (dirent = readdir(dir); dirent != NULL; dirent = readdir(dir)) {
+               struct hugepage_info *hpi;
+
+               if (strncmp(dirent->d_name, dirent_start_text,
+                           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;
+               }
 
-                               /* for now, put all pages into socket 0,
-                                * later they will be sorted */
-                               hpi->num_pages[0] = get_num_hugepages(dirent->d_name);
+               /* 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;
+
+               /* 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++;
-                       }
-               }
-               dirent = readdir(dir);
+               num_sizes++;
        }
        closedir(dir);
+
+       /* something went wrong, and we broke from the for loop above */
+       if (dirent != NULL)
+               return -1;
+
        internal_config.num_hugepage_sizes = num_sizes;
 
        /* sort the page directory entries by size, largest to smallest */
-       for (i = 0; i < num_sizes; i++){
+       for (i = 0; i < num_sizes; i++) {
                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)
+                       if (internal_config.hugepage_info[j-1].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 */
        for (i = 0; i < num_sizes; i++)
                if (internal_config.hugepage_info[i].hugedir != NULL &&
-                               internal_config.hugepage_info[i].num_pages[0] > 0)
+                   internal_config.hugepage_info[i].num_pages[0] > 0)
                        return 0;
 
        /* no valid hugepage mounts available, return error */