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

missing file change.. actually use watchdog threads on assetsconnector and 

avoid null refs on JobEngine
0.9.0-post-fixes
UbitUmarov 2017-05-26 00:34:04 +01:00
parent d90b68c2a6
commit 8d8236cfb2
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Framework/Monitoring/JobEngine.cs
View File

@ -136,12 +136,15 @@ namespace OpenSim.Framework.Monitoring
if(m_jobQueue.Count <= 0) if(m_jobQueue.Count <= 0)
m_cancelSource.Cancel(); m_cancelSource.Cancel();
if(m_finishedProcessingAfterStop.WaitOne(RequestProcessTimeoutOnStop)) m_finishedProcessingAfterStop.WaitOne(RequestProcessTimeoutOnStop);
m_finishedProcessingAfterStop.Close(); m_finishedProcessingAfterStop.Close();
} }
finally finally
{ {
m_cancelSource.Dispose(); if(m_cancelSource != null)
m_cancelSource.Dispose();
if(m_finishedProcessingAfterStop != null)
m_finishedProcessingAfterStop.Dispose();
} }
} }
} }

11
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
View File

@ -34,7 +34,7 @@ using System.Reflection;
using System.Timers; using System.Timers;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Console; using OpenSim.Framework.Monitoring;
using OpenSim.Services.Interfaces; using OpenSim.Services.Interfaces;
using OpenMetaverse; using OpenMetaverse;
@ -135,7 +135,11 @@ namespace OpenSim.Services.Connectors
for (int i = 0 ; i < 2 ; i++) 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) while (true)
{ {
r = m_requestQueue.Dequeue(2000); r = m_requestQueue.Dequeue(4500);
Watchdog.UpdateThread();
if(r== null) if(r== null)
continue; continue;
string uri = r.uri; string uri = r.uri;