ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2025-12-06 17:27:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Use mutex from utils (#1851)

Browse Source 
Fixes #1359.
This commit is contained in:
Sergey Kuznetsov
2025-01-27 15:28:00 +00:00
committed by GitHub
parent 6ef6ca9e65
commit 540e938223
11 changed files with 112 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/common/etl/FakeDiffProvider.hpp
View File

@@ -20,6 +20,7 @@
#pragma once
#include "data/Types.hpp"
#include "util/Mutex.hpp"
#include <xrpl/basics/Blob.h>
#include <xrpl/basics/base_uint.h>
@@ -27,7 +28,6 @@
#include <cstddef>
#include <cstdint>
#include <map>
#include <mutex>
#include <optional>
#include <thread>
#include <vector>
@@ -57,14 +57,14 @@ struct DiffProvider {
nextKey(std::size_t keysSize)
{
// mock the result from doFetchSuccessorKey, be aware this function will be called from multiple threads
std::lock_guard<std::mutex> const guard(keysMutex_);
threadKeysMap_[std::this_thread::get_id()]++;
auto keysMap = threadKeysMap_.lock();
keysMap->operator[](std::this_thread::get_id())++;
if (threadKeysMap_[std::this_thread::get_id()] == keysSize - 1) {
if (keysMap->operator[](std::this_thread::get_id()) == keysSize - 1) {
return data::kLAST_KEY;
}
if (threadKeysMap_[std::this_thread::get_id()] == keysSize) {
threadKeysMap_[std::this_thread::get_id()] = 0;
if (keysMap->operator[](std::this_thread::get_id()) == keysSize) {
keysMap->operator[](std::this_thread::get_id()) = 0;
return std::nullopt;
}
@@ -72,6 +72,5 @@ struct DiffProvider {
}
private:
std::mutex keysMutex_;
std::map<std::thread::id, uint32_t> threadKeysMap_;
util::Mutex<std::map<std::thread::id, uint32_t>> threadKeysMap_;
};