From 6030b495ddc5105747c415c05ad44d6195592a40 Mon Sep 17 00:00:00 2001 From: Pavel Shamis Date: Sat, 8 Nov 2014 13:01:52 -0500 Subject: [PATCH] Fixing multiple build issues on non-mlnx systems * Autotools scripts were updated * Fixing multiple warnings in gtests * Other minor issue * Making the code config.h compliant --- config/m4/ib.m4 | 6 ++--- config/m4/sysdep.m4 | 22 +++++++++++++--- configure.ac | 14 ++++++++-- contrib/configure-devel | 4 +-- src/ucs/Makefile.am | 12 +++++++-- src/ucs/debug/instrument.h | 1 + src/ucs/debug/memtrack.h | 3 ++- src/ucs/gtest/main.cc | 5 +++- src/ucs/stats/stats.h | 1 - src/uct/ib/base/ib_device.c | 2 +- src/uct/ib/base/ib_verbs.h | 9 ++++--- test/gtest/ucs/test_config.cc | 30 ++++++++++----------- test/gtest/ucs/test_datatype.cc | 34 ++++++++++++------------ test/gtest/ucs/test_frag_list.cc | 42 +++++++++++++++--------------- test/gtest/ucs/test_instr.cc | 4 +-- test/gtest/ucs/test_math.cc | 24 ++++++++--------- test/gtest/ucs/test_memtrack.cc | 6 ++--- test/gtest/ucs/test_stats.cc | 12 ++++----- test/gtest/ucs/test_twheel.cc | 8 +++--- test/gtest/uct/test_uct_context.cc | 6 ++--- 20 files changed, 143 insertions(+), 102 deletions(-) diff --git a/config/m4/ib.m4 b/config/m4/ib.m4 index e5ebcff1f39..c1bfa145235 100644 --- a/config/m4/ib.m4 +++ b/config/m4/ib.m4 @@ -1,6 +1,6 @@ # # Copyright (C) Mellanox Technologies Ltd. 2001-2014. ALL RIGHTS RESERVED. -# +# Copyright (C) UT-Battelle, LLC. 2014. ALL RIGHTS RESERVED. # $COPYRIGHT$ # $HEADER$ # @@ -55,11 +55,11 @@ AS_IF([test "x$with_dc" != xno], # AS_IF([test "x$with_ib" != xno], [AC_CHECK_HEADER([infiniband/verbs.h], [], - [AC_MSG_ERROR([ibverbs header files not found]);with_ib=no]) + [AC_MSG_WARN([ibverbs header files not found]);with_ib=no]) save_LDFLAGS="$LDFLAGS" AC_CHECK_LIB([ibverbs], [ibv_get_device_list], [AC_SUBST(IBVERBS_LDFLAGS, [-libverbs])], - [AC_MSG_ERROR([libibverbs not found]);with_ib=no]) + [AC_MSG_WARN([libibverbs not found]);with_ib=no]) LDFLAGS="$save_LDFLAGS" ]) AS_IF([test "x$with_ib" != xno], diff --git a/config/m4/sysdep.m4 b/config/m4/sysdep.m4 index 20d25bd2fbf..d514c4b8f58 100644 --- a/config/m4/sysdep.m4 +++ b/config/m4/sysdep.m4 @@ -1,6 +1,6 @@ # # Copyright (C) Mellanox Technologies Ltd. 2001-2014. ALL RIGHTS RESERVED. -# +# Copyright (C) UT-Battelle, LLC. 2014. ALL RIGHTS RESERVED. # $COPYRIGHT$ # $HEADER$ # @@ -66,10 +66,24 @@ GTEST_LIB_CHECK([1.5.0], [true], [true]) # # Boost C++ library (if we're using gtest) # +AC_ARG_WITH([boost], + AC_HELP_STRING([--with-boost], + [Enable Boost C++ library (required by gtest)]), + [], + [with_boost=no]) + if test "x$HAVE_GTEST" = "xyes"; then - AC_LANG_PUSH([C++]) - AC_MSG_CHECKING([for boost]) + AC_LANG_PUSH([C++]) + AC_MSG_CHECKING([for boost]) + + AS_IF([test "x$with_boost" != xno], + [GTEST_CPPFLAGS="$GTEST_CPPFLAGS -I$with_boost" + GTEST_LDFLAGS="$GTEST_LDFLAGS -L$with_boost/stage/lib"],[]) + + ORIG_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$GTEST_CPPFLAGS $CXXFLAGS" + AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include ]] [[ @@ -82,6 +96,8 @@ if test "x$HAVE_GTEST" = "xyes"; then AC_CHECK_DECLS([BOOST_FOREACH], [], AC_MSG_ERROR([BOOST_FOREACH not supported]), [#include ]) + + CXXFLAGS=$ORIG_CXXFLAGS AC_LANG_POP fi diff --git a/configure.ac b/configure.ac index 221897256d0..be1f032304b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # # Copyright (C) Mellanox Technologies Ltd. 2001-2011. ALL RIGHTS RESERVED. -# +# Copyright (C) UT-Battelle, LLC. 2014. ALL RIGHTS RESERVED. # $COPYRIGHT$ # $HEADER$ # @@ -22,7 +22,17 @@ config_flags="$*" valgrind_libpath="" AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([1.10 foreign tar-ustar silent-rules subdir-objects]) + +AH_TOP([ +#ifndef UCX_CONFIG_H +#define UCX_CONFIG_H +]) + +AH_BOTTOM([ +#endif /* UCX_CONFIG_H */ +]) + +AM_INIT_AUTOMAKE([1.10 foreign tar-ustar subdir-objects]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AM_MAINTAINER_MODE AC_CONFIG_MACRO_DIR([config/m4]) diff --git a/contrib/configure-devel b/contrib/configure-devel index 0391cf2a8c2..26254b22ba6 100755 --- a/contrib/configure-devel +++ b/contrib/configure-devel @@ -1,7 +1,7 @@ #!/bin/sh # # Copyright (C) Mellanox Technologies Ltd. 2001-2014. ALL RIGHTS RESERVED. -# +# Copyright (C) UT-Battelle, LLC. 2014. ALL RIGHTS RESERVED. # $COPYRIGHT$ # $HEADER$ # @@ -14,7 +14,7 @@ basedir=$(cd $(dirname $0) && pwd) $basedir/../configure \ --enable-gtest \ - --with-valgrind \ + --with-valgrind \ --enable-instrumentation \ --enable-frame-pointer \ --enable-stats \ diff --git a/src/ucs/Makefile.am b/src/ucs/Makefile.am index 944ca56f59e..f33a63e6919 100644 --- a/src/ucs/Makefile.am +++ b/src/ucs/Makefile.am @@ -1,6 +1,6 @@ # # Copyright (C) Mellanox Technologies Ltd. 2001-2014. ALL RIGHTS RESERVED. -# +# Copyright (C) 2014 Copyright (C) UT-Battelle, LLC. 2014. ALL RIGHTS RESERVED. # $COPYRIGHT$ # $HEADER$ # @@ -84,9 +84,17 @@ endif if HAVE_GTEST lib_LTLIBRARIES += libucstest.la -libucstest_la_LDFLAGS = -ldl -version-info $(SOVERSION) +libucstest_la_LDFLAGS = -ldl -version-info \ + $(SOVERSION) \ + $(GTEST_LDFLAGS) +libucstest_la_CPPFLAGS = -I$(top_builddir) -I$(abs_top_srcdir)/src \ + $(GTEST_CPPFLAGS) +libucstest_la_CXXFLAGS = $(GTEST_CXXFLAGS) libucstest_la_LIBADD = libucs.la + $(GTEST_LIBS) \ + $(BOOST_THREAD_LIB) libucstest_ladir = $(includedir) + libucstest_la_SOURCES = \ gtest/main.cc \ gtest/test_helpers.cc \ diff --git a/src/ucs/debug/instrument.h b/src/ucs/debug/instrument.h index b07e45dd51a..4ee8ad8d80d 100644 --- a/src/ucs/debug/instrument.h +++ b/src/ucs/debug/instrument.h @@ -12,6 +12,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif + #include #include diff --git a/src/ucs/debug/memtrack.h b/src/ucs/debug/memtrack.h index 8521423eae0..561aae03ba8 100644 --- a/src/ucs/debug/memtrack.h +++ b/src/ucs/debug/memtrack.h @@ -1,6 +1,6 @@ /** * Copyright (C) Mellanox Technologies Ltd. 2001-2013. ALL RIGHTS RESERVED. -* +* Copyright (C) UT-Battelle, LLC. 2014. ALL RIGHTS RESERVED. * $COPYRIGHT$ * $HEADER$ */ @@ -11,6 +11,7 @@ #include #include #include +#include enum { diff --git a/src/ucs/gtest/main.cc b/src/ucs/gtest/main.cc index 44bed3b9079..c335c293a28 100644 --- a/src/ucs/gtest/main.cc +++ b/src/ucs/gtest/main.cc @@ -1,6 +1,6 @@ /** * Copyright (C) Mellanox Technologies Ltd. 2001-2013. ALL RIGHTS RESERVED. -* +* Copyright (C) UT-Battelle, LLC. 2014. ALL RIGHTS RESERVED. * $COPYRIGHT$ * $HEADER$ */ @@ -8,6 +8,9 @@ #include #include extern "C" { +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include } diff --git a/src/ucs/stats/stats.h b/src/ucs/stats/stats.h index 9f293bb28d4..bd0c06a817e 100644 --- a/src/ucs/stats/stats.h +++ b/src/ucs/stats/stats.h @@ -13,7 +13,6 @@ # include "config.h" #endif - void ucs_stats_init(); void ucs_stats_cleanup(); void ucs_stats_dump(); diff --git a/src/uct/ib/base/ib_device.c b/src/uct/ib/base/ib_device.c index 4c5da3ec564..21b51b1187b 100644 --- a/src/uct/ib/base/ib_device.c +++ b/src/uct/ib/base/ib_device.c @@ -1,6 +1,6 @@ /** * Copyright (C) Mellanox Technologies Ltd. 2001-2014. ALL RIGHTS RESERVED. -* +* Copyright (C) UT-Battelle, LLC. 2014. ALL RIGHTS RESERVED. * $COPYRIGHT$ * $HEADER$ */ diff --git a/src/uct/ib/base/ib_verbs.h b/src/uct/ib/base/ib_verbs.h index 9d7a40e76b0..e95fe3462ce 100644 --- a/src/uct/ib/base/ib_verbs.h +++ b/src/uct/ib/base/ib_verbs.h @@ -1,6 +1,6 @@ /** * Copyright (C) Mellanox Technologies Ltd. 2001-2014. ALL RIGHTS RESERVED. -* +* Copyright (C) UT-Battelle, LLC. 2014. ALL RIGHTS RESERVED. * $COPYRIGHT$ * $HEADER$ */ @@ -58,6 +58,9 @@ # define IBV_EXP_WR_ATOMIC_FETCH_AND_ADD IBV_WR_ATOMIC_FETCH_AND_ADD # define IBV_EXP_WR_ATOMIC_CMP_AND_SWP IBV_WR_ATOMIC_CMP_AND_SWP # define ibv_exp_qp_init_attr ibv_qp_init_attr +# define ibv_exp_port_attr ibv_port_attr +# define ibv_exp_query_port ibv_query_port +# define exp_device_cap_flags device_cap_flags # define ibv_exp_create_qp ibv_create_qp struct ibv_exp_reg_mr_in { @@ -74,14 +77,14 @@ static inline struct ibv_mr *ibv_exp_reg_mr(struct ibv_exp_reg_mr_in *in) } # define IBV_IS_MPAGES_AVAIL(_attr) ((_attr)->exp_device_cap_flags & IBV_EXP_DEVICE_MR_ALLOCATE) -# define IBV_DEVICE_HAS_DC(_attr) ((_attr)->exp_device_cap_flags & IBV_EXP_DEVICE_DC_TRANSPORT) +# define IBV_DEVICE_HAS_DC(_attr) 0 # define IBV_EXP_REG_MR_FLAGS(_f, _e) ((_f) | (_e)) # define IBV_SHARED_MR_ACCESS_FLAGS(_shared_mr) ((_shared_mr)->exp_access) # define IBV_EXP_DEVICE_ATTR_SET_COMP_MASK(_attr) # define IBV_EXP_PORT_ATTR_SET_COMP_MASK(_attr) #else # define IBV_IS_MPAGES_AVAIL(_attr) ((_attr)->device_cap_flags2 & IBV_EXP_DEVICE_MR_ALLOCATE) -# define IBV_DEVICE_HAS_DC(_attr) 0 +# define IBV_DEVICE_HAS_DC(_attr) ((_attr)->exp_device_cap_flags & IBV_EXP_DEVICE_DC_TRANSPORT) # define IBV_EXP_REG_MR_FLAGS(_f, _e) (_f) , (_e) # define IBV_SHARED_MR_ACCESS_FLAGS(_shared_mr) ((_shared_mr)->access) # define IBV_EXP_DEVICE_ATTR_SET_COMP_MASK(_attr) (_attr)->comp_mask = (IBV_EXP_DEVICE_ATTR_RESERVED - 1) diff --git a/test/gtest/ucs/test_config.cc b/test/gtest/ucs/test_config.cc index 50d9d855bd1..e00a9940d94 100644 --- a/test/gtest/ucs/test_config.cc +++ b/test/gtest/ucs/test_config.cc @@ -1,6 +1,6 @@ /** * Copyright (C) Mellanox Technologies Ltd. 2001-2014. ALL RIGHTS RESERVED. -* +* Copyright (C) UT-Battelle, LLC. 2014. ALL RIGHTS RESERVED. * $COPYRIGHT$ * $HEADER$ */ @@ -163,14 +163,14 @@ class test_config : public ucs::test { UCS_TEST_F(test_config, parse_default) { car_opts opts("TEST"); - EXPECT_EQ(999, opts->price); + EXPECT_EQ((unsigned)999, opts->price); EXPECT_EQ(std::string("Chevy"), opts->brand); EXPECT_EQ(std::string("Corvette"), opts->model); - EXPECT_EQ(COLOR_RED, opts->color); - EXPECT_EQ(6000, opts->engine.volume); - EXPECT_EQ(COLOR_RED, opts->coach.driver_seat.color); - EXPECT_EQ(COLOR_BLUE, opts->coach.passenger_seat.color); - EXPECT_EQ(COLOR_BLACK, opts->coach.rear_seat.color); + EXPECT_EQ((unsigned)COLOR_RED, opts->color); + EXPECT_EQ((unsigned)6000, opts->engine.volume); + EXPECT_EQ((unsigned)COLOR_RED, opts->coach.driver_seat.color); + EXPECT_EQ((unsigned)COLOR_BLUE, opts->coach.passenger_seat.color); + EXPECT_EQ((unsigned)COLOR_BLACK, opts->coach.rear_seat.color); } @@ -181,10 +181,10 @@ UCS_TEST_F(test_config, parse_with_prefix) { ucs::scoped_setenv env4("UCS_TEST_REAR_COLOR", "white"); car_opts dfl, test("TEST"); - EXPECT_EQ(COLOR_WHITE, dfl->color); - EXPECT_EQ(COLOR_BLACK, test->color); - EXPECT_EQ(COLOR_YELLOW, test->coach.driver_seat.color); - EXPECT_EQ(COLOR_WHITE, test->coach.rear_seat.color); + EXPECT_EQ((unsigned)COLOR_WHITE, dfl->color); + EXPECT_EQ((unsigned)COLOR_BLACK, test->color); + EXPECT_EQ((unsigned)COLOR_YELLOW, test->coach.driver_seat.color); + EXPECT_EQ((unsigned)COLOR_WHITE, test->coach.rear_seat.color); } UCS_TEST_F(test_config, clone) { @@ -194,21 +194,21 @@ UCS_TEST_F(test_config, clone) { { ucs::scoped_setenv env1("UCS_TEST_COLOR", "white"); car_opts opts("TEST"); - EXPECT_EQ(COLOR_WHITE, opts->color); + EXPECT_EQ((unsigned)COLOR_WHITE, opts->color); ucs::scoped_setenv env2("UCS_TEST_COLOR", "black"); opts_clone_ptr = boost::make_shared(opts); } - EXPECT_EQ(COLOR_WHITE, (*opts_clone_ptr)->color); + EXPECT_EQ((unsigned)COLOR_WHITE, (*opts_clone_ptr)->color); } UCS_TEST_F(test_config, set) { car_opts opts("TEST"); - EXPECT_EQ(COLOR_RED, opts->color); + EXPECT_EQ((unsigned)COLOR_RED, opts->color); opts.set("COLOR", "white"); - EXPECT_EQ(COLOR_WHITE, opts->color); + EXPECT_EQ((unsigned)COLOR_WHITE, opts->color); } diff --git a/test/gtest/ucs/test_datatype.cc b/test/gtest/ucs/test_datatype.cc index 59ef424969a..da07ad9af38 100644 --- a/test/gtest/ucs/test_datatype.cc +++ b/test/gtest/ucs/test_datatype.cc @@ -1,6 +1,6 @@ /** * Copyright (C) Mellanox Technologies Ltd. 2001-2014. ALL RIGHTS RESERVED. -* +* Copyright (C) UT-Battelle, LLC. 2014. ALL RIGHTS RESERVED. * $COPYRIGHT$ * $HEADER$ */ @@ -35,7 +35,7 @@ UCS_TEST_F(test_datatype, list_basic) { elem_t *iter, *tmp; ucs_list_head_init(&head); - ASSERT_EQ(0, ucs_list_length(&head)); + ASSERT_EQ((unsigned long)0, ucs_list_length(&head)); ucs_list_insert_after(&head, &elem0.list); ucs_list_insert_before(&head, &elem1.list); @@ -46,13 +46,13 @@ UCS_TEST_F(test_datatype, list_basic) { ASSERT_EQ(2ul, vec.size()); ASSERT_EQ(&elem0, vec[0]); ASSERT_EQ(&elem1, vec[1]); - ASSERT_EQ(2, ucs_list_length(&head)); + ASSERT_EQ((unsigned long)2, ucs_list_length(&head)); ucs_list_for_each_safe(iter, tmp, &head, list) { ucs_list_del(&iter->list); } ASSERT_TRUE(ucs_list_is_empty(&head)); - ASSERT_EQ(0, ucs_list_length(&head)); + ASSERT_EQ((unsigned long)0, ucs_list_length(&head)); } UCS_TEST_F(test_datatype, list_splice) { @@ -104,21 +104,21 @@ UCS_TEST_F(test_datatype, queue) { for (unsigned i = 0; i < 5; ++i) { ucs_queue_push(&head, &elem0.queue); EXPECT_FALSE(ucs_queue_is_empty(&head)); - EXPECT_EQ(1, ucs_queue_length(&head)); + EXPECT_EQ((unsigned long)1, ucs_queue_length(&head)); ucs_queue_push(&head, &elem1.queue); - EXPECT_EQ(2, ucs_queue_length(&head)); + EXPECT_EQ((unsigned long)2, ucs_queue_length(&head)); elem = ucs_queue_pull_elem_non_empty(&head, elem_t, queue); EXPECT_EQ(&elem0, elem); - EXPECT_EQ(1, ucs_queue_length(&head)); + EXPECT_EQ((unsigned long)1, ucs_queue_length(&head)); ucs_queue_push(&head, &elem2.queue); - EXPECT_EQ(2, ucs_queue_length(&head)); + EXPECT_EQ((unsigned long)2, ucs_queue_length(&head)); elem = ucs_queue_pull_elem_non_empty(&head, elem_t, queue); EXPECT_EQ(&elem1, elem); - EXPECT_EQ(1, ucs_queue_length(&head)); + EXPECT_EQ((unsigned long)1, ucs_queue_length(&head)); elem = ucs_queue_pull_elem_non_empty(&head, elem_t, queue); EXPECT_EQ(&elem2, elem); @@ -128,11 +128,11 @@ UCS_TEST_F(test_datatype, queue) { /* Push to head now */ ucs_queue_push_head(&head, &elem2.queue); - EXPECT_EQ(1, ucs_queue_length(&head)); + EXPECT_EQ((unsigned long)1, ucs_queue_length(&head)); ucs_queue_push_head(&head, &elem1.queue); ucs_queue_push_head(&head, &elem0.queue); - EXPECT_EQ(3, ucs_queue_length(&head)); + EXPECT_EQ((unsigned long)3, ucs_queue_length(&head)); elem = ucs_queue_pull_elem_non_empty(&head, elem_t, queue); EXPECT_EQ(&elem0, elem); @@ -197,7 +197,7 @@ UCS_TEST_F(test_datatype, queue_iter) { free(elem); } } - ASSERT_EQ(2, ucs_queue_length(&head)); + ASSERT_EQ((unsigned long)2, ucs_queue_length(&head)); ucs_queue_for_each_safe(elem, iter, &head, queue) { vec.push_back(elem->i); @@ -234,7 +234,7 @@ UCS_TEST_F(test_datatype, queue_perf) { UCS_TEST_MESSAGE << lat << " nsec per push+pull"; EXPECT_LT(lat, 10.0 * ucs::test_time_multiplier()); - EXPECT_EQ(1, ucs_queue_length(&head)); + EXPECT_EQ((unsigned long)1, ucs_queue_length(&head)); } UCS_TEST_F(test_datatype, queue_splice) { @@ -254,13 +254,13 @@ UCS_TEST_F(test_datatype, queue_splice) { ucs_queue_head_t newq; ucs_queue_head_init(&newq); - EXPECT_EQ(3, ucs_queue_length(&head)); - EXPECT_EQ(0, ucs_queue_length(&newq)); + EXPECT_EQ((unsigned long)3, ucs_queue_length(&head)); + EXPECT_EQ((unsigned long)0, ucs_queue_length(&newq)); ucs_queue_splice(&newq, &head); - EXPECT_EQ(0, ucs_queue_length(&head)); - EXPECT_EQ(3, ucs_queue_length(&newq)); + EXPECT_EQ((unsigned long)0, ucs_queue_length(&head)); + EXPECT_EQ((unsigned long)3, ucs_queue_length(&newq)); elem = ucs_queue_pull_elem_non_empty(&newq, elem_t, queue); EXPECT_EQ(&elem0, elem); diff --git a/test/gtest/ucs/test_frag_list.cc b/test/gtest/ucs/test_frag_list.cc index e69e7a176a8..0e418f86c83 100644 --- a/test/gtest/ucs/test_frag_list.cc +++ b/test/gtest/ucs/test_frag_list.cc @@ -1,6 +1,6 @@ /** * Copyright (C) Mellanox Technologies Ltd. 2001-2014. ALL RIGHTS RESERVED. -* +* Copyright (C) UT-Battelle, LLC. 2014. ALL RIGHTS RESERVED. * $COPYRIGHT$ * $HEADER$ */ @@ -100,11 +100,11 @@ UCS_TEST_F(frag_list, in_order_rcv) { EXPECT_EQ(UCS_FRAG_LIST_INSERT_FAST, err); } #if ENABLE_STATS - EXPECT_EQ(1, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_BURSTS)); - EXPECT_EQ(9, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_BURST_LEN)); - EXPECT_EQ(0, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_GAPS)); - EXPECT_EQ(0, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_GAP_LEN)); - EXPECT_EQ(0, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_GAP_OUT)); + EXPECT_EQ((ucs_stats_counter_t)1, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_BURSTS)); + EXPECT_EQ((ucs_stats_counter_t)9, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_BURST_LEN)); + EXPECT_EQ((ucs_stats_counter_t)0, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_GAPS)); + EXPECT_EQ((ucs_stats_counter_t)0, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_GAP_LEN)); + EXPECT_EQ((ucs_stats_counter_t)0, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_GAP_OUT)); #endif } @@ -153,13 +153,13 @@ UCS_TEST_F(frag_list, one_hole) { EXPECT_EQ(out->sn, i+5); i++; } - EXPECT_EQ(5, i); + EXPECT_EQ((unsigned)5, i); #if ENABLE_STATS - EXPECT_EQ(2, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_BURSTS)); - EXPECT_EQ(10, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_BURST_LEN)); - EXPECT_EQ(1, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_GAPS)); - EXPECT_EQ(5, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_GAP_LEN)); - EXPECT_EQ(9, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_GAP_OUT)); + EXPECT_EQ((ucs_stats_counter_t)2, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_BURSTS)); + EXPECT_EQ((ucs_stats_counter_t)10, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_BURST_LEN)); + EXPECT_EQ((ucs_stats_counter_t)1, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_GAPS)); + EXPECT_EQ((ucs_stats_counter_t)5, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_GAP_LEN)); + EXPECT_EQ((ucs_stats_counter_t)9, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_GAP_OUT)); #endif } @@ -204,7 +204,7 @@ UCS_TEST_F(frag_list, two_holes_basic) { EXPECT_EQ(out->sn, i); i++; } - EXPECT_EQ(i, 10); + EXPECT_EQ(i, (unsigned)10); for (i = 10; i < 15; i++) { err = ucs_frag_list_insert(&m_frags, &pkts[i].elem, i); @@ -221,13 +221,13 @@ UCS_TEST_F(frag_list, two_holes_basic) { EXPECT_EQ(out->sn, i); i++; } - EXPECT_EQ(20, i); + EXPECT_EQ((unsigned)20, i); #if ENABLE_STATS - EXPECT_EQ(7, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_BURSTS)); - EXPECT_EQ(19, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_BURST_LEN)); - EXPECT_EQ(2, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_GAPS)); - EXPECT_EQ(20, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_GAP_LEN)); - EXPECT_EQ(28, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_GAP_OUT)); + EXPECT_EQ((ucs_stats_counter_t)7, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_BURSTS)); + EXPECT_EQ((ucs_stats_counter_t)19, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_BURST_LEN)); + EXPECT_EQ((ucs_stats_counter_t)2, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_GAPS)); + EXPECT_EQ((ucs_stats_counter_t)20, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_GAP_LEN)); + EXPECT_EQ((ucs_stats_counter_t)28, UCS_STATS_GET_COUNTER(m_frags.stats, UCS_FRAG_LIST_STAT_GAP_OUT)); #endif } @@ -280,7 +280,7 @@ UCS_TEST_F(frag_list, two_holes_advanced) { EXPECT_EQ(out->sn, i); i++; } - EXPECT_EQ(20, i); + EXPECT_EQ((unsigned)20, i); } /** @@ -309,7 +309,7 @@ UCS_TEST_F(frag_list, random_arrival) { EXPECT_NE(err, UCS_FRAG_LIST_INSERT_DUP); if (err == UCS_FRAG_LIST_INSERT_FAST || err == UCS_FRAG_LIST_INSERT_FIRST) { fast_inserts++; - EXPECT_EQ(last_sn+1, idx[i]+1); + EXPECT_EQ(last_sn+1, (uint32_t)idx[i]+1); last_sn = idx[i]+1; } else { diff --git a/test/gtest/ucs/test_instr.cc b/test/gtest/ucs/test_instr.cc index 4567fb5b55a..00f7f2b5355 100644 --- a/test/gtest/ucs/test_instr.cc +++ b/test/gtest/ucs/test_instr.cc @@ -1,6 +1,6 @@ /** * Copyright (C) Mellanox Technologies Ltd. 2001-2012. ALL RIGHTS RESERVED. -* +* Copyright (C) UT-Battelle, LLC. 2014. ALL RIGHTS RESERVED. * $COPYRIGHT$ * $HEADER$ */ @@ -75,7 +75,7 @@ UCS_TEST_F(instrument, record) { EXPECT_GE(record.timestamp, ucs_get_time() - ucs_time_from_sec(0.1)); } EXPECT_EQ(UCS_TEST_INSTR_LPARAM, record.lparam); - EXPECT_EQ(UCS_TEST_INSTR_WPARAM, record.wparam); + EXPECT_EQ((uint32_t)UCS_TEST_INSTR_WPARAM, record.wparam); EXPECT_GE(record.location, static_cast(address)); #if HAVE_DETAILED_BACKTRACE diff --git a/test/gtest/ucs/test_math.cc b/test/gtest/ucs/test_math.cc index 91497b99b12..fc3b3346b36 100644 --- a/test/gtest/ucs/test_math.cc +++ b/test/gtest/ucs/test_math.cc @@ -1,6 +1,6 @@ /** * Copyright (C) Mellanox Technologies Ltd. 2001-2012. ALL RIGHTS RESERVED. -* +* Copyright (C) UT-Battelle, LLC. 2014. ALL RIGHTS RESERVED. * $COPYRIGHT$ * $HEADER$ */ @@ -53,17 +53,17 @@ UCS_TEST_F(test_math, circular_compare) { } UCS_TEST_F(test_math, bitops) { - EXPECT_EQ(0, ucs_ffs64(0xfffff)); - EXPECT_EQ(16, ucs_ffs64(0xf0000)); - EXPECT_EQ(1, ucs_ffs64(0x4002)); - EXPECT_EQ(41, ucs_ffs64(1ull<<41)); - - EXPECT_EQ(0, ucs_ilog2(1)); - EXPECT_EQ(2, ucs_ilog2(4)); - EXPECT_EQ(2, ucs_ilog2(5)); - EXPECT_EQ(2, ucs_ilog2(7)); - EXPECT_EQ(14, ucs_ilog2(17000)); - EXPECT_EQ(40, ucs_ilog2(1ull<<40)); + EXPECT_EQ((unsigned)0, ucs_ffs64(0xfffff)); + EXPECT_EQ((unsigned)16, ucs_ffs64(0xf0000)); + EXPECT_EQ((unsigned)1, ucs_ffs64(0x4002)); + EXPECT_EQ((unsigned)41, ucs_ffs64(1ull<<41)); + + EXPECT_EQ((unsigned)0, ucs_ilog2(1)); + EXPECT_EQ((unsigned)2, ucs_ilog2(4)); + EXPECT_EQ((unsigned)2, ucs_ilog2(5)); + EXPECT_EQ((unsigned)2, ucs_ilog2(7)); + EXPECT_EQ((unsigned)14, ucs_ilog2(17000)); + EXPECT_EQ((unsigned)40, ucs_ilog2(1ull<<40)); } #define TEST_ATOMIC_ADD(_bitsize) \ diff --git a/test/gtest/ucs/test_memtrack.cc b/test/gtest/ucs/test_memtrack.cc index f494bf153e7..21603b81e1a 100644 --- a/test/gtest/ucs/test_memtrack.cc +++ b/test/gtest/ucs/test_memtrack.cc @@ -1,6 +1,6 @@ /** * Copyright (C) Mellanox Technologies Ltd. 2001-2014. ALL RIGHTS RESERVED. -* +* Copyright (C) UT-Battelle, LLC. 2014. ALL RIGHTS RESERVED. * $COPYRIGHT$ * $HEADER$ */ @@ -55,14 +55,14 @@ UCS_TEST_F(test_memtrack, sanity) { ucs_free(b); ucs_memtrack_total(&entry); if (ucs_memtrack_is_enabled()) { - ASSERT_EQ(i + 1, entry.current_count); + ASSERT_EQ((size_t)(i + 1), entry.current_count); } b = ucs_malloc(4, test_str); ucs_free(b); ucs_memtrack_total( &entry); if (ucs_memtrack_is_enabled()) { - ASSERT_EQ(1, entry.current_count); + ASSERT_EQ((size_t)1, entry.current_count); } ucs_free(a); diff --git a/test/gtest/ucs/test_stats.cc b/test/gtest/ucs/test_stats.cc index 98b2a66bb99..d9de79354ee 100644 --- a/test/gtest/ucs/test_stats.cc +++ b/test/gtest/ucs/test_stats.cc @@ -1,6 +1,6 @@ /** * Copyright (C) Mellanox Technologies Ltd. 2001-2013. ALL RIGHTS RESERVED. -* +* Copyright (C) UT-Battelle, LLC. 2014. ALL RIGHTS RESERVED. * $COPYRIGHT$ * $HEADER$ */ @@ -87,7 +87,7 @@ class stats_test : public ucs::test { void check_cat_node(ucs_stats_node_t *cat_node) { EXPECT_EQ(std::string("category"), std::string(cat_node->cls->name)); - EXPECT_EQ(0, cat_node->cls->num_counters); + EXPECT_EQ((unsigned)0, cat_node->cls->num_counters); ucs_stats_node_t *data_node; ucs_list_for_each(data_node, &cat_node->children[UCS_STATS_ACTIVE_CHILDREN], list) { @@ -95,10 +95,10 @@ class stats_test : public ucs::test { EXPECT_EQ(unsigned(NUM_COUNTERS), data_node->cls->num_counters); EXPECT_EQ(std::string("counter0"), std::string(data_node->cls->counter_names[0])); - EXPECT_EQ(10, data_node->counters[0]); - EXPECT_EQ(20, data_node->counters[1]); - EXPECT_EQ(30, data_node->counters[2]); - EXPECT_EQ(40, data_node->counters[3]); + EXPECT_EQ((unsigned)10, data_node->counters[0]); + EXPECT_EQ((unsigned)20, data_node->counters[1]); + EXPECT_EQ((unsigned)30, data_node->counters[2]); + EXPECT_EQ((unsigned)40, data_node->counters[3]); } } diff --git a/test/gtest/ucs/test_twheel.cc b/test/gtest/ucs/test_twheel.cc index 52b19ec2e3d..044af3b4d1e 100644 --- a/test/gtest/ucs/test_twheel.cc +++ b/test/gtest/ucs/test_twheel.cc @@ -1,6 +1,6 @@ /** * Copyright (C) Mellanox Technologies Ltd. 2001-2014. ALL RIGHTS RESERVED. -* +* Copyright (C) UT-Battelle, LLC. 2014. ALL RIGHTS RESERVED. * $COPYRIGHT$ * $HEADER$ */ @@ -146,7 +146,7 @@ UCS_TEST_F(twheel, precision_single) { ucs_twheel_sweep(&m_wheel, now); } while (t.end_time == 0); - if (::abs(t.total_time - t.d) > 2 * m_wheel.res) { + if ((ucs_time_t)::abs(t.total_time - t.d) > 2 * m_wheel.res) { ++fail_count; } } @@ -180,7 +180,7 @@ UCS_TEST_F(twheel, precision_multi) { * correct delta */ for (int i = 0; i < N_TIMERS; i++) { - EXPECT_NE(t[i].end_time, 0); + EXPECT_NE(t[i].end_time, (ucs_time_t)0); EXPECT_NEAR(t[i].total_time, t[i].d, 2 * m_wheel.res + eps); } } @@ -235,7 +235,7 @@ UCS_TEST_F(twheel, delayed_sweep) { /* all timers should have been triggered */ for (int i = 0; i < N_TIMERS; i++) { - EXPECT_NE(t[i].end_time, 0); + EXPECT_NE(t[i].end_time, (ucs_time_t)0); } } diff --git a/test/gtest/uct/test_uct_context.cc b/test/gtest/uct/test_uct_context.cc index c849a4ec236..208626204e5 100644 --- a/test/gtest/uct/test_uct_context.cc +++ b/test/gtest/uct/test_uct_context.cc @@ -1,6 +1,6 @@ /** * Copyright (C) Mellanox Technologies Ltd. 2001-2014. ALL RIGHTS RESERVED. -* +* Copyright (C) UT-Battelle, LLC. 2014. ALL RIGHTS RESERVED. * $COPYRIGHT$ * $HEADER$ */ @@ -33,8 +33,8 @@ UCS_TEST_F(test_uct, query_resources) { uct_resource_desc_t *res = &resources[i]; EXPECT_TRUE(strcmp(res->tl_name, "")); EXPECT_TRUE(strcmp(res->hw_name, "")); - EXPECT_GT(res->latency, 0); - EXPECT_GT(res->bandwidth, 0); + EXPECT_GT(res->latency, (uint64_t)0); + EXPECT_GT(res->bandwidth, (size_t)0); UCS_TEST_MESSAGE << i << ": " << res->tl_name << " on " << res->hw_name << " at " << (res->bandwidth / 1024.0 / 1024.0) << " MB/sec";