[dpdk-dev] [PATCH] there are some memory leak about Dir operator

2014-08-19 Thread zhang.zhang...@huawei.com
From: zhangkun 


Signed-off-by: zhangkun 
---
 lib/librte_eal/linuxapp/eal/eal_hugepage_info.c |6 --
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c 
b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
index b72a205..d784b7c 100644
--- a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
+++ b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
@@ -311,12 +311,14 @@ eal_hugepage_info_init(void)
/* 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)
+   if (clear_hugedir(hpi->hugedir) == -1) {
+   closedir(dir);
return -1;
-
+   }
/* for now, put all pages into socket 0,
 * later they will be sorted */
hpi->num_pages[0] = 
get_num_hugepages(dirent->d_name);
-- 
1.7.3.1.msysgit.0




[dpdk-dev] [PATCH] there are some memory leak about Dir operator

2014-08-19 Thread zhang.zhang...@huawei.com
From: zhangkun 


Signed-off-by: zhangkun 
---
 lib/librte_eal/linuxapp/eal/eal_hugepage_info.c |6 --
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c 
b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
index b72a205..d784b7c 100644
--- a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
+++ b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
@@ -311,12 +311,14 @@ eal_hugepage_info_init(void)
/* 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)
+   if (clear_hugedir(hpi->hugedir) == -1) {
+   closedir(dir);
return -1;
-
+   }
/* for now, put all pages into socket 0,
 * later they will be sorted */
hpi->num_pages[0] = 
get_num_hugepages(dirent->d_name);
-- 
1.7.3.1.msysgit.0