summaryrefslogtreecommitdiffstats
path: root/backend
diff options
context:
space:
mode:
Diffstat (limited to 'backend')
-rw-r--r--backend/amd/autoAdjust.hpp5
-rw-r--r--backend/amd/jconf.h3
-rw-r--r--backend/amd/minethd.cpp11
-rw-r--r--backend/cpu/autoAdjust.hpp5
-rw-r--r--backend/cpu/autoAdjustHwloc.hpp5
-rw-r--r--backend/cpu/jconf.h3
-rw-r--r--backend/cpu/minethd.cpp5
-rw-r--r--backend/nvidia/autoAdjust.hpp5
-rw-r--r--backend/nvidia/jconf.h3
-rw-r--r--backend/nvidia/minethd.cpp5
10 files changed, 27 insertions, 23 deletions
diff --git a/backend/amd/autoAdjust.hpp b/backend/amd/autoAdjust.hpp
index e6e4015..442d8f1 100644
--- a/backend/amd/autoAdjust.hpp
+++ b/backend/amd/autoAdjust.hpp
@@ -8,6 +8,7 @@
#include "../../console.h"
#include "../../ConfigEditor.hpp"
#include "amd_gpu/gpu.h"
+#include "../../Params.hpp"
#include <vector>
#include <cstdio>
@@ -102,8 +103,8 @@ private:
configTpl.replace("PLATFORMINDEX",std::to_string(platformIndex));
configTpl.replace("NUMGPUS",std::to_string(devVec.size()));
configTpl.replace("GPUCONFIG",conf);
- configTpl.write("amd.txt");
- printer::inst()->print_msg(L0, "AMD: GPU configuration stored in file '%s'", "amd.txt");
+ configTpl.write(Params::inst().configFileAMD);
+ printer::inst()->print_msg(L0, "AMD: GPU configuration stored in file '%s'", Params::inst().configFileAMD.c_str());
}
std::vector<GpuContext> devVec;
diff --git a/backend/amd/jconf.h b/backend/amd/jconf.h
index 463284a..9fef331 100644
--- a/backend/amd/jconf.h
+++ b/backend/amd/jconf.h
@@ -1,6 +1,7 @@
#pragma once
#include <stdlib.h>
#include <string>
+#include "../../Params.hpp"
namespace xmrstak
{
@@ -16,7 +17,7 @@ public:
return oInst;
};
- bool parse_config(const char* sFilename = "amd.txt");
+ bool parse_config(const char* sFilename = Params::inst().configFileAMD.c_str());
struct thd_cfg {
size_t index;
diff --git a/backend/amd/minethd.cpp b/backend/amd/minethd.cpp
index 0821c0e..b938f2d 100644
--- a/backend/amd/minethd.cpp
+++ b/backend/amd/minethd.cpp
@@ -40,6 +40,7 @@
#include "../../jconf.h"
#include "../../crypto/cryptonight.h"
#include "../../Environment.hpp"
+#include "../../Params.hpp"
#include "amd_gpu/gpu.h"
@@ -97,19 +98,13 @@ std::vector<IBackend*>* minethd::thread_starter(uint32_t threadOffset, miner_wor
{
std::vector<IBackend*>* pvThreads = new std::vector<IBackend*>();
- if(!ConfigEditor::file_exist("amd.txt"))
+ if(!ConfigEditor::file_exist(Params::inst().configFileAMD))
{
autoAdjust adjust;
if(!adjust.printConfig())
return pvThreads;
}
-/*
- if(!ConfigEditor::file_exist("amd.txt"))
- {
- printer::inst()->print_msg(L0, "WARNING: missing config file 'amd.txt'");
- return pvThreads;
- }
-*/
+
if(!jconf::inst()->parse_config())
{
win_exit();
diff --git a/backend/cpu/autoAdjust.hpp b/backend/cpu/autoAdjust.hpp
index 092f085..32c8576 100644
--- a/backend/cpu/autoAdjust.hpp
+++ b/backend/cpu/autoAdjust.hpp
@@ -3,6 +3,7 @@
#include "../../console.h"
#include "../../jconf.h"
#include "../../ConfigEditor.hpp"
+#include "../../Params.hpp"
#include <string>
#ifdef _WIN32
@@ -97,8 +98,8 @@ public:
}
configTpl.replace("CPUCONFIG",conf);
- configTpl.write("cpu.txt");
- printer::inst()->print_msg(L0, "CPU configuration stored in file '%s'", "cpu.txt");
+ configTpl.write(Params::inst().configFileCPU);
+ printer::inst()->print_msg(L0, "CPU configuration stored in file '%s'", Params::inst().configFileCPU.c_str());
return true;
}
diff --git a/backend/cpu/autoAdjustHwloc.hpp b/backend/cpu/autoAdjustHwloc.hpp
index 161aa5c..e1916e0 100644
--- a/backend/cpu/autoAdjustHwloc.hpp
+++ b/backend/cpu/autoAdjustHwloc.hpp
@@ -3,6 +3,7 @@
#include "../../console.h"
#include <hwloc.h>
#include <stdio.h>
+#include "../../Params.hpp"
#ifdef _WIN32
#include <windows.h>
@@ -74,8 +75,8 @@ public:
}
configTpl.replace("CPUCONFIG",conf);
- configTpl.write("cpu.txt");
- printer::inst()->print_msg(L0, "CPU configuration stored in file '%s'", "cpu.txt");
+ configTpl.write(Params::inst().configFileCPU);
+ printer::inst()->print_msg(L0, "CPU configuration stored in file '%s'", Params::inst().configFileCPU.c_str());
/* Destroy topology object. */
hwloc_topology_destroy(topology);
diff --git a/backend/cpu/jconf.h b/backend/cpu/jconf.h
index 9b46552..1f92765 100644
--- a/backend/cpu/jconf.h
+++ b/backend/cpu/jconf.h
@@ -1,6 +1,7 @@
#pragma once
#include <stdlib.h>
#include <string>
+#include "../../Params.hpp"
namespace xmrstak
{
@@ -16,7 +17,7 @@ public:
return oInst;
};
- bool parse_config(const char* sFilename = "cpu.txt");
+ bool parse_config(const char* sFilename = Params::inst().configFileCPU.c_str());
struct thd_cfg {
bool bDoubleMode;
diff --git a/backend/cpu/minethd.cpp b/backend/cpu/minethd.cpp
index 7991d86..3ffdf99 100644
--- a/backend/cpu/minethd.cpp
+++ b/backend/cpu/minethd.cpp
@@ -31,6 +31,7 @@
#include "../IBackend.hpp"
#include "../GlobalStates.hpp"
#include "../../ConfigEditor.hpp"
+#include "../../Params.hpp"
#include "../../jconf.h"
#include "../../executor.h"
@@ -247,14 +248,14 @@ std::vector<IBackend*> minethd::thread_starter(uint32_t threadOffset, miner_work
{
std::vector<IBackend*> pvThreads;
- if(!ConfigEditor::file_exist("cpu.txt"))
+ if(!ConfigEditor::file_exist(Params::inst().configFileCPU))
{
autoAdjust adjust;
if(!adjust.printConfig())
return pvThreads;
}
- if(!xmrstak::cpu::jconf::inst()->parse_config("cpu.txt"))
+ if(!jconf::inst()->parse_config())
{
win_exit();
}
diff --git a/backend/nvidia/autoAdjust.hpp b/backend/nvidia/autoAdjust.hpp
index 659bd08..84c6dfc 100644
--- a/backend/nvidia/autoAdjust.hpp
+++ b/backend/nvidia/autoAdjust.hpp
@@ -7,6 +7,7 @@
#include "jconf.h"
#include "../../console.h"
#include "../../ConfigEditor.hpp"
+#include "../../Params.hpp"
#include <vector>
#include <cstdio>
@@ -101,8 +102,8 @@ private:
}
configTpl.replace("GPUCONFIG",conf);
- configTpl.write("nvidia.txt");
- printer::inst()->print_msg(L0, "NVIDIA: GPU configuration stored in file '%s'", "nvidia.txt");
+ configTpl.write(Params::inst().configFileNVIDIA);
+ printer::inst()->print_msg(L0, "NVIDIA: GPU configuration stored in file '%s'", Params::inst().configFileNVIDIA.c_str());
}
std::vector<nvid_ctx> nvidCtxVec;
diff --git a/backend/nvidia/jconf.h b/backend/nvidia/jconf.h
index e398f30..8959088 100644
--- a/backend/nvidia/jconf.h
+++ b/backend/nvidia/jconf.h
@@ -1,6 +1,7 @@
#pragma once
#include <stdlib.h>
#include <string>
+#include "../../Params.hpp"
namespace xmrstak
{
@@ -16,7 +17,7 @@ public:
return oInst;
};
- bool parse_config(const char* sFilename = "nvidia.txt");
+ bool parse_config(const char* sFilename = Params::inst().configFileNVIDIA.c_str());
struct thd_cfg {
uint32_t id;
diff --git a/backend/nvidia/minethd.cpp b/backend/nvidia/minethd.cpp
index 554ea69..227a2cf 100644
--- a/backend/nvidia/minethd.cpp
+++ b/backend/nvidia/minethd.cpp
@@ -30,6 +30,7 @@
#include "../../console.h"
#include "../../crypto/cryptonight_aesni.h"
#include "../cpu/minethd.h"
+#include "../../Params.hpp"
#include "../../executor.h"
#include "minethd.h"
@@ -121,14 +122,14 @@ std::vector<IBackend*>* minethd::thread_starter(uint32_t threadOffset, miner_wor
{
std::vector<IBackend*>* pvThreads = new std::vector<IBackend*>();
- if(!ConfigEditor::file_exist("nvidia.txt"))
+ if(!ConfigEditor::file_exist(Params::inst().configFileNVIDIA))
{
autoAdjust adjust;
if(!adjust.printConfig())
return pvThreads;
}
- if(!jconf::inst()->parse_config("nvidia.txt"))
+ if(!jconf::inst()->parse_config())
{
win_exit();
}
OpenPOWER on IntegriCloud