Merge [0.8 to main] | Fix autopr title (#19)

.github/workflows/auto-pr-autodelete.yml

@@ -0,0 +1,27 @@
+name: Auto PR Branch Cleanup
+
+on:
+  pull_request:
+    types:
+      - closed
+
+jobs:
+  clean-auto-pr:
+    if: ${{ github.event.pull_request.merged }} &&
+        ${{ github.event.pull_request.head.repo.id == github.event.pull_request.base.repo.id }} &&
+        ${{ github.event.pull_request.head.ref == 'auto-pr-*' }}
+    runs-on: ubuntu-latest
+    steps:
+        - uses: actions/checkout@v4
+          with:
+            fetch-depth: 0
+            token: ${{ secrets.AUTOPR_SECRET }}
+
+        - name: set git config
+          run: |
+            git config --global user.email "${GITHUB_ACTOR_ID}+${GITHUB_ACTOR}@users.noreply.github.com"
+            git config --global user.name "${GITHUB_ACTOR}"
+            git config --global advice.mergeConflict false
+            git config --global --add safe.directory "${{ github.workspace }}"
+            git config -l
+            git push -d origin ${{ github.event.pull_request.head.ref }}

.github/workflows/auto-pr-new.yml → .github/workflows/auto-pr-precise.yml

@@ -12,6 +12,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
+        token: ${{ secrets.AUTOPR_SECRET }}
 
     - name: set git config
       run: |
@@ -56,44 +57,36 @@ jobs:
         set -x
         git checkout ${{steps.branch_info.outputs.NEXT_BRANCH}}
         git checkout -b ${{steps.create_branch.outputs.PRBRANCH}}
-        echo "MESSAGE<<__EOF" >> $GITHUB_OUTPUT
-        git log --format=%B ${{ github.event.commits[0].id }}~..${{ github.event.after }} >> $GITHUB_OUTPUT
-        echo "__EOF" >> $GITHUB_OUTPUT
+        echo "TITLE<<__AUTOPR_EOF" >> $GITHUB_OUTPUT
+        git log --format="| %s" ${{ github.event.commits[0].id }}~..${{ github.event.after }} | tr '\n' ' ' >> $GITHUB_OUTPUT
+        echo "" >> $GITHUB_OUTPUT
+        echo "__AUTOPR_EOF" >> $GITHUB_OUTPUT
+        echo "MESSAGE<<__AUTOPR_EOF" >> $GITHUB_OUTPUT
+        git log --format="> %B" ${{ github.event.commits[0].id }}~..${{ github.event.after }} >> $GITHUB_OUTPUT
+        echo "__AUTOPR_EOF" >> $GITHUB_OUTPUT
+        cat $GITHUB_OUTPUT
         REVS=$(git rev-list --reverse ${{ github.event.commits[0].id }}~..${{ github.event.after }} )
         for rev in "$REVS"; do
-          if ! git cherry-pick -X theirs ${rev} ; then
-            echo "merge=false" >> $GITHUB_OUTPUT
-            exit 0;
+          if ! git cherry-pick ${rev} ; then
+            git add -u
+            git -c core.editor=true cherry-pick --continue
           fi
         done
         git push -d origin ${{steps.create_branch.outputs.PRBRANCH}} || true
         git push -u origin ${{steps.create_branch.outputs.PRBRANCH}}
-        echo "merge=true" >> $GITHUB_OUTPUT
 
     - uses: actions/github-script@v7
       name: Open pick PR to ${{steps.branch_info.outputs.NEXT_BRANCH}}
-      if: steps.merge-changes.outputs.merge == 'true'
+      env:
+          TITLE: ${{steps.merge-changes.outputs.TITLE}}
+          MESSAGE: ${{steps.merge-changes.outputs.MESSAGE}}
       with:
-        github-token: ${{ github.token }}
+        github-token: ${{ secrets.AUTOPR_SECRET }}
         script: |
           await github.rest.pulls.create({
             ...context.repo,
-            title: `Pick ${{steps.branch_info.outputs.CURRENT_VERSION}} to ${{steps.branch_info.outputs.NEXT_VERSION}}`,
+            title: `[Pick][${{steps.branch_info.outputs.CURRENT_VERSION}} to ${{steps.branch_info.outputs.NEXT_VERSION}}] ` + process.env.TITLE,
             head: `${{steps.create_branch.outputs.PRBRANCH}}`,
             base: `${{steps.branch_info.outputs.NEXT_BRANCH}}`,
-            body: `${{steps.merge-changes.outputs.MESSAGE}}\nGenerated by Auto PR, by cherry-pick related commits`,
-          });
-
-    - uses: actions/github-script@v7
-      name: Open merge PR to ${{steps.branch_info.outputs.NEXT_BRANCH}}
-      if: steps.merge-changes.outputs.merge == 'false'
-      with:
-        github-token: ${{ github.token }}
-        script: |
-          await github.rest.pulls.create({
-            ...context.repo,
-            title: `Merge ${{steps.branch_info.outputs.CURRENT_VERSION}} to ${{steps.branch_info.outputs.NEXT_VERSION}}`,
-            head: `${context.ref}`,
-            base: `${{steps.branch_info.outputs.NEXT_BRANCH}}`,
-            body: `${{steps.merge-changes.outputs.MESSAGE}}\nGenerated by Auto PR, using merge since cherry-pick failed`,
+            body: process.env.MESSAGE + `\nGenerated by Auto PR, by cherry-pick related commits`,
           });

.github/workflows/ci.linux.arm.yml

@@ -1,14 +1,12 @@
 name: Linux ARM
 
 on:
-  push:
-    branches: [ "main", "release/*" ]
   pull_request:
     branches: [ "main", "release/*" ]
 
 jobs:
-  gcc921:
-    runs-on: [self-hosted, Linux, ARM64]
+  arm-linux-build-and-test:
+    runs-on: ubuntu-24.04-arm
 
     container:
       image: ghcr.io/alibaba/photon-ut-base:latest
@@ -23,7 +21,7 @@ jobs:
 
       - uses: actions/checkout@v4
 
-      - name: Build
+      - name: Build-Debug-921-C++14
         run: |
           source /opt/rh/gcc-toolset-9/enable
           cmake -B build \
@@ -36,31 +34,42 @@ jobs:
             -D PHOTON_ENABLE_EXTFS=ON
           cmake --build build -j $(nproc) -- VERBOSE=1
 
-      - name: Test
+      - name: Build-Debug-921-C++17
         run: |
-          cd build
-          ctest -E test-lockfree --timeout 3600 -V
-
-  gcc921-build-debug:
-    runs-on: [self-hosted, Linux, ARM64]
-
-    container:
-      image: ghcr.io/alibaba/photon-ut-base:latest
-      options: --cpus 4
-
-    steps:
-      - uses: szenius/set-timezone@v2.0
-        with:
-          timezoneLinux: "Asia/Shanghai"
-          timezoneMacos: "Asia/Shanghai"
-          timezoneWindows: "China Standard Time"
+          source /opt/rh/gcc-toolset-9/enable
+          rm -fr build
+          cmake -B build \
+            -D PHOTON_CXX_STANDARD=17 \
+            -D CMAKE_BUILD_TYPE=Debug \
+            -D PHOTON_ENABLE_ECOSYSTEM=ON \
+            -D PHOTON_BUILD_TESTING=ON \
+            -D PHOTON_ENABLE_SASL=ON \
+            -D PHOTON_ENABLE_FUSE=ON \
+            -D PHOTON_ENABLE_LIBCURL=ON \
+            -D PHOTON_ENABLE_EXTFS=ON
+          cmake --build build -j $(nproc) -- VERBOSE=1
 
-      - uses: actions/checkout@v4
+      - name: Build-Debug-1121-C++20
+        run: |
+          source /opt/rh/gcc-toolset-11/enable
+          rm -fr build
+          cmake -B build \
+            -D PHOTON_CXX_STANDARD=20 \
+            -D CMAKE_BUILD_TYPE=Debug \
+            -D PHOTON_ENABLE_ECOSYSTEM=ON \
+            -D PHOTON_BUILD_TESTING=ON \
+            -D PHOTON_ENABLE_SASL=ON \
+            -D PHOTON_ENABLE_FUSE=ON \
+            -D PHOTON_ENABLE_LIBCURL=ON \
+            -D PHOTON_ENABLE_EXTFS=ON
+          cmake --build build -j $(nproc) -- VERBOSE=1
 
-      - name: Build
+      - name: Build-Debug-1211-C++23
         run: |
-          source /opt/rh/gcc-toolset-9/enable
+          source /opt/rh/gcc-toolset-12/enable
+          rm -fr build
           cmake -B build \
+            -D PHOTON_CXX_STANDARD=23 \
             -D CMAKE_BUILD_TYPE=Debug \
             -D PHOTON_ENABLE_ECOSYSTEM=ON \
             -D PHOTON_BUILD_TESTING=ON \
@@ -69,3 +78,8 @@ jobs:
             -D PHOTON_ENABLE_LIBCURL=ON \
             -D PHOTON_ENABLE_EXTFS=ON
           cmake --build build -j $(nproc) -- VERBOSE=1
+
+      - name: Test
+        run: |
+          cd build
+          ctest -E test-lockfree --timeout 3600 -V

.github/workflows/ci.linux.x86_64.yml

@@ -1,8 +1,6 @@
 name: Linux x86_64
 
 on:
-  push:
-    branches: [ "main", "release/*" ]
   pull_request:
     branches: [ "main", "release/*" ]
 

.github/workflows/ci.macos.arm.yml

@@ -1,14 +1,12 @@
 name: macOS ARM
 
 on:
-  push:
-    branches: [ "main", "release/*" ]
   pull_request:
     branches: [ "main", "release/*" ]
 
 jobs:
   macOS14-arm:
-    runs-on: macos-14
+    runs-on: macos-15
 
     steps:
       - uses: szenius/set-timezone@v2.0
@@ -22,17 +20,18 @@ jobs:
       - name: Install Dependencies
         shell: bash
         run: |
-          brew install cmake openssl gflags googletest gsasl
+          brew install openssl gflags googletest gsasl
 
       - name: Build
         run: |
           cmake -B ${{github.workspace}}/build \
+            -D PHOTON_CXX_STANDARD=17 \
             -D PHOTON_ENABLE_ECOSYSTEM=ON \
             -D PHOTON_BUILD_TESTING=ON \
             -D CMAKE_BUILD_TYPE=MinSizeRel \
             -D PHOTON_ENABLE_SASL=ON \
             -D PHOTON_ENABLE_LIBCURL=ON \
-            -D OPENSSL_ROOT_DIR=/opt/homebrew/Cellar/openssl@1.1/1.1.1w
+            -D OPENSSL_ROOT_DIR=/opt/homebrew/Cellar/openssl@3/3.6.0
           cmake --build ${{github.workspace}}/build -j $(sysctl -n hw.logicalcpu)
 
       - name: Test

.github/workflows/ci.macos.x86_64.yml

@@ -1,14 +1,12 @@
 name: macOS x86_64
 
 on:
-  push:
-    branches: [ "main", "release/*" ]
   pull_request:
     branches: [ "main", "release/*" ]
 
 jobs:
   macOS13-x86:
-    runs-on: macos-13
+    runs-on: macos-15
 
     steps:
       - uses: szenius/set-timezone@v2.0
@@ -22,17 +20,18 @@ jobs:
       - name: Install Dependencies
         shell: bash
         run: |
-          brew install cmake openssl gflags googletest gsasl
+          brew install openssl gflags googletest gsasl
 
       - name: Build
         run: |
           cmake -B ${{github.workspace}}/build \
+            -D PHOTON_CXX_STANDARD=17 \
             -D PHOTON_ENABLE_ECOSYSTEM=ON \
             -D PHOTON_BUILD_TESTING=ON \
             -D CMAKE_BUILD_TYPE=MinSizeRel \
             -D PHOTON_ENABLE_SASL=ON \
             -D PHOTON_ENABLE_LIBCURL=ON \
-            -D OPENSSL_ROOT_DIR=/usr/local/opt/openssl@3
+            -D OPENSSL_ROOT_DIR=/opt/homebrew/Cellar/openssl@3/3.6.0
           cmake --build ${{github.workspace}}/build -j $(sysctl -n hw.logicalcpu)
 
       - name: Test

CMakeLists.txt

@@ -6,6 +6,9 @@ project(
         LANGUAGES C CXX ASM
 )
 
+# for CMake 4.x compatible
+set(CMAKE_POLICY_VERSION_MINIMUM 3.5)
+
 # Utility Modules and Find Modules
 include(FindPackageHandleStandardArgs)
 include(CheckCXXCompilerFlag)
@@ -28,6 +31,7 @@ option(PHOTON_ENABLE_FSTACK_DPDK "Use f-stack + DPDK as the event engine" OFF)
 option(PHOTON_ENABLE_EXTFS "enable extfs" OFF)
 option(PHOTON_ENABLE_ECOSYSTEM "enable ecosystem" OFF)
 option(PHOTON_ENABLE_LIBCURL "enable libcurl" ON)
+set(PHOTON_DEFAULT_LOG_LEVEL "0" CACHE STRING "default log level")
 
 option(PHOTON_BUILD_DEPENDENCIES "" OFF)
 set(PHOTON_AIO_SOURCE "https://pagure.io/libaio/archive/libaio-0.3.113/libaio-0.3.113.tar.gz" CACHE STRING "")
@@ -42,7 +46,7 @@ set(PHOTON_E2FS_SOURCE "" CACHE STRING "")
 set(PHOTON_GFLAGS_SOURCE "https://github.com/gflags/gflags/archive/refs/tags/v2.2.2.tar.gz" CACHE STRING "")
 set(PHOTON_GOOGLETEST_SOURCE "https://github.com/google/googletest/archive/refs/tags/release-1.12.1.tar.gz" CACHE STRING "")
 set(PHOTON_RAPIDJSON_GIT "https://github.com/Tencent/rapidjson.git" CACHE STRING "")
-set(PHOTON_RAPIDXML_SOURCE "https://sourceforge.net/projects/rapidxml/files/rapidxml/rapidxml%201.13/rapidxml-1.13.zip/download" CACHE STRING "")
+set(PHOTON_RAPIDXML_SOURCE "https://github.com/photonlibos/rapidxml" CACHE STRING "")
 set(PHOTON_RAPIDYAML_SOURCE "https://github.com/biojppm/rapidyaml/releases/download/v0.5.0/rapidyaml-0.5.0.hpp" CACHE STRING "")
 set(PHOTON_CPP_REDIS_SOURCE "https://github.com/cpp-redis/cpp_redis/archive/refs/tags/4.3.1.tar.gz" CACHE STRING "")
 
@@ -64,6 +68,7 @@ if (PHOTON_BUILD_WITH_ASAN)
     if ((NOT CMAKE_BUILD_TYPE STREQUAL "Debug") OR (NOT CMAKE_SYSTEM_NAME STREQUAL "Linux"))
         message(FATAL_ERROR "Wrong environment")
     endif ()
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -static-libasan")
     add_link_options(-fsanitize=address -static-libasan)
 endif ()
 
@@ -257,6 +262,9 @@ endif()
 if (PHOTON_ENABLE_LIBCURL)
     target_compile_definitions(photon_obj PRIVATE ENABLE_CURL)
 endif()
+if (PHOTON_DEFAULT_LOG_LEVEL)
+    target_compile_definitions(photon_obj PRIVATE DEFAULT_LOG_LEVEL=${PHOTON_DEFAULT_LOG_LEVEL})
+endif()
 
 if (actually_built)
     add_dependencies(photon_obj ${actually_built})

common/alog.cpp

@@ -77,7 +77,10 @@ class LogOutputNull : public BaseLogOutput {
 static LogOutputNull _log_output_null;
 ILogOutput* const log_output_null = &_log_output_null;
 
-ALogLogger default_logger {log_output_stdout, ALOG_DEBUG};
+#ifndef DEFAULT_LOG_LEVEL
+#define DEFAULT_LOG_LEVEL ALOG_DEBUG
+#endif
+ALogLogger default_logger {log_output_stdout, DEFAULT_LOG_LEVEL};
 ALogLogger default_audit_logger {log_output_null, ALOG_AUDIT};
 
 uint32_t& log_output_level = default_logger.log_level;
@@ -204,23 +207,26 @@ void LogFormatter::put_integer_dec(ALogBuffer& buf, ALogInteger x)
 }
 
 __attribute__((constructor)) static void __initial_timezone() { tzset(); }
-static time_t dayid = 0;
+static time_t dayid = 0, minuteid = 0, tsdelta = 0;
 static struct tm alog_time = {0};
-static struct tm* alog_update_time(time_t now)
-{
-    auto now0 = now;
+static struct tm* alog_update_time(time_t now0) {
+    auto now = now0 + tsdelta;
     int sec = now % 60;    now /= 60;
+    if (unlikely(now != minuteid)) {    // calibrate wall time every minute
+        now = time(0) - timezone;
+        tsdelta = now - now0;
+        sec = now % 60; now /= 60;
+        minuteid = now;
+    }
     int min = now % 60;    now /= 60;
     int hor = now % 24;    now /= 24;
-    if (now != dayid)
-    {
+    if (now != dayid) {
         dayid = now;
-        gmtime_r(&now0, &alog_time);
+        auto now_ = now0 + tsdelta;
+        gmtime_r(&now_, &alog_time);
         alog_time.tm_year+=1900;
         alog_time.tm_mon++;
-    }
-    else
-    {
+    } else {
         alog_time.tm_sec = sec;
         alog_time.tm_min = min;
         alog_time.tm_hour = hor;
@@ -484,7 +490,7 @@ LogBuffer& operator << (LogBuffer& log, const Prologue& pro)
     auto t = &alog_time;
 #else
     auto ts = photon::__update_now();
-    auto t = alog_update_time(ts.sec() - timezone);
+    auto t = alog_update_time(ts.sec());
 #endif
 #define DEC_W2P0(x) DEC(x).width(2).padding('0')
     log.printf(t->tm_year, '/');