Ecosystem/p2pool
1
0
Fork 0
mirror of https://github.com/SChernykh/p2pool.git synced 2025-03-12 09:29:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed data race in logger

Browse source
This commit is contained in:
SChernykh 2022-04-09 10:41:20 +02:00
parent 7522111bb7
commit 21d8cb917b
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/log.cpp
View file

@ -19,6 +19,7 @@
#include "uv_util.h"
#include <ctime>
#include <fstream>
#include <thread>
static constexpr char log_category_prefix[] = "Log ";
static constexpr char log_file_name[] = "p2pool.log";
@ -47,7 +48,7 @@ public:
enum params : int
{
SLOT_SIZE = 1024,
BUF_SIZE = SLOT_SIZE * 16384,
BUF_SIZE = SLOT_SIZE * 8192,
};
FORCEINLINE Worker()
@ -72,7 +73,9 @@ public:
abort();
}
do {} while (!worker_started);
while (!worker_started) {
std::this_thread::yield();
}
#ifdef _WIN32
DWORD dwConsoleMode;
@ -130,6 +133,7 @@ public:
memcpy(p + 1, buf + 1, size - 1);
// Ensure memory order in the writer thread
std::atomic_thread_fence(std::memory_order_seq_cst);
// Mark that everything is written into this log slot
@ -158,8 +162,13 @@ private:
char* p = m_buf.data() + (m_readPos % BUF_SIZE);
// Wait until everything is written into this log slot
volatile char& severity = *p;
while (!severity) {}
volatile char& severity = p[0];
while (!severity) {
std::this_thread::yield();
}
// Ensure memory order in the reader thread
std::atomic_thread_fence(std::memory_order_seq_cst);
uint32_t size = static_cast<uint8_t>(p[2]);
size = (size << 8) + static_cast<uint8_t>(p[1]);