macos: basic support for darwin builds

cmake/check.cmake

@@ -24,6 +24,12 @@ if (GALERA_HAVE_SUBUNIT_LIB)
   list(APPEND GALERA_UNIT_TEST_LIBS "${GALERA_HAVE_SUBUNIT_LIB}")
 endif()
 
+# needed on old systems with glibc < 2.17 for timer_create() in libcheck.
+CHECK_LIBRARY_EXISTS(rt timer_create "" HAVE_TIMER_CREATE)
+IF (HAVE_TIMER_CREATE)
+  LIST(APPEND GALERA_UNIT_TEST_LIBS rt)
+ENDIF(HAVE_TIMER_CREATE)
+
 list(APPEND GALERA_UNIT_TEST_LIBS m)
 list(APPEND GALERA_UNIT_TEST_LIBS ${GALERA_SYSTEM_LIBS})
 

cmake/os.cmake

@@ -5,8 +5,8 @@
 #
 
 find_library(PTHREAD_LIB pthread)
-find_library(RT_LIB rt)
-set(GALERA_SYSTEM_LIBS ${PTHREAD_LIB} ${RT_LIB})
+
+set(GALERA_SYSTEM_LIBS ${PTHREAD_LIB})
 
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
   # Check if linkage with atomic library is needed for 8 byte atomics

galera/src/CMakeLists.txt

@@ -104,6 +104,7 @@ target_compile_options(galera_smm
   )
 
 if (GALERA_VERSION_SCRIPT)
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
   # Limit symbols visible from Galera DSO.
   # Doing this allows to:
   # - make the ABI more clean and concise
@@ -113,6 +114,7 @@ if (GALERA_VERSION_SCRIPT)
   set(GALERA_LINK_OPTIONS
     -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/galera-sym.map)
 endif()
+endif()
 
 target_link_libraries(galera_smm galera ${GALERA_LINK_OPTIONS})
 

galerautils/src/gu_asio.hpp

@@ -27,6 +27,102 @@
 #include <memory>
 #include <string>
 
+#ifdef __APPLE__
+
+struct tcp_info {
+    uint8_t	tcpi_state;
+    uint8_t	tcpi_ca_state;
+    uint8_t	tcpi_retransmits;
+    uint8_t	tcpi_probes;
+    uint8_t	tcpi_backoff;
+    uint8_t	tcpi_options;
+    uint8_t	tcpi_snd_wscale : 4, tcpi_rcv_wscale : 4;
+    uint8_t	tcpi_delivery_rate_app_limited:1, tcpi_fastopen_client_fail:2;
+
+    uint32_t	tcpi_rto;
+    uint32_t	tcpi_ato;
+    uint32_t	tcpi_snd_mss;
+    uint32_t	tcpi_rcv_mss;
+
+    uint32_t	tcpi_unacked;
+    uint32_t	tcpi_sacked;
+    uint32_t	tcpi_lost;
+    uint32_t	tcpi_retrans;
+    uint32_t	tcpi_fackets;
+
+    /* Times. */
+    uint32_t	tcpi_last_data_sent;
+    uint32_t	tcpi_last_ack_sent;     /* Not remembered, sorry. */
+    uint32_t	tcpi_last_data_recv;
+    uint32_t	tcpi_last_ack_recv;
+
+    /* Metrics. */
+    uint32_t	tcpi_pmtu;
+    uint32_t	tcpi_rcv_ssthresh;
+    uint32_t	tcpi_rtt;
+    uint32_t	tcpi_rttvar;
+    uint32_t	tcpi_snd_ssthresh;
+    uint32_t	tcpi_snd_cwnd;
+    uint32_t	tcpi_advmss;
+    uint32_t	tcpi_reordering;
+
+    uint32_t	tcpi_rcv_rtt;
+    uint32_t	tcpi_rcv_space;
+
+    uint32_t	tcpi_total_retrans;
+
+    uint64_t	tcpi_pacing_rate;
+    uint64_t	tcpi_max_pacing_rate;
+    uint64_t	tcpi_bytes_acked;    /* RFC4898 tcpEStatsAppHCThruOctetsAcked */
+    uint64_t	tcpi_bytes_received; /* RFC4898 tcpEStatsAppHCThruOctetsReceived */
+    uint32_t	tcpi_segs_out;	     /* RFC4898 tcpEStatsPerfSegsOut */
+    uint32_t	tcpi_segs_in;	     /* RFC4898 tcpEStatsPerfSegsIn */
+
+    uint32_t	tcpi_notsent_bytes;
+    uint32_t	tcpi_min_rtt;
+    uint32_t	tcpi_data_segs_in;	/* RFC4898 tcpEStatsDataSegsIn */
+    uint32_t	tcpi_data_segs_out;	/* RFC4898 tcpEStatsDataSegsOut */
+
+    uint64_t   tcpi_delivery_rate;
+
+    uint64_t	tcpi_busy_time;      /* Time (usec) busy sending data */
+    uint64_t	tcpi_rwnd_limited;   /* Time (usec) limited by receive window */
+    uint64_t	tcpi_sndbuf_limited; /* Time (usec) limited by send buffer */
+
+    uint32_t	tcpi_delivered;
+    uint32_t	tcpi_delivered_ce;
+
+    uint64_t	tcpi_bytes_sent;     /* RFC4898 tcpEStatsPerfHCDataOctetsOut */
+    uint64_t	tcpi_bytes_retrans;  /* RFC4898 tcpEStatsPerfOctetsRetrans */
+    uint32_t	tcpi_dsack_dups;     /* RFC4898 tcpEStatsStackDSACKDups */
+    uint32_t	tcpi_reord_seen;     /* reordering events seen */
+
+    uint32_t	tcpi_rcv_ooopack;    /* Out-of-order packets received */
+
+    uint32_t	tcpi_snd_wnd;	     /* peer's advertised receive window after
+              * scaling (bytes)
+              */
+    uint32_t	tcpi_rcv_wnd;	     /* local advertised receive window after
+              * scaling (bytes)
+              */
+
+    uint32_t   tcpi_rehash;         /* PLB or timeout triggered rehash attempts */
+
+    uint16_t	tcpi_total_rto;	/* Total number of RTO timeouts, including
+         * SYN/SYN-ACK and recurring timeouts.
+         */
+    uint16_t	tcpi_total_rto_recoveries;	/* Total number of RTO
+             * recoveries, including any
+             * unfinished recovery.
+             */
+    uint32_t	tcpi_total_rto_time;	/* Total time spent in RTO recoveries
+           * in milliseconds, including any
+           * unfinished recovery.
+           */
+};
+
+#endif
+
 namespace gu
 {
     // URI schemes for networking

galerautils/src/gu_asio_socket_util.hpp

@@ -143,6 +143,40 @@ static void bind(Socket& socket, const gu::AsioIpAddress& addr)
     }
 }
 
+#ifdef __APPLE__
+
+template <class Socket>
+static struct tcp_info get_tcp_info(Socket& socket)
+{
+    struct tcp_info tcpi;
+    memset(&tcpi, 0, sizeof(tcpi));
+    // struct tcp_connection_info
+    // https://developer.apple.com/documentation/kernel/tcp_connection_info
+    // http://git.haproxy.org/?p=haproxy-2.6.git;a=commitdiff_plain;h=7747d465d54a1e367e9bf9c07c263d7f1f7fd481;hp=5c83e3a1563cd7face299bf08037e51f976eb5e3
+    // TODO needed fields:
+    //  ret.rtt            = tcpi.tcpi_rtt;
+    //  ret.rttvar         = tcpi.tcpi_rttvar;
+    //  ret.rto            = tcpi.tcpi_rto;
+#if defined(__linux__)
+    //  ret.lost           = tcpi.tcpi_lost;
+#else
+    //  ret.lost           = 0;
+#endif /* __linux__ */
+    //  ret.last_data_recv = tcpi.tcpi_last_data_recv;
+    //  ret.cwnd           = tcpi.tcpi_snd_cwnd;
+    //  gu::datetime::Date now(gu::datetime::Date::monotonic());
+    //  Critical<AsioProtonet> crit(net_);
+    //  ret.last_queued_since = (now - last_queued_tstamp_).get_nsecs();
+    //  ret.last_delivered_since = (now - last_delivered_tstamp_).get_nsecs();
+    //  ret.send_queue_length = send_q_.size();
+    //  ret.send_queue_bytes = send_q_.queued_bytes();
+    //  ret.send_queue_segments = send_q_.segments();
+
+    return tcpi;
+}
+
+#else
+
 template <class Socket>
 static struct tcp_info get_tcp_info(Socket& socket)
 {
@@ -165,7 +199,7 @@ static struct tcp_info get_tcp_info(Socket& socket)
 #endif /* __linux__ || __FreeBSD__ */
     return tcpi;
 }
-
+#endif
 
 static inline std::string
 uri_string (const std::string& scheme, const std::string& addr,

galerautils/src/gu_threads.c

@@ -248,11 +248,11 @@ int gu_barrier_init_SYS (gu_barrier_t_SYS *barrier,
         errno = EINVAL;
         return -1;
     }
-    if(gu_mutex_init_SYS (&barrier->mutex, 0) < 0)
+    if(gu_mutex_init_SYS (NULL, &barrier->mutex) < 0)
     {
         return -1;
     }
-    if(gu_cond_init_SYS (&barrier->cond, 0) < 0)
+    if(gu_cond_init_SYS (NULL, &barrier->cond) < 0)
     {
         gu_mutex_destroy_SYS (&barrier->mutex);
         return -1;
@@ -279,13 +279,13 @@ int gu_barrier_wait_SYS (gu_barrier_t_SYS *barrier)
         barrier->count = 0;
         gu_cond_broadcast_SYS (&barrier->cond);
         gu_mutex_unlock_SYS (&barrier->mutex);
-        return GU_BARRIER_THREAD_SYS;
+        return GU_BARRIER_SERIAL_THREAD_SYS;
     }
     else
     {
         gu_cond_wait_SYS (&barrier->cond, &(barrier->mutex));
         gu_mutex_unlock_SYS (&barrier->mutex);
-        return !GU_BARRIER_THREAD_SYS;
+        return !GU_BARRIER_SERIAL_THREAD_SYS;
     }
 }
 

galerautils/src/gu_threads.h

@@ -11,8 +11,6 @@
 
 #include "gu_types.h" // bool
 
-#if __unix__
-
 #include <pthread.h>
 #include <assert.h>
 
@@ -318,8 +316,6 @@ typedef pthread_barrier_t      gu_barrier_t_SYS;
 
 #endif /* native POSIX barriers */
 
-#endif /* __unix__ */
-
 /**
  *  Depending on compile-time flags application will either use
  *  normal or debug version of the API calls