[Pkg-ofed-commits] [libfabric] 90/123: prov/sockets: return initial values for cswap_* operations
Ana Beatriz Guerrero López
ana at moszumanska.debian.org
Sat Oct 22 12:28:33 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 516152f2c3c5c5b74fdb35e07b9524c13b9668bb
Author: Jithin Jose <jithin.jose at intel.com>
Date: Tue Sep 22 09:17:36 2015 -0700
prov/sockets: return initial values for cswap_* operations
Signed-off-by: Sergey Oblomov <sergey.oblomov at intel.com>
Signed-off-by: Jithin Jose <jithin.jose at intel.com>
Conflicts:
prov/sockets/src/sock_progress.c
---
prov/sockets/src/sock_progress.c | 46 ++++++++++++++++++++--------------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/prov/sockets/src/sock_progress.c b/prov/sockets/src/sock_progress.c
index a2a6a29..8dcc2a7 100644
--- a/prov/sockets/src/sock_progress.c
+++ b/prov/sockets/src/sock_progress.c
@@ -800,38 +800,38 @@ out:
break; \
\
case FI_CSWAP_NE: \
+ _tmp = *_dst; \
if (*_cmp != *_dst) \
*_dst = *_src; \
- else \
- *_cmp = *_dst; \
+ *_cmp = _tmp; \
break; \
\
case FI_CSWAP_LE: \
+ _tmp = *_dst; \
if (*_cmp <= *_dst) \
*_dst = *_src; \
- else \
- *_cmp = *_dst; \
+ *_cmp = _tmp; \
break; \
\
case FI_CSWAP_LT: \
+ _tmp = *_dst; \
if (*_cmp < *_dst) \
*_dst = *_src; \
- else \
- *_cmp = *_dst; \
+ *_cmp = _tmp; \
break; \
\
case FI_CSWAP_GE: \
+ _tmp = *_dst; \
if (*_cmp >= *_dst) \
*_dst = *_src; \
- else \
- *_cmp = *_dst; \
+ *_cmp = _tmp; \
break; \
\
case FI_CSWAP_GT: \
+ _tmp = *_dst; \
if (*_cmp > *_dst) \
*_dst = *_src; \
- else \
- *_cmp = *_dst; \
+ *_cmp = _tmp; \
break; \
\
case FI_MSWAP: \
@@ -898,38 +898,38 @@ out:
break; \
\
case FI_CSWAP_NE: \
+ _tmp = *_dst; \
if (*_cmp != *_dst) \
*_dst = *_src; \
- else \
- *_cmp = *_dst; \
+ *_cmp = _tmp; \
break; \
\
case FI_CSWAP_LE: \
+ _tmp = *_dst; \
if (*_cmp <= *_dst) \
*_dst = *_src; \
- else \
- *_cmp = *_dst; \
+ *_cmp = _tmp; \
break; \
\
case FI_CSWAP_LT: \
+ _tmp = *_dst; \
if (*_cmp < *_dst) \
*_dst = *_src; \
- else \
- *_cmp = *_dst; \
+ *_cmp = _tmp; \
break; \
\
case FI_CSWAP_GE: \
+ _tmp = *_dst; \
if (*_cmp >= *_dst) \
*_dst = *_src; \
- else \
- *_cmp = *_dst; \
+ *_cmp = _tmp; \
break; \
\
case FI_CSWAP_GT: \
+ _tmp = *_dst; \
if (*_cmp > *_dst) \
*_dst = *_src; \
- else \
- *_cmp = *_dst; \
+ *_cmp = _tmp; \
break; \
\
default: \
@@ -1009,7 +1009,7 @@ static int sock_pe_update_atomic(void *cmp, void *dst, void *src,
case FI_FLOAT:
{
- float *_cmp, *_dst, *_src;
+ float *_cmp, *_dst, *_src, _tmp;
_cmp = cmp, _src = src, _dst = dst;
SOCK_ATOMIC_UPDATE_FLOAT(_cmp, _src, _dst);
break;
@@ -1017,7 +1017,7 @@ static int sock_pe_update_atomic(void *cmp, void *dst, void *src,
case FI_DOUBLE:
{
- double *_cmp, *_dst, *_src;
+ double *_cmp, *_dst, *_src, _tmp;
_cmp = cmp, _src = src, _dst = dst;
SOCK_ATOMIC_UPDATE_FLOAT(_cmp, _src, _dst);
break;
@@ -1025,7 +1025,7 @@ static int sock_pe_update_atomic(void *cmp, void *dst, void *src,
case FI_LONG_DOUBLE:
{
- long double *_cmp, *_dst, *_src;
+ long double *_cmp, *_dst, *_src, _tmp;
_cmp = cmp, _src = src, _dst = dst;
SOCK_ATOMIC_UPDATE_FLOAT(_cmp, _src, _dst);
break;
--
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