Changeset 29ff7e1 in nscp

Timestamp:

08/07/12 23:29:55 (11 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.1, 0.4.2

Children:

a35c3b3, ca3e815

Parents:

fff754b

Message:

• Fixed issue with performance data overflowing 32-bit integers (#550)
• Fixed issue with CheckUptime? and time rendering being wrong (#549)

Files:

• changelog (modified) (1 diff)
• include/checkHelpers.hpp (modified) (6 diffs)
• include/strEx.h (modified) (1 diff)
• service/NSClient++.cpp (modified) (1 diff)
• version.txt (modified) (1 diff)

changelog

@@ -5 +5 @@
  * Fix RtlStringFromGUID problem on NT4
 
+2012-08-07 MickeM
+ * Fixed issue with perfoamnce data overflowing 32-bit integers (#550)
+ * Fixed issue with CheckUptime and time rendering beein wrong (#549)
+ 
 2012-08-04 MickeM
  * Re implemented INSTANCES command via the new pdh exec subsystem.

include/checkHelpers.hpp

@@ -720 +720 @@
     };
 
-    checkTypes type_;
-    typename TType::TValueType value_;
     typedef typename TType TValueType;
     typedef THandler TFormatType;
     typedef NumericPercentageBounds<TType, THandler> TMyType;
+
+    checkTypes type_;
+    typename TType::TValueType value_;
     InternalValue upper;
     InternalValue lower;
@@ -730 +731 @@
     double magic;
 
-    NumericPercentageBounds() : type_(none), upper(true), lower(false), magic(0), normal_size(20*1024*1024) {
+    NumericPercentageBounds() : type_(none), value_(0), upper(true), lower(false), normal_size(20*1024*1024), magic(0) {
       upper.setParent(this);
       lower.setParent(this);
@@ -738 +739 @@
       : type_(other.type_)
       , value_(other.value_)
-      , magic(other.magic)
-      , normal_size(other.normal_size)
       , upper(other.upper)
       , lower(other.lower)
+      , normal_size(other.normal_size)
+      , magic(other.magic)
     {
       upper.setParent(this);
@@ -751 +752 @@
       type_ = other.type_;
       value_ = other.value_;
-      magic = other.magic;
-      normal_size = other.normal_size;
       upper = other.upper;
       lower = other.lower;
+      normal_size = other.normal_size;
+      magic = other.magic;
       upper.setParent(this);
       lower.setParent(this);
@@ -839 +840 @@
         warn_p = evaluate_value_to_percentage(value.total, warn);
         crit_p = evaluate_value_to_percentage(value.total, crit);
-        warn_v = static_cast<unsigned int>(warn);
-        crit_v = static_cast<unsigned int>(crit);
+        warn_v = warn;
+        crit_v = crit;
       } else {
         value_p = static_cast<unsigned int>(value.getLowerPercentage());
         warn_p = evaluate_value_to_percentage(value.total, warn);
         crit_p = evaluate_value_to_percentage(value.total, crit);
-        warn_v = static_cast<unsigned int>(warn);
-        crit_v = static_cast<unsigned int>(crit);
-      }
-      std::wstring unit = THandler::get_perf_unit(min(warn_v, min(crit_v, value.value)));
+        warn_v = warn;
+        crit_v = crit;
+      }
+      std::wstring unit = THandler::get_perf_unit(min_no_zero(warn_v, crit_v, value.value));
       return 
         MAKE_PERFDATA(alias + _T(" %"), THandler::print_unformated(value_p), _T("%"), THandler::print_unformated(warn_p), THandler::print_unformated(crit_p))
@@ -855 +856 @@
           THandler::print_perf(0, unit), THandler::print_perf(value.total, unit))
         ;
+    }
+    template<class T>
+    T min_no_zero(T v1, T v2, T v3) {
+      if (v1 == 0 && v2 == 0 && v3 == 0)
+        return 0;
+      T maximum = max(v1, max(v2, v3));
+      if (v1 == 0)
+        v1 = maximum;
+      if (v2 == 0)
+        v2 = maximum;
+      if (v3 == 0)
+        v3 = maximum;
+      return min(v1, min(v2, v3));
     }
     std::wstring gatherPerfData(std::wstring alias, TType &value) {

include/strEx.h

@@ -358 +358 @@
   inline std::wstring itos_as_time(unsigned long long time) {
     if (time > WEEK) {
-      unsigned int w = static_cast<unsigned int>(time/WEEK);
-      unsigned int d = static_cast<unsigned int>((time-(w*WEEK))/DAY);
-      unsigned int h = static_cast<unsigned int>((time-(w*WEEK)-(d*DAY))/HOUR);
-      unsigned int m = static_cast<unsigned int>((time-(w*WEEK)-(d*DAY)-(h*HOUR))/MIN);
+      long long w = time/WEEK;
+      long long d = (time-(w*WEEK))/DAY;
+      long long h = (time-(w*WEEK)-(d*DAY))/HOUR;
+      long long m = (time-(w*WEEK)-(d*DAY)-(h*HOUR))/MIN;
       return itos(w) + _T("w ") + itos(d) + _T("d ") + itos(h) + _T(":") + itos(m);
     }
     else if (time > DAY) {
-      unsigned int d = static_cast<unsigned int>((time)/DAY);
-      unsigned int h = static_cast<unsigned int>((time-(d*DAY))/HOUR);
-      unsigned int m = static_cast<unsigned int>((time-(d*DAY)-(h*HOUR))/MIN);
+      long long d = time/DAY;
+      long long h = (time-(d*DAY))/HOUR;
+      long long m = (time-(d*DAY)-(h*HOUR))/MIN;
       return itos(d) + _T("d ") + itos(h) + _T(":") + itos(m);
     }
     else if (time > HOUR) {
-      unsigned int h = static_cast<unsigned int>((time)/HOUR);
-      unsigned int m = static_cast<unsigned int>((time-(h*HOUR))/MIN);
+      long long h = time/HOUR;
+      long long m = (time-(h*HOUR))/MIN;
       return itos(h) + _T(":") + itos(m);
     } else if (time > MIN) {
-      return _T("0:") + itos(static_cast<unsigned int>(time/(60 * 1000)));
+      return _T("0:") + itos(time/MIN);
     } else if (time > SEC)
-      return itos(static_cast<unsigned int>(time/(1000))) + _T("s");
-    return itos(static_cast<unsigned int>(time));
+      return itos(time/SEC) + _T("s");
+    return itos(time);
   }
 

service/NSClient++.cpp

@@ -393 +393 @@
   LOG_INFO_CORE(SERVICE_NAME _T(" booting..."));
   LOG_DEBUG_CORE(_T("Booted settings subsystem..."));
+  LOG_ERROR_CORE(_T("===> ") + strEx::itos_as_time(11171600000));
 
   bool crash_submit = false;

version.txt

@@ -1 +1 @@
 version=0.4.1
-build=32
-date=2012-08-06
+build=35
+date=2012-08-07