From patchwork Tue Dec 6 14:23:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Milard X-Patchwork-Id: 86829 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp2013306qgi; Tue, 6 Dec 2016 05:27:06 -0800 (PST) X-Received: by 10.200.57.54 with SMTP id s51mr53421214qtb.68.1481030826158; Tue, 06 Dec 2016 05:27:06 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id b37si11665470qte.234.2016.12.06.05.27.04; Tue, 06 Dec 2016 05:27:06 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id CDA3160C96; Tue, 6 Dec 2016 13:27:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2 autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 96C4B60D1B; Tue, 6 Dec 2016 13:24:52 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id B25AC60C07; Tue, 6 Dec 2016 13:24:30 +0000 (UTC) Received: from mail-wj0-f175.google.com (mail-wj0-f175.google.com [209.85.210.175]) by lists.linaro.org (Postfix) with ESMTPS id BD47360C8D for ; Tue, 6 Dec 2016 13:24:11 +0000 (UTC) Received: by mail-wj0-f175.google.com with SMTP id tg4so65455634wjb.1 for ; Tue, 06 Dec 2016 05:24:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mhPFDNzeCVbZjkM2OooD2qWd7znNTzcgO2SeGj/ikKM=; b=cyOPGCbSdb6ycs2sXI49YoySDlDpiGXBOddkJXndxiqE503q5p5c5G4eodphmE+UOA 18jGjc0Ne+538/YROS5spFR4K2A3gLhaS400UY6o004qfLioOH9bdthejbKkBd60HEWv ZG9U2f5hBM9XgbvfTVXfmHsVEuXgOZwbY+iekzoBftAy4cF4AQyMjn8g1DJlCp/HVohN hWGeuY1Nmu6hK+iqj3vRwTXgsz/dSvqCoD7RTb7D9Gig7jyOi18wQXgZXD9UVghYh6cp fAhtKigLvK0uh+p9eLAm3BOGSPKahn7869P0zCiNJQN7tK4CGfp3Dl8n7dtZ3Ung2Bs9 Ig0Q== X-Gm-Message-State: AKaTC0033Ll6qr9XVVd6REU6Ig9Wb59bocbuZj0HhsOn4iVIrFWCHBLhp6rmBK7yA2rU7ZNEloM= X-Received: by 10.25.150.210 with SMTP id y201mr23912299lfd.58.1481030650632; Tue, 06 Dec 2016 05:24:10 -0800 (PST) Received: from erachmi-ericsson.ki.sw.ericsson.se (c-83-233-76-66.cust.bredband2.com. [83.233.76.66]) by smtp.gmail.com with ESMTPSA id 204sm3806471ljj.33.2016.12.06.05.24.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Dec 2016 05:24:10 -0800 (PST) From: Christophe Milard To: maxim.uvarov@linaro.com, mike.holmes@linaro.org, yi.he@linaro.org, forrest.shi@linaro.org, francois.ozog@linaro.org, lng-odp@lists.linaro.org Date: Tue, 6 Dec 2016 15:23:35 +0100 Message-Id: <1481034217-16689-4-git-send-email-christophe.milard@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1481034217-16689-1-git-send-email-christophe.milard@linaro.org> References: <1481034217-16689-1-git-send-email-christophe.milard@linaro.org> Subject: [lng-odp] [API-NEXT PATCHv3 3/5] linux-gen: init: adding configuration file parsing X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" The parsing of the odp.conf configuration file is added. The file is searched first in the local directory (.) and then is the $prefix/etc directory. This requires libconfig (sudo apt-get install libconfig-dev) Signed-off-by: Christophe Milard --- DEPENDENCIES | 2 +- platform/linux-generic/Makefile.am | 1 + platform/linux-generic/include/odp_internal.h | 2 + platform/linux-generic/m4/configure.m4 | 11 +++++ platform/linux-generic/odp_init.c | 70 +++++++++++++++++++++++++++ 5 files changed, 85 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/DEPENDENCIES b/DEPENDENCIES index f1f0edd..a24b1c8 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -18,7 +18,7 @@ Prerequisites for building the OpenDataPlane (ODP) API 3. Required libraries - Libraries currently required to link: openssl + Libraries currently required to link: openssl, libconfig-dev 3.1 OpenSSL native compile diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 1e2e7f1..a38d47e 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -8,6 +8,7 @@ AM_CFLAGS += -I$(srcdir)/include AM_CFLAGS += -I$(top_srcdir)/include AM_CFLAGS += -I$(top_builddir)/include AM_CFLAGS += -Iinclude +AM_CFLAGS += -DSYSCONFDIR=\"@sysconfdir@\" include_HEADERS = \ $(top_srcdir)/include/odp.h \ diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index 6a80d9d..9d2c78b 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -22,6 +22,7 @@ extern "C" { #include #include #include +#include extern __thread int __odp_errno; @@ -51,6 +52,7 @@ struct odp_global_data_s { odp_cpumask_t worker_cpus; int num_cpus_installed; int ipc_ns; + config_t configuration; }; enum init_stage { diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index d3e5528..5fab0cc 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -28,6 +28,17 @@ AC_LINK_IFELSE( echo "Use newer version. For gcc > 4.7.0" exit -1) +# Check for libconfig (required) +AC_CHECK_HEADERS([libconfig.h], HEADER_LIBCONFIG="yes") +PKG_CHECK_MODULES([PKGCONFIG], [libconfig >= 1.3.2], LIBRARY_LIBCONFIG="yes") +if test "x$LIBRARY_LIBCONFIG" != "x" && test "x$HEADER_LIBCONFIG" != "x" ; then + CFLAGS="$CFLAGS $PKGCONFIG_CFLAGS" + LIBS="$LIBS $PKGCONFIG_LIBS" + AM_CPPFLAGS="$AM_CPPFLAGS `pkg-config --cflags-only-I libconfig`" +else + AC_MSG_FAILURE([libconfig not found (required)]) +fi + m4_include([platform/linux-generic/m4/odp_pthread.m4]) m4_include([platform/linux-generic/m4/odp_openssl.m4]) m4_include([platform/linux-generic/m4/odp_pcap.m4]) diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index d40a83c..797c60a 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -10,6 +10,8 @@ #include #include #include +#include +#include #include #include #include @@ -21,6 +23,15 @@ #define _ODP_FILES_FMT "odp-%d-" #define _ODP_TMPDIR "/tmp" +/* the name of the ODP configuration file: */ +#define CONFIGURATION_FILE_ENV_NONE "none" +#define CONFIGURATION_FILE "odp.conf" +#define CONFIGURATION_FILE_REL ("./" CONFIGURATION_FILE) +#define CONFIGURATION_FILE_ABS (SYSCONFDIR "/" CONFIGURATION_FILE) + +/* the ODP configuration file name can also be oveerwritten by env. variable: */ +#define ODP_SYSCONFIG_FILE_ENV "ODP_SYSCONFIG_FILE" + struct odp_global_data_s odp_global_data; /* remove all files staring with "odp-" from a directory "dir" */ @@ -65,6 +76,62 @@ static int cleanup_files(const char *dirpath, int odp_pid) return 0; } +/* read the odp configuration file + * + * the configuration file is read from: + * 1) Wherever env variable ODP_SYSCONFIG_FILE says (or "none") + * 2) ./odp.conf + * 3) the @sysconfig@/odp.conf + * (checked in reversed order overwritting each-other) + * So the environment variable setting supperseeds any other file. + * If the environment variable exists and set to the string "none" + * the configuration file reading is inibited (used to prevent + * test which do not need a file to read the user or system files) + */ +static int read_configfile(void) +{ + char *env_config_filename; + const char *config_filename; + config_t *cf; + + /* initialize and read the configuration file if any: */ + cf = &odp_global_data.configuration; + config_init(cf); + config_filename = NULL; + if (access(CONFIGURATION_FILE_ABS, R_OK) != -1) + config_filename = CONFIGURATION_FILE_ABS; + if (access(CONFIGURATION_FILE_REL, R_OK) != -1) + config_filename = CONFIGURATION_FILE_REL; + env_config_filename = getenv(ODP_SYSCONFIG_FILE_ENV); + if (env_config_filename) { + if (!strcmp(env_config_filename, CONFIGURATION_FILE_ENV_NONE)) + return 0; + if (access(env_config_filename, R_OK) != -1) { + config_filename = env_config_filename; + } else { + ODP_ERR("Cannot read ODP configurattion file %s " + "(set by env variable " + ODP_SYSCONFIG_FILE_ENV ")\n", + env_config_filename); + config_filename = NULL; + return -1; + } + } + if (config_filename) { + ODP_DBG("Reading configuration file: %s\n", config_filename); + if (!config_read_file(cf, config_filename)) { + ODP_ERR("%s:%d - %s\n", + config_error_file(cf), + config_error_line(cf), + config_error_text(cf)); + config_destroy(cf); + return(-1); + } + } + + return 0; +} + int odp_init_global(odp_instance_t *instance, const odp_init_t *params, const odp_platform_init_t *platform_params) @@ -89,6 +156,9 @@ int odp_init_global(odp_instance_t *instance, odp_global_data.abort_fn = params->abort_fn; } + if (read_configfile()) + goto init_failed; + if (odp_cpumask_init_global(params)) { ODP_ERR("ODP cpumask init failed.\n"); goto init_failed;