Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

maint: Remove use of folly/ThreadCachedInt #1486

Merged
merged 2 commits into from
May 14, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions cpp/arcticdb/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,7 @@ set(arcticdb_srcs
util/sparse_utils.hpp
util/storage_lock.hpp
util/string_utils.hpp
util/thread_cached_int.hpp
util/timeouts.hpp
util/timer.hpp
util/trace.hpp
Expand Down
4 changes: 2 additions & 2 deletions cpp/arcticdb/util/allocator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#include <arcticdb/util/memory_tracing.hpp>
#include <arcticdb/util/clock.hpp>
#include <arcticdb/util/configs_map.hpp>
#include <arcticdb/util/thread_cached_int.hpp>
#include <folly/concurrency/ConcurrentHashMap.h>
#include <folly/ThreadCachedInt.h>

#include <fmt/std.h>

Expand Down Expand Up @@ -152,7 +152,7 @@ namespace arcticdb {
namespace {
template<typename TracingPolicy, typename ClockType>
auto& free_count_of(){
static folly::ThreadCachedInt<uint32_t> free_count;
static ThreadCachedInt<uint32_t> free_count;
return free_count;
};
}
Expand Down
76 changes: 76 additions & 0 deletions cpp/arcticdb/util/thread_cached_int.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
/* Copyright 2023 Man Group Operations Limited
*
* Use of this software is governed by the Business Source License 1.1 included in the file licenses/BSL.txt.
*
* As of the Change Date specified in that file, in accordance with the Business Source License, use of this software will be governed by the Apache License, version 2.0.
*/

#pragma once

#include <atomic>
#include <boost/thread/tss.hpp>

namespace arcticdb {

template <class IntT>
class ThreadCachedInt {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This implementation LGTM!

I think it might be useful to mention that this implementation is a modification of one of folly, as you mentioned in the description of this PR. There's no problem with it since folly is Apache-2.0 licensed.

What do you think?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea.

public:
explicit ThreadCachedInt(IntT initialVal = 0, uint32_t cacheSize = 1000)
: target_(initialVal), cacheSize_(cacheSize) {}

ThreadCachedInt(const ThreadCachedInt&) = delete;
ThreadCachedInt& operator=(const ThreadCachedInt&) = delete;

void increment(IntT inc) {
auto cache = cache_.get();
if (cache == nullptr) {
cache = new IntCache(*this);
cache_.reset(cache);
}
cache->increment(inc);
}

// Quickly grabs the current value which may not include some cached increments.
IntT readFast() const {
return target_.load(std::memory_order_relaxed);
}

// Quickly reads and resets current value (doesn't reset cached increments).
IntT readFastAndReset() {
return target_.exchange(0, std::memory_order_release);
}

private:
struct IntCache;

std::atomic<IntT> target_;
std::atomic<uint32_t> cacheSize_;
boost::thread_specific_ptr<IntCache> cache_; // Must be last for dtor ordering

struct IntCache {
ThreadCachedInt* parent_;
mutable IntT val_;
mutable uint32_t numUpdates_;

explicit IntCache(ThreadCachedInt& parent)
: parent_(&parent), val_(0), numUpdates_(0) {}

void increment(IntT inc) {
val_ += inc;
++numUpdates_;
if (numUpdates_ > parent_->cacheSize_.load(std::memory_order_acquire)) {
flush();
}
}

void flush() const {
parent_->target_.fetch_add(val_, std::memory_order_release);
val_ = 0;
numUpdates_ = 0;
}

~IntCache() { flush(); }
};
};

} //namespace arcticdb