fix: upgrade rust version

sunxilin · sunxilin · commit 03629660e0d8 · 2025-09-08T11:55:35.000+08:00
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -132,7 +132,7 @@ jobs:
           export PATH=$(pwd)/core/ten_gn:$PATH
           go env -w GOFLAGS="-buildvcs=false"
           go1.20.12 download
-          rustup default nightly-2025-09-04
+          rustup default nightly-2025-09-07
 
           tgn gen linux x64 debug -- enable_serialized_actions=true ten_enable_serialized_rust_action=true ten_rust_enable_gen_cargo_config=false ten_enable_ten_rust=false ten_enable_ten_rust_apis=false ten_enable_rust_incremental_build=false ten_manager_enable_frontend=false ten_enable_integration_tests_prebuilt=false ten_enable_nodejs_binding=false ten_enable_python_binding=false ten_enable_go_binding=false
 
diff --git a/.github/workflows/linux_arm64.yml b/.github/workflows/linux_arm64.yml
@@ -157,7 +157,7 @@ jobs:
               curl -fsSL https://deb.nodesource.com/setup_23.x -o nodesource_setup.sh && \
               bash nodesource_setup.sh && \
               apt-get install -y nodejs && \
-              rustup default nightly-2025-09-04 && \
+              rustup default nightly-2025-09-07 && \
               df -h . && \
               tgn gen linux arm64 ${{ matrix.build_type }} -- is_clang=${{ matrix.compiler == 'gcc' && 'false' || 'true' }} log_level=1 enable_serialized_actions=true ten_enable_serialized_rust_action=true ten_enable_tests=false ten_rust_enable_tests=false ten_manager_enable_tests=false ten_enable_libwebsockets=false ten_enable_cargo_clean=true ten_enable_rust_incremental_build=false ten_manager_enable_frontend=false ten_enable_integration_tests_prebuilt=false ten_enable_nodejs_binding=false && \
               tgn build linux arm64 ${{ matrix.build_type }} && \
diff --git a/.github/workflows/linux_ubuntu2204.yml b/.github/workflows/linux_ubuntu2204.yml
@@ -144,7 +144,7 @@ jobs:
             export PATH=$PATH:$(go env GOPATH)/bin
             go1.24.3 download
             go1.24.3 version
-            rustup default nightly-2025-09-04
+            rustup default nightly-2025-09-07
           fi
 
           df -h .
diff --git a/.github/workflows/mac_arm64.yml b/.github/workflows/mac_arm64.yml
@@ -121,7 +121,7 @@ jobs:
       - name: Install tools and dependencies
         run: |
           brew install llvm
-          rustup default nightly-2025-09-04
+          rustup default nightly-2025-09-07
 
           brew install tree
           pip3 install --use-pep517 python-dotenv jinja2
@@ -251,7 +251,7 @@ jobs:
       - name: Install tools and dependencies
         run: |
           brew install llvm
-          rustup default nightly-2025-09-04
+          rustup default nightly-2025-09-07
 
           brew install tree
           pip3 install --use-pep517 python-dotenv jinja2
@@ -406,7 +406,7 @@ jobs:
       - name: Install tools and dependencies
         run: |
           brew install llvm
-          rustup default nightly-2025-09-04
+          rustup default nightly-2025-09-07
 
           brew install tree
           pip3 install --use-pep517 python-dotenv jinja2
@@ -498,7 +498,7 @@ jobs:
       - name: Install tools and dependencies
         run: |
           brew install llvm
-          rustup default nightly-2025-09-04
+          rustup default nightly-2025-09-07
 
           brew install tree
           pip3 install --use-pep517 python-dotenv jinja2
@@ -598,7 +598,7 @@ jobs:
       - name: Install tools and dependencies
         run: |
           brew install llvm
-          rustup default nightly-2025-09-04
+          rustup default nightly-2025-09-07
 
           brew install tree
           pip3 install --use-pep517 python-dotenv jinja2
@@ -698,7 +698,7 @@ jobs:
       - name: Install tools and dependencies
         run: |
           brew install llvm
-          rustup default nightly-2025-09-04
+          rustup default nightly-2025-09-07
 
           brew install tree
           pip3 install --use-pep517 python-dotenv jinja2
diff --git a/.github/workflows/mac_x64.yml b/.github/workflows/mac_x64.yml
@@ -121,7 +121,7 @@ jobs:
       - name: Install tools and dependencies
         run: |
           brew install llvm
-          rustup default nightly-2025-09-04
+          rustup default nightly-2025-09-07
 
           brew install tree
           brew install gettext
@@ -249,7 +249,7 @@ jobs:
       - name: Install tools and dependencies
         run: |
           brew install llvm
-          rustup default nightly-2025-09-04
+          rustup default nightly-2025-09-07
 
           brew install tree
           pip3 install --use-pep517 python-dotenv jinja2
diff --git a/.github/workflows/tman_full_linux_x64.yml b/.github/workflows/tman_full_linux_x64.yml
@@ -132,7 +132,7 @@ jobs:
           export PATH=$(pwd)/core/ten_gn:$PATH
           echo $PATH
 
-          rustup default nightly-2025-09-04
+          rustup default nightly-2025-09-07
 
           df -h .
 
diff --git a/.github/workflows/tman_full_mac_arm64.yml b/.github/workflows/tman_full_mac_arm64.yml
@@ -126,7 +126,7 @@ jobs:
             brew install llvm@18
             rustup default nightly-2024-07-19
           else
-            rustup default nightly-2025-09-04
+            rustup default nightly-2025-09-07
           fi
 
           brew install tree
diff --git a/.github/workflows/tman_full_mac_x64.yml b/.github/workflows/tman_full_mac_x64.yml
@@ -127,7 +127,7 @@ jobs:
             brew install llvm@18
             rustup default nightly-2024-07-19
           else
-            rustup default nightly-2025-09-04
+            rustup default nightly-2025-09-07
           fi
 
           brew install tree
diff --git a/.github/workflows/tman_full_win_x64.yml b/.github/workflows/tman_full_win_x64.yml
@@ -126,7 +126,7 @@ jobs:
           pip3 install --use-pep517 python-dotenv jinja2
           go install golang.org/dl/go1.24.3@latest && go1.24.3 download
           go env -w GOFLAGS="-buildvcs=false"
-          rustup default nightly-2025-09-04
+          rustup default nightly-2025-09-07
           cargo install --force cbindgen
 
       - name: Get Python executable path
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
@@ -128,7 +128,7 @@ jobs:
           pip3 install --use-pep517 python-dotenv jinja2
           go install golang.org/dl/go1.24.3@latest && go1.24.3 download
           go env -w GOFLAGS="-buildvcs=false"
-          rustup default nightly-2025-09-04
+          rustup default nightly-2025-09-07
           cargo install --force cbindgen
 
       - name: Get Python executable path
@@ -254,7 +254,7 @@ jobs:
           pip3 install --use-pep517 python-dotenv jinja2
           go install golang.org/dl/go1.24.3@latest && go1.24.3 download
           go env -w GOFLAGS="-buildvcs=false"
-          rustup default nightly-2025-09-04
+          rustup default nightly-2025-09-07
           cargo install --force cbindgen
 
       - name: Get Python executable path
@@ -379,7 +379,7 @@ jobs:
           pip3 install --use-pep517 python-dotenv jinja2
           go install golang.org/dl/go1.24.3@latest && go1.24.3 download
           go env -w GOFLAGS="-buildvcs=false"
-          rustup default nightly-2025-09-04
+          rustup default nightly-2025-09-07
           cargo install --force cbindgen
 
       - name: Get Python executable path
@@ -464,7 +464,7 @@ jobs:
           pip3 install --use-pep517 python-dotenv jinja2
           go install golang.org/dl/go1.24.3@latest && go1.24.3 download
           go env -w GOFLAGS="-buildvcs=false"
-          rustup default nightly-2025-09-04
+          rustup default nightly-2025-09-07
           cargo install --force cbindgen
 
       - name: Get Python executable path
diff --git a/tests/ten_utils/unit/ten_rwlock_test.cc b/tests/ten_utils/unit/ten_rwlock_test.cc
@@ -7,12 +7,12 @@
 #include <limits.h>
 #include <stdint.h>
 
-#include <algorithm>
 #include <atomic>
 #include <chrono>
 #include <functional>
 #include <mutex>
 #include <thread>
+#include <unordered_map>
 #include <vector>
 
 #include "common/test_utils.h"
@@ -79,22 +79,19 @@ static void RunRWLockTest(ten_rwlock_t *lut, const std::string &impl,
   std::atomic<bool> stop = {false};
   std::atomic<int32_t> read_concurr = {0};
   std::atomic<int32_t> write_concurr = {0};
-  std::vector<int> writer_actives;
+  std::unordered_map<std::thread::id, int> writer_actives;
   std::mutex writer_actives_lock;
-  std::vector<int> reader_actives;
+  std::unordered_map<std::thread::id, int> reader_actives;
   std::mutex reader_actives_lock;
 
   std::srand(static_cast<unsigned>(time(NULL)));
 
   auto writer_op = [&start_event, &lut, &stop, &read_concurr, &write_concurr,
-                    &stats, &writer_actives, &writer_actives_lock,
-                    perf](int thread_idx) {
+                    &stats, &writer_actives, &writer_actives_lock, perf] {
     int *actives = nullptr;
     {
       std::lock_guard<std::mutex> _(writer_actives_lock);
-      if (thread_idx < writer_actives.size()) {
-        actives = &writer_actives[thread_idx];
-      }
+      actives = &writer_actives[std::this_thread::get_id()];
     }
 
     // int id = writer_id++;
@@ -145,16 +142,13 @@ static void RunRWLockTest(ten_rwlock_t *lut, const std::string &impl,
   };
 
   auto reader_op = [&start_event, &lut, &stop, &read_concurr, &write_concurr,
-                    &stats, &reader_actives, &reader_actives_lock,
-                    perf](int thread_idx) {
+                    &stats, &reader_actives, &reader_actives_lock, perf] {
     // int id = reader_id++;
     // AGO_LOG("[reader] % 2d: waiting for start event", id);
     int *actives = nullptr;
     {
       std::lock_guard<std::mutex> _(reader_actives_lock);
-      if (thread_idx < reader_actives.size()) {
-        actives = &reader_actives[thread_idx];
-      }
+      actives = &reader_actives[std::this_thread::get_id()];
     }
 
     ten_event_wait(start_event, -1);
@@ -201,15 +195,13 @@ static void RunRWLockTest(ten_rwlock_t *lut, const std::string &impl,
 
   // prepare
   writers.reserve(write_threads);
-  writer_actives.resize(write_threads, 0);
   for (int i = 0; i < write_threads; i++) {
-    writers.emplace_back(std::thread(writer_op, i));
+    writers.emplace_back(std::thread(writer_op));
   }
 
   readers.reserve(read_threads);
-  reader_actives.resize(read_threads, 0);
   for (int i = 0; i < read_threads; i++) {
-    readers.emplace_back(std::thread(reader_op, i));
+    readers.emplace_back(std::thread(reader_op));
   }
 
   // go
@@ -228,9 +220,9 @@ static void RunRWLockTest(ten_rwlock_t *lut, const std::string &impl,
   ThreadBalancerStatistic balancer;
   int total = 0;
   for (auto &c : writer_actives) {
-    balancer.Writer.min = std::min(balancer.Writer.min, c);
-    balancer.Writer.max = std::max(balancer.Writer.max, c);
-    total += c;
+    if (balancer.Writer.min > c.second) balancer.Writer.min = c.second;
+    if (balancer.Writer.max < c.second) balancer.Writer.max = c.second;
+    total += c.second;
   }
   if (balancer.Writer.min == INT_MAX) balancer.Writer.min = 0;
   if (!writer_actives.empty()) {
@@ -239,9 +231,9 @@ static void RunRWLockTest(ten_rwlock_t *lut, const std::string &impl,
 
   total = 0;
   for (auto &c : reader_actives) {
-    balancer.Reader.min = std::min(balancer.Reader.min, c);
-    balancer.Reader.max = std::max(balancer.Reader.max, c);
-    total += c;
+    if (balancer.Reader.min > c.second) balancer.Reader.min = c.second;
+    if (balancer.Reader.max < c.second) balancer.Reader.max = c.second;
+    total += c.second;
   }
   if (balancer.Reader.min == INT_MAX) balancer.Reader.min = 0;
   if (!reader_actives.empty()) {
diff --git a/tools/docker_for_building/ubuntu/22.04/Dockerfile b/tools/docker_for_building/ubuntu/22.04/Dockerfile
@@ -110,8 +110,8 @@ RUN export ARCH=$(dpkg --print-architecture) && curl -OL https://go.dev/dl/go1.2
 # Install cargo for rust.
 
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y && \
-  /root/.cargo/bin/rustup install nightly-2025-09-04 && \
-  /root/.cargo/bin/rustup default nightly-2025-09-04 && \
+  /root/.cargo/bin/rustup install nightly-2025-09-07 && \
+  /root/.cargo/bin/rustup default nightly-2025-09-07 && \
   /root/.cargo/bin/cargo install --force cbindgen
 
 ENV PATH="/root/.cargo/bin:$PATH"
