fix: 修复cputest和memorytest的C重构，尽量使用CGO编译嵌入依赖，拓展编译支持的系统和架构，增加容错机制

chore: update ECS_VERSION to 0.1.55 in goecs.sh
fix: 修复传递过程中非指针传递导致的写入丢失
2025-09-27 03:36:12 +08:00 · 2025-07-16 14:47:11 +00:00 · 2025-07-15 12:48:33 +00:00 · 2025-07-15 12:44:24 +00:00 · 2025-07-15 12:27:50 +00:00
8 changed files with 235 additions and 76 deletions
--- a/.goreleaser.old
+++ b/.goreleaser.old
@@ -0,0 +1,84 @@
+before:
+  hooks:
+    - go mod tidy -v
+builds:
+  - id: universal
+    env:
+      - CGO_ENABLED=0
+    ldflags:
+      - -s -w -X main.version={{.Version}} -X main.arch={{.Arch}} -checklinkname=0 -extldflags=-static
+    flags:
+      - -trimpath
+    goos:
+      - linux
+      - windows
+      - freebsd
+    goarch:
+      - arm
+      - arm64
+      - 386
+      - amd64
+      - mips
+      - mipsle
+      - s390x
+      - riscv64
+    gomips:
+      - softfloat
+    ignore:
+      - goos: windows
+        goarch: arm
+    main: ./
+    binary: goecs
+  - id: darwin-amd64
+    env:
+      - CGO_ENABLED=1
+      - CC=o64-clang
+      - CXX=o64-clang++
+    ldflags:
+      - -s -w -X main.version={{.Version}} -X main.arch={{.Arch}} -checklinkname=0
+    flags:
+      - -trimpath
+    goos:
+      - darwin
+    goarch:
+      - amd64
+    main: ./
+    binary: goecs
+  - id: darwin-arm64
+    env:
+      - CGO_ENABLED=1
+      - CC=oa64-clang
+      - CXX=oa64-clang++
+    ldflags:
+      - -s -w -X main.version={{.Version}} -X main.arch={{.Arch}} -checklinkname=0
+    flags:
+      - -trimpath
+    goos:
+      - darwin
+    goarch:
+      - arm64
+    main: ./
+    binary: goecs
+universal_binaries:
+  - name_template: "goecs"
+    replace: false
+checksum:
+  name_template: "checksums.txt"
+snapshot:
+  name_template: "goecs"
+archives:
+  - name_template: "goecs_{{ .Os }}_{{ .Arch }}"
+    format: zip
+    files:
+      - none*
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - "^docs:"
+      - "^test:"
+      - "^chore"
+      - Merge pull request
+      - Merge branch
+      - go mod tidy
+      - New translations
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -1,7 +1,64 @@
+project_name: goecs
+env:
+  - GO111MODULE=on
+  - CGO_ENABLED=0
 before:
  hooks:
    - go mod tidy -v
 builds:
+  - id: linux-cgo
+    env:
+      - CGO_ENABLED=1
+    ldflags:
+      - -s -w -X main.version={{.Version}} -X main.arch={{.Arch}} -checklinkname=0 -extldflags=-static
+    flags:
+      - -trimpath
+    goos:
+      - linux
+    goarch:
+      - amd64
+      - 386
+      - arm64
+      - riscv64
+      - mips64
+      - mips64le
+      - ppc64le
+    main: ./
+    binary: goecs
+    no_unique_dist_dir: true
+    allow_different_binary_count: true
+  - id: windows-cgo
+    env:
+      - CGO_ENABLED=1
+    ldflags:
+      - -s -w -X main.version={{.Version}} -X main.arch={{.Arch}} -checklinkname=0 -extldflags=-static
+    flags:
+      - -trimpath
+    goos:
+      - windows
+    goarch:
+      - amd64
+      - 386
+    main: ./
+    binary: goecs
+    no_unique_dist_dir: true
+    allow_different_binary_count: true
+  - id: darwin-cgo
+    env:
+      - CGO_ENABLED=1
+    ldflags:
+      - -s -w -X main.version={{.Version}} -X main.arch={{.Arch}} -checklinkname=0
+    flags:
+      - -trimpath
+    goos:
+      - darwin
+    goarch:
+      - amd64
+      - arm64
+    main: ./
+    binary: goecs
+    no_unique_dist_dir: true
+    allow_different_binary_count: true
  - id: universal
    env:
      - CGO_ENABLED=0
@@ -13,57 +70,76 @@ builds:
      - linux
      - windows
      - freebsd
+      - openbsd
+      - netbsd
    goarch:
      - arm
      - arm64
      - 386
      - amd64
+      - s390x
      - mips
      - mipsle
-      - s390x
-      - riscv64
+      - ppc64
+    goarm:
+      - "5"
+      - "6"
+      - "7"
    gomips:
      - softfloat
    ignore:
+      # 避免和 linux-cgo 重叠
+      - goos: linux
+        goarch: amd64
+      - goos: linux
+        goarch: 386
+      - goos: linux
+        goarch: arm64
+      - goos: linux
+        goarch: riscv64
+      - goos: linux
+        goarch: mips64
+      - goos: linux
+        goarch: mips64le
+      - goos: linux
+        goarch: ppc64le
+      # 避免和 windows-cgo 重叠
+      - goos: windows
+        goarch: amd64
+      - goos: windows
+        goarch: 386
+      # 避免和 darwin-cgo 重叠
+      - goos: darwin
+        goarch: amd64
+      - goos: darwin
+        goarch: arm64
+      # 原系统不支持的忽略规则
      - goos: windows
        goarch: arm
+      - goos: freebsd
+        goarch: 386
+      - goos: openbsd
+        goarch: 386
+      - goos: netbsd
+        goarch: 386
    main: ./
    binary: goecs
-  - id: darwin-amd64
-    env:
-      - CGO_ENABLED=1
-      - CC=o64-clang
-      - CXX=o64-clang++
-    ldflags:
-      - -s -w -X main.version={{.Version}} -X main.arch={{.Arch}} -checklinkname=0
-    flags:
-      - -trimpath
-    goos:
-      - darwin
-    goarch:
-      - amd64
-    main: ./
-    binary: goecs
-  - id: darwin-arm64
-    env:
-      - CGO_ENABLED=1
-      - CC=oa64-clang
-      - CXX=oa64-clang++
-    ldflags:
-      - -s -w -X main.version={{.Version}} -X main.arch={{.Arch}} -checklinkname=0
-    flags:
-      - -trimpath
-    goos:
-      - darwin
-    goarch:
-      - arm64
-    main: ./
-    binary: goecs
+    no_unique_dist_dir: true
+    allow_different_binary_count: true
 universal_binaries:
  - name_template: "goecs"
    replace: false
+    ids:
+      - darwin-cgo
 checksum:
  name_template: "checksums.txt"
+  algorithm: sha256
+  disable: false
+  ids:
+    - linux-cgo
+    - windows-cgo
+    - darwin-cgo
+    - universal
 snapshot:
  name_template: "goecs"
 archives:
@@ -71,6 +147,7 @@ archives:
    format: zip
    files:
      - none*
+    allow_different_binary_count: true
 changelog:
  sort: asc
  filters:
@@ -81,4 +158,4 @@ changelog:
      - Merge pull request
      - Merge branch
      - go mod tidy
-      - New translations
+      - New translations
--- a/README.md
+++ b/README.md
@@ -30,9 +30,9 @@ Shell 版本：[https://github.com/spiritLHLS/ecs](https://github.com/spiritLHLS
 | 编译支持的架构 | 测试支持的架构 | 编译支持的系统 | 测试支持的系统 |
 |---------------------------|-----------|---------|-----------|
 | amd64                     | amd64     | Linux   | Linux     |
-| arm                       | arm       | Windows | Windows   |
-| arm64                     | arm64     | FreeBSD | FreeBSD   |
-| 386                       | 386       | OpenBSD |           |
+| arm                       |           | Windows | Windows   |
+| arm64                     | arm64     | FreeBSD |           |
+| 386                       |           | OpenBSD |           |
 | mips                      |           | MacOS   | MacOS     |
 | mipsle                    |           |         |           |
 | s390x                     | s390x     |         |           |
--- a/README_EN.md
+++ b/README_EN.md
@@ -28,10 +28,10 @@ Shell version: [https://github.com/spiritLHLS/ecs/blob/main/README_EN.md](https:
 | Supported for Compilation | Tested on | Supported OS for Compilation | Tested OS |
 |---------------------------|-----------|------------------------------|-----------|
 | amd64                     | amd64     | Linux                        | Linux     |
-| arm                       | arm       | Windows                      | Windows   |
-| arm64                     | arm64     | FreeBSD                      | FreeBSD   |
-| 386                       | 386       | OpenBSD                      |           |
-| mips                      |           | MacOS                        | MacOS     |
+| arm                       |           | Windows                      | Windows   |
+| arm64                     | arm64     | FreeBSD                      |           |
+| 386                       |           | OpenBSD                      |           |
+| mips                      |           | MacOS(darwin)                | MacOS     |
 | mipsle                    |           |                              |           |
 | s390x                     | s390x     |                              |           |
 | riscv64                   |           |                              |           |
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,6 @@
 module github.com/oneclickvirt/ecs

-go 1.24.1
-
-toolchain go1.24.2
+go 1.24.5

 require (
 	github.com/imroc/req/v3 v3.50.0
@@ -10,11 +8,11 @@ require (
 	github.com/oneclickvirt/UnlockTests v0.0.27-20250628125053
 	github.com/oneclickvirt/backtrace v0.0.5-20250629024536
 	github.com/oneclickvirt/basics v0.0.15-20250714163009
-	github.com/oneclickvirt/cputest v0.0.10-20250404151448
+	github.com/oneclickvirt/cputest v0.0.11-20250716031513
 	github.com/oneclickvirt/defaultset v0.0.2-20240624082446
 	github.com/oneclickvirt/disktest v0.0.8-20250701092629
 	github.com/oneclickvirt/gostun v0.0.3-20250329105202
-	github.com/oneclickvirt/memorytest v0.0.6-20250630141424.0.20250701113027-9edfc91f68e6
+	github.com/oneclickvirt/memorytest v0.0.8-20250716133749
 	github.com/oneclickvirt/nt3 v0.0.5-20250416131047
 	github.com/oneclickvirt/pingtest v0.0.8-20250701125637
 	github.com/oneclickvirt/portchecker v0.0.3-20250329125750
--- a/go.sum
+++ b/go.sum
@@ -105,8 +105,8 @@ github.com/oneclickvirt/backtrace v0.0.5-20250629024536 h1:caHCa0DHmbYWBFN1bqKxp
 github.com/oneclickvirt/backtrace v0.0.5-20250629024536/go.mod h1:5AH00bo41hH3d2/JVuCTlBkZUs3AXX4nlKVXb6piZcI=
 github.com/oneclickvirt/basics v0.0.15-20250714163009 h1:7I1lU7N91kClw6Cb6o+vGfScc/HngrjhsaaW10AbBFs=
 github.com/oneclickvirt/basics v0.0.15-20250714163009/go.mod h1:yN1IEOXN6v/GJqJSA70Pooo6nXBI/6rq72vTY72wJMQ=
-github.com/oneclickvirt/cputest v0.0.10-20250404151448 h1:ovGtCwFXG0qmpyNDRqcNDIiAmhrtemCjIUXTJ1fPH0o=
-github.com/oneclickvirt/cputest v0.0.10-20250404151448/go.mod h1:MmaHN9+XMntI3rLycwj8Ne31fG18IfNoa8N2utDK1CY=
+github.com/oneclickvirt/cputest v0.0.11-20250716031513 h1:6xP/QCxwI6jTLmarIY3UIgaeOL2u94hzjVyG4yNa4WM=
+github.com/oneclickvirt/cputest v0.0.11-20250716031513/go.mod h1:vjlH8tkPFft1tlLOpeNskXVvurxkHaJ3+dgFxQGLXY4=
 github.com/oneclickvirt/dd v0.0.2-20250701085922 h1:WiWZwcnCPhRc8hLZdvkjD2kOEpnqn1S31z1j0x3V4l0=
 github.com/oneclickvirt/dd v0.0.2-20250701085922/go.mod h1:tImu9sPTkLWo2tf1dEN1xQzrylWKauj9hbU8PHfyAeU=
 github.com/oneclickvirt/defaultset v0.0.2-20240624082446 h1:5Pg3mK/u/vQvSz7anu0nxzrNdELi/AcDAU1mMsmPzyc=
@@ -119,8 +119,8 @@ github.com/oneclickvirt/gostun v0.0.3-20250329105202 h1:aJ6E91Lp94lq8iWRcCaxpXTj
 github.com/oneclickvirt/gostun v0.0.3-20250329105202/go.mod h1:f7DPEXAxbmwXSW33dbxtb0/KzqvOBWhTs2Or5xBerQA=
 github.com/oneclickvirt/mbw v0.0.1-20250630140849 h1:p6RMhOPBnQKAm9+VEQ2axAFsidrdSdrhXMyheIyv2a8=
 github.com/oneclickvirt/mbw v0.0.1-20250630140849/go.mod h1:0Vq6NRpyLmGUdfHfL3uDcFsuZhi7KlG+OCs5ky2757Y=
-github.com/oneclickvirt/memorytest v0.0.6-20250630141424.0.20250701113027-9edfc91f68e6 h1:78/eMk+FGeDxxpKgkTb4GF5KJe76y8UW7Htcwm2hF9I=
-github.com/oneclickvirt/memorytest v0.0.6-20250630141424.0.20250701113027-9edfc91f68e6/go.mod h1:7xMacjQobvFAtODht2hxTsB9hM2IFS7vZk3gxx+bsjo=
+github.com/oneclickvirt/memorytest v0.0.8-20250716133749 h1:/z5lfsxRo5MHPfTAAKLk9vD0sQ4JDw5aEe21u6rQdfw=
+github.com/oneclickvirt/memorytest v0.0.8-20250716133749/go.mod h1:7xMacjQobvFAtODht2hxTsB9hM2IFS7vZk3gxx+bsjo=
 github.com/oneclickvirt/nt3 v0.0.5-20250416131047 h1:KL0xowq19cW+FMBGMJxdqpRNoeyR+eEmb+jYSubmlTk=
 github.com/oneclickvirt/nt3 v0.0.5-20250416131047/go.mod h1:CVsDJEaIdyyZHn3WKbhU8Wn6GOfmBNvJlC/dDLRqcSQ=
 github.com/oneclickvirt/pingtest v0.0.8-20250701125637 h1:J28Ai5miTq1J0I4gdT8rewJSd3LwzD90L/bNiiaKfHM=
--- a/goecs.go
+++ b/goecs.go
@@ -39,7 +39,7 @@ import (
 )

 var (
-	ecsVersion                                                        = "v0.1.54"
+	ecsVersion                                                        = "v0.1.56"
 	menuMode                                                          bool
 	onlyChinaTest                                                     bool
 	input, choice                                                     string
@@ -462,11 +462,11 @@ func handleSignalInterrupt(sig chan os.Signal, startTime *time.Time, output *str
 	}
 }

-func runChineseTests(preCheck utils.NetCheckResult, wg1, wg2, wg3 *sync.WaitGroup, basicInfo, securityInfo, emailInfo, mediaInfo, ptInfo *string, output, tempOutput string, startTime time.Time, outputMutex *sync.Mutex) string {
-	output = runBasicTests(preCheck, basicInfo, securityInfo, output, tempOutput, outputMutex)
-	output = runCPUTest(output, tempOutput, outputMutex)
-	output = runMemoryTest(output, tempOutput, outputMutex)
-	output = runDiskTest(output, tempOutput, outputMutex)
+func runChineseTests(preCheck utils.NetCheckResult, wg1, wg2, wg3 *sync.WaitGroup, basicInfo, securityInfo, emailInfo, mediaInfo, ptInfo *string, output *string, tempOutput string, startTime time.Time, outputMutex *sync.Mutex) {
+	*output = runBasicTests(preCheck, basicInfo, securityInfo, *output, tempOutput, outputMutex)
+	*output = runCPUTest(*output, tempOutput, outputMutex)
+	*output = runMemoryTest(*output, tempOutput, outputMutex)
+	*output = runDiskTest(*output, tempOutput, outputMutex)
 	if (onlyChinaTest || pingTestStatus) && preCheck.Connected && preCheck.StackType != "" && preCheck.StackType != "None" {
 		wg3.Add(1)
 		go func() {
@@ -489,24 +489,24 @@ func runChineseTests(preCheck utils.NetCheckResult, wg1, wg2, wg3 *sync.WaitGrou
 		}()
 	}
 	if preCheck.Connected && preCheck.StackType != "" && preCheck.StackType != "None" {
-		output = runStreamingTests(wg1, mediaInfo, output, tempOutput, outputMutex)
-		output = runSecurityTests(*securityInfo, output, tempOutput, outputMutex)
-		output = runEmailTests(wg2, emailInfo, output, tempOutput, outputMutex)
+		*output = runStreamingTests(wg1, mediaInfo, *output, tempOutput, outputMutex)
+		*output = runSecurityTests(*securityInfo, *output, tempOutput, outputMutex)
+		*output = runEmailTests(wg2, emailInfo, *output, tempOutput, outputMutex)
 	}
 	if runtime.GOOS != "windows" && preCheck.Connected && preCheck.StackType != "" && preCheck.StackType != "None" {
-		output = runNetworkTests(wg3, ptInfo, output, tempOutput, outputMutex)
+		*output = runNetworkTests(wg3, ptInfo, *output, tempOutput, outputMutex)
 	}
 	if preCheck.Connected && preCheck.StackType != "" && preCheck.StackType != "None" {
-		output = runSpeedTests(output, tempOutput, outputMutex)
+		*output = runSpeedTests(*output, tempOutput, outputMutex)
 	}
-	return appendTimeInfo(output, tempOutput, startTime, outputMutex)
+	*output = appendTimeInfo(*output, tempOutput, startTime, outputMutex)
 }

-func runEnglishTests(preCheck utils.NetCheckResult, wg1, wg2 *sync.WaitGroup, basicInfo, securityInfo, emailInfo, mediaInfo *string, output, tempOutput string, startTime time.Time, outputMutex *sync.Mutex) string {
-	output = runBasicTests(preCheck, basicInfo, securityInfo, output, tempOutput, outputMutex)
-	output = runCPUTest(output, tempOutput, outputMutex)
-	output = runMemoryTest(output, tempOutput, outputMutex)
-	output = runDiskTest(output, tempOutput, outputMutex)
+func runEnglishTests(preCheck utils.NetCheckResult, wg1, wg2 *sync.WaitGroup, basicInfo, securityInfo, emailInfo, mediaInfo *string, output *string, tempOutput string, startTime time.Time, outputMutex *sync.Mutex) {
+	*output = runBasicTests(preCheck, basicInfo, securityInfo, *output, tempOutput, outputMutex)
+	*output = runCPUTest(*output, tempOutput, outputMutex)
+	*output = runMemoryTest(*output, tempOutput, outputMutex)
+	*output = runDiskTest(*output, tempOutput, outputMutex)
 	if preCheck.Connected && preCheck.StackType != "" && preCheck.StackType != "None" {
 		if utTestStatus {
 			wg1.Add(1)
@@ -522,12 +522,12 @@ func runEnglishTests(preCheck utils.NetCheckResult, wg1, wg2 *sync.WaitGroup, ba
 				*emailInfo = email.EmailCheck()
 			}()
 		}
-		output = runStreamingTests(wg1, mediaInfo, output, tempOutput, outputMutex) // 传递指针
-		output = runSecurityTests(*securityInfo, output, tempOutput, outputMutex)
-		output = runEmailTests(wg2, emailInfo, output, tempOutput, outputMutex)
-		output = runEnglishSpeedTests(output, tempOutput, outputMutex)
+		*output = runStreamingTests(wg1, mediaInfo, *output, tempOutput, outputMutex)
+		*output = runSecurityTests(*securityInfo, *output, tempOutput, outputMutex)
+		*output = runEmailTests(wg2, emailInfo, *output, tempOutput, outputMutex)
+		*output = runEnglishSpeedTests(*output, tempOutput, outputMutex)
 	}
-	return appendTimeInfo(output, tempOutput, startTime, outputMutex)
+	*output = appendTimeInfo(*output, tempOutput, startTime, outputMutex)
 }

 func runBasicTests(preCheck utils.NetCheckResult, basicInfo, securityInfo *string, output, tempOutput string, outputMutex *sync.Mutex) string {
@@ -810,9 +810,9 @@ func main() {
 	go handleSignalInterrupt(sig, &startTime, &output, tempOutput, uploadDone, &outputMutex)
 	switch language {
 	case "zh":
-		output = runChineseTests(preCheck, &wg1, &wg2, &wg3, &basicInfo, &securityInfo, &emailInfo, &mediaInfo, &ptInfo, output, tempOutput, startTime, &outputMutex)
+		runChineseTests(preCheck, &wg1, &wg2, &wg3, &basicInfo, &securityInfo, &emailInfo, &mediaInfo, &ptInfo, &output, tempOutput, startTime, &outputMutex)
 	case "en":
-		output = runEnglishTests(preCheck, &wg1, &wg2, &basicInfo, &securityInfo, &emailInfo, &mediaInfo, output, tempOutput, startTime, &outputMutex)
+		runEnglishTests(preCheck, &wg1, &wg2, &basicInfo, &securityInfo, &emailInfo, &mediaInfo, &output, tempOutput, startTime, &outputMutex)
 	default:
 		fmt.Println("Unsupported language")
 	}
--- a/goecs.sh
+++ b/goecs.sh
@@ -143,7 +143,7 @@ goecs_check() {
    os=$(uname -s 2>/dev/null || echo "Unknown")
    arch=$(uname -m 2>/dev/null || echo "Unknown")
    check_china
-    ECS_VERSION="0.1.53"
+    ECS_VERSION="0.1.55"
    for api in \
        "https://api.github.com/repos/oneclickvirt/ecs/releases/latest" \
        "https://githubapi.spiritlhl.workers.dev/repos/oneclickvirt/ecs/releases/latest" \
@@ -155,8 +155,8 @@ goecs_check() {
        sleep 1
    done
    if [ -z "$ECS_VERSION" ]; then
-        _yellow "Unable to get version info, using default version 0.1.53"
-        ECS_VERSION="0.1.53"
+        _yellow "Unable to get version info, using default version 0.1.55"
+        ECS_VERSION="0.1.55"
    fi
    version_output=""
    for cmd_path in "goecs" "./goecs" "/usr/bin/goecs" "/usr/local/bin/goecs"; do
Author	SHA1	Message	Date
spiritlhl	e523ca3c84	fix: 修复cputest和memorytest的C重构，尽量使用CGO编译嵌入依赖，拓展编译支持的系统和架构，增加容错机制	2025-07-16 14:47:11 +00:00
github-actions[bot]	42943370bb	chore: update ECS_VERSION to 0.1.55 in goecs.sh	2025-07-15 12:48:33 +00:00
spiritlhl	7339f0336c	fix: 修复传递过程中非指针传递导致的写入丢失	2025-07-15 12:44:24 +00:00
github-actions[bot]	54bbe16563	chore: update ECS_VERSION to 0.1.54 in goecs.sh	2025-07-15 12:27:50 +00:00