diff options
author | Aleric Inglewood | 2010-11-07 16:55:50 +0100 |
---|---|---|
committer | Aleric Inglewood | 2010-11-07 18:27:48 +0100 |
commit | 5b4356cefbaa7dbdc8656e7283c110a893b1a89c (patch) | |
tree | 43fae9945562c3281746370d623877840ed884b2 /linden/indra/llcommon/llstat.h | |
parent | IMP-688: ERROR: getString: Invalid string control nick01 (diff) | |
download | meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.zip meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.gz meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.bz2 meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.xz |
IMP-692: SNOW-713: Global objects in libllcommon duplicated in plugins
See http://jira.secondlife.com/browse/SNOW-713
This patch makes llcommon shared. It contains the following snowglobe
(SVN) changesets: 3478, 3479, 3480, 3481, 3482, 3485, 3496, 3498, 3500,
3519 and 3531, plus the fix for all rejects. Note that changes
to scripts/automated_build_scripts/opensrc-build.sh (changesets 3500
and 3625) were ignored as we don't have scripts/automated_build_scripts.
Diffstat (limited to 'linden/indra/llcommon/llstat.h')
-rw-r--r-- | linden/indra/llcommon/llstat.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/linden/indra/llcommon/llstat.h b/linden/indra/llcommon/llstat.h index 66521a3..951091b 100644 --- a/linden/indra/llcommon/llstat.h +++ b/linden/indra/llcommon/llstat.h | |||
@@ -52,7 +52,7 @@ class LLSD; | |||
52 | // amounts of time with very low memory cost. | 52 | // amounts of time with very low memory cost. |
53 | // | 53 | // |
54 | 54 | ||
55 | class LLStatAccum | 55 | class LL_COMMON_API LLStatAccum |
56 | { | 56 | { |
57 | protected: | 57 | protected: |
58 | LLStatAccum(bool use_frame_timer); | 58 | LLStatAccum(bool use_frame_timer); |
@@ -109,7 +109,7 @@ public: | |||
109 | F64 mLastSampleValue; | 109 | F64 mLastSampleValue; |
110 | }; | 110 | }; |
111 | 111 | ||
112 | class LLStatMeasure : public LLStatAccum | 112 | class LL_COMMON_API LLStatMeasure : public LLStatAccum |
113 | // gathers statistics about things that are measured | 113 | // gathers statistics about things that are measured |
114 | // ex.: tempature, time dilation | 114 | // ex.: tempature, time dilation |
115 | { | 115 | { |
@@ -124,7 +124,7 @@ public: | |||
124 | }; | 124 | }; |
125 | 125 | ||
126 | 126 | ||
127 | class LLStatRate : public LLStatAccum | 127 | class LL_COMMON_API LLStatRate : public LLStatAccum |
128 | // gathers statistics about things that can be counted over time | 128 | // gathers statistics about things that can be counted over time |
129 | // ex.: LSL instructions executed, messages sent, simulator frames completed | 129 | // ex.: LSL instructions executed, messages sent, simulator frames completed |
130 | // renders it in terms of rate of thing per second | 130 | // renders it in terms of rate of thing per second |
@@ -140,7 +140,7 @@ public: | |||
140 | }; | 140 | }; |
141 | 141 | ||
142 | 142 | ||
143 | class LLStatTime : public LLStatAccum | 143 | class LL_COMMON_API LLStatTime : public LLStatAccum |
144 | // gathers statistics about time spent in a block of code | 144 | // gathers statistics about time spent in a block of code |
145 | // measure average duration per second in the block | 145 | // measure average duration per second in the block |
146 | { | 146 | { |
@@ -171,7 +171,7 @@ private: | |||
171 | 171 | ||
172 | 172 | ||
173 | // Use this class on the stack to record statistics about an area of code | 173 | // Use this class on the stack to record statistics about an area of code |
174 | class LLPerfBlock | 174 | class LL_COMMON_API LLPerfBlock |
175 | { | 175 | { |
176 | public: | 176 | public: |
177 | struct StatEntry | 177 | struct StatEntry |
@@ -213,7 +213,7 @@ private: | |||
213 | 213 | ||
214 | // ---------------------------------------------------------------------------- | 214 | // ---------------------------------------------------------------------------- |
215 | 215 | ||
216 | class LLPerfStats | 216 | class LL_COMMON_API LLPerfStats |
217 | { | 217 | { |
218 | public: | 218 | public: |
219 | LLPerfStats(const std::string& process_name = "unknown", S32 process_pid = 0); | 219 | LLPerfStats(const std::string& process_name = "unknown", S32 process_pid = 0); |
@@ -249,7 +249,7 @@ private: | |||
249 | }; | 249 | }; |
250 | 250 | ||
251 | // ---------------------------------------------------------------------------- | 251 | // ---------------------------------------------------------------------------- |
252 | class LLStat | 252 | class LL_COMMON_API LLStat |
253 | { | 253 | { |
254 | public: | 254 | public: |
255 | LLStat(const U32 num_bins = 32, BOOL use_frame_timer = FALSE); | 255 | LLStat(const U32 num_bins = 32, BOOL use_frame_timer = FALSE); |