aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/WebUtil.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-08-05 23:44:48 +0100
committerJustin Clark-Casey (justincc)2013-08-05 23:44:48 +0100
commit9bcf07279513294d58c3076e7d8a6eb5ee64c759 (patch)
tree97a5a1c77382461d840315c9f016008d0e13817c /OpenSim/Framework/WebUtil.cs
parentFor LLImageManagerTests, make tests execute under synchronous fire and forget... (diff)
downloadopensim-SC_OLD-9bcf07279513294d58c3076e7d8a6eb5ee64c759.zip
opensim-SC_OLD-9bcf07279513294d58c3076e7d8a6eb5ee64c759.tar.gz
opensim-SC_OLD-9bcf07279513294d58c3076e7d8a6eb5ee64c759.tar.bz2
opensim-SC_OLD-9bcf07279513294d58c3076e7d8a6eb5ee64c759.tar.xz
Make it possible to switch whether we serialize osd requests per endpoint or not, either via config (SerializeOSDRequests in [Network]) or via the "debug comms set" console command.
For debug purposes to assess what impact this has on network response in a heavy test environment.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/WebUtil.cs20
1 files changed, 16 insertions, 4 deletions
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 0e9de59..706b33f 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -67,6 +67,11 @@ namespace OpenSim.Framework
67 public static int RequestNumber { get; internal set; } 67 public static int RequestNumber { get; internal set; }
68 68
69 /// <summary> 69 /// <summary>
70 /// Control where OSD requests should be serialized per endpoint.
71 /// </summary>
72 public static bool SerializeOSDRequestsPerEndpoint { get; set; }
73
74 /// <summary>
70 /// this is the header field used to communicate the local request id 75 /// this is the header field used to communicate the local request id
71 /// used for performance and debugging 76 /// used for performance and debugging
72 /// </summary> 77 /// </summary>
@@ -145,10 +150,17 @@ namespace OpenSim.Framework
145 150
146 public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout, bool compressed) 151 public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout, bool compressed)
147 { 152 {
148 //lock (EndPointLock(url)) 153 if (SerializeOSDRequestsPerEndpoint)
149 //{ 154 {
150 return ServiceOSDRequestWorker(url,data,method,timeout,compressed); 155 lock (EndPointLock(url))
151 //} 156 {
157 return ServiceOSDRequestWorker(url, data, method, timeout, compressed);
158 }
159 }
160 else
161 {
162 return ServiceOSDRequestWorker(url, data, method, timeout, compressed);
163 }
152 } 164 }
153 165
154 public static void LogOutgoingDetail(Stream outputStream) 166 public static void LogOutgoingDetail(Stream outputStream)