diff options
author | BlueWall | 2014-09-17 18:11:41 -0400 |
---|---|---|
committer | BlueWall | 2014-09-17 18:11:41 -0400 |
commit | 376fab140227e92dbd841436509a97b87c9e7792 (patch) | |
tree | f9c7151984ed47ad8eac25a72f7bac3fa6ea22ae /OpenSim/Framework/Servers/HttpServer | |
parent | Small changes to threading to send thread names to unmanaged threads. Needs M... (diff) | |
download | opensim-SC-376fab140227e92dbd841436509a97b87c9e7792.zip opensim-SC-376fab140227e92dbd841436509a97b87c9e7792.tar.gz opensim-SC-376fab140227e92dbd841436509a97b87c9e7792.tar.bz2 opensim-SC-376fab140227e92dbd841436509a97b87c9e7792.tar.xz |
Revert "Small changes to threading to send thread names to unmanaged threads. Needs Mono 3.6+ to see thread names in utilities like top -H . Some formatting of the thread name to fin in the 16 byte limit on Linux. Please test on Windows to see if the work has any adverse effects."
This reverts commit af286d5fcb688e8b64202b6deca4f249e9a2b6b8.
Issue with Jenkins builds
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/OSHttpRequestPump.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/OSHttpServer.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpRequestPump.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpRequestPump.cs index bdea278..77cfb7e 100644 --- a/OpenSim/Framework/Servers/HttpServer/OSHttpRequestPump.cs +++ b/OpenSim/Framework/Servers/HttpServer/OSHttpRequestPump.cs | |||
@@ -70,9 +70,9 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
70 | _id = id; | 70 | _id = id; |
71 | 71 | ||
72 | _engine = new Thread(new ThreadStart(Engine)); | 72 | _engine = new Thread(new ThreadStart(Engine)); |
73 | _engine.Name = EngineID; | ||
73 | _engine.IsBackground = true; | 74 | _engine.IsBackground = true; |
74 | _engine.Start(); | 75 | _engine.Start(); |
75 | _engine.Name = string.Format ("Engine:{0}",EngineID); | ||
76 | 76 | ||
77 | ThreadTracker.Add(_engine); | 77 | ThreadTracker.Add(_engine); |
78 | } | 78 | } |
@@ -91,9 +91,9 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
91 | public void Start() | 91 | public void Start() |
92 | { | 92 | { |
93 | _engine = new Thread(new ThreadStart(Engine)); | 93 | _engine = new Thread(new ThreadStart(Engine)); |
94 | _engine.Name = EngineID; | ||
94 | _engine.IsBackground = true; | 95 | _engine.IsBackground = true; |
95 | _engine.Start(); | 96 | _engine.Start(); |
96 | _engine.Name = string.Format ("Engine:{0}",EngineID); | ||
97 | 97 | ||
98 | ThreadTracker.Add(_engine); | 98 | ThreadTracker.Add(_engine); |
99 | } | 99 | } |
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpServer.cs index cd62842..84aa31b 100644 --- a/OpenSim/Framework/Servers/HttpServer/OSHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/OSHttpServer.cs | |||
@@ -150,9 +150,9 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
150 | public void Start() | 150 | public void Start() |
151 | { | 151 | { |
152 | _engine = new Thread(new ThreadStart(Engine)); | 152 | _engine = new Thread(new ThreadStart(Engine)); |
153 | _engine.Name = _engineId; | ||
153 | _engine.IsBackground = true; | 154 | _engine.IsBackground = true; |
154 | _engine.Start(); | 155 | _engine.Start(); |
155 | _engine.Name = string.Format ("Engine:{0}",_engineId); | ||
156 | 156 | ||
157 | ThreadTracker.Add(_engine); | 157 | ThreadTracker.Add(_engine); |
158 | 158 | ||