diff options
author | Justin Clark-Casey (justincc) | 2011-10-25 23:26:21 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-10-25 23:26:21 +0100 |
commit | c275c229281c9a7113659457a310da775f26ec43 (patch) | |
tree | 0d78d4dd2c44f262957bbb4a0a603806f3839f21 /OpenSim/Framework/Watchdog.cs | |
parent | In Watchdog, add ability to specific timeout for a thread. (diff) | |
download | opensim-SC_OLD-c275c229281c9a7113659457a310da775f26ec43.zip opensim-SC_OLD-c275c229281c9a7113659457a310da775f26ec43.tar.gz opensim-SC_OLD-c275c229281c9a7113659457a310da775f26ec43.tar.bz2 opensim-SC_OLD-c275c229281c9a7113659457a310da775f26ec43.tar.xz |
Restart the event queue worker threads that I accidentally disabled earlier today in 8a0a78c.
Also adds these to the watchdogs with very large timeouts (should really be infinite)
Diffstat (limited to 'OpenSim/Framework/Watchdog.cs')
-rw-r--r-- | OpenSim/Framework/Watchdog.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Watchdog.cs b/OpenSim/Framework/Watchdog.cs index 1374518..5ffa890 100644 --- a/OpenSim/Framework/Watchdog.cs +++ b/OpenSim/Framework/Watchdog.cs | |||
@@ -51,7 +51,7 @@ namespace OpenSim.Framework | |||
51 | public int LastTick { get; set; } | 51 | public int LastTick { get; set; } |
52 | 52 | ||
53 | /// <summary> | 53 | /// <summary> |
54 | /// Number of seconds before we notify that the thread is having a problem. | 54 | /// Number of milliseconds before we notify that the thread is having a problem. |
55 | /// </summary> | 55 | /// </summary> |
56 | public int Timeout { get; set; } | 56 | public int Timeout { get; set; } |
57 | 57 | ||
@@ -116,7 +116,7 @@ namespace OpenSim.Framework | |||
116 | /// <param name="isBackground">True to run this thread as a background | 116 | /// <param name="isBackground">True to run this thread as a background |
117 | /// thread, otherwise false</param> | 117 | /// thread, otherwise false</param> |
118 | /// <param name="timeout"> | 118 | /// <param name="timeout"> |
119 | /// Number of seconds to wait until we issue a warning about timeout. | 119 | /// Number of milliseconds to wait until we issue a warning about timeout. |
120 | /// </para> | 120 | /// </para> |
121 | /// <returns>The newly created Thread object</returns> | 121 | /// <returns>The newly created Thread object</returns> |
122 | public static Thread StartThread( | 122 | public static Thread StartThread( |