libceph: build without globals

libceph, libosdc, libclient: depend on libcommon rather than libglobal.
No more globals in libceph.

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 0f7a53ced200e0eb85f92f14cc0fea0501c6205d..d819bd0c4c30f542cd1311d7f69fdb27cde68ff9 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -173,7 +173,7 @@ test_trans_LDADD = libos.la $(LIBGLOBAL_LDA)
 bin_DEBUGPROGRAMS += test_trans
 
 testsnaps_SOURCES = test/osd/TestSnaps.cc
-testsnaps_LDADD = libglobal.la librados.la $(LIBGLOBAL_LDA)
+testsnaps_LDADD = librados.la $(LIBGLOBAL_LDA)
 bin_DEBUGPROGRAMS += testsnaps
 
 test_libcommon_build_SOURCES = test/test_libcommon_build.cc $(libcommon_files)
@@ -208,7 +208,7 @@ libceph_la_SOURCES = \
        client/Client.cc
 libceph_la_CFLAGS= ${CRYPTO_CFLAGS} ${AM_CFLAGS}
 libceph_la_CXXFLAGS= ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
-libceph_la_LIBADD = libosdc.la libcommon.la
+libceph_la_LIBADD = libosdc.la
 libceph_la_LDFLAGS =  -lpthread $(CRYPTO_LIBS) $(EXTRALIBS) \
             ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '^ceph_.*'
 lib_LTLIBRARIES += libceph.la
@@ -218,15 +218,15 @@ testceph_LDADD = libceph.la -lpthread -lm $(CRYPTO_LIBS) $(EXTRALIBS)
 bin_DEBUGPROGRAMS += testceph
 
 testtimers_SOURCES = test/TestTimers.cc
-testtimers_LDADD = libceph.la -lpthread -lm $(CRYPTO_LIBS) $(EXTRALIBS)
+testtimers_LDADD = $(LIBGLOBAL_LDA)
 bin_DEBUGPROGRAMS += testtimers
 
 testdout_streambuf_SOURCES = test/TestDoutStreambuf.cc
-testdout_streambuf_LDADD = libceph.la -lpthread
+testdout_streambuf_LDADD = $(LIBGLOBAL_LDA)
 bin_DEBUGPROGRAMS += testdout_streambuf
 
 testsignal_handlers_SOURCES = test/TestSignalHandlers.cc
-testsignal_handlers_LDADD = libceph.la -lpthread
+testsignal_handlers_LDADD = $(LIBGLOBAL_LDA)
 bin_DEBUGPROGRAMS += testsignal_handlers
 
 # librados
@@ -396,7 +396,7 @@ unittest_ceph_argparse_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
 check_PROGRAMS += unittest_ceph_argparse
 
 unittest_gather_SOURCES = test/gather.cc
-unittest_gather_LDADD = libceph.la ${UNITTEST_LDADD}
+unittest_gather_LDADD = ${LIBGLOBAL_LDA} ${UNITTEST_LDADD}
 unittest_gather_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
 check_PROGRAMS += unittest_gather
 
@@ -406,7 +406,7 @@ unittest_run_cmd_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
 check_PROGRAMS += unittest_run_cmd
 
 unittest_signals_SOURCES = test/signals.cc
-unittest_signals_LDADD = libceph.la ${UNITTEST_LDADD}
+unittest_signals_LDADD = ${LIBGLOBAL_LDA} ${UNITTEST_LDADD}
 unittest_signals_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
 check_PROGRAMS += unittest_signals
 
@@ -428,7 +428,7 @@ check_PROGRAMS += unittest_bufferlist
 
 unittest_crypto_SOURCES = test/crypto.cc
 unittest_crypto_LDFLAGS = -lrt ${CRYPTO_LDFLAGS} ${AM_LDFLAGS}
-unittest_crypto_LDADD =  libceph.la ${CRYPTO_LIBS} ${UNITTEST_LDADD}
+unittest_crypto_LDADD =  ${LIBGLOBAL_LDA} ${UNITTEST_LDADD}
 unittest_crypto_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
 check_PROGRAMS += unittest_crypto
 
@@ -754,13 +754,13 @@ libosdc_la_SOURCES = \
        osdc/ObjectCacher.cc \
        osdc/Filer.cc \
        osdc/Journaler.cc
-libosdc_la_LIBADD = libglobal.la
+libosdc_la_LIBADD = libcommon.la
 noinst_LTLIBRARIES += libosdc.la
 
 libclient_la_SOURCES = \
        client/Client.cc \
        client/Trace.cc
-libclient_la_LIBADD = libglobal.la
+libclient_la_LIBADD = libcommon.la
 noinst_LTLIBRARIES += libclient.la
 
 dist-hook:

diff --git a/src/client/Client.h b/src/client/Client.h
index 7e57ae07a5b2f50fbca1477a7d2424debeadd769..22fb8ca78159bb819a091bebd457690e953e74e6 100644 (file)
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -565,9 +565,9 @@ class Inode {
     /*cout << "cap_gen     " << cap->session-> cap_gen << std::endl
         << "session gen " << cap->gen << std::endl
         << "cap expire  " << cap->session->cap_ttl << std::endl
-        << "cur time    " << ceph_clock_now(g_ceph_context) << std::endl;*/
+        << "cur time    " << ceph_clock_now(cct) << std::endl;*/
     if ((cap->session->cap_gen <= cap->gen)
-       && (ceph_clock_now(g_ceph_context) < cap->session->cap_ttl)) {
+       && (ceph_clock_now(cct) < cap->session->cap_ttl)) {
       return true;
     }
     //if we make it here, the capabilities aren't up-to-date

diff --git a/src/libceph.cc b/src/libceph.cc
index f1cec734eeedcf1896b0e9295539bcb43043bfb1..91913c3f94ddc47506d19587a0fc8064e0868be4 100644 (file)
--- a/src/libceph.cc
+++ b/src/libceph.cc
@@ -220,8 +220,6 @@ extern "C" int ceph_create_with_context(struct ceph_mount_info **cmount, CephCon
   return 0;
 }
 
-void global_init_set_globals(CephContext *cct); // FIXME: bug #845
-
 extern "C" int ceph_create(struct ceph_mount_info **cmount, const char * const id)
 {
   CephInitParameters iparams(CEPH_ENTITY_TYPE_CLIENT, CEPH_CONF_FILE_DEFAULT);
@@ -231,7 +229,6 @@ extern "C" int ceph_create(struct ceph_mount_info **cmount, const char * const i
   }
 
   CephContext *cct = common_preinit(iparams, CODE_ENVIRONMENT_LIBRARY, 0);
-  global_init_set_globals(cct); // FIXME: bug #845
   cct->_conf->parse_env(); // environment variables coverride
   cct->_conf->apply_changes();
   return ceph_create_with_context(cmount, cct);