projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace getnameinfo with inet_ntop in v6 string formatting
[folly.git]
/
folly
/
ProducerConsumerQueue.h
diff --git
a/folly/ProducerConsumerQueue.h
b/folly/ProducerConsumerQueue.h
index da9b93a4d57efd461185ece5ca7ea75d22e1519a..12f2bf427c33ce9485ac393d42097f6b1a1a1741 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.
@@
-22,10
+22,13
@@
#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/concurrency/CacheLocality.h>
+
namespace folly {
/*
namespace folly {
/*
@@
-61,12
+64,12
@@
struct ProducerConsumerQueue {
// (No real synchronization needed at destructor time: only one
// thread can be doing this.)
if (!std::is_trivially_destructible<T>::value) {
// (No real synchronization needed at destructor time: only one
// thread can be doing this.)
if (!std::is_trivially_destructible<T>::value) {
- size_t read = readIndex_;
- size_t end = writeIndex_;
- while (read
!= end
) {
- records_[read].~T();
- if (++read == size_) {
- read = 0;
+ size_t read
Index
= readIndex_;
+ size_t end
Index
= writeIndex_;
+ while (read
Index != endIndex
) {
+ records_[read
Index
].~T();
+ if (++read
Index
== size_) {
+ read
Index
= 0;
}
}
}
}
}
}
@@
-134,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
@@
-156,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_;
}
@@
-165,11
+168,14
@@
struct ProducerConsumerQueue {
}
private:
}
private:
- const uint32_t size_;
- T* const records_;
+ char pad0_[CacheLocality::kFalseSharingRange];
+ const uint32_t size_;
+ T* const records_;
+
+ FOLLY_ALIGN_TO_AVOID_FALSE_SHARING std::atomic<unsigned int> readIndex_;
+ FOLLY_ALIGN_TO_AVOID_FALSE_SHARING std::atomic<unsigned int> writeIndex_;
- std::atomic<unsigned int> readIndex_;
- std::atomic<unsigned int> writeIndex_;
+ char pad1_[CacheLocality::kFalseSharingRange - sizeof(writeIndex_)];
};
}
};
}