ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 19:36:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

several changes to lludp FetchInventory

Browse Source
This commit is contained in:
UbitUmarov
2020-03-01 18:56:07 +00:00
parent 71b5ca95e6
commit dc225e348d
7 changed files with 137 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
OpenSim/Region/Framework/Scenes/AsyncInventorySender.cs
View File

@@ -27,7 +27,8 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Collections.Concurrent;
//using System.Reflection;
using System.Threading;
using log4net;
using OpenMetaverse;
@@ -39,12 +40,14 @@ namespace OpenSim.Region.Framework.Scenes
class FetchHolder
{
public IClientAPI Client { get; private set; }
public UUID ItemID { get; private set; }
public UUID[] Items { get; private set; }
public UUID[] Owners { get; private set; }
public FetchHolder(IClientAPI client, UUID itemID)
public FetchHolder(IClientAPI client, UUID[] items, UUID[] owners)
{
Client = client;
ItemID = itemID;
Items = items;
Owners = owners;
}
}
@@ -77,16 +80,15 @@ namespace OpenSim.Region.Framework.Scenes
/// <summary>
/// Queues fetch requests
/// </summary>
Queue<FetchHolder> m_fetchHolder = new Queue<FetchHolder>();
private static ConcurrentQueue<FetchHolder> m_fetchHolder = new ConcurrentQueue<FetchHolder>();
static private object m_threadLock = new object();
static private bool m_running;
/// <summary>
/// Signal whether a queue is currently being processed or not.
/// </summary>
protected volatile bool m_processing;
public AsyncInventorySender(Scene scene)
{
m_processing = false;
m_scene = scene;
}
@@ -96,20 +98,20 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="remoteClient"></param>
/// <param name="itemID"></param>
/// <param name="ownerID"></param>
public void HandleFetchInventory(IClientAPI remoteClient, UUID itemID, UUID ownerID)
public void HandleFetchInventory(IClientAPI remoteClient, UUID[] items, UUID[] owners)
{
lock (m_fetchHolder)
{
// m_log.DebugFormat(
// "[ASYNC INVENTORY SENDER]: Putting request from {0} for {1} on queue", remoteClient.Name, itemID);
//m_log.DebugFormat(
// "[ASYNC INVENTORY SENDER]: Putting request from {0} for {1} on queue", remoteClient.Name, itemID);
m_fetchHolder.Enqueue(new FetchHolder(remoteClient, itemID));
}
if (!m_processing)
m_fetchHolder.Enqueue(new FetchHolder(remoteClient, items, owners));
if (Monitor.TryEnter(m_threadLock))
{
m_processing = true;
ProcessQueue();
if (!m_running)
{
m_running = true;
Util.FireAndForget(x => ProcessQueue());
}
Monitor.Exit(m_threadLock);
}
}
@@ -118,37 +120,42 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary>
protected void ProcessQueue()
{
FetchHolder fh = null;
while (true)
lock(m_threadLock)
{
lock (m_fetchHolder)
try
{
// m_log.DebugFormat("[ASYNC INVENTORY SENDER]: {0} items left to process", m_fetchHolder.Count);
while (m_fetchHolder.TryDequeue(out FetchHolder fh))
{
if (!fh.Client.IsActive)
continue;
// m_log.DebugFormat(
// "[ASYNC INVENTORY SENDER]: Handling request from {0} for {1} on queue", fh.Client.Name, fh.ItemID);
if (m_fetchHolder.Count == 0)
{
m_processing = false;
return;
}
else
{
fh = m_fetchHolder.Dequeue();
var items = new List<InventoryItemBase>();
for(int i = 0; i < fh.Items.Length; ++i )
{
InventoryItemBase item = m_scene.InventoryService.GetItem(fh.Owners[i], fh.Items[i]);
if (item == null)
continue;
/*
if (item.AssetType == (int)AssetType.Link)
{
InventoryItemBase itemlk = m_scene.InventoryService.GetItem(fh.Owners[i], item.AssetID);
if(itemlk != null)
items.Add(itemlk);
}
*/
items.Add(item);
}
fh.Client.SendInventoryItemDetails(items.ToArray());
// TODO: Possibly log any failure
}
}
if (!fh.Client.IsActive)
continue;
// m_log.DebugFormat(
// "[ASYNC INVENTORY SENDER]: Handling request from {0} for {1} on queue", fh.Client.Name, fh.ItemID);
InventoryItemBase item = m_scene.InventoryService.GetItem(fh.Client.AgentId, fh.ItemID);
if (item != null)
fh.Client.SendInventoryItemDetails(item.Owner, item);
// TODO: Possibly log any failure
catch { }
m_running = false;
}
}
}

8
OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
View File

@@ -28,7 +28,7 @@
using System;
using System.Collections.Generic;
using System.Collections.Concurrent;
using System.Reflection;
//using System.Reflection;
using System.Threading;
using log4net;
using OpenMetaverse;
@@ -52,7 +52,7 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary>
public class AsyncSceneObjectGroupDeleter
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
//private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
/// <value>
/// Is the deleter currently enabled?
/// </value>
@@ -145,8 +145,8 @@ namespace OpenSim.Region.Framework.Scenes
}
catch (Exception e)
{
m_log.ErrorFormat(
"[ASYNC OBJECT DELETER]: Exception background sending object: {0}{1}", e.Message, e.StackTrace);
//m_log.ErrorFormat(
// "[ASYNC OBJECT DELETER]: Exception background sending object: {0}{1}", e.Message, e.StackTrace);
}
}
// m_log.Debug("[ASYNC DELETER]: No objects left in inventory send queue.");