diff options
author | Justin Clark-Casey (justincc) | 2014-08-09 00:52:51 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-08-09 00:52:51 +0100 |
commit | 8738445eb70321e728c845b5095817b67aaca35b (patch) | |
tree | 1fcdf9e7432a4c5fb9e9777a1a1760862b198ea5 /OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs | |
parent | Change RootRotationUpdateTolerance from 0.01 to 0.1 in code as well. (diff) | |
download | opensim-SC_OLD-8738445eb70321e728c845b5095817b67aaca35b.zip opensim-SC_OLD-8738445eb70321e728c845b5095817b67aaca35b.tar.gz opensim-SC_OLD-8738445eb70321e728c845b5095817b67aaca35b.tar.bz2 opensim-SC_OLD-8738445eb70321e728c845b5095817b67aaca35b.tar.xz |
Move the inventory request lock introduced in git master a58152bd to HGInventoryBroker to preserve that behaviour there but allow 2 simultaneous inv requests (chiefly WebFetch) rather than 1
This lock serialized all requests and made the inventory throttling in WebFetch redundant.
By moving this lock, two simultaneous requests may now take place which may help with http://opensimulator.org/mantis/view.php?id=7054
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs index 93f9d48..574de89 100644 --- a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs | |||
@@ -62,8 +62,6 @@ namespace OpenSim.Services.Connectors | |||
62 | /// </remarks> | 62 | /// </remarks> |
63 | private int m_requestTimeoutSecs = -1; | 63 | private int m_requestTimeoutSecs = -1; |
64 | 64 | ||
65 | private object m_Lock = new object(); | ||
66 | |||
67 | public XInventoryServicesConnector() | 65 | public XInventoryServicesConnector() |
68 | { | 66 | { |
69 | } | 67 | } |
@@ -533,11 +531,10 @@ namespace OpenSim.Services.Connectors | |||
533 | 531 | ||
534 | RequestsMade++; | 532 | RequestsMade++; |
535 | 533 | ||
536 | string reply = string.Empty; | 534 | string reply |
537 | lock (m_Lock) | 535 | = SynchronousRestFormsRequester.MakeRequest( |
538 | reply = SynchronousRestFormsRequester.MakeRequest("POST", | 536 | "POST", m_ServerURI + "/xinventory", |
539 | m_ServerURI + "/xinventory", | 537 | ServerUtils.BuildQueryString(sendData), m_requestTimeoutSecs, m_Auth); |
540 | ServerUtils.BuildQueryString(sendData), m_requestTimeoutSecs, m_Auth); | ||
541 | 538 | ||
542 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse( | 539 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse( |
543 | reply); | 540 | reply); |