ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-14 18:55:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

test: change http send control to a main pool thread

Browse Source
This commit is contained in:
UbitUmarov
2020-12-29 23:53:09 +00:00
parent 3be98bdb35
commit d6747f872d
2 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
OpenSim/Framework/Servers/HttpServer/OSHttpServer/ContextTimeoutManager.cs
View File

@@ -72,23 +72,42 @@ namespace OSHttpServer
if (m_internalThread != null)
return;
m_lastTimeOutCheckTime = GetTimeStampMS();
m_internalThread = new Thread(ThreadRunProcess);
m_internalThread.Priority = ThreadPriority.Normal;
m_internalThread.IsBackground = true;
m_internalThread.CurrentCulture = new CultureInfo("en-US", false);
m_internalThread.Name = "HttpServerMain";
m_internalThread.Start();
Task.Factory.StartNew(() =>
{
while (!m_shuttingDown)
{
m_processWaitEven.WaitOne(500);
if (m_shuttingDown)
return;
double now = GetTimeStamp();
if (m_contexts.Count > 0)
{
ProcessSendQueues(now);
if (now - m_lastTimeOutCheckTime > 1.0)
{
ProcessContextTimeouts();
m_lastTimeOutCheckTime = now;
}
}
else
m_lastTimeOutCheckTime = now;
}
ProcessShutDown();
}, TaskCreationOptions.LongRunning);
}
}
public static void Stop()
{
m_shuttingDown = true;
m_internalThread.Join();
ProcessShutDown();
m_processWaitEven.Set();
//m_internalThread.Join();
//ProcessShutDown();
}
/*
private static void ThreadRunProcess()
{
while (!m_shuttingDown)
@@ -113,7 +132,7 @@ namespace OSHttpServer
m_lastTimeOutCheckTime = now;
}
}
*/
public static void ProcessShutDown()
{
try

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@@ -6011,4 +6011,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return 1;
}
}
}
}