projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added folly::hint_emplace_iterator to folly/Iterator.h
[folly.git]
/
folly
/
ProducerConsumerQueue.h
diff --git
a/folly/ProducerConsumerQueue.h
b/folly/ProducerConsumerQueue.h
index 69f3fd5a79019f7daeae66b6806a7df404708934..9ebe65acb46c66dbef1f9ab33e77e07fd968bdeb 100644
(file)
--- a/
folly/ProducerConsumerQueue.h
+++ b/
folly/ProducerConsumerQueue.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 201
6
Facebook, Inc.
+ * Copyright 201
7
Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-17,16
+17,18
@@
// @author Bo Hu (bhu@fb.com)
// @author Jordan DeLong (delong.j@fb.com)
// @author Bo Hu (bhu@fb.com)
// @author Jordan DeLong (delong.j@fb.com)
-#ifndef PRODUCER_CONSUMER_QUEUE_H_
-#define PRODUCER_CONSUMER_QUEUE_H_
+#pragma once
#include <atomic>
#include <cassert>
#include <cstdlib>
#include <atomic>
#include <cassert>
#include <cstdlib>
+#include <memory>
#include <stdexcept>
#include <type_traits>
#include <utility>
#include <stdexcept>
#include <type_traits>
#include <utility>
+#include <folly/detail/CacheLocality.h>
+
namespace folly {
/*
namespace folly {
/*
@@
-135,16
+137,16
@@
struct ProducerConsumerQueue {
}
bool isEmpty() const {
}
bool isEmpty() const {
-
return readIndex_.load(std::memory_order_consum
e) ==
-
writeIndex_.load(std::memory_order_consum
e);
+
return readIndex_.load(std::memory_order_acquir
e) ==
+
writeIndex_.load(std::memory_order_acquir
e);
}
bool isFull() const {
}
bool isFull() const {
- auto nextRecord = writeIndex_.load(std::memory_order_
consum
e) + 1;
+ auto nextRecord = writeIndex_.load(std::memory_order_
acquir
e) + 1;
if (nextRecord == size_) {
nextRecord = 0;
}
if (nextRecord == size_) {
nextRecord = 0;
}
- if (nextRecord != readIndex_.load(std::memory_order_
consum
e)) {
+ if (nextRecord != readIndex_.load(std::memory_order_
acquir
e)) {
return false;
}
// queue is full
return false;
}
// queue is full
@@
-157,8
+159,8
@@
struct ProducerConsumerQueue {
// be removing items concurrently).
// * It is undefined to call this from any other thread.
size_t sizeGuess() const {
// be removing items concurrently).
// * It is undefined to call this from any other thread.
size_t sizeGuess() const {
- int ret = writeIndex_.load(std::memory_order_
consum
e) -
-
readIndex_.load(std::memory_order_consum
e);
+ int ret = writeIndex_.load(std::memory_order_
acquir
e) -
+
readIndex_.load(std::memory_order_acquir
e);
if (ret < 0) {
ret += size_;
}
if (ret < 0) {
ret += size_;
}
@@
-166,13
+168,14
@@
struct ProducerConsumerQueue {
}
private:
}
private:
+ char pad0_[detail::CacheLocality::kFalseSharingRange];
const uint32_t size_;
T* const records_;
const uint32_t size_;
T* const records_;
- std::atomic<unsigned int> readIndex_;
- std::atomic<unsigned int> writeIndex_;
+ FOLLY_ALIGN_TO_AVOID_FALSE_SHARING std::atomic<unsigned int> readIndex_;
+ FOLLY_ALIGN_TO_AVOID_FALSE_SHARING std::atomic<unsigned int> writeIndex_;
+
+ char pad1_[detail::CacheLocality::kFalseSharingRange - sizeof(writeIndex_)];
};
}
};
}
-
-#endif