Merge pull request #56 from amandaleeang/hg-slow-fetch

Gate HGUuidGatherer per-asset Debug logs on WebUtil.DebugLevel

OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs

@@ -84,6 +84,8 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
         private float m_renderMinHeight = -100f;
         private float m_renderMaxHeight = 4096f;
 
+        private string m_mapTilesDirectory = string.Empty; // directory to load/save map tile images
+
         private bool m_Enabled = false;
 
         #region Region Module interface
@@ -132,6 +134,21 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                 m_renderMinHeight = -100f;
             else if (m_renderMinHeight > m_renderMaxHeight - 10f)
                 m_renderMinHeight = m_renderMaxHeight - 10f;
+
+            m_mapTilesDirectory =
+                Util.GetConfigVarFromSections<string>(source, "MapTilesDirectory", configSections, m_mapTilesDirectory);
+            if(!string.IsNullOrEmpty(m_mapTilesDirectory))
+            {
+                try
+                {
+                    Directory.CreateDirectory(m_mapTilesDirectory);
+                }
+                catch(Exception e)
+                {
+                    m_log.Error($"[MAPTILE]: failed to create folder {m_mapTilesDirectory} for local map tiles {e.Message}");
+                    m_mapTilesDirectory = null;
+                }
+            }
         }
 
         public void AddRegion(Scene scene)
@@ -209,6 +226,9 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             Bitmap tile = GenImage();
             // image may be reloaded elsewhere, so no compression format
             string filename = "MAP-" + m_scene.RegionInfo.RegionID.ToString() + ".png";
+            if (!string.IsNullOrEmpty(m_mapTilesDirectory))
+                filename = System.IO.Path.Combine(m_mapTilesDirectory, filename);
+
             tile.Save(filename,ImageFormat.Png);
             m_primMesher = null;
             return tile;

OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs

@@ -130,10 +130,14 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
                 //m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions", mapName, regionInfos.Count);
 
+                MapBlockData data;
                 if (regionInfos != null && regionInfos.Count > 0)
                 {
                     foreach (GridRegion info in regionInfos)
                     {
+                        data = new MapBlockData();
+                        data.Agents = 0;
+                        data.Access = info.Access;
                         MapBlockData block = new MapBlockData();
                         MapBlockFromGridRegion(block, info, flags);
 

OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs

@@ -27,7 +27,6 @@
 
 using System;
 using System.Collections;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
@@ -100,6 +99,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         protected bool m_exportPrintScale = false; // prints the scale of map in meters on exported map
         protected bool m_exportPrintRegionName = false; // prints the region name exported map
         protected bool m_localV1MapAssets = false; // keep V1 map assets only on  local cache
+        protected string m_mapTilesDirectory = string.Empty; // directory to load/save map tile images
 
         private readonly object m_sceneLock = new object();
         public WorldMapModule()
@@ -158,6 +158,21 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 Util.GetConfigVarFromSections<bool>(config, "ExportMapAddRegionName", configSections, m_exportPrintRegionName);
             m_localV1MapAssets =
                 Util.GetConfigVarFromSections<bool>(config, "LocalV1MapAssets", configSections, m_localV1MapAssets);
+            m_mapTilesDirectory =
+                Util.GetConfigVarFromSections<string>(config, "MapTilesDirectory", configSections, m_mapTilesDirectory);
+            if(!string.IsNullOrEmpty(m_mapTilesDirectory))
+            {
+                try
+                {
+                    Directory.CreateDirectory(m_mapTilesDirectory);
+                }
+                catch(Exception e)
+                {
+                    m_log.Error($"[WORLD MAP]: failed to create folder {m_mapTilesDirectory} for local map tiles {e.Message}");
+                    m_mapTilesDirectory = null;
+                }
+            }
+
         }
 
         public virtual void AddRegion(Scene scene)
@@ -1337,10 +1352,12 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             startX--;
             startY--;
 
-            bool doneLocal = false;
+            bool doneLocal;
             string filename = "MAP-" + m_scene.RegionInfo.RegionID.ToString() + ".png";
             try
             {
+                if (!string.IsNullOrEmpty(m_mapTilesDirectory))
+                    filename = Path.Combine(m_mapTilesDirectory, filename);
                 using(Image localMap = Bitmap.FromFile(filename))
                 {
                     int x = regionX - startX;
@@ -1359,7 +1376,11 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 }
                 doneLocal = true;
             }
-            catch {}
+            catch(Exception ex)
+            {
+                m_log.Error($"[WORLD MAP]: failed Export map file {ex.Message}");
+                return;
+            }
 
             if(regions.Count > 0)
             {

OpenSim/Region/Framework/Scenes/UuidGatherer.cs

@@ -1337,10 +1337,15 @@ namespace OpenSim.Region.Framework.Scenes
         {
             string IDstr = assetID.ToString();
             AssetBase asset = m_assetService.Get(IDstr, m_assetServerURL, true);
-            if (asset is null)
+            // Per-asset Debug is expensive (sync File+Console). Only when HTTP debug is on:
-                m_log.Debug($"[HGUUIDGatherer]: Failed to fetch asset {IDstr} from {m_assetServerURL}");
+            //   debug http all|out N   (WebUtil.DebugLevel > 0)
-            else
+            if (WebUtil.DebugLevel > 0)
-                m_log.Debug($"[HGUUIDGatherer]: Copied asset {IDstr} from {m_assetServerURL} to local asset server");
+            {
+                if (asset is null)
+                    m_log.Debug($"[HGUUIDGatherer]: Failed to fetch asset {IDstr} from {m_assetServerURL}");
+                else
+                    m_log.Debug($"[HGUUIDGatherer]: Copied asset {IDstr} from {m_assetServerURL} to local asset server");
+            }
 
             return asset;
         }

bin/OpenSimDefaults.ini

@@ -61,6 +61,10 @@
     ; QueueUserWorkItem, SmartThreadPool, and Thread.
     async_call_method = SmartThreadPool
 
+    ; Min threads to allocate on the FireAndForget thread pool
+    ; when running with the SmartThreadPool option above
+    MinPoolThreads = 2
+
     ; Max threads to allocate on the FireAndForget thread pool
     ; when running with the SmartThreadPool option above
     MaxPoolThreads = 300
@@ -467,6 +471,11 @@
     ; generate better images.
     ;MapImageModule = "MapImageModule"
 
+    ; Directory used to load and save the generated MAP-<region uuid>.png tile images.
+    ; If left empty the current working directory is used (default behaviour).
+    ; The directory is created automatically if it does not exist.
+    ;MapTilesDirectory = "./localmaptiles"
+
     ; World map blacklist timeout in seconds
     ;BlacklistTimeout = 600