Merge pull request #15169 from joscollin/wip-cleanup-redundant-headers-2

common: Remove redundant includes - 2 Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2025-04-09 11:12:50 +00:00 · 2017-05-23 21:48:28 -05:00 · 2017-05-23 21:48:28 -05:00 · f58ea0419c
commit f58ea0419c
parent 1f5c50aa56 9f81048606
26 changed files with 10 additions and 136 deletions
--- a/src/common/Mutex.cc
+++ b/src/common/Mutex.cc
@ -11,14 +11,10 @@
 * Foundation.  See file COPYING.
 *
 */
-#include <string>

 #include "common/Mutex.h"
 #include "common/perf_counters.h"
-#include "common/ceph_context.h"
 #include "common/config.h"
-#include "include/stringify.h"
-#include "include/utime.h"
 #include "common/Clock.h"
 #include "common/valgrind.h"

--- a/src/common/OutputDataSocket.cc
+++ b/src/common/OutputDataSocket.cc
@ -12,35 +12,15 @@
 * 
 */

-#include "include/int_types.h"
-
-#include "common/Thread.h"
 #include "common/OutputDataSocket.h"
-#include "common/config.h"
-#include "common/dout.h"
 #include "common/errno.h"
-#include "common/perf_counters.h"
 #include "common/pipe.h"
 #include "common/safe_io.h"
-#include "common/version.h"
-#include "common/Formatter.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <map>
-#include <poll.h>
-#include <set>
-#include <sstream>
-#include <stdint.h>
-#include <string.h>
-#include <string>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <sys/un.h>
-#include <unistd.h>
-
 #include "include/compat.h"

+#include <poll.h>
+#include <sys/un.h>
+
 #define dout_subsys ceph_subsys_asok
 #undef dout_prefix
 #define dout_prefix *_dout << "asok(" << (void*)m_cct << ") "
--- a/src/common/OutputDataSocket.h
+++ b/src/common/OutputDataSocket.h
@ -15,15 +15,8 @@
 #ifndef CEPH_COMMON_OUTPUTDATASOCKET_H
 #define CEPH_COMMON_OUTPUTDATASOCKET_H

-#include "common/Thread.h"
-#include "common/Mutex.h"
 #include "common/Cond.h"

-#include <string>
-#include <map>
-#include <list>
-#include "include/buffer.h"
-
 class CephContext;

 class OutputDataSocket : public Thread
--- a/src/common/PluginRegistry.cc
+++ b/src/common/PluginRegistry.cc
@ -15,17 +15,13 @@
 * 
 */

-#include <errno.h>
-#include <dlfcn.h>
-
 #include "PluginRegistry.h"
 #include "ceph_ver.h"
-#include "common/ceph_context.h"
 #include "common/errno.h"
-#include "include/str_list.h"
-
 #include "common/debug.h"

+#include <dlfcn.h>
+
 #define PLUGIN_PREFIX "libceph_"
 #define PLUGIN_SUFFIX ".so"
 #define PLUGIN_INIT_FUNCTION "__ceph_plugin_init"
--- a/src/common/PluginRegistry.h
+++ b/src/common/PluginRegistry.h
@ -18,9 +18,6 @@
 #ifndef CEPH_COMMON_PLUGINREGISTRY_H
 #define CEPH_COMMON_PLUGINREGISTRY_H

-#include <string>
-#include <map>
-
 #include "common/Mutex.h"

 class CephContext;
--- a/src/common/PrebufferedStreambuf.h
+++ b/src/common/PrebufferedStreambuf.h
@ -1,7 +1,6 @@
 #ifndef CEPH_COMMON_PREBUFFEREDSTREAMBUF_H
 #define CEPH_COMMON_PREBUFFEREDSTREAMBUF_H

-#include <string>
 #include <streambuf>

 /**
--- a/src/common/Preforker.h
+++ b/src/common/Preforker.h
@ -3,15 +3,10 @@
 #ifndef CEPH_COMMON_PREFORKER_H
 #define CEPH_COMMON_PREFORKER_H

-#include "acconfig.h"
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
-#include <errno.h>
-#include <stdlib.h>
 #include <unistd.h>
 #include <sstream>
-#include <string>

 #include "include/assert.h"
 #include "common/safe_io.h"
--- a/src/common/PrioritizedQueue.h
+++ b/src/common/PrioritizedQueue.h
@ -18,9 +18,6 @@
 #include "common/Formatter.h"
 #include "common/OpQueue.h"

-#include <map>
-#include <list>
-
 /**
 * Manages queue for normal and strict priority items
 *
--- a/src/common/RefCountedObj.h
+++ b/src/common/RefCountedObj.h
@ -17,12 +17,8 @@
 
 #include "common/Mutex.h"
 #include "common/Cond.h"
-#include "include/atomic.h"
-#include "common/ceph_context.h"
 #include "common/valgrind.h"

-#include <atomic>
-
 // re-include our assert to clobber the system one; fix dout:
 #include "include/assert.h"

--- a/src/common/SloppyCRCMap.h
+++ b/src/common/SloppyCRCMap.h
@ -7,10 +7,6 @@
 #include "include/encoding.h"
 #include "common/Formatter.h"

-#include <list>
-#include <map>
-#include <ostream>
-
 /**
 * SloppyCRCMap
 *
--- a/src/common/mutex_debug.cc
+++ b/src/common/mutex_debug.cc
@ -11,17 +11,11 @@
 * Foundation.  See file COPYING.
 *
 */
-#include <string>
-
-#include <boost/uuid/uuid.hpp>
-#include <boost/uuid/uuid_generators.hpp>
-#include <boost/uuid/uuid_io.hpp>

 #include "common/mutex_debug.h"
 #include "common/perf_counters.h"
 #include "common/ceph_context.h"
 #include "common/config.h"
-#include "include/stringify.h"

 namespace ceph {
 namespace mutex_debug_detail {
--- a/src/common/obj_bencher.cc
+++ b/src/common/obj_bencher.cc
@ -20,16 +20,6 @@
 #include "common/Cond.h"
 #include "obj_bencher.h"

-#include <iostream>
-#include <fstream>
-
-#include <cerrno>
-
-#include <stdlib.h>
-#include <time.h>
-#include <sstream>
-#include <vector>
-
 const std::string BENCH_LASTRUN_METADATA = "benchmark_last_metadata";
 const std::string BENCH_PREFIX = "benchmark_data";
 static char cached_hostname[30] = {0};
--- a/src/common/obj_bencher.h
+++ b/src/common/obj_bencher.h
@ -15,8 +15,6 @@
 #ifndef CEPH_OBJ_BENCHER_H
 #define CEPH_OBJ_BENCHER_H

-#include "common/config.h"
-#include "common/Cond.h"
 #include "common/ceph_context.h"
 #include "common/Formatter.h"
 #include <cfloat>
--- a/src/common/perf_counters.cc
+++ b/src/common/perf_counters.cc
@ -13,21 +13,10 @@
 *
 */

-#include "include/int_types.h"
-
 #include "common/perf_counters.h"
 #include "common/dout.h"
-#include "common/errno.h"
-#include "common/Formatter.h"
 #include "common/valgrind.h"

-#include <errno.h>
-#include <map>
-#include <sstream>
-#include <stdint.h>
-#include <string.h>
-#include <string>
-
 using std::ostringstream;

 PerfCountersCollection::PerfCountersCollection(CephContext *cct)
--- a/src/common/perf_counters.h
+++ b/src/common/perf_counters.h
@ -17,19 +17,9 @@
 #ifndef CEPH_COMMON_PERF_COUNTERS_H
 #define CEPH_COMMON_PERF_COUNTERS_H

-#include "common/config_obs.h"
 #include "common/perf_histogram.h"
-#include "common/Mutex.h"
 #include "include/utime.h"
-
-#include "common/config_obs.h"
 #include "common/Mutex.h"
-#include "common/ceph_time.h"
-
-#include <stdint.h>
-#include <string>
-#include <vector>
-#include <memory>

 class CephContext;
 class PerfCountersBuilder;
--- a/src/common/pick_address.cc
+++ b/src/common/pick_address.cc
@ -13,16 +13,13 @@
 */

 #include "common/pick_address.h"
-
-#include <netdb.h>
-#include <errno.h>
-#include <ifaddrs.h>
-
 #include "include/ipaddr.h"
 #include "include/str_list.h"
 #include "common/debug.h"
 #include "common/errno.h"

+#include <netdb.h>
+
 #define dout_subsys ceph_subsys_

 static const struct sockaddr *find_ip_in_subnet_list(CephContext *cct,
--- a/src/common/pipe.c
+++ b/src/common/pipe.c
@ -11,15 +11,10 @@
 * Foundation.  See file COPYING.
 *
 */
-#include "acconfig.h"
-
-#include "common/pipe.h"
 #include "include/compat.h"

 #include <errno.h>
 #include <fcntl.h>
-#include <limits.h>
-#include <stdint.h>
 #include <unistd.h>

 int pipe_cloexec(int pipefd[2])
--- a/src/common/run_cmd.cc
+++ b/src/common/run_cmd.cc
@ -14,10 +14,8 @@

 #include "common/errno.h"

-#include <errno.h>
 #include <sstream>
 #include <stdarg.h>
-#include <stdlib.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <vector>
--- a/src/common/safe_io.c
+++ b/src/common/safe_io.c
@ -12,6 +12,9 @@
 *
 */

+#include "common/safe_io.h"
+#include "include/compat.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
@ -19,9 +22,6 @@
 #include <fcntl.h>
 #include <limits.h>

-#include "common/safe_io.h"
-#include "include/compat.h"
-
 ssize_t safe_read(int fd, void *buf, size_t count)
 {
 	size_t cnt = 0;
--- a/src/common/safe_io.h
+++ b/src/common/safe_io.h
@ -15,7 +15,6 @@
 #ifndef CEPH_SAFE_IO
 #define CEPH_SAFE_IO

-#include "acconfig.h"
 #include "common/compiler_extensions.h"
 #include <sys/types.h>

--- a/src/common/scrub_types.h
+++ b/src/common/scrub_types.h
@ -4,11 +4,8 @@
 #ifndef CEPH_SCRUB_TYPES_H
 #define CEPH_SCRUB_TYPES_H

-#include "include/rados/rados_types.hpp"
-#include "common/hobject.h"
 #include "osd/osd_types.h"

-
 // wrappers around scrub types to offer the necessary bits other than
 // the minimal set that the lirados requires
 struct object_id_wrapper : public librados::object_id_t {
--- a/src/common/shared_cache.hpp
+++ b/src/common/shared_cache.hpp
@ -17,8 +17,6 @@

 #include <map>
 #include <list>
-#include <memory>
-#include <utility>
 #include "common/Mutex.h"
 #include "common/Cond.h"
 #include "include/unordered_map.h"
--- a/src/common/simple_cache.hpp
+++ b/src/common/simple_cache.hpp
@ -15,11 +15,7 @@
 #ifndef CEPH_SIMPLECACHE_H
 #define CEPH_SIMPLECACHE_H

-#include <map>
-#include <list>
-#include <memory>
 #include "common/Mutex.h"
-#include "common/Cond.h"
 #include "include/unordered_map.h"

 template <class K, class V, class C = std::less<K>, class H = std::hash<K> >
--- a/src/common/solaris_errno.cc
+++ b/src/common/solaris_errno.cc
@ -12,7 +12,6 @@
 *
 */

-#include <errno.h>
 #include "include/types.h"


--- a/src/common/sstring.hh
+++ b/src/common/sstring.hh
@ -26,15 +26,6 @@
 #ifndef SSTRING_HH_
 #define SSTRING_HH_

-#include <stdint.h>
-#include <algorithm>
-#include <string>
-#include <cstring>
-#include <stdexcept>
-#include <initializer_list>
-#include <iostream>
-#include <functional>
-#include <cstdio>
 #include <type_traits>
 #include <boost/utility/string_ref.hpp>

--- a/src/common/xattr.h
+++ b/src/common/xattr.h
@ -12,8 +12,6 @@
 #ifndef CEPH_EXTATTR_H
 #define CEPH_EXTATTR_H

-#include <sys/types.h>
-#include <errno.h>

 #ifdef __cplusplus
 extern "C" {