Make it win32 and cmake friendly #2
Conversation
| @@ -0,0 +1,40 @@ | |||
| cmake_minimum_required (VERSION 2.6) | |||
There was a problem hiding this comment.
Let's bump this up to 3.2 and make sure that QA environments have a recent version installed. Under Windows, we'd either build directly from the VC++ project or have a recent cmake version available anyway, and on Travis we can make sure it's at least 3.2, so we might as well take advantage of the nicer syntax that we'd get with 3.0+. Since this is an internal project I'm not too bothered about supporting old platforms!
| @@ -1,11 +0,0 @@ | |||
|
|
|||
| all: | |||
There was a problem hiding this comment.
Worth keeping the makefile build, if we're submitting this upstream? That means people can still do a simple build without needing to go through cmake - the code is minimal so the maintenance effort shouldn't be too bad.
| endif(NOT UNIX) | ||
|
|
||
| # check for functions | ||
| include (${CMAKE_ROOT}/Modules/CheckFunctionExists.cmake) |
There was a problem hiding this comment.
this is fine, but if you leave off the .cmake you don't need the path:
include(CheckFunctionExists)|
|
||
| #ifdef _WIN32 | ||
| // Win32-specific close socket function | ||
| #define CLOSE_SOCKET(s) closesocket(s) |
There was a problem hiding this comment.
This is probably just an oversight, but: despite the nice application of check_function_exists to determine whether we have this, you don't appear to be using that HAVE_CLOSE_SOCKET flag here?
There was a problem hiding this comment.
I've dropped check_function_exists , because it wasn't able to find closesocket on windows. May be I need to add some additional headers etc., so I've moved it under _WIN32
| @@ -48,14 +75,14 @@ StatsdClient::StatsdClient(const string& host, int port, const string& ns) | |||
| d = new _StatsdClientData; | |||
| d->sock = -1; | |||
| config(host, port, ns); | |||
| srandom(time(NULL)); | |||
| srand(time(NULL)); | |||
There was a problem hiding this comment.
If you're going to change the random handling, might as well switch to C++11 and avoid polluting global state with srand().
#include <random>
std::random_device rd;
std::default_random_engine engine { rd() };
std::uniform_real_distribution<> dist { 0.0f, 1.0f };
for(int i = 0; i < 10; ++i) std::cout << "Random between 0..1: " << dist(engine) << std::endl;| @@ -88,25 +115,21 @@ int StatsdClient::init() | |||
| d->server.sin_family = AF_INET; | |||
| d->server.sin_port = htons(d->port); | |||
|
|
|||
| int ret = inet_aton(d->host.c_str(), &d->server.sin_addr); | |||
There was a problem hiding this comment.
any particular reason for removing this? doesn't that take away the ability to pass an IP address?
| #include <fcntl.h> | ||
|
|
||
| /* platform-specific headers */ | ||
| #ifdef HAVE_WINSOCK2_H |
There was a problem hiding this comment.
I'd be tempted to put all the conditional checks in here directly. Reasoning being that we essentially have two modes: POSIX and Win32. If we only have some of the headers for one or the other, things will break anyway.
#ifdef POSIX
#include <posix things>
#elsif WIN32
#include <win32 things>
#else
#error "Need either POSIX or WIN32, this platform seems to be neither"
#endifthat way all the checks can be removed from cmake+the config.h file.
| add_subdirectory (src) | ||
|
|
||
| configure_file ( | ||
| "${PROJECT_SOURCE_DIR}/src/StatsdClient2Config.h.in" |
There was a problem hiding this comment.
Probably should rename this to drop the 2, i.e. StatsdClientConfig.h(.in)
| @@ -0,0 +1,4 @@ | |||
| add_library(StatsdClient2 statsd_client.cpp) | |||
|
|
|||
| install (TARGETS StatsdClient2 DESTINATION bin) | |||
There was a problem hiding this comment.
it's a library, so DESTINATION lib?
| add_library(StatsdClient2 statsd_client.cpp) | ||
|
|
||
| install (TARGETS StatsdClient2 DESTINATION bin) | ||
| install (FILES MathFunctions.h DESTINATION include) |
There was a problem hiding this comment.
I don't think this file exists? statsd_client.h maybe?
No description provided.