diff options
author | Justin Clark-Casey (justincc) | 2011-03-29 23:07:01 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-03-29 23:07:01 +0100 |
commit | fe258753a04706a0f760743b410611bb299b0bc1 (patch) | |
tree | eb32bed65d346d1d86f197a8430e20e0b2213043 /OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs | |
parent | add save of LLClientView I forgot from last commit (diff) | |
download | opensim-SC_OLD-fe258753a04706a0f760743b410611bb299b0bc1.zip opensim-SC_OLD-fe258753a04706a0f760743b410611bb299b0bc1.tar.gz opensim-SC_OLD-fe258753a04706a0f760743b410611bb299b0bc1.tar.bz2 opensim-SC_OLD-fe258753a04706a0f760743b410611bb299b0bc1.tar.xz |
disable prim count debug logging temporarily
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs | 68 |
1 files changed, 35 insertions, 33 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs index 2de5c16..d126b26 100644 --- a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs | |||
@@ -122,10 +122,10 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
122 | { | 122 | { |
123 | if (!m_Tainted) | 123 | if (!m_Tainted) |
124 | AddObject(obj); | 124 | AddObject(obj); |
125 | else | 125 | // else |
126 | m_log.DebugFormat( | 126 | // m_log.DebugFormat( |
127 | "[PRIM COUNT MODULE]: Ignoring OnParcelPrimCountAdd() for {0} on {1} since count is tainted", | 127 | // "[PRIM COUNT MODULE]: Ignoring OnParcelPrimCountAdd() for {0} on {1} since count is tainted", |
128 | obj.Name, m_Scene.RegionInfo.RegionName); | 128 | // obj.Name, m_Scene.RegionInfo.RegionName); |
129 | 129 | ||
130 | } | 130 | } |
131 | } | 131 | } |
@@ -137,17 +137,17 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
137 | { | 137 | { |
138 | if (!m_Tainted) | 138 | if (!m_Tainted) |
139 | RemoveObject(obj); | 139 | RemoveObject(obj); |
140 | else | 140 | // else |
141 | m_log.DebugFormat( | 141 | // m_log.DebugFormat( |
142 | "[PRIM COUNT MODULE]: Ignoring OnObjectBeingRemovedFromScene() for {0} on {1} since count is tainted", | 142 | // "[PRIM COUNT MODULE]: Ignoring OnObjectBeingRemovedFromScene() for {0} on {1} since count is tainted", |
143 | obj.Name, m_Scene.RegionInfo.RegionName); | 143 | // obj.Name, m_Scene.RegionInfo.RegionName); |
144 | } | 144 | } |
145 | } | 145 | } |
146 | 146 | ||
147 | private void OnParcelPrimCountTainted() | 147 | private void OnParcelPrimCountTainted() |
148 | { | 148 | { |
149 | m_log.DebugFormat( | 149 | // m_log.DebugFormat( |
150 | "[PRIM COUNT MODULE]: OnParcelPrimCountTainted() called on {0}", m_Scene.RegionInfo.RegionName); | 150 | // "[PRIM COUNT MODULE]: OnParcelPrimCountTainted() called on {0}", m_Scene.RegionInfo.RegionName); |
151 | 151 | ||
152 | lock (m_TaintLock) | 152 | lock (m_TaintLock) |
153 | m_Tainted = true; | 153 | m_Tainted = true; |
@@ -174,7 +174,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
174 | // NOTE: Call under Taint Lock | 174 | // NOTE: Call under Taint Lock |
175 | private void AddObject(SceneObjectGroup obj) | 175 | private void AddObject(SceneObjectGroup obj) |
176 | { | 176 | { |
177 | m_log.DebugFormat("[PRIM COUNT MODULE]: Adding object {0} {1} to prim count", obj.Name, obj.UUID); | 177 | // m_log.DebugFormat("[PRIM COUNT MODULE]: Adding object {0} {1} to prim count", obj.Name, obj.UUID); |
178 | 178 | ||
179 | if (obj.IsAttachment) | 179 | if (obj.IsAttachment) |
180 | return; | 180 | return; |
@@ -225,13 +225,15 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
225 | // NOTE: Call under Taint Lock | 225 | // NOTE: Call under Taint Lock |
226 | private void RemoveObject(SceneObjectGroup obj) | 226 | private void RemoveObject(SceneObjectGroup obj) |
227 | { | 227 | { |
228 | m_log.DebugFormat("[PRIM COUNT MODULE]: Removing object {0} {1} from prim count", obj.Name, obj.UUID); | 228 | // m_log.DebugFormat("[PRIM COUNT MODULE]: Removing object {0} {1} from prim count", obj.Name, obj.UUID); |
229 | |||
230 | // Currently this is being done by tainting the count instead. | ||
229 | } | 231 | } |
230 | 232 | ||
231 | public IPrimCounts GetPrimCounts(UUID parcelID) | 233 | public IPrimCounts GetPrimCounts(UUID parcelID) |
232 | { | 234 | { |
233 | m_log.DebugFormat( | 235 | // m_log.DebugFormat( |
234 | "[PRIM COUNT MODULE]: GetPrimCounts for parcel {0} in {1}", parcelID, m_Scene.RegionInfo.RegionName); | 236 | // "[PRIM COUNT MODULE]: GetPrimCounts for parcel {0} in {1}", parcelID, m_Scene.RegionInfo.RegionName); |
235 | 237 | ||
236 | PrimCounts primCounts; | 238 | PrimCounts primCounts; |
237 | 239 | ||
@@ -266,9 +268,9 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
266 | count = counts.Owner; | 268 | count = counts.Owner; |
267 | } | 269 | } |
268 | 270 | ||
269 | m_log.DebugFormat( | 271 | // m_log.DebugFormat( |
270 | "[PRIM COUNT MODULE]: GetOwnerCount for parcel {0} in {1} returning {2}", | 272 | // "[PRIM COUNT MODULE]: GetOwnerCount for parcel {0} in {1} returning {2}", |
271 | parcelID, m_Scene.RegionInfo.RegionName, count); | 273 | // parcelID, m_Scene.RegionInfo.RegionName, count); |
272 | 274 | ||
273 | return count; | 275 | return count; |
274 | } | 276 | } |
@@ -292,9 +294,9 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
292 | count = counts.Group; | 294 | count = counts.Group; |
293 | } | 295 | } |
294 | 296 | ||
295 | m_log.DebugFormat( | 297 | // m_log.DebugFormat( |
296 | "[PRIM COUNT MODULE]: GetGroupCount for parcel {0} in {1} returning {2}", | 298 | // "[PRIM COUNT MODULE]: GetGroupCount for parcel {0} in {1} returning {2}", |
297 | parcelID, m_Scene.RegionInfo.RegionName, count); | 299 | // parcelID, m_Scene.RegionInfo.RegionName, count); |
298 | 300 | ||
299 | return count; | 301 | return count; |
300 | } | 302 | } |
@@ -318,9 +320,9 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
318 | count = counts.Others; | 320 | count = counts.Others; |
319 | } | 321 | } |
320 | 322 | ||
321 | m_log.DebugFormat( | 323 | // m_log.DebugFormat( |
322 | "[PRIM COUNT MODULE]: GetOthersCount for parcel {0} in {1} returning {2}", | 324 | // "[PRIM COUNT MODULE]: GetOthersCount for parcel {0} in {1} returning {2}", |
323 | parcelID, m_Scene.RegionInfo.RegionName, count); | 325 | // parcelID, m_Scene.RegionInfo.RegionName, count); |
324 | 326 | ||
325 | return count; | 327 | return count; |
326 | } | 328 | } |
@@ -349,9 +351,9 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
349 | } | 351 | } |
350 | } | 352 | } |
351 | 353 | ||
352 | m_log.DebugFormat( | 354 | // m_log.DebugFormat( |
353 | "[PRIM COUNT MODULE]: GetTotalCount for parcel {0} in {1} returning {2}", | 355 | // "[PRIM COUNT MODULE]: GetTotalCount for parcel {0} in {1} returning {2}", |
354 | parcelID, m_Scene.RegionInfo.RegionName, count); | 356 | // parcelID, m_Scene.RegionInfo.RegionName, count); |
355 | 357 | ||
356 | return count; | 358 | return count; |
357 | } | 359 | } |
@@ -379,9 +381,9 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
379 | } | 381 | } |
380 | } | 382 | } |
381 | 383 | ||
382 | m_log.DebugFormat( | 384 | // m_log.DebugFormat( |
383 | "[PRIM COUNT MODULE]: GetOthersCount for parcel {0} in {1} returning {2}", | 385 | // "[PRIM COUNT MODULE]: GetOthersCount for parcel {0} in {1} returning {2}", |
384 | parcelID, m_Scene.RegionInfo.RegionName, count); | 386 | // parcelID, m_Scene.RegionInfo.RegionName, count); |
385 | 387 | ||
386 | return count; | 388 | return count; |
387 | } | 389 | } |
@@ -410,9 +412,9 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
410 | } | 412 | } |
411 | } | 413 | } |
412 | 414 | ||
413 | m_log.DebugFormat( | 415 | // m_log.DebugFormat( |
414 | "[PRIM COUNT MODULE]: GetUserCount for user {0} in parcel {1} in region {2} returning {3}", | 416 | // "[PRIM COUNT MODULE]: GetUserCount for user {0} in parcel {1} in region {2} returning {3}", |
415 | userID, parcelID, m_Scene.RegionInfo.RegionName, count); | 417 | // userID, parcelID, m_Scene.RegionInfo.RegionName, count); |
416 | 418 | ||
417 | return count; | 419 | return count; |
418 | } | 420 | } |
@@ -420,7 +422,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
420 | // NOTE: This method MUST be called while holding the taint lock! | 422 | // NOTE: This method MUST be called while holding the taint lock! |
421 | private void Recount() | 423 | private void Recount() |
422 | { | 424 | { |
423 | m_log.DebugFormat("[PRIM COUNT MODULE]: Recounting prims on {0}", m_Scene.RegionInfo.RegionName); | 425 | // m_log.DebugFormat("[PRIM COUNT MODULE]: Recounting prims on {0}", m_Scene.RegionInfo.RegionName); |
424 | 426 | ||
425 | m_OwnerMap.Clear(); | 427 | m_OwnerMap.Clear(); |
426 | m_SimwideCounts.Clear(); | 428 | m_SimwideCounts.Clear(); |