ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 11:57:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Temporarily add root agent rez attachments work to job engine if it is running rather than as a fire and forget.

Browse Source 
Experiment to see if serializing attachment rez and send initial data jobs improves other parts of sim performance.
This commit is contained in:
Justin Clark-Casey (justincc)
2014-09-09 18:26:41 +01:00
parent 859b1c5ba4
commit 9fb3065d33
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Framework/Monitoring/Watchdog.cs
View File

@@ -133,7 +133,7 @@ namespace OpenSim.Framework.Monitoring
/// /summary>
public static event Action<ThreadWatchdogInfo> OnWatchdogTimeout;
private static JobEngine m_jobEngine;
public static JobEngine JobEngine { get; private set; }
/// <summary>
/// Is this watchdog active?
@@ -175,7 +175,7 @@ namespace OpenSim.Framework.Monitoring
static Watchdog()
{
m_jobEngine = new JobEngine();
JobEngine = new JobEngine();
m_threads = new Dictionary<int, ThreadWatchdogInfo>();
m_watchdogTimer = new System.Timers.Timer(WATCHDOG_INTERVAL_MS);
m_watchdogTimer.AutoReset = false;
@@ -463,8 +463,8 @@ namespace OpenSim.Framework.Monitoring
return;
}
if (m_jobEngine.IsRunning)
m_jobEngine.QueueRequest(name, callback, obj);
if (JobEngine.IsRunning)
JobEngine.QueueRequest(name, callback, obj);
else
RunInThread(callback, name, obj, log);
}