From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 496E1A0541;
Fri, 7 Feb 2020 04:17:08 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 60BDC1C121;
Fri, 7 Feb 2020 04:16:11 +0100 (CET)
Received: from mga09.intel.com (mga09.intel.com [134.134.136.24])
by dpdk.org (Postfix) with ESMTP id 273971C06A
for <dev@dpdk.org>; Fri, 7 Feb 2020 04:15:54 +0100 (CET)
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from orsmga005.jf.intel.com ([10.7.209.41])
by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
06 Feb 2020 19:15:54 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.70,411,1574150400"; d="scan'208";a="404693011"
Received: from win-dpdk-pallavi.jf.intel.com (HELO localhost.localdomain)
([10.166.188.75])
by orsmga005.jf.intel.com with ESMTP; 06 Feb 2020 19:15:53 -0800
From: Pallavi Kadam <pallavi.kadam@intel.com>
To: dev@dpdk.org,
thomas@monjalon.net
Cc: Harini.Ramakrishnan@microsoft.com, keith.wiles@intel.com,
bruce.richardson@intel.com, david.marchand@redhat.com,
jerinjacobk@gmail.com, ranjit.menon@intel.com,
antara.ganesh.kolar@intel.com, pallavi.kadam@intel.com
Date: Thu, 6 Feb 2020 19:14:35 -0800
Message-Id: <20200207031437.9124-8-pallavi.kadam@intel.com>
X-Mailer: git-send-email 2.18.0.windows.1
In-Reply-To: <20200207031437.9124-1-pallavi.kadam@intel.com>
References: <20200201000406.11060-1-pallavi.kadam@intel.com>
<20200207031437.9124-1-pallavi.kadam@intel.com>
Subject: [dpdk-dev] [PATCH v8 7/9] eal: remove syslog and dlfcn support for
windows
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Excluding syslog/ dlfcn definitions and parameters
from Windows by adding #ifndef RTE_EXEC_ENV_WINDOWS.
Note: This is a temporary change. In future, separate
'unix' directory will be created for unix specific functions.
Signed-off-by: Pallavi Kadam <pallavi.kadam@intel.com>
Reviewed-by: Ranjit Menon <ranjit.menon@intel.com>
---
lib/librte_eal/common/eal_common_options.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c
index 5920233bc..75974dd5b 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -6,12 +6,16 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
+#ifndef RTE_EXEC_ENV_WINDOWS
#include <syslog.h>
+#endif
#include <ctype.h>
#include <limits.h>
#include <errno.h>
#include <getopt.h>
+#ifndef RTE_EXEC_ENV_WINDOWS
#include <dlfcn.h>
+#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <dirent.h>
@@ -205,7 +209,9 @@ eal_reset_internal_config(struct internal_config *internal_cfg)
}
internal_cfg->base_virtaddr = 0;
+#ifdef LOG_DAEMON
internal_cfg->syslog_facility = LOG_DAEMON;
+#endif
/* if set to NONE, interrupt mode is determined automatically */
internal_cfg->vfio_intr_mode = RTE_INTR_MODE_NONE;
@@ -278,6 +284,7 @@ eal_plugindir_init(const char *path)
int
eal_plugins_init(void)
{
+#ifndef RTE_EXEC_ENV_WINDOWS
struct shared_driver *solib = NULL;
struct stat sb;
@@ -306,6 +313,7 @@ eal_plugins_init(void)
}
return 0;
+#endif
}
/*
@@ -927,6 +935,7 @@ eal_parse_lcores(const char *lcores)
return ret;
}
+#ifndef RTE_EXEC_ENV_WINDOWS
static int
eal_parse_syslog(const char *facility, struct internal_config *conf)
{
@@ -965,6 +974,7 @@ eal_parse_syslog(const char *facility, struct internal_config *conf)
}
return -1;
}
+#endif
static int
eal_parse_log_priority(const char *level)
@@ -1389,6 +1399,7 @@ eal_parse_common_option(int opt, const char *optarg,
}
break;
+#ifndef RTE_EXEC_ENV_WINDOWS
case OPT_SYSLOG_NUM:
if (eal_parse_syslog(optarg, conf) < 0) {
RTE_LOG(ERR, EAL, "invalid parameters for --"
@@ -1396,6 +1407,7 @@ eal_parse_common_option(int opt, const char *optarg,
return -1;
}
break;
+#endif
case OPT_LOG_LEVEL_NUM: {
if (eal_parse_log_level(optarg) < 0) {
@@ -1675,7 +1687,9 @@ eal_common_usage(void)
" (can be used multiple times)\n"
" --"OPT_VMWARE_TSC_MAP" Use VMware TSC map instead of native RDTSC\n"
" --"OPT_PROC_TYPE" Type of this process (primary|secondary|auto)\n"
+#ifndef RTE_EXEC_ENV_WINDOWS
" --"OPT_SYSLOG" Set syslog facility\n"
+#endif
" --"OPT_LOG_LEVEL"=<int> Set global log level\n"
" --"OPT_LOG_LEVEL"=<type-match>:<int>\n"
" Set specific log level\n"
--
2.18.0.windows.1