diff options
author | Tedd Hansen | 2008-02-19 12:02:53 +0000 |
---|---|---|
committer | Tedd Hansen | 2008-02-19 12:02:53 +0000 |
commit | 47c909ca0af6e39a55b38db74df49c7629b552b9 (patch) | |
tree | aba1d85ff2f447b69d02de84950ecd39baef0438 | |
parent | *rawfile fix. (diff) | |
download | opensim-SC_OLD-47c909ca0af6e39a55b38db74df49c7629b552b9.zip opensim-SC_OLD-47c909ca0af6e39a55b38db74df49c7629b552b9.tar.gz opensim-SC_OLD-47c909ca0af6e39a55b38db74df49c7629b552b9.tar.bz2 opensim-SC_OLD-47c909ca0af6e39a55b38db74df49c7629b552b9.tar.xz |
Playing "Name that thread". Adding names and isbackground=true to all threads so it will be easier to debug.
9 files changed, 28 insertions, 7 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index effaa82..b793b62 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs | |||
@@ -143,6 +143,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
143 | 143 | ||
144 | 144 | ||
145 | m_assetCacheThread = new Thread(new ThreadStart(RunAssetManager)); | 145 | m_assetCacheThread = new Thread(new ThreadStart(RunAssetManager)); |
146 | m_assetCacheThread.Name = "AssetCacheThread"; | ||
146 | m_assetCacheThread.IsBackground = true; | 147 | m_assetCacheThread.IsBackground = true; |
147 | m_assetCacheThread.Start(); | 148 | m_assetCacheThread.Start(); |
148 | } | 149 | } |
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs index 6820027..9d9bc1e 100644 --- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs +++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs | |||
@@ -97,6 +97,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
97 | m_assetRequests = new BlockingQueue<AssetRequest>(); | 97 | m_assetRequests = new BlockingQueue<AssetRequest>(); |
98 | 98 | ||
99 | m_localAssetServerThread = new Thread(RunRequests); | 99 | m_localAssetServerThread = new Thread(RunRequests); |
100 | m_localAssetServerThread.Name = "LocalAssetServerThread"; | ||
100 | m_localAssetServerThread.IsBackground = true; | 101 | m_localAssetServerThread.IsBackground = true; |
101 | m_localAssetServerThread.Start(); | 102 | m_localAssetServerThread.Start(); |
102 | } | 103 | } |
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index 7f9e1a1..2966349 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs | |||
@@ -531,6 +531,7 @@ namespace OpenSim.Framework.Servers | |||
531 | m_log.Info("[HTTPD]: Starting up HTTP Server"); | 531 | m_log.Info("[HTTPD]: Starting up HTTP Server"); |
532 | 532 | ||
533 | m_workerThread = new Thread(new ThreadStart(StartHTTP)); | 533 | m_workerThread = new Thread(new ThreadStart(StartHTTP)); |
534 | m_workerThread.Name = "HttpThread"; | ||
534 | m_workerThread.IsBackground = true; | 535 | m_workerThread.IsBackground = true; |
535 | m_workerThread.Start(); | 536 | m_workerThread.Start(); |
536 | } | 537 | } |
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs index 524b8c4..cdddcc2 100644 --- a/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs +++ b/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs | |||
@@ -58,7 +58,7 @@ namespace OpenSim.Grid.ScriptServer | |||
58 | // Start listener | 58 | // Start listener |
59 | Stop(); | 59 | Stop(); |
60 | listenThread = new Thread(ListenThreadLoop); | 60 | listenThread = new Thread(ListenThreadLoop); |
61 | listenThread.Name = "listenThread"; | 61 | listenThread.Name = "ListenThread"; |
62 | listenThread.IsBackground = true; | 62 | listenThread.IsBackground = true; |
63 | listenThread.Start(); | 63 | listenThread.Start(); |
64 | } | 64 | } |
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index bc271dc..c59106f 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -181,7 +181,7 @@ namespace OpenSim | |||
181 | config.Set("storage_prim_inventories", true); | 181 | config.Set("storage_prim_inventories", true); |
182 | config.Set("startup_console_commands_file", String.Empty); | 182 | config.Set("startup_console_commands_file", String.Empty); |
183 | config.Set("shutdown_console_commands_file", String.Empty); | 183 | config.Set("shutdown_console_commands_file", String.Empty); |
184 | config.Set("script_engine", ""); | 184 | config.Set("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"); |
185 | config.Set("asset_database", "sqlite"); | 185 | config.Set("asset_database", "sqlite"); |
186 | } | 186 | } |
187 | 187 | ||
@@ -264,8 +264,7 @@ namespace OpenSim | |||
264 | m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", String.Empty); | 264 | m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", String.Empty); |
265 | m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", String.Empty); | 265 | m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", String.Empty); |
266 | 266 | ||
267 | m_scriptEngine = startupConfig.GetString("script_engine", ""); | 267 | m_scriptEngine = startupConfig.GetString("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"); |
268 | |||
269 | m_assetStorage = startupConfig.GetString("asset_database", "sqlite"); | 268 | m_assetStorage = startupConfig.GetString("asset_database", "sqlite"); |
270 | 269 | ||
271 | m_timedScript = startupConfig.GetString("timer_Script", "disabled"); | 270 | m_timedScript = startupConfig.GetString("timer_Script", "disabled"); |
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index 388a502..dfdc777 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs | |||
@@ -225,6 +225,7 @@ namespace OpenSim.Region.ClientStack | |||
225 | RegisterLocalPacketHandlers(); | 225 | RegisterLocalPacketHandlers(); |
226 | 226 | ||
227 | m_clientThread = new Thread(new ThreadStart(AuthUser)); | 227 | m_clientThread = new Thread(new ThreadStart(AuthUser)); |
228 | m_clientThread.Name = "ClientThread"; | ||
228 | m_clientThread.IsBackground = true; | 229 | m_clientThread.IsBackground = true; |
229 | m_clientThread.Start(); | 230 | m_clientThread.Start(); |
230 | } | 231 | } |
diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs index a34bd96..c6aae73 100644 --- a/OpenSim/Region/Environment/Modules/ChatModule.cs +++ b/OpenSim/Region/Environment/Modules/ChatModule.cs | |||
@@ -92,7 +92,11 @@ namespace OpenSim.Region.Environment.Modules | |||
92 | 92 | ||
93 | // setup IRC Relay | 93 | // setup IRC Relay |
94 | if (m_irc == null) { m_irc = new IRCChatModule(config); } | 94 | if (m_irc == null) { m_irc = new IRCChatModule(config); } |
95 | if (m_irc_connector == null) { m_irc_connector = new Thread(IRCConnectRun); } | 95 | if (m_irc_connector == null) { |
96 | m_irc_connector = new Thread(IRCConnectRun); | ||
97 | m_irc_connector.Name = "IRCConnectorThread"; | ||
98 | m_irc_connector.IsBackground = true; | ||
99 | } | ||
96 | 100 | ||
97 | } | 101 | } |
98 | } | 102 | } |
@@ -104,7 +108,11 @@ namespace OpenSim.Region.Environment.Modules | |||
104 | try | 108 | try |
105 | { | 109 | { |
106 | //m_irc.Connect(m_scenes); | 110 | //m_irc.Connect(m_scenes); |
107 | if (m_irc_connector == null) { m_irc_connector = new Thread(IRCConnectRun); } | 111 | if (m_irc_connector == null) { |
112 | m_irc_connector = new Thread(IRCConnectRun); | ||
113 | m_irc_connector.Name = "IRCConnectorThread"; | ||
114 | m_irc_connector.IsBackground = true; | ||
115 | } | ||
108 | if (!m_irc_connector.IsAlive) { m_irc_connector.Start(); } | 116 | if (!m_irc_connector.IsAlive) { m_irc_connector.Start(); } |
109 | } | 117 | } |
110 | catch (Exception ex) | 118 | catch (Exception ex) |
@@ -248,7 +256,10 @@ namespace OpenSim.Region.Environment.Modules | |||
248 | // In a non-blocking way. Eventually the connector will get it started | 256 | // In a non-blocking way. Eventually the connector will get it started |
249 | try | 257 | try |
250 | { | 258 | { |
251 | if (m_irc_connector == null) { m_irc_connector = new Thread(IRCConnectRun); } | 259 | if (m_irc_connector == null) { m_irc_connector = new Thread(IRCConnectRun); |
260 | m_irc_connector.Name = "IRCConnectorThread"; | ||
261 | m_irc_connector.IsBackground = true; | ||
262 | } | ||
252 | if (!m_irc_connector.IsAlive) { m_irc_connector.Start(); } | 263 | if (!m_irc_connector.IsAlive) { m_irc_connector.Start(); } |
253 | } | 264 | } |
254 | catch (Exception ex) | 265 | catch (Exception ex) |
@@ -407,9 +418,13 @@ namespace OpenSim.Region.Environment.Modules | |||
407 | m_writer = new StreamWriter(m_stream); | 418 | m_writer = new StreamWriter(m_stream); |
408 | 419 | ||
409 | pingSender = new Thread(new ThreadStart(PingRun)); | 420 | pingSender = new Thread(new ThreadStart(PingRun)); |
421 | pingSender.Name = "PingSenderThread"; | ||
422 | pingSender.IsBackground = true; | ||
410 | pingSender.Start(); | 423 | pingSender.Start(); |
411 | 424 | ||
412 | listener = new Thread(new ThreadStart(ListenerRun)); | 425 | listener = new Thread(new ThreadStart(ListenerRun)); |
426 | listener.Name = "IRCChatModuleListenerThread"; | ||
427 | listener.IsBackground = true; | ||
413 | listener.Start(); | 428 | listener.Start(); |
414 | 429 | ||
415 | m_writer.WriteLine(m_user); | 430 | m_writer.WriteLine(m_user); |
diff --git a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs index cf558e0..ff2d418 100644 --- a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs +++ b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs | |||
@@ -66,6 +66,7 @@ namespace OpenSim.Region.Environment.Modules | |||
66 | { | 66 | { |
67 | //Console.WriteLine("Creating Texture download module"); | 67 | //Console.WriteLine("Creating Texture download module"); |
68 | m_thread = new Thread(new ThreadStart(ProcessTextureSenders)); | 68 | m_thread = new Thread(new ThreadStart(ProcessTextureSenders)); |
69 | m_thread.Name = "ProcessTextureSenderThread"; | ||
69 | m_thread.IsBackground = true; | 70 | m_thread.IsBackground = true; |
70 | m_thread.Start(); | 71 | m_thread.Start(); |
71 | } | 72 | } |
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs index 0c7fa4e..1dc1dc1 100644 --- a/OpenSim/Tools/pCampBot/BotManager.cs +++ b/OpenSim/Tools/pCampBot/BotManager.cs | |||
@@ -114,6 +114,8 @@ namespace pCampBot | |||
114 | if (cs.GetString("lastname", "random") == "random") pb.lastname = CreateRandomName(); | 114 | if (cs.GetString("lastname", "random") == "random") pb.lastname = CreateRandomName(); |
115 | 115 | ||
116 | m_td[pos] = new Thread(pb.startup); | 116 | m_td[pos] = new Thread(pb.startup); |
117 | m_td[pos].Name = "CampBot_" + pos; | ||
118 | m_td[pos].IsBackground = true; | ||
117 | m_td[pos].Start(); | 119 | m_td[pos].Start(); |
118 | m_lBot.Add(pb); | 120 | m_lBot.Add(pb); |
119 | } | 121 | } |