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

Timestamp:

Sep 6, 2018, 1:46:44 AM (6 years ago)

Author:

alloc

Message:

Major allocation and execution time improvements on the map rendering code

File:

• binary-improvements/7dtd-server-fixes/src/FileCache/MapTileCache.cs (modified) (5 diffs)

binary-improvements/7dtd-server-fixes/src/FileCache/MapTileCache.cs

@@ -46 +46 @@
 
                                                 Profiler.BeginSample ("ReadPng");
-                                                cacheEntry.pngData = File.ReadAllBytes (filename);
+                                                cacheEntry.pngData = ReadAllBytes (filename);
                                                 Profiler.EndSample ();
                                         }
@@ -63 +63 @@
                                 lock (cache) {
                                         CurrentZoomFile cacheEntry = cache [zoomlevel];
-                                        
-                                        if (string.IsNullOrEmpty (cacheEntry.filename)) {
+
+                                        string file = cacheEntry.filename;
+                                        if (string.IsNullOrEmpty (file)) {
                                                 return;
                                         }
@@ -71 +72 @@
 
                                         Profiler.BeginSample ("WritePng");
-                                        File.WriteAllBytes (cacheEntry.filename, contentPng);
+                                        using (Stream stream = new FileStream (file, FileMode.Create, FileAccess.ReadWrite, FileShare.None,
+                                                4096)) {
+                                                stream.Write (contentPng, 0, contentPng.Length);
+                                        }
                                         Profiler.EndSample ();
                                 }
@@ -92 +96 @@
                                         }
 
-                                        return File.ReadAllBytes (filename);
+                                        return ReadAllBytes (filename);
                                 }
                         } catch (Exception e) {
@@ -101 +105 @@
                 }
 
+                private static byte[] ReadAllBytes (string _path) {
+                        using (FileStream fileStream = new FileStream(_path, FileMode.Open, FileAccess.Read, FileShare.Read, 4096)) {
+                                int bytesRead = 0;
+                                int bytesLeft = (int) fileStream.Length;
+                                byte[] result = new byte[bytesLeft];
+                                while (bytesLeft > 0) {
+                                        int readThisTime = fileStream.Read (result, bytesRead, bytesLeft);
+                                        if (readThisTime == 0) {
+                                                throw new IOException ("Unexpected end of stream");
+                                        }
+
+                                        bytesRead += readThisTime;
+                                        bytesLeft -= readThisTime;
+                                }
+
+                                return result;
+                        }
+                }
+
+
                 private class CurrentZoomFile {
                         public string filename;