-
Notifications
You must be signed in to change notification settings - Fork 79
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
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 { | ||
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 |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good idea.