modify logic of buffer

hiram3512 · Apr 4, 2019 · 9612edb · 9612edb
1 parent 2f54f19
commit 9612edb
Show file tree

Hide file tree

Showing 48 changed files with 36 additions and 16 deletions.
diff --git a/src/HiSocket.Example/App.config b/src/HiSocket.Example/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
-    </startup>
-</configuration>
+
+    <supportedRuntime version="v2.0.50727"/></startup>
+</configuration>
diff --git a/src/HiSocket.Example/HiSocket.Example.csproj b/src/HiSocket.Example/HiSocket.Example.csproj
@@ -8,9 +8,10 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>HiSocket.Example</RootNamespace>
     <AssemblyName>HiSocket.Example</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile>Unity Subset v3.5</TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

diff --git a/src/HiSocket.Example/bin/Debug/HiSocket.Example.exe b/src/HiSocket.Example/bin/Debug/HiSocket.Example.exe
diff --git a/src/HiSocket.Example/bin/Debug/HiSocket.Example.exe.config b/src/HiSocket.Example/bin/Debug/HiSocket.Example.exe.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
-    </startup>
-</configuration>
+
+    <supportedRuntime version="v2.0.50727"/></startup>
+</configuration>
diff --git a/src/HiSocket.Example/bin/Debug/HiSocket.Example.pdb b/src/HiSocket.Example/bin/Debug/HiSocket.Example.pdb
diff --git a/src/HiSocket.Example/bin/Debug/HiSocket.Message.dll b/src/HiSocket.Example/bin/Debug/HiSocket.Message.dll
diff --git a/src/HiSocket.Example/bin/Debug/HiSocket.Message.pdb b/src/HiSocket.Example/bin/Debug/HiSocket.Message.pdb
diff --git a/src/HiSocket.Example/bin/Debug/HiSocket.dll b/src/HiSocket.Example/bin/Debug/HiSocket.dll
diff --git a/src/HiSocket.Example/bin/Debug/HiSocket.pdb b/src/HiSocket.Example/bin/Debug/HiSocket.pdb
diff --git a/src/HiSocket.Example/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/src/HiSocket.Example/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/src/HiSocket.Example/obj/Debug/HiSocket.Example.csproj.CoreCompileInputs.cache b/src/HiSocket.Example/obj/Debug/HiSocket.Example.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f30679e8703ee0bde5a883148d1cfe583578e62f
+bfe03b0b643ce2cb02f88d3aac3eb1d5b32f5a25
diff --git a/src/HiSocket.Example/obj/Debug/HiSocket.Example.csprojAssemblyReference.cache b/src/HiSocket.Example/obj/Debug/HiSocket.Example.csprojAssemblyReference.cache
diff --git a/src/HiSocket.Example/obj/Debug/HiSocket.Example.exe b/src/HiSocket.Example/obj/Debug/HiSocket.Example.exe
diff --git a/src/HiSocket.Example/obj/Debug/HiSocket.Example.pdb b/src/HiSocket.Example/obj/Debug/HiSocket.Example.pdb
diff --git a/src/HiSocket.Message/HiSocket.Message.csproj b/src/HiSocket.Message/HiSocket.Message.csproj
@@ -11,6 +11,7 @@
     <AssemblyName>HiSocket.Message</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile>Unity Subset v3.5</TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/src/HiSocket.Message/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/src/HiSocket.Message/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/src/HiSocket.Message/obj/Debug/HiSocket.Message.csproj.CoreCompileInputs.cache b/src/HiSocket.Message/obj/Debug/HiSocket.Message.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-a9d6d1160fc5262789cd2aa4fa606d957210502b
+85163093e10efbb4350ab8970a86af5be6cb488c
diff --git a/src/HiSocket.Message/obj/Debug/HiSocket.Message.csprojAssemblyReference.cache b/src/HiSocket.Message/obj/Debug/HiSocket.Message.csprojAssemblyReference.cache
diff --git a/src/HiSocket.Message/obj/Debug/HiSocket.Message.dll b/src/HiSocket.Message/obj/Debug/HiSocket.Message.dll
diff --git a/src/HiSocket.Message/obj/Debug/HiSocket.Message.pdb b/src/HiSocket.Message/obj/Debug/HiSocket.Message.pdb
diff --git a/src/HiSocket.Test/HiSocket.Test.csproj b/src/HiSocket.Test/HiSocket.Test.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>HiSocket.Test</RootNamespace>
     <AssemblyName>HiSocket.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
@@ -19,6 +19,7 @@
     <TestProjectType>UnitTest</TestProjectType>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/src/HiSocket.Test/bin/Debug/HiSocket.Message.dll b/src/HiSocket.Test/bin/Debug/HiSocket.Message.dll
diff --git a/src/HiSocket.Test/bin/Debug/HiSocket.Message.pdb b/src/HiSocket.Test/bin/Debug/HiSocket.Message.pdb
diff --git a/src/HiSocket.Test/bin/Debug/HiSocket.Test.dll b/src/HiSocket.Test/bin/Debug/HiSocket.Test.dll
diff --git a/src/HiSocket.Test/bin/Debug/HiSocket.Test.pdb b/src/HiSocket.Test/bin/Debug/HiSocket.Test.pdb
diff --git a/src/HiSocket.Test/bin/Debug/HiSocket.dll b/src/HiSocket.Test/bin/Debug/HiSocket.dll
diff --git a/src/HiSocket.Test/bin/Debug/HiSocket.pdb b/src/HiSocket.Test/bin/Debug/HiSocket.pdb
diff --git a/src/HiSocket.Test/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/src/HiSocket.Test/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/src/HiSocket.Test/obj/Debug/HiSocket.Test.csproj.CoreCompileInputs.cache b/src/HiSocket.Test/obj/Debug/HiSocket.Test.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-cce52a4795e6d5db3dbd01a2cfaca65891eb473c
+d2c55b9ca13d0ef5d02990a6d4e0e07c8e133469
diff --git a/src/HiSocket.Test/obj/Debug/HiSocket.Test.csproj.FileListAbsolute.txt b/src/HiSocket.Test/obj/Debug/HiSocket.Test.csproj.FileListAbsolute.txt
@@ -36,3 +36,9 @@ D:\MyGit\github\HiSocket\src\HiSocket.Test\obj\Debug\HiSocket.Test.csproj.CoreCo
 D:\MyGit\github\HiSocket\src\HiSocket.Test\obj\Debug\HiSocket.Test.csproj.CopyComplete
 D:\MyGit\github\HiSocket\src\HiSocket.Test\obj\Debug\HiSocket.Test.dll
 D:\MyGit\github\HiSocket\src\HiSocket.Test\obj\Debug\HiSocket.Test.pdb
+D:\MyGit\github\HiSocket\src\HiSocket.Test\bin\Debug\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll
+D:\MyGit\github\HiSocket\src\HiSocket.Test\bin\Debug\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.dll
+D:\MyGit\github\HiSocket\src\HiSocket.Test\bin\Debug\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll
+D:\MyGit\github\HiSocket\src\HiSocket.Test\bin\Debug\zh-Hans\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.resources.dll
+D:\MyGit\github\HiSocket\src\HiSocket.Test\bin\Debug\zh-Hans\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll
+D:\MyGit\github\HiSocket\src\HiSocket.Test\bin\Debug\zh-Hans\Microsoft.VisualStudio.TestPlatform.TestFramework.resources.dll
diff --git a/src/HiSocket.Test/obj/Debug/HiSocket.Test.csprojAssemblyReference.cache b/src/HiSocket.Test/obj/Debug/HiSocket.Test.csprojAssemblyReference.cache
diff --git a/src/HiSocket.Test/obj/Debug/HiSocket.Test.dll b/src/HiSocket.Test/obj/Debug/HiSocket.Test.dll
diff --git a/src/HiSocket.Test/obj/Debug/HiSocket.Test.pdb b/src/HiSocket.Test/obj/Debug/HiSocket.Test.pdb
diff --git a/src/HiSocket/HiSocket.csproj b/src/HiSocket/HiSocket.csproj
@@ -11,6 +11,7 @@
     <AssemblyName>HiSocket</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile>Unity Subset v3.5</TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/src/HiSocket/TcpConnection/Socket/TcpSocket.cs b/src/HiSocket/TcpConnection/Socket/TcpSocket.cs
@@ -209,7 +209,18 @@ private void EndSend(IAsyncResult ar)
 
         private void Receive()
         {
-            var count = ReceiveBuffer.HowManyCanWrite;
+            //var count = ReceiveBuffer.HowManyCanWrite;//可写下标不连续
+            var count = 0;
+            if (ReceiveBuffer.EState == CircularBuffer<byte>.State.WriteAhead)
+                count = ReceiveBuffer.Size - ReceiveBuffer.WritePosition;
+            else if (ReceiveBuffer.EState == CircularBuffer<byte>.State.ReadAhead)
+                count = ReceiveBuffer.ReadPosition - ReceiveBuffer.WritePosition;
+            else if (ReceiveBuffer.EState == CircularBuffer<byte>.State.WriteEqualRead)
+                count = ReceiveBuffer.Size - ReceiveBuffer.WritePosition;
+            else
+            {
+                throw new Exception("state error");
+            }
             try
             {
                 Socket.BeginReceive(ReceiveBuffer.Array, ReceiveBuffer.WritePosition, count, SocketFlags.None,

diff --git a/src/HiSocket/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/src/HiSocket/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/src/HiSocket/obj/Debug/HiSocket.csproj.CoreCompileInputs.cache b/src/HiSocket/obj/Debug/HiSocket.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-aef6f356fafc0e0347fe76958283966412dbbff8
+e8480a323b2418b5cc5ee873db9a6c748952099e
diff --git a/src/HiSocket/obj/Debug/HiSocket.csproj.FileListAbsolute.txt b/src/HiSocket/obj/Debug/HiSocket.csproj.FileListAbsolute.txt
@@ -7,7 +7,6 @@ D:\MyGit\github\HiSocket\visual\HiSocket\obj\Debug\HiSocket.dll
 D:\MyGit\github\HiSocket\visual\HiSocket\obj\Debug\HiSocket.pdb
 D:\MyGit\github\HiSocket\src\release\HiSocket.dll
 D:\MyGit\github\HiSocket\src\release\HiSocket.pdb
-D:\MyGit\github\HiSocket\src\HiSocket\obj\Debug\HiSocket.csprojAssemblyReference.cache
 D:\MyGit\github\HiSocket\src\HiSocket\obj\Debug\HiSocket.csproj.CoreCompileInputs.cache
 D:\MyGit\github\HiSocket\src\HiSocket\obj\Debug\HiSocket.dll
 D:\MyGit\github\HiSocket\src\HiSocket\obj\Debug\HiSocket.pdb
diff --git a/src/HiSocket/obj/Debug/HiSocket.dll b/src/HiSocket/obj/Debug/HiSocket.dll
diff --git a/src/HiSocket/obj/Debug/HiSocket.pdb b/src/HiSocket/obj/Debug/HiSocket.pdb
diff --git a/src/release/HiSocket.Message.dll b/src/release/HiSocket.Message.dll
diff --git a/src/release/HiSocket.Message.pdb b/src/release/HiSocket.Message.pdb
diff --git a/src/release/HiSocket.dll b/src/release/HiSocket.dll
diff --git a/src/release/HiSocket.pdb b/src/release/HiSocket.pdb
diff --git a/unity/Assets/HiSocket/HiSocket.Message.dll b/unity/Assets/HiSocket/HiSocket.Message.dll
diff --git a/unity/Assets/HiSocket/HiSocket.Message.pdb b/unity/Assets/HiSocket/HiSocket.Message.pdb
diff --git a/unity/Assets/HiSocket/HiSocket.dll b/unity/Assets/HiSocket/HiSocket.dll
diff --git a/unity/Assets/HiSocket/HiSocket.pdb b/unity/Assets/HiSocket/HiSocket.pdb