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

Started to link RegionSyncModule.RecordPrimUpdatesByLocal with functions 

in PrimSyncInfoManager. To to finished.
dsg
Huaiyu (Kitty) Liu 2011-04-08 17:10:09 -07:00
parent 2f41b216d3
commit a06ddb9e88
1 changed files with 104 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs
View File

@ -100,6 +100,11 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
SyncStatisticCollector.LogInterval = m_sysConfig.GetInt("SyncLogInterval", 5000); SyncStatisticCollector.LogInterval = m_sysConfig.GetInt("SyncLogInterval", 5000);
SyncStatisticCollector.LogMaxFileTimeMin = m_sysConfig.GetInt("SyncLogMaxFileTimeMin", 5); SyncStatisticCollector.LogMaxFileTimeMin = m_sysConfig.GetInt("SyncLogMaxFileTimeMin", 5);
SyncStatisticCollector.LogFileHeader = m_sysConfig.GetString("SyncLogFileHeader", "sync-"); SyncStatisticCollector.LogFileHeader = m_sysConfig.GetString("SyncLogFileHeader", "sync-");
//initialize PrimSyncInfoManager
int syncInfoAgeOutSeconds = m_sysConfig.GetInt("PrimSyncInfoAgeOutSeconds", 300); //unit of seconds
TimeSpan tSpan = new TimeSpan(0, 0, syncInfoAgeOutSeconds);
m_primSyncInfoManager = new PrimSyncInfoManager(this, tSpan.Ticks, m_log);
} }
//Called after Initialise() //Called after Initialise()
@ -3014,9 +3019,14 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
#endregion //Remote Event handlers #endregion //Remote Event handlers
#region Per Property SyncInfo management #region Per Property SyncInfo management
private PrimSyncInfoManager m_primSyncInfoManager;
public void RecordPrimUpdatesByLocal(SceneObjectPart part, List<SceneObjectPartProperties> updatedProperties) public void RecordPrimUpdatesByLocal(SceneObjectPart part, List<SceneObjectPartProperties> updatedProperties)
{ {
List<SceneObjectPartProperties> propertiesWithSyncInfoUpdated = m_primSyncInfoManager.UpdatePrimSyncInfoByLocal(part, updatedProperties);
OSDMap propertiesToSync = m_primSyncInfoManager.EncodePrimProperties(part, propertiesWithSyncInfoUpdated);
//TODO: Send out sync message with propertiesToSync
} }
#endregion //Per Property SyncInfo management #endregion //Per Property SyncInfo management
@ -3170,8 +3180,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
public class PropertySyncInfo public class PropertySyncInfo
{ {
private ulong m_lastUpdateTimeStamp; private long m_lastUpdateTimeStamp;
public ulong LastUpdateTimeStamp public long LastUpdateTimeStamp
{ {
get { return m_lastUpdateTimeStamp; } get { return m_lastUpdateTimeStamp; }
} }
@ -3201,8 +3211,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
/// Record the time the last sync message about this property is received. /// Record the time the last sync message about this property is received.
/// This value is only meaninful when m_lastUpdateSource==BySync /// This value is only meaninful when m_lastUpdateSource==BySync
/// </summary> /// </summary>
private ulong m_lastSyncUpdateRecvTime; private long m_lastSyncUpdateRecvTime;
public ulong LastSyncUpdateRecvTime public long LastSyncUpdateRecvTime
{ {
get { return m_lastSyncUpdateRecvTime; } get { return m_lastSyncUpdateRecvTime; }
set { m_lastSyncUpdateRecvTime = value; } set { m_lastSyncUpdateRecvTime = value; }
@ -3216,6 +3226,14 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
private Object m_syncInfoLock = new Object(); private Object m_syncInfoLock = new Object();
public PropertySyncInfo(Object initValue, long initTS, string syncID)
{
m_lastUpdateValue = initValue;
m_lastUpdateTimeStamp = initTS;
m_lastUpdateSyncID = syncID;
//m_lastSyncUpdateRecvTime == ??
}
/// <summary> /// <summary>
/// Update SyncInfo when the property is updated locally. This interface /// Update SyncInfo when the property is updated locally. This interface
/// is for complex properties that need hashValue for fast comparison, /// is for complex properties that need hashValue for fast comparison,
@ -3226,7 +3244,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
/// <param name="pValue"></param> /// <param name="pValue"></param>
/// <param name="pHashedValue">This is only meaningful for complex properties: /// <param name="pHashedValue">This is only meaningful for complex properties:
/// Shape & TaskInventory. For other properties, it is ignore.</param> /// Shape & TaskInventory. For other properties, it is ignore.</param>
public void UpdateSyncInfoByLocal(ulong ts, string syncID, Object pValue, string pHashedValue) public void UpdateSyncInfoByLocal(long ts, string syncID, Object pValue, string pHashedValue)
{ {
lock (m_syncInfoLock) lock (m_syncInfoLock)
{ {
@ -3245,7 +3263,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
/// <param name="ts"></param> /// <param name="ts"></param>
/// <param name="syncID"></param> /// <param name="syncID"></param>
/// <param name="pValue"></param> /// <param name="pValue"></param>
public void UpdateSyncInfoByLocal(ulong ts, string syncID, Object pValue) public void UpdateSyncInfoByLocal(long ts, string syncID, Object pValue)
{ {
lock (m_syncInfoLock) lock (m_syncInfoLock)
{ {
@ -3262,7 +3280,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
/// </summary> /// </summary>
/// <param name="ts"></param> /// <param name="ts"></param>
/// <param name="syncID"></param> /// <param name="syncID"></param>
public void UpdateSyncInfoBySync(ulong ts, string syncID, ulong recvTS, Object pValue) public void UpdateSyncInfoBySync(long ts, string syncID, long recvTS, Object pValue)
{ {
lock (m_syncInfoLock) lock (m_syncInfoLock)
{ {
@ -3296,8 +3314,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
get { return m_propertiesSyncInfo; } get { return m_propertiesSyncInfo; }
} }
private ulong m_PrimLastUpdateTime; private long m_PrimLastUpdateTime;
public ulong PrimLastUpdateTime public long PrimLastUpdateTime
{ {
get { return m_PrimLastUpdateTime; } get { return m_PrimLastUpdateTime; }
} }
@ -3308,30 +3326,26 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
#endregion //Members #endregion //Members
#region Constructors #region Constructors
public PrimSyncInfo()
{
InitPropertiesSyncInfo();
}
public PrimSyncInfo(ILog log) public PrimSyncInfo(SceneObjectPart part, long initUpdateTimestamp, string syncID, ILog log)
{ {
InitPropertiesSyncInfo(); InitPropertiesSyncInfo(part, initUpdateTimestamp, syncID);
m_log = log; m_log = log;
} }
#endregion //Constructors #endregion //Constructors
public void UpdatePropertySyncInfoByLocal(SceneObjectPartProperties property, ulong lastUpdateTS, string syncID, Object pValue, string pHashedValue) public void UpdatePropertySyncInfoByLocal(SceneObjectPartProperties property, long lastUpdateTS, string syncID, Object pValue, string pHashedValue)
{ {
m_propertiesSyncInfo[property].UpdateSyncInfoByLocal(lastUpdateTS, syncID, pValue, pHashedValue); m_propertiesSyncInfo[property].UpdateSyncInfoByLocal(lastUpdateTS, syncID, pValue, pHashedValue);
} }
public void UpdatePropertySyncInfoByLocal(SceneObjectPartProperties property, ulong lastUpdateTS, string syncID, Object pValue) public void UpdatePropertySyncInfoByLocal(SceneObjectPartProperties property, long lastUpdateTS, string syncID, Object pValue)
{ {
m_propertiesSyncInfo[property].UpdateSyncInfoByLocal(lastUpdateTS, syncID, pValue); m_propertiesSyncInfo[property].UpdateSyncInfoByLocal(lastUpdateTS, syncID, pValue);
} }
public void UpdatePropertySyncInfoBySync(SceneObjectPartProperties property, ulong lastUpdateTS, string syncID, Object pValue, Object pHashedValue, ulong recvTS) public void UpdatePropertySyncInfoBySync(SceneObjectPartProperties property, long lastUpdateTS, string syncID, Object pValue, Object pHashedValue, long recvTS)
{ {
m_propertiesSyncInfo[property].UpdateSyncInfoBySync(lastUpdateTS, syncID, recvTS, pValue); m_propertiesSyncInfo[property].UpdateSyncInfoBySync(lastUpdateTS, syncID, recvTS, pValue);
} }
@ -3339,17 +3353,16 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
//Triggered when a set of local writes just happened, and ScheduleFullUpdate //Triggered when a set of local writes just happened, and ScheduleFullUpdate
//or ScheduleTerseUpdate has been called. //or ScheduleTerseUpdate has been called.
/// <summary> /// <summary>
/// Update copies of the given list of properties in this SyncModule, /// Update copies of the given list of properties in the prim's SyncInfo.
/// by copying property values from SOP's data and set the timestamp
/// and syncID.
/// </summary> /// </summary>
/// <param name="part"></param> /// <param name="part"></param>
/// <param name="updatedProperties"></param> /// <param name="updatedProperties"></param>
/// <param name="lastUpdateTS"></param> /// <param name="lastUpdateTS"></param>
/// <param name="syncID"></param> /// <param name="syncID"></param>
public void UpdatePropertiesByLocal(SceneObjectPart part, List<SceneObjectPartProperties> updatedProperties, ulong lastUpdateTS, string syncID) public List<SceneObjectPartProperties> UpdatePropertiesByLocal(SceneObjectPart part, List<SceneObjectPartProperties> updatedProperties, long lastUpdateTS, string syncID)
{ {
if (part == null) return; List<SceneObjectPartProperties> propertiesWithSyncInfoUpdated = new List<SceneObjectPartProperties>();
if (part == null) return propertiesWithSyncInfoUpdated;
//first, see if there are physics properties updated but PhysActor //first, see if there are physics properties updated but PhysActor
//does not exist //does not exist
@ -3373,7 +3386,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
if (part.PhysActor == null) if (part.PhysActor == null)
{ {
m_log.WarnFormat("PrimSyncInfo: Informed some physics property in SOP updated, yet SOP's PhysActor no longer exsits."); m_log.WarnFormat("PrimSyncInfo: Informed some physics property in SOP updated, yet SOP's PhysActor no longer exsits.");
return; return propertiesWithSyncInfoUpdated;
} }
break; break;
case SceneObjectPartProperties.FullUpdate: case SceneObjectPartProperties.FullUpdate:
@ -3382,7 +3395,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
//compare and update all properties //compare and update all properties
return; return propertiesWithSyncInfoUpdated;
case SceneObjectPartProperties.None: case SceneObjectPartProperties.None:
//do nothing //do nothing
break; break;
@ -3410,22 +3423,29 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
updated = CompareAndUpdateValueByLocal(part, property, lastUpdateTS, syncID); updated = CompareAndUpdateValueByLocal(part, property, lastUpdateTS, syncID);
break; break;
} }
if (updated)
{
propertiesWithSyncInfoUpdated.Add(property);
} }
} }
} }
return propertiesWithSyncInfoUpdated;
}
private void InitPropertiesSyncInfo() private void InitPropertiesSyncInfo(SceneObjectPart part, long initUpdateTimestamp, string syncID)
{ {
m_propertiesSyncInfo = new Dictionary<SceneObjectPartProperties, PropertySyncInfo>(); m_propertiesSyncInfo = new Dictionary<SceneObjectPartProperties, PropertySyncInfo>();
foreach (SceneObjectPartProperties property in Enum.GetValues(typeof(SceneObjectPartProperties))) foreach (SceneObjectPartProperties property in Enum.GetValues(typeof(SceneObjectPartProperties)))
{ {
PropertySyncInfo syncInfo = new PropertySyncInfo(); Object initValue = GetSOPPropertyValue(part, property);
PropertySyncInfo syncInfo = new PropertySyncInfo(initValue, initUpdateTimestamp, syncID);
m_propertiesSyncInfo.Add(property, syncInfo); m_propertiesSyncInfo.Add(property, syncInfo);
} }
} }
private bool CompareAndUpdateHashedValueByLocal(SceneObjectPart part, SceneObjectPartProperties property, ulong lastUpdateTS, string syncID) private bool CompareAndUpdateHashedValueByLocal(SceneObjectPart part, SceneObjectPartProperties property, long lastUpdateTS, string syncID)
{ {
bool updated = false; bool updated = false;
switch (property) switch (property)
@ -3535,7 +3555,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
/// <param name="syncID"></param> /// <param name="syncID"></param>
/// <returns>Return true if the property's value maintained in this /// <returns>Return true if the property's value maintained in this
/// RegionSyncModule is replaced by SOP's data.</returns> /// RegionSyncModule is replaced by SOP's data.</returns>
private bool CompareAndUpdateValueByLocal(SceneObjectPart part, SceneObjectPartProperties property, ulong lastUpdateByLocalTS, string syncID) private bool CompareAndUpdateValueByLocal(SceneObjectPart part, SceneObjectPartProperties property, long lastUpdateByLocalTS, string syncID)
{ {
bool propertyUpdatedByLocal = false; bool propertyUpdatedByLocal = false;
@ -4600,10 +4620,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
{ {
case SceneObjectPartProperties.Shape: case SceneObjectPartProperties.Shape:
return (Object)SerializePrimPropertyShape(part); return (Object)SerializePrimPropertyShape(part);
break;
case SceneObjectPartProperties.TaskInventory: case SceneObjectPartProperties.TaskInventory:
return (Object)SerializePrimPropertyTaskInventory(part); return (Object)SerializePrimPropertyTaskInventory(part);
break;
/////////////////////// ///////////////////////
//SOP properties //SOP properties
@ -4680,7 +4698,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
case SceneObjectPartProperties.OwnershipCost: case SceneObjectPartProperties.OwnershipCost:
return (Object)part.OwnershipCost; return (Object)part.OwnershipCost;
case SceneObjectPartProperties.ParticleSystem: case SceneObjectPartProperties.ParticleSystem:
return ByteArrayEquals(part.ParticleSystem, (Byte[])m_propertiesSyncInfo[property].LastUpdateValue); //byte[], return a cloned copy
return (Object)part.ParticleSystem.Clone();
case SceneObjectPartProperties.PassTouches: case SceneObjectPartProperties.PassTouches:
return (Object)part.PassTouches; return (Object)part.PassTouches;
case SceneObjectPartProperties.RotationOffset: case SceneObjectPartProperties.RotationOffset:
@ -4710,7 +4729,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
case SceneObjectPartProperties.Text: case SceneObjectPartProperties.Text:
return (Object)part.Text; return (Object)part.Text;
case SceneObjectPartProperties.TextureAnimation: case SceneObjectPartProperties.TextureAnimation:
return ByteArrayEquals(part.TextureAnimation, (Byte[])m_propertiesSyncInfo[property].LastUpdateValue); //byte[], return a cloned copy
return part.TextureAnimation.Clone();
case SceneObjectPartProperties.TouchName: case SceneObjectPartProperties.TouchName:
return (Object)part.TouchName; return (Object)part.TouchName;
case SceneObjectPartProperties.UpdateFlag: case SceneObjectPartProperties.UpdateFlag:
@ -4762,19 +4782,68 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
public class PrimSyncInfoManager public class PrimSyncInfoManager
{ {
private Dictionary<UUID, PrimSyncInfo> m_primsInSync; private Dictionary<UUID, PrimSyncInfo> m_primsInSync;
private RegionSyncModule m_regionSyncModule;
private ILog m_log;
/// <summary>
/// The max time for a SOP's SyncInfo to sit in record
/// w/o being updated either locally or bySync.
/// </summary>
private long m_ageOutThreshold;
public Dictionary<UUID, PrimSyncInfo> PrimsInSync public Dictionary<UUID, PrimSyncInfo> PrimsInSync
{ {
get { return m_primsInSync; } get { return m_primsInSync; }
} }
public PrimSyncInfoManager() public PrimSyncInfoManager(RegionSyncModule syncModule, long ageOutTh, ILog log)
{ {
m_primsInSync = new Dictionary<UUID, PrimSyncInfo>(); m_primsInSync = new Dictionary<UUID, PrimSyncInfo>();
m_regionSyncModule = syncModule;
m_ageOutThreshold = ageOutTh;
m_log = log;
} }
public void UpdatePrimSyncInfo(SceneObjectPart part, List<SceneObjectPartProperties> updatedProperties) /// <summary>
/// For each property in updatedProperties, (1) if the value in SOP's
/// data is different than that in PrimSyncInfo, and what's in PrimSyncInfo
/// has an older timestamp, then update that property's value and syncInfo
/// in PrimSyncInfo; (2) otherwise, skip the property and do nothing.
/// </summary>
/// <param name="part"></param>
/// <param name="updatedProperties"></param>
/// <returns>The list properties among updatedProperties whose value
/// have been copied over to PrimSyncInfo.</returns>
public List<SceneObjectPartProperties> UpdatePrimSyncInfoByLocal(SceneObjectPart part, List<SceneObjectPartProperties> updatedProperties)
{ {
long currentTime = DateTime.Now.Ticks;
if (m_primsInSync.ContainsKey(part.UUID))
{
return m_primsInSync[part.UUID].UpdatePropertiesByLocal(part, updatedProperties, currentTime, m_regionSyncModule.SyncID);
}
else
{
//The SOP's SyncInfo is no longer in my record, may due to
//TimeOut or something. Add it back. Assume the properties
//were "AgeOut" seconds old.
PrimSyncInfo primSyncInfo = new PrimSyncInfo(part, currentTime, m_regionSyncModule.SyncID, m_log);
m_primsInSync.Add(part.UUID, primSyncInfo);
return updatedProperties;
}
}
public OSDMap EncodePrimProperties(SceneObjectPart part, List<SceneObjectPartProperties> updatedProperties)
{
OSDMap data = new OSDMap();
data["primUUID"] = OSDMap.FromUUID(part.UUID);
foreach (SceneObjectPartProperties property in updatedProperties)
{
// data[property.ToString()] =
}
return data;
} }
} }