Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LIBOMV-636: Dereference timers so GC can collect GridClient and managers

Browse Source 
git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2998 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
Latif Khalifa
2009-07-17 16:54:45 +00:00
parent 13f10b25bf
commit de0e00a1f0
4 changed files with 66 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
OpenMetaverse/ObjectManager.cs
View File

@@ -389,6 +389,8 @@ namespace OpenMetaverse
protected ObjectManager(GridClient client, bool registerCallbacks)
{
Client = client;
Client.Network.OnConnected += new NetworkManager.ConnectedCallback(Network_OnConnected);
Client.Network.OnDisconnected += new NetworkManager.DisconnectedCallback(Network_OnDisconnected);
if (registerCallbacks)
{
@@ -396,6 +398,23 @@ namespace OpenMetaverse
}
}
void Network_OnDisconnected(NetworkManager.DisconnectType reason, string message)
{
if (InterpolationTimer != null)
{
InterpolationTimer.Dispose();
InterpolationTimer = null;
}
}
void Network_OnConnected(object sender)
{
if (Settings.USE_INTERPOLATION_TIMER)
{
InterpolationTimer = new Timer(InterpolationTimer_Elapsed, null, Settings.INTERPOLATION_INTERVAL, Timeout.Infinite);
}
}
protected void RegisterCallbacks()
{
Client.Network.RegisterCallback(PacketType.ObjectUpdate, UpdateHandler);
@@ -406,14 +425,6 @@ namespace OpenMetaverse
Client.Network.RegisterCallback(PacketType.ObjectPropertiesFamily, ObjectPropertiesFamilyHandler);
Client.Network.RegisterCallback(PacketType.ObjectProperties, ObjectPropertiesHandler);
Client.Network.RegisterCallback(PacketType.PayPriceReply, PayPriceReplyHandler);
// If the callbacks aren't registered there's not point in doing client-side path prediction,
// so we set it up here
if (Settings.USE_INTERPOLATION_TIMER)
{
InterpolationTimer = new Timer(InterpolationTimer_Elapsed, null, Settings.INTERPOLATION_INTERVAL,
Timeout.Infinite);
}
}
#region Action Methods
@@ -2952,7 +2963,10 @@ namespace OpenMetaverse
// Start the timer again. Use a minimum of a 50ms pause in between calculations
int delay = Math.Max(50, Settings.INTERPOLATION_INTERVAL - elapsed);
InterpolationTimer.Change(delay, Timeout.Infinite);
if (InterpolationTimer != null)
{
InterpolationTimer.Change(delay, Timeout.Infinite);
}
}
}
}