summaryrefslogtreecommitdiff
path: root/src/rados.cc
diff options
context:
space:
mode:
authorRoald J. van Loon <roaldvanloon@gmail.com>2012-12-24 13:10:57 +0100
committerRoald van Loon <roaldvanloon@gmail.com>2012-12-24 22:26:56 +0000
commit17ae36a5420eb4568f93ba3d9f185dfbc0a42918 (patch)
treeae06815a5638dea51b98466d81b6b0c5a46f987d /src/rados.cc
parent18001d059656224abbf7d92c1c54befd33ec8d6e (diff)
downloadceph-wip-dout.tar.gz
cleanup: changed order of #includes, global_context.h, debug.hwip-dout
- lots of rewriting of #include ordering (see below) - renamed mdstypes.h to mds_types.h, same as {osd,mon}_types.h - included global/global_context.h and global/debug.h where used - fixed lots of duplicate includes The order of #includes is now; 1. types include (include/types.h, mds/mds_types.h, etc) 2. system includes (like stl, boost, etc) 3. ceph includes (include/..) 4. ceph common (common/..) 5. ceph other (auth/.., os/.., global/.., etc) 6. list of messages/.., if used 7. local includes (headers from same module) 8. own header (<basename>.h) "using namespace" stuff is always directly below #include, not intermixed with them (WIP notice: most files have this implemented, but some not yet) Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
Diffstat (limited to 'src/rados.cc')
-rw-r--r--src/rados.cc36
1 files changed, 19 insertions, 17 deletions
diff --git a/src/rados.cc b/src/rados.cc
index f7b3c8e9a34..f0b63964b15 100644
--- a/src/rados.cc
+++ b/src/rados.cc
@@ -14,23 +14,6 @@
#include "include/types.h"
-#include "include/rados/librados.hpp"
-#include "rados_sync.h"
-using namespace librados;
-
-#include "common/config.h"
-#include "common/ceph_argparse.h"
-#include "global/global_init.h"
-#include "global/debug.h"
-#include "common/Cond.h"
-#include "common/errno.h"
-#include "common/Formatter.h"
-#include "common/obj_bencher.h"
-#include "mds/inode_backtrace.h"
-#include "auth/Crypto.h"
-#include <iostream>
-#include <fstream>
-
#include <stdlib.h>
#include <time.h>
#include <sstream>
@@ -39,9 +22,28 @@ using namespace librados;
#include <stdexcept>
#include <climits>
#include <locale>
+#include <iostream>
+#include <fstream>
+
+#include "include/rados/librados.hpp"
+#include "common/config.h"
+#include "common/ceph_argparse.h"
+#include "common/Cond.h"
+#include "common/errno.h"
+#include "common/Formatter.h"
+#include "common/obj_bencher.h"
+#include "auth/Crypto.h"
+#include "mds/inode_backtrace.h"
+#include "global/global_init.h"
+#include "global/global_context.h"
+#include "global/debug.h"
#include "cls/lock/cls_lock_client.h"
+#include "rados_sync.h"
+
+using namespace librados;
+
int rados_tool_sync(const std::map < std::string, std::string > &opts,
std::vector<const char*> &args);