summaryrefslogtreecommitdiff
path: root/lib/librte_distributor
diff options
context:
space:
mode:
authorBruce Richardson <bruce.richardson@intel.com>2014-06-19 22:12:35 +0100
committerThomas Monjalon <thomas.monjalon@6wind.com>2014-06-20 17:41:18 +0200
commit5058a6e3f9af5f8841466e367ecfb9d8aa93a6e0 (patch)
treedd92c22645479bcf4e734cd7532523b2e455fa02 /lib/librte_distributor
parent2b12431b5369ca06d43ea4e62856f6d023a0ef09 (diff)
downloaddpdk-next-eventdev-5058a6e3f9af5f8841466e367ecfb9d8aa93a6e0.zip
dpdk-next-eventdev-5058a6e3f9af5f8841466e367ecfb9d8aa93a6e0.tar.gz
dpdk-next-eventdev-5058a6e3f9af5f8841466e367ecfb9d8aa93a6e0.tar.xz
distributor: split get_pkt into request and poll
Take the existing get_pkt API and split out the parts for requesting a new packet from the part to poll for arrival of a new packet. These individual functions can then be used independently of the get function, which still acts as before. The split functions for request and poll will allow a worker to pull packets from multiple distributors, or to act as multiple workers with a single distributor if needed for better performance. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Diffstat (limited to 'lib/librte_distributor')
-rw-r--r--lib/librte_distributor/rte_distributor.c27
-rw-r--r--lib/librte_distributor/rte_distributor.h44
2 files changed, 66 insertions, 5 deletions
diff --git a/lib/librte_distributor/rte_distributor.c b/lib/librte_distributor/rte_distributor.c
index 5eee442..ec6094f 100644
--- a/lib/librte_distributor/rte_distributor.c
+++ b/lib/librte_distributor/rte_distributor.c
@@ -103,8 +103,8 @@ TAILQ_HEAD(rte_distributor_list, rte_distributor);
/**** APIs called by workers ****/
-struct rte_mbuf *
-rte_distributor_get_pkt(struct rte_distributor *d,
+void
+rte_distributor_request_pkt(struct rte_distributor *d,
unsigned worker_id, struct rte_mbuf *oldpkt)
{
union rte_distributor_buffer *buf = &d->bufs[worker_id];
@@ -113,13 +113,32 @@ rte_distributor_get_pkt(struct rte_distributor *d,
while (unlikely(buf->bufptr64 & RTE_DISTRIB_FLAGS_MASK))
rte_pause();
buf->bufptr64 = req;
- while (buf->bufptr64 & RTE_DISTRIB_GET_BUF)
- rte_pause();
+}
+
+struct rte_mbuf *
+rte_distributor_poll_pkt(struct rte_distributor *d,
+ unsigned worker_id)
+{
+ union rte_distributor_buffer *buf = &d->bufs[worker_id];
+ if (buf->bufptr64 & RTE_DISTRIB_GET_BUF)
+ return NULL;
+
/* since bufptr64 is signed, this should be an arithmetic shift */
int64_t ret = buf->bufptr64 >> RTE_DISTRIB_FLAG_BITS;
return (struct rte_mbuf *)((uintptr_t)ret);
}
+struct rte_mbuf *
+rte_distributor_get_pkt(struct rte_distributor *d,
+ unsigned worker_id, struct rte_mbuf *oldpkt)
+{
+ struct rte_mbuf *ret;
+ rte_distributor_request_pkt(d, worker_id, oldpkt);
+ while ((ret = rte_distributor_poll_pkt(d, worker_id)) == NULL)
+ rte_pause();
+ return ret;
+}
+
int
rte_distributor_return_pkt(struct rte_distributor *d,
unsigned worker_id, struct rte_mbuf *oldpkt)
diff --git a/lib/librte_distributor/rte_distributor.h b/lib/librte_distributor/rte_distributor.h
index 1e41dce..ec0d74a 100644
--- a/lib/librte_distributor/rte_distributor.h
+++ b/lib/librte_distributor/rte_distributor.h
@@ -193,7 +193,49 @@ int
rte_distributor_return_pkt(struct rte_distributor *d, unsigned worker_id,
struct rte_mbuf *mbuf);
-/******************************************/
+/**
+ * API called by a worker to request a new packet to process.
+ * Any previous packet given to the worker is assumed to have completed
+ * processing, and may be optionally returned to the distributor via
+ * the oldpkt parameter.
+ * Unlike rte_distributor_get_pkt(), this function does not wait for a new
+ * packet to be provided by the distributor.
+ *
+ * NOTE: after calling this function, rte_distributor_poll_pkt() should
+ * be used to poll for the packet requested. The rte_distributor_get_pkt()
+ * API should *not* be used to try and retrieve the new packet.
+ *
+ * @param d
+ * The distributor instance to be used
+ * @param worker_id
+ * The worker instance number to use - must be less that num_workers passed
+ * at distributor creation time.
+ * @param oldpkt
+ * The previous packet, if any, being processed by the worker
+ */
+void
+rte_distributor_request_pkt(struct rte_distributor *d,
+ unsigned worker_id, struct rte_mbuf *oldpkt);
+
+/**
+ * API called by a worker to check for a new packet that was previously
+ * requested by a call to rte_distributor_request_pkt(). It does not wait
+ * for the new packet to be available, but returns NULL if the request has
+ * not yet been fulfilled by the distributor.
+ *
+ * @param d
+ * The distributor instance to be used
+ * @param worker_id
+ * The worker instance number to use - must be less that num_workers passed
+ * at distributor creation time.
+ *
+ * @return
+ * A new packet to be processed by the worker thread, or NULL if no
+ * packet is yet available.
+ */
+struct rte_mbuf *
+rte_distributor_poll_pkt(struct rte_distributor *d,
+ unsigned worker_id);
#ifdef __cplusplus
}