Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/400/?format=api
{ "id": 400, "url": "https://patches.dpdk.org/api/patches/400/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1410961612-8571-4-git-send-email-david.marchand@6wind.com/", "project": { "id": 1, "url": "https://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": "<1410961612-8571-4-git-send-email-david.marchand@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1410961612-8571-4-git-send-email-david.marchand@6wind.com", "date": "2014-09-17T13:46:35", "name": "[dpdk-dev,v3,03/20] ixgbe: indent logs sections", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "30253e491ea4e6a1708ece97dc952e5af323d249", "submitter": { "id": 3, "url": "https://patches.dpdk.org/api/people/3/?format=api", "name": "David Marchand", "email": "david.marchand@6wind.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1410961612-8571-4-git-send-email-david.marchand@6wind.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/400/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/400/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 [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id D074BB3AC;\n\tWed, 17 Sep 2014 15:41:24 +0200 (CEST)", "from mail-wg0-f52.google.com (mail-wg0-f52.google.com\n\t[74.125.82.52]) by dpdk.org (Postfix) with ESMTP id AFC1AB39B\n\tfor <dev@dpdk.org>; Wed, 17 Sep 2014 15:41:22 +0200 (CEST)", "by mail-wg0-f52.google.com with SMTP id x13so1413875wgg.11\n\tfor <dev@dpdk.org>; Wed, 17 Sep 2014 06:47:03 -0700 (PDT)", "from alcyon.dev.6wind.com (guy78-3-82-239-227-177.fbx.proxad.net.\n\t[82.239.227.177]) by mx.google.com with ESMTPSA id\n\tfa20sm5712872wic.1.2014.09.17.06.47.02 for <multiple recipients>\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 17 Sep 2014 06:47:03 -0700 (PDT)" ], "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=yjYJ6KJDOMh7ulJJGK1TUQ3fjydmZZxZlNkryioeeQA=;\n\tb=Va6M8Yj7XeF6n9LwOt4as14iyabVUO3sqg0cMhso02+arfCh8cXH6cz6aQPoHxHs+2\n\tvPTSAIT8J+k3pT9K/FxVQ5UlJ5qn6yBIZJxbKSJmAVna+WmRYLs2Z8JGzPW4Zky4ZLdH\n\tAqJFaIlOmJ4Xc77GW9sb9+aipBf3b9JQ1s/XB7otgOMGEtVpsbe9bZSXBgeGrRSWFzCc\n\tfsYCt5S0XeWrBy068Dya1AM2ZyZNyGwOxEXsXCwUpFkV6OoZUDt7qP2+53dJTo+iHu3K\n\tTDQln7ddBBFpVkmp4EQnigSFjt7+RkPx6h1ivNgEFwuwWV2uh6qnFtkjgiHFACOS72Dd\n\tELzw==", "X-Gm-Message-State": "ALoCoQlcQoitjMjiLUyjsjsX7OEmnNSWFZFpCN8e3z+lCR1FMyjlAC0Uo4ijzItccN7ln/H7jHjq", "X-Received": "by 10.194.78.4 with SMTP id x4mr51149291wjw.44.1410961623867;\n\tWed, 17 Sep 2014 06:47:03 -0700 (PDT)", "From": "David Marchand <david.marchand@6wind.com>", "To": "dev@dpdk.org", "Date": "Wed, 17 Sep 2014 15:46:35 +0200", "Message-Id": "<1410961612-8571-4-git-send-email-david.marchand@6wind.com>", "X-Mailer": "git-send-email 1.7.10.4", "In-Reply-To": "<1410961612-8571-1-git-send-email-david.marchand@6wind.com>", "References": "<1410961612-8571-1-git-send-email-david.marchand@6wind.com>", "Subject": "[dpdk-dev] [PATCH v3 03/20] ixgbe: indent logs sections", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://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": "<http://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": "Prepare for next commit, indent sections where log messages will be modified so\nthat next patch is only about \\n.\n\nSigned-off-by: David Marchand <david.marchand@6wind.com>\n---\n lib/librte_pmd_ixgbe/ixgbe_ethdev.c | 51 +++++++++++++++++------------------\n lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 34 ++++++++++++-----------\n 2 files changed, 42 insertions(+), 43 deletions(-)", "diff": "diff --git a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c\nindex f914405..71b964a 100644\n--- a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c\n+++ b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c\n@@ -548,7 +548,8 @@ ixgbe_dev_queue_stats_mapping_set(struct rte_eth_dev *eth_dev,\n \t\treturn -ENOSYS;\n \n \tPMD_INIT_LOG(INFO, \"Setting port %d, %s queue_id %d to stat index %d\\n\",\n-\t\t (int)(eth_dev->data->port_id), is_rx ? \"RX\" : \"TX\", queue_id, stat_idx);\n+\t\t (int)(eth_dev->data->port_id), is_rx ? \"RX\" : \"TX\",\n+\t\t queue_id, stat_idx);\n \n \tn = (uint8_t)(queue_id / NB_QMAP_FIELDS_PER_QSM_REG);\n \tif (n >= IXGBE_NB_STAT_MAPPING_REGS) {\n@@ -574,8 +575,9 @@ ixgbe_dev_queue_stats_mapping_set(struct rte_eth_dev *eth_dev,\n \n \tPMD_INIT_LOG(INFO, \"Set port %d, %s queue_id %d to stat index %d\\n\"\n \t\t \"%s[%d] = 0x%08x\\n\",\n-\t\t (int)(eth_dev->data->port_id), is_rx ? \"RX\" : \"TX\", queue_id, stat_idx,\n-\t\t is_rx ? \"RQSMR\" : \"TQSM\",n, is_rx ? stat_mappings->rqsmr[n] : stat_mappings->tqsm[n]);\n+\t\t (int)(eth_dev->data->port_id), is_rx ? \"RX\" : \"TX\",\n+\t\t queue_id, stat_idx, is_rx ? \"RQSMR\" : \"TQSM\", n,\n+\t\t is_rx ? stat_mappings->rqsmr[n] : stat_mappings->tqsm[n]);\n \n \t/* Now write the mapping in the appropriate register */\n \tif (is_rx) {\n@@ -849,8 +851,7 @@ eth_ixgbe_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,\n \tIXGBE_WRITE_FLUSH(hw);\n \n \tif (ixgbe_is_sfp(hw) && hw->phy.sfp_type != ixgbe_sfp_type_not_present)\n-\t\tPMD_INIT_LOG(DEBUG,\n-\t\t\t \"MAC: %d, PHY: %d, SFP+: %d<n\",\n+\t\tPMD_INIT_LOG(DEBUG, \"MAC: %d, PHY: %d, SFP+: %d<n\",\n \t\t\t (int) hw->mac.type, (int) hw->phy.type,\n \t\t\t (int) hw->phy.sfp_type);\n \telse\n@@ -1038,8 +1039,8 @@ eth_ixgbevf_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,\n \t}\n \n \tPMD_INIT_LOG(DEBUG, \"\\nport %d vendorID=0x%x deviceID=0x%x mac.type=%s\\n\",\n-\t\t\t eth_dev->data->port_id, pci_dev->id.vendor_id, pci_dev->id.device_id,\n-\t\t\t \"ixgbe_mac_82599_vf\");\n+\t\t eth_dev->data->port_id, pci_dev->id.vendor_id,\n+\t\t pci_dev->id.device_id, \"ixgbe_mac_82599_vf\");\n \n \treturn 0;\n }\n@@ -1418,8 +1419,8 @@ ixgbe_dev_start(struct rte_eth_dev *dev)\n \tif ((dev->data->dev_conf.link_duplex != ETH_LINK_AUTONEG_DUPLEX) &&\n \t\t\t(dev->data->dev_conf.link_duplex != ETH_LINK_FULL_DUPLEX)) {\n \t\tPMD_INIT_LOG(ERR, \"Invalid link_duplex (%hu) for port %hhu\\n\",\n-\t\t\t\tdev->data->dev_conf.link_duplex,\n-\t\t\t\tdev->data->port_id);\n+\t\t\t dev->data->dev_conf.link_duplex,\n+\t\t\t dev->data->port_id);\n \t\treturn -EINVAL;\n \t}\n \n@@ -1491,8 +1492,8 @@ ixgbe_dev_start(struct rte_eth_dev *dev)\n \t\tbreak;\n \tdefault:\n \t\tPMD_INIT_LOG(ERR, \"Invalid link_speed (%hu) for port %hhu\\n\",\n-\t\t\t\tdev->data->dev_conf.link_speed,\n-\t\t\t\tdev->data->port_id);\n+\t\t\t dev->data->dev_conf.link_speed,\n+\t\t\t dev->data->port_id);\n \t\tgoto error;\n \t}\n \n@@ -1598,10 +1599,8 @@ ixgbe_dev_set_link_up(struct rte_eth_dev *dev)\n #ifdef RTE_NIC_BYPASS\n \t\tif (hw->device_id == IXGBE_DEV_ID_82599_BYPASS) {\n \t\t\t/* Not suported in bypass mode */\n-\t\t\tPMD_INIT_LOG(ERR,\n-\t\t\t\t\"\\nSet link up is not supported \"\n-\t\t\t\t\"by device id 0x%x\\n\",\n-\t\t\t\thw->device_id);\n+\t\t\tPMD_INIT_LOG(ERR, \"\\nSet link up is not supported \"\n+\t\t\t\t \"by device id 0x%x\\n\", hw->device_id);\n \t\t\treturn -ENOTSUP;\n \t\t}\n #endif\n@@ -1611,7 +1610,7 @@ ixgbe_dev_set_link_up(struct rte_eth_dev *dev)\n \t}\n \n \tPMD_INIT_LOG(ERR, \"\\nSet link up is not supported by device id 0x%x\\n\",\n-\t\thw->device_id);\n+\t\t hw->device_id);\n \treturn -ENOTSUP;\n }\n \n@@ -1627,10 +1626,8 @@ ixgbe_dev_set_link_down(struct rte_eth_dev *dev)\n #ifdef RTE_NIC_BYPASS\n \t\tif (hw->device_id == IXGBE_DEV_ID_82599_BYPASS) {\n \t\t\t/* Not suported in bypass mode */\n-\t\t\tPMD_INIT_LOG(ERR,\n-\t\t\t\t\"\\nSet link down is not supported \"\n-\t\t\t\t\"by device id 0x%x\\n\",\n-\t\t\t\t hw->device_id);\n+\t\t\tPMD_INIT_LOG(ERR, \"\\nSet link down is not supported \"\n+\t\t\t\t \"by device id 0x%x\\n\", hw->device_id);\n \t\t\treturn -ENOTSUP;\n \t\t}\n #endif\n@@ -1639,9 +1636,8 @@ ixgbe_dev_set_link_down(struct rte_eth_dev *dev)\n \t\treturn 0;\n \t}\n \n-\tPMD_INIT_LOG(ERR,\n-\t\t\"\\nSet link down is not supported by device id 0x%x\\n\",\n-\t\t hw->device_id);\n+\tPMD_INIT_LOG(ERR, \"\\nSet link down is not supported by device id 0x%x\\n\",\n+\t\t hw->device_id);\n \treturn -ENOTSUP;\n }\n \n@@ -2599,7 +2595,7 @@ ixgbe_priority_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_pfc_conf *p\n \t */\n \tmax_high_water = (rx_buf_size - ETHER_MAX_LEN) >> IXGBE_RXPBSIZE_SHIFT;\n \tif ((pfc_conf->fc.high_water > max_high_water) ||\n-\t\t(pfc_conf->fc.high_water <= pfc_conf->fc.low_water)) {\n+\t (pfc_conf->fc.high_water <= pfc_conf->fc.low_water)) {\n \t\tPMD_INIT_LOG(ERR, \"Invalid high/low water setup value in KB\\n\");\n \t\tPMD_INIT_LOG(ERR, \"High_water must <= 0x%x\\n\", max_high_water);\n \t\treturn (-EINVAL);\n@@ -2778,7 +2774,7 @@ ixgbevf_dev_configure(struct rte_eth_dev *dev)\n \tstruct rte_eth_conf* conf = &dev->data->dev_conf;\n \n \tPMD_INIT_LOG(DEBUG, \"\\nConfigured Virtual Function port id: %d\\n\",\n-\t\tdev->data->port_id);\n+\t\t dev->data->port_id);\n \n \t/*\n \t * VF has no ability to enable/disable HW CRC\n@@ -2818,7 +2814,8 @@ ixgbevf_dev_start(struct rte_eth_dev *dev)\n \t/* This can fail when allocating mbufs for descriptor rings */\n \terr = ixgbevf_dev_rx_init(dev);\n \tif (err) {\n-\t\tPMD_INIT_LOG(ERR, \"Unable to initialize RX hardware (%d)\\n\", err);\n+\t\tPMD_INIT_LOG(ERR, \"Unable to initialize RX hardware (%d)\\n\",\n+\t\t\t err);\n \t\tixgbe_dev_clear_queues(dev);\n \t\treturn err;\n \t}\n@@ -3098,7 +3095,7 @@ ixgbe_set_pool_rx_mode(struct rte_eth_dev *dev, uint16_t pool,\n \n \tif (hw->mac.type == ixgbe_mac_82598EB) {\n \t\tPMD_INIT_LOG(ERR, \"setting VF receive mode set should be done\"\n-\t\t\t\" on 82599 hardware and newer\\n\");\n+\t\t\t \" on 82599 hardware and newer\\n\");\n \t\treturn (-ENOTSUP);\n \t}\n \tif (ixgbe_vmdq_mode_check(hw) < 0)\ndiff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c\nindex 765b4e0..8732051 100644\n--- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c\n+++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c\n@@ -1889,8 +1889,14 @@ ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,\n \t\t\tdev->tx_pkt_burst = ixgbe_xmit_pkts_simple;\n \t} else {\n \t\tPMD_INIT_LOG(INFO, \"Using full-featured tx code path\\n\");\n-\t\tPMD_INIT_LOG(INFO, \" - txq_flags = %lx [IXGBE_SIMPLE_FLAGS=%lx]\\n\", (long unsigned)txq->txq_flags, (long unsigned)IXGBE_SIMPLE_FLAGS);\n-\t\tPMD_INIT_LOG(INFO, \" - tx_rs_thresh = %lu [RTE_PMD_IXGBE_TX_MAX_BURST=%lu]\\n\", (long unsigned)txq->tx_rs_thresh, (long unsigned)RTE_PMD_IXGBE_TX_MAX_BURST);\n+\t\tPMD_INIT_LOG(INFO, \" - txq_flags = %lx \"\n+\t\t\t \"[IXGBE_SIMPLE_FLAGS=%lx]\\n\",\n+\t\t\t (long unsigned)txq->txq_flags,\n+\t\t\t (long unsigned)IXGBE_SIMPLE_FLAGS);\n+\t\tPMD_INIT_LOG(INFO, \" - tx_rs_thresh = %lu \"\n+\t\t\t \"[RTE_PMD_IXGBE_TX_MAX_BURST=%lu]\\n\",\n+\t\t\t (long unsigned)txq->tx_rs_thresh,\n+\t\t\t (long unsigned)RTE_PMD_IXGBE_TX_MAX_BURST);\n \t\tdev->tx_pkt_burst = ixgbe_xmit_pkts;\n \t}\n \n@@ -3695,9 +3701,8 @@ ixgbe_dev_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id)\n \n \t\t/* Allocate buffers for descriptor rings */\n \t\tif (ixgbe_alloc_rx_queue_mbufs(rxq) != 0) {\n-\t\t\tPMD_INIT_LOG(ERR,\n-\t\t\t\t\"Could not alloc mbuf for queue:%d\\n\",\n-\t\t\t\trx_queue_id);\n+\t\t\tPMD_INIT_LOG(ERR, \"Could not alloc mbuf for queue:%d\\n\",\n+\t\t\t\t rx_queue_id);\n \t\t\treturn -1;\n \t\t}\n \t\trxdctl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(rxq->reg_idx));\n@@ -3711,8 +3716,8 @@ ixgbe_dev_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id)\n \t\t\trxdctl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(rxq->reg_idx));\n \t\t} while (--poll_ms && !(rxdctl & IXGBE_RXDCTL_ENABLE));\n \t\tif (!poll_ms)\n-\t\t\tPMD_INIT_LOG(ERR, \"Could not enable \"\n-\t\t\t\t \"Rx Queue %d\\n\", rx_queue_id);\n+\t\t\tPMD_INIT_LOG(ERR, \"Could not enable Rx Queue %d\\n\",\n+\t\t\t\t rx_queue_id);\n \t\trte_wmb();\n \t\tIXGBE_WRITE_REG(hw, IXGBE_RDH(rxq->reg_idx), 0);\n \t\tIXGBE_WRITE_REG(hw, IXGBE_RDT(rxq->reg_idx), rxq->nb_rx_desc - 1);\n@@ -3750,8 +3755,8 @@ ixgbe_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id)\n \t\t\trxdctl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(rxq->reg_idx));\n \t\t} while (--poll_ms && (rxdctl | IXGBE_RXDCTL_ENABLE));\n \t\tif (!poll_ms)\n-\t\t\tPMD_INIT_LOG(ERR, \"Could not disable \"\n-\t\t\t\t \"Rx Queue %d\\n\", rx_queue_id);\n+\t\t\tPMD_INIT_LOG(ERR, \"Could not disable Rx Queue %d\\n\",\n+\t\t\t\t rx_queue_id);\n \n \t\trte_delay_us(RTE_IXGBE_WAIT_100_US);\n \n@@ -3834,9 +3839,8 @@ ixgbe_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id)\n \t\t\t\t\t\tIXGBE_TDT(txq->reg_idx));\n \t\t\t} while (--poll_ms && (txtdh != txtdt));\n \t\t\tif (!poll_ms)\n-\t\t\t\tPMD_INIT_LOG(ERR,\n-\t\t\t\t\"Tx Queue %d is not empty when stopping.\\n\",\n-\t\t\t\ttx_queue_id);\n+\t\t\t\tPMD_INIT_LOG(ERR, \"Tx Queue %d is not empty \"\n+\t\t\t\t\t \"when stopping.\\n\", tx_queue_id);\n \t\t}\n \n \t\ttxdctl = IXGBE_READ_REG(hw, IXGBE_TXDCTL(txq->reg_idx));\n@@ -4069,8 +4073,7 @@ ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev)\n \t\t\ttxdctl = IXGBE_READ_REG(hw, IXGBE_VFTXDCTL(i));\n \t\t} while (--poll_ms && !(txdctl & IXGBE_TXDCTL_ENABLE));\n \t\tif (!poll_ms)\n-\t\t\tPMD_INIT_LOG(ERR, \"Could not enable \"\n-\t\t\t\t\t \"Tx Queue %d\\n\", i);\n+\t\t\tPMD_INIT_LOG(ERR, \"Could not enable Tx Queue %d\\n\", i);\n \t}\n \tfor (i = 0; i < dev->data->nb_rx_queues; i++) {\n \n@@ -4087,8 +4090,7 @@ ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev)\n \t\t\trxdctl = IXGBE_READ_REG(hw, IXGBE_VFRXDCTL(i));\n \t\t} while (--poll_ms && !(rxdctl & IXGBE_RXDCTL_ENABLE));\n \t\tif (!poll_ms)\n-\t\t\tPMD_INIT_LOG(ERR, \"Could not enable \"\n-\t\t\t\t\t \"Rx Queue %d\\n\", i);\n+\t\t\tPMD_INIT_LOG(ERR, \"Could not enable Rx Queue %d\\n\", i);\n \t\trte_wmb();\n \t\tIXGBE_WRITE_REG(hw, IXGBE_VFRDT(i), rxq->nb_rx_desc - 1);\n \n", "prefixes": [ "dpdk-dev", "v3", "03/20" ] }