From dcf8a19c8d08d7e730d3862c88396fdcdfa2813f Mon Sep 17 00:00:00 2001
From: Yedidya Feldblum <yfeldblum@fb.com>
Date: Wed, 10 Jan 2018 12:05:34 -0800
Subject: [PATCH] Let Futex import base-class ctors

Summary:
[Folly] Let `Futex` import base-class ctors.

Rather than needing to define ctors and inherit `boost::noncopyable`.

Reviewed By: WillerZ

Differential Revision: D6674054

fbshipit-source-id: 59e0a4815682b227346954fe47c6eda49e3ad62f
---
 folly/SharedMutex.h                             | 2 +-
 folly/SpinLock.h                                | 2 ++
 folly/concurrency/DynamicBoundedQueue.h         | 3 ++-
 folly/detail/Futex.h                            | 7 ++-----
 folly/experimental/FlatCombiningPriorityQueue.h | 4 ++--
 folly/fibers/Baton.h                            | 2 +-
 folly/synchronization/detail/ThreadCachedInts.h | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/folly/SharedMutex.h b/folly/SharedMutex.h
index ce160f80..976c6e09 100644
--- a/folly/SharedMutex.h
+++ b/folly/SharedMutex.h
@@ -563,7 +563,7 @@ class SharedMutexImpl {
   };
 
   // 32 bits of state
-  Futex state_;
+  Futex state_{};
 
   // S count needs to be on the end, because we explicitly allow it to
   // underflow.  This can occur while we are in the middle of applying
diff --git a/folly/SpinLock.h b/folly/SpinLock.h
index 3df5d4e1..a735fcd1 100644
--- a/folly/SpinLock.h
+++ b/folly/SpinLock.h
@@ -34,6 +34,8 @@
 
 #include <type_traits>
 
+#include <boost/noncopyable.hpp>
+
 #include <folly/Portability.h>
 #include <folly/SmallLocks.h>
 
diff --git a/folly/concurrency/DynamicBoundedQueue.h b/folly/concurrency/DynamicBoundedQueue.h
index e6634b8d..18ff4928 100644
--- a/folly/concurrency/DynamicBoundedQueue.h
+++ b/folly/concurrency/DynamicBoundedQueue.h
@@ -330,7 +330,8 @@ class DynamicBoundedQueue {
         capacity_(capacity + threshold(capacity)), // capacity slack
         credit_(0),
         threshold_(threshold(capacity)),
-        transfer_(0) {}
+        transfer_(0),
+        waiting_(0) {}
 
   /** destructor */
   ~DynamicBoundedQueue() {}
diff --git a/folly/detail/Futex.h b/folly/detail/Futex.h
index 630ad696..de0c78f9 100644
--- a/folly/detail/Futex.h
+++ b/folly/detail/Futex.h
@@ -22,8 +22,6 @@
 #include <limits>
 #include <type_traits>
 
-#include <boost/noncopyable.hpp>
-
 #include <folly/portability/Unistd.h>
 
 namespace folly { namespace detail {
@@ -45,9 +43,8 @@ enum class FutexResult {
  * (and benchmarks to back you up).
  */
 template <template <typename> class Atom = std::atomic>
-struct Futex : Atom<uint32_t>, boost::noncopyable {
-
-  explicit constexpr Futex(uint32_t init = 0) : Atom<uint32_t>(init) {}
+struct Futex : Atom<uint32_t> {
+  using Atom<uint32_t>::Atom;
 
   /** Puts the thread to sleep if this->load() == expected.  Returns true when
    *  it is returning because it has consumed a wake() event, false for any
diff --git a/folly/experimental/FlatCombiningPriorityQueue.h b/folly/experimental/FlatCombiningPriorityQueue.h
index a8c3c128..5e57e313 100644
--- a/folly/experimental/FlatCombiningPriorityQueue.h
+++ b/folly/experimental/FlatCombiningPriorityQueue.h
@@ -171,8 +171,8 @@ class FlatCombiningPriorityQueue
  private:
   size_t maxSize_;
   PriorityQueue pq_;
-  detail::Futex<Atom> empty_;
-  detail::Futex<Atom> full_;
+  detail::Futex<Atom> empty_{};
+  detail::Futex<Atom> full_{};
 
   bool isTrue(detail::Futex<Atom>& futex) {
     return futex.load(std::memory_order_relaxed) != 0;
diff --git a/folly/fibers/Baton.h b/folly/fibers/Baton.h
index 286ded79..65694b66 100644
--- a/folly/fibers/Baton.h
+++ b/folly/fibers/Baton.h
@@ -258,7 +258,7 @@ class Baton {
   union {
     std::atomic<intptr_t> waitingFiber_;
     struct {
-      folly::detail::Futex<> futex;
+      folly::detail::Futex<> futex{};
       int32_t _unused_packing;
     } futex_;
   };
diff --git a/folly/synchronization/detail/ThreadCachedInts.h b/folly/synchronization/detail/ThreadCachedInts.h
index 1e6b0fb8..1363cc1a 100644
--- a/folly/synchronization/detail/ThreadCachedInts.h
+++ b/folly/synchronization/detail/ThreadCachedInts.h
@@ -38,7 +38,7 @@ template <typename Tag>
 class ThreadCachedInts {
   std::atomic<int64_t> orphan_inc_[2];
   std::atomic<int64_t> orphan_dec_[2];
-  folly::detail::Futex<> waiting_;
+  folly::detail::Futex<> waiting_{0};
 
   class Integer {
    public:
-- 
2.34.1