Commit 376557bb authored by Alfred Fuller's avatar Alfred Fuller Committed by Facebook GitHub Bot

Fix include order and grouping in folly - 10/13

Summary: All changes were automated

Reviewed By: Orvid

Differential Revision: D25507575

fbshipit-source-id: cbddef5a79008d9bf8b6e0234e6433084e5d8df9
parent 5a51004b
......@@ -15,6 +15,7 @@
*/
#include <folly/ssl/SSLSessionManager.h>
#include <folly/portability/OpenSSL.h>
#include <folly/ssl/OpenSSLPtrTypes.h>
#include <folly/ssl/detail/OpenSSLSession.h>
......
......@@ -17,6 +17,7 @@
#pragma once
#include <boost/variant.hpp>
#include <folly/portability/OpenSSL.h>
#include <folly/ssl/OpenSSLPtrTypes.h>
#include <folly/ssl/SSLSession.h>
......
......@@ -15,9 +15,11 @@
*/
#include <folly/ssl/detail/OpenSSLSession.h>
#include <atomic>
#include <folly/portability/OpenSSL.h>
#include <folly/ssl/OpenSSLPtrTypes.h>
#include <atomic>
namespace folly {
namespace ssl {
......
......@@ -16,10 +16,11 @@
#pragma once
#include <atomic>
#include <folly/portability/OpenSSL.h>
#include <folly/ssl/OpenSSLPtrTypes.h>
#include <folly/ssl/SSLSession.h>
#include <atomic>
namespace folly {
namespace ssl {
......
......@@ -19,17 +19,19 @@
#include <memory>
#include <mutex>
#include <glog/logging.h>
#include <folly/Portability.h>
#include <folly/SharedMutex.h>
#include <folly/SpinLock.h>
#include <glog/logging.h>
// We cannot directly use portability/openssl because it also depends on us.
// Therefore we directly use openssl includes. Order of includes is important
// here. See portability/openssl.h.
// clang-format off
#include <folly/portability/Windows.h>
#include <openssl/crypto.h>
// clang-format on
#if !defined(OPENSSL_IS_BORINGSSL)
#define FOLLY_SSL_DETAIL_OPENSSL_IS_110 (OPENSSL_VERSION_NUMBER >= 0x10100000L)
......
......@@ -14,11 +14,11 @@
* limitations under the License.
*/
#include <gtest/gtest.h>
#include <folly/ssl/SSLSessionManager.h>
#include <folly/portability/GTest.h>
#include <folly/portability/OpenSSL.h>
#include <folly/ssl/OpenSSLPtrTypes.h>
#include <folly/ssl/SSLSessionManager.h>
#include <folly/ssl/detail/OpenSSLSession.h>
using folly::ssl::SSLSessionManager;
......
......@@ -16,11 +16,13 @@
#pragma once
#include <folly/Likely.h>
#include <glog/logging.h>
#include <algorithm>
#include <stdexcept>
#include <glog/logging.h>
#include <folly/Likely.h>
namespace folly {
template <typename VT, typename CT>
......
......@@ -16,10 +16,10 @@
#pragma once
#include <folly/Conv.h>
#include <glog/logging.h>
#include <folly/Conv.h>
namespace folly {
namespace detail {
......
......@@ -16,9 +16,10 @@
#pragma once
#include <folly/ConstexprMath.h>
#include <glog/logging.h>
#include <folly/ConstexprMath.h>
namespace folly {
template <typename VT, typename CT>
......
......@@ -21,9 +21,10 @@
#include <string>
#include <vector>
#include <glog/logging.h>
#include <folly/String.h>
#include <folly/stats/BucketedTimeSeries.h>
#include <glog/logging.h>
namespace folly {
......
......@@ -16,13 +16,13 @@
#include <folly/stats/TDigest.h>
#include <algorithm>
#include <limits>
#include <glog/logging.h>
#include <folly/stats/detail/DoubleRadixSort.h>
#include <algorithm>
#include <limits>
namespace folly {
/*
......
......@@ -16,9 +16,10 @@
#pragma once
#include <string>
#include <folly/stats/Histogram.h>
#include <folly/stats/MultiLevelTimeSeries.h>
#include <string>
namespace folly {
......
......@@ -16,11 +16,12 @@
#pragma once
#include <folly/ConstexprMath.h>
#include <chrono>
#include <cstdint>
#include <type_traits>
#include <folly/ConstexprMath.h>
namespace folly {
namespace detail {
......
......@@ -14,9 +14,8 @@
* limitations under the License.
*/
#include <folly/portability/GTest.h>
#include <folly/Random.h>
#include <folly/portability/GTest.h>
#include <folly/stats/detail/DoubleRadixSort.h>
using namespace folly::detail;
......
......@@ -14,16 +14,15 @@
* limitations under the License.
*/
#include <folly/stats/BucketedTimeSeries.h>
#include <folly/stats/MultiLevelTimeSeries.h>
#include <folly/stats/detail/Bucket.h>
#include <array>
#include <glog/logging.h>
#include <folly/container/Foreach.h>
#include <folly/portability/GTest.h>
#include <folly/stats/BucketedTimeSeries.h>
#include <folly/stats/MultiLevelTimeSeries.h>
#include <folly/stats/detail/Bucket.h>
using folly::BucketedTimeSeries;
using std::string;
......
......@@ -16,11 +16,12 @@
#include <folly/synchronization/AsymmetricMemoryBarrier.h>
#include <mutex>
#include <folly/Exception.h>
#include <folly/Indestructible.h>
#include <folly/portability/SysMembarrier.h>
#include <folly/portability/SysMman.h>
#include <mutex>
namespace folly {
......
......@@ -16,12 +16,12 @@
#pragma once
#include <folly/detail/Futex.h>
#include <folly/synchronization/ParkingLot.h>
#include <condition_variable>
#include <cstdint>
#include <folly/detail/Futex.h>
#include <folly/synchronization/ParkingLot.h>
namespace folly {
namespace detail {
namespace atomic_notification {
......
......@@ -16,15 +16,15 @@
#pragma once
#include <folly/Portability.h>
#include <folly/Traits.h>
#include <atomic>
#include <cassert>
#include <cstdint>
#include <tuple>
#include <type_traits>
#include <folly/Portability.h>
#include <folly/Traits.h>
#ifdef _WIN32
#include <intrin.h>
#endif
......
......@@ -19,6 +19,7 @@
#include <assert.h>
#include <errno.h>
#include <stdint.h>
#include <atomic>
#include <thread>
......
......@@ -14,7 +14,15 @@
* limitations under the License.
*/
#include <folly/synchronization/DistributedMutex.h>
#include <array>
#include <atomic>
#include <cstdint>
#include <limits>
#include <stdexcept>
#include <thread>
#include <utility>
#include <glog/logging.h>
#include <folly/ConstexprMath.h>
#include <folly/Likely.h>
......@@ -29,19 +37,10 @@
#include <folly/portability/Asm.h>
#include <folly/synchronization/AtomicNotification.h>
#include <folly/synchronization/AtomicUtil.h>
#include <folly/synchronization/DistributedMutex.h>
#include <folly/synchronization/detail/InlineFunctionRef.h>
#include <folly/synchronization/detail/Sleeper.h>
#include <glog/logging.h>
#include <array>
#include <atomic>
#include <cstdint>
#include <limits>
#include <stdexcept>
#include <thread>
#include <utility>
namespace folly {
namespace detail {
namespace distributed_mutex {
......
......@@ -16,13 +16,13 @@
#pragma once
#include <folly/Optional.h>
#include <folly/functional/Invoke.h>
#include <atomic>
#include <chrono>
#include <cstdint>
#include <folly/Optional.h>
#include <folly/functional/Invoke.h>
namespace folly {
namespace detail {
namespace distributed_mutex {
......
......@@ -16,11 +16,11 @@
#pragma once
#include <folly/portability/GFlags.h>
#include <atomic>
#include <memory>
#include <folly/portability/GFlags.h>
///
/// Forward declatations and implicit documentation of all hazptr
/// top-level classes, functions, macros, default values, and globals.
......
......@@ -16,10 +16,10 @@
#include <folly/synchronization/Hazptr.h>
#include <folly/portability/GFlags.h>
#include <atomic>
#include <folly/portability/GFlags.h>
DEFINE_bool(
folly_hazptr_use_executor,
true,
......
......@@ -16,18 +16,17 @@
#pragma once
#include <folly/synchronization/Hazptr-fwd.h>
#include <folly/synchronization/HazptrObj.h>
#include <folly/synchronization/HazptrRec.h>
#include <folly/synchronization/HazptrThrLocal.h>
#include <atomic>
#include <unordered_set> // for hash set in bulk_reclaim
#include <folly/Memory.h>
#include <folly/Portability.h>
#include <folly/executors/QueuedImmediateExecutor.h>
#include <folly/synchronization/AsymmetricMemoryBarrier.h>
#include <atomic>
#include <unordered_set> // for hash set in bulk_reclaim
#include <folly/synchronization/Hazptr-fwd.h>
#include <folly/synchronization/HazptrObj.h>
#include <folly/synchronization/HazptrRec.h>
#include <folly/synchronization/HazptrThrLocal.h>
///
/// Classes related to hazard pointer domains.
......
......@@ -17,14 +17,12 @@
#pragma once
#include <folly/Traits.h>
#include <folly/synchronization/AsymmetricMemoryBarrier.h>
#include <folly/synchronization/Hazptr-fwd.h>
#include <folly/synchronization/HazptrDomain.h>
#include <folly/synchronization/HazptrRec.h>
#include <folly/synchronization/HazptrThrLocal.h>
#include <folly/synchronization/AsymmetricMemoryBarrier.h>
namespace folly {
///
......
......@@ -16,17 +16,16 @@
#pragma once
#include <folly/synchronization/Hazptr-fwd.h>
#include <folly/synchronization/detail/HazptrUtils.h>
#include <atomic>
#include <memory>
#include <glog/logging.h>
#include <folly/CPortability.h>
#include <folly/Portability.h>
#include <folly/concurrency/CacheLocality.h>
#include <glog/logging.h>
#include <atomic>
#include <memory>
#include <folly/synchronization/Hazptr-fwd.h>
#include <folly/synchronization/detail/HazptrUtils.h>
///
/// Classes related to objects protected by hazard pointers.
......
......@@ -16,13 +16,13 @@
#pragma once
#include <folly/synchronization/Hazptr-fwd.h>
#include <folly/synchronization/HazptrObj.h>
#include <atomic>
#include <stack>
#include <glog/logging.h>
#include <atomic>
#include <stack>
#include <folly/synchronization/Hazptr-fwd.h>
#include <folly/synchronization/HazptrObj.h>
///
/// Classes related to link counted objects and automatic retirement.
......
......@@ -16,11 +16,10 @@
#pragma once
#include <folly/synchronization/Hazptr-fwd.h>
#include <atomic>
#include <folly/concurrency/CacheLocality.h>
#include <atomic>
#include <folly/synchronization/Hazptr-fwd.h>
namespace folly {
......
......@@ -20,14 +20,13 @@
#if FOLLY_HAZPTR_THR_LOCAL
#include <folly/synchronization/HazptrObj.h>
#include <folly/synchronization/HazptrRec.h>
#include <folly/SingletonThreadLocal.h>
#include <atomic>
#include <glog/logging.h>
#include <atomic>
#include <folly/SingletonThreadLocal.h>
#include <folly/synchronization/HazptrObj.h>
#include <folly/synchronization/HazptrRec.h>
/**
* Thread local classes and singletons
......
......@@ -16,6 +16,10 @@
#pragma once
#include <atomic>
#include <glog/logging.h>
#include <folly/Likely.h>
#include <folly/detail/Futex.h>
#include <folly/detail/MemoryIdler.h>
......@@ -24,10 +28,6 @@
#include <folly/synchronization/WaitOptions.h>
#include <folly/synchronization/detail/Spin.h>
#include <glog/logging.h>
#include <atomic>
namespace folly {
/// SaturatingSemaphore is a flag that allows concurrent posting by
......
......@@ -34,9 +34,8 @@
*/
#include <folly/MicroLock.h>
#include <folly/synchronization/MicroSpinLock.h>
#include <folly/Portability.h>
#include <folly/synchronization/MicroSpinLock.h>
#if FOLLY_X64 || FOLLY_AARCH64 || FOLLY_PPC64
#include <folly/synchronization/PicoSpinLock.h>
#endif
......@@ -16,9 +16,10 @@
#pragma once
#include <folly/Portability.h>
#include <mutex>
#include <folly/Portability.h>
namespace folly {
/**
......
......@@ -16,13 +16,13 @@
#pragma once
#include <folly/Portability.h>
#include <folly/synchronization/detail/Sleeper.h>
#include <atomic>
#include <thread>
#include <glog/logging.h>
#include <atomic>
#include <thread>
#include <folly/Portability.h>
#include <folly/synchronization/detail/Sleeper.h>
/// Linked list class templates used in the hazard pointer library:
/// - linked_list: Sequential linked list that uses a pre-existing
......
......@@ -16,15 +16,15 @@
#pragma once
#include <folly/Optional.h>
#include <folly/Portability.h>
#include <cassert>
#include <memory>
#include <mutex>
#include <stdexcept>
#include <utility>
#include <folly/Optional.h>
#include <folly/Portability.h>
namespace folly {
namespace detail {
namespace proxylockable_detail {
......
......@@ -16,10 +16,10 @@
#pragma once
#include <folly/Optional.h>
#include <mutex>
#include <folly/Optional.h>
namespace folly {
namespace detail {
......
......@@ -18,10 +18,11 @@
#include <atomic>
#include <glog/logging.h>
#include <folly/Function.h>
#include <folly/Synchronized.h>
#include <folly/ThreadLocal.h>
#include <glog/logging.h>
namespace folly {
......
......@@ -16,10 +16,10 @@
#include <folly/synchronization/detail/Hardware.h>
#include <folly/portability/GTest.h>
#include <glog/logging.h>
#include <folly/portability/GTest.h>
using namespace folly;
class HardwareTest : public testing::Test {};
......
......@@ -16,10 +16,10 @@
#include <folly/synchronization/detail/InlineFunctionRef.h>
#include <folly/portability/GTest.h>
#include <cstring>
#include <folly/portability/GTest.h>
namespace folly {
namespace detail {
......
......@@ -14,12 +14,13 @@
* limitations under the License.
*/
#include <folly/Benchmark.h>
#include <folly/synchronization/detail/ProxyLockable.h>
#include <mutex>
#include <tuple>
#include <folly/Benchmark.h>
namespace folly {
namespace detail {
namespace {
......
......@@ -15,10 +15,6 @@
*/
#include <folly/synchronization/detail/ProxyLockable.h>
#include <folly/Benchmark.h>
#include <folly/Random.h>
#include <folly/portability/GTest.h>
#include <folly/synchronization/DistributedMutex.h>
#include <atomic>
#include <chrono>
......@@ -27,6 +23,11 @@
#include <tuple>
#include <vector>
#include <folly/Benchmark.h>
#include <folly/Random.h>
#include <folly/portability/GTest.h>
#include <folly/synchronization/DistributedMutex.h>
using namespace std::literals;
namespace folly {
......
......@@ -16,10 +16,10 @@
#pragma once
#include <folly/synchronization/Hazptr.h>
#include <atomic>
#include <folly/synchronization/Hazptr.h>
namespace folly {
/** Set implemented as an ordered singly-linked list.
......
......@@ -16,10 +16,10 @@
#pragma once
#include <folly/synchronization/Hazptr.h>
#include <string>
#include <folly/synchronization/Hazptr.h>
namespace folly {
/** Wide CAS.
......
......@@ -16,11 +16,11 @@
#include <folly/synchronization/AtomicNotification.h>
#include <thread>
#include <folly/Optional.h>
#include <folly/portability/GTest.h>
#include <thread>
using namespace std::literals;
namespace folly {
......
......@@ -16,13 +16,13 @@
#include <folly/synchronization/AtomicUtil.h>
#include <utility>
#include <folly/Benchmark.h>
#include <folly/Portability.h>
#include <folly/Utility.h>
#include <folly/portability/GTest.h>
#include <utility>
namespace folly {
class AtomicCompareExchangeSuccTest : public testing::Test {};
......
......@@ -16,11 +16,11 @@
#pragma once
#include <stdint.h>
#include <condition_variable>
#include <mutex>
#include <stdint.h>
namespace folly {
namespace test {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment