From patchwork Thu Jul 9 09:19:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 6235 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 876EBC380; Thu, 9 Jul 2015 11:19:50 +0200 (CEST) Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by dpdk.org (Postfix) with ESMTP id 33305C36E for ; Thu, 9 Jul 2015 11:19:47 +0200 (CEST) Received: by wgxm20 with SMTP id m20so34544470wgx.3 for ; Thu, 09 Jul 2015 02:19:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=4VugIaLM5yEOzw3bDiFD8EORHxppsL1K0XwjgIMNXPk=; b=TQ28umQWR4/VLQQMmD12sT1qUWJHZSe2fJr2TOpQ+yXN7wrabzsWvqzCuaj7gei3gY BQ/oEZv3QPQZCB2Gxdha6Yz6vwB68eKMFgNtsNu2x77HVaEje/G0sL1t2GSlgHhWEAlu fk+tIC0QkvhD4CQXH6eDyR3ZvnjVflY2rw3Y4/7D9TemdYOvHPjF17OMCwQC3TeB8cMy ll8gx4XJnvmT0yemT+TDf1YJddzQoejDhY/VWrSJ/IE4LATYoK8ROnBh7oPxo6EUhXYb /IgrOvchw7qK0nx7qPV6bwDU2iLD0nabEkJN7Ey/hCXmtCadQTquDuAOiGpTjGCoezxg iBAw== X-Gm-Message-State: ALoCoQm+CJ2aiFIgFt7x+CIyLHT78GyPasdCw4WqF1BwNz7QkvH7nDt3iyKAUcZtrrk2YiTKTLgL X-Received: by 10.194.77.144 with SMTP id s16mr29022182wjw.145.1436433587040; Thu, 09 Jul 2015 02:19:47 -0700 (PDT) Received: from alcyon.dev.6wind.com (6wind.net2.nerim.net. [213.41.151.210]) by smtp.gmail.com with ESMTPSA id um5sm7774777wjc.1.2015.07.09.02.19.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Jul 2015 02:19:46 -0700 (PDT) From: David Marchand To: dev@dpdk.org Date: Thu, 9 Jul 2015 11:19:23 +0200 Message-Id: <1436433566-328-4-git-send-email-david.marchand@6wind.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1436433566-328-1-git-send-email-david.marchand@6wind.com> References: <1436259634-7077-1-git-send-email-david.marchand@6wind.com> <1436433566-328-1-git-send-email-david.marchand@6wind.com> Subject: [dpdk-dev] [PATCH v2 3/6] eal/linux: cosmetic change X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Prepare for checkpatch compliance. Signed-off-by: David Marchand Acked-by: Sergio Gonzalez Monroy --- lib/librte_eal/linuxapp/eal/eal_hugepage_info.c | 28 +++++++++++++---------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c index 91e288c..e676a31 100644 --- a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c +++ b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c @@ -279,22 +279,26 @@ 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]; + dirent = readdir(dir); + while (dirent != NULL) { + struct hugepage_info *hpi; + + if (strncmp(dirent->d_name, dirent_start_text, + dirent_start_len) == 0) { + 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){ + if (hpi->hugedir == NULL) { uint32_t num_pages; num_pages = get_num_hugepages(dirent->d_name); @@ -337,10 +341,10 @@ eal_hugepage_info_init(void) 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 < \ + 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]); @@ -349,7 +353,7 @@ eal_hugepage_info_init(void) /* 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 */