missing file change.. actually use watchdog threads on assetsconnector and
avoid null refs on JobEngine0.9.0-post-fixes
parent
d90b68c2a6
commit
8d8236cfb2
|
@ -136,12 +136,15 @@ namespace OpenSim.Framework.Monitoring
|
|||
if(m_jobQueue.Count <= 0)
|
||||
m_cancelSource.Cancel();
|
||||
|
||||
if(m_finishedProcessingAfterStop.WaitOne(RequestProcessTimeoutOnStop))
|
||||
m_finishedProcessingAfterStop.WaitOne(RequestProcessTimeoutOnStop);
|
||||
m_finishedProcessingAfterStop.Close();
|
||||
}
|
||||
finally
|
||||
{
|
||||
m_cancelSource.Dispose();
|
||||
if(m_cancelSource != null)
|
||||
m_cancelSource.Dispose();
|
||||
if(m_finishedProcessingAfterStop != null)
|
||||
m_finishedProcessingAfterStop.Dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@ using System.Reflection;
|
|||
using System.Timers;
|
||||
using Nini.Config;
|
||||
using OpenSim.Framework;
|
||||
using OpenSim.Framework.Console;
|
||||
using OpenSim.Framework.Monitoring;
|
||||
using OpenSim.Services.Interfaces;
|
||||
using OpenMetaverse;
|
||||
|
||||
|
@ -135,7 +135,11 @@ namespace OpenSim.Services.Connectors
|
|||
|
||||
for (int i = 0 ; i < 2 ; i++)
|
||||
{
|
||||
Util.FireAndForget(delegate { AssetRequestProcessor();});
|
||||
m_fetchThreads[i] = WorkManager.StartThread(AssetRequestProcessor,
|
||||
String.Format("GetTextureWorker{0}", i),
|
||||
ThreadPriority.Normal,
|
||||
true,
|
||||
false);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -357,7 +361,8 @@ namespace OpenSim.Services.Connectors
|
|||
|
||||
while (true)
|
||||
{
|
||||
r = m_requestQueue.Dequeue(2000);
|
||||
r = m_requestQueue.Dequeue(4500);
|
||||
Watchdog.UpdateThread();
|
||||
if(r== null)
|
||||
continue;
|
||||
string uri = r.uri;
|
||||
|
|
Loading…
Reference in New Issue