BF: CS-1176 Installation on xlx-amd64 fails due to core of qping

Author: Joachim Gabler

cmake/ArchitectureSpecificSettings.cmake

@@ -69,6 +69,7 @@ function(architecture_specific_settings)
 
       add_compile_definitions(LINUX _GNU_SOURCE GETHOSTBYNAME_R6 GETHOSTBYADDR_R8 HAS_IN_PORT_T SPOOLING_dynamic __SGE_COMPILE_WITH_GETTEXT__)
       add_compile_options(-fPIC)
+      add_compile_options(-pthread)
       add_link_options(-pthread -rdynamic)
 
       set(TIRPC_INCLUDES /usr/include/tirpc PARENT_SCOPE)
@@ -107,6 +108,7 @@ function(architecture_specific_settings)
       endif ()
       add_compile_definitions(LINUX _GNU_SOURCE GETHOSTBYNAME_R6 GETHOSTBYADDR_R8
             HAS_IN_PORT_T SPOOLING_dynamic __SGE_COMPILE_WITH_GETTEXT__)
+      add_compile_options(-pthread)
       add_link_options(-pthread -rdynamic)
 
       set(WITH_MTMALLOC OFF PARENT_SCOPE)
@@ -169,6 +171,7 @@ function(architecture_specific_settings)
       # can't build jemalloc on CentOS 6 - autoconf is too old
       if (SGE_ARCH STREQUAL "xlx-amd64")
          set(WITH_JEMALLOC OFF PARENT_SCOPE)
+         add_compile_definitions(XLINUXAMD64)
          # we need to use a self-compiled gcc/g++/libstdc++ on this platform
          # as the OS packages (CentOS-6) are too old
          # link statically to make sure that the correct libstdc++ is used

doc/markdown/manual/release-notes/02_os_matrix.md

@@ -26,7 +26,7 @@ xxQS_NAMExx components on the other axis.
 |                  |         |              |                       |                   |                      |
 | Alma Linux       | 8       | x86-64       |           x           |         x         |          x           |
 | Alma Linux       | 9       | x86-64       |           x           |         x         |          x           |
-| CentOS Linux     | 6       | x86-64       |           a           |         a         |          a           |
+| CentOS Linux     | 6       | x86-64       |                       |         d         |          d           |
 | CentOS Linux     | 7       | x86-64       |           a           |         x         |          x           |
 | CentOS Linux     | 8       | x86-64       |           x           |         x         |          x           |
 | CentOS Linux     | 9       | x86-64       |           x           |         x         |          x           |
@@ -48,6 +48,7 @@ xxQS_NAMExx components on the other axis.
   -: Unsupported  
   a: Available but not covered by support contract. Contact our sales and support team if you need this configuration.
   b: Still in beta testing. Contact our sales and support team if you need this configuration.
+  d: Deprecated. Will be removed in the next minor release (9.1.0).
   x: Supported  
 
 > **Note**

source/libs/comm/lists/cl_thread.cc

@@ -599,55 +599,45 @@ int cl_thread_trigger_event(cl_thread_settings_t *thread_config) {
 }
 
 int cl_thread_func_testcancel(cl_thread_settings_t *thread_config) {
-   int ret_val = 0;
-   int execute_pop = 0;
-
    if (thread_config == nullptr) {
       return CL_RETVAL_THREAD_CANCELSTATE_ERROR;
    }
 
-   /* pthread_cleanup_push() and pthread_cleanup_pop() must be used in the
-      same { ... } context */
-
 #ifdef CL_DO_COMMLIB_DEBUG
-   gettimeofday(&(thread_config->thread_last_cancel_test_time),nullptr);
+   gettimeofday(&(thread_config->thread_last_cancel_test_time), nullptr);
 #endif
 
-   if (thread_config->thread_cleanup_func != nullptr) {
-      /* push user cleanup function */
-      pthread_cleanup_push((void (*)(void *)) thread_config->thread_cleanup_func, thread_config) ;
-
-            /* push default cleanup function */
-            pthread_cleanup_push((void (*)(void *)) cl_thread_default_cleanup_function, thread_config) ;
-
-                  ret_val = pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, nullptr);
+   // pthread_cleanup_push() and pthread_cleanup_pop() must be used in the same { ... } context
 
-                  if (ret_val == 0) {
-                     pthread_testcancel();
-                     ret_val = pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, nullptr);
-                  }
-                  /* remove cleanup function from stack without execution */
-            pthread_cleanup_pop(execute_pop);  /* client_thread_cleanup */
-
-            /* remove user function from stack without execution */
+   pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, nullptr);
+   if (thread_config->thread_cleanup_func != nullptr) {
+#if not defined(XLINUXAMD64)
+      constexpr int execute_pop = 0;
+      // push user cleanup function
+      pthread_cleanup_push(reinterpret_cast<void (*)(void *)>(thread_config->thread_cleanup_func), thread_config) ;
+      // push default cleanup function
+      pthread_cleanup_push(reinterpret_cast<void (*)(void *)>(cl_thread_default_cleanup_function), thread_config) ;
+#endif
+      // check if the thread was cancelled - if yes, pthread_testcancel() will not return
+      pthread_testcancel();
+#if not defined(XLINUXAMD64)
       pthread_cleanup_pop(execute_pop);
+      pthread_cleanup_pop(execute_pop);
+#endif
    } else {
-      /* push default cleanup function */
-      pthread_cleanup_push((void (*)(void *)) cl_thread_default_cleanup_function, thread_config) ;
-            ret_val = pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, nullptr);
-
-            if (ret_val == 0) {
-               pthread_testcancel();
-               ret_val = pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, nullptr);
-            }
-            /* remove cleanup function from stack without execution */
-      pthread_cleanup_pop(execute_pop);  /* client_thread_cleanup */
+#if not defined(XLINUXAMD64)
+      constexpr int execute_pop = 0;
+      // push default cleanup function
+      pthread_cleanup_push(reinterpret_cast<void (*)(void *)>(cl_thread_default_cleanup_function), thread_config) ;
+#endif
+      // check if the thread was cancelled - if yes, pthread_testcancel() will not return
+      pthread_testcancel();
+#if not defined(XLINUXAMD64)
+      pthread_cleanup_pop(execute_pop);
+#endif
    }
+   pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, nullptr);
 
-
-   if (ret_val != 0) {
-      return CL_RETVAL_THREAD_CANCELSTATE_ERROR;
-   }
    return CL_RETVAL_OK;
 }