Commit 7b0ae9d2 authored by Ondrej Vysocky's avatar Ondrej Vysocky
Browse files

FIX variable declaration when RAPL not available #53

parent 889a98fd
...@@ -79,10 +79,10 @@ std::string RAPL::suffix = "_"; ...@@ -79,10 +79,10 @@ std::string RAPL::suffix = "_";
bool RAPL::detailedMode = false; bool RAPL::detailedMode = false;
unsigned long long int RAPL::COUNTERMAX = pow(2,32); unsigned long long int RAPL::COUNTERMAX = pow(2,32);
uint64_t RAPL::NODE_SIZE_SOCKET = 1; uint64_t RAPL::NODE_SIZE_SOCKET = 1;
std::map<std::string, double> RAPL::units;
#if defined (HAVE_X86_ADAPT_H) || defined (HAVE_MSR_CORE_H) #if defined (HAVE_X86_ADAPT_H) || defined (HAVE_MSR_CORE_H)
std::map<std::string, unsigned long long int> RAPL::counters; std::map<std::string, unsigned long long int> RAPL::counters;
std::map<std::string, double> RAPL::units;
uint64_t RAPL::SOCKET_SIZE_CPU = 1; uint64_t RAPL::SOCKET_SIZE_CPU = 1;
// solve counter overflow and add baseline energy consumption // solve counter overflow and add baseline energy consumption
......
...@@ -50,7 +50,6 @@ public: ...@@ -50,7 +50,6 @@ public:
private: private:
//list of counters //list of counters
static std::map<std::string, unsigned long long int> counters; static std::map<std::string, unsigned long long int> counters;
static std::map<std::string, double> units;
static std::string suffix; static std::string suffix;
static uint64_t SOCKET_SIZE_CPU; static uint64_t SOCKET_SIZE_CPU;
static bool detailedMode; static bool detailedMode;
...@@ -78,6 +77,7 @@ private: ...@@ -78,6 +77,7 @@ private:
static bool detailedMode; static bool detailedMode;
static unsigned long long int COUNTERMAX; static unsigned long long int COUNTERMAX;
#endif #endif
static std::map<std::string, double> units;
static uint64_t NODE_SIZE_SOCKET; static uint64_t NODE_SIZE_SOCKET;
}; };
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment