ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 09:16:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

retire our BlockingQueue replaced by BlockingCollection and cross fingers

Browse Source
This commit is contained in:
UbitUmarov
2018-01-22 17:09:38 +00:00
parent 437369778d
commit d38161f83d
5 changed files with 33 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs
View File

@@ -3,6 +3,7 @@
*/
using System;
using System.Collections.Concurrent;
using System.Threading;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModules.SharedBase;
@@ -73,7 +74,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
public float MeshSculptphysicalLOD = 32;
public float MinSizeToMeshmerize = 0.1f;
private OpenSim.Framework.BlockingQueue<ODEPhysRepData> workQueue = new OpenSim.Framework.BlockingQueue<ODEPhysRepData>();
private BlockingCollection<ODEPhysRepData> workQueue = new BlockingCollection<ODEPhysRepData>();
private bool m_running;
private Thread m_thread;
@@ -100,10 +101,11 @@ namespace OpenSim.Region.PhysicsModule.ubOde
private void DoWork()
{
m_mesher.ExpireFileCache();
ODEPhysRepData nextRep;
while(m_running)
{
ODEPhysRepData nextRep = workQueue.Dequeue();
workQueue.TryTake(out nextRep, -1);
if(!m_running)
return;
if (nextRep == null)
@@ -132,7 +134,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
try
{
m_thread.Abort();
workQueue.Clear();
// workQueue.Dispose();
}
catch
{
@@ -189,7 +191,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
repData.meshState = MeshState.loadingAsset;
repData.comand = meshWorkerCmnds.getmesh;
workQueue.Enqueue(repData);
workQueue.Add(repData);
}
}
@@ -235,7 +237,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
if (needsMeshing(repData)) // no need for pbs now?
{
repData.comand = meshWorkerCmnds.changefull;
workQueue.Enqueue(repData);
workQueue.Add(repData);
}
}
else