projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve formatting of scripts and test files
[folly.git]
/
folly
/
ProducerConsumerQueue.h
diff --git
a/folly/ProducerConsumerQueue.h
b/folly/ProducerConsumerQueue.h
index 2a6ed376fc37a2eb5cd9ce1ab4799d067e840c95..fd9c94a0dc3fd49edda24695cb16323be4580a77 100644
(file)
--- a/
folly/ProducerConsumerQueue.h
+++ b/
folly/ProducerConsumerQueue.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 201
3
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,17
+17,17
@@
// @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 <boost/noncopyable.hpp>
-#include <
boost/type_traits.hpp
>
+
+#include <
folly/concurrency/CacheLocality.h
>
namespace folly {
namespace folly {
@@
-35,10
+35,13
@@
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>
-struct ProducerConsumerQueue
: private boost::noncopyable
{
+template
<class T>
+struct ProducerConsumerQueue {
typedef T value_type;
typedef T value_type;
+ ProducerConsumerQueue(const ProducerConsumerQueue&) = delete;
+ ProducerConsumerQueue& operator = (const ProducerConsumerQueue&) = delete;
+
// size must be >= 2.
//
// Also, note that the number of usable slots in the queue at any
// size must be >= 2.
//
// Also, note that the number of usable slots in the queue at any
@@
-60,13
+63,13
@@
struct ProducerConsumerQueue : private boost::noncopyable {
// We need to destruct anything that may still exist in our queue.
// (No real synchronization needed at destructor time: only one
// thread can be doing this.)
// We need to destruct anything that may still exist in our queue.
// (No real synchronization needed at destructor time: only one
// thread can be doing this.)
- if (!
boost::has_trivial_destructor
<T>::value) {
-
int read
= readIndex_;
-
int end
= writeIndex_;
- while (read
!= end
) {
- records_[read].~T();
- if (++read == size_) {
- read = 0;
+ if (!
std::is_trivially_destructible
<T>::value) {
+
size_t readIndex
= readIndex_;
+
size_t endIndex
= writeIndex_;
+ while (read
Index != endIndex
) {
+ records_[read
Index
].~T();
+ if (++read
Index
== size_) {
+ read
Index
= 0;
}
}
}
}
}
}
@@
-74,7
+77,7
@@
struct ProducerConsumerQueue : private boost::noncopyable {
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;
@@
-134,16
+137,16
@@
struct ProducerConsumerQueue : private boost::noncopyable {
}
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,22
+159,23
@@
struct ProducerConsumerQueue : private boost::noncopyable {
// 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_;
}
return ret;
}
if (ret < 0) {
ret += size_;
}
return ret;
}
-private:
+ private:
+ char pad0_[CacheLocality::kFalseSharingRange];
const uint32_t size_;
T* const records_;
const uint32_t size_;
T* const records_;
- std::atomic<int> readIndex_;
- std::atomic<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_[CacheLocality::kFalseSharingRange - sizeof(writeIndex_)];
};
}
};
}
-
-#endif