aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorTedd Hansen2008-02-21 10:43:24 +0000
committerTedd Hansen2008-02-21 10:43:24 +0000
commit7102ac77698f4bfd7406d6e8871db7b006c2cae2 (patch)
tree7253775d1a6ae64e2469b1ef79863aaebe83e1d1 /OpenSim/Region/Environment
parentRemove a couple compiler warnings. (diff)
downloadopensim-SC_OLD-7102ac77698f4bfd7406d6e8871db7b006c2cae2.zip
opensim-SC_OLD-7102ac77698f4bfd7406d6e8871db7b006c2cae2.tar.gz
opensim-SC_OLD-7102ac77698f4bfd7406d6e8871db7b006c2cae2.tar.bz2
opensim-SC_OLD-7102ac77698f4bfd7406d6e8871db7b006c2cae2.tar.xz
"threads" command now works. I've added manual tracking of threads (only if compiled in DEBUG mode)... Its ugly and even requires a separate thread to track the treads, but it will be very valuable in debugging.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/ChatModule.cs12
-rw-r--r--OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs1
-rw-r--r--OpenSim/Region/Environment/Modules/TextureDownloadModule.cs1
-rw-r--r--OpenSim/Region/Environment/Modules/XMLRPCModule.cs1
4 files changed, 13 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs
index 0510ad6..c146941 100644
--- a/OpenSim/Region/Environment/Modules/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/ChatModule.cs
@@ -113,7 +113,10 @@ namespace OpenSim.Region.Environment.Modules
113 m_irc_connector.Name = "IRCConnectorThread"; 113 m_irc_connector.Name = "IRCConnectorThread";
114 m_irc_connector.IsBackground = true; 114 m_irc_connector.IsBackground = true;
115 } 115 }
116 if (!m_irc_connector.IsAlive) { m_irc_connector.Start(); } 116 if (!m_irc_connector.IsAlive) {
117 m_irc_connector.Start();
118 OpenSim.Framework.ThreadTracker.Add(m_irc_connector);
119 }
117 } 120 }
118 catch (Exception ex) 121 catch (Exception ex)
119 { 122 {
@@ -260,7 +263,10 @@ namespace OpenSim.Region.Environment.Modules
260 m_irc_connector.Name = "IRCConnectorThread"; 263 m_irc_connector.Name = "IRCConnectorThread";
261 m_irc_connector.IsBackground = true; 264 m_irc_connector.IsBackground = true;
262 } 265 }
263 if (!m_irc_connector.IsAlive) { m_irc_connector.Start(); } 266 if (!m_irc_connector.IsAlive) {
267 m_irc_connector.Start();
268 OpenSim.Framework.ThreadTracker.Add(m_irc_connector);
269 }
264 } 270 }
265 catch (Exception ex) 271 catch (Exception ex)
266 { 272 {
@@ -421,11 +427,13 @@ namespace OpenSim.Region.Environment.Modules
421 pingSender.Name = "PingSenderThread"; 427 pingSender.Name = "PingSenderThread";
422 pingSender.IsBackground = true; 428 pingSender.IsBackground = true;
423 pingSender.Start(); 429 pingSender.Start();
430 OpenSim.Framework.ThreadTracker.Add(pingSender);
424 431
425 listener = new Thread(new ThreadStart(ListenerRun)); 432 listener = new Thread(new ThreadStart(ListenerRun));
426 listener.Name = "IRCChatModuleListenerThread"; 433 listener.Name = "IRCChatModuleListenerThread";
427 listener.IsBackground = true; 434 listener.IsBackground = true;
428 listener.Start(); 435 listener.Start();
436 OpenSim.Framework.ThreadTracker.Add(listener);
429 437
430 m_writer.WriteLine(m_user); 438 m_writer.WriteLine(m_user);
431 m_writer.Flush(); 439 m_writer.Flush();
diff --git a/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs b/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs
index 47dd250..54a3bc0 100644
--- a/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs
@@ -287,6 +287,7 @@ namespace OpenSim.Region.Environment.Modules
287 httpThread.IsBackground = true; 287 httpThread.IsBackground = true;
288 finished = false; 288 finished = false;
289 httpThread.Start(); 289 httpThread.Start();
290 OpenSim.Framework.ThreadTracker.Add(httpThread);
290 } 291 }
291 292
292 /* 293 /*
diff --git a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
index ecf44a6..c773f9e 100644
--- a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
@@ -75,6 +75,7 @@ namespace OpenSim.Region.Environment.Modules
75 m_thread.Name = "ProcessTextureSenderThread"; 75 m_thread.Name = "ProcessTextureSenderThread";
76 m_thread.IsBackground = true; 76 m_thread.IsBackground = true;
77 m_thread.Start(); 77 m_thread.Start();
78 OpenSim.Framework.ThreadTracker.Add(m_thread);
78 } 79 }
79 80
80 if (!m_scenes.Contains(scene)) 81 if (!m_scenes.Contains(scene))
diff --git a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
index 3cdb576..6294a49 100644
--- a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
+++ b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
@@ -584,6 +584,7 @@ namespace OpenSim.Region.Environment.Modules
584 httpThread.IsBackground = true; 584 httpThread.IsBackground = true;
585 finished = false; 585 finished = false;
586 httpThread.Start(); 586 httpThread.Start();
587 OpenSim.Framework.ThreadTracker.Add(httpThread);
587 588
588 return reqID; 589 return reqID;
589 590