tools: format headers for object cache daemon

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>

diff --git a/src/test/immutable_object_cache/test_SimplePolicy.cc b/src/test/immutable_object_cache/test_SimplePolicy.cc
index 808b09b7ad7da014c06fe275134de2730c316da5..70f333ebec0de052c549339b79cd5c4ef751f7e7 100644 (file)
--- a/src/test/immutable_object_cache/test_SimplePolicy.cc
+++ b/src/test/immutable_object_cache/test_SimplePolicy.cc
@@ -5,6 +5,7 @@
 #include <list>
 #include <gtest/gtest.h>
 
+#include "include/Context.h"
 #include "tools/immutable_object_cache/SimplePolicy.h"
 
 using namespace ceph::immutable_obj_cache;

diff --git a/src/tools/immutable_object_cache/CacheClient.cc b/src/tools/immutable_object_cache/CacheClient.cc
index c3070a8f533e83d432f840778fdac89832591320..414c9cbc4cd22c3607bccde92fc57ae45fd2673d 100644 (file)
--- a/src/tools/immutable_object_cache/CacheClient.cc
+++ b/src/tools/immutable_object_cache/CacheClient.cc
@@ -9,9 +9,6 @@
 #define dout_prefix *_dout << "ceph::cache::CacheClient: " << this << " " \
                            << __func__ << ": "
 
-
-using boost::asio::local::stream_protocol;
-
 namespace ceph {
 namespace immutable_obj_cache {
 

diff --git a/src/tools/immutable_object_cache/CacheClient.h b/src/tools/immutable_object_cache/CacheClient.h
index dca081cbf5ae2b866daa736ada3c4b8361de24eb..26162c45f823fa160e8d20ddbab7c2006facc303 100644 (file)
--- a/src/tools/immutable_object_cache/CacheClient.h
+++ b/src/tools/immutable_object_cache/CacheClient.h
@@ -1,8 +1,8 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#ifndef CEPH_CACHE_CLIENT_H
-#define CEPH_CACHE_CLIENT_H
+#ifndef CEPH_CACHE_CACHE_CLIENT_H
+#define CEPH_CACHE_CACHE_CLIENT_H
 
 #include <atomic>
 #include <boost/asio.hpp>

diff --git a/src/tools/immutable_object_cache/CacheController.h b/src/tools/immutable_object_cache/CacheController.h
index 08fed8b37d17a4cb92e4ab31448b86ddd77a607e..427ad5cc80fac4e033e356dc940de7523ed96e05 100644 (file)
--- a/src/tools/immutable_object_cache/CacheController.h
+++ b/src/tools/immutable_object_cache/CacheController.h
@@ -1,23 +1,14 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#ifndef CEPH_CACHE_CONTROLLER_H
-#define CEPH_CACHE_CONTROLLER_H
+#ifndef CEPH_CACHE_CACHE_CONTROLLER_H
+#define CEPH_CACHE_CACHE_CONTROLLER_H
 
-#include "common/Formatter.h"
-#include "common/admin_socket.h"
-#include "common/debug.h"
-#include "common/errno.h"
 #include "common/ceph_context.h"
-#include "common/Mutex.h"
 #include "common/WorkQueue.h"
-#include "include/rados/librados.hpp"
-#include "include/ceph_assert.h"
 #include "CacheServer.h"
 #include "ObjectCacheStore.h"
 
-#include <thread>
-
 namespace ceph {
 namespace immutable_obj_cache {
 

diff --git a/src/tools/immutable_object_cache/CacheServer.cc b/src/tools/immutable_object_cache/CacheServer.cc
index 5d94b069c0595fe35c2470286622c1168a88cbd2..3e0f4c8a34d5d5c89eaf5846ed8f3f1e1cebb9de 100644 (file)
--- a/src/tools/immutable_object_cache/CacheServer.cc
+++ b/src/tools/immutable_object_cache/CacheServer.cc
@@ -1,6 +1,7 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
+#include <boost/bind.hpp>
 #include "common/debug.h"
 #include "common/ceph_context.h"
 #include "CacheServer.h"
@@ -12,8 +13,6 @@
                            << __func__ << ": "
 
 
-using boost::asio::local::stream_protocol;
-
 namespace ceph {
 namespace immutable_obj_cache {
 

diff --git a/src/tools/immutable_object_cache/CacheServer.h b/src/tools/immutable_object_cache/CacheServer.h
index 05b31c5b3ce51a84cb7183ce311fff70028c88fc..a0174451521bec3823e43bac4ce8170330002ab1 100644 (file)
--- a/src/tools/immutable_object_cache/CacheServer.h
+++ b/src/tools/immutable_object_cache/CacheServer.h
@@ -1,20 +1,12 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#ifndef CEPH_CACHE_SERVER_H
-#define CEPH_CACHE_SERVER_H
-
-#include <cstdio>
-#include <iostream>
-#include <array>
-#include <memory>
-#include <string>
-#include <boost/bind.hpp>
+#ifndef CEPH_CACHE_CACHE_SERVER_H
+#define CEPH_CACHE_CACHE_SERVER_H
+
 #include <boost/asio.hpp>
 #include <boost/asio/error.hpp>
-#include <boost/algorithm/string.hpp>
 
-#include "include/ceph_assert.h"
 #include "SocketCommon.h"
 #include "CacheSession.h"
 

diff --git a/src/tools/immutable_object_cache/CacheSession.h b/src/tools/immutable_object_cache/CacheSession.h
index 76a8543b340621b6c08c8c99416df692fb926192..989e1181ca29fdc223d94ad3ae537896de502525 100644 (file)
--- a/src/tools/immutable_object_cache/CacheSession.h
+++ b/src/tools/immutable_object_cache/CacheSession.h
@@ -4,17 +4,12 @@
 #ifndef CEPH_CACHE_SESSION_H
 #define CEPH_CACHE_SESSION_H
 
-#include <iostream>
-#include <string>
 #include <boost/bind.hpp>
 #include <boost/asio.hpp>
 #include <boost/asio/error.hpp>
-#include <boost/algorithm/string.hpp>
 
-#include "include/ceph_assert.h"
 #include "SocketCommon.h"
 
-
 using boost::asio::local::stream_protocol;
 using boost::asio::io_service;
 

diff --git a/src/tools/immutable_object_cache/ObjectCacheFile.h b/src/tools/immutable_object_cache/ObjectCacheFile.h
index a8fe4350f40f5001a878f8923a35e2b55208ca13..7d878390472f404e7c3b53b20b0af5b285f4292f 100644 (file)
--- a/src/tools/immutable_object_cache/ObjectCacheFile.h
+++ b/src/tools/immutable_object_cache/ObjectCacheFile.h
@@ -7,7 +7,6 @@
 #include "include/Context.h"
 #include "include/buffer_fwd.h"
 #include "common/ceph_context.h"
-#include <sys/mman.h>
 #include <string>
 
 

diff --git a/src/tools/immutable_object_cache/ObjectCacheStore.cc b/src/tools/immutable_object_cache/ObjectCacheStore.cc
index 7894266bdfdc18e184f903248826a174ceb28827..6b3dbae79dc698b2785ecb478a8441d4562d1f31 100644 (file)
--- a/src/tools/immutable_object_cache/ObjectCacheStore.cc
+++ b/src/tools/immutable_object_cache/ObjectCacheStore.cc
@@ -1,7 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#include "include/Context.h"
 #include "ObjectCacheStore.h"
 #include "Utils.h"
 #include <experimental/filesystem>

diff --git a/src/tools/immutable_object_cache/ObjectCacheStore.h b/src/tools/immutable_object_cache/ObjectCacheStore.h
index e8c44f0fee80c1632865ff5feff51e39f28232c1..d51ce326f364521e7ed2c57e5bfaef0ee4ab250d 100644 (file)
--- a/src/tools/immutable_object_cache/ObjectCacheStore.h
+++ b/src/tools/immutable_object_cache/ObjectCacheStore.h
@@ -4,11 +4,8 @@
 #ifndef CEPH_CACHE_OBJECT_CACHE_STORE_H
 #define CEPH_CACHE_OBJECT_CACHE_STORE_H
 
-#include "common/debug.h"
-#include "common/errno.h"
 #include "common/ceph_context.h"
 #include "common/Mutex.h"
-#include "include/Context.h"
 #include "include/rados/librados.hpp"
 
 #include "ObjectCacheFile.h"

diff --git a/src/tools/immutable_object_cache/SimplePolicy.cc b/src/tools/immutable_object_cache/SimplePolicy.cc
index 119b8c76b064fa1f53d7cd5c60a76b8dcdc045d0..86936b2f3ae6a0b716e4ebe6673a5505fd495648 100644 (file)
--- a/src/tools/immutable_object_cache/SimplePolicy.cc
+++ b/src/tools/immutable_object_cache/SimplePolicy.cc
@@ -1,12 +1,9 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
+#include "common/debug.h"
 #include "SimplePolicy.h"
 
-#include <vector>
-#include <unordered_map>
-#include <string>
-
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_immutable_obj_cache
 #undef dout_prefix

diff --git a/src/tools/immutable_object_cache/SimplePolicy.h b/src/tools/immutable_object_cache/SimplePolicy.h
index a75bf3ca3d74d422c3b5afcd65fc68f84b4b2b31..7dce7840fd322ad519807e5f0e7515d09ed71a53 100644 (file)
--- a/src/tools/immutable_object_cache/SimplePolicy.h
+++ b/src/tools/immutable_object_cache/SimplePolicy.h
@@ -7,11 +7,9 @@
 #include "common/ceph_context.h"
 #include "common/RWLock.h"
 #include "common/Mutex.h"
-#include "common/debug.h"
 #include "include/lru.h"
 #include "Policy.h"
 
-#include <vector>
 #include <unordered_map>
 #include <string>