[Pkg-ofed-commits] r412 - in /branches/ofed-1.4.2/qperf/trunk: ./ debian/ src/
gmpc-guest at alioth.debian.org
gmpc-guest at alioth.debian.org
Fri Aug 7 11:55:00 UTC 2009
Author: gmpc-guest
Date: Fri Aug 7 11:55:00 2009
New Revision: 412
URL: http://svn.debian.org/wsvn/pkg-ofed/?sc=1&rev=412
Log:
New upstream release
Modified:
branches/ofed-1.4.2/qperf/trunk/README
branches/ofed-1.4.2/qperf/trunk/configure.in
branches/ofed-1.4.2/qperf/trunk/debian/changelog
branches/ofed-1.4.2/qperf/trunk/qperf.spec
branches/ofed-1.4.2/qperf/trunk/src/qperf.c
branches/ofed-1.4.2/qperf/trunk/src/rdma.c
branches/ofed-1.4.2/qperf/trunk/src/support.c
Modified: branches/ofed-1.4.2/qperf/trunk/README
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/qperf/trunk/README?rev=412&op=diff
==============================================================================
--- branches/ofed-1.4.2/qperf/trunk/README (original)
+++ branches/ofed-1.4.2/qperf/trunk/README Fri Aug 7 11:55:00 2009
@@ -5,8 +5,11 @@
make
Changing version
- * Change VER_MAJ, VER_MIN and VER_INC as appropriate in src/qperf.c
- * Change version also in qperf.spec and configure.in
+ * src/qperf.c: Change VER_MAJ, VER_MIN and VER_INC.
+ * configure.in: Change in AC_INIT and AM_INIT_AUTOMAKE
+ * qperf.spec: Change line beginning with Version:
+ * Note ensure that qperf.spec is modified last so that cleanup does not
+ delete it.
Notes
* If the library ibverbs is not found, a version of qperf is built that
Modified: branches/ofed-1.4.2/qperf/trunk/configure.in
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/qperf/trunk/configure.in?rev=412&op=diff
==============================================================================
--- branches/ofed-1.4.2/qperf/trunk/configure.in (original)
+++ branches/ofed-1.4.2/qperf/trunk/configure.in Fri Aug 7 11:55:00 2009
@@ -1,5 +1,5 @@
-AC_INIT(qperf, 0.4.4, general at lists.openfabrics.org)
-AM_INIT_AUTOMAKE(qperf, 0.4.4)
+AC_INIT(qperf, 0.4.6, general at lists.openfabrics.org)
+AM_INIT_AUTOMAKE(qperf, 0.4.6)
AC_PROG_CC
AC_CHECK_LIB(ibverbs, ibv_open_device, RDMA=1)
AC_CHECK_LIB(rdmacm, rdma_create_id)
Modified: branches/ofed-1.4.2/qperf/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/qperf/trunk/debian/changelog?rev=412&op=diff
==============================================================================
--- branches/ofed-1.4.2/qperf/trunk/debian/changelog (original)
+++ branches/ofed-1.4.2/qperf/trunk/debian/changelog Fri Aug 7 11:55:00 2009
@@ -1,3 +1,9 @@
+qperf (0.4.6-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Guy Coates <gmpc at sanger.ac.uk> Fri, 07 Aug 2009 12:46:24 +0100
+
qperf (0.4.4-1) unstable; urgency=low
* OFED 1.4.1 upstream release
Modified: branches/ofed-1.4.2/qperf/trunk/qperf.spec
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/qperf/trunk/qperf.spec?rev=412&op=diff
==============================================================================
--- branches/ofed-1.4.2/qperf/trunk/qperf.spec (original)
+++ branches/ofed-1.4.2/qperf/trunk/qperf.spec Fri Aug 7 11:55:00 2009
@@ -1,10 +1,10 @@
Name: qperf
Summary: Measure socket and RDMA performance
-Version: 0.4.4
-Release: 1.ofed1.4.1
+Version: 0.4.6
+Release: 1.ofed1.4.2
License: BSD 3-Clause, GPL v2
Group: Networking/Diagnostic
-Source: http://www.openfabrics.org/downloads/qperf-0.4.4.tar.gz
+Source: http://www.openfabrics.org/downloads/qperf-0.4.6.tar.gz
Url: http://www.openfabrics.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libibverbs-devel
Modified: branches/ofed-1.4.2/qperf/trunk/src/qperf.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/qperf/trunk/src/qperf.c?rev=412&op=diff
==============================================================================
--- branches/ofed-1.4.2/qperf/trunk/src/qperf.c (original)
+++ branches/ofed-1.4.2/qperf/trunk/src/qperf.c Fri Aug 7 11:55:00 2009
@@ -62,7 +62,7 @@
*/
#define VER_MAJ 0 /* Major version */
#define VER_MIN 4 /* Minor version */
-#define VER_INC 4 /* Incremental version */
+#define VER_INC 6 /* Incremental version */
#define LISTENQ 5 /* Size of listen queue */
#define BUFSIZE 1024 /* Size of buffers */
@@ -673,10 +673,10 @@
set_signals(void)
{
struct sigaction act ={
- .sa_sigaction = sig_alrm,
.sa_flags = SA_SIGINFO
};
+ act.sa_sigaction = sig_alrm;
sigaction(SIGALRM, &act, 0);
sigaction(SIGPIPE, &act, 0);
@@ -1776,10 +1776,11 @@
static void
run_server_quit(void)
{
+ int z;
char buf[1];
sync_test();
- read(RemoteFD, buf, sizeof(buf));
+ z = read(RemoteFD, buf, sizeof(buf));
kill(getppid(), SIGQUIT);
exit(0);
}
@@ -1812,7 +1813,11 @@
debug("starting timer for %d seconds", seconds);
itimerval.it_value.tv_sec = seconds;
- itimerval.it_interval.tv_usec = 1;
+ /*
+ * SLES11 has high precision timers; too low an interval will cause timer
+ * to fire extremely rapidly after first occurrence. We set it to 10 ms.
+ */
+ itimerval.it_interval.tv_usec = 10000;
setitimer(ITIMER_REAL, &itimerval, 0);
}
Modified: branches/ofed-1.4.2/qperf/trunk/src/rdma.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/qperf/trunk/src/rdma.c?rev=412&op=diff
==============================================================================
--- branches/ofed-1.4.2/qperf/trunk/src/rdma.c (original)
+++ branches/ofed-1.4.2/qperf/trunk/src/rdma.c Fri Aug 7 11:55:00 2009
@@ -326,6 +326,18 @@
/*
+ * This routine is never called and is solely to avoid compiler warnings for
+ * functions that are not currently being used.
+ */
+void
+rdma_not_called(void)
+{
+ if (0)
+ ib_migrate(NULL);
+}
+
+
+/*
* Measure RC bi-directional bandwidth (client side).
*/
void
@@ -1319,9 +1331,9 @@
int i;
int slots;
DEVICE dev;
- uint64_t args[2];
int head = 0;
int tail = 0;
+ uint64_t args[2] = {0};
rd_params(IBV_QPT_RC, K64, 1, 1);
rd_open(&dev, IBV_QPT_RC, NCQE, 0);
@@ -1349,8 +1361,8 @@
if (n > LStat.max_cqes)
LStat.max_cqes = n;
for (i = 0; i < n; ++i) {
- uint64_t want;
uint64_t seen;
+ uint64_t want = 0;
int x = wc[i].wr_id;
int status = wc[i].status;
Modified: branches/ofed-1.4.2/qperf/trunk/src/support.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/qperf/trunk/src/support.c?rev=412&op=diff
==============================================================================
--- branches/ofed-1.4.2/qperf/trunk/src/support.c (original)
+++ branches/ofed-1.4.2/qperf/trunk/src/support.c Fri Aug 7 11:55:00 2009
@@ -357,6 +357,7 @@
}
len -= n;
ioc += n;
+ buf += n;
}
return ioc;
}
@@ -418,6 +419,7 @@
void
urgent(void)
{
+ int z;
char *p, *q;
char buffer[256];
@@ -469,7 +471,7 @@
remote_failure_error();
if (s)
break;
- read(RemoteFD, p, q-p);
+ z = read(RemoteFD, p, q-p);
}
while (p < q) {
@@ -482,7 +484,7 @@
timeout_end();
buf_end(&p, q);
- write(2, buffer, p+1-buffer);
+ z = write(2, buffer, p+1-buffer);
die();
}
@@ -503,6 +505,7 @@
static void
remote_failure_error(void)
{
+ int z;
char buffer[256];
char *p = buffer;
char *q = p + sizeof(buffer);
@@ -510,7 +513,7 @@
buf_app(&p, q, remote_name());
buf_app(&p, q, " failure");
buf_end(&p, q);
- write(2, buffer, p+1-buffer);
+ z = write(2, buffer, p+1-buffer);
die();
}
@@ -536,6 +539,7 @@
int
error(int actions, char *fmt, ...)
{
+ int z;
va_list alist;
char buffer[256];
char *p = buffer;
@@ -557,7 +561,7 @@
if (RemoteFD >= 0) {
send(RemoteFD, "?", 1, MSG_OOB);
- write(RemoteFD, buffer, p-buffer);
+ z = write(RemoteFD, buffer, p-buffer);
shutdown(RemoteFD, SHUT_WR);
timeout_set(ERROR_TIMEOUT, sig_alrm_die);
while (read(RemoteFD, buffer, sizeof(buffer)) > 0)
@@ -659,6 +663,7 @@
vfprintf(stderr, fmt, alist);
va_end(alist);
fprintf(stderr, "\n");
+ fflush(stderr);
}
More information about the Pkg-ofed-commits
mailing list