aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcommon/llstat.h
diff options
context:
space:
mode:
authorAleric Inglewood2010-11-07 16:55:50 +0100
committerAleric Inglewood2010-11-07 18:27:48 +0100
commit5b4356cefbaa7dbdc8656e7283c110a893b1a89c (patch)
tree43fae9945562c3281746370d623877840ed884b2 /linden/indra/llcommon/llstat.h
parentIMP-688: ERROR: getString: Invalid string control nick01 (diff)
downloadmeta-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.h14
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
55class LLStatAccum 55class LL_COMMON_API LLStatAccum
56{ 56{
57protected: 57protected:
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
112class LLStatMeasure : public LLStatAccum 112class 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
127class LLStatRate : public LLStatAccum 127class 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
143class LLStatTime : public LLStatAccum 143class 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
174class LLPerfBlock 174class LL_COMMON_API LLPerfBlock
175{ 175{
176public: 176public:
177 struct StatEntry 177 struct StatEntry
@@ -213,7 +213,7 @@ private:
213 213
214// ---------------------------------------------------------------------------- 214// ----------------------------------------------------------------------------
215 215
216class LLPerfStats 216class LL_COMMON_API LLPerfStats
217{ 217{
218public: 218public:
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// ----------------------------------------------------------------------------
252class LLStat 252class LL_COMMON_API LLStat
253{ 253{
254public: 254public:
255 LLStat(const U32 num_bins = 32, BOOL use_frame_timer = FALSE); 255 LLStat(const U32 num_bins = 32, BOOL use_frame_timer = FALSE);