diff options
author | Justin Clarke Casey | 2008-02-09 01:37:53 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-02-09 01:37:53 +0000 |
commit | a50a8376d60e7ff4ab80b04d00e143ee79c4245c (patch) | |
tree | 8ed2d0b1004f5d518dd12fa3c0b517323628ead7 /OpenSim/Region/Environment/Modules | |
parent | Mostly debugging verbosity which I shall very shortly comment out. (diff) | |
download | opensim-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 '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/TextureDownloadModule.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs | 4 |
2 files changed, 10 insertions, 4 deletions
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 | { |