aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2012-07-17 10:21:12 +0200
committerMelanie2012-07-17 10:21:12 +0200
commitb35f97db4658f0dd4af0ad1f56a6303d6d45d51e (patch)
treecfd8a4def4a008789161292615cd94f882288102 /OpenSim/Framework
parentFix merge artefacts (diff)
downloadopensim-SC_OLD-b35f97db4658f0dd4af0ad1f56a6303d6d45d51e.zip
opensim-SC_OLD-b35f97db4658f0dd4af0ad1f56a6303d6d45d51e.tar.gz
opensim-SC_OLD-b35f97db4658f0dd4af0ad1f56a6303d6d45d51e.tar.bz2
opensim-SC_OLD-b35f97db4658f0dd4af0ad1f56a6303d6d45d51e.tar.xz
Replace PollServiceRequestManager with older version, add extra logging to
event exceptions to see call path leading up to it.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs13
1 files changed, 6 insertions, 7 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index 3a14b6f..af40185 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -70,7 +70,6 @@ namespace OpenSim.Framework.Servers.HttpServer
70 ThreadPriority.Normal, 70 ThreadPriority.Normal,
71 false, 71 false,
72 true, 72 true,
73 null,
74 int.MaxValue); 73 int.MaxValue);
75 } 74 }
76 75
@@ -80,7 +79,6 @@ namespace OpenSim.Framework.Servers.HttpServer
80 ThreadPriority.Normal, 79 ThreadPriority.Normal,
81 false, 80 false,
82 true, 81 true,
83 null,
84 1000 * 60 * 10); 82 1000 * 60 * 10);
85 } 83 }
86 84
@@ -146,8 +144,9 @@ namespace OpenSim.Framework.Servers.HttpServer
146 foreach (object o in m_requests) 144 foreach (object o in m_requests)
147 { 145 {
148 PollServiceHttpRequest req = (PollServiceHttpRequest) o; 146 PollServiceHttpRequest req = (PollServiceHttpRequest) o;
149 PollServiceWorkerThread.DoHTTPGruntWork( 147 m_server.DoHTTPGruntWork(
150 m_server, req, req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id)); 148 req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id),
149 new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext));
151 } 150 }
152 151
153 m_requests.Clear(); 152 m_requests.Clear();
@@ -156,7 +155,6 @@ namespace OpenSim.Framework.Servers.HttpServer
156 { 155 {
157 t.Abort(); 156 t.Abort();
158 } 157 }
159
160 m_running = false; 158 m_running = false;
161 } 159 }
162 } 160 }
@@ -186,7 +184,7 @@ namespace OpenSim.Framework.Servers.HttpServer
186 private bool m_running = true; 184 private bool m_running = true;
187 private int slowCount = 0; 185 private int slowCount = 0;
188 186
189 // private int m_timeout = 250; // increase timeout 250; now use the event one 187// private int m_timeout = 1000; // increase timeout 250; now use the event one
190 188
191 public PollServiceRequestManager(BaseHttpServer pSrv, uint pWorkerThreadCount, int pTimeout) 189 public PollServiceRequestManager(BaseHttpServer pSrv, uint pWorkerThreadCount, int pTimeout)
192 { 190 {
@@ -372,7 +370,8 @@ namespace OpenSim.Framework.Servers.HttpServer
372 } 370 }
373 else 371 else
374 { 372 {
375 // if ((Environment.TickCount - req.RequestTime) > m_timeout) 373// if ((Environment.TickCount - req.RequestTime) > m_timeout)
374
376 if ((Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms) 375 if ((Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms)
377 { 376 {
378 m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id), 377 m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id),