aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-02-09 01:37:53 +0000
committerJustin Clarke Casey2008-02-09 01:37:53 +0000
commita50a8376d60e7ff4ab80b04d00e143ee79c4245c (patch)
tree8ed2d0b1004f5d518dd12fa3c0b517323628ead7 /OpenSim
parentMostly debugging verbosity which I shall very shortly comment out. (diff)
downloadopensim-SC_OLD-a50a8376d60e7ff4ab80b04d00e143ee79c4245c.zip
opensim-SC_OLD-a50a8376d60e7ff4ab80b04d00e143ee79c4245c.tar.gz
opensim-SC_OLD-a50a8376d60e7ff4ab80b04d00e143ee79c4245c.tar.bz2
opensim-SC_OLD-a50a8376d60e7ff4ab80b04d00e143ee79c4245c.tar.xz
* In the most basic situations, ClientView and ScenePresence no longer leak memory
* However, I'm no longer sure they were even a big contributory factor (to this particular leak, there are other causes of other leaks). I need better measurement techniques * Removed most of my debugging gawp
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs8
-rw-r--r--OpenSim/Region/Environment/Modules/TextureDownloadModule.cs10
-rw-r--r--OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs8
4 files changed, 18 insertions, 12 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 6f25191..1717825 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -51,10 +51,10 @@ namespace OpenSim.Region.ClientStack
51 /// </summary> 51 /// </summary>
52 public class ClientView : IClientAPI 52 public class ClientView : IClientAPI
53 { 53 {
54 ~ClientView() 54// ~ClientView()
55 { 55// {
56 System.Console.WriteLine("[CLIENTVIEW]: Destructor called"); 56// System.Console.WriteLine("[CLIENTVIEW]: Destructor called");
57 } 57// }
58 58
59 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 59 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
60 60
diff --git a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
index 7529111..4f877be 100644
--- a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
@@ -146,9 +146,12 @@ namespace OpenSim.Region.Environment.Modules
146 146
147 public void ProcessTextureSenders() 147 public void ProcessTextureSenders()
148 { 148 {
149 TextureSender sender = null;
150
149 while (true) 151 while (true)
150 { 152 {
151 TextureSender sender = m_queueSenders.Dequeue(); 153 sender = m_queueSenders.Dequeue();
154
152 if (sender.Cancel) 155 if (sender.Cancel)
153 { 156 {
154 TextureSent(sender); 157 TextureSent(sender);
@@ -168,7 +171,10 @@ namespace OpenSim.Region.Environment.Modules
168 } 171 }
169 } 172 }
170 173
171 m_log.Info(String.Format("[TEXTURE DOWNLOAD] Texture sender queue size: {0}", m_queueSenders.Count())); 174 // Make sure that any sender we currently have can get garbage collected
175 sender = null;
176
177 //m_log.Info(String.Format("[TEXTURE DOWNLOAD] Texture sender queue size: {0}", m_queueSenders.Count()));
172 } 178 }
173 } 179 }
174 180
diff --git a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
index 08b6979..999f4a2 100644
--- a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
+++ b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
@@ -104,9 +104,9 @@ namespace OpenSim.Region.Environment.Modules
104 EnqueueTextureSender(textureSender); 104 EnqueueTextureSender(textureSender);
105 } 105 }
106 106
107 m_log.Info(String.Format("[TEXTURE SENDER] Removing texture sender with uuid {0}", textureID)); 107 //m_log.Info(String.Format("[TEXTURE SENDER] Removing texture sender with uuid {0}", textureID));
108 m_textureSenders.Remove(textureID); 108 m_textureSenders.Remove(textureID);
109 m_log.Info(String.Format("[TEXTURE SENDER] Current texture senders in dictionary: {0}", m_textureSenders.Count)); 109 //m_log.Info(String.Format("[TEXTURE SENDER] Current texture senders in dictionary: {0}", m_textureSenders.Count));
110 } 110 }
111 else 111 else
112 { 112 {
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 1b9e154..21710c0 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -39,10 +39,10 @@ namespace OpenSim.Region.Environment.Scenes
39{ 39{
40 public class ScenePresence : EntityBase 40 public class ScenePresence : EntityBase
41 { 41 {
42 ~ScenePresence() 42// ~ScenePresence()
43 { 43// {
44 System.Console.WriteLine("[ScenePresence] Destructor called"); 44// System.Console.WriteLine("[ScenePresence] Destructor called");
45 } 45// }
46 46
47 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 47 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
48 48