Capio v2

.github/workflows/ci-tests.yaml

@@ -6,17 +6,20 @@ on:
   pull_request:
     branches:
       - master
+      - capio-v2
 concurrency:
   group: build-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
 jobs:
   codespell-check:
     name: "Check codespell conformance"
     runs-on: ubuntu-22.04
+    continue-on-error: true
     steps:
       - uses: actions/checkout@v4
       - name: "Run codespell"
         uses: codespell-project/actions-codespell@v2
+        with:
+          exclude_file: capio-tests/unit/server/src/SourceText.hpp
   docker-check:
     name: "Check Docker image"
     runs-on: ubuntu-22.04
@@ -39,7 +42,9 @@ jobs:
           load: true
           tags: alphaunito/capio:latest
       - name: "Run unit tests with Docker"
+        working-directory: ${{ github.workspace }}
         run: |
+
           echo "Run CAPIO POSIX Unit tests"
           docker run --rm                         \
               --env CAPIO_DIR=/tmp                \
@@ -49,64 +54,43 @@ jobs:
             capio_posix_unit_tests                \
               --gtest_break_on_failure            \
               --gtest_print_time=1
-
-          echo "Run CAPIO server Unit tests"
-          docker run --rm                         \
-              --env CAPIO_DIR=/tmp                \
-              --env CAPIO_LOG_LEVEL=-1            \
-              --name capio-docker                 \
-              alphaunito/capio:latest             \
-            capio_server_unit_tests               \
-              --gtest_break_on_failure            \
-              --gtest_print_time=1
-
-          echo "Run CAPIO syscall Unit tests"
-          docker run --rm                         \
-              --env CAPIO_DIR=/tmp                \
-              --env CAPIO_LOG_LEVEL=-1            \
-              --env LD_PRELOAD=libcapio_posix.so  \
-              --name capio-docker                 \
-              alphaunito/capio:latest             \
-            capio_server_unit_tests               \
-              --gtest_break_on_failure            \
-              --gtest_print_time=1
-
-          echo "Run CAPIO integration tests"
-            docker run --rm                     \
-            --env CAPIO_DIR=/tmp                \
-            --env CAPIO_LOG_LEVEL=-1            \
-            --env LD_PRELOAD=libcapio_posix.so  \
-            --name capio-docker                 \
-            alphaunito/capio:latest             \
-            capio_integration_tests             \
-            --gtest_break_on_failure            \
-            --gtest_print_time=1
+
+      - name: "Run backend communication tests"
+        working-directory: ${{ github.workspace }}
+        run: docker compose -f capio-tests/multinode/backend/docker-compose.yml up --abort-on-container-exit
+
+      - name: "Run integration tests"
+        working-directory: ${{ github.workspace }}
+        run: docker compose -f capio-tests/multinode/integration/docker-compose.yml up --abort-on-container-exit
+
 
   format-check:
     name: "Check ${{ matrix.path }} clang-format conformance"
     runs-on: ubuntu-22.04
     strategy:
       matrix:
         path:
-          - "src"
-          - "tests"
+          - "capio-posix"
+          - "capio-server"
+          - "capio-common"
+          - "capio-tests"
     steps:
       - uses: actions/checkout@v4
       - name: "Run clang-format style check"
-        uses: jidicula/clang-format-action@v4.11.0
+        uses: jidicula/clang-format-action@v4.15.0
         with:
-          clang-format-version: "16"
+          clang-format-version: "20"
           check-path: "${{ matrix.path }}"
   unit-tests:
     name: "Build ${{ matrix.build_type }} with ${{ matrix.cxx }}"
     runs-on: ubuntu-22.04
+    continue-on-error: true
     strategy:
       matrix:
         build_type:
           - Debug
           - Release
         cxx:
-          - g++-9
           - g++-10
           - g++-11
           - g++-12
@@ -126,7 +110,8 @@ jobs:
             libopenmpi-dev \
             ninja-build \
             openmpi-bin \
-            pkg-config
+            pkg-config \
+            cmake
       - name: "Get compiler version"
         run: |
           IFS='-' read -r -a COMPILER <<< "${{ matrix.cxx }}"
@@ -161,38 +146,48 @@ jobs:
                 -B ../build \
                 -S ${GITHUB_WORKSPACE}
           cmake --build ../build -j $(nproc)
-          sudo cmake --install ../build --prefix /usr/local
+          sudo cmake --install ../build --prefix /usr/local          
+
       - name: "Run tests"
         id: run-tests
-        timeout-minutes: 5
+        timeout-minutes: 2
         env:
           CAPIO_DIR: ${{ github.workspace }}
           CAPIO_LOG_LEVEL: -1
         run: |
           export LD_LIBRARY_PATH="/usr/local/lib:${LD_LIBRARY_PATH}"
-
+
+          echo "Run CAPIO syscall Unit tests"         
+          capio_server --no-config &
+          CAPIO_SERVER_PID=$!
+          LD_PRELOAD=libcapio_posix.so  capio_syscall_unit_tests          \
+                  --gtest_break_on_failure --gtest_print_time=1
+          kill $CAPIO_SERVER_PID
+          sleep 2
+
+
+          echo "Run CAPIO memory file integration tests"
+          capio_server --no-config &
+          CAPIO_SERVER_PID=$!
+          LD_PRELOAD=libcapio_posix.so  capio_memory_file_unit_tests      \
+                  --gtest_break_on_failure  --gtest_print_time=1
+          kill $CAPIO_SERVER_PID
+          sleep 2
+
+
+
           echo "Run CAPIO POSIX Unit tests"
           capio_posix_unit_tests \
             --gtest_break_on_failure \
-            --gtest_print_time=1
-
-          echo "Run CAPIO server Unit tests"
+            --gtest_print_time=1 
+          sleep 2
+
+
+          echo "Run CAPIO SERVER unit tests"
           capio_server_unit_tests \
             --gtest_break_on_failure \
             --gtest_print_time=1
-
-          echo "Run CAPIO syscall Unit tests"
-          LD_PRELOAD=libcapio_posix.so \
-          capio_syscall_unit_tests \
-            --gtest_break_on_failure \
-            --gtest_print_time=1
-
-          echo "Run CAPIO integration tests"
-          rm -rf /dev/shm/CAPIO*
-          LD_PRELOAD=libcapio_posix.so \
-          capio_integration_tests \
-            --gtest_break_on_failure \
-            --gtest_print_time=1
+
       - name: "Show client logs on failure"
         if: ${{ always() && steps.run-tests.outcome == 'failure' && matrix.build_type == 'Debug' }}
         run: tail -v -n +1 capio_logs/posix/$(hostname)/posix_thread_*.log
@@ -204,6 +199,7 @@ jobs:
         run: |
           pip install --upgrade gcovr
           gcovr \
+            --gcov-ignore-parse-errors \
             --exclude-throw-branches \
             --xml coverage.xml \
             --gcov-executable "${{ startsWith(matrix.cxx, 'clang-') && format('llvm-cov-{0} gcov', env.CXX_VERSION) || format('gcov-{0}', env.CXX_VERSION) }}" \

.gitignore

@@ -44,7 +44,15 @@ cmake-build-*
 files_location*.txt
 capio_logs
 
+#Doxygen generated documentation
+doxy/html
+doxy/latex
+doxy/doxygen-awesome-css-*
+doxy/theme
+
 # Other
 debug
 build
-
+.devcontainer
+.DS_Store
+*.alive_connection

CMakeLists.txt

@@ -11,7 +11,7 @@ project(capio
 )
 
 # Set required C++ standard
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 
 # Generate the compile_commands.json file
@@ -21,6 +21,16 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -pedantic -O0")
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
 
+# Silence warning from G++
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wno-terminate")
+endif ()
+
+# Silence warning from clang
+if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -pedantic -O0 -Wno-gnu-zero-variadic-macro-arguments -Wno-exceptions")
+endif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+
 #####################################
 # Options
 #####################################
@@ -37,14 +47,21 @@ include(GNUInstallDirs)
 #####################################
 # Dependencies
 #####################################
-find_package(MPI REQUIRED)
 find_package(Threads REQUIRED)
 
 #####################################
 # Definitions
 #####################################
 add_compile_definitions(CAPIO_VERSION="${CMAKE_PROJECT_VERSION}")
 
+# We check here and define only here the CAPIO_BUILD_TESTS macro
+# as it is required by both src/posix and src/server targets
+# Later on we check again to add the tests subproject, which cannot
+# be added here for issues with include directories
+IF (CAPIO_BUILD_TESTS)
+    add_compile_definitions(CAPIO_BUILD_TESTS)
+ENDIF (CAPIO_BUILD_TESTS)
+
 IF (CAPIO_LOG)
     IF (CMAKE_BUILD_TYPE STREQUAL "Debug")
         message(STATUS "Enabling CAPIO logger")
@@ -61,8 +78,8 @@ ENDIF (CAPIO_LOG)
 #####################################
 # Include files and directories
 #####################################
-file(GLOB_RECURSE CAPIO_COMMON_HEADERS "src/common/capio/*.hpp")
-include_directories(src/common)
+file(GLOB_RECURSE CAPIO_COMMON_HEADERS "capio-common/capio/*.hpp")
+include_directories(${PROJECT_SOURCE_DIR}/capio-common)
 
 IF (CAPIO_LOG AND CMAKE_BUILD_TYPE STREQUAL "Debug")
     include_directories("${PROJECT_BINARY_DIR}/include/syscall")
@@ -71,10 +88,28 @@ ENDIF (CAPIO_LOG AND CMAKE_BUILD_TYPE STREQUAL "Debug")
 #####################################
 # Targets
 #####################################
-add_subdirectory(src/posix)
-add_subdirectory(src/server)
+add_subdirectory(capio-posix)
+add_subdirectory(capio-server)
+
+#####################################
+# Install capio-run
+#####################################
+install(
+        FILES ${PROJECT_SOURCE_DIR}/capio-run/capiorun
+        DESTINATION ${CMAKE_INSTALL_BINDIR}
+        PERMISSIONS
+        OWNER_READ
+        OWNER_WRITE
+        OWNER_EXECUTE
+        GROUP_READ
+        GROUP_EXECUTE
+        WORLD_READ
+        WORLD_EXECUTE
+)
+
 
 IF (CAPIO_BUILD_TESTS)
     message(STATUS "Building CAPIO test suite")
-    add_subdirectory(tests)
-ENDIF (CAPIO_BUILD_TESTS)
+    add_compile_definitions(CAPIO_BUILD_TESTS)
+    add_subdirectory(capio-tests)
+ENDIF (CAPIO_BUILD_TESTS)