Skip to content

Commit 5b39be8

Browse files
aingersonj-xiong
authored andcommitted
prov/udp: cleanup CQ parameters
Remove passing around RX CQ flags and buffer since they are not needed and always 0/NULL. UDP does not support any features that would report any additional flags and does not support FI_MULTI_RECV which is the only case where the buf field is valid. This is not a functional fix and just cleans up the code a bit Signed-off-by: Alexia Ingerson <[email protected]>
1 parent 37eb3f5 commit 5b39be8

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

prov/udp/src/udpx.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ struct udpx_ep_entry {
9191
OFI_DECLARE_CIRQUE(struct udpx_ep_entry, udpx_rx_cirq);
9292

9393
struct udpx_ep;
94-
typedef void (*udpx_rx_comp_func)(struct udpx_ep *ep, void *context,
95-
uint64_t flags, size_t len, void *buf, void *addr);
94+
typedef void (*udpx_rx_comp_func)(struct udpx_ep *ep, void *context, size_t len,
95+
void *addr);
9696
typedef void (*udpx_tx_comp_func)(struct udpx_ep *ep, void *context);
9797

9898
struct udpx_ep {

prov/udp/src/udpx_ep.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -234,41 +234,41 @@ static void udpx_tx_comp_signal(struct udpx_ep *ep, void *context)
234234
ep->util_ep.tx_cq->wait->signal(ep->util_ep.tx_cq->wait);
235235
}
236236

237-
static void udpx_rx_comp(struct udpx_ep *ep, void *context, uint64_t flags,
238-
size_t len, void *buf, void *addr)
237+
static void udpx_rx_comp(struct udpx_ep *ep, void *context, size_t len,
238+
void *addr)
239239
{
240240
struct fi_cq_tagged_entry *comp;
241241

242242
assert(!ofi_cirque_isfull(ep->util_ep.rx_cq->cirq));
243243

244244
comp = ofi_cirque_next(ep->util_ep.rx_cq->cirq);
245245
comp->op_context = context;
246-
comp->flags = FI_RECV | flags;
246+
comp->flags = FI_RECV;
247247
comp->len = len;
248-
comp->buf = buf;
248+
comp->buf = NULL;
249249
comp->data = 0;
250250
ofi_cirque_commit(ep->util_ep.rx_cq->cirq);
251251
}
252252

253-
static void udpx_rx_src_comp(struct udpx_ep *ep, void *context, uint64_t flags,
254-
size_t len, void *buf, void *addr)
253+
static void udpx_rx_src_comp(struct udpx_ep *ep, void *context, size_t len,
254+
void *addr)
255255
{
256256
ep->util_ep.rx_cq->src[ofi_cirque_windex(ep->util_ep.rx_cq->cirq)] =
257257
ofi_ip_av_get_fi_addr(ep->util_ep.av, addr);
258-
udpx_rx_comp(ep, context, flags, len, buf, addr);
258+
udpx_rx_comp(ep, context, len, addr);
259259
}
260260

261-
static void udpx_rx_comp_signal(struct udpx_ep *ep, void *context,
262-
uint64_t flags, size_t len, void *buf, void *addr)
261+
static void udpx_rx_comp_signal(struct udpx_ep *ep, void *context, size_t len,
262+
void *addr)
263263
{
264-
udpx_rx_comp(ep, context, flags, len, buf, addr);
264+
udpx_rx_comp(ep, context, len, addr);
265265
ep->util_ep.rx_cq->wait->signal(ep->util_ep.rx_cq->wait);
266266
}
267267

268268
static void udpx_rx_src_comp_signal(struct udpx_ep *ep, void *context,
269-
uint64_t flags, size_t len, void *buf, void *addr)
269+
size_t len, void *addr)
270270
{
271-
udpx_rx_src_comp(ep, context, flags, len, buf, addr);
271+
udpx_rx_src_comp(ep, context, len, addr);
272272
ep->util_ep.rx_cq->wait->signal(ep->util_ep.rx_cq->wait);
273273
}
274274

@@ -298,7 +298,7 @@ static void udpx_ep_progress(struct util_ep *util_ep)
298298

299299
ret = ofi_recvmsg_udp(ep->sock, &hdr, 0);
300300
if (ret >= 0) {
301-
ep->rx_comp(ep, entry->context, 0, ret, NULL, &addr);
301+
ep->rx_comp(ep, entry->context, ret, &addr);
302302
ofi_cirque_discard(ep->rxq);
303303
}
304304
out:

0 commit comments

Comments
 (0)