Merge pull request #83 from RedisLabs/fix/macos-build

Fix and clean up build on macOS.

Author: yossigo

README.md

@@ -29,12 +29,13 @@ The following libraries are required for building:
 The following tools are required
 * autoconf
 * automake
+* pkg-config
 * GNU make
 * GCC C++ compiler
 
-### CentOS 6.x Prerequisites
+#### CentOS 6.x
 
-On a CentOS 6.4 system, use the following to install prerequisites:
+On a CentOS 6.x system, use the following to install prerequisites:
 ```
 # yum install autoconf automake make gcc-c++ 
 # yum install pcre-devel zlib-devel libmemcached-devel
@@ -64,33 +65,21 @@ $ export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:${PKG_CONFIG_PATH}
 
 Then proceed to follow the build instructions below.
 
+#### Ubuntu/Debian
 
-### Ubuntu 12.x Prerequisites
-
-On recent Ubuntu versions, simply install all prerequisites as follows:
+On Ubuntu/Debian distributions, simply install all prerequisites as follows:
 
 ```
 # apt-get install build-essential autoconf automake libpcre3-dev libevent-dev pkg-config zlib1g-dev
 ```
 
+#### macOS
 
-### Cluster mode
-
-#### Connections
-
-When using the cluster-mode option, each client opens one connection for each node.
-So, when using a large number of threads and clients, the user must verify that he is not
-limited by the maximum number of file descriptors.
-
-#### Using sequential key pattern
-
-When there is an asymmetry between the Redis nodes and user set
-the --requests option, there may be gaps in the generated keys.
-
-Also, the ratio and the key generator is per client (and not connection).
-In this case, setting the ratio to 1:1 does not guarantee 100% hits because
-the keys spread to different connections/nodes.
+To build natively on macOS, use Homebrew to install the required dependencies::
 
+```
+$ brew install autoconf automake libtool libevent pkg-config
+```
 
 ### Building and installing
 
@@ -121,5 +110,24 @@ $ memtier_benchmark --help
 for command line options.
 
 
+### Cluster mode
+
+#### Connections
+
+When using the cluster-mode option, each client opens one connection for each node.
+So, when using a large number of threads and clients, the user must verify that he is not
+limited by the maximum number of file descriptors.
+
+#### Using sequential key pattern
+
+When there is an asymmetry between the Redis nodes and user set
+the --requests option, there may be gaps in the generated keys.
+
+Also, the ratio and the key generator is per client (and not connection).
+In this case, setting the ratio to 1:1 does not guarantee 100% hits because
+the keys spread to different connections/nodes.
+
+
+
 
 [![githalytics.com alpha](https://cruel-carlota.pagodabox.com/c1e8ecf15c469fbeb0e4eb12e8436c82 "githalytics.com")](http://githalytics.com/RedisLabs/memtier_benchmark)

config_types.h

@@ -123,7 +123,7 @@ struct arbitrary_command {
     unsigned int ratio;
 };
 
-class arbitrary_command_list {
+struct arbitrary_command_list {
 private:
     std::vector<arbitrary_command> commands_list;
 

configure.ac

@@ -45,9 +45,11 @@ AC_FUNC_MALLOC
 AC_FUNC_MEMCMP
 AC_CHECK_FUNCS([gettimeofday memchr memset socket strerror random_r drand48])
 
+# clock_gettime requires -lrt on old glibc only.
+AC_SEARCH_LIBS([clock_gettime], [rt], , AC_MSG_ERROR([rt is required libevent.]))
+
 AC_CHECK_LIB([pcre], [pcre_compile], , AC_MSG_ERROR([pcre is required; try installing libpcre3-dev.]))
 AC_CHECK_LIB([z], [deflateInit_], , AC_MSG_ERROR([zlib is required; try installing zlib1g-dev.]))
-AC_CHECK_LIB([rt], [clock_gettime], , AC_MSG_ERROR([rt is required for libevent.]))
 AC_CHECK_LIB([pthread], [pthread_create], , AC_MSG_ERROR([pthread is required.]))
 AC_CHECK_LIB([socket], [gai_strerror])
 

memtier_benchmark.cpp

@@ -249,7 +249,7 @@ static void config_init_defaults(struct benchmark_config *cfg)
 
 static int generate_random_seed()
 {
-    int R;
+    int R = 0;
     FILE* f = fopen("/dev/random", "r");
     if (f)
     {

protocol.h

@@ -107,7 +107,7 @@ class bulk_el : public mbulk_element {
     unsigned int value_len;
 };
 
-class protocol_response {
+struct protocol_response {
 protected:
     const char *m_status;
     mbulk_size_el *m_mbulk_value;