Rebase to upstream release perftest-4.4-0.29

Signed-off-by: Honggang Li <honli@redhat.com>
This commit is contained in:
Honggang Li 2020-05-24 21:54:17 -04:00
parent 6db8f9776c
commit 0366c66634
5 changed files with 8 additions and 59 deletions

1
.gitignore vendored
View File

@ -17,3 +17,4 @@ noarch/
/perftest-4.2-0.8.g0e24e67.tar.gz
/perftest-4.4-0.11.gd240b65.tar.gz
/perftest-4.4-0.23.g89e176a.tar.gz
/perftest-4.4-0.29.g817ec38.tar.gz

View File

@ -1,26 +0,0 @@
From 144ff72482dba53dd290e0743c6a557c9eae99df Mon Sep 17 00:00:00 2001
From: Honggang Li <honli@redhat.com>
Date: Mon, 10 Feb 2020 02:18:42 -0500
Subject: [PATCH 10/11] Fix multiple definition of duration_param
Signed-off-by: Honggang Li <honli@redhat.com>
---
src/raw_ethernet_resources.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/raw_ethernet_resources.c b/src/raw_ethernet_resources.c
index 9e3a455..a5f8057 100755
--- a/src/raw_ethernet_resources.c
+++ b/src/raw_ethernet_resources.c
@@ -55,7 +55,7 @@
#include <config.h>
#endif
-struct perftest_parameters* duration_param;
+extern struct perftest_parameters* duration_param;
int check_flow_steering_support(char *dev_name)
{
--
2.25.0

View File

@ -1,26 +0,0 @@
From 32a97e3718a94d57dd7ccc343f94d7ac5ef6d1c4 Mon Sep 17 00:00:00 2001
From: Honggang Li <honli@redhat.com>
Date: Mon, 10 Feb 2020 02:19:16 -0500
Subject: [PATCH 11/11] Replace '_BSD_SOURCE' with '_DEFAULT_SOURCE'
Signed-off-by: Honggang Li <honli@redhat.com>
---
src/get_clock.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/get_clock.c b/src/get_clock.c
index 91aaf72..acdc6f1 100755
--- a/src/get_clock.c
+++ b/src/get_clock.c
@@ -39,7 +39,7 @@
/* #define GET_CPU_MHZ_FROM_PROC 1 */
/* For gettimeofday */
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
#include <sys/time.h>
#include <unistd.h>
--
2.25.0

View File

@ -1,11 +1,9 @@
Name: perftest
Summary: IB Performance Tests
Version: 4.4
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2 or BSD
Source: https://github.com/linux-rdma/perftest/releases/download/v4.4-0.23-beta/perftest-4.4-0.23.g89e176a.tar.gz
Patch0010: 0010-Fix-multiple-definition-of-duration_param.patch
Patch0011: 0011-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch
Source: https://github.com/linux-rdma/perftest/releases/download/4.4-0.29/perftest-4.4-0.29.g817ec38.tar.gz
Url: https://github.com/linux-rdma/perftest
BuildRequires: gcc
@ -23,12 +21,11 @@ RDMA networks.
%prep
%setup -q
%autosetup -v -p1
find src -type f -iname '*.[ch]' -exec chmod a-x '{}' ';'
%build
%configure
make %{?_smp_mflags} CFLAGS+="-fPIC -g -Wall -D_GNU_SOURCE -O3"
make V=1 %{?_smp_mflags}
%install
for file in ib_{atomic,read,send,write}_{lat,bw} raw_ethernet_{lat,bw}; do
@ -41,6 +38,9 @@ done
%_bindir/*
%changelog
* Sun May 24 2020 Honggang Li <honli@redhat.com> - 4.4-3
- Rebase to upstream release perftest-4.4-0.29
* Sun Apr 12 2020 Honggang Li <honli@redhat.com> - 4.4-2
- Rebase to upstream release perftest-4.4-0.23

View File

@ -1 +1 @@
SHA512 (perftest-4.4-0.23.g89e176a.tar.gz) = 39d84e6d76c0ff2f494aba40f527c9566def4f2855052906d18a3393d97f8030ca65dcbcd503198c3b4b93ee61b415b035fd2639f603bfdf0b48057694094d9f
SHA512 (perftest-4.4-0.29.g817ec38.tar.gz) = 896e9f610a58080c7d6c8b2102ba0921880609253ff5449c173fa2ba2f4fbb6d7bbe4f11445f0c2d71e91494435ed9851fd10ac9a5e9229f37a4ba633cdf60cc