Merge pull request #3043 from yuyuyu101/objectstore-perf

Objectstore::Transaction Perf Program

Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc src/common/Makefile.am
index 94ac19d7c9e4d4c5a3ae79f286efd3ae385dc664,8ee980d614e9a1701f7203ee571fbf3819435100..28881945357c18cd3f87f385ee6cef564d5f91f5
--- 1/src/common/Makefile.am
--- 2/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@@ -72,10 -73,11 +72,11 @@@ libcommon_internal_la_SOURCES = 
        common/bloom_filter.cc \
        common/linux_version.c \
        common/module.c \
-       common/Readahead.cc
+       common/Readahead.cc \
+       common/Cycles.cc
  
 -# these should go out of libcommon
 -libcommon_la_SOURCES += \
 +# these should go out of libcommon_internal
 +libcommon_internal_la_SOURCES += \
        mon/MonCap.cc \
        mon/MonClient.cc \
        mon/MonMap.cc \
@@@ -217,8 -208,13 +218,10 @@@ noinst_HEADERS += 
        common/linux_version.h \
        common/module.h \
        common/Continuation.h \
-       common/Readahead.h
+       common/Readahead.h \
+       common/Cycles.h \
+       common/Initialize.h
  
 -noinst_LTLIBRARIES += libcommon.la
 -
 -
  libsecret_la_SOURCES = common/secret.c
  libsecret_la_LIBADD = $(KEYUTILS_LIB)
  if LINUX

diff --cc src/test/Makefile.am
Simple merge