mirror of
https://github.com/xmrig/xmrig.git
synced 2025-01-11 05:14:40 +00:00
Update user agent for macOS and fix compile warnings
This commit is contained in:
parent
a36fb7e728
commit
643142dc30
6 changed files with 29 additions and 12 deletions
|
@ -71,10 +71,13 @@ protected:
|
||||||
bool m_jccErratum = false;
|
bool m_jccErratum = false;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
# ifndef XMRIG_ARM
|
||||||
uint32_t m_procInfo = 0;
|
uint32_t m_procInfo = 0;
|
||||||
uint32_t m_family = 0;
|
uint32_t m_family = 0;
|
||||||
uint32_t m_model = 0;
|
uint32_t m_model = 0;
|
||||||
uint32_t m_stepping = 0;
|
uint32_t m_stepping = 0;
|
||||||
|
# endif
|
||||||
|
|
||||||
Assembly m_assembly = Assembly::NONE;
|
Assembly m_assembly = Assembly::NONE;
|
||||||
MsrMod m_msrMod = MSR_MOD_NONE;
|
MsrMod m_msrMod = MSR_MOD_NONE;
|
||||||
std::bitset<FLAG_MAX> m_flags;
|
std::bitset<FLAG_MAX> m_flags;
|
||||||
|
|
|
@ -85,6 +85,15 @@ static inline void findByType(hwloc_obj_t obj, hwloc_obj_type_t type, func lambd
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static inline size_t countByType(hwloc_topology_t topology, hwloc_obj_type_t type)
|
||||||
|
{
|
||||||
|
const int count = hwloc_get_nbobjs_by_type(topology, type);
|
||||||
|
|
||||||
|
return count > 0 ? static_cast<size_t>(count) : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef XMRIG_ARM
|
||||||
static inline std::vector<hwloc_obj_t> findByType(hwloc_obj_t obj, hwloc_obj_type_t type)
|
static inline std::vector<hwloc_obj_t> findByType(hwloc_obj_t obj, hwloc_obj_type_t type)
|
||||||
{
|
{
|
||||||
std::vector<hwloc_obj_t> out;
|
std::vector<hwloc_obj_t> out;
|
||||||
|
@ -94,14 +103,6 @@ static inline std::vector<hwloc_obj_t> findByType(hwloc_obj_t obj, hwloc_obj_typ
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static inline size_t countByType(hwloc_topology_t topology, hwloc_obj_type_t type)
|
|
||||||
{
|
|
||||||
const int count = hwloc_get_nbobjs_by_type(topology, type);
|
|
||||||
|
|
||||||
return count > 0 ? static_cast<size_t>(count) : 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static inline size_t countByType(hwloc_obj_t obj, hwloc_obj_type_t type)
|
static inline size_t countByType(hwloc_obj_t obj, hwloc_obj_type_t type)
|
||||||
{
|
{
|
||||||
size_t count = 0;
|
size_t count = 0;
|
||||||
|
@ -116,6 +117,7 @@ static inline bool isCacheExclusive(hwloc_obj_t obj)
|
||||||
const char *value = hwloc_obj_get_info_by_name(obj, "Inclusive");
|
const char *value = hwloc_obj_get_info_by_name(obj, "Inclusive");
|
||||||
return value == nullptr || value[0] != '1';
|
return value == nullptr || value[0] != '1';
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
} // namespace xmrig
|
} // namespace xmrig
|
||||||
|
|
|
@ -50,7 +50,6 @@
|
||||||
namespace xmrig {
|
namespace xmrig {
|
||||||
|
|
||||||
|
|
||||||
static constexpr uint32_t kReserveCount = 32768;
|
|
||||||
std::atomic<bool> CudaWorker::ready;
|
std::atomic<bool> CudaWorker::ready;
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,14 @@ char *xmrig::Platform::createUserAgent()
|
||||||
constexpr const size_t max = 256;
|
constexpr const size_t max = 256;
|
||||||
|
|
||||||
char *buf = new char[max]();
|
char *buf = new char[max]();
|
||||||
int length = snprintf(buf, max, "%s/%s (Macintosh; Intel Mac OS X) libuv/%s", APP_NAME, APP_VERSION, uv_version_string());
|
int length = snprintf(buf, max,
|
||||||
|
"%s/%s (Macintosh; macOS"
|
||||||
|
# ifdef XMRIG_ARM
|
||||||
|
"; arm64"
|
||||||
|
# else
|
||||||
|
"; x86_64"
|
||||||
|
# endif
|
||||||
|
") libuv/%s", APP_NAME, APP_VERSION, uv_version_string());
|
||||||
|
|
||||||
# ifdef __clang__
|
# ifdef __clang__
|
||||||
length += snprintf(buf + length, max - length, " clang/%d.%d.%d", __clang_major__, __clang_minor__, __clang_patchlevel__);
|
length += snprintf(buf + length, max - length, " clang/%d.%d.%d", __clang_major__, __clang_minor__, __clang_patchlevel__);
|
||||||
|
|
|
@ -29,13 +29,20 @@ namespace xmrig {
|
||||||
class HttpListener : public IHttpListener
|
class HttpListener : public IHttpListener
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
inline HttpListener(IHttpListener *listener, const char *tag = nullptr) : m_tag(tag), m_listener(listener) {}
|
inline HttpListener(IHttpListener *listener, const char *tag = nullptr) :
|
||||||
|
# ifdef APP_DEBUG
|
||||||
|
m_tag(tag),
|
||||||
|
# endif
|
||||||
|
m_listener(listener)
|
||||||
|
{}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void onHttpData(const HttpData &data) override;
|
void onHttpData(const HttpData &data) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
# ifdef APP_DEBUG
|
||||||
const char *m_tag;
|
const char *m_tag;
|
||||||
|
# endif
|
||||||
IHttpListener *m_listener;
|
IHttpListener *m_listener;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -92,7 +92,6 @@ private:
|
||||||
IStrategy *m_strategy = nullptr;
|
IStrategy *m_strategy = nullptr;
|
||||||
NetworkState *m_state = nullptr;
|
NetworkState *m_state = nullptr;
|
||||||
Timer *m_timer = nullptr;
|
Timer *m_timer = nullptr;
|
||||||
uint32_t m_benchSize = 0;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue