ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 08:06:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'avination' into careminster

Browse Source 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
This commit is contained in:
Melanie
2012-06-29 22:11:49 +01:00
parent a1a22a2f10 c87f0ac226
commit 05cf51cbbd
11 changed files with 89 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Framework/OSChatMessage.cs
View File

@@ -51,6 +51,7 @@ namespace OpenSim.Framework
protected object m_senderObject;
protected ChatTypeEnum m_type;
protected UUID m_fromID;
protected UUID m_destination = UUID.Zero;
public OSChatMessage()
{
@@ -131,6 +132,12 @@ namespace OpenSim.Framework
set { m_fromID = value; }
}
public UUID Destination
{
get { return m_destination; }
set { m_destination = value; }
}
/// <summary>
///
/// </summary>

7
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
View File

@@ -41,6 +41,7 @@ namespace OpenSim.Framework.Servers.HttpServer
private readonly BaseHttpServer m_server;
private static Queue m_requests = Queue.Synchronized(new Queue());
private static ManualResetEvent m_ev = new ManualResetEvent(false);
private uint m_WorkerThreadCount = 0;
private Thread[] m_workerThreads;
private PollServiceWorkerThread[] m_PollServiceWorkerThreads;
@@ -90,15 +91,17 @@ namespace OpenSim.Framework.Servers.HttpServer
{
lock (m_requests)
m_requests.Enqueue(req);
m_ev.Set();
}
public void ThreadStart()
{
while (m_running)
{
m_ev.WaitOne(1000);
m_ev.Reset();
Watchdog.UpdateThread();
ProcessQueuedRequests();
Thread.Sleep(1000);
}
}
@@ -154,4 +157,4 @@ namespace OpenSim.Framework.Servers.HttpServer
m_running = false;
}
}
}
}

13
OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
View File

@@ -89,8 +89,15 @@ namespace OpenSim.Framework.Servers.HttpServer
continue;
}
Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id, str.ReadToEnd());
DoHTTPGruntWork(m_server, req, responsedata);
try
{
Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id, str.ReadToEnd());
DoHTTPGruntWork(m_server, req, responsedata);
}
catch (ObjectDisposedException) // Browser aborted before we could read body, server closed the stream
{
// Ignore it, no need to reply
}
}
else
{
@@ -161,4 +168,4 @@ namespace OpenSim.Framework.Servers.HttpServer
}
}
}
}
}