OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

cpu-performance
Justin Clark-Casey (justincc) 2013-06-28 23:35:44 +01:00
parent 4406f07a84 4cb4c9fb25
commit eed15703ed
1 changed files with 43 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
View File

@ -173,11 +173,14 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
OSDMap GetMaterial(UUID id) OSDMap GetMaterial(UUID id)
{ {
OSDMap map = null; OSDMap map = null;
if (m_knownMaterials.ContainsKey(id)) lock (m_knownMaterials)
{ {
map = new OSDMap(); if (m_knownMaterials.ContainsKey(id))
map["ID"] = OSD.FromBinary(id.GetBytes()); {
map["Material"] = m_knownMaterials[id]; map = new OSDMap();
map["ID"] = OSD.FromBinary(id.GetBytes());
map["Material"] = m_knownMaterials[id];
}
} }
return map; return map;
} }
@ -227,7 +230,8 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
{ {
try try
{ {
m_knownMaterials[matMap["ID"].AsUUID()] = (OSDMap)matMap["Material"]; lock (m_knownMaterials)
m_knownMaterials[matMap["ID"].AsUUID()] = (OSDMap)matMap["Material"];
} }
catch (Exception e) catch (Exception e)
{ {
@ -251,8 +255,11 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
if (te.DefaultTexture != null) if (te.DefaultTexture != null)
{ {
if (m_knownMaterials.ContainsKey(te.DefaultTexture.MaterialID)) lock (m_knownMaterials)
mats[te.DefaultTexture.MaterialID] = m_knownMaterials[te.DefaultTexture.MaterialID]; {
if (m_knownMaterials.ContainsKey(te.DefaultTexture.MaterialID))
mats[te.DefaultTexture.MaterialID] = m_knownMaterials[te.DefaultTexture.MaterialID];
}
} }
if (te.FaceTextures != null) if (te.FaceTextures != null)
@ -261,8 +268,11 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
{ {
if (face != null) if (face != null)
{ {
if (m_knownMaterials.ContainsKey(face.MaterialID)) lock (m_knownMaterials)
mats[face.MaterialID] = m_knownMaterials[face.MaterialID]; {
if (m_knownMaterials.ContainsKey(face.MaterialID))
mats[face.MaterialID] = m_knownMaterials[face.MaterialID];
}
} }
} }
} }
@ -323,18 +333,21 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
try try
{ {
UUID id = new UUID(elem.AsBinary(), 0); UUID id = new UUID(elem.AsBinary(), 0);
if (m_knownMaterials.ContainsKey(id))
{
m_log.Info("[MaterialsDemoModule]: request for known material ID: " + id.ToString());
OSDMap matMap = new OSDMap();
matMap["ID"] = OSD.FromBinary(id.GetBytes());
matMap["Material"] = m_knownMaterials[id]; lock (m_knownMaterials)
respArr.Add(matMap); {
if (m_knownMaterials.ContainsKey(id))
{
m_log.Info("[MaterialsDemoModule]: request for known material ID: " + id.ToString());
OSDMap matMap = new OSDMap();
matMap["ID"] = OSD.FromBinary(id.GetBytes());
matMap["Material"] = m_knownMaterials[id];
respArr.Add(matMap);
}
else
m_log.Info("[MaterialsDemoModule]: request for UNKNOWN material ID: " + id.ToString());
} }
else
m_log.Info("[MaterialsDemoModule]: request for UNKNOWN material ID: " + id.ToString());
} }
catch (Exception e) catch (Exception e)
{ {
@ -372,7 +385,8 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
m_log.Debug("[MaterialsDemoModule]: mat: " + OSDParser.SerializeJsonString(mat)); m_log.Debug("[MaterialsDemoModule]: mat: " + OSDParser.SerializeJsonString(mat));
UUID id = HashOsd(mat); UUID id = HashOsd(mat);
m_knownMaterials[id] = mat; lock (m_knownMaterials)
m_knownMaterials[id] = mat;
var sop = m_scene.GetSceneObjectPart(matLocalID); var sop = m_scene.GetSceneObjectPart(matLocalID);
@ -480,24 +494,22 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
m_log.Debug("[MaterialsDemoModule]: GET cap handler"); m_log.Debug("[MaterialsDemoModule]: GET cap handler");
OSDMap resp = new OSDMap(); OSDMap resp = new OSDMap();
int matsCount = 0; int matsCount = 0;
OSDArray allOsd = new OSDArray(); OSDArray allOsd = new OSDArray();
foreach (KeyValuePair<UUID, OSDMap> kvp in m_knownMaterials) lock (m_knownMaterials)
{ {
OSDMap matMap = new OSDMap(); foreach (KeyValuePair<UUID, OSDMap> kvp in m_knownMaterials)
{
OSDMap matMap = new OSDMap();
matMap["ID"] = OSD.FromBinary(kvp.Key.GetBytes()); matMap["ID"] = OSD.FromBinary(kvp.Key.GetBytes());
matMap["Material"] = kvp.Value;
matMap["Material"] = kvp.Value; allOsd.Add(matMap);
allOsd.Add(matMap); matsCount++;
matsCount++; }
} }
resp["Zipped"] = ZCompressOSD(allOsd, false); resp["Zipped"] = ZCompressOSD(allOsd, false);
m_log.Debug("[MaterialsDemoModule]: matsCount: " + matsCount.ToString()); m_log.Debug("[MaterialsDemoModule]: matsCount: " + matsCount.ToString());