[Pkg-ofed-commits] [libfabric] 20/123: prov/sockets: Defined SOCK_EP_XXX_CAP by ORing SOCK_EP_XXX_PRI_CAP and SOCK_EP_XXX_SEC_CAP
Ana Beatriz Guerrero López
ana at moszumanska.debian.org
Sat Oct 22 12:28:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
ana pushed a commit to annotated tag v1.1.1
in repository libfabric.
commit 52810747bf3963e2d629f8ea8c3f8a3ea43f902e
Author: shantonu <shantonu.hossain at intel.com>
Date: Thu Aug 27 14:28:23 2015 -0700
prov/sockets: Defined SOCK_EP_XXX_CAP by ORing SOCK_EP_XXX_PRI_CAP and SOCK_EP_XXX_SEC_CAP
Signed-off-by: Shantonu Hossain <shantonu.hossain at intel.com>
---
prov/sockets/src/sock.h | 6 ++++++
prov/sockets/src/sock_ep.c | 4 ++--
prov/sockets/src/sock_ep_dgram.c | 10 +++++-----
prov/sockets/src/sock_ep_msg.c | 10 +++++-----
prov/sockets/src/sock_ep_rdm.c | 10 +++++-----
prov/sockets/src/sock_fabric.c | 6 +++---
6 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/prov/sockets/src/sock.h b/prov/sockets/src/sock.h
index 3c039b8..fe23ffa 100644
--- a/prov/sockets/src/sock.h
+++ b/prov/sockets/src/sock.h
@@ -107,10 +107,14 @@
FI_RMA_EVENT | \
FI_FENCE | FI_TRIGGER)
+#define SOCK_EP_RDM_CAP (SOCK_EP_RDM_PRI_CAP | SOCK_EP_RDM_SEC_CAP)
+
#define SOCK_EP_MSG_PRI_CAP SOCK_EP_RDM_PRI_CAP
#define SOCK_EP_MSG_SEC_CAP SOCK_EP_RDM_SEC_CAP
+#define SOCK_EP_MSG_CAP (SOCK_EP_MSG_PRI_CAP | SOCK_EP_MSG_SEC_CAP)
+
#define SOCK_EP_DGRAM_PRI_CAP (FI_MSG | FI_TAGGED | \
FI_NAMED_RX_CTX | FI_DIRECTED_RECV | \
FI_RECV | FI_SEND)
@@ -119,6 +123,8 @@
FI_SOURCE | \
FI_FENCE | FI_TRIGGER)
+#define SOCK_EP_DGRAM_CAP (SOCK_EP_DGRAM_PRI_CAP | SOCK_EP_DGRAM_SEC_CAP)
+
#define SOCK_EP_MSG_ORDER (FI_ORDER_RAR | FI_ORDER_RAW | FI_ORDER_RAS| \
FI_ORDER_WAR | FI_ORDER_WAW | FI_ORDER_WAS | \
FI_ORDER_SAR | FI_ORDER_SAW | FI_ORDER_SAS)
diff --git a/prov/sockets/src/sock_ep.c b/prov/sockets/src/sock_ep.c
index e3e01d8..0968eca 100644
--- a/prov/sockets/src/sock_ep.c
+++ b/prov/sockets/src/sock_ep.c
@@ -61,7 +61,7 @@ extern const struct fi_domain_attr sock_domain_attr;
extern const struct fi_fabric_attr sock_fabric_attr;
const struct fi_tx_attr sock_stx_attr = {
- .caps = SOCK_EP_RDM_PRI_CAP | SOCK_EP_RDM_SEC_CAP,
+ .caps = SOCK_EP_RDM_CAP,
.mode = SOCK_MODE,
.op_flags = FI_TRANSMIT_COMPLETE,
.msg_order = SOCK_EP_MSG_ORDER,
@@ -72,7 +72,7 @@ const struct fi_tx_attr sock_stx_attr = {
};
const struct fi_rx_attr sock_srx_attr = {
- .caps = SOCK_EP_RDM_PRI_CAP | SOCK_EP_RDM_SEC_CAP,
+ .caps = SOCK_EP_RDM_CAP,
.mode = SOCK_MODE,
.op_flags = 0,
.msg_order = SOCK_EP_MSG_ORDER,
diff --git a/prov/sockets/src/sock_ep_dgram.c b/prov/sockets/src/sock_ep_dgram.c
index 8151124..8a628e1 100644
--- a/prov/sockets/src/sock_ep_dgram.c
+++ b/prov/sockets/src/sock_ep_dgram.c
@@ -73,7 +73,7 @@ const struct fi_ep_attr sock_dgram_ep_attr = {
};
const struct fi_tx_attr sock_dgram_tx_attr = {
- .caps = SOCK_EP_DGRAM_PRI_CAP | SOCK_EP_DGRAM_SEC_CAP,
+ .caps = SOCK_EP_DGRAM_CAP,
.mode = SOCK_MODE,
.op_flags = SOCK_EP_DEFAULT_OP_FLAGS,
.msg_order = SOCK_EP_MSG_ORDER,
@@ -84,7 +84,7 @@ const struct fi_tx_attr sock_dgram_tx_attr = {
};
const struct fi_rx_attr sock_dgram_rx_attr = {
- .caps = SOCK_EP_DGRAM_PRI_CAP | SOCK_EP_DGRAM_SEC_CAP,
+ .caps = SOCK_EP_DGRAM_CAP,
.mode = SOCK_MODE,
.op_flags = 0,
.msg_order = SOCK_EP_MSG_ORDER,
@@ -99,7 +99,7 @@ static int sock_dgram_verify_rx_attr(const struct fi_rx_attr *attr)
if (!attr)
return 0;
- if ((attr->caps | SOCK_EP_DGRAM_PRI_CAP | SOCK_EP_DGRAM_SEC_CAP) != (SOCK_EP_DGRAM_PRI_CAP | SOCK_EP_DGRAM_SEC_CAP))
+ if ((attr->caps | SOCK_EP_DGRAM_CAP) != SOCK_EP_DGRAM_CAP)
return -FI_ENODATA;
if ((attr->msg_order | SOCK_EP_MSG_ORDER) != SOCK_EP_MSG_ORDER)
@@ -125,7 +125,7 @@ static int sock_dgram_verify_tx_attr(const struct fi_tx_attr *attr)
if (!attr)
return 0;
- if ((attr->caps | SOCK_EP_DGRAM_PRI_CAP | SOCK_EP_DGRAM_SEC_CAP) != (SOCK_EP_DGRAM_PRI_CAP | SOCK_EP_DGRAM_SEC_CAP))
+ if ((attr->caps | SOCK_EP_DGRAM_CAP) != SOCK_EP_DGRAM_CAP)
return -FI_ENODATA;
if ((attr->msg_order | SOCK_EP_MSG_ORDER) != SOCK_EP_MSG_ORDER)
@@ -225,7 +225,7 @@ int sock_dgram_fi_info(void *src_addr, void *dest_addr, struct fi_info *hints,
(*info)->tx_attr->caps = SOCK_EP_DGRAM_SEC_CAP | hints->tx_attr->caps;
}
- (*info)->caps = SOCK_EP_DGRAM_PRI_CAP | SOCK_EP_DGRAM_SEC_CAP |
+ (*info)->caps = SOCK_EP_DGRAM_CAP |
(*info)->rx_attr->caps | (*info)->tx_attr->caps;
if (hints->caps)
(*info)->caps = SOCK_EP_DGRAM_SEC_CAP | hints->caps;
diff --git a/prov/sockets/src/sock_ep_msg.c b/prov/sockets/src/sock_ep_msg.c
index 6c2c751..25a19e3 100644
--- a/prov/sockets/src/sock_ep_msg.c
+++ b/prov/sockets/src/sock_ep_msg.c
@@ -75,7 +75,7 @@ static const struct fi_ep_attr sock_msg_ep_attr = {
};
static const struct fi_tx_attr sock_msg_tx_attr = {
- .caps = SOCK_EP_MSG_PRI_CAP | SOCK_EP_MSG_SEC_CAP,
+ .caps = SOCK_EP_MSG_CAP,
.mode = SOCK_MODE,
.op_flags = SOCK_EP_DEFAULT_OP_FLAGS,
.msg_order = SOCK_EP_MSG_ORDER,
@@ -86,7 +86,7 @@ static const struct fi_tx_attr sock_msg_tx_attr = {
};
static const struct fi_rx_attr sock_msg_rx_attr = {
- .caps = SOCK_EP_MSG_PRI_CAP | SOCK_EP_MSG_SEC_CAP,
+ .caps = SOCK_EP_MSG_CAP,
.mode = SOCK_MODE,
.op_flags = 0,
.msg_order = SOCK_EP_MSG_ORDER,
@@ -101,7 +101,7 @@ static int sock_msg_verify_rx_attr(const struct fi_rx_attr *attr)
if (!attr)
return 0;
- if ((attr->caps | SOCK_EP_MSG_PRI_CAP | SOCK_EP_MSG_SEC_CAP) != (SOCK_EP_MSG_PRI_CAP | SOCK_EP_MSG_SEC_CAP))
+ if ((attr->caps | SOCK_EP_MSG_CAP) != SOCK_EP_MSG_CAP)
return -FI_ENODATA;
if ((attr->msg_order | SOCK_EP_MSG_ORDER) != SOCK_EP_MSG_ORDER)
@@ -127,7 +127,7 @@ static int sock_msg_verify_tx_attr(const struct fi_tx_attr *attr)
if (!attr)
return 0;
- if ((attr->caps | SOCK_EP_MSG_PRI_CAP | SOCK_EP_MSG_SEC_CAP) != (SOCK_EP_MSG_PRI_CAP | SOCK_EP_MSG_SEC_CAP))
+ if ((attr->caps | SOCK_EP_MSG_CAP) != SOCK_EP_MSG_CAP)
return -FI_ENODATA;
if ((attr->msg_order | SOCK_EP_MSG_ORDER) != SOCK_EP_MSG_ORDER)
@@ -227,7 +227,7 @@ int sock_msg_fi_info(void *src_addr, void *dest_addr, struct fi_info *hints,
(*info)->tx_attr->caps = SOCK_EP_MSG_SEC_CAP | hints->tx_attr->caps;
}
- (*info)->caps = SOCK_EP_MSG_PRI_CAP | SOCK_EP_MSG_SEC_CAP |
+ (*info)->caps = SOCK_EP_MSG_CAP |
(*info)->rx_attr->caps | (*info)->tx_attr->caps;
if (hints->caps)
(*info)->caps = SOCK_EP_MSG_SEC_CAP | hints->caps;
diff --git a/prov/sockets/src/sock_ep_rdm.c b/prov/sockets/src/sock_ep_rdm.c
index cd7c07a..40a22d0 100644
--- a/prov/sockets/src/sock_ep_rdm.c
+++ b/prov/sockets/src/sock_ep_rdm.c
@@ -74,7 +74,7 @@ const struct fi_ep_attr sock_rdm_ep_attr = {
};
const struct fi_tx_attr sock_rdm_tx_attr = {
- .caps = SOCK_EP_RDM_PRI_CAP | SOCK_EP_RDM_SEC_CAP,
+ .caps = SOCK_EP_RDM_CAP,
.mode = SOCK_MODE,
.op_flags = SOCK_EP_DEFAULT_OP_FLAGS,
.msg_order = SOCK_EP_MSG_ORDER,
@@ -85,7 +85,7 @@ const struct fi_tx_attr sock_rdm_tx_attr = {
};
const struct fi_rx_attr sock_rdm_rx_attr = {
- .caps = SOCK_EP_RDM_PRI_CAP | SOCK_EP_RDM_SEC_CAP,
+ .caps = SOCK_EP_RDM_CAP,
.mode = SOCK_MODE,
.op_flags = 0,
.msg_order = SOCK_EP_MSG_ORDER,
@@ -100,7 +100,7 @@ static int sock_rdm_verify_rx_attr(const struct fi_rx_attr *attr)
if (!attr)
return 0;
- if ((attr->caps | SOCK_EP_RDM_PRI_CAP | SOCK_EP_RDM_SEC_CAP) != (SOCK_EP_RDM_PRI_CAP | SOCK_EP_RDM_SEC_CAP)) {
+ if ((attr->caps | SOCK_EP_RDM_CAP) != SOCK_EP_RDM_CAP) {
SOCK_LOG_DBG("Unsupported RDM rx caps\n");
return -FI_ENODATA;
}
@@ -138,7 +138,7 @@ static int sock_rdm_verify_tx_attr(const struct fi_tx_attr *attr)
if (!attr)
return 0;
- if ((attr->caps | SOCK_EP_RDM_PRI_CAP | SOCK_EP_RDM_SEC_CAP) != (SOCK_EP_RDM_PRI_CAP | SOCK_EP_RDM_SEC_CAP)) {
+ if ((attr->caps | SOCK_EP_RDM_CAP) != SOCK_EP_RDM_CAP) {
SOCK_LOG_DBG("Unsupported RDM tx caps\n");
return -FI_ENODATA;
}
@@ -270,7 +270,7 @@ int sock_rdm_fi_info(void *src_addr, void *dest_addr, struct fi_info *hints,
(*info)->tx_attr->caps = SOCK_EP_RDM_SEC_CAP | hints->tx_attr->caps;
}
- (*info)->caps = SOCK_EP_RDM_PRI_CAP | SOCK_EP_RDM_SEC_CAP |
+ (*info)->caps = SOCK_EP_RDM_CAP |
(*info)->rx_attr->caps | (*info)->tx_attr->caps;
if (hints->caps)
(*info)->caps = SOCK_EP_RDM_SEC_CAP | hints->caps;
diff --git a/prov/sockets/src/sock_fabric.c b/prov/sockets/src/sock_fabric.c
index 7726f38..f12d663 100644
--- a/prov/sockets/src/sock_fabric.c
+++ b/prov/sockets/src/sock_fabric.c
@@ -208,19 +208,19 @@ int sock_verify_info(struct fi_info *hints)
switch (ep_type) {
case FI_EP_UNSPEC:
case FI_EP_MSG:
- caps = SOCK_EP_MSG_PRI_CAP | SOCK_EP_MSG_SEC_CAP;
+ caps = SOCK_EP_MSG_CAP;
ret = sock_msg_verify_ep_attr(hints->ep_attr,
hints->tx_attr,
hints->rx_attr);
break;
case FI_EP_DGRAM:
- caps = SOCK_EP_DGRAM_PRI_CAP | SOCK_EP_DGRAM_SEC_CAP;
+ caps = SOCK_EP_DGRAM_CAP;
ret = sock_dgram_verify_ep_attr(hints->ep_attr,
hints->tx_attr,
hints->rx_attr);
break;
case FI_EP_RDM:
- caps = SOCK_EP_RDM_PRI_CAP | SOCK_EP_RDM_SEC_CAP;
+ caps = SOCK_EP_RDM_CAP;
ret = sock_rdm_verify_ep_attr(hints->ep_attr,
hints->tx_attr,
hints->rx_attr);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/libfabric.git
More information about the Pkg-ofed-commits
mailing list