Merge branch 'release/0.7' into ManualPR_0.6_0.7

alibaba · Jun 12, 2024 · a4a17ca · a4a17ca
2 parents 33252d3 + fa7a438
commit a4a17ca
Show file tree

Hide file tree

Showing 121 changed files with 3,753 additions and 1,601 deletions.
diff --git a/.github/workflows/ci.linux.arm.yml b/.github/workflows/ci.linux.arm.yml
@@ -23,29 +23,17 @@ jobs:
 
  - uses: actions/checkout@v3
 
- # - name: Install Dependencies
- # run: |
- # dnf install -y git gcc-c++ cmake 'dnf-command(config-manager)'
- # dnf install -y gcc-toolset-9-gcc-c++
- # dnf install -y openssl-devel libcurl-devel libaio-devel
- # dnf install -y epel-release
- # dnf config-manager --set-enabled powertools
- # dnf install -y gtest-devel gmock-devel gflags-devel fuse-devel libgsasl-devel e2fsprogs-devel
-
  - name: Build
  run: |
  source /opt/rh/gcc-toolset-9/enable
- cmake -B build -D CMAKE_BUILD_TYPE=MinSizeRel \
- -D PHOTON_BUILD_DEPENDENCIES=OFF -D PHOTON_BUILD_TESTING=ON \
- -D PHOTON_ENABLE_SASL=ON -D PHOTON_ENABLE_FUSE=ON \
- -D PHOTON_ENABLE_EXTFS=ON
- cmake --build build -j -- VERBOSE=1
+ cmake -B build -D CMAKE_BUILD_TYPE=MinSizeRel -D PHOTON_BUILD_TESTING=ON \
+ -D PHOTON_ENABLE_SASL=ON -D PHOTON_ENABLE_FUSE=ON -D PHOTON_ENABLE_EXTFS=ON
+ cmake --build build -j $(nproc) -- VERBOSE=1
 
  - name: Test
  run: |
- ulimit -l unlimited
  cd build
- ctest --timeout 3600 -V
+ ctest -E test-lockfree --timeout 3600 -V
 
  centos8-gcc921-epoll-debug:
  runs-on: [self-hosted, Linux, ARM64]
@@ -63,26 +51,14 @@ jobs:
 
  - uses: actions/checkout@v3
 
- # - name: Install Dependencies
- # run: |
- # dnf install -y git gcc-c++ cmake 'dnf-command(config-manager)'
- # dnf install -y gcc-toolset-9-gcc-c++
- # dnf install -y openssl-devel libcurl-devel libaio-devel
- # dnf install -y epel-release
- # dnf config-manager --set-enabled powertools
- # dnf install -y gtest-devel gmock-devel gflags-devel fuse-devel libgsasl-devel e2fsprogs-devel
-
  - name: Build
  run: |
  source /opt/rh/gcc-toolset-9/enable
- cmake -B build -D CMAKE_BUILD_TYPE=Debug \
- -D PHOTON_BUILD_DEPENDENCIES=OFF -D PHOTON_BUILD_TESTING=ON \
- -D PHOTON_ENABLE_SASL=ON -D PHOTON_ENABLE_FUSE=ON \
- -D PHOTON_ENABLE_EXTFS=ON
- cmake --build build -j -- VERBOSE=1
+ cmake -B build -D CMAKE_BUILD_TYPE=Debug -D PHOTON_BUILD_TESTING=ON \
+ -D PHOTON_ENABLE_SASL=ON -D PHOTON_ENABLE_FUSE=ON -D PHOTON_ENABLE_EXTFS=ON
+ cmake --build build -j $(nproc) -- VERBOSE=1
 
  - name: Test
  run: |
- ulimit -l unlimited
  cd build
- ctest --timeout 3600 -V
+ ctest -E test-lockfree --timeout 3600 -V
diff --git a/.github/workflows/ci.linux.x86-64.yml b/.github/workflows/ci.linux.x86-64.yml
@@ -0,0 +1,230 @@
+name: Linux x86 (new)
+
+on:
+ push:
+ branches: [ "main", "release/*" ]
+ pull_request:
+ branches: [ "main", "release/*" ]
+
+jobs:
+ gcc850:
+ runs-on: [self-hosted, compiler]
+ steps:
+ - uses: actions/checkout@v3
+ - name: Build850
+ run: |
+ rm -fr build
+ cmake -B build -D CMAKE_BUILD_TYPE=MinSizeRel \
+ -D PHOTON_BUILD_TESTING=ON \
+ -D PHOTON_ENABLE_SASL=ON \
+ -D PHOTON_ENABLE_FUSE=ON \
+ -D PHOTON_ENABLE_URING=ON \
+ -D PHOTON_ENABLE_EXTFS=ON \
+ # -D PHOTON_BUILD_DEPENDENCIES=ON \
+ # -D PHOTON_AIO_SOURCE="" \
+ # -D PHOTON_ZLIB_SOURCE="" \
+ # -D PHOTON_CURL_SOURCE="" \
+ # -D PHOTON_OPENSSL_SOURCE="" \
+ # -D PHOTON_GFLAGS_SOURCE="" \
+ # -D PHOTON_GOOGLETEST_SOURCE="" \
+ # -D PHOTON_URING_SOURCE=https://github.com/axboe/liburing/archive/refs/tags/liburing-2.3.tar.gz
+
+ cmake --build build -j $(nproc) --clean-first -- VERBOSE=1
+ ln -f common/checksum/test/checksum.in build/output/
+ tar -c -h --use-compress-program=zstdmt -f output850.tzs build/output/
+ - name: Upload850
+ uses: actions/upload-artifact@v4
+ with:
+ name: output850
+ path: output850.tzs
+ retention-days: 5
+ compression-level: 0
+
+ test850:
+ needs: gcc850
+ runs-on: ubuntu-latest
+ container:
+ image: ghcr.io/coldwings/photon-ut-base:latest
+ options: --cpus 4
+ steps:
+ - uses: szenius/set-timezone@v1.2
+ with:
+ timezoneLinux: "Asia/Shanghai"
+ timezoneMacos: "Asia/Shanghai"
+ timezoneWindows: "China Standard Time"
+ - uses: actions/download-artifact@v4
+ with:
+ name: output850
+ - name: test
+ run: |
+ tar -x --use-compress-program=zstdmt -f output850.tzs
+ cd build/output/
+ ctest -E test-lockfree --timeout 3600 -V
+ export PHOTON_CI_EV_ENGINE=io_uring
+ ctest -E test-lockfree --timeout 3600 -V
+
+ gcc921:
+ needs: gcc850
+ runs-on: [self-hosted, compiler]
+ steps:
+ - name: Build921
+ run: |
+ source /opt/rh/gcc-toolset-9/enable
+ cmake --build build -j $(nproc) --clean-first -- VERBOSE=1
+ ln -f common/checksum/test/checksum.in build/output/
+ tar -c --use-compress-program=zstdmt -f output921.tzs build/output/
+ - name: Upload921
+ uses: actions/upload-artifact@v4
+ with:
+ name: output921
+ path: output921.tzs
+ retention-days: 5
+ compression-level: 0
+
+ test921:
+ needs: gcc921
+ runs-on: ubuntu-latest
+ container:
+ image: ghcr.io/coldwings/photon-ut-base:latest
+ options: --cpus 4
+ steps:
+ - uses: szenius/set-timezone@v1.2
+ with:
+ timezoneLinux: "Asia/Shanghai"
+ timezoneMacos: "Asia/Shanghai"
+ timezoneWindows: "China Standard Time"
+ - uses: actions/download-artifact@v4
+ with:
+ name: output921
+ - name: test
+ run: |
+ tar -x --use-compress-program=zstdmt -f output921.tzs
+ cd build/output/
+ ctest -E test-lockfree --timeout 3600 -V
+ export PHOTON_CI_EV_ENGINE=io_uring
+ ctest -E test-lockfree --timeout 3600 -V
+
+ gcc1031:
+ needs: gcc921
+ runs-on: [self-hosted, compiler]
+ steps:
+ - name: Build1031
+ run: |
+ source /opt/rh/gcc-toolset-10/enable
+ cmake --build build -j $(nproc) --clean-first -- VERBOSE=1
+ ln -f common/checksum/test/checksum.in build/output/
+ tar -c --use-compress-program=zstdmt -f output1031.tzs build/output/
+ - name: Upload1031
+ uses: actions/upload-artifact@v4
+ with:
+ name: output1031
+ path: output1031.tzs
+ retention-days: 5
+ compression-level: 0
+
+ test1031:
+ needs: gcc1031
+ runs-on: ubuntu-latest
+ container:
+ image: ghcr.io/coldwings/photon-ut-base:latest
+ options: --cpus 4
+ steps:
+ - uses: szenius/set-timezone@v1.2
+ with:
+ timezoneLinux: "Asia/Shanghai"
+ timezoneMacos: "Asia/Shanghai"
+ timezoneWindows: "China Standard Time"
+ - uses: actions/download-artifact@v4
+ with:
+ name: output1031
+ - name: test
+ run: |
+ tar -x --use-compress-program=zstdmt -f output1031.tzs
+ cd build/output/
+ ctest -E test-lockfree --timeout 3600 -V
+ export PHOTON_CI_EV_ENGINE=io_uring
+ ctest -E test-lockfree --timeout 3600 -V
+
+ gcc1121:
+ needs: gcc1031
+ runs-on: [self-hosted, compiler]
+ steps:
+ - name: Build1121
+ run: |
+ source /opt/rh/gcc-toolset-10/enable
+ cmake --build build -j --clean-first -- VERBOSE=1
+ ln -f common/checksum/test/checksum.in build/output/
+ tar -c --use-compress-program=zstdmt -f output1121.tzs build/output/
+ - name: Upload1121
+ uses: actions/upload-artifact@v4
+ with:
+ name: output1121
+ path: output1121.tzs
+ retention-days: 5
+ compression-level: 0
+
+ test1121:
+ needs: gcc1121
+ runs-on: ubuntu-latest
+ container:
+ image: ghcr.io/coldwings/photon-ut-base:latest
+ options: --cpus 4
+ steps:
+ - uses: szenius/set-timezone@v1.2
+ with:
+ timezoneLinux: "Asia/Shanghai"
+ timezoneMacos: "Asia/Shanghai"
+ timezoneWindows: "China Standard Time"
+ - uses: actions/download-artifact@v4
+ with:
+ name: output1121
+ - name: test
+ run: |
+ tar -x --use-compress-program=zstdmt -f output1121.tzs
+ cd build/output/
+ ctest -E test-lockfree --timeout 3600 -V
+ export PHOTON_CI_EV_ENGINE=io_uring
+ ctest -E test-lockfree --timeout 3600 -V
+
+ gcc1211:
+ needs: gcc1121
+ runs-on: [self-hosted, compiler]
+ steps:
+ - name: Build1211
+ run: |
+ source /opt/rh/gcc-toolset-10/enable
+ cmake --build build -j $(nproc) --clean-first -- VERBOSE=1
+ ln -f common/checksum/test/checksum.in build/output/
+ tar -c --use-compress-program=zstdmt -f output1211.tzs build/output/
+ - name: Upload1211
+ uses: actions/upload-artifact@v4
+ with:
+ name: output1211
+ path: output1211.tzs
+ retention-days: 5
+ compression-level: 0
+
+ test1211:
+ needs: gcc1211
+ runs-on: ubuntu-latest
+ container:
+ image: ghcr.io/coldwings/photon-ut-base:latest
+ options: --cpus 4
+ steps:
+ - uses: szenius/set-timezone@v1.2
+ with:
+ timezoneLinux: "Asia/Shanghai"
+ timezoneMacos: "Asia/Shanghai"
+ timezoneWindows: "China Standard Time"
+ - uses: actions/download-artifact@v4
+ with:
+ name: output1211
+ - name: test
+ run: |
+ tar -x --use-compress-program=zstdmt -f output1211.tzs
+ cd build/output/
+ ctest -E test-lockfree --timeout 3600 -V
+ export PHOTON_CI_EV_ENGINE=io_uring
+ ctest -E test-lockfree --timeout 3600 -V
+
+
diff --git a/.github/workflows/ci.linux.x86.yml b/.github/workflows/ci.linux.x86.yml
@@ -127,3 +127,4 @@ jobs:
  ulimit -l unlimited
  cd build
  ctest --timeout 3600 -V
+
diff --git a/.github/workflows/ci.macos.arm.yml b/.github/workflows/ci.macos.arm.yml
@@ -7,7 +7,7 @@ on:
  branches: [ "main", "release/*" ]
 
 jobs:
- macOS-clang-debug:
+ macOS14-arm:
  runs-on: macos-14
 
  steps:
@@ -26,10 +26,10 @@ jobs:
 
  - name: Build
  run: |
- cmake -B ${{github.workspace}}/build -D PHOTON_BUILD_TESTING=ON -D CMAKE_BUILD_TYPE=Debug \
+ cmake -B ${{github.workspace}}/build -D PHOTON_BUILD_TESTING=ON -D CMAKE_BUILD_TYPE=Release \
  -D PHOTON_ENABLE_SASL=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@3
- cmake --build ${{github.workspace}}/build -j -- VERBOSE=1
+ cmake --build ${{github.workspace}}/build -j $(nproc)
 
  - name: Test
  working-directory: ${{github.workspace}}/build
- run: ctest --timeout 3600 -V
+ run: ctest -E test-lockfree --timeout 3600 -V
diff --git a/.github/workflows/ci.macos.yml → .github/workflows/ci.macos.x86.yml b/.github/workflows/ci.macos.yml → .github/workflows/ci.macos.x86.yml
@@ -7,8 +7,8 @@ on:
  branches: [ "main", "release/*" ]
 
 jobs:
- macOS-12-Monterey-debug:
- runs-on: macos-12
+ macOS13-x86:
+ runs-on: macos-13
 
  steps:
  - uses: szenius/set-timezone@v1.2
@@ -20,17 +20,17 @@ jobs:
  - uses: actions/checkout@v3
 
  - name: Install Dependencies
- shell: bash 
+ shell: bash
  run: |
- brew install cmake openssl gflags googletest gsasl 
+ brew install cmake openssl gflags googletest gsasl
 
  - name: Build
  run: |
- cmake -B ${{github.workspace}}/build -D PHOTON_BUILD_TESTING=ON -D CMAKE_BUILD_TYPE=Debug \
+ cmake -B ${{github.workspace}}/build -D PHOTON_BUILD_TESTING=ON -D CMAKE_BUILD_TYPE=Release \
  -D PHOTON_ENABLE_SASL=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@3
- cmake --build ${{github.workspace}}/build -j -- VERBOSE=1
+ cmake --build ${{github.workspace}}/build -j $(nproc)
 
  - name: Test
  working-directory: ${{github.workspace}}/build
- run: ctest --timeout 3600 -V
- 
+ run: ctest -E test-lockfree --timeout 3600 -V
+
diff --git a/CMake/Findgflags.cmake b/CMake/Findgflags.cmake
@@ -1,6 +1,6 @@
 find_path(GFLAGS_INCLUDE_DIRS gflags/gflags.h)
 
-find_library(GFLAGS_LIBRARIES gflags_nothreads)
+find_library(GFLAGS_LIBRARIES gflags)
 
 find_package_handle_standard_args(gflags DEFAULT_MSG GFLAGS_LIBRARIES GFLAGS_INCLUDE_DIRS)
 

diff --git a/CMake/Findgoogletest.cmake b/CMake/Findgoogletest.cmake
@@ -3,13 +3,10 @@ find_path(GOOGLETEST_INCLUDE_DIRS gtest/gtest.h gmock/gmock.h)
 find_library(GOOGLETEST_GTEST_LIBRARIES gtest)
 find_library(GOOGLETEST_GTEST_MAIN_LIBRARIES gtest_main)
 find_library(GOOGLETEST_GMOCK_LIBRARIES gmock)
-find_library(GOOGLETEST_GMOCK_MAIN_LIBRARIES gmock_main)
 
 set(GOOGLETEST_LIBRARIES
  ${GOOGLETEST_GTEST_LIBRARIES}
- ${GOOGLETEST_GTEST_MAIN_LIBRARIES}
  ${GOOGLETEST_GMOCK_LIBRARIES}
- ${GOOGLETEST_GMOCK_MAIN_LIBRARIES}
 )
 
 find_package_handle_standard_args(googletest DEFAULT_MSG GOOGLETEST_LIBRARIES GOOGLETEST_INCLUDE_DIRS)