Changeset 199 for binary-improvements/7dtd-server-fixes

Timestamp:

Sep 22, 2014, 11:15:14 PM (10 years ago)

Author:

alloc

Message:

fixes

Location:

binary-improvements/7dtd-server-fixes

Files:

• 7dtd-server-fixes.csproj (modified) (2 diffs)
• src/FileCache (added)
• src/FileCache/AbstractCache.cs (added)
• src/FileCache/DirectAccess.cs (added)
• src/FileCache/MapTileCache.cs (added)
• src/FileCache/SimpleCache.cs (added)
• src/ItemList.cs (modified) (2 diffs)
• src/MapRendering/MapRenderBlockBuffer.cs (modified) (3 diffs)
• src/MapRendering/MapRendering.cs (modified) (2 diffs)
• src/NetConnections/Servers/Web/StaticHandler.cs (modified) (2 diffs)
• src/NetConnections/Servers/Web/Web.cs (modified) (2 diffs)

binary-improvements/7dtd-server-fixes/7dtd-server-fixes.csproj

@@ -125 +125 @@
     <Compile Include="src\CustomCommands\Unban.cs" />
     <Compile Include="src\ItemList.cs" />
+    <Compile Include="src\FileCache\AbstractCache.cs" />
+    <Compile Include="src\FileCache\DirectAccess.cs" />
+    <Compile Include="src\FileCache\SimpleCache.cs" />
+    <Compile Include="src\FileCache\MapTileCache.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
@@ -138 +142 @@
     <Folder Include="src\NetConnections\Servers\Web\API\" />
     <Folder Include="src\JSON\Parser\" />
+    <Folder Include="src\FileCache\" />
   </ItemGroup>
 </Project>

binary-improvements/7dtd-server-fixes/src/ItemList.cs

@@ -49 +49 @@
                                 string name = ib.GetItemName (invF.itemValue);
                                 if (name != null && name.Length > 0) {
-                                        if (!items.ContainsKey (name))
+                                        if (!items.ContainsKey (name)) {
                                                 items.Add (name, invF.itemValue);
-                                        else
-                                                Log.Out ("Item \"" + name + "\" already in list!");
+                                        } else {
+                                                //Log.Out ("Item \"" + name + "\" already in list!");
+                                        }
                                 }
                         }
@@ -59 +60 @@
                                 string name = ib.GetItemName (invF.itemValue);
                                 if (name != null && name.Length > 0) {
-                                        if (!items.ContainsKey (name))
+                                        if (!items.ContainsKey (name)) {
                                                 items.Add (name, invF.itemValue);
-                                        else
-                                                Log.Out ("Item \"" + name + "\" already in list!");
+                                        } else {
+                                                //Log.Out ("Item \"" + name + "\" already in list!");
+                                        }
                                 }
                         }

binary-improvements/7dtd-server-fixes/src/MapRendering/MapRenderBlockBuffer.cs

@@ -13 +13 @@
                 private Texture2D zoomBuffer = new Texture2D (1, 1);
                 private Color nullColor = new Color (0, 0, 0, 0);
+                private AllocsFixes.FileCache.MapTileCache cache;
 
-                public MapRenderBlockBuffer (int level)
+                public MapRenderBlockBuffer (int level, AllocsFixes.FileCache.MapTileCache cache)
                 {
                         zoomLevel = level;
+                        this.cache = cache;
                 }
 
@@ -68 +70 @@
                 private void loadTextureFromFile (string _fileName)
                 {
-                        try {
-                                byte[] array = File.ReadAllBytes (_fileName);
+                        byte[] array = cache.LoadTile (zoomLevel, _fileName);
+                        if (array != null) {
                                 blockMap.LoadImage (array);
-                        } catch (Exception) {
+                        } else {
+                                //try {
+                                //byte[] array = File.ReadAllBytes (_fileName);
+                                //blockMap.LoadImage (array);
+                                //} catch (Exception) {
                                 for (int x = 0; x < Constants.MAP_BLOCK_SIZE; x++) {
                                         for (int y = 0; y < Constants.MAP_BLOCK_SIZE; y++) {
@@ -82 +88 @@
                 private void saveTextureToFile (string _fileName)
                 {
-                        try {
-                                byte[] array = blockMap.EncodeToPNG ();
-                                File.WriteAllBytes (_fileName, array);
-                        } catch (Exception e) {
-                                Log.Out ("Exception in MapRenderBlockBuffer.saveTextureToFile(): " + e);
-                        }
+                        byte[] array = blockMap.EncodeToPNG ();
+                        cache.SaveTile (zoomLevel, array);
+//                      try {
+//                              byte[] array = blockMap.EncodeToPNG ();
+//                              File.WriteAllBytes (_fileName, array);
+//                      } catch (Exception e) {
+//                              Log.Out ("Exception in MapRenderBlockBuffer.saveTextureToFile(): " + e);
+//                      }
                 }
 

binary-improvements/7dtd-server-fixes/src/MapRendering/MapRendering.cs

@@ -29 +29 @@
                 public static bool renderingEnabled = true;
                 private MicroStopwatch msw = new MicroStopwatch ();
+                private AllocsFixes.FileCache.MapTileCache cache = new AllocsFixes.FileCache.MapTileCache ();
+
+                public AllocsFixes.FileCache.MapTileCache TileCache {
+                        get { return cache; }
+                }
 
                 private MapRendering ()
@@ -39 +44 @@
                         }
 
+                        cache.SetZoomCount (Constants.ZOOMLEVELS);
+
                         zoomLevelBuffers = new MapRenderBlockBuffer[Constants.ZOOMLEVELS];
                         for (int i = 0; i < Constants.ZOOMLEVELS; i++) {
-                                zoomLevelBuffers [i] = new MapRenderBlockBuffer (i);
+                                zoomLevelBuffers [i] = new MapRenderBlockBuffer (i, cache);
                         }
 

binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/StaticHandler.cs

@@ -11 +11 @@
                 private string datapath;
                 private string staticPart;
-                private bool cache;
+                private AllocsFixes.FileCache.AbstractCache cache;
                 private bool logMissingFiles;
-                private Dictionary<string, byte[]> fileCache = new Dictionary<string, byte[]> ();
 
-                public StaticHandler (string staticPart, string filePath, bool cache, bool logMissingFiles)
+                public StaticHandler (string staticPart, string filePath, AllocsFixes.FileCache.AbstractCache cache, bool logMissingFiles)
                 {
                         this.staticPart = staticPart;
@@ -28 +27 @@
                                 string fn = req.Url.AbsolutePath.Remove (0, staticPart.Length);
 
-                                byte[] content;
-                                if (cache) {
-                                        lock (fileCache) {
-                                                if (!fileCache.ContainsKey (fn)) {
-                                                        if (!File.Exists (datapath + "/" + fn)) {
-                                                                throw new FileNotFoundException ();
-                                                        }
-
-                                                        fileCache.Add (fn, File.ReadAllBytes (datapath + "/" + fn));
-                                                }
-
-                                                content = fileCache [fn];
-                                        }
+                                byte[] content = cache.GetFileContent (datapath + "/" + fn);
+                                if (content != null) {
+                                        resp.ContentType = MimeType.GetMimeType (Path.GetExtension (fn));
+                                        resp.ContentLength64 = content.Length;
+                                        resp.OutputStream.Write (content, 0, content.Length);
                                 } else {
-                                        if (!File.Exists (datapath + "/" + fn)) {
-                                                throw new FileNotFoundException ();
-                                        }
-
-                                        content = File.ReadAllBytes (datapath + "/" + fn);
+                                        resp.StatusCode = (int)HttpStatusCode.NotFound;
+                                        if (logMissingFiles)
+                                                Log.Out ("Web:Static:FileNotFound: \"" + req.Url.AbsolutePath + "\" @ \"" + datapath + "/" + req.Url.AbsolutePath.Remove (0, staticPart.Length) + "\"");
+                                        return;
                                 }
-
-                                resp.ContentType = MimeType.GetMimeType (Path.GetExtension (fn));
-                                resp.ContentLength64 = content.Length;
-                                resp.OutputStream.Write (content, 0, content.Length);
-                        } catch (FileNotFoundException) {
-                                resp.StatusCode = (int)HttpStatusCode.NotFound;
-                                if (logMissingFiles)
-                                        Log.Out ("Web:Static:FileNotFound: \"" + req.Url.AbsolutePath + "\" @ \"" + datapath + "/" + req.Url.AbsolutePath.Remove (0, staticPart.Length) + "\"");
-                                return;
                         } catch (Exception e) {
                                 Log.Out ("Error in StaticHandler.HandleRequest: " + e);

binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/Web.cs

@@ -34 +34 @@
                                 }
  
-                                handlers.Add ("/index.htm", new SimpleRedirectHandler ("/static/index.html"));
-                                handlers.Add ("/static/", new StaticHandler ("/static/", Application.dataPath + "/../webserver", false/*true*/, true)); // TODO: Enable cache
-                                handlers.Add ("/map/", new StaticHandler ("/map/", StaticDirectories.GetSaveGameDir () + "/map", false, false));
+                                handlers.Add (
+                                                "/index.htm",
+                                                new SimpleRedirectHandler ("/static/index.html"));
+                                handlers.Add (
+                                                "/static/",
+                                                new StaticHandler (
+                                                                "/static/",
+                                                                Application.dataPath + "/../webserver",
+                                                                new AllocsFixes.FileCache.DirectAccess (),
+                                                                true)
+                                ); // TODO: Enable cache
+                                handlers.Add (
+                                                "/map/",
+                                                new StaticHandler (
+                                                                "/map/",
+                                                                StaticDirectories.GetSaveGameDir () + "/map",
+                                                                MapRendering.MapRendering.Instance.TileCache,
+                                                                false)
+                                );
                                 handlers.Add ("/api/", new ApiHandler ("/api/"));
 
@@ -61 +77 @@
                                 );
 
-                                NetTelnetServer.RegisterServer(this);
+                                NetTelnetServer.RegisterServer (this);