updated to latest libraries

Author: ReferenceType

RelayServerTest.sln

@@ -8,17 +8,23 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{5CBE7822-5903-4733-8DDE-67E9A5A85F0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5CBE7822-5903-4733-8DDE-67E9A5A85F0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5CBE7822-5903-4733-8DDE-67E9A5A85F0C}.Debug|x64.ActiveCfg = Debug|x64
+		{5CBE7822-5903-4733-8DDE-67E9A5A85F0C}.Debug|x64.Build.0 = Debug|x64
 		{5CBE7822-5903-4733-8DDE-67E9A5A85F0C}.Debug|x86.ActiveCfg = Debug|x86
 		{5CBE7822-5903-4733-8DDE-67E9A5A85F0C}.Debug|x86.Build.0 = Debug|x86
 		{5CBE7822-5903-4733-8DDE-67E9A5A85F0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5CBE7822-5903-4733-8DDE-67E9A5A85F0C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5CBE7822-5903-4733-8DDE-67E9A5A85F0C}.Release|x64.ActiveCfg = Release|x64
+		{5CBE7822-5903-4733-8DDE-67E9A5A85F0C}.Release|x64.Build.0 = Release|x64
 		{5CBE7822-5903-4733-8DDE-67E9A5A85F0C}.Release|x86.ActiveCfg = Release|x86
 		{5CBE7822-5903-4733-8DDE-67E9A5A85F0C}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection

RelayServerTest/Config.json

@@ -1,6 +1,7 @@
 {
-  "PortRelay": 20011,
-  "PortHttp": 20012,
+  "ServerName": "Ophelia",
+  "PortRelay": 20020,
+  "PortHttp": 20021,
   "UpdateProxy": false,
   "ProxyUri": "http://localhost:8001/ip"
 }

RelayServerTest/HttpSimple/Alternative/HttpNativeServer.cs

@@ -2,7 +2,6 @@
 using NetworkLibrary.Components.Statistics;
 using NetworkLibrary.TCP.Base;
 using NetworkLibrary.Utils;
-using Protobuff.P2P;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -12,7 +11,6 @@
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;
-using static RelayServer.HttpSimple.Alternative.HttpNativeServer;
 
 namespace RelayServer.HttpSimple
 {
@@ -29,12 +27,12 @@ internal class SimpleHttpServer
         private ConcurrentDictionary<Guid, TcpStatistics> tcpSessionStats;
         private ConcurrentDictionary<IPEndPoint, UdpStatistics> udpSessionStats;
 
-        private SecureProtoRelayServer server;
+        private NetworkLibrary.P2P.RelayServer server;
         private AsyncTcpServer httpMiniServer;
         private SharerdMemoryStreamPool streamPool = new SharerdMemoryStreamPool();
         byte[] cachedSendArray = new byte[500];
         private readonly string page;
-        public SimpleHttpServer(SecureProtoRelayServer s, int porthttp)
+        public SimpleHttpServer(NetworkLibrary.P2P.RelayServer s, int porthttp)
         {
             server = s;
             page = PageResources.TextVisualizePage.Replace("20012", porthttp.ToString());
@@ -84,7 +82,7 @@ PooledMemoryStream GetTextResponse(string data)
 
             return stream;
         }
-        private void ServerBytesReceived(in Guid guid, byte[] bytes, int offset, int count)
+        private void ServerBytesReceived(Guid guid, byte[] bytes, int offset, int count)
         {
             try
             {
@@ -106,7 +104,7 @@ private void ServerBytesReceived(in Guid guid, byte[] bytes, int offset, int cou
 
 
                     var stream = GetTextResponse(data);
-                    httpMiniServer.SendBytesToClient(in guid,stream.GetBuffer(),0,(int)stream.Position );
+                    httpMiniServer.SendBytesToClient(guid,stream.GetBuffer(),0,(int)stream.Position );
                 }
             } catch { }
 

RelayServerTest/HttpSimple/SimpleHttpServer.cs

@@ -17,27 +17,31 @@ internal class PerformanceStatistics
         private static string lastMemoryUsage;
         static Stopwatch sw = new Stopwatch();
         static double ProcCount;
+        private static DateTime processStartTime;
+
         static PerformanceStatistics()
         {
             process = Process.GetCurrentProcess();
             lastProctime=process.TotalProcessorTime;
             lastRequestTimeCpu = 0;
             lastRequestTimeMemory = 0;
             ProcCount = Convert.ToDouble(Environment.ProcessorCount);
+            processStartTime = process.StartTime;
             sw.Start();
 
         }
+
+       
         public static string GetCpuUsage()
         {
-
             long elapsed = sw.ElapsedMilliseconds;
             long deltaTms = elapsed - lastRequestTimeCpu;
-            if(deltaTms < 900)
+            if (deltaTms < 900)
             {
                 return lastCpuUsage;
             }
             var currentProcessorTime = process.TotalProcessorTime;
-            double CPUUsage = (currentProcessorTime.TotalMilliseconds - lastProctime.TotalMilliseconds) / deltaTms / ProcCount;
+            double CPUUsage = (currentProcessorTime.TotalMilliseconds - lastProctime.TotalMilliseconds) / (deltaTms * ProcCount);
             lastRequestTimeCpu = elapsed;
             lastProctime = currentProcessorTime;
             lastCpuUsage = (CPUUsage * 100).ToString("N3") + "%";
@@ -47,6 +51,9 @@ public static string GetCpuUsage()
 
         public static string GetMemoryUsage()
         {
+            const double f = 1024.0 * 1024.0;
+            return (Environment.WorkingSet / f).ToString("N3") + "MB";
+
             long elapsed = sw.ElapsedMilliseconds;
             long deltaTms = elapsed - lastRequestTimeMemory;
             if (deltaTms < 900)
@@ -55,7 +62,6 @@ public static string GetMemoryUsage()
             }
             lastRequestTimeMemory=elapsed;
             process.Refresh();
-            const double f = 1024.0 * 1024.0;
             lastMemoryUsage = (process.WorkingSet64 / f).ToString("N3") + "MB";
             return  lastMemoryUsage;