Changeset 332 for binary-improvements/MapRendering/Web/API

Timestamp:

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

Author:

alloc

Message:

*Latest optimizations

Location:

binary-improvements/MapRendering/Web/API

Files:

• GetLandClaims.cs (modified) (1 diff)
• GetPlayerInventories.cs (modified) (3 diffs)
• GetPlayerList.cs (modified) (6 diffs)
• GetPlayersLocation.cs (modified) (4 diffs)
• WebAPI.cs (modified) (3 diffs)

binary-improvements/MapRendering/Web/API/GetLandClaims.cs

@@ -21 +21 @@
 
                         // default user, cheap way to avoid 'null reference exception'
-                        user = user ?? new WebConnection ("", "", 0L);
+                        user = user ?? new WebConnection ("", IPAddress.None, 0L);
 
                         bool bViewAll = WebConnection.CanViewAllClaims (permissionLevel);

binary-improvements/MapRendering/Web/API/GetPlayerInventories.cs

@@ +1 @@
+using System.Collections.Generic;
 using System.Net;
 using AllocsFixes.JSON;
@@ -9 +10 @@
                         JSONArray AllInventoriesResult = new JSONArray ();
 
-                        foreach (string sid in PersistentContainer.Instance.Players.SteamIDs) {
-                                Player p = PersistentContainer.Instance.Players [sid, false];
+                        foreach (KeyValuePair<string, Player> kvp in PersistentContainer.Instance.Players.Dict) {
+                                Player p = kvp.Value;
 
                                 if (p == null) {
@@ -23 +24 @@
                                         JSONArray belt = new JSONArray ();
                                         JSONObject equipment = new JSONObject ();
-                                        result.Add ("steamid", new JSONString (sid));
+                                        result.Add ("steamid", new JSONString (kvp.Key));
                                         result.Add ("entityid", new JSONNumber (p.EntityID));
                                         result.Add ("playername", new JSONString (p.Name));

binary-improvements/MapRendering/Web/API/GetPlayerList.cs

@@ -6 +6 @@
 using AllocsFixes.JSON;
 using AllocsFixes.PersistentData;
+using UnityEngine.Profiling;
 
 namespace AllocsFixes.NetConnections.Servers.Web.API {
@@ -12 +13 @@
                         new Regex (@"^(>=|=>|>|<=|=<|<|==|=)?\s*([0-9]+(\.[0-9]*)?)$");
 
+#if ENABLE_PROFILER
+                private static readonly CustomSampler jsonSerializeSampler = CustomSampler.Create ("JSON_Build");
+#endif
+
                 public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user,
                         int permissionLevel) {
                         AdminTools admTools = GameManager.Instance.adminTools;
-                        user = user ?? new WebConnection ("", "", 0L);
+                        user = user ?? new WebConnection ("", IPAddress.None, 0L);
 
                         bool bViewAll = WebConnection.CanViewAllPlayers (permissionLevel);
@@ -35 +40 @@
                         Players playersList = PersistentContainer.Instance.Players;
 
+                        
                         List<JSONObject> playerList = new List<JSONObject> ();
 
-                        foreach (string sid in playersList.SteamIDs) {
-                                Player p = playersList [sid, false];
+#if ENABLE_PROFILER
+                        jsonSerializeSampler.Begin ();
+#endif
+
+                        foreach (KeyValuePair<string, Player> kvp in playersList.Dict) {
+                                Player p = kvp.Value;
 
                                 ulong player_steam_ID;
-                                if (!ulong.TryParse (sid, out player_steam_ID)) {
+                                if (!ulong.TryParse (kvp.Key, out player_steam_ID)) {
                                         player_steam_ID = 0L;
                                 }
@@ -52 +62 @@
 
                                         JSONObject pJson = new JSONObject ();
-                                        pJson.Add ("steamid", new JSONString (sid));
+                                        pJson.Add ("steamid", new JSONString (kvp.Key));
                                         pJson.Add ("entityid", new JSONNumber (p.EntityID));
                                         pJson.Add ("ip", new JSONString (p.IP));
@@ -66 +76 @@
                                         JSONBoolean banned;
                                         if (admTools != null) {
-                                                banned = new JSONBoolean (admTools.IsBanned (sid));
+                                                banned = new JSONBoolean (admTools.IsBanned (kvp.Key));
                                         } else {
                                                 banned = new JSONBoolean (false);
@@ -76 +86 @@
                                 }
                         }
+
+#if ENABLE_PROFILER
+                        jsonSerializeSampler.End ();
+#endif
 
                         IEnumerable<JSONObject> list = playerList;

binary-improvements/MapRendering/Web/API/GetPlayersLocation.cs

@@ +1 @@
+using System.Collections.Generic;
 using System.Net;
 using AllocsFixes.JSON;
@@ -8 +9 @@
                         int permissionLevel) {
                         AdminTools admTools = GameManager.Instance.adminTools;
-                        user = user ?? new WebConnection ("", "", 0L);
+                        user = user ?? new WebConnection ("", IPAddress.None, 0L);
 
                         bool listOffline = false;
@@ -21 +22 @@
                         Players playersList = PersistentContainer.Instance.Players;
 
-                        foreach (string sid in playersList.SteamIDs) {
+                        foreach (KeyValuePair<string, Player> kvp in playersList.Dict) {
                                 if (admTools != null) {
-                                        if (admTools.IsBanned (sid)) {
+                                        if (admTools.IsBanned (kvp.Key)) {
                                                 continue;
                                         }
                                 }
 
-                                Player p = playersList [sid, false];
+                                Player p = kvp.Value;
 
                                 if (listOffline || p.IsOnline) {
                                         ulong player_steam_ID;
-                                        if (!ulong.TryParse (sid, out player_steam_ID)) {
+                                        if (!ulong.TryParse (kvp.Key, out player_steam_ID)) {
                                                 player_steam_ID = 0L;
                                         }
@@ -43 +44 @@
 
                                                 JSONObject pJson = new JSONObject ();
-                                                pJson.Add ("steamid", new JSONString (sid));
+                                                pJson.Add ("steamid", new JSONString (kvp.Key));
 
                                                 //                                      pJson.Add("entityid", new JSONNumber (p.EntityID));

binary-improvements/MapRendering/Web/API/WebAPI.cs

@@ -2 +2 @@
 using System.Text;
 using AllocsFixes.JSON;
+using UnityEngine.Profiling;
 
 namespace AllocsFixes.NetConnections.Servers.Web.API {
@@ -11 +12 @@
                 }
 
+#if ENABLE_PROFILER
+                private static readonly CustomSampler jsonSerializeSampler = CustomSampler.Create ("JSON_Serialize");
+                private static readonly CustomSampler netWriteSampler = CustomSampler.Create ("JSON_Write");
+#endif
+
                 public static void WriteJSON (HttpListenerResponse resp, JSONNode root) {
+#if ENABLE_PROFILER
+                        jsonSerializeSampler.Begin ();
+#endif
                         StringBuilder sb = new StringBuilder ();
                         root.ToString (sb);
+#if ENABLE_PROFILER
+                        jsonSerializeSampler.End ();
+                        netWriteSampler.Begin ();
+#endif
                         byte[] buf = Encoding.UTF8.GetBytes (sb.ToString ());
                         resp.ContentLength64 = buf.Length;
@@ -19 +32 @@
                         resp.ContentEncoding = Encoding.UTF8;
                         resp.OutputStream.Write (buf, 0, buf.Length);
+#if ENABLE_PROFILER
+                        netWriteSampler.End ();
+#endif
                 }