gf4
/
p2pool
mirror of https://github.com/SChernykh/p2pool
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More clang fixes

pull/2/head
SChernykh 2021-08-23 11:44:26 +02:00
parent 4a5691e349
commit 39a8c68ab7
5 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/flags.cmake
View File

@ -39,7 +39,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${WARNING_FLAGS} ${SECURITY_FLAGS} /Ob1 /Ot /Zi /MT") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${WARNING_FLAGS} ${SECURITY_FLAGS} /Ob1 /Ot /Zi /MT")
elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang) elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang)
set(WARNING_FLAGS "-Wall -Wextra -Werror") set(WARNING_FLAGS "-Wall -Wextra")
set(OPTIMIZATION_FLAGS "-Ofast -funroll-loops -fmerge-all-constants") set(OPTIMIZATION_FLAGS "-Ofast -funroll-loops -fmerge-all-constants")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}")

3
src/mempool.cpp
View File

@ -23,8 +23,7 @@ static constexpr char log_category_prefix[] = "Mempool ";
namespace p2pool { namespace p2pool {
Mempool::Mempool(p2pool* pool) Mempool::Mempool()
: m_pool(pool)
{ {
uv_rwlock_init_checked(&m_lock); uv_rwlock_init_checked(&m_lock);
} }

5
src/mempool.h
View File

@ -26,15 +26,12 @@ class p2pool;
class Mempool : public nocopy_nomove class Mempool : public nocopy_nomove
{ {
public: public:
explicit Mempool(p2pool* pool); Mempool();
~Mempool(); ~Mempool();
void add(const TxMempoolData& tx); void add(const TxMempoolData& tx);
void swap(std::vector<TxMempoolData>& transactions); void swap(std::vector<TxMempoolData>& transactions);
private:
p2pool* m_pool;
public: public:
mutable uv_rwlock_t m_lock; mutable uv_rwlock_t m_lock;
std::vector<TxMempoolData> m_transactions; std::vector<TxMempoolData> m_transactions;

2
src/p2pool.cpp
View File

@ -65,7 +65,7 @@ p2pool::p2pool(int argc, char* argv[])
m_sideChain = new SideChain(this); m_sideChain = new SideChain(this);
m_hasher = new RandomX_Hasher(this); m_hasher = new RandomX_Hasher(this);
m_blockTemplate = new BlockTemplate(this); m_blockTemplate = new BlockTemplate(this);
m_mempool = new Mempool(this); m_mempool = new Mempool();
m_consoleCommands = new ConsoleCommands(this); m_consoleCommands = new ConsoleCommands(this);
} }

2
src/util.cpp
View File

@ -50,7 +50,7 @@ void make_thread_background()
SetThreadPriorityBoost(GetCurrentThread(), true); SetThreadPriorityBoost(GetCurrentThread(), true);
SetThreadPriority(GetCurrentThread(), THREAD_MODE_BACKGROUND_BEGIN); SetThreadPriority(GetCurrentThread(), THREAD_MODE_BACKGROUND_BEGIN);
SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_IDLE); SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_IDLE);
#else #elif !defined(__APPLE__)
sched_param param; sched_param param;
param.sched_priority = 0; param.sched_priority = 0;
if (sched_setscheduler(0, SCHED_IDLE, &param) != 0) { if (sched_setscheduler(0, SCHED_IDLE, &param) != 0) {