fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP hugepages in clientinfo popup

Browse source
This commit is contained in:
BenDr0id 2018-07-18 16:44:03 +02:00
parent 566a9f57ec
commit 1b69dfc0e5
7 changed files with 82 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/cc/CCClient.cpp
View file

@ -79,9 +79,7 @@ CCClient::CCClient(Options* options, uv_async_t* async)
m_clientStatus.setCurrentAlgoName(m_options->algoName());
}
m_clientStatus.setHugepages(Mem::isHugepagesAvailable());
m_clientStatus.setHashFactor(Mem::hashFactor());
m_clientStatus.setVersion(Version::string());
m_clientStatus.setCpuBrand(Cpu::brand());
m_clientStatus.setCpuAES(Cpu::hasAES());
@ -134,6 +132,11 @@ void CCClient::updateNetworkState(const NetworkState& network)
m_self->m_clientStatus.setSharesTotal(network.accepted + network.rejected);
m_self->m_clientStatus.setHashesTotal(network.total);
m_self->m_clientStatus.setAvgTime(network.avgTime());
m_self->m_clientStatus.setHugepagesEnabled(Mem::isHugepagesEnabled());
m_self->m_clientStatus.setHugepages(Mem::isHugepagesAvailable());
m_self->m_clientStatus.setTotalPages(Mem::getTotalPages());
m_self->m_clientStatus.setTotalHugepages(Mem::getTotalHugepages());
m_self->m_clientStatus.setCurrentPowVariantName(getPowVariantName(network.powVariant));
uv_mutex_unlock(&m_mutex);

49
src/cc/ClientStatus.cpp
View file

@ -34,13 +34,16 @@
ClientStatus::ClientStatus()
: m_currentStatus(Status::PAUSED),
m_hasHugepages(false),
m_isHugepagesEnabled(false),
m_isCpuX64(false),
m_hasCpuAES(false),
m_hashFactor(1),
m_hashrateShort(0),
m_hashrateMedium(0),
m_hashrateLong(0),
m_hashrateHighest(0),
m_hashFactor(1),
m_totalPages(0),
m_totalHugepages(0),
m_currentThreads(0),
m_cpuSockets(0),
m_cpuCores(0),
@ -157,14 +160,14 @@ void ClientStatus::setHugepages(bool hasHugepages)
m_hasHugepages = hasHugepages;
}
int ClientStatus::getHashFactor() const
bool ClientStatus::isHugepagesEnabled() const
{
return m_hashFactor;
return m_isHugepagesEnabled;
}
void ClientStatus::setHashFactor(int hashFactor)
void ClientStatus::setHugepagesEnabled(bool hugepagesEnabled)
{
m_hashFactor = hashFactor;
m_isHugepagesEnabled = hugepagesEnabled;
}
bool ClientStatus::isCpuX64() const
@ -227,6 +230,36 @@ double ClientStatus::getHashrateHighest() const
return m_hashrateHighest;
}
int ClientStatus::getHashFactor() const
{
return m_hashFactor;
}
void ClientStatus::setHashFactor(int hashFactor)
{
m_hashFactor = hashFactor;
}
int ClientStatus::getTotalPages() const
{
return m_totalPages;
}
void ClientStatus::setTotalPages(int totalPages)
{
m_totalPages = totalPages;
}
int ClientStatus::getTotalHugepages() const
{
return m_totalHugepages;
}
void ClientStatus::setTotalHugepages(int totalHugepages)
{
m_totalHugepages = totalHugepages;
}
int ClientStatus::getCurrentThreads() const
{
return m_currentThreads;
@ -389,6 +422,10 @@ bool ClientStatus::parseFromJson(const rapidjson::Document& document)
m_hasHugepages = clientStatus["hugepages_available"].GetBool();
}
if (clientStatus.HasMember("hugepages_enabled")) {
m_isHugepagesEnabled = clientStatus["hugepages_enabled"].GetBool();
}
if (clientStatus.HasMember("hash_factor")) {
m_hashFactor = clientStatus["hash_factor"].GetInt();
}
@ -487,6 +524,7 @@ rapidjson::Value ClientStatus::toJson(rapidjson::MemoryPoolAllocator<rapidjson::
clientStatus.AddMember("version", rapidjson::StringRef(m_version.c_str()), allocator);
clientStatus.AddMember("hugepages_available", m_hasHugepages, allocator);
clientStatus.AddMember("hugepages_enabled", m_isHugepagesEnabled, allocator);
clientStatus.AddMember("hash_factor", m_hashFactor, allocator);
clientStatus.AddMember("cpu_is_x64", m_isCpuX64, allocator);
clientStatus.AddMember("cpu_has_aes", m_hasCpuAES, allocator);
@ -536,4 +574,3 @@ std::string ClientStatus::toJsonString()
return strdup(buffer.GetString());
}

18
src/cc/ClientStatus.h
View file

@ -87,8 +87,8 @@ public:
bool hasHugepages() const;
void setHugepages(bool hasHugepages);
int getHashFactor() const;
void setHashFactor(int hashFactor);
bool isHugepagesEnabled() const;
void setHugepagesEnabled(bool hugepagesEnabled);
bool isCpuX64() const;
void setCpuX64(bool isCpuX64);
@ -108,6 +108,15 @@ public:
void setHashrateHighest(double hashrateHighest);
double getHashrateHighest() const;
int getHashFactor() const;
void setHashFactor(int hashFactor);
int getTotalPages() const;
void setTotalPages(int totalPages);
int getTotalHugepages() const;
void setTotalHugepages(int totalHugepages);
int getCurrentThreads() const;
void setCurrentThreads(int currentThreads);
@ -167,15 +176,18 @@ private:
std::string m_log;
bool m_hasHugepages;
bool m_isHugepagesEnabled;
bool m_isCpuX64;
bool m_hasCpuAES;
int m_hashFactor;
double m_hashrateShort;
double m_hashrateMedium;
double m_hashrateLong;
double m_hashrateHighest;
int m_hashFactor;
int m_totalPages;
int m_totalHugepages;
int m_currentThreads;
int m_cpuSockets;
int m_cpuCores;