Changeset 332 for binary-improvements/MapRendering/Web/Web.cs

Timestamp:

Nov 16, 2018, 10:38:46 PM (6 years ago)

Author:

alloc

Message:

*Latest optimizations

File:

• binary-improvements/MapRendering/Web/Web.cs (modified) (9 diffs)

binary-improvements/MapRendering/Web/Web.cs

@@ -10 +10 @@
 using AllocsFixes.NetConnections.Servers.Web.Handlers;
 using UnityEngine;
+using UnityEngine.Profiling;
 
 namespace AllocsFixes.NetConnections.Servers.Web {
@@ -19 +20 @@
                 private readonly HttpListener _listener = new HttpListener ();
                 private readonly string dataFolder;
-                private readonly Dictionary<string, PathHandler> handlers = new Dictionary<string, PathHandler> ();
+                private readonly Dictionary<string, PathHandler> handlers = new CaseInsensitiveStringDictionary<PathHandler> ();
                 private readonly bool useStaticCache;
 
@@ -147 +148 @@
                         return false;
                 }
+                
+                private readonly Version HttpProtocolVersion = new Version(1, 1);
+                
+#if ENABLE_PROFILER
+                private readonly CustomSampler authSampler = CustomSampler.Create ("Auth");
+                private readonly CustomSampler handlerSampler = CustomSampler.Create ("Handler");
+#endif
 
                 private void HandleRequest (IAsyncResult result) {
@@ -157 +165 @@
 
 //                              MicroStopwatch msw = new MicroStopwatch ();
+#if ENABLE_PROFILER
+                        Profiler.BeginThreadProfiling ("AllocsMods", "WebRequest");
+                        HttpListenerContext ctx = _listener.EndGetContext (result);
+                        try {
+#else
                         HttpListenerContext ctx = _listener.EndGetContext (result);
                         _listener.BeginGetContext (HandleRequest, _listener);
+#endif
                         try {
                                 HttpListenerRequest request = ctx.Request;
@@ -164 +178 @@
                                 response.SendChunked = false;
 
-                                response.ProtocolVersion = new Version ("1.1");
+                                response.ProtocolVersion = HttpProtocolVersion;
 
                                 WebConnection conn;
+#if ENABLE_PROFILER
+                                authSampler.Begin ();
+#endif
                                 int permissionLevel = DoAuthentication (request, out conn);
+#if ENABLE_PROFILER
+                                authSampler.End ();
+#endif
 
 
@@ -200 +220 @@
                                                                 }
                                                         } else {
+#if ENABLE_PROFILER
+                                                                handlerSampler.Begin ();
+#endif
                                                                 kvp.Value.HandleRequest (request, response, conn, permissionLevel);
+#if ENABLE_PROFILER
+                                                                handlerSampler.End ();
+#endif
                                                         }
 
@@ -230 +256 @@
                                 Interlocked.Decrement (ref currentHandlers);
                         }
+#if ENABLE_PROFILER
+                        } finally {
+                                _listener.BeginGetContext (HandleRequest, _listener);
+                                Profiler.EndThreadProfiling ();
+                        }
+#endif
                 }
 
@@ -241 +273 @@
 
                         if (!string.IsNullOrEmpty (sessionId)) {
-                                WebConnection con = connectionHandler.IsLoggedIn (sessionId, _req.RemoteEndPoint.Address.ToString ());
+                                WebConnection con = connectionHandler.IsLoggedIn (sessionId, _req.RemoteEndPoint.Address);
                                 if (con != null) {
                                         _con = con;
@@ -259 +291 @@
                         }
 
-                        if (_req.Url.AbsolutePath.StartsWith ("/session/verify")) {
+                        if (_req.Url.AbsolutePath.StartsWith ("/session/verify", StringComparison.OrdinalIgnoreCase)) {
                                 try {
                                         ulong id = OpenID.Validate (_req);
                                         if (id > 0) {
-                                                WebConnection con = connectionHandler.LogIn (id, _req.RemoteEndPoint.Address.ToString ());
+                                                WebConnection con = connectionHandler.LogIn (id, _req.RemoteEndPoint.Address);
                                                 _con = con;
                                                 int level = GameManager.Instance.adminTools.GetAdminToolsClientInfo (id.ToString ())