dev.dpdk.org archive mirror
 help / color / mirror / Atom feed
From: John McNamara <john.mcnamara-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
To: dev-VfR2kkLFssw@public.gmane.org
Subject: [PATCH v2 1/4] ethdev: rename callbacks field to intr_cbs
Date: Fri, 13 Feb 2015 15:39:46 +0000	[thread overview]
Message-ID: <1423841989-9090-2-git-send-email-john.mcnamara@intel.com> (raw)
In-Reply-To: <1423841989-9090-1-git-send-email-john.mcnamara-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>

From: Richardson, Bruce <bruce.richardson-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>

The callbacks member of the rte_eth_dev structure has been renamed
to intr_cbs to make it clear that it refers to callbacks from NIC
interrupts. This then allows us to add other types of callbacks to
the structure without ambiguity.

Signed-off-by: Bruce Richardson <bruce.richardson-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
 app/test/virtual_pmd.c                 |    2 +-
 lib/librte_ether/rte_ethdev.c          |   12 ++++++------
 lib/librte_ether/rte_ethdev.h          |    2 +-
 lib/librte_pmd_bond/rte_eth_bond_api.c |    2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/test/virtual_pmd.c b/app/test/virtual_pmd.c
index 9fac95d..ec2474f 100644
--- a/app/test/virtual_pmd.c
+++ b/app/test/virtual_pmd.c
@@ -576,7 +576,7 @@ virtual_ethdev_create(const char *name, struct ether_addr *mac_addr,
 	eth_dev->data->nb_rx_queues = (uint16_t)1;
 	eth_dev->data->nb_tx_queues = (uint16_t)1;
 
-	TAILQ_INIT(&(eth_dev->callbacks));
+	TAILQ_INIT(&(eth_dev->intr_cbs));
 
 	eth_dev->data->dev_link.link_status = 0;
 	eth_dev->data->dev_link.link_speed = ETH_LINK_SPEED_10000;
diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index ea3a1fb..e4b3315 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -265,7 +265,7 @@ rte_eth_dev_init(struct rte_pci_driver *pci_drv,
 	eth_dev->data->rx_mbuf_alloc_failed = 0;
 
 	/* init user callbacks */
-	TAILQ_INIT(&(eth_dev->callbacks));
+	TAILQ_INIT(&(eth_dev->intr_cbs));
 
 	/*
 	 * Set the default MTU.
@@ -2738,7 +2738,7 @@ rte_eth_dev_callback_register(uint8_t port_id,
 	dev = &rte_eth_devices[port_id];
 	rte_spinlock_lock(&rte_eth_dev_cb_lock);
 
-	TAILQ_FOREACH(user_cb, &(dev->callbacks), next) {
+	TAILQ_FOREACH(user_cb, &(dev->intr_cbs), next) {
 		if (user_cb->cb_fn == cb_fn &&
 			user_cb->cb_arg == cb_arg &&
 			user_cb->event == event) {
@@ -2752,7 +2752,7 @@ rte_eth_dev_callback_register(uint8_t port_id,
 		user_cb->cb_fn = cb_fn;
 		user_cb->cb_arg = cb_arg;
 		user_cb->event = event;
-		TAILQ_INSERT_TAIL(&(dev->callbacks), user_cb, next);
+		TAILQ_INSERT_TAIL(&(dev->intr_cbs), user_cb, next);
 	}
 
 	rte_spinlock_unlock(&rte_eth_dev_cb_lock);
@@ -2779,7 +2779,7 @@ rte_eth_dev_callback_unregister(uint8_t port_id,
 	rte_spinlock_lock(&rte_eth_dev_cb_lock);
 
 	ret = 0;
-	for (cb = TAILQ_FIRST(&dev->callbacks); cb != NULL; cb = next) {
+	for (cb = TAILQ_FIRST(&dev->intr_cbs); cb != NULL; cb = next) {
 
 		next = TAILQ_NEXT(cb, next);
 
@@ -2793,7 +2793,7 @@ rte_eth_dev_callback_unregister(uint8_t port_id,
 		 * then remove it.
 		 */
 		if (cb->active == 0) {
-			TAILQ_REMOVE(&(dev->callbacks), cb, next);
+			TAILQ_REMOVE(&(dev->intr_cbs), cb, next);
 			rte_free(cb);
 		} else {
 			ret = -EAGAIN;
@@ -2812,7 +2812,7 @@ _rte_eth_dev_callback_process(struct rte_eth_dev *dev,
 	struct rte_eth_dev_callback dev_cb;
 
 	rte_spinlock_lock(&rte_eth_dev_cb_lock);
-	TAILQ_FOREACH(cb_lst, &(dev->callbacks), next) {
+	TAILQ_FOREACH(cb_lst, &(dev->intr_cbs), next) {
 		if (cb_lst->cb_fn == NULL || cb_lst->event != event)
 			continue;
 		dev_cb = *cb_lst;
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 1200c1c..9c67488 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -1538,7 +1538,7 @@ struct rte_eth_dev {
 	const struct eth_driver *driver;/**< Driver for this device */
 	struct eth_dev_ops *dev_ops;    /**< Functions exported by PMD */
 	struct rte_pci_device *pci_dev; /**< PCI info. supplied by probing */
-	struct rte_eth_dev_cb_list callbacks; /**< User application callbacks */
+	struct rte_eth_dev_cb_list intr_cbs; /**< User application callbacks on interrupt*/
 };
 
 struct rte_eth_dev_sriov {
diff --git a/lib/librte_pmd_bond/rte_eth_bond_api.c b/lib/librte_pmd_bond/rte_eth_bond_api.c
index 4ab3267..4a66609 100644
--- a/lib/librte_pmd_bond/rte_eth_bond_api.c
+++ b/lib/librte_pmd_bond/rte_eth_bond_api.c
@@ -251,7 +251,7 @@ rte_eth_bond_create(const char *name, uint8_t mode, uint8_t socket_id)
 	eth_dev->data->nb_rx_queues = (uint16_t)1;
 	eth_dev->data->nb_tx_queues = (uint16_t)1;
 
-	TAILQ_INIT(&(eth_dev->callbacks));
+	TAILQ_INIT(&(eth_dev->intr_cbs));
 
 	eth_dev->data->dev_link.link_status = 0;
 
-- 
1.7.4.1

  parent reply	other threads:[~2015-02-13 15:39 UTC|newest]

Thread overview: 73+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-22 16:47 [PATCH RFC 0/3] DPDK ethdev callback support Bruce Richardson
     [not found] ` <1419266844-4848-1-git-send-email-bruce.richardson-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2014-12-22 16:47   ` [PATCH RFC 1/3] ethdev: rename callbacks field to intr_cbs Bruce Richardson
2014-12-22 16:47   ` [PATCH RFC 2/3] ethdev: Add in data rxtx callback support Bruce Richardson
2014-12-22 16:47   ` [PATCH RFC 3/3] examples: example showing use of callbacks Bruce Richardson
2014-12-22 17:02   ` [PATCH RFC 0/3] DPDK ethdev callback support Thomas Monjalon
2014-12-22 17:33     ` Bruce Richardson
2014-12-22 17:47       ` Neil Horman
     [not found]         ` <20141222174709.GE26669-B26myB8xz7F8NnZeBjwnZQMhkBWG/bsMQH7oEaQurus@public.gmane.org>
2014-12-23  9:28           ` Bruce Richardson
2014-12-23 13:09             ` Neil Horman
     [not found]               ` <20141223130937.GB31876-B26myB8xz7F8NnZeBjwnZQMhkBWG/bsMQH7oEaQurus@public.gmane.org>
2014-12-23 14:09                 ` Bruce Richardson
2015-01-05 16:17       ` Bruce Richardson
2014-12-22 18:31   ` Stephen Hemminger
2014-12-23  9:29     ` Bruce Richardson
2014-12-23  4:23   ` Vithal S Mohare
     [not found]     ` <98DB008FA2AC6644B40AD8C766FAB271014BDE376A-AxeMsvIPF9dVlT40swnHCBaHJUVzwnCM@public.gmane.org>
2014-12-23  9:30       ` Bruce Richardson
2014-12-23  9:37         ` Vithal S Mohare
     [not found]           ` <98DB008FA2AC6644B40AD8C766FAB271014BDE3921-AxeMsvIPF9dVlT40swnHCBaHJUVzwnCM@public.gmane.org>
2014-12-24  1:43             ` Zhang, Helin
2015-02-12 19:57   ` [PATCH " John McNamara
     [not found]     ` <1423771077-13665-1-git-send-email-john.mcnamara-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-02-12 19:57       ` [PATCH 1/3] ethdev: rename callbacks field to intr_cbs John McNamara
2015-02-12 19:57       ` [PATCH 2/3] ethdev: Add in data rxtx callback support John McNamara
     [not found]         ` <1423771077-13665-3-git-send-email-john.mcnamara-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-02-12 21:12           ` Neil Horman
2015-02-12 19:57       ` [PATCH 3/3] examples: example showing use of callbacks John McNamara
2015-02-13 14:54       ` [PATCH 0/3] DPDK ethdev callback support Declan Doherty
2015-02-13 15:39   ` [PATCH v2 0/4] " John McNamara
     [not found]     ` <1423841989-9090-1-git-send-email-john.mcnamara-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-02-13 15:39       ` John McNamara [this message]
     [not found]         ` <1423841989-9090-2-git-send-email-john.mcnamara-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-02-13 16:06           ` [PATCH v2 1/4] ethdev: rename callbacks field to intr_cbs Thomas Monjalon
2015-02-13 16:52             ` Thomas Monjalon
2015-02-13 15:39       ` [PATCH v2 2/4] ethdev: Add in data rxtx callback support John McNamara
     [not found]         ` <1423841989-9090-3-git-send-email-john.mcnamara-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-02-13 16:33           ` Thomas Monjalon
2015-02-13 17:49             ` Bruce Richardson
2015-02-13 15:39       ` [PATCH v2 3/4] examples: example showing use of callbacks John McNamara
     [not found]         ` <1423841989-9090-4-git-send-email-john.mcnamara-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-02-13 16:02           ` Thomas Monjalon
2015-02-16 14:33           ` Olivier MATZ
     [not found]             ` <54E1FFC4.1060605-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2015-02-16 15:16               ` Bruce Richardson
2015-02-16 17:34                 ` Thomas Monjalon
2015-02-17 12:17                   ` Declan Doherty
2015-02-17 12:25                   ` Bruce Richardson
2015-02-17 13:28                     ` Olivier MATZ
     [not found]                       ` <54E341E2.6090006-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2015-02-17 13:50                         ` Bruce Richardson
2015-02-17 15:49                           ` Neil Horman
     [not found]                             ` <20150217154924.GA6309-0o1r3XBGOEbbgkc5XkKeNuvMHUBZFtU3YPYVAmT7z5s@public.gmane.org>
2015-02-17 16:00                               ` Bruce Richardson
2015-02-17 16:08                                 ` Neil Horman
     [not found]                                   ` <20150217160809.GE6309-0o1r3XBGOEbbgkc5XkKeNuvMHUBZFtU3YPYVAmT7z5s@public.gmane.org>
2015-02-17 16:15                                     ` Bruce Richardson
2015-02-17 19:27                                       ` Neil Horman
2015-02-17 15:32                     ` Thomas Monjalon
2015-02-17 15:58                       ` Bruce Richardson
2015-02-13 15:39       ` [PATCH v2 4/4] abi: Added rxtx callback functions to ABI versioning John McNamara
     [not found]         ` <1423841989-9090-5-git-send-email-john.mcnamara-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-02-13 15:59           ` Thomas Monjalon
2015-02-13 15:48       ` [PATCH v2 0/4] DPDK ethdev callback support Declan Doherty
2015-02-18 17:42   ` [PATCH v3 0/3] " John McNamara
     [not found]     ` <1424281343-2994-1-git-send-email-john.mcnamara-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-02-18 17:42       ` [PATCH v3 1/3] ethdev: Rename callbacks field to link_intr_cbs John McNamara
2015-02-18 17:42       ` [PATCH v3 2/3] ethdev: Add rxtx callback support John McNamara
     [not found]         ` <1424281343-2994-3-git-send-email-john.mcnamara-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-02-18 18:19           ` Thomas Monjalon
2015-02-19  9:33             ` Mcnamara, John
2015-02-18 17:42       ` [PATCH v3 3/3] examples: example showing use of callbacks John McNamara
2015-02-19 17:56       ` [PATCH v4 0/3] DPDK ethdev callback support John McNamara
     [not found]         ` <1424368602-30826-1-git-send-email-john.mcnamara-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-02-19 17:56           ` [PATCH v4 1/3] ethdev: rename callbacks field to link_intr_cbs John McNamara
2015-02-19 17:56           ` [PATCH v4 2/3] ethdev: add optional rxtx callback support John McNamara
     [not found]             ` <1424368602-30826-3-git-send-email-john.mcnamara-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-02-20 10:06               ` Bruce Richardson
2015-02-20 10:31                 ` Thomas Monjalon
2015-02-19 17:56           ` [PATCH v4 3/3] examples: example showing use of callbacks John McNamara
2015-02-20 17:03       ` [PATCH v5 0/3] DPDK ethdev callback support John McNamara
     [not found]         ` <1424451827-32293-1-git-send-email-john.mcnamara-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-02-20 17:03           ` [PATCH v5 1/3] ethdev: rename callbacks field to link_intr_cbs John McNamara
2015-02-20 17:03           ` [PATCH v5 2/3] ethdev: add optional rxtx callback support John McNamara
     [not found]             ` <1424451827-32293-3-git-send-email-john.mcnamara-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-02-23 15:11               ` Thomas Monjalon
2015-02-23 17:27                 ` Mcnamara, John
2015-02-20 17:03           ` [PATCH v5 3/3] examples: example showing use of callbacks John McNamara
2015-02-23 18:30       ` [PATCH v6 0/3] DPDK ethdev callback support John McNamara
     [not found]         ` <1424716210-25773-1-git-send-email-john.mcnamara-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-02-23 18:30           ` [PATCH v6 1/3] ethdev: rename callbacks field to link_intr_cbs John McNamara
2015-02-23 18:30           ` [PATCH v6 2/3] ethdev: add optional rxtx callback support John McNamara
2015-02-23 18:30           ` [PATCH v6 3/3] examples: example showing use of callbacks John McNamara
2015-02-23 23:39           ` [PATCH v6 0/3] DPDK ethdev callback support Thomas Monjalon
2014-12-24  5:06 ` [PATCH RFC " Qiu, Michael

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1423841989-9090-2-git-send-email-john.mcnamara@intel.com \
    --to=john.mcnamara-ral2jqcrhueavxtiumwx3w@public.gmane.org \
    --cc=dev-VfR2kkLFssw@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).