Merge branch 'develop' of github.com:ROCm/hipFile into rildixon/io-retry-compat

Author: riley-dixon

.github/workflows/build-ais-nvidia.yml

@@ -84,7 +84,6 @@ jobs:
                 -DCMAKE_CXX_COMPILER="${_AIS_INPUT_CXX_COMPILER}" \
                 -DCMAKE_CXX_FLAGS="-Werror" \
                 -DCMAKE_HIP_PLATFORM=nvidia \
-                -DAIS_BUILD_DOCS=ON \
                 ..
             '
       - name: Build hipFile for the NVIDIA platform (${{ matrix.supported_compilers }})
@@ -114,4 +113,4 @@ jobs:
 #    uses: ./.github/workflows/hipfile-nvidia.yml
 #    needs: build_AIS_image
 #    with:
-#      platform: ${AIS_INPUT_PLATFORM}
+#      platform: ${AIS_INPUT_PLATFORM}

.github/workflows/build-ais.yml

@@ -140,6 +140,7 @@ jobs:
               export CPACK_DEBIAN_PACKAGE_RELEASE="${JOB_DESIGNATOR}${SLES_BUILD_ID_PREFIX}${BUILD_ID}~$(source /etc/os-release && echo ${VERSION_ID})"
               export CPACK_RPM_PACKAGE_RELEASE="${JOB_DESIGNATOR}${SLES_BUILD_ID_PREFIX}${BUILD_ID}"
               cmake \
+                -DCMAKE_BUILD_TYPE=Debug \
                 -DCMAKE_CXX_COMPILER="${_AIS_INPUT_CXX_COMPILER}" \
                 -DCMAKE_CXX_FLAGS="-Werror" \
                 -DCMAKE_HIP_ARCHITECTURES="${{ env.AIS_HIP_ARCHITECTURES }}" \

.github/workflows/hipfile-nvidia.yml.disabled

@@ -74,7 +74,6 @@ jobs:
                 -DCMAKE_CXX_COMPILER=g++ \
                 -DCMAKE_CXX_FLAGS="-Werror" \
                 -DCMAKE_HIP_PLATFORM=nvidia \
-                -DAIS_BUILD_DOCS=ON \
                 -DAIS_CAPABLE_DIR=\"${ROCTMPDIR}\" \
                 ..
             "

CHANGELOG.md

@@ -14,6 +14,7 @@
 * `AIS_USE_SANITIZERS` now also enables the following sanitizers: integer, float-divide-by-zero, local-bounds, vptr, nullability (in addition to address, leak, and undefined). Sanitizers should also now emit usable stack trace info.
 * The AIS optimized IO path will automatically fallback to the POSIX IO path if a failure occurs and the compatibility mode has not been disabled.
 * Added check in the Fastpath/AIS backend to ensure the HIP Runtime is initialized. This avoids causing a segfault in the HIP Runtime.
+* The default CMake build type was changed from `Debug` to `RelWithDebInfo`
 
 ### Removed
 * The rocFile library has been completely removed and the code is now a part of hipFile.

CMakeLists.txt

@@ -7,11 +7,11 @@
 # CMake version according to latest ROCm platform requirements
 cmake_minimum_required(VERSION 3.21)
 
-# Set the default build type to Debug
+# Set the default CMake build type
 #
 # NOTE: This has to be done BEFORE the project is declared!
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-    set(CMAKE_BUILD_TYPE Debug CACHE STRING "Build type")
+    set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Build type")
 endif()
 
 # Set the library version in a variable so we can use

src/amd_detail/stats.cpp

@@ -8,6 +8,7 @@
 #include "stats.h"
 #include "sys.h"
 
+#include <cerrno>
 #include <fcntl.h>
 #include <poll.h>
 #include <unistd.h>
@@ -109,7 +110,8 @@ StatsServer::~StatsServer()
 {
     if (m_thread.joinable()) {
         uint64_t i{1};
-        write(m_efd.get(), &i, sizeof(i));
+        while (write(m_efd.get(), &i, sizeof(i)) == -1 && errno == EINTR) {
+        }
         m_thread.join();
     }
 }
@@ -152,7 +154,7 @@ StatsServer::threadFn()
             sendFd(conn, m_fd.get());
             close(conn);
         }
-        if (pfd[1].revents & POLLIN) {
+        if (pfd[1].revents & (POLLIN | POLLERR | POLLNVAL)) {
             break;
         }
     }