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

Stop locking the requests coming in to WebFetchInvDecHandler. 

There's no technical reason for this as the methods are thread safe.  However, it might have served to slow down requests.
iar_mods
Justin Clark-Casey (justincc) 2011-11-26 00:13:04 +00:00
parent 95a686dbf5
commit c5b636469d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
View File

@ -49,7 +49,7 @@ namespace OpenSim.Capabilities.Handlers
private IInventoryService m_InventoryService; private IInventoryService m_InventoryService;
private ILibraryService m_LibraryService; private ILibraryService m_LibraryService;
private object m_fetchLock = new Object(); // private object m_fetchLock = new Object();
public WebFetchInvDescHandler(IInventoryService invService, ILibraryService libService) public WebFetchInvDescHandler(IInventoryService invService, ILibraryService libService)
{ {
@ -59,8 +59,8 @@ namespace OpenSim.Capabilities.Handlers
public string FetchInventoryDescendentsRequest(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) public string FetchInventoryDescendentsRequest(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse)
{ {
lock (m_fetchLock) // lock (m_fetchLock)
{ // {
// m_log.DebugFormat("[WEB FETCH INV DESC HANDLER]: Received request {0}", request); // m_log.DebugFormat("[WEB FETCH INV DESC HANDLER]: Received request {0}", request);
// nasty temporary hack here, the linden client falsely // nasty temporary hack here, the linden client falsely
@ -135,7 +135,7 @@ namespace OpenSim.Capabilities.Handlers
return response; return response;
} // }
} }
/// <summary> /// <summary>
@ -188,9 +188,9 @@ namespace OpenSim.Capabilities.Handlers
UUID agentID, UUID folderID, UUID ownerID, UUID agentID, UUID folderID, UUID ownerID,
bool fetchFolders, bool fetchItems, int sortOrder, out int version) bool fetchFolders, bool fetchItems, int sortOrder, out int version)
{ {
m_log.DebugFormat( // m_log.DebugFormat(
"[WEB FETCH INV DESC HANDLER]: Fetching folders ({0}), items ({1}) from {2} for agent {3}", // "[WEB FETCH INV DESC HANDLER]: Fetching folders ({0}), items ({1}) from {2} for agent {3}",
fetchFolders, fetchItems, folderID, agentID); // fetchFolders, fetchItems, folderID, agentID);
version = 0; version = 0;
InventoryFolderImpl fold; InventoryFolderImpl fold;
@ -220,7 +220,7 @@ namespace OpenSim.Capabilities.Handlers
} }
else else
{ {
// Lost itemsm don't really need a version // Lost items don't really need a version
version = 1; version = 1;
} }