Hello community,
here is the log from the commit of package fabtests for openSUSE:Factory
checked in at 2017-12-31 01:13:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fabtests (Old)
and /work/SRC/openSUSE:Factory/.fabtests.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fabtests"
Sun Dec 31 01:13:08 2017 rev:7 rq:559255 version:1.5.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/fabtests/fabtests.changes 2017-11-24
10:53:43.937902981 +0100
+++ /work/SRC/openSUSE:Factory/.fabtests.new/fabtests.changes 2017-12-31
01:13:15.256404104 +0100
@@ -1,0 +2,6 @@
+Wed Dec 20 08:55:18 UTC 2017 - nmoreychaisemar...@suse.com
+
+- Update to version 1.5.3
+ * No release notes available
+
+-------------------------------------------------------------------
Old:
----
fabtests-1.5.2.0.ed3448c.tar.bz2
New:
----
fabtests-1.5.3.0.14a683c40239.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fabtests.spec ++++++
--- /var/tmp/diff_new_pack.lZnXZK/_old 2017-12-31 01:13:15.952171972 +0100
+++ /var/tmp/diff_new_pack.lZnXZK/_new 2017-12-31 01:13:15.956170638 +0100
@@ -16,10 +16,10 @@
#
-%define git_ver .0.ed3448c
+%define git_ver .0.14a683c40239
Name: fabtests
-Version: 1.5.2
+Version: 1.5.3
Release: 0
Summary: Test suite for libfabric API
License: BSD-2-Clause or GPL-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.lZnXZK/_old 2017-12-31 01:13:15.992158631 +0100
+++ /var/tmp/diff_new_pack.lZnXZK/_new 2017-12-31 01:13:15.992158631 +0100
@@ -8,7 +8,7 @@
<param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.%h</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="versionrewrite-replacement">\1</param>
- <param name="revision">ed3448c2a71fd68d6999bdc872ec2aeb061e8d1a</param>
+ <param name="revision">14a683c40239650a6c3cdd95a979801e1908941b</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">fabtests*.tar</param>
++++++ fabtests-1.5.2.0.ed3448c.tar.bz2 ->
fabtests-1.5.3.0.14a683c40239.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/.appveyor.yml
new/fabtests-1.5.3.0.14a683c40239/.appveyor.yml
--- old/fabtests-1.5.2.0.ed3448c/.appveyor.yml 2017-11-08 22:48:45.000000000
+0100
+++ new/fabtests-1.5.3.0.14a683c40239/.appveyor.yml 2017-12-19
14:02:59.000000000 +0100
@@ -11,6 +11,7 @@
- cd ..
- git clone https://github.com/ofiwg/libfabric
- cd libfabric
+ - git checkout -b v1.5.x origin/v1.5.x
- ps: .appveyor.ps1 -Verbose
- msbuild libfabric.sln
- set PATH=%CD%\x64\%CONFIGURATION%;%PATH%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/benchmarks/dgram_pingpong.c
new/fabtests-1.5.3.0.14a683c40239/benchmarks/dgram_pingpong.c
--- old/fabtests-1.5.2.0.ed3448c/benchmarks/dgram_pingpong.c 2017-11-08
22:48:45.000000000 +0100
+++ new/fabtests-1.5.3.0.14a683c40239/benchmarks/dgram_pingpong.c
2017-12-19 14:02:59.000000000 +0100
@@ -52,7 +52,7 @@
/* Post an extra receive to avoid lacking a posted receive in the
* finalize.
*/
- ret = fi_recv(ep, rx_buf, rx_size + ft_rx_prefix_size(), fi_mr_desc(mr),
+ ret = fi_recv(ep, rx_buf, rx_size + ft_rx_prefix_size(), mr_desc,
0, &rx_ctx);
if (!(opts.options & FT_OPT_SIZE)) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/common/shared.c
new/fabtests-1.5.3.0.14a683c40239/common/shared.c
--- old/fabtests-1.5.2.0.ed3448c/common/shared.c 2017-11-08
22:48:45.000000000 +0100
+++ new/fabtests-1.5.3.0.14a683c40239/common/shared.c 2017-12-19
14:02:59.000000000 +0100
@@ -59,6 +59,7 @@
struct fid_cq *txcq, *rxcq;
struct fid_cntr *txcntr, *rxcntr;
struct fid_mr *mr;
+void *mr_desc = NULL;
struct fid_av *av;
struct fid_eq *eq;
struct fid_mc *mc;
@@ -160,13 +161,13 @@
return ret;
}
-size_t ft_tx_prefix_size()
+size_t ft_tx_prefix_size(void)
{
return (fi->tx_attr->mode & FI_MSG_PREFIX) ?
fi->ep_attr->msg_prefix_size : 0;
}
-size_t ft_rx_prefix_size()
+size_t ft_rx_prefix_size(void)
{
return (fi->rx_attr->mode & FI_MSG_PREFIX) ?
fi->ep_attr->msg_prefix_size : 0;
@@ -225,7 +226,7 @@
return fi_cntr_open(domain, &cntr_attr, cntr, cntr);
}
-int ft_rma_read_target_allowed(uint64_t caps)
+static inline int ft_rma_read_target_allowed(uint64_t caps)
{
if (caps & (FI_RMA | FI_ATOMIC)) {
if (caps & FI_REMOTE_READ)
@@ -235,7 +236,7 @@
return 0;
}
-int ft_rma_write_target_allowed(uint64_t caps)
+static inline int ft_rma_write_target_allowed(uint64_t caps)
{
if (caps & (FI_RMA | FI_ATOMIC)) {
if (caps & FI_REMOTE_WRITE)
@@ -245,10 +246,16 @@
return 0;
}
+static inline int ft_check_mr_local_flag(struct fi_info *info)
+{
+ return ((info->mode & FI_LOCAL_MR) ||
+ (info->domain_attr->mr_mode & FI_MR_LOCAL));
+}
+
uint64_t ft_info_to_mr_access(struct fi_info *info)
{
uint64_t mr_access = 0;
- if ((info->mode & FI_LOCAL_MR) || (info->domain_attr->mr_mode &
FI_MR_LOCAL)) {
+ if (ft_check_mr_local_flag(info)) {
if (info->caps & (FI_MSG | FI_TAGGED)) {
if (info->caps & FT_MSG_MR_ACCESS) {
mr_access |= info->caps & FT_MSG_MR_ACCESS;
@@ -395,6 +402,7 @@
FT_PRINTERR("fi_mr_reg", ret);
return ret;
}
+ mr_desc = ft_check_mr_local_flag(fi) ? fi_mr_desc(mr) : NULL;
} else {
if (ft_mr_alloc_func) {
ret = ft_mr_alloc_func();
@@ -799,7 +807,8 @@
struct fid_cq *rxcq, struct fid_cntr *txcntr,
struct fid_cntr *rxcntr, bool post_initial_recv)
{
- int flags, ret;
+ uint64_t flags;
+ int ret;
if (fi->ep_attr->type == FI_EP_MSG || fi->caps & FI_MULTICAST)
FT_EP_BIND(ep, eq, 0);
@@ -1358,13 +1367,14 @@
ssize_t ft_post_tx(struct fid_ep *ep, fi_addr_t fi_addr, size_t size, struct
fi_context* ctx)
{
+
if (hints->caps & FI_TAGGED) {
FT_POST(fi_tsend, ft_get_tx_comp, tx_seq, "transmit", ep,
- tx_buf, size + ft_tx_prefix_size(),
fi_mr_desc(mr),
+ tx_buf, size + ft_tx_prefix_size(), mr_desc,
fi_addr, ft_tag ? ft_tag : tx_seq, ctx);
} else {
FT_POST(fi_send, ft_get_tx_comp, tx_seq, "transmit", ep,
- tx_buf, size + ft_tx_prefix_size(),
fi_mr_desc(mr),
+ tx_buf, size + ft_tx_prefix_size(), mr_desc,
fi_addr, ctx);
}
return 0;
@@ -1421,19 +1431,18 @@
switch (op) {
case FT_RMA_WRITE:
FT_POST(fi_write, ft_get_tx_comp, tx_seq, "fi_write", ep,
tx_buf,
- opts.transfer_size, fi_mr_desc(mr),
remote_fi_addr,
- remote->addr, remote->key, context);
+ opts.transfer_size, mr_desc, remote_fi_addr,
remote->addr,
+ remote->key, context);
break;
case FT_RMA_WRITEDATA:
FT_POST(fi_writedata, ft_get_tx_comp, tx_seq, "fi_writedata",
ep,
- tx_buf, opts.transfer_size, fi_mr_desc(mr),
- remote_cq_data, remote_fi_addr, remote->addr,
- remote->key, context);
+ tx_buf, opts.transfer_size, mr_desc, remote_cq_data,
remote_fi_addr,
+ remote->addr, remote->key, context);
break;
case FT_RMA_READ:
FT_POST(fi_read, ft_get_tx_comp, tx_seq, "fi_read", ep, rx_buf,
- opts.transfer_size, fi_mr_desc(mr),
remote_fi_addr,
- remote->addr, remote->key, context);
+ opts.transfer_size, mr_desc, remote_fi_addr,
remote->addr,
+ remote->key, context);
break;
default:
FT_ERR("Unknown RMA op type\n");
@@ -1558,11 +1567,11 @@
if (hints->caps & FI_TAGGED) {
FT_POST(fi_trecv, ft_get_rx_comp, rx_seq, "receive", ep, rx_buf,
MAX(size, FT_MAX_CTRL_MSG) +
ft_rx_prefix_size(),
- fi_mr_desc(mr), 0, ft_tag ? ft_tag : rx_seq, 0,
ctx);
+ mr_desc, 0, ft_tag ? ft_tag : rx_seq, 0, ctx);
} else {
FT_POST(fi_recv, ft_get_rx_comp, rx_seq, "receive", ep, rx_buf,
MAX(size, FT_MAX_CTRL_MSG) +
ft_rx_prefix_size(),
- fi_mr_desc(mr), 0, ctx);
+ mr_desc, 0, ctx);
}
return 0;
}
@@ -1787,7 +1796,7 @@
}
}
-int ft_sync()
+int ft_sync(void)
{
int ret;
@@ -1844,7 +1853,7 @@
return 0;
}
-int ft_fork_and_pair()
+int ft_fork_and_pair(void)
{
int ret;
@@ -1865,7 +1874,7 @@
return 0;
}
-int ft_wait_child()
+int ft_wait_child(void)
{
int ret;
@@ -1895,7 +1904,6 @@
struct iovec iov;
int ret;
struct fi_context ctx;
- void *desc = fi_mr_desc(mr);
strcpy(tx_buf + ft_tx_prefix_size(), "fin");
iov.iov_base = tx_buf;
@@ -1906,7 +1914,7 @@
memset(&tmsg, 0, sizeof tmsg);
tmsg.msg_iov = &iov;
- tmsg.desc = &desc;
+ tmsg.desc = &mr_desc;
tmsg.iov_count = 1;
tmsg.addr = remote_fi_addr;
tmsg.tag = tx_seq;
@@ -1919,7 +1927,7 @@
memset(&msg, 0, sizeof msg);
msg.msg_iov = &iov;
- msg.desc = &desc;
+ msg.desc = &mr_desc;
msg.iov_count = 1;
msg.addr = remote_fi_addr;
msg.context = &ctx;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/complex/ft_domain.c
new/fabtests-1.5.3.0.14a683c40239/complex/ft_domain.c
--- old/fabtests-1.5.2.0.ed3448c/complex/ft_domain.c 2017-11-08
22:48:45.000000000 +0100
+++ new/fabtests-1.5.3.0.14a683c40239/complex/ft_domain.c 2017-12-19
14:02:59.000000000 +0100
@@ -191,8 +191,9 @@
memset(ctrl->buf, 0, size);
}
- if ((fabric_info->mode & FI_LOCAL_MR) && !ctrl->mr) {
- ret = fi_mr_reg(domain, ctrl->buf, size, FI_RECV | FI_SEND,
+ if ((fabric_info->domain_attr->mr_mode & FI_MR_LOCAL) && !ctrl->mr) {
+ ret = fi_mr_reg(domain, ctrl->buf, size,
+ ft_info_to_mr_access(fabric_info),
0, 0, 0, &ctrl->mr, NULL);
if (ret) {
FT_PRINTERR("fi_mr_reg", ret);
@@ -238,7 +239,7 @@
memset(ctrl->orig_buf, 0, size);
}
- if (fabric_info->mode & FI_LOCAL_MR) {
+ if (fabric_info->domain_attr->mr_mode & FI_MR_LOCAL) {
access = FI_READ | FI_WRITE | FI_REMOTE_READ | FI_REMOTE_WRITE;
if (!ctrl->res_mr) {
ret = fi_mr_reg(domain, ctrl->res_buf, size, access,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/complex/ft_msg.c
new/fabtests-1.5.3.0.14a683c40239/complex/ft_msg.c
--- old/fabtests-1.5.2.0.ed3448c/complex/ft_msg.c 2017-11-08
22:48:45.000000000 +0100
+++ new/fabtests-1.5.3.0.14a683c40239/complex/ft_msg.c 2017-12-19
14:02:59.000000000 +0100
@@ -261,7 +261,7 @@
switch (test_info.class_function) {
case FT_FUNC_READ:
ft_send_retry(ret, fi_read, ft_tx_ctrl.ep, ft_tx_ctrl.buf,
- ft_tx_ctrl.rma_msg_size, ft_mr_ctrl.memdesc,
+ ft_tx_ctrl.rma_msg_size, ft_tx_ctrl.memdesc,
ft_tx_ctrl.addr, 0, ft_mr_ctrl.mr_key, ctx);
ft_tx_ctrl.credits--;
break;
@@ -333,7 +333,7 @@
break;
case FT_FUNC_WRITEDATA:
ft_send_retry(ret, fi_writedata, ft_tx_ctrl.ep, ft_tx_ctrl.buf,
- ft_tx_ctrl.rma_msg_size, ft_mr_ctrl.memdesc,
ft_tx_ctrl.remote_cq_data,
+ ft_tx_ctrl.rma_msg_size, ft_tx_ctrl.memdesc,
ft_tx_ctrl.remote_cq_data,
ft_tx_ctrl.addr, 0, ft_mr_ctrl.mr_key, ctx);
ft_tx_ctrl.credits--;
break;
@@ -344,7 +344,7 @@
break;
default:
ft_send_retry(ret, fi_write, ft_tx_ctrl.ep, ft_tx_ctrl.buf,
- ft_tx_ctrl.rma_msg_size, ft_mr_ctrl.memdesc,
+ ft_tx_ctrl.rma_msg_size, ft_tx_ctrl.memdesc,
ft_tx_ctrl.addr, 0, ft_mr_ctrl.mr_key, ctx);
ft_tx_ctrl.credits--;
break;
@@ -599,7 +599,7 @@
return ret;
ft_send_retry(ret, fi_writedata, ft_tx_ctrl.ep, ft_tx_ctrl.buf,
- 0, ft_mr_ctrl.memdesc, ft_tx_ctrl.remote_cq_data,
+ 0, ft_tx_ctrl.memdesc, ft_tx_ctrl.remote_cq_data,
ft_tx_ctrl.addr, 0, ft_mr_ctrl.mr_key, ctx);
ft_tx_ctrl.credits--;
return ret;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/configure.ac
new/fabtests-1.5.3.0.14a683c40239/configure.ac
--- old/fabtests-1.5.2.0.ed3448c/configure.ac 2017-11-08 22:48:45.000000000
+0100
+++ new/fabtests-1.5.3.0.14a683c40239/configure.ac 2017-12-19
14:02:59.000000000 +0100
@@ -4,7 +4,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
-AC_INIT([fabtests], [1.5.2], [of...@lists.openfabrics.org])
+AC_INIT([fabtests], [1.5.3], [of...@lists.openfabrics.org])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR(config)
AC_CONFIG_HEADERS(config.h)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/include/shared.h
new/fabtests-1.5.3.0.14a683c40239/include/shared.h
--- old/fabtests-1.5.2.0.ed3448c/include/shared.h 2017-11-08
22:48:45.000000000 +0100
+++ new/fabtests-1.5.3.0.14a683c40239/include/shared.h 2017-12-19
14:02:59.000000000 +0100
@@ -157,6 +157,7 @@
extern struct fid_cq *txcq, *rxcq;
extern struct fid_cntr *txcntr, *rxcntr;
extern struct fid_mr *mr, no_mr;
+extern void *mr_desc;
extern struct fid_av *av;
extern struct fid_eq *eq;
extern struct fid_mc *mc;
@@ -373,14 +374,14 @@
return true;
}
-int ft_sync();
+int ft_sync(void);
int ft_sync_pair(int status);
-int ft_fork_and_pair();
-int ft_wait_child();
+int ft_fork_and_pair(void);
+int ft_wait_child(void);
int ft_finalize(void);
-size_t ft_rx_prefix_size();
-size_t ft_tx_prefix_size();
+size_t ft_rx_prefix_size(void);
+size_t ft_tx_prefix_size(void);
ssize_t ft_post_rx(struct fid_ep *ep, size_t size, struct fi_context* ctx);
ssize_t ft_post_tx(struct fid_ep *ep, fi_addr_t fi_addr, size_t size,
struct fi_context* ctx);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/simple/dgram_waitset.c
new/fabtests-1.5.3.0.14a683c40239/simple/dgram_waitset.c
--- old/fabtests-1.5.2.0.ed3448c/simple/dgram_waitset.c 2017-11-08
22:48:45.000000000 +0100
+++ new/fabtests-1.5.3.0.14a683c40239/simple/dgram_waitset.c 2017-12-19
14:02:59.000000000 +0100
@@ -84,8 +84,8 @@
struct fi_cq_entry comp;
int ret;
- ret = fi_recv(ep, rx_buf, rx_size + ft_rx_prefix_size(), fi_mr_desc(mr),
- 0, &rx_ctx);
+ ret = fi_recv(ep, rx_buf, rx_size + ft_rx_prefix_size(),
+ mr_desc, 0, &rx_ctx);
if (ret)
return ret;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/simple/poll.c
new/fabtests-1.5.3.0.14a683c40239/simple/poll.c
--- old/fabtests-1.5.2.0.ed3448c/simple/poll.c 2017-11-08 22:48:45.000000000
+0100
+++ new/fabtests-1.5.3.0.14a683c40239/simple/poll.c 2017-12-19
14:02:59.000000000 +0100
@@ -122,8 +122,10 @@
if (ret)
return ret;
- while ((txcq && (tx_cq_cntr < tx_seq)) || (rxcq && (rx_cq_cntr <
rx_seq)) ||
- (txcntr && !tx_cntr_done) || (rxcntr && !rx_cntr_done)) {
+ while (((opts.options & FT_OPT_TX_CQ) && (tx_cq_cntr < tx_seq)) ||
+ ((opts.options & FT_OPT_TX_CNTR) && (!tx_cntr_done)) ||
+ ((opts.options & FT_OPT_RX_CQ) && (rx_cq_cntr < rx_seq)) ||
+ ((opts.options & FT_OPT_RX_CNTR) && (!rx_cntr_done))) {
/* Poll send and recv CQs/Cntrs */
do {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/simple/rdm_deferred_wq.c
new/fabtests-1.5.3.0.14a683c40239/simple/rdm_deferred_wq.c
--- old/fabtests-1.5.2.0.ed3448c/simple/rdm_deferred_wq.c 2017-11-08
22:48:45.000000000 +0100
+++ new/fabtests-1.5.3.0.14a683c40239/simple/rdm_deferred_wq.c 2017-12-19
14:02:59.000000000 +0100
@@ -54,7 +54,7 @@
size_t size, void *ctx)
{
msg->context = ctx;
- msg->desc = fi_mr_desc(mr);
+ msg->desc = mr_desc;
msg->iov_count = 1;
msg->addr = remote_fi_addr;
msg->data = 0;
@@ -69,7 +69,7 @@
uint64_t tag)
{
msg->context = ctx;
- msg->desc = fi_mr_desc(mr);
+ msg->desc = mr_desc;
msg->iov_count = 1;
msg->addr = remote_fi_addr;
msg->data = 0;
@@ -85,7 +85,7 @@
size_t size, void *ctx)
{
msg->context = ctx;
- msg->desc = fi_mr_desc(mr);
+ msg->desc = mr_desc;
msg->iov_count = 1;
msg->addr = remote_fi_addr;
msg->rma_iov_count = 1;
@@ -106,7 +106,7 @@
enum fi_op op)
{
msg->context = ctx;
- msg->desc = fi_mr_desc(mr);
+ msg->desc = mr_desc;
msg->iov_count = 1;
msg->rma_iov_count = 1;
msg->addr = remote_fi_addr;
@@ -197,7 +197,7 @@
int ret;
if (opts.dst_addr) {
- ret = fi_write(ep, tx_buf, strlen(welcome_text), fi_mr_desc(mr),
+ ret = fi_write(ep, tx_buf, strlen(welcome_text), mr_desc,
remote_fi_addr, 0, FT_MR_KEY, &tx_ctx);
if (ret) {
FT_PRINTERR("fi_write", ret);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/simple/rdm_rma_simple.c
new/fabtests-1.5.3.0.14a683c40239/simple/rdm_rma_simple.c
--- old/fabtests-1.5.2.0.ed3448c/simple/rdm_rma_simple.c 2017-11-08
22:48:45.000000000 +0100
+++ new/fabtests-1.5.3.0.14a683c40239/simple/rdm_rma_simple.c 2017-12-19
14:02:59.000000000 +0100
@@ -57,8 +57,9 @@
fprintf(stderr, "Transmit buffer too small.\n");
return -FI_ETOOSMALL;
}
- ret = fi_write(ep, tx_buf, message_len, fi_mr_desc(mr),
- remote_fi_addr, 0, FT_MR_KEY, &fi_ctx_write);
+ ret = fi_write(ep, tx_buf, message_len, mr_desc,
+ remote_fi_addr, 0, FT_MR_KEY,
+ &fi_ctx_write);
if (ret)
return ret;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/simple/rdm_rma_trigger.c
new/fabtests-1.5.3.0.14a683c40239/simple/rdm_rma_trigger.c
--- old/fabtests-1.5.2.0.ed3448c/simple/rdm_rma_trigger.c 2017-11-08
22:48:45.000000000 +0100
+++ new/fabtests-1.5.3.0.14a683c40239/simple/rdm_rma_trigger.c 2017-12-19
14:02:59.000000000 +0100
@@ -49,8 +49,9 @@
triggered_ctx.event_type = FI_TRIGGER_THRESHOLD;
triggered_ctx.trigger.threshold.cntr = cntr;
triggered_ctx.trigger.threshold.threshold = threshold;
- ret = fi_write(alias_ep, src, size, fi_mr_desc(mr), remote_fi_addr, 0,
- FT_MR_KEY, &triggered_ctx);
+ ret = fi_write(alias_ep, src, size, mr_desc,
+ remote_fi_addr, 0,
+ FT_MR_KEY, &triggered_ctx);
if (ret){
FT_PRINTERR("fi_write", ret);
return ret;
@@ -80,7 +81,7 @@
goto out;
fprintf(stdout, "RMA write to server\n");
- ret = fi_write(ep, tx_buf, strlen(welcome_text1),
fi_mr_desc(mr),
+ ret = fi_write(ep, tx_buf, strlen(welcome_text1), mr_desc,
remote_fi_addr, 0, FT_MR_KEY, &tx_ctx);
if (ret){
FT_PRINTERR("fi_write", ret);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/simple/rdm_tagged_peek.c
new/fabtests-1.5.3.0.14a683c40239/simple/rdm_tagged_peek.c
--- old/fabtests-1.5.2.0.ed3448c/simple/rdm_tagged_peek.c 2017-11-08
22:48:45.000000000 +0100
+++ new/fabtests-1.5.3.0.14a683c40239/simple/rdm_tagged_peek.c 2017-12-19
14:02:59.000000000 +0100
@@ -70,7 +70,7 @@
iov.iov_base = buf;
iov.iov_len = rx_size;
msg.msg_iov = &iov;
- desc = fi_mr_desc(mr);
+ desc = mr_desc;
msg.desc = &desc;
msg.iov_count = 1;
msg.addr = remote_fi_addr;
@@ -191,8 +191,9 @@
/* sync with sender before ft_finalize, since we sent
* and received messages outside of the sequence numbers
* maintained by common code */
- ret = fi_tsend(ep, tx_buf, 1, fi_mr_desc(mr),
- remote_fi_addr, 0xabc, &tx_ctx_arr[0]);
+ ret = fi_tsend(ep, tx_buf, 1, mr_desc,
+ remote_fi_addr, 0xabc,
+ &tx_ctx_arr[0]);
if (ret)
return ret;
ret = wait_for_send_comp(1);
@@ -201,8 +202,9 @@
} else {
printf("Sending five tagged messages\n");
for(i = 0; i < 5; i++) {
- ret = fi_tsend(ep, tx_buf, tx_size, fi_mr_desc(mr),
- remote_fi_addr, 0x900d+i,
&tx_ctx_arr[i]);
+ ret = fi_tsend(ep, tx_buf, tx_size, mr_desc,
+ remote_fi_addr, 0x900d+i,
+ &tx_ctx_arr[i]);
if (ret)
return ret;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/simple/scalable_ep.c
new/fabtests-1.5.3.0.14a683c40239/simple/scalable_ep.c
--- old/fabtests-1.5.2.0.ed3448c/simple/scalable_ep.c 2017-11-08
22:48:45.000000000 +0100
+++ new/fabtests-1.5.3.0.14a683c40239/simple/scalable_ep.c 2017-12-19
14:02:59.000000000 +0100
@@ -162,7 +162,7 @@
}
ret = fi_recv(rx_ep[i], rx_buf, MAX(rx_size, FT_MAX_CTRL_MSG),
- fi_mr_desc(mr), 0, NULL);
+ mr_desc, 0, NULL);
if (ret) {
FT_PRINTERR("fi_recv", ret);
return ret;
@@ -208,8 +208,8 @@
for (i = 0; i < ctx_cnt && !ret; i++) {
fprintf(stdout, "Posting send for ctx: %d\n", i);
tb[0] = DATA + i;
- ret = fi_send(tx_ep[i], tx_buf, tx_size, fi_mr_desc(mr),
- remote_rx_addr[i], NULL);
+ ret = fi_send(tx_ep[i], tx_buf, tx_size, mr_desc,
+ remote_rx_addr[i], NULL);
if (ret) {
FT_PRINTERR("fi_send", ret);
return ret;
@@ -288,7 +288,7 @@
}
ret = fi_send(tx_ep[0], tx_buf, addrlen,
- fi_mr_desc(mr), remote_fi_addr, NULL);
+ mr_desc, remote_fi_addr, NULL);
if (ret) {
FT_PRINTERR("fi_send", ret);
return ret;
@@ -307,7 +307,7 @@
return ret;
ret = fi_send(tx_ep[0], tx_buf, 1,
- fi_mr_desc(mr), remote_fi_addr, NULL);
+ mr_desc, remote_fi_addr, NULL);
if (ret) {
FT_PRINTERR("fi_send", ret);
return ret;
@@ -317,7 +317,7 @@
for (i = 0; i < ctx_cnt; i++)
remote_rx_addr[i] = fi_rx_addr(remote_fi_addr, i, rx_ctx_bits);
- ret = fi_recv(rx_ep[0], rx_buf, rx_size, fi_mr_desc(mr), 0, NULL);
+ ret = fi_recv(rx_ep[0], rx_buf, rx_size, mr_desc, 0, NULL);
if (ret) {
FT_PRINTERR("fi_recv", ret);
return ret;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.2.0.ed3448c/streaming/rdm_atomic.c
new/fabtests-1.5.3.0.14a683c40239/streaming/rdm_atomic.c
--- old/fabtests-1.5.2.0.ed3448c/streaming/rdm_atomic.c 2017-11-08
22:48:45.000000000 +0100
+++ new/fabtests-1.5.3.0.14a683c40239/streaming/rdm_atomic.c 2017-12-19
14:02:59.000000000 +0100
@@ -98,7 +98,7 @@
{
int ret;
- ret = fi_atomic(ep, buf, 1, fi_mr_desc(mr), remote_fi_addr, remote.addr,
+ ret = fi_atomic(ep, buf, 1, mr_desc, remote_fi_addr, remote.addr,
remote.key, datatype, op, &fi_ctx_atomic);
if (ret) {
FT_PRINTERR("fi_atomic", ret);
@@ -113,7 +113,7 @@
{
int ret;
- ret = fi_fetch_atomic(ep, buf, 1, fi_mr_desc(mr), result,
+ ret = fi_fetch_atomic(ep, buf, 1, mr_desc, result,
fi_mr_desc(mr_result), remote_fi_addr, remote.addr,
remote.key, datatype, op, &fi_ctx_atomic);
if (ret) {
@@ -129,7 +129,7 @@
{
int ret;
- ret = fi_compare_atomic(ep, buf, 1, fi_mr_desc(mr), compare,
+ ret = fi_compare_atomic(ep, buf, 1, mr_desc, compare,
fi_mr_desc(mr_compare), result, fi_mr_desc(mr_result),
remote_fi_addr, remote.addr, remote.key, datatype, op,
&fi_ctx_atomic);
