From patchwork Wed Apr 25 15:56:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 38949 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 D3AA38E68; Wed, 25 Apr 2018 17:57:01 +0200 (CEST) Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by dpdk.org (Postfix) with ESMTP id D45668E5B for ; Wed, 25 Apr 2018 17:56:53 +0200 (CEST) Received: by mail-pf0-f193.google.com with SMTP id p6so15587026pfn.4 for ; Wed, 25 Apr 2018 08:56: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; bh=8NfUcpTpxMJuCtwYe6bmqtc3cgIa0BsxdrBaIlUKS/k=; b=KqAS3nFAxVfs3o5oZCvP89KEfD8uQMP2pcHmCVvw1o4tAebipl/Bu7T+kUJC8odO7U APPTP7mUHGO2OhmGVyL/mcbAjv7XKRq9RRd9DmL0zys/Zz3tNCGTk0GSRj4R8JNM8nxT G6WcPP1X2oD8PRoPifNkQw+5JKe28S/N9L7fmx84tYSN+J6rn4u74lFBORKFyuM+MsPs 6B5DM/d/p1cveHKZUsYdQ2HwJ59kk8P/CDsCmsE9+iORTy6MiZPSNeOgNnXG6q0kw4j2 l1361r7uIiechsrcE8uEjj1WFF2JlBbyEm9bcJZ6xhu1dZ1jW2fHs6MZj+D3ys4gutVV gBkA== 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=8NfUcpTpxMJuCtwYe6bmqtc3cgIa0BsxdrBaIlUKS/k=; b=UuR3qY9ePzHlaU41O3V3FCR+SR9IxKmkrVyjnbsy7uzhPs6IaU+8hHwEETlek0KVAf Ho1KlCcAJmew9ObwTTFW2sW9dSUCLlTUglm5qW2S7e29AjrbqB7U8fFXafGF29HYvmbr PJoSa5kFnsVwnOxQXbE8jVFYUzRm1KTY/FOeAxNDZykqlQIQ3YBn0I3LtnV4+EUCstDX 1qKNSoyN548JBlwVWtioaNOy61kaMLBzBNbylXU7T7INUfR5iXkNOwb6E5Ffv/qFxmIZ wBuQIGN4UTnJeOnndW0fbBRZdFHGVvmCyCxO7bkxcSc7JtR+81PPeru08Cb5GiQLNseS MjSw== X-Gm-Message-State: ALQs6tBcmv4ifMFYU3ue5Njc/rDIc1DxiXUdMS9z5GPQSYJi49szzAvw jwrJmkJY27x9VYVRYUAhmUXUJhXYS0U= X-Google-Smtp-Source: AB8JxZo6sGOgTlikyD+EJftjPuwZ62gckgu9eoVQSjczJAE27bgo8OTUTQTkJcZYNMsqOp1v3oruow== X-Received: by 10.98.232.1 with SMTP id c1mr5977083pfi.184.1524671812717; Wed, 25 Apr 2018 08:56:52 -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.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Apr 2018 08:56:51 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 25 Apr 2018 08:56:39 -0700 Message-Id: <20180425155646.3627-4-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 03/10] net/null: 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" Convert null device to use dynamic logging. Signed-off-by: Stephen Hemminger --- drivers/net/null/rte_eth_null.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c index 6413a9064245..571ba7952cd2 100644 --- a/drivers/net/null/rte_eth_null.c +++ b/drivers/net/null/rte_eth_null.c @@ -92,6 +92,12 @@ static struct rte_eth_link pmd_link = { .link_autoneg = ETH_LINK_AUTONEG, }; +static int eth_null_logtype; + +#define PMD_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, eth_null_logtype, \ + "%s(): " fmt "\n", __func__, ##args) + static uint16_t eth_null_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) { @@ -509,7 +515,7 @@ eth_dev_null_create(struct rte_vdev_device *dev, if (dev->device.numa_node == SOCKET_ID_ANY) dev->device.numa_node = rte_socket_id(); - RTE_LOG(INFO, PMD, "Creating null ethdev on numa socket %u\n", + PMD_LOG(INFO, "Creating null ethdev on numa socket %u", dev->device.numa_node); eth_dev = rte_eth_vdev_allocate(dev, sizeof(*internals)); @@ -605,13 +611,13 @@ rte_pmd_null_probe(struct rte_vdev_device *dev) name = rte_vdev_device_name(dev); params = rte_vdev_device_args(dev); - RTE_LOG(INFO, PMD, "Initializing pmd_null for %s\n", name); + PMD_LOG(INFO, "Initializing pmd_null for %s", name); if (rte_eal_process_type() == RTE_PROC_SECONDARY && strlen(params) == 0) { eth_dev = rte_eth_dev_attach_secondary(name); if (!eth_dev) { - RTE_LOG(ERR, PMD, "Failed to probe %s\n", name); + PMD_LOG(ERR, "Failed to probe %s", name); return -1; } /* TODO: request info from primary to set up Rx and Tx */ @@ -643,8 +649,8 @@ rte_pmd_null_probe(struct rte_vdev_device *dev) } } - RTE_LOG(INFO, PMD, "Configure pmd_null: packet size is %d, " - "packet copy is %s\n", packet_size, + PMD_LOG(INFO, "Configure pmd_null: packet size is %d, " + "packet copy is %s", packet_size, packet_copy ? "enabled" : "disabled"); ret = eth_dev_null_create(dev, packet_size, packet_copy); @@ -663,7 +669,7 @@ rte_pmd_null_remove(struct rte_vdev_device *dev) if (!dev) return -EINVAL; - RTE_LOG(INFO, PMD, "Closing null ethdev on numa socket %u\n", + PMD_LOG(INFO, "Closing null ethdev on numa socket %u", rte_socket_id()); /* find the ethdev entry */ @@ -688,3 +694,12 @@ RTE_PMD_REGISTER_ALIAS(net_null, eth_null); RTE_PMD_REGISTER_PARAM_STRING(net_null, "size= " "copy="); + +RTE_INIT(eth_null_init_log); +static void +eth_null_init_log(void) +{ + eth_null_logtype = rte_log_register("pmd.net.null"); + if (eth_null_logtype >= 0) + rte_log_set_level(eth_null_logtype, RTE_LOG_NOTICE); +}