Simon/fantasize
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects 1 Releases 13 Wiki Activity

Add average and max aggregator functions

Browse Source
This commit is contained in:
Simon
2023-03-15 15:16:56 +01:00
parent 7b0b419a22
commit f383eb1b79
8 changed files with 141 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PKGBUILD
View File

@@ -1,5 +1,5 @@
pkgname=fantasize
pkgver=0.1.8
pkgver=0.1.9
pkgrel=1
pkgdesc='C++ fan control for Linux'
url='https://github.com/Tabascl/fantasize.git'

1
app/CMakeLists.txt
View File

@@ -19,6 +19,7 @@ add_executable(${PROJECT_NAME}
src/fan/HwmonFan.cxx
src/fan/FanCurve.cxx
src/fan/FanLabeler.cxx
src/fan/Aggregators.cxx
src/FanGenerator.cxx
src/Serializer.cxx
src/sensor/SensorManager.cxx

13
app/include/Serializer.h
View File

@@ -7,6 +7,7 @@
#include <nlohmann/json.hpp>
#include <Settings.h>
#include <fan/Aggregators.h>
#include <fan/Fan.h>
#include <fan/FanCurve.h>
#include <sensor/Sensor.h>
@@ -16,20 +17,22 @@
using json = nlohmann::json;
class Serializer {
class Serializer
{
public:
Serializer();
void SerializeFans(std::vector<std::shared_ptr<Fan>> fans);
std::vector<std::shared_ptr<Fan>>
DeserializeFans(std::vector<std::shared_ptr<Sensor>> availableSensors);
std::vector<std::shared_ptr<FanCurve>>
DeserializeFanCurves(std::vector<std::shared_ptr<Sensor>> availableSensors,
std::vector<std::shared_ptr<Fan>> DeserializeFans(
std::vector<std::shared_ptr<Sensor>> availableSensors);
std::vector<std::shared_ptr<FanCurve>> DeserializeFanCurves(
std::vector<std::shared_ptr<Sensor>> availableSensors,
std::vector<std::shared_ptr<Fan>> availableFans);
std::shared_ptr<Settings> DeserializeSettings();
private:
void WriteJson(json o);
json ReadJson();
std::unique_ptr<Aggregator> aggregatorFromString(std::string str) const;
};
#endif // SERIALIZER_H_

11
app/include/fan/FanCurve.h
View File

@@ -4,19 +4,23 @@
#include <memory>
#include <vector>
#include <fan/Aggregators.h>
#include <fan/HwmonFan.h>
#include <sensor/Sensor.h>
struct FanStep {
struct FanStep
{
int Temp;
int Percent;
};
class FanCurve {
class FanCurve
{
public:
FanCurve(std::vector<FanStep> steps,
std::vector<std::shared_ptr<Sensor>> sensors,
std::vector<std::shared_ptr<Fan>> fans);
std::vector<std::shared_ptr<Fan>> fans,
std::unique_ptr<Aggregator> aggregator);
void DoFanControl();
@@ -27,6 +31,7 @@ private:
std::vector<FanStep> mSteps;
std::vector<std::shared_ptr<Sensor>> mTempSensors;
std::vector<std::shared_ptr<Fan>> mFans;
std::unique_ptr<Aggregator> mAggregator;
};
#endif // FANCURVE_H_

45
app/src/Serializer.cxx
View File

@@ -1,4 +1,3 @@
#include "Settings.h"
#include <filesystem>
#include <fstream>
#include <iostream>
@@ -9,17 +8,21 @@
#include <fan/HwmonFan.h>
#include <pwm/PWMControl.h>
#include <sensor/LMSensor.h>
#include <string>
using namespace std;
namespace fs = filesystem;
Serializer::Serializer() {
Serializer::Serializer()
{
if (!fs::exists(SERIALIZATION_DIR)) {
fs::create_directory(SERIALIZATION_DIR);
}
}
void Serializer::SerializeFans(vector<shared_ptr<Fan>> fans) {
void
Serializer::SerializeFans(vector<shared_ptr<Fan>> fans)
{
json obj;
for (auto f : fans) {
@@ -30,7 +33,8 @@ void Serializer::SerializeFans(vector<shared_ptr<Fan>> fans) {
}
vector<shared_ptr<Fan>>
Serializer::DeserializeFans(vector<shared_ptr<Sensor>> availableSensors) {
Serializer::DeserializeFans(vector<shared_ptr<Sensor>> availableSensors)
{
vector<shared_ptr<Fan>> fans;
// Create a for the sensors first, then searching becomes cheaper
@@ -62,7 +66,9 @@ Serializer::DeserializeFans(vector<shared_ptr<Sensor>> availableSensors) {
return fans;
}
void Serializer::WriteJson(json o) {
void
Serializer::WriteJson(json o)
{
json obj;
if (fs::exists(fs::path(SERIALIZATION_DIR) / FANS_JSON_FILENAME)) {
@@ -77,14 +83,18 @@ void Serializer::WriteJson(json o) {
ostrm << obj.dump(2) << "\n";
}
json Serializer::ReadJson() {
json
Serializer::ReadJson()
{
ifstream istrm(fs::path(SERIALIZATION_DIR) / FANS_JSON_FILENAME);
return json::parse(istrm);
}
vector<shared_ptr<FanCurve>> Serializer::DeserializeFanCurves(
vector<shared_ptr<FanCurve>>
Serializer::DeserializeFanCurves(
std::vector<std::shared_ptr<Sensor>> availableSensors,
std::vector<std::shared_ptr<Fan>> availableFans) {
std::vector<std::shared_ptr<Fan>> availableFans)
{
auto data = ReadJson();
map<string, shared_ptr<Sensor>> sensorMap;
@@ -118,13 +128,28 @@ vector<shared_ptr<FanCurve>> Serializer::DeserializeFanCurves(
fans.push_back(fanMap[fan.value()]);
}
curves.push_back(make_shared<FanCurve>(steps, sensors, fans));
std::unique_ptr<Aggregator> aggregator =
aggregatorFromString(el.value()["AggregateFunction"]);
curves.push_back(
make_shared<FanCurve>(steps, sensors, fans, std::move(aggregator)));
}
return curves;
}
shared_ptr<Settings> Serializer::DeserializeSettings() {
std::unique_ptr<Aggregator>
Serializer::aggregatorFromString(std::string str) const
{
if (str == "max")
return std::make_unique<MaxAggregator>();
else
return std::make_unique<AverageAggregator>();
}
shared_ptr<Settings>
Serializer::DeserializeSettings()
{
int frequency = FREQUENCY_DEFAULT;
auto data = ReadJson();

36
app/src/fan/FanCurve.cxx
View File

@@ -4,17 +4,25 @@
#include <boost/log/trivial.hpp>
#include <fan/FanCurve.h>
#include <memory>
using namespace std;
FanCurve::FanCurve(std::vector<FanStep> steps,
std::vector<std::shared_ptr<Sensor>> sensors,
std::vector<std::shared_ptr<Fan>> fans)
: mSteps(steps), mTempSensors(sensors), mFans(fans) {
std::vector<std::shared_ptr<Fan>> fans,
std::unique_ptr<Aggregator> aggregator)
: mSteps(steps)
, mTempSensors(sensors)
, mFans(fans)
, mAggregator(std::move(aggregator))
{
PrintInfo();
}
void FanCurve::DoFanControl() {
void
FanCurve::DoFanControl()
{
BOOST_LOG_FUNCTION();
int temp = AggregateTemperature();
@@ -51,17 +59,15 @@ void FanCurve::DoFanControl() {
}
}
// Dummy Implementation using AVG
int FanCurve::AggregateTemperature() {
int sum = 0;
for (auto s : mTempSensors) {
sum += s->value();
int
FanCurve::AggregateTemperature()
{
return mAggregator->aggregate(mTempSensors);
}
return sum / mTempSensors.size();
}
void FanCurve::PrintInfo() {
void
FanCurve::PrintInfo()
{
BOOST_LOG_FUNCTION()
BOOST_LOG_TRIVIAL(info) << "### Fan curve:";
@@ -90,4 +96,10 @@ void FanCurve::PrintInfo() {
}
BOOST_LOG_TRIVIAL(info) << sStream.str();
sStream.str(string());
sStream << "Aggregate function: " << mAggregator->toString();
BOOST_LOG_TRIVIAL(info) << sStream.str();
}

20
app/src/main.cxx
View File

@@ -20,7 +20,7 @@
#include <App.h>
#define PROJECT_VERSION "v0.1.8"
#define PROJECT_VERSION "v0.1.9"
namespace po = boost::program_options;
namespace logging = boost::log;
@@ -29,9 +29,15 @@ App app;
static int doInitialSetup = 0;
void signal_handler(int s) { app.Shutdown(); }
void
signal_handler(int s)
{
app.Shutdown();
}
void InitLogging(bool verbose) {
void
InitLogging(bool verbose)
{
logging::add_console_log(
std::clog,
logging::keywords::format =
@@ -60,7 +66,9 @@ void InitLogging(bool verbose) {
}
}
int main(int argc, char **argv) {
int
main(int argc, char** argv)
{
BOOST_LOG_FUNCTION()
BOOST_LOG_TRIVIAL(info) << "Version: " << PROJECT_VERSION;
@@ -69,8 +77,8 @@ int main(int argc, char **argv) {
po::options_description desc("Allowed options");
desc.add_options()("help,h", "produce help message")(
"setup,s", po::bool_switch(),
"run initial setup")("verbose,v", po::bool_switch(), "print debug info");
"setup,s", po::bool_switch(), "run initial setup")(
"verbose,v", po::bool_switch(), "print debug info");
po::variables_map vm;
po::store(po::parse_command_line(argc, argv, desc), vm);

35
app/src/pwm/PWMControl.cxx
View File

@@ -15,7 +15,9 @@
using namespace std;
namespace fs = filesystem;
PWMControl::PWMControl(string controlPath) : mControlPath(controlPath) {
PWMControl::PWMControl(string controlPath)
: mControlPath(controlPath)
{
fs::path pathEnable(mControlPath + PWM_POSTFIX_ENABLE);
fs::path pathMode(mControlPath + PWM_POSTFIX_MODE);
@@ -35,21 +37,24 @@ PWMControl::PWMControl(string controlPath) : mControlPath(controlPath) {
istrm.close();
}
PWMControl::~PWMControl() {
PWMControl::~PWMControl()
{
BOOST_LOG_FUNCTION();
BOOST_LOG_TRIVIAL(trace) << "Cleanup";
Reset();
}
void PWMControl::Power(int percent) {
void
PWMControl::Power(int percent)
{
BOOST_LOG_FUNCTION();
int pwmValue = (PWM_MAX_VALUE * percent) / 100;
if (percent != mCurrentValue) {
BOOST_LOG_TRIVIAL(trace)
<< "Updating control value to " << percent << "% (" << pwmValue << ")";
BOOST_LOG_TRIVIAL(trace) << "Updating control value of " << toString()
<< " to " << percent << "% (" << pwmValue << ")";
ofstream ostrm(mControlPath, ios::trunc);
ostrm << pwmValue;
ostrm.close();
@@ -58,7 +63,9 @@ void PWMControl::Power(int percent) {
}
}
int PWMControl::Power() {
int
PWMControl::Power()
{
int value;
ifstream istrm;
@@ -68,13 +75,17 @@ int PWMControl::Power() {
return (value * 100) / PWM_MAX_VALUE;
}
void PWMControl::EnableManualControl() {
void
PWMControl::EnableManualControl()
{
ofstream ostrm(mEnablePath, ios::trunc);
ostrm << static_cast<int>(PWM_ENABLE::MANUAL_CONTROL);
ostrm.close();
}
void PWMControl::Reset() {
void
PWMControl::Reset()
{
ofstream ostrm(mEnablePath, ios::trunc);
ostrm << mInitialEnable;
@@ -86,11 +97,15 @@ void PWMControl::Reset() {
ostrm.close();
}
const string PWMControl::toString() const {
const string
PWMControl::toString() const
{
return fs::path(mControlPath).filename();
}
json PWMControl::toJson() const {
json
PWMControl::toJson() const
{
json obj = { "PWMControl", mControlPath };
return obj;
}