Switch gflags to portability/GFlags.h

Summary: There are two places that still includes gflags/gflags.h: portability/GFlags.h and futures/exercises/Koan.h. Also removing gflags entirely from a couple of places which never reference it at all. Reviewed By: yfeldblum Differential Revision: D3203187 fb-gh-sync-id: e7725fbf2c4b3c475c0035e1b0e8c6e1227f277f fbshipit-source-id: e7725fbf2c4b3c475c0035e1b0e8c6e1227f277f
facebook · May 5, 2016 · 4598dd7 · 4598dd7
1 parent 2d96948
commit 4598dd7
Show file tree

Hide file tree

Showing 51 changed files with 154 additions and 138 deletions.
diff --git a/folly/MemoryMapping.cpp b/folly/MemoryMapping.cpp
@@ -21,6 +21,7 @@
 #include <utility>
 
 #include <folly/Format.h>
+#include <folly/portability/GFlags.h>
 #include <folly/portability/SysMman.h>
 
 #ifdef __linux__
@@ -30,7 +31,6 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <system_error>
-#include <gflags/gflags.h>
 
 DEFINE_int64(mlock_chunk_size, 1 << 20,  // 1MB
              "Maximum bytes to mlock/munlock/munmap at once "

diff --git a/folly/build/GenerateFingerprintTables.cpp b/folly/build/GenerateFingerprintTables.cpp
@@ -24,9 +24,9 @@
 #include <string>
 
 #include <glog/logging.h>
-#include <gflags/gflags.h>
 
 #include <folly/Format.h>
+#include <folly/portability/GFlags.h>
 
 #include <folly/detail/FingerprintPolynomial.h>
 

diff --git a/folly/experimental/ProgramOptions.cpp b/folly/experimental/ProgramOptions.cpp
@@ -20,10 +20,11 @@
 #include <unordered_set>
 
 #include <boost/version.hpp>
-#include <gflags/gflags.h>
 #include <glog/logging.h>
+
 #include <folly/Conv.h>
 #include <folly/Portability.h>
+#include <folly/portability/GFlags.h>
 
 namespace po = ::boost::program_options;
 

diff --git a/folly/experimental/ProgramOptions.h b/folly/experimental/ProgramOptions.h
@@ -17,8 +17,9 @@
 #pragma once
 
 #include <boost/program_options.hpp>
+
 #include <folly/Optional.h>
-#include <gflags/gflags.h>
+#include <folly/portability/GFlags.h>
 
 namespace folly {
 

diff --git a/folly/experimental/exception_tracer/ExceptionTracerBenchmark.cpp b/folly/experimental/exception_tracer/ExceptionTracerBenchmark.cpp
@@ -18,11 +18,11 @@
 #include <thread>
 #include <vector>
 
-#include <gflags/gflags.h>
 #include <glog/logging.h>
 
 #include <folly/Benchmark.h>
 #include <folly/experimental/exception_tracer/ExceptionTracer.h>
+#include <folly/portability/GFlags.h>
 
 void recurse(int level) {
   if (level == 0) {

diff --git a/folly/experimental/io/HugePageUtil.cpp b/folly/experimental/io/HugePageUtil.cpp
@@ -25,15 +25,14 @@
 #include <stdexcept>
 #include <system_error>
 
-#include <gflags/gflags.h>
-
 #include <folly/File.h>
 #include <folly/Format.h>
 #include <folly/MemoryMapping.h>
 #include <folly/Portability.h>
 #include <folly/Range.h>
 #include <folly/ScopeGuard.h>
 #include <folly/experimental/io/HugePages.h>
+#include <folly/portability/GFlags.h>
 
 DEFINE_bool(cp, false, "Copy file");
 

diff --git a/folly/experimental/symbolizer/ElfUtil.cpp b/folly/experimental/symbolizer/ElfUtil.cpp
@@ -19,9 +19,10 @@
 
 #include <stdio.h>
 
-#include <gflags/gflags.h>
 #include <glog/logging.h>
 
+#include <folly/portability/GFlags.h>
+
 using namespace folly;
 using namespace folly::symbolizer;
 

diff --git a/folly/experimental/symbolizer/test/DwarfBenchmark.cpp b/folly/experimental/symbolizer/test/DwarfBenchmark.cpp
@@ -16,7 +16,7 @@
 
 #include <folly/Benchmark.h>
 #include <folly/experimental/symbolizer/Dwarf.h>
-#include <gflags/gflags.h>
+#include <folly/portability/GFlags.h>
 
 void dummy() {}
 

diff --git a/folly/experimental/test/LockFreeRingBufferTest.cpp b/folly/experimental/test/LockFreeRingBufferTest.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <gflags/gflags.h>
 #include <gtest/gtest.h>
 #include <iostream>
 #include <thread>

diff --git a/folly/experimental/test/NestedCommandLineAppTestHelper.cpp b/folly/experimental/test/NestedCommandLineAppTestHelper.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <folly/experimental/NestedCommandLineApp.h>
-#include <gflags/gflags.h>
+#include <folly/portability/GFlags.h>
 
 DEFINE_int32(global_foo, 42, "Global foo");
 

diff --git a/folly/experimental/test/ReadMostlySharedPtrBenchmark.cpp b/folly/experimental/test/ReadMostlySharedPtrBenchmark.cpp
@@ -15,14 +15,15 @@
  */
 /* -*- Mode: C++; tab-width: 2; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 
-#include <thread>
+#include <folly/experimental/ReadMostlySharedPtr.h>
+
 #include <iostream>
+#include <thread>
+
 #include <folly/Benchmark.h>
 #include <folly/Memory.h>
-#include <gflags/gflags.h>
-
 #include <folly/experimental/RCURefCount.h>
-#include <folly/experimental/ReadMostlySharedPtr.h>
+#include <folly/portability/GFlags.h>
 
 template <template<typename> class MainPtr,
           template<typename> class WeakPtr,

diff --git a/folly/experimental/test/StringKeyedTest.cpp b/folly/experimental/test/StringKeyedTest.cpp
@@ -15,19 +15,20 @@
  */
 // Copyright 2013-present Facebook. All Rights Reserved.
 
-#include <gflags/gflags.h>
-#include <glog/logging.h>
-#include <gtest/gtest.h>
-
-#include <string>
-#include <list>
-
-#include <folly/Range.h>
 #include <folly/experimental/StringKeyedMap.h>
 #include <folly/experimental/StringKeyedSet.h>
 #include <folly/experimental/StringKeyedUnorderedMap.h>
 #include <folly/experimental/StringKeyedUnorderedSet.h>
 
+#include <list>
+#include <string>
+
+#include <glog/logging.h>
+#include <gtest/gtest.h>
+
+#include <folly/Range.h>
+#include <folly/portability/GFlags.h>
+
 using folly::StringKeyedMap;
 using folly::StringKeyedSetBase;
 using folly::StringKeyedUnorderedMap;

diff --git a/folly/init/Init.cpp b/folly/init/Init.cpp
@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <folly/init/Init.h>
-#include <folly/Singleton.h>
-#include <folly/experimental/symbolizer/SignalHandler.h>
 
 #include <glog/logging.h>
-#include <gflags/gflags.h>
+
+#include <folly/Singleton.h>
+#include <folly/experimental/symbolizer/SignalHandler.h>
+#include <folly/portability/GFlags.h>
 
 namespace folly {
 

diff --git a/folly/io/async/test/EventBaseBenchmark.cpp b/folly/io/async/test/EventBaseBenchmark.cpp
@@ -16,8 +16,7 @@
 
 #include <folly/Benchmark.h>
 #include <folly/io/async/EventBase.h>
-
-#include <gflags/gflags.h>
+#include <folly/portability/GFlags.h>
 
 using namespace folly;
 

diff --git a/folly/io/test/IOBufQueueTest.cpp b/folly/io/test/IOBufQueueTest.cpp
@@ -15,15 +15,15 @@
  */
 
 #include <folly/io/IOBufQueue.h>
-#include <folly/Range.h>
-
-#include <gflags/gflags.h>
-#include <gtest/gtest.h>
 
 #include <iostream>
 #include <stdexcept>
 #include <string.h>
 
+#include <gtest/gtest.h>
+
+#include <folly/Range.h>
+
 using folly::IOBuf;
 using folly::IOBufQueue;
 using folly::StringPiece;

diff --git a/folly/io/test/IOBufTest.cpp b/folly/io/test/IOBufTest.cpp
@@ -17,15 +17,14 @@
 #include <folly/io/IOBuf.h>
 #include <folly/io/TypedIOBuf.h>
 
-#include <gflags/gflags.h>
+#include <cstddef>
+
 #include <boost/random.hpp>
 #include <gtest/gtest.h>
 
 #include <folly/Malloc.h>
 #include <folly/Range.h>
 
-#include <cstddef>
-
 using folly::fbstring;
 using folly::fbvector;
 using folly::IOBuf;

diff --git a/folly/io/test/NetworkBenchmark.cpp b/folly/io/test/NetworkBenchmark.cpp
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-#include <folly/io/IOBuf.h>
+#include <vector>
 
-#include <gflags/gflags.h>
 #include <folly/Benchmark.h>
 #include <folly/io/Cursor.h>
-
-#include <vector>
+#include <folly/io/IOBuf.h>
+#include <folly/portability/GFlags.h>
 
 using folly::IOBuf;
 using std::unique_ptr;

diff --git a/folly/io/test/RecordIOTest.cpp b/folly/io/test/RecordIOTest.cpp
@@ -18,10 +18,8 @@
 
 #include <sys/types.h>
 #include <unistd.h>
-
 #include <random>
 
-#include <gflags/gflags.h>
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 
@@ -30,6 +28,7 @@
 #include <folly/Random.h>
 #include <folly/experimental/TestUtil.h>
 #include <folly/io/IOBufQueue.h>
+#include <folly/portability/GFlags.h>
 
 DEFINE_int32(random_seed, folly::randomNumberSeed(), "random seed");
 

diff --git a/folly/portability/GFlags.h b/folly/portability/GFlags.h
@@ -16,9 +16,9 @@
 
 #pragma once
 
-#if FOLLY_HAVE_LIBGFLAGS
-#include <gflags/gflags.h>
-#else
+#include <folly/portability/Config.h>
+
+#if defined(FOLLY_HAVE_LIBGFLAGS) && (FOLLY_HAVE_LIBGFLAGS == 0)
 // glog/logging.h is dependent on this implementation detail
 // being defined otherwise it undefines all of this -_-....
 //
@@ -58,4 +58,6 @@
   FOLLY_DEFINE_FLAG(unsigned long long, U64, _name, _default)
 #define DEFINE_string(_name, _default, _description) \
   FOLLY_DEFINE_FLAG(std::string, S, _name, _default)
+#else
+#include <gflags/gflags.h>
 #endif
diff --git a/folly/test/AsciiCaseInsensitiveTest.cpp b/folly/test/AsciiCaseInsensitiveTest.cpp
@@ -16,7 +16,7 @@
 
 #include <folly/Range.h>
 
-#include <gflags/gflags.h>
+#include <folly/portability/GFlags.h>
 #include <gtest/gtest.h>
 #include <algorithm>
 

diff --git a/folly/test/AtomicUnorderedMapTest.cpp b/folly/test/AtomicUnorderedMapTest.cpp
@@ -13,14 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <folly/AtomicUnorderedMap.h>
-#include <folly/test/DeterministicSchedule.h>
-#include <thread>
+
 #include <semaphore.h>
-#include <gflags/gflags.h>
+#include <thread>
+#include <unordered_map>
+
 #include <gtest/gtest.h>
+
 #include <folly/Benchmark.h>
-#include <unordered_map>
+#include <folly/portability/GFlags.h>
+#include <folly/test/DeterministicSchedule.h>
 
 using namespace folly;
 using namespace folly::test;

diff --git a/folly/test/BatonBenchmark.cpp b/folly/test/BatonBenchmark.cpp
@@ -15,13 +15,16 @@
  */
 
 #include <folly/Baton.h>
+
+#include <semaphore.h>
+#include <thread>
+
+#include <gtest/gtest.h>
+
 #include <folly/Benchmark.h>
+#include <folly/portability/GFlags.h>
 #include <folly/test/BatonTestHelpers.h>
 #include <folly/test/DeterministicSchedule.h>
-#include <thread>
-#include <semaphore.h>
-#include <gflags/gflags.h>
-#include <gtest/gtest.h>
 
 using namespace folly;
 using namespace folly::test;

diff --git a/folly/test/BitIteratorTest.cpp b/folly/test/BitIteratorTest.cpp
@@ -15,15 +15,16 @@
  */
 
 #include <folly/Bits.h>
-#include <folly/Benchmark.h>
 
 #include <algorithm>
 #include <type_traits>
 #include <limits>
 #include <vector>
+
 #include <gtest/gtest.h>
 
-#include <gflags/gflags.h>
+#include <folly/Benchmark.h>
+#include <folly/portability/GFlags.h>
 
 using namespace folly;
 using namespace folly::bititerator_detail;

diff --git a/folly/test/ChecksumTest.cpp b/folly/test/ChecksumTest.cpp
@@ -15,11 +15,13 @@
  */
 
 #include <folly/Checksum.h>
-#include <gflags/gflags.h>
+
 #include <gtest/gtest.h>
+
 #include <folly/Benchmark.h>
 #include <folly/Hash.h>
 #include <folly/detail/ChecksumDetail.h>
+#include <folly/portability/GFlags.h>
 
 namespace {
 const unsigned int BUFFER_SIZE = 512 * 1024 * sizeof(uint64_t);

diff --git a/folly/test/ConcurrentSkipListBenchmark.cpp b/folly/test/ConcurrentSkipListBenchmark.cpp
@@ -20,13 +20,12 @@
 #include <set>
 #include <thread>
 
-#include <gflags/gflags.h>
-#include <glog/logging.h>
 #include <folly/Benchmark.h>
 #include <folly/ConcurrentSkipList.h>
 #include <folly/Hash.h>
 #include <folly/RWSpinLock.h>
-
+#include <folly/portability/GFlags.h>
+#include <glog/logging.h>
 
 DEFINE_int32(num_threads, 12, "num concurrent threads to test");