Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/38954/?format=api
{ "id": 38954, "url": "http://patches.dpdk.org/api/patches/38954/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20180425155646.3627-9-stephen@networkplumber.org/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20180425155646.3627-9-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20180425155646.3627-9-stephen@networkplumber.org", "date": "2018-04-25T15:56:44", "name": "[dpdk-dev,next,08/10] net/pcap: support dynamic logging", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "c8a10998b79d61b7eda32b2c4c96d1050226e536", "submitter": { "id": 27, "url": "http://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20180425155646.3627-9-stephen@networkplumber.org/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/38954/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/38954/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 9676DAAA0;\n\tWed, 25 Apr 2018 17:57:17 +0200 (CEST)", "from mail-pf0-f195.google.com (mail-pf0-f195.google.com\n\t[209.85.192.195]) by dpdk.org (Postfix) with ESMTP id 1E1958E7A\n\tfor <dev@dpdk.org>; Wed, 25 Apr 2018 17:57:02 +0200 (CEST)", "by mail-pf0-f195.google.com with SMTP id f15so15602083pfn.0\n\tfor <dev@dpdk.org>; Wed, 25 Apr 2018 08:57:02 -0700 (PDT)", "from xeon-e3.lan (204-195-71-95.wavecable.com. [204.195.71.95])\n\tby smtp.gmail.com with ESMTPSA id\n\ty3sm25713924pgc.81.2018.04.25.08.56.58\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 25 Apr 2018 08:56:58 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=networkplumber-org.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=RsczD2/4ClQ1OXq5a+cIhOyKKuJtIf5U3MA/E7eqwKI=;\n\tb=xe+E50bXywtfUX7V5RXkNnjTUgeaZSuYjeevzfUuyS6L7qcg/WqjIEo5ulZ4aTCuMo\n\t71lCVi0a2R90ExWnHAnH3A+8sBtnfi9qEnlARp8Ri1vvcsPPzFkKtxruITQkassUorvq\n\tYqqIGtHgoiZanONeTiLaxp4dkKGg/5QX9ghAk5PCXFESgKIHnVXdW6X5dxQdnB3qHH/5\n\tJbGCdN6WlwC02D9JLvKXMssIebGyO8wVDzxa/3Tbye4FzpF5vFnzgnkg1qESYuoK4AXn\n\tK2YxxU+/aqO9j1QHxwvpOLFgQMk6byLST5dX5/7KkGgiCGJmB/7qG8tQGkxrO82cj60C\n\tKKew==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=RsczD2/4ClQ1OXq5a+cIhOyKKuJtIf5U3MA/E7eqwKI=;\n\tb=YqcErwqVF2QrSkhAcEr9A6TM/xeI4AZKCPyyYRPkWrYq2m+SvO1Auc4yJbhLKmenKm\n\tH11H0a7R6kzz+0AyGr0GilmqFX2yMvWk4XPZYK+yNSz0+vOCnTJCL6J6/4W4S0Zvt+Y7\n\tlGXGlPaLxlj6fqs/MQlFLckBaEaRVkEM5NzN50w6hMoGsSj9ObKuLU+O0DBIkxHj5tJg\n\t4aWN0wSdVU6XotVK2qYs1wSamAEoVv/uceBpMpkdpiNZVLnMAuyvvZcirAqTLCyVg57i\n\t7cbZ6Vb5wRdD2pMfjssZbX3kmSRQy+owEloZuBE7y8OTVk5Uf2JwO5JmCRn5vCL5gOlU\n\tDcTw==", "X-Gm-Message-State": "ALQs6tDU5ai2cmmHqdtiPRiDSnnTWworb/PdKlanoVP+8zm/ZlMSW+YS\n\t6NXpOxMMXN1NUDpTlxbiTRH1o34jAUc=", "X-Google-Smtp-Source": "AIpwx49nsrwvERNyqVR7R19N5r4bfg4C9p10elH2ozTS0eLS5GE8FdRAfCUW6MTvs8C0UdlnOu93JA==", "X-Received": "by 10.99.115.78 with SMTP id d14mr12386359pgn.1.1524671820869;\n\tWed, 25 Apr 2018 08:57:00 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>", "Date": "Wed, 25 Apr 2018 08:56:44 -0700", "Message-Id": "<20180425155646.3627-9-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 08/10] net/pcap: support dynamic logging", "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>,\n\t<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>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n drivers/net/pcap/rte_eth_pcap.c | 41 ++++++++++++++++++++++-----------\n 1 file changed, 28 insertions(+), 13 deletions(-)", "diff": "diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c\nindex 570c9e984d32..4ef28a4995d2 100644\n--- a/drivers/net/pcap/rte_eth_pcap.c\n+++ b/drivers/net/pcap/rte_eth_pcap.c\n@@ -99,6 +99,12 @@ static struct rte_eth_link pmd_link = {\n \t\t.link_autoneg = ETH_LINK_AUTONEG,\n };\n \n+static int eth_pcap_logtype;\n+\n+#define PMD_LOG(level, fmt, args...) \\\n+\trte_log(RTE_LOG_ ## level, eth_pcap_logtype, \\\n+\t\t\"%s(): \" fmt \"\\n\", __func__, ##args)\n+\n static int\n eth_pcap_rx_jumbo(struct rte_mempool *mb_pool, struct rte_mbuf *mbuf,\n \t\tconst u_char *data, uint16_t data_len)\n@@ -256,8 +262,8 @@ eth_pcap_tx_dumper(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\t\t\tpcap_dump((u_char *)dumper_q->dumper, &header,\n \t\t\t\t\t tx_pcap_data);\n \t\t\t} else {\n-\t\t\t\tRTE_LOG(ERR, PMD,\n-\t\t\t\t\t\"Dropping PCAP packet. Size (%d) > max jumbo size (%d).\\n\",\n+\t\t\t\tPMD_LOG(ERR,\n+\t\t\t\t\t\"Dropping PCAP packet. Size (%d) > max jumbo size (%d).\",\n \t\t\t\t\tmbuf->pkt_len,\n \t\t\t\t\tETHER_MAX_JUMBO_FRAME_LEN);\n \n@@ -313,8 +319,8 @@ eth_pcap_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\t\t\tret = pcap_sendpacket(tx_queue->pcap,\n \t\t\t\t\t\ttx_pcap_data, mbuf->pkt_len);\n \t\t\t} else {\n-\t\t\t\tRTE_LOG(ERR, PMD,\n-\t\t\t\t\t\"Dropping PCAP packet. Size (%d) > max jumbo size (%d).\\n\",\n+\t\t\t\tPMD_LOG(ERR,\n+\t\t\t\t\t\"Dropping PCAP packet. Size (%d) > max jumbo size (%d).\",\n \t\t\t\t\tmbuf->pkt_len,\n \t\t\t\t\tETHER_MAX_JUMBO_FRAME_LEN);\n \n@@ -346,7 +352,7 @@ open_iface_live(const char *iface, pcap_t **pcap) {\n \t\t\tRTE_ETH_PCAP_PROMISC, RTE_ETH_PCAP_TIMEOUT, errbuf);\n \n \tif (*pcap == NULL) {\n-\t\tRTE_LOG(ERR, PMD, \"Couldn't open %s: %s\\n\", iface, errbuf);\n+\t\tPMD_LOG(ERR, \"Couldn't open %s: %s\", iface, errbuf);\n \t\treturn -1;\n \t}\n \n@@ -357,7 +363,7 @@ static int\n open_single_iface(const char *iface, pcap_t **pcap)\n {\n \tif (open_iface_live(iface, pcap) < 0) {\n-\t\tRTE_LOG(ERR, PMD, \"Couldn't open interface %s\\n\", iface);\n+\t\tPMD_LOG(ERR, \"Couldn't open interface %s\", iface);\n \t\treturn -1;\n \t}\n \n@@ -376,7 +382,7 @@ open_single_tx_pcap(const char *pcap_filename, pcap_dumper_t **dumper)\n \t */\n \ttx_pcap = pcap_open_dead(DLT_EN10MB, RTE_ETH_PCAP_SNAPSHOT_LEN);\n \tif (tx_pcap == NULL) {\n-\t\tRTE_LOG(ERR, PMD, \"Couldn't create dead pcap\\n\");\n+\t\tPMD_LOG(ERR, \"Couldn't create dead pcap\");\n \t\treturn -1;\n \t}\n \n@@ -384,7 +390,7 @@ open_single_tx_pcap(const char *pcap_filename, pcap_dumper_t **dumper)\n \t*dumper = pcap_dump_open(tx_pcap, pcap_filename);\n \tif (*dumper == NULL) {\n \t\tpcap_close(tx_pcap);\n-\t\tRTE_LOG(ERR, PMD, \"Couldn't open %s for writing.\\n\",\n+\t\tPMD_LOG(ERR, \"Couldn't open %s for writing.\",\n \t\t\tpcap_filename);\n \t\treturn -1;\n \t}\n@@ -398,7 +404,7 @@ open_single_rx_pcap(const char *pcap_filename, pcap_t **pcap)\n {\n \t*pcap = pcap_open_offline(pcap_filename, errbuf);\n \tif (*pcap == NULL) {\n-\t\tRTE_LOG(ERR, PMD, \"Couldn't open %s: %s\\n\", pcap_filename,\n+\t\tPMD_LOG(ERR, \"Couldn't open %s: %s\", pcap_filename,\n \t\t\terrbuf);\n \t\treturn -1;\n \t}\n@@ -776,7 +782,7 @@ pmd_init_internals(struct rte_vdev_device *vdev,\n \tstruct rte_eth_dev_data *data;\n \tunsigned int numa_node = vdev->device.numa_node;\n \n-\tRTE_LOG(INFO, PMD, \"Creating pcap-backed ethdev on numa socket %d\\n\",\n+\tPMD_LOG(INFO, \"Creating pcap-backed ethdev on numa socket %d\",\n \t\tnuma_node);\n \n \t/* reserve an ethdev entry */\n@@ -903,7 +909,7 @@ pmd_pcap_probe(struct rte_vdev_device *dev)\n \tint ret;\n \n \tname = rte_vdev_device_name(dev);\n-\tRTE_LOG(INFO, PMD, \"Initializing pmd_pcap for %s\\n\", name);\n+\tPMD_LOG(INFO, \"Initializing pmd_pcap for %s\", name);\n \n \tgettimeofday(&start_time, NULL);\n \tstart_cycles = rte_get_timer_cycles();\n@@ -913,7 +919,7 @@ pmd_pcap_probe(struct rte_vdev_device *dev)\n \t strlen(rte_vdev_device_args(dev)) == 0) {\n \t\teth_dev = rte_eth_dev_attach_secondary(name);\n \t\tif (!eth_dev) {\n-\t\t\tRTE_LOG(ERR, PMD, \"Failed to probe %s\\n\", name);\n+\t\t\tPMD_LOG(ERR, \"Failed to probe %s\", name);\n \t\t\treturn -1;\n \t\t}\n \t\t/* TODO: request info from primary to set up Rx and Tx */\n@@ -1009,7 +1015,7 @@ pmd_pcap_remove(struct rte_vdev_device *dev)\n {\n \tstruct rte_eth_dev *eth_dev = NULL;\n \n-\tRTE_LOG(INFO, PMD, \"Closing pcap ethdev on numa socket %d\\n\",\n+\tPMD_LOG(INFO, \"Closing pcap ethdev on numa socket %d\",\n \t\t\trte_socket_id());\n \n \tif (!dev)\n@@ -1040,3 +1046,12 @@ RTE_PMD_REGISTER_PARAM_STRING(net_pcap,\n \tETH_PCAP_RX_IFACE_ARG \"=<ifc> \"\n \tETH_PCAP_TX_IFACE_ARG \"=<ifc> \"\n \tETH_PCAP_IFACE_ARG \"=<ifc>\");\n+\n+RTE_INIT(eth_pcap_init_log);\n+static void\n+eth_pcap_init_log(void)\n+{\n+\teth_pcap_logtype = rte_log_register(\"pmd.net.pcap\");\n+\tif (eth_pcap_logtype >= 0)\n+\t\trte_log_set_level(eth_pcap_logtype, RTE_LOG_NOTICE);\n+}\n", "prefixes": [ "dpdk-dev", "next", "08/10" ] }