Merge pull request #140 from SpamapS/fix-macos

Start trying to support Mac OS X
gearman · Dec 11, 2017 · e2d76cf · e2d76cf
2 parents d40e6cc + 97e714f
commit e2d76cf
Show file tree

Hide file tree

Showing 28 changed files with 83 additions and 202 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,6 @@
+os:
+  - linux
+  - osx
 language: cpp
 dist: trusty
 sudo: required
@@ -26,17 +29,7 @@ matrix:
       env: COMPILER=g++-5
 
 before_install:
-  - sudo apt-get update -qq
-  - if [ "$COMPILER" = "g++-4.9" ]; then sudo apt-get install -qq g++-4.9; fi
-  - if [ "$COMPILER" = "g++-4.9" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
-  - if [ "$COMPILER" = "g++-5" ]; then sudo apt-get install -qq g++-5; fi
-  - if [ "$COMPILER" = "g++-5" ]; then export CXX="g++-5" CC="gcc-5"; fi
-  - sudo apt-get install -y libboost-all-dev
-  - sudo apt-get install -y gperf
-  - sudo apt-get install -y libevent-dev
-  - sudo apt-get install -y uuid-dev
-  - sudo apt-get install -y python-sphinx
-  - sudo apt-get install -y libhiredis-dev
+  - . scripts/travis-$TRAVIS_OS_NAME.sh
 
 script:
   - ./bootstrap.sh -a

diff --git a/configure.ac b/configure.ac
@@ -175,6 +175,8 @@ AC_CHECK_HEADERS_ONCE([syslog.h])
 AC_CHECK_HEADERS_ONCE([unistd.h])
 AC_CHECK_HEADERS_ONCE([winsock2.h])
 AC_CHECK_HEADERS_ONCE([libmemcached-1.0/types/return.h])
+AC_CHECK_DECL([htonll],[AC_DEFINE([HAVE_HTONLL],[1],
+              [Define to 1 if you have htonll.])])
 
 AM_CONDITIONAL([BUILD_WIN32_WRAPPERS],[test "x$ac_cv_header_winsock2_h" = "xyes"])
 AS_IF([test "x$ac_cv_header_winsock2_h" = "xyes"],

diff --git a/libgearman-server/byteorder.cc b/libgearman-server/byteorder.cc
diff --git a/libgearman-server/byteorder.h b/libgearman-server/byteorder.h
diff --git a/libgearman-server/common.h b/libgearman-server/common.h
@@ -44,7 +44,6 @@
 #pragma once
 
 #include <libgearman-server/gearmand.h>
-#include <libgearman-server/byteorder.h>
 #include "libgearman-server/config.hpp"
 
 #include "libgearman/assert.hpp"

diff --git a/libgearman-server/gearmand.h b/libgearman-server/gearmand.h
@@ -57,7 +57,6 @@
 
 #include <libgearman-server/constants.h>
 #include <libgearman-server/wakeup.h>
-#include <libgearman-server/byteorder.h>
 #include <libgearman-server/log.h>
 #include <libgearman-server/packet.h>
 #include <libgearman-server/connection.h>

diff --git a/libgearman-server/include.am b/libgearman-server/include.am
@@ -31,7 +31,6 @@ noinst_HEADERS+= libgearman-server/queue.hpp
 noinst_HEADERS+= libgearman-server/text.h
 noinst_HEADERS+= \
 		 libgearman-server/byte.h \
-		 libgearman-server/byteorder.h \
 		 libgearman-server/client.h \
 		 libgearman-server/common.h \
 		 libgearman-server/config.h \
@@ -61,7 +60,6 @@ libgearman_server_libgearman_server_la_SOURCES+= libgearman/vector.cc
 libgearman_server_libgearman_server_la_SOURCES+= libgearman-server/text.cc
 libgearman_server_libgearman_server_la_SOURCES+= libgearman-server/config.cc
 libgearman_server_libgearman_server_la_SOURCES+= \
-						 libgearman-server/byteorder.cc \
 						 libgearman-server/client.cc \
 						 libgearman-server/connection.cc \
 						 libgearman-server/function.cc \

diff --git a/libgearman-server/server.cc b/libgearman-server/server.cc
@@ -623,7 +623,7 @@ gearmand_error_t gearman_server_run_command(gearman_server_con_st *server_con,
                                           server_job->data, server_job->data_size,
                                           NULL);
       }
-      else if (packet->command == GEARMAN_COMMAND_GRAB_JOB_ALL and server_job->reducer)
+      else if (packet->command == GEARMAN_COMMAND_GRAB_JOB_ALL and *server_job->reducer != '\0')
       {
         gearmand_log_debug(GEARMAN_DEFAULT_LOG_PARAM,
                            "Sending reduce submission, Partitioner: %.*s(%lu) Reducer: %.*s(%lu) Unique: %.*s(%lu) with data sized (%lu)" ,

diff --git a/libgearman/byteorder.cc b/libgearman/byteorder.cc
@@ -65,6 +65,8 @@ static inline uint64_t swap64(uint64_t in)
 }
 #endif
 
+#ifndef HAVE_HTONLL
+
 uint64_t ntohll(uint64_t value)
 {
   return swap64(value);
@@ -74,3 +76,5 @@ uint64_t htonll(uint64_t value)
 {
   return swap64(value);
 }
+
+#endif
diff --git a/libgearman/byteorder.h b/libgearman/byteorder.h
@@ -40,16 +40,6 @@
 
 #pragma once
 
-#ifndef HAVE_HTONLL
-
-GEARMAN_INTERNAL_API
-uint64_t ntohll(uint64_t);
-
-GEARMAN_INTERNAL_API
-uint64_t htonll(uint64_t);
-
-#endif
-
 #ifdef linux
 /* /usr/include/netinet/in.h defines macros from ntohs() to _bswap_nn to
  * optimize the conversion functions, but the prototypes generate warnings

diff --git a/libgearman/command.cc b/libgearman/command.cc
@@ -40,7 +40,15 @@
 #include <libgearman/common.h>
 
 #include <libgearman-1.0/visibility.h>
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-register"
+#pragma clang diagnostic ignored "-Wshorten-64-to-32"
+#endif
 #include "libgearman/command.hpp"
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
 #include "libgearman/strcommand.h"
 
 #include "libgearman/assert.hpp"
@@ -133,7 +141,7 @@ const gearman_command_info_st *gearman_command_info(gearman_command_t command)
   return command_info;
 }
 
-const struct gearman_command_info_st * gearman_command_lookup (register const char *str, register unsigned int len)
+const struct gearman_command_info_st * gearman_command_lookup (const char *str, unsigned int len)
 {
   const struct gearman_command_string_st* com_str= String2gearman_command_t::in_word_set(str, len);
   return gearman_command_info(com_str->code);

diff --git a/libgearman/command.h b/libgearman/command.h
@@ -57,7 +57,7 @@ const char *gearman_enum_strcommand(gearman_command_t);
 
 const struct gearman_command_info_st *gearman_command_info(gearman_command_t command);
 
-const struct gearman_command_info_st * gearman_command_lookup (register const char *str, register unsigned int len);
+const struct gearman_command_info_st * gearman_command_lookup (const char *str, unsigned int len);
 
 #ifdef __cplusplus
 }

diff --git a/libgearman/common.h b/libgearman/common.h
@@ -61,7 +61,6 @@ struct gearman_universal_st;
 #include "libgearman/error_code.h"
 
 /* These are private not to be installed headers */
-#include "libgearman/byteorder.h"
 #include "libgearman/strcommand.h"
 #include "libgearman/vector.hpp"
 #include "libgearman/unique.hpp"

diff --git a/libgearman/error_code.cc b/libgearman/error_code.cc
@@ -38,7 +38,15 @@
 #include "gear_config.h"
 
 #include "libgearman/error_code.h"
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-register"
+#pragma clang diagnostic ignored "-Wshorten-64-to-32"
+#endif
 #include "libgearman/error_code.hpp"
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
 
 #include "libgearman-1.0/visibility.h"
 #include "libgearman-1.0/strerror.h"

diff --git a/libgearman/include.am b/libgearman/include.am
@@ -41,7 +41,6 @@ noinst_HEADERS+= \
 		 libgearman/allocator.hpp \
 		 libgearman/assert.hpp \
 		 libgearman/backtrace.hpp \
-		 libgearman/byteorder.h \
 		 libgearman/command.h \
 		 libgearman/common.h \
 		 libgearman/connection.hpp \
@@ -99,7 +98,6 @@ libgearman_libgearman_la_SOURCES+= \
 				  libgearman/argument.cc \
 				  libgearman/add.cc \
 				  libgearman/backtrace.cc \
-				  libgearman/byteorder.cc \
 				  libgearman/client.cc \
 				  libgearman/command.cc \
 				  libgearman/connection.cc \

diff --git a/libgearman/job.cc b/libgearman/job.cc
@@ -318,14 +318,6 @@ gearman_client_st *gearman_job_use_client(gearman_job_st *job_shell)
   return NULL;
 }
 
-static inline void gearman_job_reset_error(Job* job)
-{
-  if (job)
-  {
-    gearman_worker_reset_error(job->_worker);
-  }
-}
-
 gearman_return_t gearman_job_send_data(gearman_job_st *job_shell, const void *data, size_t data_size)
 {
   if (job_shell and job_shell->impl())

diff --git a/libgearmancore/include.am b/libgearmancore/include.am
@@ -13,7 +13,6 @@ noinst_LTLIBRARIES+= libgearman/libgearmancore.la
 libgearman_libgearmancore_la_SOURCES= 
 libgearman_libgearmancore_la_SOURCES+= libgearman/allocator.cc
 libgearman_libgearmancore_la_SOURCES+= libgearman/backtrace.cc
-libgearman_libgearmancore_la_SOURCES+= libgearman/byteorder.cc
 libgearman_libgearmancore_la_SOURCES+= libgearman/check.cc
 libgearman_libgearmancore_la_SOURCES+= libgearman/command.cc
 libgearman_libgearmancore_la_SOURCES+= libgearman/connection.cc

diff --git a/libtest/exception/disconnected.hpp b/libtest/exception/disconnected.hpp
@@ -43,7 +43,7 @@ namespace libtest {
 class disconnected : public libtest::exception
 {
 public:
-  disconnected(const char *file, int line, const char *func, const std::string&, const in_port_t port, ...);
+  disconnected(const char *file, int line, const char *func, const std::string&, const int port, ...);
 
   disconnected(const disconnected&);
 

diff --git a/libtest/exception/fatal.cc b/libtest/exception/fatal.cc
@@ -89,7 +89,7 @@ void fatal::increment_disabled_counter() throw()
 
 #pragma GCC diagnostic ignored "-Wformat-nonliteral"
 disconnected::disconnected(const char *file_arg, int line_arg, const char *func_arg,
-                           const std::string& instance, const in_port_t port, ...) :
+                           const std::string& instance, const int port, ...) :
   libtest::exception(file_arg, line_arg, func_arg),
   _port(port)
 {

diff --git a/libtest/server.cc b/libtest/server.cc
@@ -49,12 +49,6 @@
 #include <locale>
 #include <unistd.h>
 
-// trim from end 
-static inline std::string &rtrim(std::string &s)
-{ 
-  s.erase(std::find_if(s.rbegin(), s.rend(), std::not1(std::ptr_fun<int, int>(std::isspace))).base(), s.end()); 
-  return s; 
-}
 
 #include <libtest/server.h>
 #include <libtest/stream.h>