various fixes to allow mac osx compilation

This commit is contained in:
mydesktop 2014-04-30 13:52:21 -04:00
parent 9c70be0e77
commit 67df296650
13 changed files with 40 additions and 20 deletions

View file

@ -204,6 +204,8 @@
#define GTEST_NAME_ "Google Test"
#define GTEST_PROJECT_URL_ "http://code.google.com/p/googletest/"
#define GTEST_HAS_TR1_TUPLE 0
// Determines the version of gcc that is used to compile this.
#ifdef __GNUC__
// 40302 means version 4.3.2.

View file

@ -212,8 +212,8 @@ namespace net_load_tests
struct request
{
size_t open_request_target;
size_t max_opened_conn_count;
uint64_t open_request_target;
uint64_t max_opened_conn_count;
BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(open_request_target)
@ -240,9 +240,9 @@ namespace net_load_tests
struct response
{
size_t opened_connections_count;
size_t new_connection_counter;
size_t close_connection_counter;
uint64_t opened_connections_count;
uint64_t new_connection_counter;
uint64_t close_connection_counter;
BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(opened_connections_count)
@ -295,7 +295,7 @@ namespace net_load_tests
struct request
{
size_t request_size;
uint64_t request_size;
BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(request_size)
@ -310,7 +310,7 @@ namespace net_load_tests
struct request
{
std::string data;
size_t response_size;
uint64_t response_size;
BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(data)

View file

@ -14,7 +14,9 @@
void set_process_affinity(int core)
{
#if defined(BOOST_WINDOWS)
#if defined (__APPLE__)
return;
#elif defined(BOOST_WINDOWS)
DWORD_PTR mask = 1;
for (int i = 0; i < core; ++i)
{
@ -34,7 +36,9 @@ void set_process_affinity(int core)
void set_thread_high_priority()
{
#if defined(BOOST_WINDOWS)
#if defined(__APPLE__)
return;
#elif defined(BOOST_WINDOWS)
::SetPriorityClass(::GetCurrentProcess(), HIGH_PRIORITY_CLASS);
#elif defined(BOOST_HAS_PTHREADS)
pthread_attr_t attr;