Merge branch 'profiling' into unstable

Conflicts:
	src/Makefile.am

diff --cc src/Makefile.am
index 9e6435dcd4fd05289892ce8611e4209f6a30619a,0a00bebd31a29ea24ca244223f59931a29f4c9b9..054bab85617eeb949ad60b1cb4bfda517e238e28
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -23,7 -24,17 +24,8 @@@ cosd_CXXFLAGS = ${AM_CFLAGS
  cmds_SOURCES = cmds.cc msg/SimpleMessenger.cc
  cmds_LDADD = libmds.a libosdc.a libcrush.a libcommon.a -lpthread -lm -lcrypto
  bin_PROGRAMS += cmds
+ cmds_CXXFLAGS = ${AM_CFLAGS}
  
 -# tcmalloc?
 -if WITH_TCMALLOC
 -tcmalloc_safety_flags = "-fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free"
 -cosd_LDADD += -ltcmalloc
 -cosd_CXXFLAGS += ${tcmalloc_safety_flags}
 -cmds_LDADD += -ltcmalloc
 -cmds_CXXFLAGS += ${tcmalloc_safety_flags}
 -endif # WITH_TCMALLOC
 -
  # admin tools
  ceph_SOURCES = ceph.cc msg/SimpleMessenger.cc
  ceph_LDADD = libcrush.a libcommon.a -ledit -lpthread -lm -lcrypto
@@@ -56,15 -67,8 +58,20 @@@ core: cmon cosd cmds ceph cconf monmapt
  if WITH_FUSE
  cfuse_SOURCES = cfuse.cc msg/SimpleMessenger.cc client/fuse.cc client/fuse_ll.cc
  cfuse_LDADD = -lfuse libclient.a libosdc.a libcrush.a libcommon.a -lpthread -lm -lcrypto
++cfuse_CXXFLAGS = ${AM_CFLAGS}
  bin_PROGRAMS += cfuse
  
 +# tcmalloc?
 +if WITH_TCMALLOC
++tcmalloc_safety_flags = "-fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free"
 +cosd_LDADD += -ltcmalloc
++cosd_CXXFLAGS += ${tcmalloc_safety_flags}
 +cmds_LDADD += -ltcmalloc
++cmds_CXXFLAGS += ${tcmalloc_safety_flags}
 +cfuse_LDADD += -ltcmalloc
++cfuse_CXXFLAGS += ${tcmalloc_safety_flags}
 +endif # WITH_TCMALLOC
 +
  #if WITH_DEBUG
  #fakefuse_SOURCES = fakefuse.cc msg/FakeMessenger.cc client/fuse.cc client/fuse_ll.cc
  #fakefuse_LDADD = -lfuse libmon.a libmds.a libosd.a libos.a \

diff --cc src/config.cc
Simple merge

diff --cc src/config.h
Simple merge