From 0d68cfcf18f8f2118d5115fe3766d72c0630bb4d Mon Sep 17 00:00:00 2001 From: James Simmons Date: Tue, 4 Oct 2016 19:07:42 -0400 Subject: [PATCH] LU-6387 tests: fix lp_utils build issues on Power8 With the latest RHEL7 image for power8 some compile issues have surfaced. Currently the issue is with begin() and end() inline functions for the lp_util code. The solution appears to not make the functions inline. Change-Id: I8f11ed488890407c117f13ebc741d7140702c647 Signed-off-by: James Simmons Reviewed-on: http://review.whamcloud.com/22941 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Bob Glossman Reviewed-by: Frank Zago Reviewed-by: Dmitry Eremin Reviewed-by: Oleg Drokin --- lustre/tests/lp_utils.c | 4 ++-- lustre/tests/lp_utils.h | 4 ++-- lustre/tests/mpi/lp_utils.c | 4 ++-- lustre/tests/mpi/lp_utils.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lustre/tests/lp_utils.c b/lustre/tests/lp_utils.c index e752c28..ea0170b 100644 --- a/lustre/tests/lp_utils.c +++ b/lustre/tests/lp_utils.c @@ -68,7 +68,7 @@ char *timestamp() { return datestring; } -inline void begin(char *str) { +void begin(char *str) { if (verbose > 0 && rank == 0) { gettimeofday(&t1, NULL); printf("%s:\tBeginning %s\n", timestamp(), str); @@ -76,7 +76,7 @@ inline void begin(char *str) { } } -inline void end(char *str) { +void end(char *str) { float elapsed; MPI_Barrier(MPI_COMM_WORLD); diff --git a/lustre/tests/lp_utils.h b/lustre/tests/lp_utils.h index 0c6b87f..5406148 100644 --- a/lustre/tests/lp_utils.h +++ b/lustre/tests/lp_utils.h @@ -63,8 +63,8 @@ extern char hostname[]; extern char *timestamp(); extern char *testdir; -extern inline void begin(char *str); -extern inline void end(char *str); +extern void begin(char *str); +extern void end(char *str); extern void dump_diff(char *orig_buf, char *buf, int len, long off); extern void lp_gethostname(void); diff --git a/lustre/tests/mpi/lp_utils.c b/lustre/tests/mpi/lp_utils.c index e738164..879e814 100644 --- a/lustre/tests/mpi/lp_utils.c +++ b/lustre/tests/mpi/lp_utils.c @@ -67,7 +67,7 @@ char *timestamp() { return datestring; } -inline void begin(char *str) { +void begin(char *str) { if (verbose > 0 && rank == 0) { gettimeofday(&t1, NULL); printf("%s:\tBeginning %s\n", timestamp(), str); @@ -75,7 +75,7 @@ inline void begin(char *str) { } } -inline void end(char *str) { +void end(char *str) { float elapsed; MPI_Barrier(MPI_COMM_WORLD); diff --git a/lustre/tests/mpi/lp_utils.h b/lustre/tests/mpi/lp_utils.h index dd289a6..c541690 100644 --- a/lustre/tests/mpi/lp_utils.h +++ b/lustre/tests/mpi/lp_utils.h @@ -63,8 +63,8 @@ extern char hostname[]; extern char *timestamp(); extern char *testdir; -extern inline void begin(char *str); -extern inline void end(char *str); +extern void begin(char *str); +extern void end(char *str); extern void dump_diff(char *orig_buf, char *buf, int len, long off); extern void lp_gethostname(void); -- 1.8.3.1