From patchwork Wed Apr 25 15:56:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 38952 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 9D4A7A496; Wed, 25 Apr 2018 17:57:08 +0200 (CEST) Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by dpdk.org (Postfix) with ESMTP id 6022A8D99 for ; Wed, 25 Apr 2018 17:56:58 +0200 (CEST) Received: by mail-pf0-f194.google.com with SMTP id f189so6484480pfa.7 for ; Wed, 25 Apr 2018 08:56:58 -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=I9m9LPecdpFXDkFZ0omPYHf4SnUVVJVQbItEB3u7QUc=; b=2AO9z+vUTsPpxayrqGIoF791RCrrMa38Zvgr2yKQulczgp/j0F3d71GSUMt66z9VrO gFWiGH99ukl2XzDN/X1qpCJETmDLJSNAYf9b3+kVitTTPkLFiBjqryiOSzlBkLBstgIh GTs37IK9SmPc+U0xh7Snxdgki2rzisB5xuv5JxWSeVjEx1KWwlZdmoIvQ6nwSxVrMFn6 8hKVSKVIWKhYdXO+Z8myW4a5PEkjLdmOTHPNFz0ip7ENHRSowrsY46bKTFjRbg1m1O4v ihMMXsVm57DEFedpoE60Txo/+pC8Xpa/yGhSFWkbh2FX8Rcttg22meJvwlO7y3Jr7PZC csQA== 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=I9m9LPecdpFXDkFZ0omPYHf4SnUVVJVQbItEB3u7QUc=; b=agWf0B4BbzUbvhBbMpwC05Qi5pvZ0btGBadV6irEUYzRo5pCS7ovA6tRCFb/92TMOn AESr1JbMBhwrhuk5ViHx8O6p2Gpkx+smDmMMTb1VlGNUdo8RpUhukddj6N3nZzVa7HED CTaOjnkOc6CFTzkCnMOCile8N31uk5YQmpUrCG9Hr2LXqwi5tSFQz8GYxeD5v1ZViujc yDIO/InsTBP3lPw83xIFonkM+4JyZdUCBipZvcD9ByZnMGqezO7t3dJfrNXtkHzNSAnr B8EnypV1V1WwPveuboXZn6+jRJ9iB/RBeC2xE2aixAMKFo/JQNmI+U4ttcZUrnwKkT8v hu/w== X-Gm-Message-State: ALQs6tBqrxDtApo8odVV2I3u9Oz8VCG3m0tZXDVSINwKz+zL2tgGXXFT IgXnEU+WS3zH9ptB/TMX3DShy0NvyuQ= X-Google-Smtp-Source: AIpwx4/+WP1ClsNPGRsHHXkrK1W3yXWCycfF5ttwYHnXb7Jz3TQOqKsJ/SWv0WomqJ0O6Ho68hctxA== X-Received: by 10.98.71.141 with SMTP id p13mr26467145pfi.164.1524671817256; Wed, 25 Apr 2018 08:56:57 -0700 (PDT) Received: from xeon-e3.lan (204-195-71-95.wavecable.com. [204.195.71.95]) by smtp.gmail.com with ESMTPSA id y3sm25713924pgc.81.2018.04.25.08.56.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Apr 2018 08:56:56 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 25 Apr 2018 08:56:42 -0700 Message-Id: <20180425155646.3627-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180425155646.3627-1-stephen@networkplumber.org> References: <20180425155646.3627-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH next 06/10] net/failsafe: convert to dynamic logging 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" Signed-off-by: Stephen Hemminger --- drivers/net/failsafe/failsafe.c | 13 ++++++++++++- drivers/net/failsafe/failsafe_private.h | 8 ++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/drivers/net/failsafe/failsafe.c b/drivers/net/failsafe/failsafe.c index dc9b0d08881d..5e7a8ba1b0dd 100644 --- a/drivers/net/failsafe/failsafe.c +++ b/drivers/net/failsafe/failsafe.c @@ -13,6 +13,8 @@ #include "failsafe_private.h" +int failsafe_logtype; + const char pmd_failsafe_driver_name[] = FAILSAFE_DRIVER_NAME; static const struct rte_eth_link eth_link = { .link_speed = ETH_SPEED_NUM_10G, @@ -304,7 +306,7 @@ rte_pmd_failsafe_probe(struct rte_vdev_device *vdev) strlen(rte_vdev_device_args(vdev)) == 0) { eth_dev = rte_eth_dev_attach_secondary(name); if (!eth_dev) { - RTE_LOG(ERR, PMD, "Failed to probe %s\n", name); + ERROR("Failed to probe %s", name); return -1; } /* TODO: request info from primary to set up Rx and Tx */ @@ -332,3 +334,12 @@ static struct rte_vdev_driver failsafe_drv = { RTE_PMD_REGISTER_VDEV(net_failsafe, failsafe_drv); RTE_PMD_REGISTER_PARAM_STRING(net_failsafe, PMD_FAILSAFE_PARAM_STRING); + +RTE_INIT(failsafe_init_log); +static void +failsafe_init_log(void) +{ + failsafe_logtype = rte_log_register("pmd.net.failsafe"); + if (failsafe_logtype >= 0) + rte_log_set_level(failsafe_logtype, RTE_LOG_NOTICE); +} diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h index 7db9eebe3fcc..b54f8e33671f 100644 --- a/drivers/net/failsafe/failsafe_private.h +++ b/drivers/net/failsafe/failsafe_private.h @@ -326,8 +326,12 @@ extern int mac_from_arg; #define FS_THREADID_FMT "lu" #endif -#define LOG__(level, m, ...) \ - RTE_LOG(level, PMD, "net_failsafe: " m "%c", __VA_ARGS__) +extern int failsafe_logtype; + +#define LOG__(l, m, ...) \ + rte_log(RTE_LOG_ ## l, failsafe_logtype, \ + "net_failsafe: " m "%c", __VA_ARGS__) + #define LOG_(level, ...) LOG__(level, __VA_ARGS__, '\n') #define DEBUG(...) LOG_(DEBUG, __VA_ARGS__) #define INFO(...) LOG_(INFO, __VA_ARGS__)