Merge from apple main branch (#131)

.devcontainer/devcontainer.json

@@ -0,0 +1,33 @@
+{
+  "name": "FoundationDB remote dev env",
+  "image": "foundationdb/devel:centos7-latest",
+  "features": {},
+  "capAdd": [
+    "SYS_PTRACE"
+  ],
+  "privileged": true,
+  "securityOpt": [
+    "seccomp=unconfined"
+  ],
+  "hostRequirements": {
+    "storage": "60gb"
+  },
+  "containerEnv": {
+    "CC": "clang",
+    "CXX": "clang++",
+    "BOOST_ROOT": "/opt/boost_1_78_0_clang"
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "llvm-vs-code-extensions.vscode-clangd",
+        "ms-vscode.cmake-tools"
+      ],
+      "settings": {
+        "cmake.configureArgs": [
+          "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
+        ]
+      }
+    }
+  }
+}

.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Calculate versions
         id: vers
@@ -30,12 +30,12 @@ jobs:
       - name: Create Draft Release
         if: ${{ steps.vers.outputs.release_flag == 'ON' }}
         id: create_release
-        uses: actions/create-release@v1
+        uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: "${{ steps.vers.outputs.full_ver }}"
-          release_name: "v${{ steps.vers.outputs.full_ver }}"
+          name: "v${{ steps.vers.outputs.full_ver }}"
           draft: true
           prerelease: false
 
@@ -56,10 +56,10 @@ jobs:
     runs-on: ${{ matrix.run_on }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set building repo
-        run: | 
+        run: |
           echo "use_image=ghcr.io/${{matrix.owner}}/${{matrix.image}}" >> "$GITHUB_ENV"
 
       - name: Build
@@ -86,7 +86,7 @@ jobs:
       #  run: ctest --output-on-failure -V
 
       - name: Upload result
-        uses: nanoufo/action-upload-artifacts-and-release-assets@v1.8
+        uses: nanoufo/action-upload-artifacts-and-release-assets@v2
         with:
           path: |
             ${{github.workspace}}/bld/linux/packages/*${{needs.calc_ver.outputs.full_ver}}*
@@ -103,10 +103,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download the foundationdb distro
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: ${{github.workspace}}/bld/download
 
@@ -142,10 +142,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download the foundationdb distro
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: ${{github.workspace}}/bld/download
 
@@ -169,7 +169,7 @@ jobs:
           ${{github.workspace}}/packaging/docker/build-images-for-owtech.bash \
             ${{needs.calc_ver.outputs.full_ver}} \
             ${{github.workspace}}/bld/linux/packages \
-            ghcr.io/${{ github.repository_owner }}
+            ghcr.io/${GITHUB_REPOSITORY_OWNER@L}
 
   tests:
     needs: [calc_ver, build]
@@ -205,7 +205,7 @@ jobs:
           pip3 install 'foundationdb==${{ env.JOSHUA_DB_VER }}'
 
       - name: Download the correctness package
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         id: download_correctness
         with:
           name: correctness-${{needs.calc_ver.outputs.full_ver}}.tar.gz

.github/workflows/make-build-image.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Calculate versions
         id: vers
@@ -43,7 +43,7 @@ jobs:
     runs-on: ${{ matrix.run_on }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Build an image
         run: |

CMakeLists.txt

@@ -53,6 +53,15 @@ endif()
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
 
+option(WITH_ACAC "Enable actor stack recording" OFF)
+if (WITH_ACAC)
+  message(STATUS "Build FoundationDB with AcAC support")
+  if (FDB_RELEASE OR FDB_RELEASE_CANDIDATE)
+	message(FATAL_ERROR "ACAC will cause severe slowdown of the system and SHOULD not be enabled in Release.")
+  endif()
+  add_compile_definitions(WITH_ACAC)
+endif()
+
 ################################################################################
 # Packages used for bindings
 ################################################################################
@@ -129,7 +138,7 @@ message(STATUS "FDB_PATCH is ${FDB_PATCH}")
 
 set(FDB_CURRENT_VERSION ${PROJECT_VERSION})
 set(FDB_FUTURE_VERSION "7.5.0")
-set(FDB_PREV_RELEASE_VERSION "7.3.3")
+set(FDB_PREV_RELEASE_VERSION "7.3.41")
 set(FDB_PREV2_RELEASE_VERSION "7.1.33")
 set(FDB_PREV3_RELEASE_VERSION "7.0.0")
 
@@ -223,6 +232,7 @@ if(WITH_PYTHON AND WITH_C_BINDING)
 endif()
 if(WITH_DOCUMENTATION)
   add_subdirectory(documentation)
+  add_dependencies(html CopyJavadoc)
 endif()
 
 if(WIN32)
@@ -249,7 +259,9 @@ if (CMAKE_EXPORT_COMPILE_COMMANDS AND WITH_PYTHON)
   add_custom_target(processed_compile_commands ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/compile_commands.json ${CMAKE_CURRENT_BINARY_DIR}/compile_commands.json)
 
   # A prebuild target ensures that all actors, Swift-generated headers, and Swift modules are built.
-  add_custom_target(prebuild_for_ide ALL DEPENDS fdbserver_swift processed_compile_commands)
+  if (WITH_SWIFT)
+     add_custom_target(prebuild_for_ide ALL DEPENDS fdbserver_swift processed_compile_commands)
+  endif()
 endif()
 
 ################################################################################
@@ -259,3 +271,5 @@ endif()
 print_components()
 
 message(STATUS "CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL}")
+
+