projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
parkinglot benchmark
[folly.git]
/
folly
/
ProducerConsumerQueue.h
diff --git
a/folly/ProducerConsumerQueue.h
b/folly/ProducerConsumerQueue.h
index 9ebe65acb46c66dbef1f9ab33e77e07fd968bdeb..57d41cca84b9599604bbca4581b3cf862b423fe2 100644
(file)
--- a/
folly/ProducerConsumerQueue.h
+++ b/
folly/ProducerConsumerQueue.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 201
7
Facebook, Inc.
+ * Copyright 201
2-present
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.
@@
-27,7
+27,7
@@
#include <type_traits>
#include <utility>
#include <type_traits>
#include <utility>
-#include <folly/
detail
/CacheLocality.h>
+#include <folly/
concurrency
/CacheLocality.h>
namespace folly {
namespace folly {
@@
-35,7
+35,7
@@
namespace folly {
* ProducerConsumerQueue is a one producer and one consumer queue
* without locks.
*/
* ProducerConsumerQueue is a one producer and one consumer queue
* without locks.
*/
-template<class T>
+template
<class T>
struct ProducerConsumerQueue {
typedef T value_type;
struct ProducerConsumerQueue {
typedef T value_type;
@@
-64,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;
}
}
}
}
}
}
@@
-77,7
+77,7
@@
struct ProducerConsumerQueue {
std::free(records_);
}
std::free(records_);
}
- template
<class ...
Args>
+ template
<class...
Args>
bool write(Args&&... recordArgs) {
auto const currentWrite = writeIndex_.load(std::memory_order_relaxed);
auto nextRecord = currentWrite + 1;
bool write(Args&&... recordArgs) {
auto const currentWrite = writeIndex_.load(std::memory_order_relaxed);
auto nextRecord = currentWrite + 1;
@@
-167,15
+167,22
@@
struct ProducerConsumerQueue {
return ret;
}
return ret;
}
-private:
- char pad0_[detail::CacheLocality::kFalseSharingRange];
+ // maximum number of items in the queue.
+ size_t capacity() const {
+ return size_ - 1;
+ }
+
+ private:
+ char pad0_[hardware_destructive_interference_size];
const uint32_t size_;
T* const records_;
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_;
+ alignas(hardware_destructive_interference_size)
+ std::atomic<unsigned int> readIndex_;
+ alignas(hardware_destructive_interference_size)
+ std::atomic<unsigned int> writeIndex_;
- char pad1_[
detail::CacheLocality::kFalseSharingRang
e - sizeof(writeIndex_)];
+ char pad1_[
hardware_destructive_interference_siz
e - sizeof(writeIndex_)];
};
};
-}
+}
// namespace folly