From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stephen@networkplumber.org>
Received: from mail-pl0-f67.google.com (mail-pl0-f67.google.com
[209.85.160.67]) by dpdk.org (Postfix) with ESMTP id 2EF755F59
for <dev@dpdk.org>; Fri, 23 Feb 2018 22:18:07 +0100 (CET)
Received: by mail-pl0-f67.google.com with SMTP id u13so5603982plq.1
for <dev@dpdk.org>; Fri, 23 Feb 2018 13:18:07 -0800 (PST)
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;
bh=0Qv43NGjNETF/rK8gkp9YV2DLoQToYpp7UVPIae4EM4=;
b=NkQ0uZQAcR6jMpJsCOYzsXc3DIlVjj7dqEYeKmKWKmhcf/Ujihgn9oWyMRZt4Ggyh+
QLIUrSXtLeJnvPlEXr2RIvz0CcyFGsOdDG/9UsXpZMZ6ysDE38mFVibbWoIw2ptvpHMt
Cr5fWKST8EO6OH/ftVchXvYXXHj3Gg9OYmbY6HPQwbZc7U6/QNrh8gT5YStLlXVW1322
mR71+EOjYzyTRVOLzmAO1/j4rTrTGSKhEQnTXQiiEuz2J4F9IYQUK2zM49QsCZXTlH/R
4LLHPOMXibyh6IrzWvCxlDTfcaUiplL+2ab+oe2scsRnXsHZKIGopQr3RwryDv4ou6Xw
L/5A==
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;
bh=0Qv43NGjNETF/rK8gkp9YV2DLoQToYpp7UVPIae4EM4=;
b=d9niDDNjzx6PqnSGXNnGQKBiBMHYv0fzfHeWdFEMTAxGysJXnpGm25Z5m4xzYgazTj
zwDJdWvv8IEZ0hNV1J2LjbDZL+TA2LjZtTOjtWPR3At9MIx/ro7LDsPOH7AL4WFhkXfN
xH0/tTaHeArKZkfWQnyAJ5JYJyuH8LlyP9aa4L85KA8sXooutZqHPyOGCXFcAtXtLkh/
yqLavSeypKd3FjSW8kSmxwmiJN/HfiLAFnI+jGoAPLBIFCuIcQ6U/rB+YiHfHFVta/e5
iFdsZhD1WEgWRz1/nCjziTcu6Rtn4B16JN6f5bHWbjJXPHKI/dGHytsXHQsvZeVyuNjH
K5Ww==
X-Gm-Message-State: APf1xPAXVgKWWAbozrFRoCMpPwZXkdr/KnE1ReUdOPobYFVYy3YaYmW7
FmdSEN4S1Wkm+SX0JDIXeoJ3njmWI10=
X-Google-Smtp-Source: AH8x224+T4bLRhHSSPWCNJ8NGuHbGdgyEPq2EqmTTYJgPhrSjVkxARPc5G+1LIozyLW0VJb0FtNPCg==
X-Received: by 2002:a17:902:ab84:: with SMTP id
f4-v6mr2949748plr.239.1519420685459;
Fri, 23 Feb 2018 13:18:05 -0800 (PST)
Received: from xeon-e3.lan (204-195-71-95.wavecable.com. [204.195.71.95])
by smtp.gmail.com with ESMTPSA id g67sm5496674pgc.60.2018.02.23.13.18.04
(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Fri, 23 Feb 2018 13:18:04 -0800 (PST)
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>
Date: Fri, 23 Feb 2018 13:17:51 -0800
Message-Id: <20180223211752.28651-3-stephen@networkplumber.org>
X-Mailer: git-send-email 2.16.1
In-Reply-To: <20180223211752.28651-1-stephen@networkplumber.org>
References: <20180223205648.18690-1-stephen@networkplumber.org>
<20180223211752.28651-1-stephen@networkplumber.org>
Subject: [dpdk-dev] [PATCH v2 2/3] log: add ability to match dynamic log
based on shell pattern
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://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Feb 2018 21:18:07 -0000
Regular expressions are not the best way to match a hierarchical
pattern like dynamic log levels. And the separator for dynamic
log levels is period which is the regex wildcard character.
A better solution is to use filename matching 'globbing' so
that log levels match like file paths. For compatibility,
use colon to separate pattern match style arguments. For
example:
--log-level 'pmd.net.virtio.*:debug'
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
lib/librte_eal/common/eal_common_log.c | 22 +++++++++++++++++-
lib/librte_eal/common/eal_common_options.c | 36 ++++++++++++++++++++----------
lib/librte_eal/common/include/rte_log.h | 16 +++++++++++--
3 files changed, 59 insertions(+), 15 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_log.c b/lib/librte_eal/common/eal_common_log.c
index 37b2e20e539b..2601c7cd4e4f 100644
--- a/lib/librte_eal/common/eal_common_log.c
+++ b/lib/librte_eal/common/eal_common_log.c
@@ -9,6 +9,7 @@
#include <string.h>
#include <errno.h>
#include <regex.h>
+#include <fnmatch.h>
#include <rte_eal.h>
#include <rte_log.h>
@@ -89,7 +90,26 @@ rte_log_set_level(uint32_t type, uint32_t level)
return 0;
}
-/* set level */
+int
+rte_log_set_level_match(const char *pattern, uint32_t level)
+{
+ size_t i;
+
+ if (level > RTE_LOG_DEBUG)
+ return -1;
+
+ for (i = 0; i < rte_logs.dynamic_types_len; i++) {
+ if (rte_logs.dynamic_types[i].name == NULL)
+ continue;
+
+ if (fnmatch(pattern, rte_logs.dynamic_types[i].name, 0))
+ rte_logs.dynamic_types[i].loglevel = level;
+ }
+
+ return 0;
+}
+
+/* set level by regular expression (using pattern match is preferred) */
int
rte_log_set_level_regexp(const char *pattern, uint32_t level)
{
diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c
index 19069638ea05..45a75f75ae94 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -955,31 +955,43 @@ eal_parse_log_priority(const char *level)
static int
eal_parse_log_level(const char *arg)
{
- char *str, *type, *level;
+ char *str, *level;
+ const char *regex = NULL;
+ const char *pattern = NULL;
int priority;
str = strdup(arg);
if (str == NULL)
return -1;
- if (strchr(str, ',') == NULL) {
- type = NULL;
- level = str;
+ if ((level = strchr(str, ','))) {
+ regex = str;
+ *level++ = '\0';
+ } else if ((level = strchr(str, ':'))) {
+ pattern = str;
+ *level++ = '\0';
} else {
- type = strsep(&str, ",");
- level = strsep(&str, ",");
+ level = str;
}
priority = eal_parse_log_priority(level);
if (priority < 0)
goto fail;
- if (type == NULL) {
+ if (regex) {
+ if (rte_log_set_level_regexp(regex, priority) < 0) {
+ fprintf(stderr, "cannot set log level %s,%d\n",
+ pattern, priority);
+ goto fail;
+ }
+ } else if (pattern) {
+ if (rte_log_set_level_match(pattern, priority) < 0) {
+ fprintf(stderr, "cannot set log level %s:%d\n",
+ pattern, priority);
+ goto fail;
+ }
+ } else {
rte_log_set_global_level(priority);
- } else if (rte_log_set_level_regexp(type, priority) < 0) {
- fprintf(stderr, "cannot set log level %s,%d\n",
- type, priority);
- goto fail;
}
free(str);
@@ -1336,7 +1348,7 @@ eal_common_usage(void)
" --"OPT_PROC_TYPE" Type of this process (primary|secondary|auto)\n"
" --"OPT_SYSLOG" Set syslog facility\n"
" --"OPT_LOG_LEVEL"=<int> Set global log level\n"
- " --"OPT_LOG_LEVEL"=<type-regexp>,<int>\n"
+ " --"OPT_LOG_LEVEL"=<type-match>:<int>\n"
" Set specific log level\n"
" -v Display version information on startup\n"
" -h, --help This help\n"
diff --git a/lib/librte_eal/common/include/rte_log.h b/lib/librte_eal/common/include/rte_log.h
index 9029c7856d31..6d0ff9fe4623 100644
--- a/lib/librte_eal/common/include/rte_log.h
+++ b/lib/librte_eal/common/include/rte_log.h
@@ -132,13 +132,25 @@ int rte_log_get_level(uint32_t logtype);
* Set the log level for a given type.
*
* @param pattern
- * The regexp identifying the log type.
+ * The match pattern identifying the log type.
* @param level
* The level to be set.
* @return
* 0 on success, a negative value if level is invalid.
*/
-int rte_log_set_level_regexp(const char *pattern, uint32_t level);
+int rte_log_set_level_match(const char *pattern, uint32_t level);
+
+/**
+ * Set the log level for a given type.
+ *
+ * @param regex
+ * The regular expression identifying the log type.
+ * @param level
+ * The level to be set.
+ * @return
+ * 0 on success, a negative value if level is invalid.
+ */
+int rte_log_set_level_regexp(const char *regex, uint32_t level);
/**
* Set the log level for a given type.
--
2.16.1