From: Yehuda Sadeh Date: Mon, 9 Feb 2009 23:46:02 +0000 (-0800) Subject: added a common initialization function X-Git-Tag: v0.7~220 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c511d68dea821ce11bd07634b6a1707920241ee3;p=ceph.git added a common initialization function --- diff --git a/src/Makefile.am b/src/Makefile.am index 0d78f7287890..5b2d79b2fbad 100644 --- 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 40e22761e9f9..f4f8a3f5e89f 100644 --- 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 @@ -521,7 +522,7 @@ int main(int argc, const char **argv, const char *envp[]) { vector 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 79e00f68dc31..600f050537c3 100644 --- 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 @@ -43,7 +44,7 @@ int main(int argc, const char **argv, const char *envp[]) { vector 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 ddcfd766d5fb..b7dfb8e65278 100644 --- 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 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 556478a183b9..2f217ddf7b48 100644 --- 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 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 8bf15511bab5..03340acad4b3 100644 --- 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 index 000000000000..600da45482ff --- /dev/null +++ b/src/common/common_init.cc @@ -0,0 +1,10 @@ + +#include "config.h" +#include "tls.h" + +void common_init(std::vector& 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 index 000000000000..042623a15f57 --- /dev/null +++ b/src/common/common_init.h @@ -0,0 +1,8 @@ +#ifndef __COMMON_INIT_H +#define __COMMON_INIT_H + +#include + +void common_init(std::vector& args, bool open=true); + +#endif diff --git a/src/cosd.cc b/src/cosd.cc index 1304d0da9fdd..0c6cded6b220 100644 --- 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 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 404f8e769c10..bf2cc3a23c86 100644 --- 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 @@ -41,7 +42,7 @@ int main(int argc, const char **argv, char *envp[]) //cerr << "csyn starting" << std::endl; vector 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 09c54feb3c29..19ca0de3d712 100644 --- 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 @@ -74,7 +75,7 @@ int main(int argc, const char **argv, const char *envp[]) vector 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 e5d25e911f83..748967c3a897 100644 --- a/src/dupstore.cc +++ b/src/dupstore.cc @@ -15,6 +15,7 @@ #include #include "ebofs/Ebofs.h" #include "os/FileStore.h" +#include "common/common_init.h" #include using __gnu_cxx::hash_map; @@ -85,7 +86,7 @@ int main(int argc, const char **argv) vector 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 b4319e4335b3..8dd80ba7a68e 100644 --- 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 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 71b78de53d28..de561863b5b4 100644 --- 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 05518867d887..6bc87c946dbf 100644 --- 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 4a6746bbd781..83861010726b 100644 --- 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 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 ddd67877a614..28c8cd1fea07 100644 --- a/src/streamtest.cc +++ b/src/streamtest.cc @@ -15,6 +15,7 @@ #include #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 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 f9ea59829253..db58917cb0de 100644 --- 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 @@ -68,7 +69,7 @@ int main(int argc, const char **argv, const char *envp[]) { vector args; argv_to_vec(argc, argv, args); env_to_vec(args); - parse_config_options(args); + common_init(args); vec_to_argv(args, argc, argv);