Changeset de8ef76 in nscp for include

Timestamp:

02/04/08 22:42:46 (5 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

047516e

Parents:

f6edbcd

Message:

2008-02-04 MickeM

* Happy Birthday bogi!! :)

• Fixed issues with performance counter rendering (mainly checkDisk)

Location:

include

Files:

• checkHelpers.hpp (modified) (7 diffs)
• strEx.h (modified) (1 diff)

include/checkHelpers.hpp

@@ -134 +134 @@
       return strEx::itos_as_BKMG(value);
     }
-    static std::wstring print_perf(TType value) {
-      return strEx::itos_as_BKMG(value);
+    static std::wstring get_perf_unit(TType value) {
+      return strEx::find_proper_unit_BKMG(value);
+    }
+    static std::wstring print_perf(TType value, std::wstring unit) {
+      return strEx::format_BKMG(value, unit);
     }
     static TType parse(std::wstring s) {
@@ -187 +190 @@
       return strEx::itos(value);
     }
-    static std::wstring print_perf(TType value) {
+    static std::wstring get_perf_unit(TType value) {
+      return _T("");
+    }
+    static std::wstring print_perf(TType value, std::wstring unit) {
       return strEx::itos(value);
     }
@@ -211 +217 @@
       return strEx::itos(value);
     }
-    static std::wstring print_perf(int value) {
+    static std::wstring get_perf_unit(int value) {
+      return _T("");
+    }
+    static std::wstring print_perf(int value, std::wstring unit) {
       return strEx::itos(value);
     }
@@ -238 +247 @@
       return strEx::itos(value);
     }
-    static std::wstring print_perf(__int64 value) {
+    static std::wstring get_perf_unit(__int64 value) {
+      return _T("");
+    }
+    static std::wstring print_perf(__int64 value, std::wstring unit) {
       return strEx::itos(value);
     }
@@ -262 +274 @@
       return strEx::stod(s);
     }
-    static std::wstring print_perf(double value) {
+    static std::wstring get_perf_unit(double value) {
+      return _T("");
+    }
+    static std::wstring print_perf(double value, std::wstring unit) {
       return strEx::itos(value);
     }
@@ -360 +375 @@
     }
     static std::wstring gatherPerfData(std::wstring alias, TType &value, TType warn, TType crit) {
-      return MAKE_PERFDATA(alias, THandler::print_perf(value), _T(""), THandler::print_perf(warn), THandler::print_perf(crit));
+      std::wstring unit = THandler::get_perf_unit(min(warn, min(crit, value)));
+      return MAKE_PERFDATA(alias, THandler::print_perf(value, unit), unit, THandler::print_perf(warn, unit), THandler::print_perf(crit, unit));
     }
 
@@ -495 +511 @@
             THandler::print_unformated(warn), THandler::print_unformated(crit));
       } else {
+        std::wstring unit = THandler::get_perf_unit(min(warn, min(crit, value.value)));
         return 
-          MAKE_PERFDATA(alias, THandler::print_perf(value.value), _T(""), 
-          THandler::print_perf(warn), THandler::print_perf(crit));
+          MAKE_PERFDATA(alias, THandler::print_perf(value.value, unit), unit, 
+          THandler::print_perf(warn, unit), THandler::print_perf(crit, unit));
       }
     }

include/strEx.h

@@ -310 +310 @@
     return ret;
   }
+  inline std::wstring format_BKMG(unsigned __int64 i, std::wstring unit) {
+    double cpy = static_cast<double>(i);
+    TCHAR postfix[] = _T(BKMG_RANGE);
+    if (unit.length() != 1)
+      return itos(cpy);
+    for (int i=0;i<BKMG_SIZE;i++) {
+      if (unit[0] == postfix[i]) {
+        std::wstringstream ss;
+        ss << std::setiosflags(std::ios::fixed) << std::setprecision(3) << cpy;
+        std::wstring s = ss.str();
+        std::wstring::size_type pos = s.find_last_not_of(_T("0"));
+        if (pos != std::string::npos) {
+          s = s.substr(0,pos);
+        }
+        return s;
+      }
+      cpy/=1024;
+    }
+    return itos(cpy);
+  }
+  inline std::wstring find_proper_unit_BKMG(unsigned __int64 i) {
+    double cpy = static_cast<double>(i);
+    TCHAR postfix[] = _T(BKMG_RANGE);
+    int idx = 0;
+    while ((cpy > 999)&&(idx<BKMG_SIZE)) {
+      cpy/=1024;
+      idx++;
+    }
+    return std::wstring(1, postfix[idx]);
+  }
 
   typedef std::list<std::wstring> splitList;