From patchwork Tue Apr 24 16:58:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 38833 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 BBB9958EC; Tue, 24 Apr 2018 18:58:23 +0200 (CEST) Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by dpdk.org (Postfix) with ESMTP id 07EAE4C90 for ; Tue, 24 Apr 2018 18:58:16 +0200 (CEST) Received: by mail-pg0-f68.google.com with SMTP id i29so9789123pgn.12 for ; Tue, 24 Apr 2018 09:58:16 -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; bh=N4eexufc67MQ5TacgbmLz11aYL1sGhqX891EiTlpWVY=; b=JcdVc5QSFmbC8PX+IcRnF2H7lzTK3sq9/MeUlpuiCvRg45NDKO8vQsbzxB94p02pYG lBfeGDa+0TD/eCFiFVx5HHV81tVBceAsUV4h0O+w3gvgv/q+sQHCuco4/Dkdgbo2ksT/ EfCyWJscDhKSqoT3qSual0zhj8qFaDOGfFoawnW3fU6xIcQa5WOock0XIBFdf1uzKVLn f1LKH090raC3uW/oY94SsWXab2C62qP+yNbERKU6TaaXyrEWPjsBZY7RbokCMxU6Z5Q9 zDarIDS11XrpzCcY+K1XtTOdLQ6R2zkuawX5QsbQIFjVjjcEml5oc/Ed7vlleCW069bk PTOw== 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=N4eexufc67MQ5TacgbmLz11aYL1sGhqX891EiTlpWVY=; b=I9PZa1EoS3T4XaEbio39dhMeyiVcpgKFxdoJYClLAbMcVr51DeHFug7S/0GGHFF67A UHQuiNtUMYKY9R8caL795z48PGB5uOeIj8K7U8BHigV9AATMeOL7Nacbz5XYipaLKZvy 1aiUG4gWJSR3NEHrZs1Y0+QnIxfn2xe4Nm6GRar6EhB2dr4RfBlv33rsI7864ToKXjn5 a37/vDdGEyh/LwU1kIPp/ti3iOMTEgp58bC9I4bAjYK5jxoSRMO6Yc19xGY2FKAe8Wzg OFdk/IWIWxTizDOqhTuhKbTlTxbrWytpPj7zeAB4Jc77uFz3ba02WTzjX5THhH5+BHnP 3hDQ== X-Gm-Message-State: ALQs6tBPgikD4SCfS6dR5/HZy41QZQvq6cI0g5acW2bSsah0PFHbSu/c e1y2cPTCi2Rq2f9LFzOp+8FQC1Ujisk= X-Google-Smtp-Source: AIpwx4/rZQb6+K1rjLHu18Zp1y+kYYQ3mw74YHW+hGwP4oDjyfeZ4gn7idzd+XW5Cztn05r0w6PYfw== X-Received: by 10.98.233.11 with SMTP id j11mr24580546pfh.205.1524589095806; Tue, 24 Apr 2018 09:58:15 -0700 (PDT) Received: from xeon-e3.lan (204-195-71-95.wavecable.com. [204.195.71.95]) by smtp.gmail.com with ESMTPSA id a28sm19851114pfl.86.2018.04.24.09.58.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 09:58:14 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 24 Apr 2018 09:58:06 -0700 Message-Id: <20180424165808.23292-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180424165808.23292-1-stephen@networkplumber.org> References: <20180424165808.23292-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v2 3/5] eal: make eal_log_level save private 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" We don't want format of eal log level saved values to be visible in ABI. Move to private storage in eal_common_log. Includes minor optimization. Compile the regular expression for each log match once, rather than each time it is used. Signed-off-by: Stephen Hemminger --- lib/librte_eal/common/eal_common_log.c | 51 +++++++++++++++++----- lib/librte_eal/common/eal_common_options.c | 26 ++--------- lib/librte_eal/common/eal_private.h | 5 +++ lib/librte_eal/common/include/rte_log.h | 26 ----------- 4 files changed, 49 insertions(+), 59 deletions(-) diff --git a/lib/librte_eal/common/eal_common_log.c b/lib/librte_eal/common/eal_common_log.c index a27192620d9e..c47e53b3db74 100644 --- a/lib/librte_eal/common/eal_common_log.c +++ b/lib/librte_eal/common/eal_common_log.c @@ -23,8 +23,19 @@ struct rte_logs rte_logs = { .file = NULL, }; -/** Global list of valid EAL log level options */ -struct rte_eal_opt_loglevel_list opt_loglevel_list = +struct rte_eal_opt_loglevel { + /** Next list entry */ + TAILQ_ENTRY(rte_eal_opt_loglevel) next; + /** Compiled regular expression obtained from the option */ + regex_t re_match; + /** Log level value obtained from the option */ + uint32_t level; +}; + +TAILQ_HEAD(rte_eal_opt_loglevel_list, rte_eal_opt_loglevel); + +/** List of valid EAL log level options */ +static struct rte_eal_opt_loglevel_list opt_loglevel_list = TAILQ_HEAD_INITIALIZER(opt_loglevel_list); /* Stream to use for logging if rte_logs.file is NULL */ @@ -119,6 +130,33 @@ rte_log_set_level_regexp(const char *pattern, uint32_t level) return 0; } +/* + * Save the type (regexp string) and the loglevel + * in the global storage so that it could be used + * to configure dynamic logtypes which are absent + * at the moment of EAL option processing but may + * be registered during runtime. + */ +int rte_eal_log_save_regexp(const char *regex, int tmp) +{ + struct rte_eal_opt_loglevel *opt_ll; + + opt_ll = malloc(sizeof(*opt_ll)); + if (opt_ll == NULL) + return -1; + + if (regcomp(&opt_ll->re_match, regex, 0) != 0) + goto fail; + + opt_ll->level = tmp; + + TAILQ_INSERT_HEAD(&opt_loglevel_list, opt_ll, next); + return 0; +fail: + free(opt_ll); + return -1; +} + /* get the current loglevel for the message being processed */ int rte_log_cur_msg_loglevel(void) { @@ -203,18 +241,11 @@ rte_log_register_type_and_pick_level(const char *name, uint32_t level_def) return type; TAILQ_FOREACH(opt_ll, &opt_loglevel_list, next) { - regex_t r; - if (opt_ll->level > RTE_LOG_DEBUG) continue; - if (regcomp(&r, opt_ll->re_type, 0) != 0) - continue; - - if (regexec(&r, name, 0, NULL, 0) == 0) + if (regexec(&opt_ll->re_match, name, 0, NULL, 0) == 0) level = opt_ll->level; - - regfree(&r); } rte_logs.dynamic_types[type].loglevel = level; diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c index 13c05bbe9b70..038e75d86348 100644 --- a/lib/librte_eal/common/eal_common_options.c +++ b/lib/librte_eal/common/eal_common_options.c @@ -27,6 +27,7 @@ #include "eal_internal_cfg.h" #include "eal_options.h" #include "eal_filesystem.h" +#include "eal_private.h" #define BITS_PER_HEX 4 #define LCORE_OPT_LST 1 @@ -985,29 +986,8 @@ eal_parse_log_level(const char *arg) fprintf(stderr, "cannot set log level %s,%d\n", type, priority); goto fail; - } else { - struct rte_eal_opt_loglevel *opt_ll; - - /* - * Save the type (regexp string) and the loglevel - * in the global storage so that it could be used - * to configure dynamic logtypes which are absent - * at the moment of EAL option processing but may - * be registered during runtime. - */ - opt_ll = malloc(sizeof(*opt_ll)); - if (opt_ll == NULL) - goto fail; - - opt_ll->re_type = strdup(type); - if (opt_ll->re_type == NULL) { - free(opt_ll); - goto fail; - } - - opt_ll->level = priority; - - TAILQ_INSERT_HEAD(&opt_loglevel_list, opt_ll, next); + } else if (rte_eal_log_save_regexp(type, priority) < 0) { + goto fail; } free(str); diff --git a/lib/librte_eal/common/eal_private.h b/lib/librte_eal/common/eal_private.h index 6a8dde824313..d505a9a3c76f 100644 --- a/lib/librte_eal/common/eal_private.h +++ b/lib/librte_eal/common/eal_private.h @@ -82,6 +82,11 @@ int rte_eal_timer_init(void); */ int rte_eal_log_init(const char *id, int facility); +/** + * Save the log regexp for later + */ +int rte_eal_log_save_regexp(const char *type, int priority); + /** * Init tail queues for non-EAL library structures. This is to allow * the rings, mempools, etc. lists to be shared among multiple processes diff --git a/lib/librte_eal/common/include/rte_log.h b/lib/librte_eal/common/include/rte_log.h index 5f4799e1b795..2d817c3da7c1 100644 --- a/lib/librte_eal/common/include/rte_log.h +++ b/lib/librte_eal/common/include/rte_log.h @@ -85,32 +85,6 @@ extern struct rte_logs rte_logs; #define RTE_LOG_INFO 7U /**< Informational. */ #define RTE_LOG_DEBUG 8U /**< Debug-level messages. */ -/** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * - * Entry definition for the storage to keep EAL log level options - * which are found to have log type regular expressions specified. - */ -struct rte_eal_opt_loglevel { - /** Next list entry */ - TAILQ_ENTRY(rte_eal_opt_loglevel) next; - /** Regular expression string obtained from the option */ - char *re_type; - /** Log level value obtained from the option */ - uint32_t level; -}; - -TAILQ_HEAD(rte_eal_opt_loglevel_list, rte_eal_opt_loglevel); - -/** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * - * Global list of EAL log level options featuring log type expressions - */ -extern struct rte_eal_opt_loglevel_list opt_loglevel_list; - /** * Change the stream that will be used by the logging system. *