From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by dpdk.org (Postfix) with ESMTP id DE8351B01C for ; Tue, 19 Dec 2017 07:38:53 +0100 (CET) Received: by mail-pf0-f193.google.com with SMTP id c204so10752275pfc.13 for ; Mon, 18 Dec 2017 22:38:53 -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=YiGdnsgbt0vALlWT/no9EBHTY7q0kLT4YLPdbp9J4fU=; b=RYSmSR1ArOAQUKnII5ZHo04RR+3pH/642x/EopCW8/4FcPEBiAWjcIaNL33Meac6nl YH7NHiehWRv8V2kwkO8Sk7SB11I1ktg08vTKyVoYHwwTw4QzmyeXPrzMRVtwbQM5QxFT X9NMBE3rn/JR/p4hkVqhw+R1hix647/n0RL7q2Lzl3EzI6xZ7bqp1AWKKQfF1eBbV+AE dX+lvmG6UEEFq1TX/EIe4Xb2bQJU5vuweFbUS1iXxIQnDSFszY5iCeLrG/OZtnWCnJD2 jHhwwJbHIpHMpGXtzpzfBKv+TaD3ltpG4/T59En4+qi6KxtjdTc/B0npMugPenHwlBk3 OVXQ== 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=YiGdnsgbt0vALlWT/no9EBHTY7q0kLT4YLPdbp9J4fU=; b=cdBU+zSyYAsYFZeEktOec6TJqCMxtCPPP4WpuBUsvY62bk3D3YTF9vZXll0TvLTFqH 9//QeKrYKLplVSrfj+VyYTejlBOdonufXfkL/8v5aSORWTcYXeCZoTrqqk5QhxJDp3ru eHCtCc4LfAmqP/cCW4sB1qQUp/z6DydgD6PPlUYSipeyG4mIp0b3MCBq9p6UnuBbikAO UwEcG2KR4VaexaKMrly2bj4MHwpxF6Y1z5vHXIf5+ILA/LmYewFhOy/lUB0cfeCTIHA9 BZuxLhwQzaKmjExs1RW1Vz1kRdnDZyfrzNkKIuVz5gPbqZsG3NeJYs9H2ZEcnyA3pDpt 9XvQ== X-Gm-Message-State: AKGB3mJwx+gYMTR35Q72tunQPDwU+i8CLfeduQCtzgfnipkHv/cBBIat WYPhBssDy46yLkPOaadMMfMAoQnDctY= X-Google-Smtp-Source: ACJfBou00RNODdczruS2PAgP/x1dzGCn0hgwXqpqBBDcDD3C1YIl9GU0ygTPSByNv7ITL6b3AJFjsw== X-Received: by 10.99.108.5 with SMTP id h5mr2118300pgc.113.1513665532716; Mon, 18 Dec 2017 22:38:52 -0800 (PST) Received: from xeon-e3.lan (204-195-18-133.wavecable.com. [204.195.18.133]) by smtp.gmail.com with ESMTPSA id d9sm31288842pfk.117.2017.12.18.22.38.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Dec 2017 22:38:51 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 18 Dec 2017 22:38:35 -0800 Message-Id: <20171219063840.18981-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171219063840.18981-1-stephen@networkplumber.org> References: <20171219063840.18981-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH 06/11] virtio: implement 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: , X-List-Received-Date: Tue, 19 Dec 2017 06:38:54 -0000 Signed-off-by: Stephen Hemminger --- config/common_base | 2 -- drivers/net/virtio/virtio_ethdev.c | 15 +++++++++++++++ drivers/net/virtio/virtio_logs.h | 19 +++++++------------ 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/config/common_base b/config/common_base index d2564075706d..3695fbe5de27 100644 --- a/config/common_base +++ b/config/common_base @@ -361,10 +361,8 @@ CONFIG_RTE_LIBRTE_DPAA2_DEBUG_TX_FREE=n # Compile burst-oriented VIRTIO PMD driver # CONFIG_RTE_LIBRTE_VIRTIO_PMD=y -CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_INIT=n CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_RX=n CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_TX=n -CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_DRIVER=n CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_DUMP=n # diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index e0328f61d138..e13481774f73 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -106,6 +106,9 @@ static int virtio_dev_queue_stats_mapping_set( uint8_t stat_idx, uint8_t is_rx); +int virtio_logtype_init; +int virtio_logtype_driver; + /* * The set of PCI devices this driver supports */ @@ -2072,3 +2075,15 @@ __rte_unused uint8_t is_rx) RTE_PMD_EXPORT_NAME(net_virtio, __COUNTER__); RTE_PMD_REGISTER_PCI_TABLE(net_virtio, pci_id_virtio_map); RTE_PMD_REGISTER_KMOD_DEP(net_virtio, "* igb_uio | uio_pci_generic | vfio-pci"); + +RTE_INIT(virtio_init_log); +static void +virtio_init_log(void) +{ + virtio_logtype_init = rte_log_register("pmd.virtio.init"); + if (virtio_logtype_init >= 0) + rte_log_set_level(virtio_logtype_init, RTE_LOG_NOTICE); + virtio_logtype_driver = rte_log_register("pmd.virtio.driver"); + if (virtio_logtype_driver >= 0) + rte_log_set_level(virtio_logtype_driver, RTE_LOG_NOTICE); +} diff --git a/drivers/net/virtio/virtio_logs.h b/drivers/net/virtio/virtio_logs.h index 90a79eaa5b42..1d287c1a72ec 100644 --- a/drivers/net/virtio/virtio_logs.h +++ b/drivers/net/virtio/virtio_logs.h @@ -36,14 +36,12 @@ #include -#ifdef RTE_LIBRTE_VIRTIO_DEBUG_INIT +extern int virtio_logtype_init; #define PMD_INIT_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) + rte_log(RTE_LOG_ ## level, virtio_logtype_init, \ + "%s(): " fmt "\n", __func__, ##args) + #define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>") -#else -#define PMD_INIT_LOG(level, fmt, args...) do { } while(0) -#define PMD_INIT_FUNC_TRACE() do { } while(0) -#endif #ifdef RTE_LIBRTE_VIRTIO_DEBUG_RX #define PMD_RX_LOG(level, fmt, args...) \ @@ -59,12 +57,9 @@ #define PMD_TX_LOG(level, fmt, args...) do { } while(0) #endif - -#ifdef RTE_LIBRTE_VIRTIO_DEBUG_DRIVER +extern int virtio_logtype_driver; #define PMD_DRV_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) -#else -#define PMD_DRV_LOG(level, fmt, args...) do { } while(0) -#endif + rte_log(RTE_LOG_ ## level, virtio_logtype_driver, \ + "%s(): " fmt "\n", __func__, ## args) #endif /* _VIRTIO_LOGS_H_ */ -- 2.11.0