Changeset 332

Timestamp:

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

Author:

alloc

Message:

*Latest optimizations

Location:

binary-improvements

Files:

• 7dtd-server-fixes/src/PersistentData/Players.cs (modified) (5 diffs)
• AllocsCommands/Commands/ListKnownPlayers.cs (modified) (1 diff)
• MapRendering/MapRendering/MapRenderBlockBuffer.cs (modified) (3 diffs)
• MapRendering/Web/API/GetLandClaims.cs (modified) (1 diff)
• MapRendering/Web/API/GetPlayerInventories.cs (modified) (3 diffs)
• MapRendering/Web/API/GetPlayerList.cs (modified) (6 diffs)
• MapRendering/Web/API/GetPlayersLocation.cs (modified) (4 diffs)
• MapRendering/Web/API/WebAPI.cs (modified) (3 diffs)
• MapRendering/Web/ConnectionHandler.cs (modified) (5 diffs)
• MapRendering/Web/Handlers/ApiHandler.cs (modified) (3 diffs)
• MapRendering/Web/Handlers/StaticHandler.cs (modified) (3 diffs)
• MapRendering/Web/Handlers/UserStatusHandler.cs (modified) (1 diff)
• MapRendering/Web/MimeType.cs (modified) (1 diff)
• MapRendering/Web/Web.cs (modified) (9 diffs)
• MapRendering/Web/WebCommandResult.cs (modified) (2 diffs)
• MapRendering/Web/WebConnection.cs (modified) (4 diffs)
• MapRendering/Web/WebPermissions.cs (modified) (10 diffs)

binary-improvements/7dtd-server-fixes/src/PersistentData/Players.cs

@@ -6 +6 @@
         [Serializable]
         public class Players {
-                private readonly Dictionary<string, Player> players = new Dictionary<string, Player> (StringComparer.OrdinalIgnoreCase);
+                public readonly Dictionary<string, Player> Dict = new Dictionary<string, Player> (StringComparer.OrdinalIgnoreCase);
 
                 public Player this [string steamId, bool create] {
@@ -14 +14 @@
                                 }
 
-                                if (players.ContainsKey (steamId)) {
-                                        return players [steamId];
+                                if (Dict.ContainsKey (steamId)) {
+                                        return Dict [steamId];
                                 }
 
@@ -24 +24 @@
                                 Log.Out ("Created new player entry for ID: " + steamId);
                                 Player p = new Player (steamId);
-                                players.Add (steamId, p);
+                                Dict.Add (steamId, p);
                                 return p;
                         }
                 }
 
-                public List<string> SteamIDs {
-                        get { return new List<string> (players.Keys); }
-                }
-
                 public int Count {
-                        get { return players.Count; }
+                        get { return Dict.Count; }
                 }
 
@@ -58 +54 @@
                         int entityId;
                         if (int.TryParse (_nameOrId, out entityId)) {
-                                foreach (KeyValuePair<string, Player> kvp in players) {
+                                foreach (KeyValuePair<string, Player> kvp in Dict) {
                                         if (kvp.Value.IsOnline && kvp.Value.EntityID == entityId) {
                                                 return kvp.Key;
@@ -65 +61 @@
                         }
 
-                        foreach (KeyValuePair<string, Player> kvp in players) {
+                        foreach (KeyValuePair<string, Player> kvp in Dict) {
                                 string name = kvp.Value.Name;
                                 if (_ignoreColorCodes) {

binary-improvements/AllocsCommands/Commands/ListKnownPlayers.cs

@@ -62 +62 @@
                                 } else {
                                         int num = 0;
-                                        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 (
                                                         (!onlineOnly || p.IsOnline)
-                                                        && (!notBannedOnly || !admTools.IsBanned (sid))
+                                                        && (!notBannedOnly || !admTools.IsBanned (kvp.Key))
                                                         && (nameFilter.Length == 0 || p.Name.ContainsCaseInsensitive (nameFilter))
                                                 ) {
                                                         SdtdConsole.Instance.Output (string.Format (
                                                                 "{0}. {1}, id={2}, steamid={3}, online={4}, ip={5}, playtime={6} m, seen={7}",
-                                                                ++num, p.Name, p.EntityID, sid, p.IsOnline, p.IP,
+                                                                ++num, p.Name, p.EntityID, kvp.Key, p.IsOnline, p.IP,
                                                                 p.TotalPlayTime / 60,
                                                                 p.LastOnline.ToString ("yyyy-MM-dd HH:mm"))

binary-improvements/MapRendering/MapRendering/MapRenderBlockBuffer.cs

@@ -17 +17 @@
                 private Vector2i currentBlockMapPos = new Vector2i (Int32.MinValue, Int32.MinValue);
                 private string currentBlockMapFolder = string.Empty;
-                private string currentBlockMapFilename = string.Empty;
 
                 public MapRenderBlockBuffer (int level, MapTileCache cache) {
@@ -46 +45 @@
                 public void ResetBlock () {
                         currentBlockMapFolder = string.Empty;
-                        currentBlockMapFilename = string.Empty;
                         currentBlockMapPos = new Vector2i (Int32.MinValue, Int32.MinValue);
                 }
@@ -84 +82 @@
                                         currentBlockMapFolder = folder;
                                         currentBlockMapPos = block;
-                                        currentBlockMapFilename = fileName;
 
                                         Profiler.EndSample ();

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
                 }
 

binary-improvements/MapRendering/Web/ConnectionHandler.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
+using System.Net;
 
 namespace AllocsFixes.NetConnections.Servers.Web {
@@ -6 +7 @@
                 private readonly Dictionary<string, WebConnection> connections = new Dictionary<string, WebConnection> ();
 
-                public WebConnection IsLoggedIn (string _sessionId, string _endpoint) {
+                public WebConnection IsLoggedIn (string _sessionId, IPAddress _ip) {
                         if (!connections.ContainsKey (_sessionId)) {
                                 return null;
@@ -18 +19 @@
 //                      }
 
-                        if (con.Endpoint != _endpoint) {
-                                connections.Remove (_sessionId);
+                        if (!Equals (con.Endpoint, _ip)) {
+                                // Fixed: Allow different clients from same NAT network
+//                              connections.Remove (_sessionId);
                                 return null;
                         }
@@ -32 +34 @@
                 }
 
-                public WebConnection LogIn (ulong _steamId, string _endpoint) {
+                public WebConnection LogIn (ulong _steamId, IPAddress _ip) {
                         string sessionId = Guid.NewGuid ().ToString ();
-                        WebConnection con = new WebConnection (sessionId, _endpoint, _steamId);
+                        WebConnection con = new WebConnection (sessionId, _ip, _steamId);
                         connections.Add (sessionId, con);
                         return con;
@@ -40 +42 @@
 
                 public void SendLine (string line) {
-                        foreach (WebConnection wc in connections.Values) {
-                                wc.SendLine (line);
+                        foreach (KeyValuePair<string, WebConnection> kvp in connections) {
+                                kvp.Value.SendLine (line);
                         }
                 }

binary-improvements/MapRendering/Web/Handlers/ApiHandler.cs

@@ -4 +4 @@
 using System.Reflection;
 using AllocsFixes.NetConnections.Servers.Web.API;
+using UnityEngine.Profiling;
 
 namespace AllocsFixes.NetConnections.Servers.Web.Handlers {
@@ -40 +41 @@
                 }
 
+#if ENABLE_PROFILER
+                private static readonly CustomSampler apiHandlerSampler = CustomSampler.Create ("API_Handler");
+#endif
+
                 public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user,
                         int permissionLevel) {
@@ -55 +60 @@
                         if (apis.TryGetValue (apiName, out api)) {
                                 try {
+#if ENABLE_PROFILER
+                                        apiHandlerSampler.Begin ();
+#endif
                                         api.HandleRequest (req, resp, user, permissionLevel);
+#if ENABLE_PROFILER
+                                        apiHandlerSampler.End ();
+#endif
                                         return;
                                 } catch (Exception e) {

binary-improvements/MapRendering/Web/Handlers/StaticHandler.cs

@@ -13 +13 @@
                         string moduleName = null) : base (moduleName) {
                         this.staticPart = staticPart;
-                        datapath = filePath;
+                        datapath = filePath + (filePath [filePath.Length - 1] == '/' ? "" : "/");
                         this.cache = cache;
                         this.logMissingFiles = logMissingFiles;
@@ -22 +22 @@
                         string fn = req.Url.AbsolutePath.Remove (0, staticPart.Length);
 
-                        byte[] content = cache.GetFileContent (datapath + "/" + fn);
+                        byte[] content = cache.GetFileContent (datapath + fn);
 
                         if (content != null) {
@@ -31 +31 @@
                                 resp.StatusCode = (int) HttpStatusCode.NotFound;
                                 if (logMissingFiles) {
-                                        Log.Out ("Web:Static:FileNotFound: \"" + req.Url.AbsolutePath + "\" @ \"" + datapath + "/" +
-                                                 req.Url.AbsolutePath.Remove (0, staticPart.Length) + "\"");
+                                        Log.Out ("Web:Static:FileNotFound: \"" + req.Url.AbsolutePath + "\" @ \"" + datapath + fn + "\"");
                                 }
                         }

binary-improvements/MapRendering/Web/Handlers/UserStatusHandler.cs

@@ -19 +19 @@
                                 JSONObject permObj = new JSONObject ();
                                 permObj.Add ("module", new JSONString (perm.module));
-                                permObj.Add ("allowed",
-                                        new JSONBoolean (WebPermissions.Instance.ModuleAllowedWithLevel (perm.module, permissionLevel)));
+                                permObj.Add ("allowed", new JSONBoolean (perm.permissionLevel >= permissionLevel));
                                 perms.Add (permObj);
                         }

binary-improvements/MapRendering/Web/MimeType.cs

@@ -5 +5 @@
         public class MimeType {
                 private static readonly IDictionary<string, string> _mappings =
-                        new Dictionary<string, string> (StringComparer.InvariantCultureIgnoreCase) {
+                        new CaseInsensitiveStringDictionary<string> {
                                 {".323", "text/h323"},
                                 {".3g2", "video/3gpp2"},

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 ())

binary-improvements/MapRendering/Web/WebCommandResult.cs

@@ -39 +39 @@
 
                 public void SendLines (List<string> _output) {
-                        MicroStopwatch msw = new MicroStopwatch ();
+//                      MicroStopwatch msw = new MicroStopwatch ();
 
                         StringBuilder sb = new StringBuilder ();
@@ -81 +81 @@
                                 }
 
-                                msw.Stop ();
-                                if (GamePrefs.GetInt (EnumGamePrefs.HideCommandExecutionLog) < 1) {
-                                        totalHandlingTime += msw.ElapsedMicroseconds;
-                                        Log.Out ("WebCommandResult.SendLines(): Took {0} µs", msw.ElapsedMicroseconds);
-                                }
+//                              msw.Stop ();
+//                              if (GamePrefs.GetInt (EnumGamePrefs.HideCommandExecutionLog) < 1) {
+//                                      totalHandlingTime += msw.ElapsedMicroseconds;
+//                                      Log.Out ("WebCommandResult.SendLines(): Took {0} µs", msw.ElapsedMicroseconds);
+//                              }
 
                                 Interlocked.Decrement (ref currentHandlers);

binary-improvements/MapRendering/Web/WebConnection.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
+using System.Net;
 using UnityEngine;
 
@@ -10 +11 @@
                 private readonly string conDescription;
 
-                public WebConnection (string _sessionId, string _endpoint, ulong _steamId) {
+                public WebConnection (string _sessionId, IPAddress _endpoint, ulong _steamId) {
                         SessionID = _sessionId;
                         Endpoint = _endpoint;
@@ -21 +22 @@
                 public string SessionID { get; private set; }
 
-                public string Endpoint { get; private set; }
+                public IPAddress Endpoint { get; private set; }
 
                 public ulong SteamID { get; private set; }
@@ -30 +31 @@
 
                 public static bool CanViewAllPlayers (int _permissionLevel) {
-                        const int defaultPermissionLevel = 0;
-
-                        bool val = _permissionLevel <= defaultPermissionLevel;
-
-                        foreach (WebPermissions.WebModulePermission wap in WebPermissions.Instance.GetModules ()) {
-                                if (wap.module.EqualsCaseInsensitive ("webapi.viewallplayers")) {
-                                        val = _permissionLevel <= wap.permissionLevel;
-                                }
-                        }
-
-                        return val;
+                        return WebPermissions.Instance.ModuleAllowedWithLevel ("webapi.viewallplayers", _permissionLevel);
                 }
 
                 public static bool CanViewAllClaims (int _permissionLevel) {
-                        const int defaultPermissionLevel = 0;
-
-                        bool val = _permissionLevel <= defaultPermissionLevel;
-
-                        foreach (WebPermissions.WebModulePermission wap in WebPermissions.Instance.GetModules ()) {
-                                if (wap.module.EqualsCaseInsensitive ("webapi.viewallclaims")) {
-                                        val = _permissionLevel <= wap.permissionLevel;
-                                }
-                        }
-
-                        return val;
+                        return WebPermissions.Instance.ModuleAllowedWithLevel ("webapi.viewallclaims", _permissionLevel);
                 }
 

binary-improvements/MapRendering/Web/WebPermissions.cs

@@ -1 +1 @@
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.IO;
 using System.Xml;
+using UniLinq;
 
 namespace AllocsFixes.NetConnections.Servers.Web {
@@ -10 +12 @@
 
                 private readonly Dictionary<string, WebModulePermission> knownModules =
-                        new Dictionary<string, WebModulePermission> ();
+                        new CaseInsensitiveStringDictionary<WebModulePermission> ();
 
                 private readonly Dictionary<string, AdminToken> admintokens = new CaseInsensitiveStringDictionary<AdminToken> ();
@@ -18 +20 @@
 
                 public WebPermissions () {
+                        allModulesList = new List<WebModulePermission> ();
+                        allModulesListRO = new ReadOnlyCollection<WebModulePermission> (allModulesList);
                         Directory.CreateDirectory (GetFilePath ());
                         InitFileWatcher ();
@@ -54 +58 @@
                         }
 
+                        if (knownModules.TryGetValue (_module, out result)) {
+                                return result;
+                        }
+
                         return defaultModulePermission;
                 }
@@ -93 +101 @@
                         WebModulePermission p = new WebModulePermission (_module, _permissionLevel);
                         lock (this) {
+                                allModulesList.Clear ();
                                 modules [_module] = p;
                                 if (_save) {
@@ -104 +113 @@
                                 return;
                         }
-
-                        lock (this) {
-                                if (!IsKnownModule (_module)) {
-                                        knownModules.Add (_module, new WebModulePermission (_module, _defaultPermission));
-                                }
-
-                                if (_defaultPermission > 0 && !modules.ContainsKey (_module)) {
-                                        AddModulePermission (_module, _defaultPermission);
-                                }
+                        
+                        WebModulePermission p = new WebModulePermission (_module, _defaultPermission);
+
+                        lock (this) {
+                                allModulesList.Clear ();
+                                knownModules [_module] = p;
                         }
                 }
@@ -129 +135 @@
                 public void RemoveModulePermission (string _module, bool _save = true) {
                         lock (this) {
+                                allModulesList.Clear ();
                                 modules.Remove (_module);
                                 if (_save) {
@@ -136 +143 @@
                 }
 
-                public List<WebModulePermission> GetModules () {
-                        List<WebModulePermission> result = new List<WebModulePermission> ();
-                        foreach (string module in knownModules.Keys) {
-                                if (modules.ContainsKey (module)) {
-                                        result.Add (modules [module]);
-                                } else {
-                                        result.Add (knownModules [module]);
-                                }
-                        }
-
-                        return result;
+                private readonly List<WebModulePermission> allModulesList;
+                private readonly ReadOnlyCollection<WebModulePermission> allModulesListRO; 
+
+                public IList<WebModulePermission> GetModules () {
+                        if (allModulesList.Count == 0) {
+                                foreach (KeyValuePair<string, WebModulePermission> kvp in knownModules) {
+                                        if (modules.ContainsKey (kvp.Key)) {
+                                                allModulesList.Add (modules [kvp.Key]);
+                                        } else {
+                                                allModulesList.Add (kvp.Value);
+                                        }
+                                }
+                        }
+
+                        return allModulesListRO;
                 }
 
@@ -302 +313 @@
                                 sw.WriteLine (
                                         "               <!-- <token name=\"adminuser1\" token=\"supersecrettoken\" permission_level=\"0\" /> -->");
-                                foreach (AdminToken at in admintokens.Values) {
-                                        sw.WriteLine ("         <token name=\"{0}\" token=\"{1}\" permission_level=\"{2}\" />", at.name, at.token,
-                                                at.permissionLevel);
+                                foreach (KeyValuePair<string, AdminToken> kvp in admintokens) {
+                                        sw.WriteLine ("         <token name=\"{0}\" token=\"{1}\" permission_level=\"{2}\" />", kvp.Value.name,
+                                                kvp.Value.token, kvp.Value.permissionLevel);
                                 }
 
@@ -310 +321 @@
                                 sw.WriteLine ();
                                 sw.WriteLine (" <permissions>");
-                                foreach (WebModulePermission wap in modules.Values) {
-                                        sw.WriteLine ("         <permission module=\"{0}\" permission_level=\"{1}\" />", wap.module,
-                                                wap.permissionLevel);
+                                foreach (KeyValuePair<string, WebModulePermission> kvp in modules) {
+                                        sw.WriteLine ("         <permission module=\"{0}\" permission_level=\"{1}\" />", kvp.Value.module,
+                                                kvp.Value.permissionLevel);
                                 }