added a common initialization function

diff --git a/src/Makefile.am b/src/Makefile.am
index 0d78f72878908fdf000883ee9cdd4ac9d13b5cc4..5b2d79b2fbad1afbfd7643bddc1df2ddd760f430 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -192,6 +192,7 @@ libcommon_a_SOURCES = \
        osd/OSDMap.cc \
        mds/MDSMap.cc \
        common/tls.cc \
+       common/common_init.cc \
        config.cc
 
 libcrush_a_SOURCES = \
@@ -278,6 +279,7 @@ noinst_HEADERS = \
        common/lockdep.h\
        common/BackTrace.h\
         common/Clock.h\
+        common/common_init.h\
         common/Cond.h\
         common/ConfUtils.h\
         common/DecayCounter.h\
@@ -290,6 +292,7 @@ noinst_HEADERS = \
         common/Thread.h\
         common/ThreadPool.h\
         common/Timer.h\
+        common/tls.h\
        common/WorkQueue.h\
        common/LogClient.h\
         config.h\

diff --git a/src/ceph.cc b/src/ceph.cc
index 40e22761e9f9d766b0f8cea761b1a9d75c7123dc..f4f8a3f5e89f6910af700e7c71670715fa9709ef 100644 (file)
--- a/src/ceph.cc
+++ b/src/ceph.cc
@@ -26,6 +26,7 @@ using namespace std;
 #include "messages/MMonCommandAck.h"
 
 #include "common/Timer.h"
+#include "common/common_init.h"
 
 #ifndef DARWIN
 #include <envz.h>
@@ -521,7 +522,7 @@ int main(int argc, const char **argv, const char *envp[]) {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
-  parse_config_options(args);
+  common_init(args);
 
   vec_to_argv(args, argc, argv);
 

diff --git a/src/cfuse.cc b/src/cfuse.cc
index 79e00f68dc3136a8e59bd6411ba42ded6934f709..600f050537c32f62d752bd7850a04e9477c5ad7f 100644 (file)
--- a/src/cfuse.cc
+++ b/src/cfuse.cc
@@ -28,6 +28,7 @@ using namespace std;
 #include "mon/MonClient.h"
 
 #include "common/Timer.h"
+#include "common/common_init.h"
        
 #ifndef DARWIN
 #include <envz.h>
@@ -43,7 +44,7 @@ int main(int argc, const char **argv, const char *envp[]) {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
-  parse_config_options(args);
+  common_init(args);
 
   // args for fuse
   vec_to_argv(args, argc, argv);

diff --git a/src/cmds.cc b/src/cmds.cc
index ddcfd766d5fbfab9b843a71bb583fb0b09d01f0c..b7dfb8e652783c462e0d1b8645b3aa284a08912b 100644 (file)
--- a/src/cmds.cc
+++ b/src/cmds.cc
@@ -29,6 +29,7 @@ using namespace std;
 #include "msg/SimpleMessenger.h"
 
 #include "common/Timer.h"
+#include "common/common_init.h"
 
 #include "mon/MonClient.h"
 
@@ -37,7 +38,7 @@ int main(int argc, const char **argv)
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
-  parse_config_options(args);
+  common_init(args);
 
   // mds specific args
   const char *monhost = 0;

diff --git a/src/cmon.cc b/src/cmon.cc
index 556478a183b92ef565d00f5d1ef9ac07e0794428..2f217ddf7b4891b163069a13943a55dc3d819f71 100644 (file)
--- a/src/cmon.cc
+++ b/src/cmon.cc
@@ -32,6 +32,7 @@ using namespace std;
 #include "include/nstring.h"
 
 #include "common/Timer.h"
+#include "common/common_init.h"
 
 void usage()
 {
@@ -50,7 +51,7 @@ int main(int argc, const char **argv)
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
-  parse_config_options(args);
+  common_init(args);
 
   // args
   const char *fsdir = 0;

diff --git a/src/common/assert.cc b/src/common/assert.cc
index 8bf15511bab50149b6c37957461d1fc046a871d3..03340acad4b3c07f900b4168d25bfe60a5c87549 100644 (file)
--- a/src/common/assert.cc
+++ b/src/common/assert.cc
@@ -4,6 +4,8 @@
 
 #include "BackTrace.h"
 
+#include "common/tls.h"
+
 void __ceph_assert_fail(const char *assertion, const char *file, int line, const char *func)
 {
   BackTrace bt(1);

diff --git a/src/common/common_init.cc b/src/common/common_init.cc
new file mode 100644 (file)
index 0000000..600da45
--- /dev/null
+++ b/src/common/common_init.cc
@@ -0,0 +1,10 @@
+
+#include "config.h"
+#include "tls.h"
+
+void common_init(std::vector<const char*>& args, bool open)
+{
+  parse_config_options(args, open);
+  tls_init();
+}
+

diff --git a/src/common/common_init.h b/src/common/common_init.h
new file mode 100644 (file)
index 0000000..042623a
--- /dev/null
+++ b/src/common/common_init.h
@@ -0,0 +1,8 @@
+#ifndef __COMMON_INIT_H
+#define __COMMON_INIT_H
+
+#include <vector>
+
+void common_init(std::vector<const char*>& args, bool open=true);
+
+#endif

diff --git a/src/cosd.cc b/src/cosd.cc
index 1304d0da9fdd4ac5ed9c191c93e7d42cf2ee8b5c..0c6cded6b2206e6af2095972005e05f3709cef5d 100644 (file)
--- a/src/cosd.cc
+++ b/src/cosd.cc
@@ -32,6 +32,7 @@ using namespace std;
 #include "msg/SimpleMessenger.h"
 
 #include "common/Timer.h"
+#include "common/common_init.h"
 
 void usage() 
 {
@@ -50,7 +51,7 @@ int main(int argc, const char **argv)
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
-  parse_config_options(args);
+  common_init(args);
 
   if (g_conf.clock_tare) g_clock.tare();
 

diff --git a/src/csyn.cc b/src/csyn.cc
index 404f8e769c108498c4e0aed153794dd51287b0d8..bf2cc3a23c86b0384b943b314f5de91809d83ea8 100644 (file)
--- a/src/csyn.cc
+++ b/src/csyn.cc
@@ -27,6 +27,7 @@ using namespace std;
 #include "mon/MonClient.h"
 
 #include "common/Timer.h"
+#include "common/common_init.h"
 
 #ifndef DARWIN
 #include <envz.h>
@@ -41,7 +42,7 @@ int main(int argc, const char **argv, char *envp[])
   //cerr << "csyn starting" << std::endl;
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  parse_config_options(args);
+  common_init(args);
   parse_syn_options(args);   // for SyntheticClient
 
   vec_to_argv(args, argc, argv);

diff --git a/src/dumpjournal.cc b/src/dumpjournal.cc
index 09c54feb3c29941117a0ff783396c7f2694134d3..19ca0de3d712ba00cab4dce9958a6931a939cf8b 100644 (file)
--- a/src/dumpjournal.cc
+++ b/src/dumpjournal.cc
@@ -29,6 +29,7 @@ using namespace std;
 #include "mds/mdstypes.h"
 
 #include "common/Timer.h"
+#include "common/common_init.h"
 
 #ifndef DARWIN
 #include <envz.h>
@@ -74,7 +75,7 @@ int main(int argc, const char **argv, const char *envp[])
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
-  parse_config_options(args);
+  common_init(args);
 
   vec_to_argv(args, argc, argv);
 

diff --git a/src/dupstore.cc b/src/dupstore.cc
index e5d25e911f830ceeaef58b51fd9f862f865f88dd..748967c3a89715b359410afadaa90461e1776c78 100644 (file)
--- a/src/dupstore.cc
+++ b/src/dupstore.cc
@@ -15,6 +15,7 @@
 #include <iostream>
 #include "ebofs/Ebofs.h"
 #include "os/FileStore.h"
+#include "common/common_init.h"
 
 #include <ext/hash_map>
 using __gnu_cxx::hash_map;
@@ -85,7 +86,7 @@ int main(int argc, const char **argv)
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
-  parse_config_options(args);
+  common_init(args);
 
   // args
   if (args.size() != 4) 

diff --git a/src/fakefuse.cc b/src/fakefuse.cc
index b4319e4335b30922c305b6e9acd52bb573517107..8dd80ba7a68e54d60c1bdeb6fea4c88e767706d1 100644 (file)
--- a/src/fakefuse.cc
+++ b/src/fakefuse.cc
@@ -30,6 +30,7 @@ using namespace std;
 #include "client/fuse_ll.h"
 
 #include "common/Timer.h"
+#include "common/common_init.h"
 
 #include "msg/FakeMessenger.h"
 #include "messages/MMonCommand.h"
@@ -68,7 +69,7 @@ int main(int argc, const char **argv) {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
-  parse_config_options(args);
+  common_init(args);
 
   // start messenger thread
   fakemessenger_startthread();

diff --git a/src/fakesyn.cc b/src/fakesyn.cc
index 71b78de53d285f8a0dc95450cd26ff6649006901..de561863b5b4c7c8c7f42f967d63630d1a208348 100644 (file)
--- a/src/fakesyn.cc
+++ b/src/fakesyn.cc
@@ -33,6 +33,7 @@ using namespace std;
 #include "messages/MMonCommand.h"
 
 #include "common/Timer.h"
+#include "common/common_init.h"
 
 
 class C_Test : public Context {
@@ -65,7 +66,7 @@ int main(int argc, const char **argv)
   g_conf.mon_stop_on_last_unmount = true;
   g_conf.mon_stop_with_last_mds = true;
 
-  parse_config_options(args);
+  common_init(args);
 
   int start = 0;
 

diff --git a/src/newsyn.cc b/src/newsyn.cc
index 05518867d88701a34882fdefb842ae94a3236fef..6bc87c946dbf72b80a5162c0f427f0ba22fcc70b 100644 (file)
--- a/src/newsyn.cc
+++ b/src/newsyn.cc
@@ -34,6 +34,7 @@ using namespace std;
 #include "msg/SimpleMessenger.h"
 
 #include "common/Timer.h"
+#include "common/common_init.h"
 
 
 class C_Test : public Context {
@@ -201,7 +202,7 @@ int main(int argc, const char **argv)
 
   env_to_vec(args);
 
-  parse_config_options(args);
+  common_init(args);
   parse_syn_options(args);
 
 

diff --git a/src/osdmaptool.cc b/src/osdmaptool.cc
index 4a6746bbd7815a5ff42a7453224feb066cab7507..83861010726be60d988b1aba39d691afbfcdc6aa 100644 (file)
--- a/src/osdmaptool.cc
+++ b/src/osdmaptool.cc
@@ -26,6 +26,7 @@ using namespace std;
 
 #include "osd/OSDMap.h"
 #include "mon/MonMap.h"
+#include "common/common_init.h"
 
 void usage(const char *me)
 {
@@ -43,7 +44,7 @@ int main(int argc, const char **argv)
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
-  parse_config_options(args);
+  common_init(args);
 
   const char *me = argv[0];
 

diff --git a/src/streamtest.cc b/src/streamtest.cc
index ddd67877a6143a12964a2adfc87bb102bd3db9e8..28c8cd1fea0703f56fb2f16ba6de3fe86fb88837 100644 (file)
--- a/src/streamtest.cc
+++ b/src/streamtest.cc
@@ -15,6 +15,7 @@
 #include <iostream>
 #include "ebofs/Ebofs.h"
 #include "os/FileStore.h"
+#include "common/common_init.h"
 
 #undef dout_prefix
 #define dout_prefix *_dout << dbeginl
@@ -76,7 +77,7 @@ int main(int argc, const char **argv)
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
-  parse_config_options(args);
+  common_init(args);
 
   // args
   if (args.size() < 3) return -1;

diff --git a/src/testmsgr.cc b/src/testmsgr.cc
index f9ea59829253093b11869f8a40f9d1a4e6f0bb10..db58917cb0deeb189ac4715b20eea21ec475f636 100644 (file)
--- a/src/testmsgr.cc
+++ b/src/testmsgr.cc
@@ -25,6 +25,7 @@ using namespace std;
 #include "messages/MPing.h"
 
 #include "common/Timer.h"
+#include "common/common_init.h"
 
 #ifndef DARWIN
 #include <envz.h>
@@ -68,7 +69,7 @@ int main(int argc, const char **argv, const char *envp[]) {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
-  parse_config_options(args);
+  common_init(args);
 
   vec_to_argv(args, argc, argv);