This is an automated email from the ASF dual-hosted git repository.
echobravo pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new 06a1348 GEODE-5693: Use clang-tidy in travis build. (#374)
06a1348 is described below
commit 06a1348b080f13b33fe870fdf1d98c8db5918551
Author: Jacob Barrett <jbarr...@pivotal.io>
AuthorDate: Thu Oct 11 13:05:29 2018 -0700
GEODE-5693: Use clang-tidy in travis build. (#374)
---
.travis.yml | 17 +++++++---
cppcache/integration-test/fw_dunit.hpp | 3 +-
.../testXmlCacheCreationWithPools.cpp | 22 ++++++++-----
cppcache/src/MapSegment.cpp | 35 ++++++++------------
dependencies/ACE/CMakeLists.txt | 38 +++-------------------
dependencies/boost/CMakeLists.txt | 15 ++++-----
dependencies/gtest/CMakeLists.txt | 4 +--
docker/Dockerfile | 37 ++++++++++++++++-----
tests/cpp/fwklib/TcpIpc.cpp | 4 ---
tests/cpp/fwklib/UDPIpc.cpp | 26 +++++----------
10 files changed, 92 insertions(+), 109 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 54e94ec..f64b6c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,14 +22,21 @@ sudo: required
services:
- docker
+env:
+ global:
+ - DOCKER_ARGS="--rm --volume=${TRAVIS_BUILD_DIR}:/geode-native"
+ - DOCKER_IMAGE="apachegeode/geode-native-build:clang"
+ - SOURCE_DIR="/geode-native"
+
+ matrix:
+ - DOCKER_COMMAND="java -jar /apache-rat-0.12/apache-rat-0.12.jar -E
${SOURCE_DIR}/.ratignore -d ${SOURCE_DIR}"
+ - DOCKER_COMMAND="mkdir build && cd build && cmake ${SOURCE_DIR}
-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_CXX_CLANG_TIDY=clang-tidy && cmake
--build . -- -j2 && ./cppcache/test/apache-geode_unittests"
+
install:
- - docker pull apachegeode/geode-native-build
+ - docker pull "${DOCKER_IMAGE}"
script:
- - DOCKER_ARGS="--volume=${TRAVIS_BUILD_DIR}:/geode-native
--workdir=/geode-native"
- - docker run ${DOCKER_ARGS} apachegeode/geode-native-build bash -c "java
-jar /apache-rat-0.12/apache-rat-0.12.jar -E .ratignore -d ."
- - docker run ${DOCKER_ARGS} apachegeode/geode-native-build bash -c 'mkdir
build && cd build && cmake .. && cmake --build . -- -j $((`nproc`+1)) &&
./cppcache/test/apache-geode_unittests'
- - docker stop $(docker ps -l -q)
+ - docker run ${DOCKER_ARGS} "${DOCKER_IMAGE}" bash -c "${DOCKER_COMMAND}"
notifications:
email:
diff --git a/cppcache/integration-test/fw_dunit.hpp
b/cppcache/integration-test/fw_dunit.hpp
index 9378169..e004c3b 100644
--- a/cppcache/integration-test/fw_dunit.hpp
+++ b/cppcache/integration-test/fw_dunit.hpp
@@ -220,7 +220,8 @@ END_TASK(validate)
} \
} \
;
-#define CALL_TASK(y) DCLASSDEF(y) * DVARNAME(y) = new DCLASSDEF(y)();
+#define CALL_TASK(y) \
+ auto DVARNAME(y) = std::unique_ptr<DCLASSDEF(y)>(new DCLASSDEF(y)());
#define DUNIT_MAIN \
class DCLASSNAME(Main) { \
diff --git a/cppcache/integration-test/testXmlCacheCreationWithPools.cpp
b/cppcache/integration-test/testXmlCacheCreationWithPools.cpp
index 73edbd9..7ee084d 100644
--- a/cppcache/integration-test/testXmlCacheCreationWithPools.cpp
+++ b/cppcache/integration-test/testXmlCacheCreationWithPools.cpp
@@ -121,7 +121,8 @@ bool checkPoolAttribs(std::shared_ptr<Pool> pool, SLIST&
locators,
sprintf(logmsg,
"checkPoolAttribs: Pool freeConnectionTimeout expected [%d], "
"actual [%" PRId64 "]",
- freeConnectionTimeout, pool->getFreeConnectionTimeout().count());
+ freeConnectionTimeout,
+ static_cast<int64_t>(pool->getFreeConnectionTimeout().count()));
LOG(logmsg);
return false;
}
@@ -131,7 +132,7 @@ bool checkPoolAttribs(std::shared_ptr<Pool> pool, SLIST&
locators,
"checkPoolAttribs: Pool loadConditioningInterval expected [%d], "
"actual [%" PRId64 "]",
loadConditioningInterval,
- pool->getLoadConditioningInterval().count());
+ static_cast<int64_t>(pool->getLoadConditioningInterval().count()));
LOG(logmsg);
return false;
}
@@ -169,7 +170,7 @@ bool checkPoolAttribs(std::shared_ptr<Pool> pool, SLIST&
locators,
logmsg,
"checkPoolAttribs: Pool pingInterval expected [%d], actual [%" PRId64
"]",
- pingInterval, pool->getPingInterval().count());
+ pingInterval, static_cast<int64_t>(pool->getPingInterval().count()));
LOG(logmsg);
return false;
}
@@ -177,7 +178,7 @@ bool checkPoolAttribs(std::shared_ptr<Pool> pool, SLIST&
locators,
sprintf(logmsg,
"checkPoolAttribs: Pool readTimeout expected [%d], actual [%"
PRId64
"]",
- readTimeout, pool->getReadTimeout().count());
+ readTimeout, static_cast<int64_t>(pool->getReadTimeout().count()));
LOG(logmsg);
return false;
}
@@ -211,7 +212,8 @@ bool checkPoolAttribs(std::shared_ptr<Pool> pool, SLIST&
locators,
"checkPoolAttribs: Pool subscriptionMessageTrackingTimeout "
"expected [%d], actual [%" PRId64 "]",
subscriptionMessageTrackingTimeout,
- pool->getSubscriptionMessageTrackingTimeout().count());
+ static_cast<int64_t>(
+ pool->getSubscriptionMessageTrackingTimeout().count()));
LOG(logmsg);
return false;
}
@@ -221,7 +223,7 @@ bool checkPoolAttribs(std::shared_ptr<Pool> pool, SLIST&
locators,
"checkPoolAttribs: Pool subscriptionAckInterval expected [%d], "
"actual [%" PRId64 "]",
subscriptionAckInterval,
- pool->getSubscriptionAckInterval().count());
+ static_cast<int64_t>(pool->getSubscriptionAckInterval().count()));
LOG(logmsg);
return false;
}
@@ -238,7 +240,8 @@ bool checkPoolAttribs(std::shared_ptr<Pool> pool, SLIST&
locators,
sprintf(logmsg,
"checkPoolAttribs: Pool statisticInterval expected [%d], actual "
"[%" PRId64 "]",
- statisticInterval, pool->getStatisticInterval().count());
+ statisticInterval,
+ static_cast<int64_t>(pool->getStatisticInterval().count()));
LOG(logmsg);
return false;
}
@@ -256,7 +259,7 @@ bool checkPoolAttribs(std::shared_ptr<Pool> pool, SLIST&
locators,
"checkPoolAttribs: Pool updateLocatorListInterval expected [%d], "
"actual [%" PRId64 "]",
updateLocatorListInterval,
- pool->getUpdateLocatorListInterval().count());
+
static_cast<int64_t>(pool->getUpdateLocatorListInterval().count()));
LOG(logmsg);
return false;
}
@@ -267,7 +270,8 @@ int testXmlCacheCreationWithPools() {
auto cacheFactory = CacheFactory();
std::shared_ptr<Cache> cptr;
- std::cout << "create DistributedSytem with name=XML_CACHE_CREATION_TEST" <<
std::endl;
+ std::cout << "create DistributedSytem with name=XML_CACHE_CREATION_TEST"
+ << std::endl;
std::cout
<< "Create cache with the configurations provided in
valid_cache_pool.xml"
<< std::endl;
diff --git a/cppcache/src/MapSegment.cpp b/cppcache/src/MapSegment.cpp
index 41fb743..456257b 100644
--- a/cppcache/src/MapSegment.cpp
+++ b/cppcache/src/MapSegment.cpp
@@ -484,28 +484,21 @@ void
MapSegment::getEntries(std::vector<std::shared_ptr<RegionEntry>>& result) {
*/
void MapSegment::getValues(std::vector<std::shared_ptr<Cacheable>>& result) {
std::lock_guard<spinlock_mutex> lk(m_spinlock);
- for (CacheableKeyHashMap::iterator iter = m_map->begin();
- iter != m_map->end(); iter++) {
- std::shared_ptr<Cacheable> valuePtr;
- std::shared_ptr<CacheableKey> keyPtr;
- std::shared_ptr<MapEntry> entry;
- int status;
-
- keyPtr = (*iter).ext_id_;
- (*iter).int_id_->getValue(valuePtr);
- status = m_map->find(keyPtr, entry);
-
- if (status != -1) {
- auto entryImpl = entry->getImplPtr();
- if (valuePtr != nullptr && !CacheableToken::isInvalid(valuePtr) &&
- !CacheableToken::isDestroyed(valuePtr) &&
- !CacheableToken::isTombstone(valuePtr)) {
- if (CacheableToken::isOverflowed(valuePtr)) { // get Value from disc.
- valuePtr = getFromDisc(keyPtr, entryImpl);
- entryImpl->setValueI(valuePtr);
- }
- result.push_back(valuePtr);
+ for (auto&& it : *m_map) {
+ auto&& entry = it.int_id_;
+ std::shared_ptr<Cacheable> value;
+ entry->getValue(value);
+ auto&& entryImpl = entry->getImplPtr();
+
+ if (value && !CacheableToken::isInvalid(value) &&
+ !CacheableToken::isDestroyed(value) &&
+ !CacheableToken::isTombstone(value)) {
+ if (CacheableToken::isOverflowed(value)) { // get Value from disc.
+ auto&& key = it.ext_id_;
+ value = getFromDisc(key, entryImpl);
+ entryImpl->setValueI(value);
}
+ result.push_back(value);
}
}
}
diff --git a/dependencies/ACE/CMakeLists.txt b/dependencies/ACE/CMakeLists.txt
index d5c0543..eb04e1c 100644
--- a/dependencies/ACE/CMakeLists.txt
+++ b/dependencies/ACE/CMakeLists.txt
@@ -22,14 +22,9 @@ set( ${PROJECT_NAME}_URL
"https://github.com/DOCGroup/ACE_TAO/releases/download/
set( ${PROJECT_NAME}_EXTERN ${PROJECT_NAME}-extern )
set( ${PROJECT_NAME}_DEPENDS openssl-extern )
-
if ("SunOS" STREQUAL ${CMAKE_SYSTEM_NAME})
set( ACE_PLATFORM sunos5_sunc++ )
set( ACE_CONFIG sunos${CMAKE_SYSTEM_VERSION} )
- set( ACE_CPPFLAGS ${ACE_CPPFLAGS} -KPIC )
- if ( 5.10 VERSION_EQUAL ${CMAKE_C_COMPILER_VERSION} )
- set( ACE_CPPFLAGS ${ACE_CPPFLAGS} -features=zla )
- endif()
elseif ("Linux" STREQUAL ${CMAKE_SYSTEM_NAME} )
if ("Clang" STREQUAL ${CMAKE_CXX_COMPILER_ID})
set( ACE_PLATFORM linux_clang )
@@ -37,13 +32,11 @@ elseif ("Linux" STREQUAL ${CMAKE_SYSTEM_NAME} )
set( ACE_PLATFORM linux )
endif()
set( ACE_CONFIG linux )
- set( ACE_CPPFLAGS ${ACE_CPPFLAGS} -fPIC )
## TODO fix visibility problem with g++
set( _MAKE_ARGS ${_MAKE_ARGS} no_hidden_visibility=1 )
elseif ("Darwin" STREQUAL ${CMAKE_SYSTEM_NAME} )
set( ACE_PLATFORM macosx_sierra )
set( ACE_CONFIG macosx-sierra )
- set( ACE_CPPFLAGS ${ACE_CPPFLAGS} -fPIC )
elseif ("Windows" STREQUAL ${CMAKE_SYSTEM_NAME} )
set( ACE_PLATFORM win32-msvc )
set( ACE_CONFIG win32 )
@@ -53,23 +46,6 @@ if (NOT DEFINED ACE_PLATFORM)
message( FATAL_ERROR "ACE_PLATFORM unset for ${CMAKE_SYSTEM_NAME}" )
endif()
-set( _MAKE_ARGS ${_MAKE_ARGS} buildbits=${BUILD_BITS} )
-
-if ( 11 EQUAL USE_C++ )
- if ("${CMAKE_CXX11_STANDARD_COMPILE_OPTION}" STREQUAL "-std=c++0x")
- set( _MAKE_ARGS ${_MAKE_ARGS} c++0x=1 )
- else()
- set( _MAKE_ARGS ${_MAKE_ARGS} c++11=1 )
- endif()
-elseif ( "" STREQUAL "${USE_C++}" )
-
- # TODO config.h
- #define ACE_LACKS_IOSTREAM_TOTALLY true
- #define ACE_HAS_VERSIONED_NAMESPACE 1
- #define ACE_HAS_POLL
-
-endif()
-
include(ExternalProject)
set( OPENSSL_ROOT ${DEPENDENCIES_openssl_DIR} )
@@ -84,7 +60,7 @@ if (${WIN32})
set ( _COMMAND_PREFIX ${CMAKE_COMMAND} -E chdir ace )
- set ( _MSBUILD_FLAGS /m /p:Platform=${_PLATFORM}
/p:Configuration=$<$<CONFIG:Debug>:Debug>$<$<NOT:$<CONFIG:Debug>>:Release>)
+ set ( _MSBUILD_FLAGS /m /p:Platform=${_PLATFORM}
/p:Configuration=$<$<CONFIG:Debug>:Debug>$<$<NOT:$<CONFIG:Debug>>:Release>)
set ( _MSBUILD_FLAGS_STATIC ${_MSBUILD_FLAGS}
/t:ace_vc${MSVC_VERSION}_static /t:SSL_vc${MSVC_VERSION}_static )
include(ProcessorCount)
@@ -108,13 +84,14 @@ if (${WIN32})
COMMAND ${CMAKE_COMMAND} -E copy_directory ace
<INSTALL_DIR>/include/ace
)
+ set(CMAKE_STATIC_LIBRARY_SUFFIX s$<${MSVC}:$<$<CONFIG:Debug>:d>>.lib)
+
else()
# TODO Configure trips up without MAKE
- # TODO should we do something with STLport includes
# TODO look into using cmake -E chdir
# TODO use cmake -E env
- set( _MAKE cd ace && ACE_ROOT=<SOURCE_DIR> SSL_ROOT=${OPENSSL_ROOT} $(MAKE)
SHELL=/bin/bash debug=$<CONFIG:Debug> optimize=$<NOT:$<CONFIG:Debug>>
static_libs_only=1 ssl=1 ${_MAKE_ARGS})
+ set( _MAKE cd ace && ACE_ROOT=<SOURCE_DIR> SSL_ROOT=${OPENSSL_ROOT} $(MAKE)
SHELL=/bin/bash debug=$<CONFIG:Debug> optimize=$<NOT:$<CONFIG:Debug>>
buildbits=${BUILD_BITS} c++11=1 static_libs_only=1 ssl=1 ${_MAKE_ARGS})
set ( _CONFIGURE_COMMAND "" )
set ( _BUILD_COMMAND ${_MAKE} all )
set ( _INSTALL_COMMAND ${_MAKE} install )
@@ -137,10 +114,6 @@ ExternalProject_Get_Property( ${${PROJECT_NAME}_EXTERN}
INSTALL_DIR )
set( ${PROJECT_NAME}_INSTALL_DIR ${INSTALL_DIR} )
set( DEPENDENCIES_${PROJECT_NAME}_DIR ${${PROJECT_NAME}_INSTALL_DIR}
PARENT_SCOPE)
-if (${WIN32})
- set(CMAKE_STATIC_LIBRARY_SUFFIX s$<${MSVC}:$<$<CONFIG:Debug>:d>>.lib)
-endif()
-
if ("SunOS" STREQUAL ${CMAKE_SYSTEM_NAME})
set( PATCH_FILE ${CMAKE_CURRENT_SOURCE_DIR}/patches )
ExternalProject_Add_Step( ${${PROJECT_NAME}_EXTERN} patches
@@ -169,7 +142,7 @@ ExternalProject_Add_Step( ${${PROJECT_NAME}_EXTERN} platform
DEPENDERS configure
BYPRODUCTS
${${PROJECT_NAME}_SOURCE_DIR}/include/makeinclude/platform_macros.GNU
COMMAND echo "INSTALL_PREFIX = ${${PROJECT_NAME}_INSTALL_DIR}" >
${${PROJECT_NAME}_SOURCE_DIR}/include/makeinclude/platform_macros.GNU
- COMMAND echo "CCFLAGS += ${ACE_CPPFLAGS}" >>
${${PROJECT_NAME}_SOURCE_DIR}/include/makeinclude/platform_macros.GNU
+ COMMAND echo "CCFLAGS += ${CMAKE_CXX_FLAGS}
${CMAKE_CXX_COMPILE_OPTIONS_PIC}" >>
${${PROJECT_NAME}_SOURCE_DIR}/include/makeinclude/platform_macros.GNU
COMMAND echo "include
${${PROJECT_NAME}_SOURCE_DIR}/include/makeinclude/platform_${ACE_PLATFORM}.GNU"
>> ${${PROJECT_NAME}_SOURCE_DIR}/include/makeinclude/platform_macros.GNU
)
endif()
@@ -215,4 +188,3 @@ target_link_libraries(ACE_SSL INTERFACE
${PROJECT_NAME}
${${PROJECT_NAME}_INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}ACE_SSL${CMAKE_STATIC_LIBRARY_SUFFIX}
)
-
diff --git a/dependencies/boost/CMakeLists.txt
b/dependencies/boost/CMakeLists.txt
index 2f6d7a8..143fc46 100644
--- a/dependencies/boost/CMakeLists.txt
+++ b/dependencies/boost/CMakeLists.txt
@@ -49,7 +49,7 @@ if (${WIN32})
else()
set ( _BOOTSTRAP_COMMAND ./bootstrap.sh )
set ( _B2_COMMAND ./b2 )
- set ( _B2_FLAGS ${_B2_FLAGS} cxxflags=-std=c++11 )
+ set ( _B2_FLAGS ${_B2_FLAGS} "cxxflags=${CMAKE_CXX_FLAGS}
${CMAKE_CXX11_STANDARD_COMPILE_OPTION}" )
endif()
if ("SunOS" STREQUAL ${CMAKE_SYSTEM_NAME})
@@ -75,6 +75,11 @@ ExternalProject_Add( ${${PROJECT_NAME}_EXTERN}
STAMP_DIR ./stamp
)
+ExternalProject_Get_Property( ${${PROJECT_NAME}_EXTERN} SOURCE_DIR )
+set( ${PROJECT_NAME}_SOURCE_DIR ${SOURCE_DIR} )
+ExternalProject_Get_Property( ${${PROJECT_NAME}_EXTERN} INSTALL_DIR )
+set( ${PROJECT_NAME}_INSTALL_DIR ${INSTALL_DIR} )
+
if (NOT WIN32)
# https://github.com/boostorg/process/issues/51
set( PATCH_FILE ${CMAKE_CURRENT_SOURCE_DIR}/patches)
@@ -83,18 +88,12 @@ if (NOT WIN32)
DEPENDEES download
DEPENDERS patch
DEPENDS ${PATCH_FILE}
+ BYPRODUCTS
${${PROJECT_NAME}_SOURCE_DIR}/boost/process/detail/posix/is_running.hpp
WORKING_DIRECTORY ${${PROJECT_NAME}_INSTALL_DIR}
COMMAND ${PATCH} -u -N -p1 < ${PATCH_FILE}
)
endif()
-
-ExternalProject_Get_Property( ${${PROJECT_NAME}_EXTERN} SOURCE_DIR )
-set( ${PROJECT_NAME}_SOURCE_DIR ${SOURCE_DIR} )
-ExternalProject_Get_Property( ${${PROJECT_NAME}_EXTERN} INSTALL_DIR )
-set( ${PROJECT_NAME}_INSTALL_DIR ${INSTALL_DIR} )
-
-
function(ADD_BOOST_LIBRARY)
set(options)
set(oneValueArgs)
diff --git a/dependencies/gtest/CMakeLists.txt
b/dependencies/gtest/CMakeLists.txt
index 78a1f24..b93c7ff 100644
--- a/dependencies/gtest/CMakeLists.txt
+++ b/dependencies/gtest/CMakeLists.txt
@@ -23,7 +23,7 @@ set( ${PROJECT_NAME}_EXTERN ${PROJECT_NAME}-extern )
include(ExternalProject)
if(CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
- set(SUN_COMPILER_FLAGS "-DCMAKE_CXX_FLAGS=-std=c++11 -m64")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
endif()
ExternalProject_Add( ${${PROJECT_NAME}_EXTERN}
@@ -31,7 +31,7 @@ ExternalProject_Add( ${${PROJECT_NAME}_EXTERN}
URL_HASH SHA256=${${PROJECT_NAME}_SHA265}
UPDATE_COMMAND ""
INSTALL_COMMAND ""
- CMAKE_ARGS "${SUN_COMPILER_FLAGS}" -Dgtest_force_shared_crt:BOOL=ON
+ CMAKE_ARGS -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} -Dgtest_force_shared_crt:BOOL=ON
)
ExternalProject_Get_Property( ${${PROJECT_NAME}_EXTERN} SOURCE_DIR )
diff --git a/docker/Dockerfile b/docker/Dockerfile
index e0d88e2..55b6523 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -17,22 +17,41 @@
FROM ubuntu
LABEL maintainer Apache Geode <d...@geode.apache.org>
+ENV CLANG_VERSION 6.0
RUN apt-get update && \
- apt-get install -y build-essential doxygen git graphviz openjdk-8-jdk
wget zlib1g-dev && \
- rm -rf /var/lib/apt/lists/*
+ apt-get install -y \
+ libc++-dev \
+ libc++api-dev \
+ clang-${CLANG_VERSION} \
+ clang-tidy-${CLANG_VERSION} \
+ clang-format-${CLANG_VERSION} \
+ make \
+ doxygen \
+ git \
+ graphviz \
+ openjdk-8-jdk \
+ wget \
+ zlib1g-dev && \
+ rm -rf /var/lib/apt/lists/* && \
+ update-alternatives --install /usr/bin/clang clang
/usr/bin/clang-${CLANG_VERSION} 999 && \
+ update-alternatives --install /usr/bin/clang++ clang++
/usr/bin/clang++-${CLANG_VERSION} 999 && \
+ update-alternatives --install /usr/bin/cc cc
/usr/bin/clang-${CLANG_VERSION} 999 && \
+ update-alternatives --install /usr/bin/c++ c++
/usr/bin/clang++-${CLANG_VERSION} 999 && \
+ update-alternatives --install /usr/bin/clang-tidy clang-tidy
/usr/bin/clang-tidy-${CLANG_VERSION} 999 && \
+ update-alternatives --install /usr/bin/clang-format clang-format
/usr/bin/clang-format-${CLANG_VERSION} 999
-ENV GEODE_VERSION 1.4.0
-RUN wget
"https://www.apache.org/dyn/closer.cgi?action=download&filename=geode/${GEODE_VERSION}/apache-geode-${GEODE_VERSION}.tgz";
-O - | \
+ENV GEODE_VERSION 1.6.0
+RUN wget
"https://www.apache.org/dyn/closer.cgi?action=download&filename=geode/${GEODE_VERSION}/apache-geode-${GEODE_VERSION}.tgz";
--quiet -O - | \
tar xzf -
ENV RAT_VERSION 0.12
-RUN wget
"https://www.apache.org/dyn/closer.cgi?action=download&filename=creadur/apache-rat-${RAT_VERSION}/apache-rat-${RAT_VERSION}-bin.tar.bz2";
-O - | \
- tar xjf -
+RUN wget
"https://www.apache.org/dyn/closer.cgi?action=download&filename=creadur/apache-rat-${RAT_VERSION}/apache-rat-${RAT_VERSION}-bin.tar.gz";
--quiet -O - | \
+ tar xzf -
-ENV CMAKE_VERSION 3.10.3
-RUN wget
"https://cmake.org/files/PreviousRelease/cmake-${CMAKE_VERSION}-Linux-x86_64.sh";
-O /tmp/cmake && \
+ENV CMAKE_VERSION 3.12.2
+RUN wget
"https://cmake.org/files/v${CMAKE_VERSION%.*}/cmake-${CMAKE_VERSION}-Linux-x86_64.sh";
--quiet -O /tmp/cmake && \
bash /tmp/cmake --skip-license --prefix=/usr/local && \
- rm /tmp/cmake
+ rm -rf /tmp/cmake
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
ENV GEODE_HOME /apache-geode-${GEODE_VERSION}
diff --git a/tests/cpp/fwklib/TcpIpc.cpp b/tests/cpp/fwklib/TcpIpc.cpp
index 5b094d6..d6646e2 100644
--- a/tests/cpp/fwklib/TcpIpc.cpp
+++ b/tests/cpp/fwklib/TcpIpc.cpp
@@ -183,11 +183,7 @@ int32_t TcpIpc::sendBuffers(int32_t cnt, char *buffers[],
int32_t lengths[],
}
iovec buffs[2];
for (int32_t idx = 0; idx < cnt; idx++) {
-#ifdef _LINUX
- buffs[idx].iov_base = (void *)buffers[idx];
-#else
buffs[idx].iov_base = buffers[idx];
-#endif
buffs[idx].iov_len = lengths[idx];
tot += lengths[idx];
}
diff --git a/tests/cpp/fwklib/UDPIpc.cpp b/tests/cpp/fwklib/UDPIpc.cpp
index 95608fd..01ec6a5 100644
--- a/tests/cpp/fwklib/UDPIpc.cpp
+++ b/tests/cpp/fwklib/UDPIpc.cpp
@@ -111,21 +111,13 @@ bool UDPMessage::send(ACE_SOCK_Dgram& io) {
int32_t vcnt = 1;
iovec buffs[2];
m_hdr.length = 0;
-#ifdef _LINUX
- buffs[0].iov_base = (void*)&m_hdr;
-#else
buffs[0].iov_base = reinterpret_cast<char*>(&m_hdr);
-#endif
buffs[0].iov_len = UDP_HEADER_SIZE;
tot += UDP_HEADER_SIZE;
if (!m_msg.empty()) {
- int32_t len = static_cast<int32_t>(m_msg.size());
+ auto len = static_cast<uint32_t>(m_msg.size());
m_hdr.length = htonl(len);
-#ifdef _LINUX
- buffs[1].iov_base = (void*)m_msg.c_str();
-#else
buffs[1].iov_base = const_cast<char*>(m_msg.c_str());
-#endif
buffs[1].iov_len = len;
vcnt = 2;
tot += len;
@@ -206,7 +198,7 @@ UDPMessageClient::UDPMessageClient(std::string server)
}
int32_t Receiver::doTask() {
- UDPMessage* msg = new UDPMessage();
+ auto msg = std::unique_ptr<UDPMessage>(new UDPMessage());
UDPMessage cmsg;
try {
while (*m_run) {
@@ -215,7 +207,7 @@ int32_t Receiver::doTask() {
ACE_Time_Value wait(30); // Timeout is relative time.
if (cmsg.receiveFrom(*m_io, &wait)) {
if (cmsg.getCmd() == ADDR_REQUEST) {
- std::string addr = m_addrs.front();
+ auto&& addr = m_addrs.front();
m_addrs.pop_front();
m_addrs.push_back(addr);
cmsg.clear();
@@ -230,7 +222,7 @@ int32_t Receiver::doTask() {
if (msg->receiveFrom(
*m_io, &timeout)) { // Timeout is relative time, send ack.
if (msg->getCmd() == ADDR_REQUEST) {
- std::string addr = m_addrs.front();
+ auto&& addr = m_addrs.front();
m_addrs.pop_front();
m_addrs.push_back(addr);
cmsg.clear();
@@ -239,8 +231,8 @@ int32_t Receiver::doTask() {
cmsg.send(*m_io);
}
if (msg->length() > 0) {
- m_queues->putInbound(msg);
- msg = new UDPMessage();
+ m_queues->putInbound(msg.release());
+ msg.reset(new UDPMessage());
}
}
}
@@ -288,7 +280,7 @@ void Receiver::initialize() {
}
int32_t STReceiver::doTask() {
- UDPMessage* msg = new UDPMessage();
+ auto msg = std::unique_ptr<UDPMessage>(new UDPMessage());
try {
while (*m_run) {
msg->clear();
@@ -301,8 +293,8 @@ int32_t STReceiver::doTask() {
msg->send(m_io);
} else {
if (msg->length() > 0) {
- m_queues->putInbound(msg);
- msg = new UDPMessage();
+ m_queues->putInbound(msg.release());
+ msg.reset(new UDPMessage());
}
}
}
