]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
unittest_crypto: benchmark 100,000 CryptoKey::encrypt() calls 7801/head
authorSage Weil <sage@redhat.com>
Mon, 26 Jan 2015 23:57:33 +0000 (15:57 -0800)
committerLoic Dachary <ldachary@redhat.com>
Thu, 25 Feb 2016 12:07:35 +0000 (19:07 +0700)
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit fb4b6c52d8e31e8dedfa8aecc16c389f0e7d86cf)

Conflicts:
src/test/crypto.cc : complements the incorrect cherry-pick
           df3f971eafda9c54881c13dcf47f996f18e17028 see
           http://tracker.ceph.com/issues/14863 for more information

src/test/crypto.cc

index 150d2a45cc5520af39d8f88f02b0a73f64948411..17e90d04097cebab7ee0bd32de745bc0d55bea71 100644 (file)
@@ -3,7 +3,10 @@
 
 #include "include/types.h"
 #include "auth/Crypto.h"
+#include "common/Clock.h"
 #include "common/ceph_crypto.h"
+#include "common/ceph_context.h"
+#include "global/global_context.h"
 
 #include "test/unit.h"