aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Watchdog.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-11-15 23:24:51 +0000
committerJustin Clark-Casey (justincc)2011-11-15 23:24:51 +0000
commitaea547cd11e4baa24cad12e13160e5ff2250a69f (patch)
tree952386c40f3c794e1a7dea8d7c8a6564f941e618 /OpenSim/Framework/Watchdog.cs
parentDo proper locking of UserManagementModule.m_UserCache when getting. (diff)
downloadopensim-SC_OLD-aea547cd11e4baa24cad12e13160e5ff2250a69f.zip
opensim-SC_OLD-aea547cd11e4baa24cad12e13160e5ff2250a69f.tar.gz
opensim-SC_OLD-aea547cd11e4baa24cad12e13160e5ff2250a69f.tar.bz2
opensim-SC_OLD-aea547cd11e4baa24cad12e13160e5ff2250a69f.tar.xz
fix build break on UserManagementModule.
This also adds time since started to "show threads". Unfortunately these two changes got mixed in.
Diffstat (limited to 'OpenSim/Framework/Watchdog.cs')
-rw-r--r--OpenSim/Framework/Watchdog.cs11
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Framework/Watchdog.cs b/OpenSim/Framework/Watchdog.cs
index 0ee0c5b..2dd6ebe 100644
--- a/OpenSim/Framework/Watchdog.cs
+++ b/OpenSim/Framework/Watchdog.cs
@@ -52,10 +52,13 @@ namespace OpenSim.Framework
52 /// <summary> 52 /// <summary>
53 /// Approximate tick when this thread was started. 53 /// Approximate tick when this thread was started.
54 /// </summary> 54 /// </summary>
55 public int StartTick { get; private set; } 55 /// <remarks>
56 /// Not terribly good since this quickly wraps around.
57 /// </remarks>
58 public int FirstTick { get; private set; }
56 59
57 /// <summary> 60 /// <summary>
58 /// Last time this heartbeat update was invoked 61 /// First time this heartbeat update was invoked
59 /// </summary> 62 /// </summary>
60 public int LastTick { get; set; } 63 public int LastTick { get; set; }
61 64
@@ -73,8 +76,8 @@ namespace OpenSim.Framework
73 { 76 {
74 Thread = thread; 77 Thread = thread;
75 Timeout = timeout; 78 Timeout = timeout;
76 StartTick = Environment.TickCount & Int32.MaxValue; 79 FirstTick = Environment.TickCount & Int32.MaxValue;
77 LastTick = StartTick; 80 LastTick = FirstTick;
78 } 81 }
79 } 82 }
80 83