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

lludpclient: use jobengine again, keeping less ethernal references

master
UbitUmarov 2020-07-23 18:35:34 +01:00
parent 03e3078a9f
commit 25582af3dc
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
View File

@ -726,7 +726,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
const double MIN_CALLBACK_MS = 20.0; const double MIN_CALLBACK_MS = 20.0;
private bool m_isQueueEmptyRunning; public bool QueueEmptyRunning;
/// <summary> /// <summary>
/// Does an early check to see if this queue empty callback is already /// Does an early check to see if this queue empty callback is already
@ -735,23 +735,41 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// <param name="categories">Throttle categories to fire the callback for</param> /// <param name="categories">Throttle categories to fire the callback for</param>
private void BeginFireQueueEmpty(ThrottleOutPacketTypeFlags categories) private void BeginFireQueueEmpty(ThrottleOutPacketTypeFlags categories)
{ {
if (!m_isQueueEmptyRunning) if (!QueueEmptyRunning && HasUpdates(categories) && OnQueueEmpty != null)
{ {
if (!HasUpdates(categories))
return;
double start = Util.GetTimeStampMS(); double start = Util.GetTimeStampMS();
if (start < m_nextOnQueueEmpty) if (start < m_nextOnQueueEmpty)
return; return;
m_isQueueEmptyRunning = true; QueueEmptyRunning = true;
m_nextOnQueueEmpty = start + MIN_CALLBACK_MS; m_nextOnQueueEmpty = start + MIN_CALLBACK_MS;
// Asynchronously run the callback // Asynchronously run the callback
// avoid stupid memory leak if (m_udpServer.OqrEngine.IsRunning)
//if (m_udpServer.OqrEngine.IsRunning) {
// m_udpServer.OqrEngine.QueueJob(AgentID.ToString(), () => FireQueueEmpty(categories)); LLUDPClient udpcli = this;
//else ThrottleOutPacketTypeFlags cats = categories;
Action<LLUDPClient, ThrottleOutPacketTypeFlags> act = delegate
{
QueueEmpty callback = udpcli.OnQueueEmpty;
if (callback != null)
{
try
{
callback(cats);
}
catch { }
if (callback != null)
udpcli.QueueEmptyRunning = false;
}
udpcli = null;
callback = null;
};
m_udpServer.OqrEngine.QueueJob(AgentID.ToString(), () => act(udpcli, cats));
}
else
Util.FireAndForget(FireQueueEmpty, categories, "LLUDPClient.BeginFireQueueEmpty"); Util.FireAndForget(FireQueueEmpty, categories, "LLUDPClient.BeginFireQueueEmpty");
} }
} }
@ -773,7 +791,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
catch (Exception e) { m_log.Error("[LLUDPCLIENT]: OnQueueEmpty(" + categories + ") threw an exception: " + e.Message, e); } catch (Exception e) { m_log.Error("[LLUDPCLIENT]: OnQueueEmpty(" + categories + ") threw an exception: " + e.Message, e); }
} }
m_isQueueEmptyRunning = false; QueueEmptyRunning = false;
} }
internal void ForceThrottleSetting(int throttle, int setting) internal void ForceThrottleSetting(int throttle, int setting)