update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / rocksdb / util / log_write_bench.cc

diff --git a/ceph/src/rocksdb/util/log_write_bench.cc b/ceph/src/rocksdb/util/log_write_bench.cc
index 9ba84b7c69f18de135c7b4e318226922ec4b72ae..b4e12b948c5a3a6f4ad68b707a73d5593df19093 100644 (file)
--- a/ceph/src/rocksdb/util/log_write_bench.cc
+++ b/ceph/src/rocksdb/util/log_write_bench.cc
@@ -1,7 +1,7 @@
 //  Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under the BSD-style license found in the
-//  LICENSE file in the root directory of this source tree. An additional grant
-//  of patent rights can be found in the PATENTS file in the same directory.
+//  This source code is licensed under both the GPLv2 (found in the
+//  COPYING file in the root directory) and Apache 2.0 License
+//  (found in the LICENSE.Apache file in the root directory).
 
 #ifndef GFLAGS
 #include <cstdio>
@@ -11,16 +11,15 @@ int main() {
 }
 #else
 
-#include <gflags/gflags.h>
-
 #include "monitoring/histogram.h"
 #include "rocksdb/env.h"
 #include "util/file_reader_writer.h"
+#include "util/gflags_compat.h"
 #include "util/testharness.h"
 #include "util/testutil.h"
 
-using GFLAGS::ParseCommandLineFlags;
-using GFLAGS::SetUsageMessage;
+using GFLAGS_NAMESPACE::ParseCommandLineFlags;
+using GFLAGS_NAMESPACE::SetUsageMessage;
 
 // A simple benchmark to simulate transactional logs
 
@@ -32,7 +31,7 @@ DEFINE_bool(enable_sync, false, "sync after each write.");
 
 namespace rocksdb {
 void RunBenchmark() {
-  std::string file_name = test::TmpDir() + "/log_write_benchmark.log";
+  std::string file_name = test::PerThreadDBPath("log_write_benchmark.log");
   Env* env = Env::Default();
   EnvOptions env_options = env->OptimizeForLogWrite(EnvOptions());
   env_options.bytes_per_sync = FLAGS_bytes_per_sync;