clearlinux/folly
2
0
Fork 0
mirror of https://github.com/clearlinux/folly.git synced 2026-09-06 13:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix race condition in collect(..)

Browse Source 
Summary: This is a temporary fix (until D2015320 is checked in) for race condition(s) in collect(..) method.

Test Plan:
Run unit tests
Run buffalo_aggregator canary

Reviewed By: jsedgwick@fb.com

Subscribers: folly-diffs@, jsedgwick, yfeldblum, chalfant

FB internal diff: D2037406

Tasks: 6894157

Signature: t1:2037406:1430435227:ed9612d016cdbd708e2deba02dc4fe0b59632f5a
This commit is contained in:
Vladislav Isenbaev
2015-05-11 17:01:48 -07:00
committed by Praveen Kumar Ramakrishnan
parent 0b46bcd5ec
commit e602963840
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
folly/futures/Future-inl.h
+6 -7
View File
@@ -620,13 +620,13 @@ struct CollectContext {
Optional<T>
>::type VecT;
explicit CollectContext(int n) : count(0), threw(false) {
explicit CollectContext(int n) : count(0), success_count(0), threw(false) {
results.resize(n);
}
Promise<std::vector<T>> p;
std::vector<VecT> results;
std::atomic<size_t> count;
std::atomic<size_t> count, success_count;
std::atomic_bool threw;
typedef std::vector<T> result_type;
@@ -647,10 +647,10 @@ struct CollectContext {
template <>
struct CollectContext<void> {
explicit CollectContext(int n) : count(0), threw(false) {}
explicit CollectContext(int n) : count(0), success_count(0), threw(false) {}
Promise<void> p;
std::atomic<size_t> count;
std::atomic<size_t> count, success_count;
std::atomic_bool threw;
typedef void result_type;
@@ -690,7 +690,6 @@ collect(InputIterator first, InputIterator last) {
assert(i < n);
auto& f = *first;
f.setCallback_([ctx, i, n](Try<T> t) {
auto c = ++ctx->count;
if (t.hasException()) {
if (!ctx->threw.exchange(true)) {
@@ -698,12 +697,12 @@ collect(InputIterator first, InputIterator last) {
}
} else if (!ctx->threw) {
ctx->addResult(i, t);
if (c == n) {
if (++ctx->success_count == n) {
ctx->setValue();
}
}
if (c == n) {
if (++ctx->count == n) {
delete ctx;
}
});