]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
common/Cycles: Do not initialize Cycles globally. 8538/head
authorRichard W.M. Jones <rjones@redhat.com>
Mon, 21 Mar 2016 14:24:35 +0000 (14:24 +0000)
committerVicente Cheng <freeze.bilsted@gmail.com>
Mon, 11 Apr 2016 15:39:08 +0000 (23:39 +0800)
commita2e7ca15d6fd0326526b77f443c15067eb1840ac
treeedf30275b5356b0a78f431a3f7dd603a2e57230e
parente219e85be00088eecde7b1f29d7699493a79bc4d
common/Cycles: Do not initialize Cycles globally.

Move initialization to the few tests that actually use it.

Fixes: http://tracker.ceph.com/issues/15225
Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
(cherry picked from commit 1c2831a2c1277c69f9649200d74a75c04a4b0296)

  Conflicts:
src/test/msgr/perf_msgr_client.cc
src/test/msgr/perf_msgr_server.cc
src/test/perf_local.cc
            These three files were not introduced on hammer, just remove
src/common/Cycles.cc
src/test/objectstore/ObjectStoreTransactionBenchmark.cc