You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@rocketmq.apache.org by GitBox <gi...@apache.org> on 2018/11/23 02:38:43 UTC
[GitHub] vongosling closed pull request #11: Update build.sh and readme
vongosling closed pull request #11: Update build.sh and readme
URL: https://github.com/apache/rocketmq-client-cpp/pull/11
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/README.md b/README.md
index 844192a6..e29764df 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ RocketMQ-Client-CPP is the C/C++ client of Apache RocketMQ which is a distribute
- [jsoncpp 0.10.6](https://github.com/open-source-parsers/jsoncpp/archive/0.10.6.zip "jsoncpp 0.10.6")
-- [boost 1.56.0](http://sourceforge.net/projects/boost/files/boost/1.56.0/boost_1_56_0.tar.gz "boost 1.56.0")
+- [boost 1.58.0](http://sourceforge.net/projects/boost/files/boost/1.58.0/boost_1_58_0.tar.gz "boost 1.58.0")
## Documentation ##
doc/rocketmq-cpp_manaual_zh.docx
@@ -38,21 +38,21 @@ doc/rocketmq-cpp_manaual_zh.docx
**note**: *make sure the following compile tools or libraries with them minimum version number have been installed before run the build script build.sh*
- compile tools:
- - gcc-c++ 4.8.2: jsoncpp,boost rocket-client require it, need support C++11
- - cmake 2.8.0: jsoncpp,rocketmq-client require it
- - automake 1.11.1: libevent require it
- - libtool 2.2.6: libevent require it
+ - gcc-c++ 4.8.2: c++ compiler while need support C++11
+ - cmake 2.8.0: build jsoncpp require it
+ - automake 1.11.1: build libevent require it
+ - libtool 2.2.6: build libevent require it
- libraries:
- - bzip2-devel 1.0.6: boost dependcy it
+ - bzip2-devel 1.0.6: boost depend it
-one key build script will automatic build the dependency libraries include libevent json and boost, then it will build rocketmq-client static and shared library.
+build.sh script will automatic build the dependency libraries include libevent json and boost, then it will build rocketmq-client static and shared library.
-if can't get internet to download three library source files by build script, you can copy three library source files (release-2.0.22-stable.zip 0.10.6.zip and boost_1_56_0.tar.gz) to rocketmq-client root dir, then build.sh will auto use these library files to build rocketmq-client.
+if you can't get to internet to download three library source files by build.sh script, you can copy three library source files (release-2.0.22-stable.zip 0.10.6.zip and boost_1_58_0.tar.gz) to rocketmq-client-cpp root dir, then build.sh will auto use these three library source files to build rocketmq-client-cpp.
sudo sh build.sh
-then there are librocketmq.a and librocketmq.so in /usr/local/lib. for use them to build application you should link with following libraries: -lrocketmq -lpthread -lz -ldl -lrt.
+then there are both librocketmq.a and librocketmq.so in /usr/local/lib. when use them to build application or library you should link with following libraries: -lrocketmq -lpthread -lz -ldl -lrt.
g++ -o consumer_example consumer_example.cpp -L. -lrocketmq -lpthread -lz -ldl -lrt
@@ -71,7 +71,7 @@ download [cmake windows tool](https://cmake.org/files/v3.9/cmake-3.9.3-win64-x64
run cmake-gui.exe, choose your source code dir and build dir, then click generate which will let you choose Virtual Studio version
open project by VirtualStudio, and build jsoncpp, and jsoncpp.lib will be got
-1. install [boost 1.56.0](http://sourceforge.net/projects/boost/files/boost/1.56.0/boost_1_56_0.tar.gz "boost 1.56.0")
+1. install [boost 1.58.0](http://sourceforge.net/projects/boost/files/boost/1.58.0/boost_1_58_0.tar.gz "boost 1.58.0")
according to following discription: http://www.boost.org/doc/libs/1_56_0/more/getting_started/windows.html
following build options are needed to be set when run bjam.exe: msvc architecture=x86 address-model=64 link=static runtime-link=static stage
all lib will be generated except boost_zlib:
diff --git a/build.sh b/build.sh
index 6e2922ee..b35927d0 100644
--- a/build.sh
+++ b/build.sh
@@ -5,9 +5,12 @@ build_dir="${basepath}/tmp_build_dir"
packet_dir="${basepath}/tmp_packet_dir"
sys_lib_dir="/usr/local/lib"
bin_dir="${basepath}/bin"
-fname_libevent="release-2.0.22-stable.zip"
-fname_jsoncpp="0.10.6.zip"
-fname_boost="boost_1_58_0.tar.gz"
+fname_libevent="libevent*.zip"
+fname_jsoncpp="jsoncpp*.zip"
+fname_boost="boost*.tar.gz"
+fname_libevent_down="release-2.0.22-stable.zip"
+fname_jsoncpp_down="0.10.6.zip"
+fname_boost_down="1.58.0/boost_1_58_0.tar.gz"
function Help()
{
@@ -125,15 +128,32 @@ function BuildLibevent()
then
echo "${fname_libevent} is exist"
else
- wget https://github.com/libevent/libevent/archive/${fname_libevent}
+ wget https://github.com/libevent/libevent/archive/${fname_libevent_down} -O libevent-${fname_libevent_down}
+ fi
+ unzip -o ${fname_libevent}
+ if [ $? -ne 0 ];then
+ exit 1
fi
- unzip ${fname_libevent}
- cd libevent-release-2.0.22-stable
- ./autogen.sh
+ libevent_dir=`ls | grep libevent | grep .*[^zip]$`
+ echo ${libevent_dir}
+ cd ${libevent_dir}
+ if [ $? -ne 0 ];then
+ exit 1
+ fi
+ ./autogen.sh
+ if [ $? -ne 0 ];then
+ exit 1
+ fi
echo "build libevent static #####################"
./configure --disable-openssl --enable-static=yes --enable-shared=no CFLAGS=-fPIC CPPFLAGS=-fPIC
+ if [ $? -ne 0 ];then
+ exit 1
+ fi
make
+ if [ $? -ne 0 ];then
+ exit 1
+ fi
sudo make install
}
@@ -151,15 +171,27 @@ function BuildJsonCPP()
then
echo "${fname_jsoncpp} is exist"
else
- wget https://github.com/open-source-parsers/jsoncpp/archive/${fname_jsoncpp}
+ wget https://github.com/open-source-parsers/jsoncpp/archive/${fname_jsoncpp_down} -O jsoncpp-${fname_jsoncpp_down}
+ fi
+ unzip -o ${fname_jsoncpp}
+ if [ $? -ne 0 ];then
+ exit 1
+ fi
+ jsoncpp_dir=`ls | grep ^jsoncpp | grep .*[^zip]$`
+ cd ${jsoncpp_dir}
+ if [ $? -ne 0 ];then
+ exit 1
fi
- unzip ${fname_jsoncpp}
- cd jsoncpp-0.10.6
-
mkdir build; cd build
echo "build jsoncpp static #####################"
cmake .. -DCMAKE_CXX_FLAGS=-fPIC -DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=OFF
+ if [ $? -ne 0 ];then
+ exit 1
+ fi
make
+ if [ $? -ne 0 ];then
+ exit 1
+ fi
sudo make install
}
@@ -175,13 +207,23 @@ function BuildBoost()
then
echo "${fname_boost} is exist"
else
- wget http://sourceforge.net/projects/boost/files/boost/1.58.0/${fname_boost}
+ wget http://sourceforge.net/projects/boost/files/boost/${fname_boost_down}
fi
tar -zxvf ${fname_boost}
- cd boost_1_58_0
+ boost_dir=`ls | grep boost | grep .*[^gz]$`
+ cd ${boost_dir}
+ if [ $? -ne 0 ];then
+ exit 1
+ fi
./bootstrap.sh
+ if [ $? -ne 0 ];then
+ exit 1
+ fi
echo "build boost static #####################"
sudo ./b2 cflags=-fPIC cxxflags=-fPIC --with-atomic --with-thread --with-system --with-chrono --with-date_time --with-log --with-regex --with-serialization --with-filesystem --with-locale --with-iostreams threading=multi link=static runtime-link=static release install
+ if [ $? -ne 0 ];then
+ exit 1
+ fi
}
function BuildRocketMQClient()
@@ -189,6 +231,9 @@ function BuildRocketMQClient()
cd ${build_dir}
cmake ..
make
+ if [ $? -ne 0 ];then
+ exit 1
+ fi
sudo make install
PackageRocketMQStatic
@@ -209,4 +254,4 @@ Prepare
BuildLibevent
BuildJsonCPP
BuildBoost
-BuildRocketMQClient
+BuildRocketMQClient
\ No newline at end of file
diff --git a/src/producer/StringIdMaker.cpp b/src/producer/StringIdMaker.cpp
index c556cb6d..ed4a26a8 100644
--- a/src/producer/StringIdMaker.cpp
+++ b/src/producer/StringIdMaker.cpp
@@ -1,8 +1,29 @@
#include "StringIdMaker.h"
-#include <unistd.h>
#include <boost/asio.hpp>
namespace rocketmq {
+
+#ifdef WIN32
+int gettimeofdayWin(struct timeval *tp, void *tzp)
+{
+ time_t clock;
+ struct tm tm;
+ SYSTEMTIME wtm;
+ GetLocalTime(&wtm);
+ tm.tm_year = wtm.wYear - 1900;
+ tm.tm_mon = wtm.wMonth - 1;
+ tm.tm_mday = wtm.wDay;
+ tm.tm_hour = wtm.wHour;
+ tm.tm_min = wtm.wMinute;
+ tm.tm_sec = wtm.wSecond;
+ tm. tm_isdst = -1;
+ clock = mktime(&tm);
+ tp->tv_sec = clock;
+ tp->tv_usec = wtm.wMilliseconds * 1000;
+ return (0);
+}
+#endif
+
StringIdMaker::StringIdMaker() {
memset(_buff, 0, sizeof(_buff));
memset(_0x_buff, 0, sizeof(_0x_buff));
@@ -75,6 +96,7 @@ uint32_t StringIdMaker::get_ip() {
uint64_t StringIdMaker::get_curr_ms() {
struct timeval time_now;
+ //windows and linux use the same function name, windows's defination as begining this file
gettimeofday(&time_now, NULL);
uint64_t ms_time = time_now.tv_sec * 1000 + time_now.tv_usec / 1000;
return ms_time;
@@ -112,7 +134,11 @@ void StringIdMaker::set_start_and_next_tm() {
}
int StringIdMaker::atomic_incr(int id) {
- __sync_add_and_fetch(&id, 1);
+ #ifdef WIN32
+ InterlockedIncrement(&id)
+ #else
+ __sync_add_and_fetch(&id, 1);
+ #endif
return id;
}
std::string StringIdMaker::get_unique_id() {
diff --git a/src/producer/StringIdMaker.h b/src/producer/StringIdMaker.h
index fc52f5a7..d8e54763 100644
--- a/src/producer/StringIdMaker.h
+++ b/src/producer/StringIdMaker.h
@@ -11,12 +11,17 @@
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
-#include <sys/time.h>
#include <time.h>
-#include <unistd.h>
#include <boost/serialization/singleton.hpp>
#include <string>
+#ifdef WIN32
+#include <windows.h>
+#else
+#include <unistd.h>
+#include <sys/time.h>
+#endif
+
namespace rocketmq {
class StringIdMaker : public boost::serialization::singleton<StringIdMaker> {
public:
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services