[Pkg-ofed-commits] [perftest] 06/12: Refresh patches

Benjamin Drung bdrung at moszumanska.debian.org
Mon Aug 22 09:17:56 UTC 2016


This is an automated email from the git hooks/post-receive script.

bdrung pushed a commit to branch master
in repository perftest.

commit 589b6e984b449b865593a82ba8c241f182c3e9dd
Author: Benjamin Drung <benjamin.drung at profitbricks.com>
Date:   Mon Aug 22 10:49:34 2016 +0200

    Refresh patches
---
 .../0001-Fix-spelling-errors-in-binaries.patch     | 50 ++++++++--------------
 debian/patches/Fix-typos-in-s390x-support.patch    | 16 +++----
 2 files changed, 23 insertions(+), 43 deletions(-)

diff --git a/debian/patches/0001-Fix-spelling-errors-in-binaries.patch b/debian/patches/0001-Fix-spelling-errors-in-binaries.patch
index 598b9b1..9b54584 100644
--- a/debian/patches/0001-Fix-spelling-errors-in-binaries.patch
+++ b/debian/patches/0001-Fix-spelling-errors-in-binaries.patch
@@ -13,11 +13,9 @@ Subject: Fix spelling errors in binaries
  src/write_bw.c               | 2 +-
  8 files changed, 13 insertions(+), 13 deletions(-)
 
-diff --git a/src/atomic_bw.c b/src/atomic_bw.c
-index 73f2a38..68076c7 100755
 --- a/src/atomic_bw.c
 +++ b/src/atomic_bw.c
-@@ -272,7 +272,7 @@ int main(int argc, char *argv[])
+@@ -272,7 +272,7 @@
  		}
  
  		if (run_iter_bw(&ctx, &user_param)) {
@@ -26,7 +24,7 @@ index 73f2a38..68076c7 100755
  			return 1;
  		}
  
-@@ -301,7 +301,7 @@ int main(int argc, char *argv[])
+@@ -301,7 +301,7 @@
  	} else if (user_param.test_method == RUN_INFINITELY) {
  
  		if (run_iter_bw_infinitely(&ctx, &user_param)) {
@@ -35,11 +33,9 @@ index 73f2a38..68076c7 100755
  			return 1;
  		}
  	}
-diff --git a/src/perftest_communication.c b/src/perftest_communication.c
-index cd219fd..e9a2586 100755
 --- a/src/perftest_communication.c
 +++ b/src/perftest_communication.c
-@@ -492,7 +492,7 @@ static int ethernet_server_connect(struct perftest_comm *comm)
+@@ -677,7 +677,7 @@
  	hints.ai_socktype = SOCK_STREAM;
  
  	if (check_add_port(&service,comm->rdma_params->port,NULL,&hints,&res)) {
@@ -48,7 +44,7 @@ index cd219fd..e9a2586 100755
  		return 1;
  	}
  
-@@ -700,7 +700,7 @@ int rdma_client_connect(struct pingpong_context *ctx,struct perftest_parameters
+@@ -871,7 +871,7 @@
  	hints.ai_socktype = SOCK_STREAM;
  
  	if (check_add_port(&service,user_param->port,user_param->servername,&hints,&res)) {
@@ -57,7 +53,7 @@ index cd219fd..e9a2586 100755
  		return FAILURE;
  	}
  
-@@ -895,7 +895,7 @@ int rdma_server_connect(struct pingpong_context *ctx,
+@@ -1069,7 +1069,7 @@
  	hints.ai_socktype = SOCK_STREAM;
  
  	if (check_add_port(&service,user_param->port,user_param->servername,&hints,&res)) {
@@ -66,11 +62,9 @@ index cd219fd..e9a2586 100755
  		return FAILURE;
  	}
  
-diff --git a/src/perftest_resources.c b/src/perftest_resources.c
-index 71a1541..0681430 100755
 --- a/src/perftest_resources.c
 +++ b/src/perftest_resources.c
-@@ -3468,7 +3468,7 @@ int run_iter_bw_infinitely_server(struct pingpong_context *ctx, struct perftest_
+@@ -3594,7 +3594,7 @@
  			}
  
  		} else if (ne < 0) {
@@ -79,11 +73,9 @@ index 71a1541..0681430 100755
  			return_value = 1;
  			goto cleaning;
  		}
-diff --git a/src/perftest_resources.h b/src/perftest_resources.h
-index c5b6413..4625cb7 100755
 --- a/src/perftest_resources.h
 +++ b/src/perftest_resources.h
-@@ -109,7 +109,7 @@
+@@ -113,7 +113,7 @@
  /* UD addition to the buffer. */
  #define IF_UD_ADD(type,cache_line_size) ((type == UD) ? (cache_line_size) : (0))
  
@@ -92,32 +84,28 @@ index c5b6413..4625cb7 100755
   * If message size is smaller then CACHE_LINE size then we write in CACHE_LINE jumps.
   */
  #define INC(size,cache_line_size) ((size > cache_line_size) ? ((size%cache_line_size == 0) ?  \
-diff --git a/src/raw_ethernet_send_bw.c b/src/raw_ethernet_send_bw.c
-index 3fa6296..f5e06a9 100755
 --- a/src/raw_ethernet_send_bw.c
 +++ b/src/raw_ethernet_send_bw.c
-@@ -321,14 +321,14 @@ int main(int argc, char *argv[])
+@@ -338,14 +338,14 @@
  		if (user_param.machine == CLIENT) {
  
- 			if(run_iter_bw_infinitely(&ctx,&user_param)) {
--				fprintf(stderr," Error occured while running infinitely! aborting ...\n");
-+				fprintf(stderr," Error occurred while running infinitely! aborting ...\n");
+ 			if(run_iter_bw_infinitely(&ctx, &user_param)) {
+-				fprintf(stderr, " Error occured while running infinitely! aborting ...\n");
++				fprintf(stderr, " Error occurred while running infinitely! aborting ...\n");
  				return 1;
  			}
  
  		} else if (user_param.machine == SERVER) {
  
- 			if(run_iter_bw_infinitely_server(&ctx,&user_param)) {
--				fprintf(stderr," Error occured while running infinitely on server! aborting ...\n");
-+				fprintf(stderr," Error occurred while running infinitely on server! aborting ...\n");
+ 			if(run_iter_bw_infinitely_server(&ctx, &user_param)) {
+-				fprintf(stderr, " Error occured while running infinitely on server! aborting ...\n");
++				fprintf(stderr, " Error occurred while running infinitely on server! aborting ...\n");
  				return 1;
  			}
  		}
-diff --git a/src/read_bw.c b/src/read_bw.c
-index d5dde51..961dc1c 100755
 --- a/src/read_bw.c
 +++ b/src/read_bw.c
-@@ -343,7 +343,7 @@ int main(int argc, char *argv[])
+@@ -343,7 +343,7 @@
  		ctx_set_send_wqes(&ctx,&user_param,rem_dest);
  
  		if(run_iter_bw_infinitely(&ctx,&user_param)) {
@@ -126,11 +114,9 @@ index d5dde51..961dc1c 100755
  			return 1;
  		}
  	}
-diff --git a/src/send_bw.c b/src/send_bw.c
-index 8184c2f..ee6ada3 100755
 --- a/src/send_bw.c
 +++ b/src/send_bw.c
-@@ -524,14 +524,14 @@ int main(int argc, char *argv[])
+@@ -524,14 +524,14 @@
  		if (user_param.machine == CLIENT) {
  
  			if(run_iter_bw_infinitely(&ctx,&user_param)) {
@@ -147,11 +133,9 @@ index 8184c2f..ee6ada3 100755
  				return 1;
  			}
  		}
-diff --git a/src/write_bw.c b/src/write_bw.c
-index cb31410..45b6d53 100755
 --- a/src/write_bw.c
 +++ b/src/write_bw.c
-@@ -344,7 +344,7 @@ int main(int argc, char *argv[])
+@@ -345,7 +345,7 @@
  		ctx_set_send_wqes(&ctx,&user_param,rem_dest);
  
  		if(run_iter_bw_infinitely(&ctx,&user_param)) {
diff --git a/debian/patches/Fix-typos-in-s390x-support.patch b/debian/patches/Fix-typos-in-s390x-support.patch
index a730e70..01dffb5 100644
--- a/debian/patches/Fix-typos-in-s390x-support.patch
+++ b/debian/patches/Fix-typos-in-s390x-support.patch
@@ -12,11 +12,9 @@ Bug-Ubuntu: 1545010
 Forwarded: http://www.spinics.net/lists/linux-rdma/msg33357.html
 Last-Update: 2016-02-12
 
-Index: perftest/README
-===================================================================
---- perftest.orig/README
-+++ perftest/README
-@@ -237,7 +237,7 @@ Special feature detailed explanation in
+--- a/README
++++ b/README
+@@ -237,7 +237,7 @@
      ./configure --disable-verbs_exp
      make
  
@@ -25,11 +23,9 @@ Index: perftest/README
  
   7. perftest-2.3 release includes support for dualport VPI test - port1-Ethernet , port2-IB. (in addition to Eth:Eth, IB:IB)
      Currently, running dualport when port1-IB , port2-Ethernet still not working.
-Index: perftest/src/get_clock.c
-===================================================================
---- perftest.orig/src/get_clock.c
-+++ perftest/src/get_clock.c
-@@ -201,7 +201,7 @@ static double proc_get_cpu_mhz(int no_cp
+--- a/src/get_clock.c
++++ b/src/get_clock.c
+@@ -214,7 +214,7 @@
  double get_cpu_mhz(int no_cpu_freq_warn)
  {
  	#ifdef __s390x__

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/perftest.git



More information about the Pkg-ofed-commits mailing list