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

Added hwloc version display.

Browse source
This commit is contained in:
XMRig 2019-07-23 07:45:00 +07:00
parent b27fc6fd5d
commit 4263c6c381
4 changed files with 56 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/base/kernel/Entry.cpp
View file

@ -31,6 +31,9 @@
# include <openssl/opensslv.h>
#endif
#ifdef XMRIG_FEATURE_HWLOC
# include <hwloc.h>
#endif
#include "base/kernel/Entry.h"
#include "base/kernel/Process.h"
@ -75,6 +78,8 @@ static int showVersion()
}
# endif
printf("hwloc/%s\n", HWLOC_VERSION);
return 0;
}

21
src/base/kernel/config/BaseConfig.cpp
View file

@ -34,6 +34,9 @@
# include <openssl/opensslv.h>
#endif
#ifdef XMRIG_FEATURE_HWLOC
# include <hwloc.h>
#endif
#ifdef XMRIG_AMD_PROJECT
# if defined(__APPLE__)
@ -95,22 +98,24 @@ void xmrig::BaseConfig::printVersions()
# elif defined(XMRIG_NVIDIA_PROJECT)
const int cudaVersion = cuda_get_runtime_version();
int length = snprintf(buf, sizeof buf, "CUDA/%d.%d ", cudaVersion / 1000, cudaVersion % 100);
# else
memset(buf, 0, 16);
# endif
# if defined(XMRIG_FEATURE_HTTP) || defined(XMRIG_FEATURE_TLS)
int length = 0;
# endif
# endif
std::string libs;
# if defined(XMRIG_FEATURE_TLS) && defined(OPENSSL_VERSION_TEXT)
{
constexpr const char *v = OPENSSL_VERSION_TEXT + 8;
length += snprintf(buf + length, (sizeof buf) - length, "OpenSSL/%.*s ", static_cast<int>(strchr(v, ' ') - v), v);
snprintf(buf, sizeof buf, "OpenSSL/%.*s ", static_cast<int>(strchr(v, ' ') - v), v);
libs += buf;
}
# endif
Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13slibuv/%s %s"), "LIBS", uv_version_string(), buf);
# ifdef XMRIG_FEATURE_HWLOC
snprintf(buf, sizeof buf, "hwloc/%s ", HWLOC_VERSION);
libs += buf;
# endif
Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13slibuv/%s %s"), "LIBS", uv_version_string(), libs.c_str());
}