重新提交

Author: daixian

.editorconfig

@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

.gitattributes

@@ -0,0 +1,85 @@
+name: Build and Release
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  release:
+    name: Build + Release (.NET Framework 4.6.2)
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # 必须拉取完整历史，否则 git describe 无法正常工作
+
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v2
+        with:
+          vs-version: 'latest'
+
+      - name: Restore NuGet packages
+        run: nuget restore DNet.sln
+
+      - name: Build solution
+        run: msbuild DNet.sln /p:Configuration=Release
+
+      - name: Zip release output
+        run: |
+          mkdir output
+          Copy-Item -Recurse -Path DNET\bin\Release\* -Destination output
+          Compress-Archive -Path output\* -DestinationPath DNET-Build.zip
+
+      - name: Upload Release Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: DNET-Release-Zip
+          path: DNET-Build.zip
+
+      - name: Generate changelog
+        id: changelog
+        shell: pwsh
+        run: |
+          $tags = git tag --sort=-creatordate
+          if ($tags.Count -eq 0) {
+            Write-Host "没有 tag，使用全部提交"
+            $log = git log --pretty=format:"%h %s"
+          } elseif ($tags.Count -eq 1) {
+            $lastTag = $tags[0]
+            Write-Host "只有一个 tag：$lastTag，显示该 tag 提交"
+            $log = git log -1 --pretty=format:"%h %s" $lastTag
+          } else {
+            $lastTag = $tags[0]
+            $prevTag = $tags[1]
+            Write-Host "当前 tag：$lastTag，之前 tag：$prevTag"
+            $log = git log --pretty=format:"%h %s" "$prevTag..$lastTag"
+          }
+
+          if (-not $log) {
+            Write-Host "无提交，改为最近5条提交"
+            $log = git log -n 5 --pretty=format:"%h %s"
+          }
+
+          Write-Host "----- changelog start -----"
+          Write-Host $log
+          Write-Host "----- changelog end -----"
+
+          Add-Content -Path $env:GITHUB_OUTPUT -Value "changelog<<EOF"
+          $log.Split("`n") | ForEach-Object { Add-Content -Path $env:GITHUB_OUTPUT -Value $_ }
+          Add-Content -Path $env:GITHUB_OUTPUT -Value "EOF"
+
+      # 🔽 发布 Release 并附带变更日志
+      - name: Publish GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: DNET-Build.zip
+          body: |
+            🚀 自动发布版本
+
+            📦 变更内容:
+            ${{ steps.changelog.outputs.changelog }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build-and-release.yml

@@ -0,0 +1,48 @@
+name: Build and Test
+
+on:
+  push:
+    branches: [main, master]
+  pull_request:
+    branches: [main, master]
+
+jobs:
+  build:
+    name: Build and Test (.NET Framework 4.6.2)
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v2
+        with:
+          vs-version: "latest"
+
+      - name: Restore NuGet packages
+        run: nuget restore DNet.sln
+
+      - name: Build solution
+        run: msbuild DNet.sln /p:Configuration=Release
+
+      - name: Run NUnit Tests
+        shell: pwsh
+        run: |
+          $testDll = "DNET.Test\bin\Release\DNET.Test.dll"
+          if (-Not (Test-Path $testDll)) {
+            Write-Error "Test DLL not found: $testDll"
+            exit 1
+          }
+
+          # 查找 vstest.console.exe，只取第一条结果
+          $vsTestPath = & "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" `
+            -latest -products * -requires Microsoft.VisualStudio.PackageGroup.TestTools.Core `
+            -find **\vstest.console.exe | Select-Object -First 1
+
+          if (-not (Test-Path $vsTestPath)) {
+            Write-Error "vstest.console.exe not found at: $vsTestPath"
+            exit 1
+          }
+
+          & "$vsTestPath" "$testDll"

.github/workflows/build.yml

@@ -0,0 +1,104 @@
+# Build results
+[Dd]ebug/
+[Rr]elease/
+x64/
+x86/
+build/
+[Bb]in/
+[Oo]bj/
+
+# Visual Studio 2015+ cache/options directory
+.vs/
+
+# User-specific files
+*.user
+*.suo
+*.userosscache
+*.sln.docstates
+
+# Auto-generated files by Visual Studio
+*.vcxproj.user
+*.filters
+*.log
+
+# NuGet packages
+*.nupkg
+packages/
+# NuGet v3's project.json files
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# Visual Studio Code workspace settings
+.vscode/
+
+# Rider
+.idea/
+
+# Others
+*.dbmdl
+*.pdb
+*.cache
+*.ilk
+*.meta
+*.obj
+*.exe
+*.dll
+*.lib
+*.app
+*.apk
+*.iobj
+*.ipdb
+*.iuser
+*.ipch
+*.idb
+*.class
+*.jar
+*.war
+*.ear
+
+# DotCover
+*.dotCover
+
+# Resharper
+_ReSharper*/
+
+# TFS
+$tf/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# Backup & report files
+*.bak
+*.backup
+*.log
+*.rdlc
+*.trx
+
+# Others
+*.userprefs
+
+# IIS Express
+/.vs/
+*.vspscc
+
+# Publish Web Output
+*.Publish.xml
+*.azurePubxml
+*.pubxml.user
+
+# Web workbench config files
+.sass-cache/
+*.css.map
+
+# npm packages
+node_modules/
+
+# Yarn Integrity file
+.yarn-integrity
+
+# JetBrains Rider
+.idea/
+.DS_Store

.gitignore

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Concurrent;
+using System.Threading.Tasks;
+using NUnit.Framework;
+
+namespace DNET.Test
+{
+    [TestFixture]
+    public class ByteBufferPoolTests
+    {
+        [Test]
+        public void MultiThread_GetAndRecycle_ShouldBeThreadSafe()
+        {
+            int threadCount = 16;
+            int iterationsPerThread = 100_000;
+            int blockSize = 256;
+            int capacityLimit = 128;
+
+            ByteBufferPool pool = new ByteBufferPool(blockSize, capacityLimit);
+
+            // 用于记录是否出异常
+            var exceptions = new ConcurrentQueue<Exception>();
+
+            Parallel.For(0, threadCount, t => {
+                try {
+                    for (int i = 0; i < iterationsPerThread; i++) {
+                        // 模拟不同大小的请求
+                        int size = i % 4 == 0 ? blockSize * 2 : blockSize;
+
+                        ByteBuffer buf = pool.Get(size);
+
+                        Assert.That(buf.Length, Is.EqualTo(0)); // 重点检查这里
+                        Assert.That(buf.Capacity, Is.GreaterThanOrEqualTo(size));
+
+                        // 模拟写入
+                        buf.Write(new byte[16], 0, 16);
+                        Assert.That(buf.Length, Is.EqualTo(16)); // 重点检查这里
+
+                        // 模拟使用后归还
+                        pool.Recycle(buf);
+                    }
+                } catch (Exception ex) {
+                    exceptions.Enqueue(ex);
+                }
+            });
+
+            // 所有线程完成后检查
+            Assert.That(exceptions, Is.Empty, $"有异常发生: {string.Join("\n", exceptions)}");
+
+            // 检查分配数量是否合理 LogProxy.LogDebug
+            Console.WriteLine($"池中剩余数量: {pool.InPoolCount}, 总共分配: {pool.TotalAllocated},成功复用次数: {pool.ReusedCount}");
+
+            Assert.That(pool.InPoolCount, Is.LessThanOrEqualTo(capacityLimit), "池中数量不能超过上限");
+            Assert.That(pool.TotalAllocated, Is.GreaterThan(0), "应至少分配过一次");
+        }
+    }
+}