Hello community,
here is the log from the commit of package fabtests for openSUSE:Factory
checked in at 2017-10-17 01:50:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fabtests (Old)
and /work/SRC/openSUSE:Factory/.fabtests.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fabtests"
Tue Oct 17 01:50:56 2017 rev:5 rq:532704 version:1.5.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/fabtests/fabtests.changes 2017-09-07
22:14:57.712197757 +0200
+++ /work/SRC/openSUSE:Factory/.fabtests.new/fabtests.changes 2017-10-17
01:50:57.766805814 +0200
@@ -1,0 +2,7 @@
+Mon Oct 9 07:49:10 UTC 2017 - nmoreychaisemar...@suse.com
+
+- Update to version 1.5.1
+ * No release notes available
+ * Bugfixes backported from master branch
+
+-------------------------------------------------------------------
Old:
----
fabtests-1.5.0.0.65771ff.tar.bz2
New:
----
fabtests-1.5.1.0.5a76567.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fabtests.spec ++++++
--- /var/tmp/diff_new_pack.Wk5F2m/_old 2017-10-17 01:50:58.698762154 +0200
+++ /var/tmp/diff_new_pack.Wk5F2m/_new 2017-10-17 01:50:58.702761966 +0200
@@ -16,10 +16,10 @@
#
-%define git_ver .0.65771ff
+%define git_ver .0.5a76567
Name: fabtests
-Version: 1.5.0
+Version: 1.5.1
Release: 0
Summary: Test suite for libfabric API
License: BSD-2-Clause or GPL-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.Wk5F2m/_old 2017-10-17 01:50:58.726760842 +0200
+++ /var/tmp/diff_new_pack.Wk5F2m/_new 2017-10-17 01:50:58.726760842 +0200
@@ -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">65771ffbfa599eaa05d634431d82e7d70a74da81</param>
+ <param name="revision">5a7656734f441c7f39306d1ae1ca58a57c46bb0d</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">fabtests*.tar</param>
++++++ fabtests-1.5.0.0.65771ff.tar.bz2 -> fabtests-1.5.1.0.5a76567.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.0.0.65771ff/AUTHORS
new/fabtests-1.5.1.0.5a76567/AUTHORS
--- old/fabtests-1.5.0.0.65771ff/AUTHORS 2017-08-09 13:39:11.000000000
+0200
+++ new/fabtests-1.5.1.0.5a76567/AUTHORS 2017-10-07 01:24:17.000000000
+0200
@@ -17,6 +17,7 @@
Jerome Berryhill <jerome.berryh...@intel.com>
Jerome Boyd Berryhill <jeromeberryh...@intel.com>
Jithin Jose <jithin.j...@intel.com>
+John Byrne <john.l.by...@hpe.com>
jose <jose@cst-fs.(none)>
jose <jose@cstnh-8.(none)>
Ken Raffenetti <raffe...@mcs.anl.gov>
@@ -32,6 +33,7 @@
Sean Hefty <sean.he...@intel.com>
Shantonu Hossain <shantonu.hoss...@intel.com>
Solovyev, Dmitriy <dmitriy.solov...@intel.com>
+Spruit, Neil R <neil.r.spr...@intel.com>
Stan Smith <stan.sm...@intel.com>
Sung-Eun Choi <sungeunc...@users.noreply.github.com>
Xuyang Wang <xuyw...@cisco.com>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.0.0.65771ff/benchmarks/rma_bw.c
new/fabtests-1.5.1.0.5a76567/benchmarks/rma_bw.c
--- old/fabtests-1.5.0.0.65771ff/benchmarks/rma_bw.c 2017-08-09
13:39:11.000000000 +0200
+++ new/fabtests-1.5.1.0.5a76567/benchmarks/rma_bw.c 2017-10-07
01:24:17.000000000 +0200
@@ -97,13 +97,18 @@
if (!hints)
return EXIT_FAILURE;
+ hints->caps = FI_MSG | FI_RMA;
+ hints->domain_attr->resource_mgmt = FI_RM_ENABLED;
+ hints->mode = FI_CONTEXT;
+ hints->domain_attr->mr_mode = FI_MR_LOCAL | OFI_MR_BASIC_MAP;
+
while ((op = getopt(argc, argv, "ho:" CS_OPTS INFO_OPTS
BENCHMARK_OPTS)) != -1) {
switch (op) {
default:
ft_parse_benchmark_opts(op, optarg);
ft_parseinfo(op, optarg, hints);
ft_parsecsopts(op, optarg, &opts);
- ret = ft_parse_rma_opts(op, optarg, &opts);
+ ret = ft_parse_rma_opts(op, optarg, hints, &opts);
if (ret)
return ret;
break;
@@ -123,11 +128,6 @@
if (optind < argc)
opts.dst_addr = argv[optind];
- hints->caps = FI_MSG | FI_RMA;
- hints->domain_attr->resource_mgmt = FI_RM_ENABLED;
- hints->mode = FI_CONTEXT | FI_RX_CQ_DATA;
- hints->domain_attr->mr_mode = FI_MR_LOCAL | OFI_MR_BASIC_MAP;
-
ret = run();
ft_free_res();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.0.0.65771ff/common/shared.c
new/fabtests-1.5.1.0.5a76567/common/shared.c
--- old/fabtests-1.5.0.0.65771ff/common/shared.c 2017-08-09
13:39:11.000000000 +0200
+++ new/fabtests-1.5.1.0.5a76567/common/shared.c 2017-10-07
01:24:17.000000000 +0200
@@ -435,11 +435,6 @@
int ft_alloc_ep_res(struct fi_info *fi)
{
int ret;
- if (hints->caps & FI_RMA) {
- ret = ft_set_rma_caps(fi, opts.rma_op);
- if (ret)
- return ret;
- }
ret = ft_alloc_msgs();
if (ret)
@@ -452,14 +447,12 @@
cq_attr.format = FI_CQ_FORMAT_CONTEXT;
}
- if (opts.options & FT_OPT_TX_CQ) {
- ft_cq_set_wait_attr();
- cq_attr.size = fi->tx_attr->size;
- ret = fi_cq_open(domain, &cq_attr, &txcq, &txcq);
- if (ret) {
- FT_PRINTERR("fi_cq_open", ret);
- return ret;
- }
+ ft_cq_set_wait_attr();
+ cq_attr.size = fi->tx_attr->size;
+ ret = fi_cq_open(domain, &cq_attr, &txcq, &txcq);
+ if (ret) {
+ FT_PRINTERR("fi_cq_open", ret);
+ return ret;
}
if (opts.options & FT_OPT_TX_CNTR) {
@@ -471,14 +464,12 @@
}
}
- if (opts.options & FT_OPT_RX_CQ) {
- ft_cq_set_wait_attr();
- cq_attr.size = fi->rx_attr->size;
- ret = fi_cq_open(domain, &cq_attr, &rxcq, &rxcq);
- if (ret) {
- FT_PRINTERR("fi_cq_open", ret);
- return ret;
- }
+ ft_cq_set_wait_attr();
+ cq_attr.size = fi->rx_attr->size;
+ ret = fi_cq_open(domain, &cq_attr, &rxcq, &rxcq);
+ if (ret) {
+ FT_PRINTERR("fi_cq_open", ret);
+ return ret;
}
if (opts.options & FT_OPT_RX_CNTR) {
@@ -523,27 +514,6 @@
return 0;
}
-int ft_set_rma_caps(struct fi_info *fi, enum ft_rma_opcodes rma_op)
-{
- switch (rma_op) {
- case FT_RMA_READ:
- fi->caps |= FI_REMOTE_READ;
- if (fi->mode & FI_LOCAL_MR)
- fi->caps |= FI_READ;
- break;
- case FT_RMA_WRITE:
- case FT_RMA_WRITEDATA:
- fi->caps |= FI_REMOTE_WRITE;
- if (fi->mode & FI_LOCAL_MR)
- fi->caps |= FI_WRITE;
- break;
- default:
- FT_ERR("Invalid rma op type\n");
- return -FI_EINVAL;
- }
- return 0;
-}
-
int ft_getinfo(struct fi_info *hints, struct fi_info **info)
{
char *node, *service;
@@ -780,12 +750,6 @@
if (ret)
return ret;
- if (hints->caps & FI_RMA) {
- ret = ft_set_rma_caps(fi, opts.rma_op);
- if (ret)
- return ret;
- }
-
ret = ft_alloc_active_res(fi);
if (ret)
return ret;
@@ -852,13 +816,20 @@
return ret;
/* TODO: use control structure to select counter bindings explicitly */
- flags = !txcq ? FI_SEND : 0;
+ if (opts.options & FT_OPT_TX_CQ)
+ flags = 0;
+ else
+ flags = FI_SEND;
if (hints->caps & (FI_WRITE | FI_READ))
flags |= hints->caps & (FI_WRITE | FI_READ);
else if (hints->caps & FI_RMA)
flags |= FI_WRITE | FI_READ;
FT_EP_BIND(ep, txcntr, flags);
- flags = !rxcq ? FI_RECV : 0;
+
+ if (opts.options & FT_OPT_RX_CQ)
+ flags = 0;
+ else
+ flags = FI_RECV;
if (hints->caps & (FI_REMOTE_WRITE | FI_REMOTE_READ))
flags |= hints->caps & (FI_REMOTE_WRITE | FI_REMOTE_READ);
else if (hints->caps & FI_RMA)
@@ -1320,7 +1291,7 @@
struct fi_cq_err_entry comp;
int ret;
- if (txcq) {
+ if (opts.options & FT_OPT_TX_CQ) {
if (opts.comp_method == FT_COMP_SREAD)
ret = fi_cq_sread(txcq, &comp, 1, NULL, 0);
else
@@ -1743,7 +1714,7 @@
{
int ret = FI_SUCCESS;
- if (rxcq) {
+ if (opts.options & FT_OPT_RX_CQ) {
ret = ft_get_cq_comp(rxcq, &rx_cq_cntr, total, timeout);
} else if (rxcntr) {
while (fi_cntr_read(rxcntr) < total) {
@@ -1764,7 +1735,7 @@
{
int ret;
- if (txcq) {
+ if (opts.options & FT_OPT_TX_CQ) {
ret = ft_get_cq_comp(txcq, &tx_cq_cntr, total, -1);
} else if (txcntr) {
ret = fi_cntr_wait(txcntr, total, -1);
@@ -2230,16 +2201,22 @@
}
}
-int ft_parse_rma_opts(int op, char *optarg, struct ft_opts *opts)
+int ft_parse_rma_opts(int op, char *optarg, struct fi_info *hints,
+ struct ft_opts *opts)
{
switch (op) {
case 'o':
if (!strcmp(optarg, "read")) {
+ hints->caps |= FI_READ | FI_REMOTE_READ;
opts->rma_op = FT_RMA_READ;
} else if (!strcmp(optarg, "writedata")) {
+ hints->caps |= FI_WRITE | FI_REMOTE_WRITE;
+ hints->mode |= FI_RX_CQ_DATA;
+ hints->domain_attr->cq_data_size = 4;
opts->rma_op = FT_RMA_WRITEDATA;
cq_attr.format = FI_CQ_FORMAT_DATA;
} else if (!strcmp(optarg, "write")) {
+ hints->caps |= FI_WRITE | FI_REMOTE_WRITE;
opts->rma_op = FT_RMA_WRITE;
} else {
fprintf(stderr, "Invalid operation type: \"%s\".
Usage:\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.0.0.65771ff/complex/ft_comp.c
new/fabtests-1.5.1.0.5a76567/complex/ft_comp.c
--- old/fabtests-1.5.0.0.65771ff/complex/ft_comp.c 2017-08-09
13:39:11.000000000 +0200
+++ new/fabtests-1.5.1.0.5a76567/complex/ft_comp.c 2017-10-07
01:24:17.000000000 +0200
@@ -114,15 +114,18 @@
{
int ret;
+ ret = ft_open_cqs();
+ if (ret)
+ return ret;
+
switch (test_info.comp_type) {
case FT_COMP_QUEUE:
- ret = ft_open_cqs();
break;
case FT_COMP_CNTR:
ret = ft_open_cntrs();
break;
default:
- ret = -FI_ENOSYS;
+ ret = -FI_ENOSYS;
}
return ret;
@@ -132,25 +135,38 @@
{
int ret;
uint64_t flags;
- struct fid *txfid = (test_info.comp_type == FT_COMP_CNTR) ?
&txcntr->fid : &txcq->fid;
- struct fid *rxfid = (test_info.comp_type == FT_COMP_CNTR) ?
&rxcntr->fid : &rxcq->fid;
flags = FI_TRANSMIT;
- if (test_info.comp_type == FT_COMP_CNTR)
- flags |= FI_READ | FI_WRITE;
- ret = fi_ep_bind(ep, txfid, flags);
+ ret = fi_ep_bind(ep, &txcq->fid, flags);
if (ret) {
FT_PRINTERR("fi_ep_bind", ret);
return ret;
}
+ if (test_info.comp_type == FT_COMP_CNTR) {
+ flags |= FI_READ | FI_WRITE;
+ ret = fi_ep_bind(ep, &txcntr->fid, flags);
+ if (ret) {
+ FT_PRINTERR("fi_ep_bind", ret);
+ return ret;
+ }
+ }
+
flags = FI_RECV;
- ret = fi_ep_bind(ep, rxfid, flags);
+ ret = fi_ep_bind(ep, &rxcq->fid, flags);
if (ret) {
FT_PRINTERR("fi_ep_bind", ret);
return ret;
}
+ if (test_info.comp_type == FT_COMP_CNTR) {
+ ret = fi_ep_bind(ep, &rxcntr->fid, flags);
+ if (ret) {
+ FT_PRINTERR("fi_ep_bind", ret);
+ return ret;
+ }
+ }
+
return 0;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.0.0.65771ff/complex/ft_config.c
new/fabtests-1.5.1.0.5a76567/complex/ft_config.c
--- old/fabtests-1.5.0.0.65771ff/complex/ft_config.c 2017-08-09
13:39:11.000000000 +0200
+++ new/fabtests-1.5.1.0.5a76567/complex/ft_config.c 2017-10-07
01:24:17.000000000 +0200
@@ -776,6 +776,9 @@
info->ep_type = set->ep_type[series->cur_ep];
info->av_type = set->av_type[series->cur_av];
info->comp_type = set->comp_type[series->cur_comp];
+ if (info->caps & (FT_CAP_RMA | FT_CAP_ATOMIC) &&
+ (info->comp_type == FT_COMP_CNTR))
+ info->caps |= FI_RMA_EVENT;
info->eq_wait_obj = set->eq_wait_obj[series->cur_eq_wait_obj];
info->cntr_wait_obj = set->cntr_wait_obj[series->cur_cntr_wait_obj];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.0.0.65771ff/complex/ft_main.c
new/fabtests-1.5.1.0.5a76567/complex/ft_main.c
--- old/fabtests-1.5.0.0.65771ff/complex/ft_main.c 2017-08-09
13:39:11.000000000 +0200
+++ new/fabtests-1.5.1.0.5a76567/complex/ft_main.c 2017-10-07
01:24:17.000000000 +0200
@@ -221,6 +221,13 @@
static void ft_fw_convert_info(struct fi_info *info, struct ft_info *test_info)
{
info->caps = test_info->caps;
+
+ if ((test_info->class_function == FT_FUNC_WRITEDATA) ||
+ (test_info->class_function == FT_FUNC_INJECT_WRITEDATA) ||
+ (test_info->class_function == FT_FUNC_INJECTDATA) ||
+ (test_info->class_function == FT_FUNC_SENDDATA))
+ info->domain_attr->cq_data_size = 4;
+
info->mode = test_info->mode;
info->domain_attr->av_type = test_info->av_type;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.0.0.65771ff/configure.ac
new/fabtests-1.5.1.0.5a76567/configure.ac
--- old/fabtests-1.5.0.0.65771ff/configure.ac 2017-08-09 13:39:11.000000000
+0200
+++ new/fabtests-1.5.1.0.5a76567/configure.ac 2017-10-07 01:24:17.000000000
+0200
@@ -4,7 +4,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
-AC_INIT([fabtests], [1.5.0], [of...@lists.openfabrics.org])
+AC_INIT([fabtests], [1.5.1], [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.0.0.65771ff/include/shared.h
new/fabtests-1.5.1.0.5a76567/include/shared.h
--- old/fabtests-1.5.0.0.65771ff/include/shared.h 2017-08-09
13:39:11.000000000 +0200
+++ new/fabtests-1.5.1.0.5a76567/include/shared.h 2017-10-07
01:24:17.000000000 +0200
@@ -184,7 +184,8 @@
void ft_parseinfo(int op, char *optarg, struct fi_info *hints);
void ft_parse_addr_opts(int op, char *optarg, struct ft_opts *opts);
void ft_parsecsopts(int op, char *optarg, struct ft_opts *opts);
-int ft_parse_rma_opts(int op, char *optarg, struct ft_opts *opts);
+int ft_parse_rma_opts(int op, char *optarg, struct fi_info *hints,
+ struct ft_opts *opts);
void ft_addr_usage();
void ft_usage(char *name, char *desc);
void ft_mcusage(char *name, char *desc);
@@ -305,7 +306,6 @@
int ft_alloc_bufs();
int ft_open_fabric_res();
-int ft_set_rma_caps(struct fi_info *fi, enum ft_rma_opcodes rma_op);
int ft_getinfo(struct fi_info *hints, struct fi_info **info);
int ft_init_fabric();
int ft_start_server();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.0.0.65771ff/scripts/runfabtests.cmd
new/fabtests-1.5.1.0.5a76567/scripts/runfabtests.cmd
--- old/fabtests-1.5.0.0.65771ff/scripts/runfabtests.cmd 2017-08-09
13:39:11.000000000 +0200
+++ new/fabtests-1.5.1.0.5a76567/scripts/runfabtests.cmd 2017-10-07
01:24:17.000000000 +0200
@@ -11,8 +11,9 @@
set unit_tests=^
"av_test -g 192.168.10.1 -n 1 -s 127.0.0.1"^
- "dom_test -n 2"^
"eq_test"
+:: Disabling this test since it fails on windows (appveyor). Re-enable after
root cause is identified and fixed
+:: "dom_test -n 2"^
set simple_tests=^
"cq_data"^
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.0.0.65771ff/scripts/runfabtests.sh
new/fabtests-1.5.1.0.5a76567/scripts/runfabtests.sh
--- old/fabtests-1.5.0.0.65771ff/scripts/runfabtests.sh 2017-08-09
13:39:11.000000000 +0200
+++ new/fabtests-1.5.1.0.5a76567/scripts/runfabtests.sh 2017-10-07
01:24:17.000000000 +0200
@@ -103,9 +103,6 @@
"rdm_shared_av"
"multi_mr -e msg -V"
"multi_mr -e rdm -V"
- "rdm_multi_domain -V"
- "multi_ep -e msg"
- "multi_ep -e rdm"
"recv_cancel -e rdm -V"
"unexpected_msg -e msg -i 10"
"unexpected_msg -e rdm -i 10"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.0.0.65771ff/simple/rdm_deferred_wq.c
new/fabtests-1.5.1.0.5a76567/simple/rdm_deferred_wq.c
--- old/fabtests-1.5.0.0.65771ff/simple/rdm_deferred_wq.c 2017-08-09
13:39:11.000000000 +0200
+++ new/fabtests-1.5.1.0.5a76567/simple/rdm_deferred_wq.c 2017-10-07
01:24:17.000000000 +0200
@@ -165,7 +165,7 @@
case FI_OP_ATOMIC:
for (i = 0; i < strlen(welcome_text); i++) {
if (rx_buf[i] != c) {
- printf("Data mismatch found at byte %d", i);
+ printf("Data mismatch found at byte %d...", i);
return 1;
}
}
@@ -332,13 +332,13 @@
struct fi_ioc compare_iov;
struct fi_rma_ioc rma_iov;
- ret = check_compare_atomic_op(ep, FI_CSWAP, FI_UINT8, &count);
+ ret = check_compare_atomic_op(ep, FI_CSWAP_LE, FI_UINT8, &count);
if (ret)
return ret;
format_simple_msg_atomic(&msg, &iov, &rma_iov,
tx_buf + strlen(welcome_text),
- strlen(welcome_text), &work.context, FI_UINT8,
FI_CSWAP_LT);
+ strlen(welcome_text), &work.context, FI_UINT8,
FI_CSWAP_LE);
format_simple_msg_fetch(&fetch, &fetch_iov, result_buf,
strlen(welcome_text));
format_simple_msg_compare(&compare, &compare_iov, compare_buf,
strlen(welcome_text));
@@ -483,7 +483,7 @@
case FI_OP_ATOMIC:
case FI_OP_FETCH_ATOMIC:
case FI_OP_COMPARE_ATOMIC:
- memset(compare_buf, ~0, strlen(compare_buf));
+ memset(compare_buf, ~0, strlen(welcome_text) * 2);
sprintf(tx_buf, "%s", welcome_text);
memset(&tx_buf[strlen(welcome_text)], ~0, strlen(welcome_text));
if (opts.dst_addr)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.0.0.65771ff/simple/rdm_multi_domain.c
new/fabtests-1.5.1.0.5a76567/simple/rdm_multi_domain.c
--- old/fabtests-1.5.0.0.65771ff/simple/rdm_multi_domain.c 2017-08-09
13:39:11.000000000 +0200
+++ new/fabtests-1.5.1.0.5a76567/simple/rdm_multi_domain.c 2017-10-07
01:24:17.000000000 +0200
@@ -172,12 +172,25 @@
static int init_peer_addresses()
{
int dom_idx, ret;
+ int ep_idx;
+ /*
+ Initializes the Address Vectors for each domain
+ with the addresses of the remote hosts' endpoints.
+ The fi_addr_t array peer_addrs gets rewritten
+ in this loop with the same set of addresses for each domain
+ init, but the peer addresses to the remote domains
+ are the same so this is not an issue.
+ The address vectors for each domain must be init even if
+ the peer addresses returned is the same after the first loop.
+ */
for (dom_idx = 0; dom_idx < domain_cnt; dom_idx++) {
- ret = ft_init_av_addr(domain_res_array[dom_idx].av,
- domain_res_array[dom_idx].ep,
&peer_addrs[dom_idx]);
- if (ret)
- return ret;
+ for (ep_idx = 0; ep_idx < domain_cnt; ep_idx++) {
+ ret = ft_init_av_addr(domain_res_array[dom_idx].av,
+ domain_res_array[ep_idx].ep,
&peer_addrs[ep_idx]);
+ if (ret)
+ return ret;
+ }
}
return 0;
@@ -247,7 +260,7 @@
while (ret == -FI_EAGAIN) {
ret = fi_write(domain_res_array[dom_idx].ep, buffer, size,
fi_mr_desc(domain_res_array[dom_idx].mr),
peer_addrs[remote_dom_idx],
- 0, fi_mr_key(domain_res_array[dom_idx].mr),
&rma_ctx);
+ 0,
fi_mr_key(domain_res_array[remote_dom_idx].mr), &rma_ctx);
}
if (ret)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.0.0.65771ff/simple/rdm_tagged_peek.c
new/fabtests-1.5.1.0.5a76567/simple/rdm_tagged_peek.c
--- old/fabtests-1.5.0.0.65771ff/simple/rdm_tagged_peek.c 2017-08-09
13:39:11.000000000 +0200
+++ new/fabtests-1.5.1.0.5a76567/simple/rdm_tagged_peek.c 2017-10-07
01:24:17.000000000 +0200
@@ -63,12 +63,14 @@
struct fi_cq_err_entry cq_err;
struct iovec iov;
struct fi_context ctx;
+ void *desc;
if (recv) {
iov.iov_base = buf;
iov.iov_len = rx_size;
msg.msg_iov = &iov;
- msg.desc = fi_mr_desc(mr);
+ desc = fi_mr_desc(mr);
+ msg.desc = &desc;
msg.iov_count = 1;
msg.addr = remote_fi_addr;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.0.0.65771ff/streaming/msg_rma.c
new/fabtests-1.5.1.0.5a76567/streaming/msg_rma.c
--- old/fabtests-1.5.0.0.65771ff/streaming/msg_rma.c 2017-08-09
13:39:11.000000000 +0200
+++ new/fabtests-1.5.1.0.5a76567/streaming/msg_rma.c 2017-10-07
01:24:17.000000000 +0200
@@ -115,12 +115,16 @@
if (!hints)
return EXIT_FAILURE;
+ hints->caps = FI_MSG | FI_RMA;
+ hints->ep_attr->type = FI_EP_MSG;
+ hints->domain_attr->mr_mode = FI_MR_LOCAL | OFI_MR_BASIC_MAP;
+
while ((op = getopt(argc, argv, "ho:" CS_OPTS INFO_OPTS)) != -1) {
switch (op) {
default:
ft_parseinfo(op, optarg, hints);
ft_parsecsopts(op, optarg, &opts);
- ret = ft_parse_rma_opts(op, optarg, &opts);
+ ret = ft_parse_rma_opts(op, optarg, hints, &opts);
if (ret)
return ret;
break;
@@ -135,11 +139,6 @@
if (optind < argc)
opts.dst_addr = argv[optind];
- hints->ep_attr->type = FI_EP_MSG;
- hints->caps = FI_MSG | FI_RMA;
- hints->mode = FI_RX_CQ_DATA;
- hints->domain_attr->mr_mode = FI_MR_LOCAL | OFI_MR_BASIC_MAP;
-
ret = run();
ft_free_res();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.0.0.65771ff/streaming/rdm_atomic.c
new/fabtests-1.5.1.0.5a76567/streaming/rdm_atomic.c
--- old/fabtests-1.5.0.0.65771ff/streaming/rdm_atomic.c 2017-08-09
13:39:11.000000000 +0200
+++ new/fabtests-1.5.1.0.5a76567/streaming/rdm_atomic.c 2017-10-07
01:24:17.000000000 +0200
@@ -153,9 +153,14 @@
static int run_op(void)
{
- int ret, i, len;
+ int ret = -FI_EINVAL, i, len;
- count = (size_t *) malloc(sizeof(size_t));
+ count = (size_t *)malloc(sizeof(*count));
+ if (!count) {
+ ret = -FI_ENOMEM;
+ perror("malloc");
+ goto fn;
+ }
ft_sync();
switch (op_type) {
@@ -266,11 +271,11 @@
}
break;
default:
- ret = -EINVAL;
break;
}
free(count);
+fn:
return ret;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.0.0.65771ff/streaming/rdm_rma.c
new/fabtests-1.5.1.0.5a76567/streaming/rdm_rma.c
--- old/fabtests-1.5.0.0.65771ff/streaming/rdm_rma.c 2017-08-09
13:39:11.000000000 +0200
+++ new/fabtests-1.5.1.0.5a76567/streaming/rdm_rma.c 2017-10-07
01:24:17.000000000 +0200
@@ -107,12 +107,16 @@
if (!hints)
return EXIT_FAILURE;
+ hints->caps = FI_MSG | FI_RMA;
+ hints->ep_attr->type = FI_EP_RDM;
+ hints->domain_attr->mr_mode = FI_MR_LOCAL | OFI_MR_BASIC_MAP;
+
while ((op = getopt(argc, argv, "ho:" CS_OPTS INFO_OPTS)) != -1) {
switch (op) {
default:
ft_parseinfo(op, optarg, hints);
ft_parsecsopts(op, optarg, &opts);
- ret = ft_parse_rma_opts(op, optarg, &opts);
+ ret = ft_parse_rma_opts(op, optarg, hints, &opts);
if (ret)
return ret;
break;
@@ -127,11 +131,6 @@
if (optind < argc)
opts.dst_addr = argv[optind];
- hints->ep_attr->type = FI_EP_RDM;
- hints->caps = FI_MSG | FI_RMA;
- hints->mode = FI_RX_CQ_DATA;
- hints->domain_attr->mr_mode = FI_MR_LOCAL | OFI_MR_BASIC_MAP;
-
ret = run();
ft_free_res();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.0.0.65771ff/unit/cq_test.c
new/fabtests-1.5.1.0.5a76567/unit/cq_test.c
--- old/fabtests-1.5.0.0.65771ff/unit/cq_test.c 2017-08-09 13:39:11.000000000
+0200
+++ new/fabtests-1.5.1.0.5a76567/unit/cq_test.c 2017-10-07 01:24:17.000000000
+0200
@@ -178,7 +178,7 @@
hints->mode = ~0;
hints->domain_attr->mode = ~0;
- hints->domain_attr->mr_mode = ~0;
+ hints->domain_attr->mr_mode = ~(FI_MR_BASIC | FI_MR_SCALABLE);
ret = fi_getinfo(FT_FIVERSION, NULL, 0, 0, hints, &fi);
if (ret) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fabtests-1.5.0.0.65771ff/unit/dom_test.c
new/fabtests-1.5.1.0.5a76567/unit/dom_test.c
--- old/fabtests-1.5.0.0.65771ff/unit/dom_test.c 2017-08-09
13:39:11.000000000 +0200
+++ new/fabtests-1.5.1.0.5a76567/unit/dom_test.c 2017-10-07
01:24:17.000000000 +0200
@@ -90,7 +90,7 @@
hints->mode = ~0;
hints->domain_attr->mode = ~0;
- hints->domain_attr->mr_mode = ~0;
+ hints->domain_attr->mr_mode = ~(FI_MR_BASIC | FI_MR_SCALABLE);
ret = fi_getinfo(FT_FIVERSION, NULL, 0, 0, hints, &fi);
if (ret) {
