Browse Source

set mg (#5245)

* use .net core 3

* Update README.md

* UPDATE

* del .vs

* fix plaintext

* set size

* ..

* UPDATE
luyikk 5 years ago
parent
commit
c299665d34

+ 9 - 6
frameworks/CSharp/zysocket-v/PlatformBenchmarks/HttpHandler.cs

@@ -55,10 +55,14 @@ namespace PlatformBenchmarks
         {
         {
             write.Write("<b> zysocket server</b><hr/>");         
             write.Write("<b> zysocket server</b><hr/>");         
             write.Write($"error not found!");
             write.Write($"error not found!");
-            OnCompleted(fiberRw, write);
+
+            var length = write.Stream.Length - fiberRw.UserToken.HttpHandlerPostion;
+            write.Stream.Position = fiberRw.UserToken.ContentPostion.postion;
+            write.Write(length.ToString(), false);
+            write.Flush();
         }
         }
 
 
-        private async void OnCompleted(IFiberRw<HttpToken> fiberRw, WriteBytes write)
+        private async Task OnCompleted(IFiberRw<HttpToken> fiberRw, WriteBytes write)
         {
         {
             Task<int> WSend()
             Task<int> WSend()
             {
             {
@@ -107,8 +111,7 @@ namespace PlatformBenchmarks
                 {
                 {
                     if (count != 0)
                     if (count != 0)
                     {
                     {
-                        url = line.Slice(offset2, i - offset2);
-                        offset2 = i + 1;                      
+                        url = line.Slice(offset2, i - offset2);                                      
                         break;
                         break;
                     }                  
                     }                  
                     offset2 = i + 1;
                     offset2 = i + 1;
@@ -135,13 +138,13 @@ namespace PlatformBenchmarks
             {
             {
                 write.Write(_headerContentTypeText.Data, 0, _headerContentTypeText.Length);
                 write.Write(_headerContentTypeText.Data, 0, _headerContentTypeText.Length);
                 OnWriteContentLength(write, token);
                 OnWriteContentLength(write, token);
-                Plaintext(fiberRw, ref write);
+                Plaintext(fiberRw, write);
             }
             }
             else if (baseUrl.Length == _path_Json.Length && baseUrl.StartsWith(_path_Json))
             else if (baseUrl.Length == _path_Json.Length && baseUrl.StartsWith(_path_Json))
             {
             {
                 write.Write(_headerContentTypeJson.Data, 0, _headerContentTypeJson.Length);
                 write.Write(_headerContentTypeJson.Data, 0, _headerContentTypeJson.Length);
                 OnWriteContentLength(write, token);
                 OnWriteContentLength(write, token);
-                Json(fiberRw, ref write);
+                Json(fiberRw, write);
             }
             }
             else if (baseUrl.Length == _path_Db.Length && baseUrl.StartsWith(_path_Db))
             else if (baseUrl.Length == _path_Db.Length && baseUrl.StartsWith(_path_Db))
             {
             {

+ 2 - 2
frameworks/CSharp/zysocket-v/PlatformBenchmarks/PlatformBenchmarks.csproj

@@ -2,9 +2,9 @@
 
 
   <PropertyGroup>
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <ServerGarbageCollection>true</ServerGarbageCollection>
+    <TargetFramework>netcoreapp3.0</TargetFramework> 
     <LangVersion>8.0</LangVersion>
     <LangVersion>8.0</LangVersion>
+    <ServerGarbageCollection>true</ServerGarbageCollection>
   </PropertyGroup>
   </PropertyGroup>
 
 
   <ItemGroup>
   <ItemGroup>

+ 1 - 0
frameworks/CSharp/zysocket-v/PlatformBenchmarks/Program.cs

@@ -13,6 +13,7 @@ namespace PlatformBenchmarks
                 services.AddHostedService<ZYHttpServer>();
                 services.AddHostedService<ZYHttpServer>();
 
 
             }).Build().Run();
             }).Build().Run();
+
         }
         }
     }
     }
 }
 }

+ 2 - 6
frameworks/CSharp/zysocket-v/PlatformBenchmarks/ZYHttpServer.cs

@@ -34,7 +34,7 @@ namespace PlatformBenchmarks
              .ConfigServer(p =>
              .ConfigServer(p =>
              {
              {
                  p.Port = 8080;
                  p.Port = 8080;
-                 p.MaxBufferSize = 4096;
+                 p.MaxBufferSize = 1024;
                  p.MaxConnectCout = 20000;
                  p.MaxConnectCout = 20000;
              });
              });
 
 
@@ -73,17 +73,13 @@ namespace PlatformBenchmarks
                 Db = new RawDb(new ConcurrentRandom(), Npgsql.NpgsqlFactory.Instance)
                 Db = new RawDb(new ConcurrentRandom(), Npgsql.NpgsqlFactory.Instance)
             };
             };
 
 
-
-
-            using var data_r = fiberRw.GetMemory(4096);
+            using var data_r = fiberRw.GetMemory(1024);         
             using var write = new WriteBytes(fiberRw);
             using var write = new WriteBytes(fiberRw);
             for (; ; )
             for (; ; )
             {
             {
                 await HttpHandler.Receive(fiberRw, data_r.Memory, write);
                 await HttpHandler.Receive(fiberRw, data_r.Memory, write);
             }
             }
 
 
-
-
         }
         }
     }
     }
 }
 }

+ 1 - 1
frameworks/CSharp/zysocket-v/PlatformBenchmarks/db.cs

@@ -22,7 +22,7 @@ namespace PlatformBenchmarks
                 write.Write(e_.Message);               
                 write.Write(e_.Message);               
             }
             }
 
 
-            OnCompleted(fiberRw, write);
+            await OnCompleted(fiberRw, write);
 
 
         }
         }
     }
     }

+ 1 - 5
frameworks/CSharp/zysocket-v/PlatformBenchmarks/fortunes.cs

@@ -49,14 +49,10 @@ namespace PlatformBenchmarks
             catch (Exception e_)
             catch (Exception e_)
             {
             {
                 write.Write(e_.Message);
                 write.Write(e_.Message);
-                OnCompleted(fiberRw, write);
+                await OnCompleted(fiberRw, write);
             }
             }
 
 
 
 
-
-        
-
-
         }
         }
     }
     }
 }
 }

+ 6 - 3
frameworks/CSharp/zysocket-v/PlatformBenchmarks/json.cs

@@ -8,12 +8,15 @@ namespace PlatformBenchmarks
 {
 {
     public partial class HttpHandler
     public partial class HttpHandler
     {
     {
-        public void Json(IFiberRw<HttpToken> fiberRw,ref WriteBytes write)
+        public async void Json(IFiberRw<HttpToken> fiberRw,WriteBytes write)
         {
         {
             JsonMessage jsonMessage = default(JsonMessage);
             JsonMessage jsonMessage = default(JsonMessage);
             jsonMessage.message = "Hello, World!";          
             jsonMessage.message = "Hello, World!";          
-             JsonFormatter.SerializeObject(jsonMessage,write.Stream,System.Text.Encoding.UTF8);
-            OnCompleted(fiberRw, write);
+            JsonFormatter.SerializeObject(jsonMessage,write.Stream,System.Text.Encoding.UTF8);
+            var length = write.Stream.Length - fiberRw.UserToken.HttpHandlerPostion;
+            write.Stream.Position = fiberRw.UserToken.ContentPostion.postion;
+            write.Write(length.ToString(), false);
+            await write.Flush();
         }
         }
     }
     }
 }
 }

+ 6 - 2
frameworks/CSharp/zysocket-v/PlatformBenchmarks/plaintext.cs

@@ -1,4 +1,5 @@
 using System;
 using System;
+using System.Threading.Tasks;
 using ZYSocket;
 using ZYSocket;
 using ZYSocket.FiberStream;
 using ZYSocket.FiberStream;
 
 
@@ -6,10 +7,13 @@ namespace PlatformBenchmarks
 {
 {
     public partial class HttpHandler
     public partial class HttpHandler
     {
     {
-        public  void Plaintext( IFiberRw<HttpToken> fiberRw,  ref WriteBytes write)
+        public async void Plaintext( IFiberRw<HttpToken> fiberRw,  WriteBytes write)
         {
         {
             write.Write(_result_plaintext.Data, 0, _result_plaintext.Length);
             write.Write(_result_plaintext.Data, 0, _result_plaintext.Length);
-            OnCompleted(fiberRw, write);
+            var length = write.Stream.Length - fiberRw.UserToken.HttpHandlerPostion;
+            write.Stream.Position = fiberRw.UserToken.ContentPostion.postion;
+            write.Write(length.ToString(), false);
+            await write.Flush();          
         }
         }
     }
     }
 }
 }

+ 1 - 1
frameworks/CSharp/zysocket-v/PlatformBenchmarks/queries.cs

@@ -35,7 +35,7 @@ namespace PlatformBenchmarks
             {
             {
                 write.Write(e_.Message);
                 write.Write(e_.Message);
             }
             }
-            OnCompleted(fiberRw, write);
+            await OnCompleted(fiberRw, write);
         }
         }
     }
     }
 }
 }