c7c7b07f06
Summary: Cleans up some of the dependencies on test code in the Makefile while building tools: - Moves the test::RandomString, DBBaseTest::RandomString into Random - Moves the test::RandomHumanReadableString into Random - Moves the DestroyDir method into file_utils - Moves the SetupSyncPointsToMockDirectIO into sync_point. - Moves the FaultInjection Env and FS classes under env These changes allow all of the tools to build without dependencies on test_util, thereby simplifying the build dependencies. By moving the FaultInjection code, the dependency in db_stress on different libraries for debug vs release was eliminated. Tested both release and debug builds via Make and CMake for both static and shared libraries. More work remains to clean up how the tools are built and remove some unnecessary dependencies. There is also more work that should be done to get the Makefile and CMake to align in their builds -- what is in the libraries and the sizes of the executables are different. Pull Request resolved: https://github.com/facebook/rocksdb/pull/7097 Reviewed By: riversand963 Differential Revision: D22463160 Pulled By: pdillinger fbshipit-source-id: e19462b53324ab3f0b7c72459dbc73165cc382b2
57 lines
1.4 KiB
C++
57 lines
1.4 KiB
C++
// Copyright (c) 2011-present, Facebook, Inc. All rights reserved.
|
|
// 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).
|
|
//
|
|
|
|
#include "util/random.h"
|
|
|
|
#include <stdint.h>
|
|
#include <string.h>
|
|
#include <thread>
|
|
#include <utility>
|
|
|
|
#include "port/likely.h"
|
|
#include "util/thread_local.h"
|
|
|
|
#ifdef ROCKSDB_SUPPORT_THREAD_LOCAL
|
|
#define STORAGE_DECL static __thread
|
|
#else
|
|
#define STORAGE_DECL static
|
|
#endif
|
|
|
|
namespace ROCKSDB_NAMESPACE {
|
|
|
|
Random* Random::GetTLSInstance() {
|
|
STORAGE_DECL Random* tls_instance;
|
|
STORAGE_DECL std::aligned_storage<sizeof(Random)>::type tls_instance_bytes;
|
|
|
|
auto rv = tls_instance;
|
|
if (UNLIKELY(rv == nullptr)) {
|
|
size_t seed = std::hash<std::thread::id>()(std::this_thread::get_id());
|
|
rv = new (&tls_instance_bytes) Random((uint32_t)seed);
|
|
tls_instance = rv;
|
|
}
|
|
return rv;
|
|
}
|
|
|
|
std::string Random::HumanReadableString(int len) {
|
|
std::string ret;
|
|
ret.resize(len);
|
|
for (int i = 0; i < len; ++i) {
|
|
ret[i] = static_cast<char>('a' + Uniform(26));
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
std::string Random::RandomString(int len) {
|
|
std::string ret;
|
|
ret.resize(len);
|
|
for (int i = 0; i < len; i++) {
|
|
ret[i] = static_cast<char>(' ' + Uniform(95)); // ' ' .. '~'
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
} // namespace ROCKSDB_NAMESPACE
|