[Pkg-ofed-commits] [perftest] 03/05: Refresh patches
Benjamin Drung
bdrung at moszumanska.debian.org
Mon Jan 2 12:55:05 UTC 2017
This is an automated email from the git hooks/post-receive script.
bdrung pushed a commit to branch master
in repository perftest.
commit fcf653e504a37129ad50e23fcd27440d06337092
Author: Benjamin Drung <benjamin.drung at profitbricks.com>
Date: Mon Jan 2 13:42:15 2017 +0100
Refresh patches
---
.../0001-Fix-spelling-errors-in-binaries.patch | 30 ++++-----
debian/patches/Fix-typo-destory.patch | 72 ++++++++++++++++++----
debian/patches/Fix-typos-in-s390x-support.patch | 4 +-
debian/patches/fix-cflags.patch | 4 +-
4 files changed, 80 insertions(+), 30 deletions(-)
diff --git a/debian/patches/0001-Fix-spelling-errors-in-binaries.patch b/debian/patches/0001-Fix-spelling-errors-in-binaries.patch
index 9b54584..2540a85 100644
--- a/debian/patches/0001-Fix-spelling-errors-in-binaries.patch
+++ b/debian/patches/0001-Fix-spelling-errors-in-binaries.patch
@@ -15,22 +15,22 @@ Subject: Fix spelling errors in binaries
--- a/src/atomic_bw.c
+++ b/src/atomic_bw.c
-@@ -272,7 +272,7 @@
+@@ -274,7 +274,7 @@
}
if (run_iter_bw(&ctx, &user_param)) {
- fprintf(stderr, " Error occured in run_iter function\n");
+ fprintf(stderr, " Error occurred in run_iter function\n");
- return 1;
+ return FAILURE;
}
-@@ -301,7 +301,7 @@
+@@ -303,7 +303,7 @@
} else if (user_param.test_method == RUN_INFINITELY) {
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;
+ return FAILURE;
}
}
--- a/src/perftest_communication.c
@@ -64,13 +64,13 @@ Subject: Fix spelling errors in binaries
--- a/src/perftest_resources.c
+++ b/src/perftest_resources.c
-@@ -3594,7 +3594,7 @@
+@@ -3704,7 +3704,7 @@
}
} else if (ne < 0) {
- fprintf(stderr, "Poll Recieve CQ failed %d\n", ne);
+ fprintf(stderr, "Poll Receive CQ failed %d\n", ne);
- return_value = 1;
+ return_value = FAILURE;
goto cleaning;
}
--- a/src/perftest_resources.h
@@ -86,13 +86,13 @@ Subject: Fix spelling errors in binaries
#define INC(size,cache_line_size) ((size > cache_line_size) ? ((size%cache_line_size == 0) ? \
--- a/src/raw_ethernet_send_bw.c
+++ b/src/raw_ethernet_send_bw.c
-@@ -338,14 +338,14 @@
+@@ -392,14 +392,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");
- return 1;
+ return FAILURE;
}
} else if (user_param.machine == SERVER) {
@@ -100,18 +100,18 @@ Subject: Fix spelling errors in binaries
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;
+ return FAILURE;
}
}
--- a/src/read_bw.c
+++ b/src/read_bw.c
-@@ -343,7 +343,7 @@
+@@ -346,7 +346,7 @@
ctx_set_send_wqes(&ctx,&user_param,rem_dest);
if(run_iter_bw_infinitely(&ctx,&user_param)) {
- fprintf(stderr," Error occured while running! aborting ...\n");
+ fprintf(stderr," Error occurred while running! aborting ...\n");
- return 1;
+ return FAILURE;
}
}
--- a/src/send_bw.c
@@ -122,7 +122,7 @@ Subject: Fix spelling errors in binaries
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;
+ return FAILURE;
}
} else if (user_param.machine == SERVER) {
@@ -130,17 +130,17 @@ Subject: Fix spelling errors in binaries
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;
+ return FAILURE;
}
}
--- a/src/write_bw.c
+++ b/src/write_bw.c
-@@ -345,7 +345,7 @@
+@@ -350,7 +350,7 @@
ctx_set_send_wqes(&ctx,&user_param,rem_dest);
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;
+ return FAILURE;
}
}
diff --git a/debian/patches/Fix-typo-destory.patch b/debian/patches/Fix-typo-destory.patch
index c3d1c5b..f8fdd4d 100644
--- a/debian/patches/Fix-typo-destory.patch
+++ b/debian/patches/Fix-typo-destory.patch
@@ -3,33 +3,54 @@ Author: Benjamin Drung <benjamin.drung at profitbricks.com>
--- a/src/raw_ethernet_send_bw.c
+++ b/src/raw_ethernet_send_bw.c
-@@ -359,7 +359,7 @@
- if (ibv_destroy_flow(flow_create_result[i])) {
- #endif
- perror("error");
-- fprintf(stderr, "Couldn't Destory flow\n");
-+ fprintf(stderr, "Couldn't destroy flow\n");
- return FAILURE;
+@@ -415,7 +415,7 @@
+ if (ibv_destroy_flow(flow_create_result[flow_index + qp_index * user_param.flows])) {
+ #endif
+ perror("error");
+- fprintf(stderr, "Couldn't Destory flow\n");
++ fprintf(stderr, "Couldn't destroy flow\n");
+ return FAILURE;
+ }
+ }
+@@ -430,7 +430,7 @@
+ if (ibv_destroy_flow(flow_promisc[qp_index])) {
+ #endif
+ perror("error");
+- fprintf(stderr, "Couldn't Destory flow\n");
++ fprintf(stderr, "Couldn't destroy flow\n");
+ return FAILURE;
+ }
+ }
+@@ -446,7 +446,7 @@
+ if (ibv_destroy_flow(flow_sniffer[qp_index])) {
+ #endif
+ perror("error");
+- fprintf(stderr, "Couldn't Destory sniffer flow\n");
++ fprintf(stderr, "Couldn't destroy sniffer flow\n");
+ return FAILURE;
+ }
}
-
--- a/src/raw_ethernet_send_lat.c
+++ b/src/raw_ethernet_send_lat.c
-@@ -261,12 +261,12 @@
+@@ -247,7 +247,7 @@
user_param.test_type == ITERATIONS ? print_report_lat(&user_param) :
print_report_lat_duration(&user_param);
- /* destory promisc flow */
+ /* destroy promisc flow */
- #ifdef HAVE_RAW_ETH_EXP
if (user_param.use_promiscuous) {
+ #ifdef HAVE_RAW_ETH_EXP
if (ibv_exp_destroy_flow(flow_promisc)) {
+@@ -255,7 +255,7 @@
+ if (ibv_destroy_flow(flow_promisc)) {
+ #endif
perror("error");
- fprintf(stderr, "Couldn't Destory promisc flow\n");
+ fprintf(stderr, "Couldn't destroy promisc flow\n");
return FAILURE;
}
}
-@@ -280,7 +280,7 @@
+@@ -268,7 +268,7 @@
if (ibv_destroy_flow(flow_create_result[i])) {
#endif
perror("error");
@@ -52,3 +73,32 @@ Author: Benjamin Drung <benjamin.drung at profitbricks.com>
return FAILURE;
}
if (user_param.work_rdma_cm == ON) {
+--- a/src/raw_ethernet_send_burst_lat.c
++++ b/src/raw_ethernet_send_burst_lat.c
+@@ -252,7 +252,7 @@
+ if (user_param.machine == CLIENT)
+ print_report_lat(&user_param);
+
+- /* destory promisc flow */
++ /* destroy promisc flow */
+ if (user_param.use_promiscuous) {
+ #ifdef HAVE_RAW_ETH_EXP
+ if (ibv_exp_destroy_flow(flow_promisc)) {
+@@ -260,7 +260,7 @@
+ if (ibv_destroy_flow(flow_promisc)) {
+ #endif
+ perror("error");
+- fprintf(stderr, "Couldn't Destory promisc flow\n");
++ fprintf(stderr, "Couldn't destroy promisc flow\n");
+ return FAILURE;
+ }
+ }
+@@ -273,7 +273,7 @@
+ if (ibv_destroy_flow(flow_create_result[i])) {
+ #endif
+ perror("error");
+- fprintf(stderr, "Couldn't Destory flow\n");
++ fprintf(stderr, "Couldn't destroy flow\n");
+ return FAILURE;
+ }
+
diff --git a/debian/patches/Fix-typos-in-s390x-support.patch b/debian/patches/Fix-typos-in-s390x-support.patch
index 01dffb5..b3400b9 100644
--- a/debian/patches/Fix-typos-in-s390x-support.patch
+++ b/debian/patches/Fix-typos-in-s390x-support.patch
@@ -10,7 +10,7 @@ failure. The version on the mailing list looks fine:
Signed-off-by: dann frazier <dann.frazier at canonical.com>
Bug-Ubuntu: 1545010
Forwarded: http://www.spinics.net/lists/linux-rdma/msg33357.html
-Last-Update: 2016-02-12
+Last-Update: 2017-01-02
--- a/README
+++ b/README
@@ -25,7 +25,7 @@ Last-Update: 2016-02-12
Currently, running dualport when port1-IB , port2-Ethernet still not working.
--- a/src/get_clock.c
+++ b/src/get_clock.c
-@@ -214,7 +214,7 @@
+@@ -213,7 +213,7 @@
double get_cpu_mhz(int no_cpu_freq_warn)
{
#ifdef __s390x__
diff --git a/debian/patches/fix-cflags.patch b/debian/patches/fix-cflags.patch
index 5257e6f..f54a5bb 100644
--- a/debian/patches/fix-cflags.patch
+++ b/debian/patches/fix-cflags.patch
@@ -5,8 +5,8 @@ Author: Benjamin Drung <benjamin.drung at profitbricks.com>
--- a/configure.ac
+++ b/configure.ac
-@@ -189,7 +189,7 @@
- AC_DEFINE([HAVE_GID_ATTR], [1], [Enable GID Attribute query feature])
+@@ -271,7 +271,7 @@
+ AC_DEFINE([HAVE_PACKET_PACING], [1], [Have PACKET_PACING support])
fi
-CFLAGS="-g -Wall -D_GNU_SOURCE -O3"
--
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