mariadb (sorry): fix missing pthread mutex init after calloc

CMakeLists.txt

@@ -22,6 +22,7 @@ include_directories(
   ${PROJECT_SOURCE_DIR}/gcomm/src
   ${PROJECT_SOURCE_DIR}/gcs/src
   ${PROJECT_SOURCE_DIR}/wsrep/src
+  ${PROJECT_SOURCE_DIR}/wsrep/ps
   )
 
 # Options to control compiler options and error behavior.
@@ -89,6 +90,7 @@ include(cmake/custom_boost.cmake)
 include(cmake/boost.cmake)
 include(cmake/crc32c.cmake)
 include(cmake/endian.cmake)
+include(cmake/seed_seq.cmake)
 include(cmake/shared_ptr.cmake)
 include(cmake/unordered.cmake)
 include(cmake/check.cmake)

SConstruct

@@ -139,10 +139,17 @@ elif x86:
             if sysname == 'linux':
                 link_arch = ' -Wl,-melf_i386'
     else:
-        compile_arch = ' -m64'
-        if sysname == 'linux':
+        if machine == 'ppc64':
+          compile_arch = ' -mtune=native'
+          link_arch = ' -Wl,-melf64ppc'
+        elif machine == 'ppc64le':
+          compile_arch = ' -mtune=native'
+          link_arch = ' -Wl,-melf64lppc'
+        else:
+          compile_arch = ' -m64'
+          if sysname == 'linux':
             link_arch = ' -Wl,-melf_x86_64'
-    link_arch = compile_arch + link_arch
+        link_arch = compile_arch + link_arch
 elif machine == 's390x':
     compile_arch = ' -mzarch'
     if bits == 32:
@@ -407,6 +414,16 @@ int main() { SSL_CTX* ctx=NULL; EC_KEY* ecdh=NULL; return !SSL_CTX_set_tmp_ecdh(
     context.Result(result)
     return result
 
+def CheckStdSeedSeq(context):
+    test_source = """
+#include <random>
+int main() { std::seed_seq seeds{1, 2}; }
+"""
+    context.Message('Checking for std::seed_seq ...')
+    result = context.TryLink(test_source, '.cpp')
+    context.Result(result)
+    return result
+
 def CheckVersionScript(context):
     test_source = """
 int main() { return 0; }
@@ -428,10 +445,11 @@ conf = Configure(env, custom_tests = {
     'CheckTr1UnorderedMap': CheckTr1UnorderedMap,
     'CheckWeffcpp': CheckWeffcpp,
     'CheckSetEcdhAuto': CheckSetEcdhAuto,
-    'CheckSetTmpEcdh': CheckSetTmpEcdh
+    'CheckSetTmpEcdh': CheckSetTmpEcdh,
+    'CheckStdSeedSeq': CheckStdSeedSeq
 })
 
-conf.env.Append(CPPPATH = [ '#/wsrep/src' ])
+conf.env.Append(CPPPATH = [ '#/wsrep/src' '#/wsrep/ps' ])
 
 # System headers and libraries
 
@@ -674,6 +692,10 @@ if have_ssl:
     # Enable SSL compilation
     conf.env.Append(CPPFLAGS = ' -DGALERA_HAVE_SSL=1')
 
+# STD library support
+if conf.CheckStdSeedSeq():
+    conf.env.Append(CPPFLAGS = ' -DHAVE_STD_SEED_SEQ')
+
 # these will be used only with our software
 if strict_build_flags == 1:
     conf.env.Append(CCFLAGS = ' -Werror ')
@@ -758,6 +780,22 @@ if sysname != 'darwin':
         print('Error: realtime library not found or not usable')
         Exit(1)
 
+if not conf.CheckCXXHeader('boost/filesystem.hpp'):
+    print('Error: boost/filesystem.hpp file not found or not usable')
+    Exit(1)
+
+if not conf.CheckLib('boost_system',
+                     language = 'CXX',
+                     autoadd = 0):
+    print('Error: boost_system library not found or not usable')
+    Exit(1)
+
+if not conf.CheckLib('boost_filesystem',
+                     language = 'CXX',
+                     autoadd = 0):
+    print('Error: boost_filesystem library not found or not usable')
+    Exit(1)
+
 conf.Finish()
 
 #

asio/asio/detail/impl/epoll_reactor.ipp

@@ -526,6 +526,29 @@ void epoll_reactor::run(long usec, op_queue<operation>& ops)
 #if defined(ASIO_HAS_TIMERFD)
     else if (ptr == &timer_fd_)
     {
+      // We must read the 8-byte timeout expiration counter (using the
+      // "timerfd" descriptor) every time when an EPOLLIN event occurs.
+      // Otherwise, the timer may stop notifying the application of new
+      // events, and all actions related to this timer will be frozen
+      // on some systems; or vice versa, we will get an infinite loop
+      // of notifications due to the constant readiness to read new data:
+      if (events[i].events & EPOLLIN)
+      {
+        // If timeout was expired, we should read the expiration counter:
+        uint64_t count;
+        ssize_t len = sizeof(count);
+        char * buf = reinterpret_cast<char *>(&count);
+        for(;;) {
+          ssize_t ret = read(timer_fd_, buf, len);
+          if (ret == len) break;
+          if (ret < 0)
+          {
+            if (EINTR == errno) continue; else break;
+          }
+          buf += ret;
+          len -= ret;
+        }
+      }
       check_timers = true;
     }
 #endif // defined(ASIO_HAS_TIMERFD)

cmake/boost.cmake

@@ -4,7 +4,7 @@
 
 set(Boost_USE_MULTITHREAD ON)
 set(Boost_USE_STATIC_LIBS ${GALERA_STATIC})
-find_package(Boost 1.41 COMPONENTS program_options)
+find_package(Boost 1.41 COMPONENTS filesystem program_options system)
 if (NOT Boost_FOUND)
   if (Boost_USE_STATIC_LIBS)
     message(ERROR

cmake/os.cmake

@@ -11,14 +11,30 @@ set(GALERA_SYSTEM_LIBS ${PTHREAD_LIB} ${RT_LIB})
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
   # Check if linkage with atomic library is needed for 8 byte atomics
   set(ATOMIC_8_TEST_C_SOURCE
-     "#include <stdatomic.h>
-      int main() { atomic_llong val; atomic_fetch_add(&val, 1); return 0; }")
-  check_c_source_compiles("${ATOMIC_8_TEST_C_SOURCE}" GALERA_HAVE_ATOMIC)
+  "int main()
+  {
+    long long s = 1;
+    s = __atomic_add_fetch(&s, 1, __ATOMIC_SEQ_CST);
+    return (int)__atomic_load_n(&s, __ATOMIC_SEQ_CST);
+  }")
+  CHECK_CXX_SOURCE_COMPILES("${ATOMIC_8_TEST_C_SOURCE}" GALERA_HAVE_ATOMIC)
   if (NOT GALERA_HAVE_ATOMIC)
-    find_library(ATOMIC_LIB NAMES atomic libatomic.so.1)
+    find_library(ATOMIC_LIB NAMES atomic atomic.so.1 libatomic.so.1 libatomic.dylib libatomic.1.dylib libatomic.a
+                 HINTS
+                   $ENV{HOME}/local/lib64
+                   $ENV{HOME}/local/lib
+                   /usr/local/lib64
+                   /usr/local/lib
+                   /opt/local/lib64
+                   /opt/local/lib
+                   /usr/lib64
+                   /usr/lib
+                   /lib64
+                   /lib
+                   /usr/lib/arm-linux-gnueabihf)
     message(STATUS ${ATOMIC_LIB})
     set(CMAKE_REQUIRED_LIBRARIES ${ATOMIC_LIB})
-    check_c_source_compiles("${ATOMIC_8_TEST_C_SOURCE}" GALERA_HAVE_ATOMIC_LIB)
+    CHECK_CXX_SOURCE_COMPILES("${ATOMIC_8_TEST_C_SOURCE}" GALERA_HAVE_ATOMIC_LIB)
     if (NOT GALERA_HAVE_ATOMIC_LIB)
       message(FATAL_ERROR "Could not find support for 64 bit atomic operations")
     endif()

cmake/seed_seq.cmake

@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2020 Codership Oy <info@codership.com>
+#
+# Check for std::seed_seq which may not be implemented in all
+# required platforms. It is missing at least from GCC 4.4.
+#
+
+check_cxx_source_compiles("
+#include <random>
+int main() { std::seed_seq seeds{1, 2}; }
+" SEED_SEQ_OK)
+if (SEED_SEQ_OK)
+  add_definitions(-DHAVE_STD_SEED_SEQ)
+endif()

cmake/version.cmake

@@ -13,7 +13,7 @@ string(REGEX MATCH "GALERA_VERSION_EXTRA=([0-9a-zA-Z]*)" _ ${ver})
 set(GALERA_VERSION_EXTRA ${CMAKE_MATCH_1})
 
 set(GALERA_VERSION
-  "${GALERA_VERSION_MAJOR}.${GALERA_VERSION_MINOR}${GALERA_VERSION_EXTRA}")
+  "${GALERA_VERSION_WSREP_API}.${GALERA_VERSION_MAJOR}.${GALERA_VERSION_MINOR}${GALERA_VERSION_EXTRA}")
 
 #
 # First determine GALERA_GIT_REVISION. If it is stored into file

debian/control

@@ -10,6 +10,7 @@ Build-Depends: check,
                debhelper (>= 10),
                libasio-dev,
                libboost-dev (>= 1.41),
+               libboost-filesystem-dev (>= 1.41),
                libboost-program-options-dev (>= 1.41),
                libssl-dev
 Homepage: https://www.galeracluster.com/
@@ -48,6 +49,14 @@ Description: Replication framework for transactional applications
  .
  This package contains the Galera library/plugin.
 
+Package: galera-4-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: galera-4 (= ${binary:Version}), ${misc:Depends}
+Description: debugging symbols for galera-4
+ This package contains the debugging symbols for galera-4.
+
 Package: galera-arbitrator-4
 Architecture: any
 Conflicts: galera-arbitrator-3,
@@ -68,3 +77,12 @@ Description: Galera arbitrator daemon
  of Galera replication engine see http://galeracluster.com.
  .
  This package contains the Galera arbitrator daemon (garbd).
+
+Package: galera-arbitrator-4-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Conflicts: percona-xtradb-cluster-galera-2.x-dbg
+Depends: galera-arbitrator-4 (= ${binary:Version}), ${misc:Depends}
+Description: debugging symbols for galera-arbitrator-4
+ This package contains the debugging symbols for galera-arbitrator-4.

debian/rules

@@ -6,6 +6,19 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
 # Include all defaults, includes buildflags.mk
 include /usr/share/dpkg/default.mk
+# The following is not available on Debian6
+# Galera Version
+ifneq (,$(filter version=%,$(DEB_BUILD_OPTIONS)))
+       VERSION = $(filter version=%,$(DEB_BUILD_OPTIONS))
+       SCONS_ARGS += $(VERSION)
+endif
+
+# Galera revision number
+ifneq (,$(filter revno=%,$(DEB_BUILD_OPTIONS)))
+       REVNO = $(filter revno=%,$(DEB_BUILD_OPTIONS))
+       SCONS_ARGS += $(REVNO)
+endif
+
 
 # Set unit test timeout multiplier to make slow tests
 # pass on loaded builders.
@@ -18,9 +31,18 @@ override_dh_auto_test:
 override_dh_installinit-arch:
 	dh_installinit -n --name=garb -- defaults 18 22
 
+override_dh_strip:
+	dh_strip -pgalera-4 --dbg-package=galera-4-dbg
+	dh_strip -pgalera-arbitrator-4 --dbg-package=galera-arbitrator-4-dbg
+
 override_dh_installsystemd:
 	dh_installsystemd --name=garb
 
+override_dh_shlibdeps:
+	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
+
 %:
 
 	dh $@ --list-missing
+
+.PHONY: override_dh_strip

galera/src/CMakeLists.txt

@@ -32,6 +32,7 @@ add_library(galera STATIC
 target_include_directories(galera
   PRIVATE
   ${PROJECT_SOURCE_DIR}/wsrep/src
+  ${PROJECT_SOURCE_DIR}/wsrep/ps
   )
 
 # TODO: Fix.
@@ -62,6 +63,7 @@ target_compile_definitions(galera_smm_static
 target_include_directories(galera_smm_static
   PRIVATE
   ${PROJECT_SOURCE_DIR}/wsrep/src
+  ${PROJECT_SOURCE_DIR}/wsrep/ps
   )
 
 # TODO: Fix.
@@ -84,6 +86,7 @@ set_target_properties(galera_smm PROPERTIES
 target_include_directories(galera_smm
   PRIVATE
   ${PROJECT_SOURCE_DIR}/wsrep/src
+  ${CMAKE_SOURCE_DIR}/wsrep/ps
   )
 
 target_compile_definitions(galera_smm