From patchwork Tue Jul 16 17:27:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 56530 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 446C91B974; Tue, 16 Jul 2019 19:27:58 +0200 (CEST) Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by dpdk.org (Postfix) with ESMTP id 9132A4C94 for ; Tue, 16 Jul 2019 19:27:53 +0200 (CEST) Received: by mail-pl1-f196.google.com with SMTP id y8so10446615plr.12 for ; Tue, 16 Jul 2019 10:27:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2c5t78v8D8ioyCie5DWBG4mA3csgd1We6ZXYiFQAgqY=; b=BJTk3WE+kAwAuV8/mXdaOQi7/n/CjbPmq+ynFxeBSxF7RbD2hM2FaGTlrVO2cVwjUz ZD5yxdMequrNSH+x0KYsJWa+pg2e6GmLQSe34q6bhgK0nkkNaGtVsOBD+atf1EOaqpL7 uuuu3Fnpmq4mlFwmYrLErKHB6hTjDiv4D2cRmzKdFRHXQJsYraheNv/j4rLEWWQEaOxI vnFZbZdNWl+Ob+nDzQBNtWcmebWxBDkVWk5r1lqVlw+kUoT5hWyrxR+e/1E5Vq05rbQg t9hKvO6i5IeZ6O812gBrar5+hv6idebgbI0WA7ogSTWeh5qMJeX7zOwhHrNxCk7h8mLf 4SBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2c5t78v8D8ioyCie5DWBG4mA3csgd1We6ZXYiFQAgqY=; b=dRiE73NN3Zy5vFjLic6XQhxaXbfsqSogl/RJmRedntYFcuDkP01g3OANtjqCD6JX0z o13ZZGMQWhA5+wvyWzQz4NcT9SVfpVm/zZvFnDbLHN9cjtog5w5Fg0Mr8OhbF217a+EN ZBI/5HaWTl0mam3HW2TFZsKbIywMrmEW/yjzAmfi3dcf3HJAJO7CORyy5jPQKCtlFYJW f7IM8TuyIgBM5gFyVfQlGnBXByqmnWUdYCo3xLhn1X9t8t8khPXYVV4V/gUN2fJg6Lox k+s/gtgNI6SNnhQ2wj784BRpvLn7McRvqfyGjzdGUcBuJrLUXu2P0itPnkKKJaimlpH/ cwQA== X-Gm-Message-State: APjAAAUf226KsyvaXrb1OmiRBhEdq4V+GaSvsB5nf0qBEOKkjMH3qd4C NF6THyoXd8HB9exos+UAPaK4iPm4 X-Google-Smtp-Source: APXvYqykRQajITfrHl7fJ7Zu+oM4995jrMySe8GJFI33C3+KUBj3PTGtBZhROQqYeNxCOA4XTci/Sw== X-Received: by 2002:a17:902:76c7:: with SMTP id j7mr35876209plt.247.1563298072620; Tue, 16 Jul 2019 10:27:52 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id m6sm21173049pfb.151.2019.07.16.10.27.51 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 10:27:51 -0700 (PDT) From: Stephen Hemminger To: cristian.dumitrescu@intel.com Cc: dev@dpdk.org, Stephen Hemminger Date: Tue, 16 Jul 2019 10:27:40 -0700 Message-Id: <20190716172741.21399-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190716172741.21399-1-stephen@networkplumber.org> References: <20190716172741.21399-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 2/3] cfgfile: use RTE_LOG for errors X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" In general, DPDK libraries to not print error messages to stdout because that is often redirected to /dev/null for daemons. This patch changes cfgfile library to use RTE_LOG with its own type. Signed-off-by: Stephen Hemminger --- lib/librte_cfgfile/rte_cfgfile.c | 25 +++++++++++++++---------- lib/librte_eal/common/include/rte_log.h | 1 + 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/lib/librte_cfgfile/rte_cfgfile.c b/lib/librte_cfgfile/rte_cfgfile.c index 1ef298592fa5..c4b768b6833f 100644 --- a/lib/librte_cfgfile/rte_cfgfile.c +++ b/lib/librte_cfgfile/rte_cfgfile.c @@ -9,6 +9,7 @@ #include #include #include +#include #include "rte_cfgfile.h" @@ -128,7 +129,7 @@ rte_cfgfile_check_params(const struct rte_cfgfile_parameters *params) unsigned int i; if (!params) { - printf("Error - missing cfgfile parameters\n"); + RTE_LOG(ERR, CFGFILE, "missing cfgfile parameters\n"); return -EINVAL; } @@ -141,7 +142,7 @@ rte_cfgfile_check_params(const struct rte_cfgfile_parameters *params) } if (valid_comment == 0) { - printf("Error - invalid comment characters %c\n", + RTE_LOG(ERR, CFGFILE, "invalid comment characters %c\n", params->comment_character); return -ENOTSUP; } @@ -178,7 +179,7 @@ rte_cfgfile_load_with_params(const char *filename, int flags, size_t len = strnlen(buffer, sizeof(buffer)); lineno++; if ((len >= sizeof(buffer) - 1) && (buffer[len-1] != '\n')) { - printf("Error line %d - no \\n found on string. " + RTE_LOG(ERR, CFGFILE, " line %d - no \\n found on string. " "Check if line too long\n", lineno); goto error1; } @@ -198,8 +199,9 @@ rte_cfgfile_load_with_params(const char *filename, int flags, /* section heading line */ char *end = memchr(buffer, ']', len); if (end == NULL) { - printf("Error line %d - no terminating ']'" - "character found\n", lineno); + RTE_LOG(ERR, CFGFILE, + "line %d - no terminating ']' character found\n", + lineno); goto error1; } *end = '\0'; @@ -213,8 +215,9 @@ rte_cfgfile_load_with_params(const char *filename, int flags, split[0] = buffer; split[1] = memchr(buffer, '=', len); if (split[1] == NULL) { - printf("Error line %d - no '='" - "character found\n", lineno); + RTE_LOG(ERR, CFGFILE, + "line %d - no '=' character found\n", + lineno); goto error1; } *split[1] = '\0'; @@ -236,8 +239,9 @@ rte_cfgfile_load_with_params(const char *filename, int flags, if (!(flags & CFG_FLAG_EMPTY_VALUES) && (*split[1] == '\0')) { - printf("Error at line %d - cannot use empty " - "values\n", lineno); + RTE_LOG(ERR, CFGFILE, + "line %d - cannot use empty values\n", + lineno); goto error1; } @@ -397,7 +401,8 @@ int rte_cfgfile_set_entry(struct rte_cfgfile *cfg, const char *sectionname, sizeof(curr_section->entries[i].value)); return 0; } - printf("Error - entry name doesn't exist\n"); + + RTE_LOG(ERR, CFGFILE, "entry name doesn't exist\n"); return -EINVAL; } diff --git a/lib/librte_eal/common/include/rte_log.h b/lib/librte_eal/common/include/rte_log.h index cbb41846aaa3..fa747d5b90ef 100644 --- a/lib/librte_eal/common/include/rte_log.h +++ b/lib/librte_eal/common/include/rte_log.h @@ -62,6 +62,7 @@ extern struct rte_logs rte_logs; #define RTE_LOGTYPE_EFD 18 /**< Log related to EFD. */ #define RTE_LOGTYPE_EVENTDEV 19 /**< Log related to eventdev. */ #define RTE_LOGTYPE_GSO 20 /**< Log related to GSO. */ +#define RTE_LOGTYPE_CFGFILE 21 /**< Log related to cfgfile. */ /* these log types can be used in an application */ #define RTE_LOGTYPE_USER1 24 /**< User-defined log type 1. */