prov/efa: Migrate efa_dgram_ep to efa_ep

Migrate dgram/efa_dgram_ep.c to efa_ep.c as a common ep interface for both dgram and rdm ep type. dgram repo now has nothing and is removed. Signed-off-by: Shi Jin <[email protected]>
shijin-aws · Jan 16, 2025 · efbf69f · efbf69f
1 parent 091b20b
commit efbf69f
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 92 deletions.
diff --git a/prov/efa/Makefile.include b/prov/efa/Makefile.include
@@ -50,7 +50,7 @@ _efa_files = \
 	prov/efa/src/efa_msg.c \
 	prov/efa/src/efa_rma.c \
 	prov/efa/src/efa_cq.c \
-	prov/efa/src/dgram/efa_dgram_ep.c \
+	prov/efa/src/efa_ep.c \
 	prov/efa/src/rdm/efa_rdm_peer.c	\
 	prov/efa/src/rdm/efa_rdm_cq.c \
 	prov/efa/src/rdm/efa_rdm_ep_utils.c \
@@ -94,7 +94,6 @@ _efa_headers = \
 	prov/efa/src/efa_prov.h \
 	prov/efa/src/efa_env.h \
 	prov/efa/src/fi_ext_efa.h \
-	prov/efa/src/dgram/efa_dgram_ep.h \
 	prov/efa/src/rdm/efa_rdm_peer.h	\
 	prov/efa/src/rdm/efa_rdm_cq.h \
 	prov/efa/src/rdm/efa_rdm_ep.h \
@@ -187,7 +186,6 @@ endif ENABLE_EFA_UNIT_TEST
 
 efa_CPPFLAGS += \
 	-I$(top_srcdir)/prov/efa/src/ \
-	-I$(top_srcdir)/prov/efa/src/dgram/ \
 	-I$(top_srcdir)/prov/efa/src/rdm/
 
 rdmainclude_HEADERS += \

diff --git a/prov/efa/src/dgram/efa_dgram_ep.h b/prov/efa/src/dgram/efa_dgram_ep.h
diff --git a/prov/efa/src/efa_base_ep.h b/prov/efa/src/efa_base_ep.h
@@ -82,6 +82,9 @@ int efa_base_ep_construct(struct efa_base_ep *base_ep,
 
 int efa_base_ep_getname(fid_t fid, void *addr, size_t *addrlen);
 
+int efa_ep_open(struct fid_domain *domain_fid, struct fi_info *user_info,
+		struct fid_ep **ep_fid, void *context);
+
 int efa_qp_create(struct efa_qp **qp, struct ibv_qp_init_attr_ex *init_attr_ex, uint32_t tclass);
 
 void efa_qp_destruct(struct efa_qp *qp);

diff --git a/prov/efa/src/efa_cq.c b/prov/efa/src/efa_cq.c
@@ -6,7 +6,6 @@
 #include <string.h>
 #include "config.h"
 #include <ofi_mem.h>
-#include "dgram/efa_dgram_ep.h"
 #include "efa.h"
 #include "efa_av.h"
 #include "efa_cntr.h"

diff --git a/prov/efa/src/efa_domain.c b/prov/efa/src/efa_domain.c
@@ -11,7 +11,6 @@
 #include "efa_cntr.h"
 #include "rdm/efa_rdm_cq.h"
 #include "rdm/efa_rdm_atomic.h"
-#include "dgram/efa_dgram_ep.h"
 
 
 struct dlist_entry g_efa_domain_list;
@@ -33,7 +32,7 @@ static struct fi_ops_domain efa_ops_domain_dgram = {
 	.size = sizeof(struct fi_ops_domain),
 	.av_open = efa_av_open,
 	.cq_open = efa_cq_open,
-	.endpoint = efa_dgram_ep_open,
+	.endpoint = efa_ep_open,
 	.scalable_ep = fi_no_scalable_ep,
 	.cntr_open = efa_cntr_open,
 	.poll_open = fi_no_poll_open,