andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix tsan error

Browse Source 
Summary:
The tsan error was because the random implementation we have is not
thread safe, using Random::GetTLSInstance

Test Plan: Run tests in Linux

Reviewers: sdong

Subscribers: andrewkr, dhruba, leveldb

Differential Revision: https://reviews.facebook.net/D59559
This commit is contained in:
krad 2016-06-10 17:25:39 -07:00
parent bc8af90e8c
commit 81f6b33d93
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utilities/persistent_cache/hash_table_evictable.h
View File

@ -76,7 +76,8 @@ class EvictableHashTable : private HashTable<T*, Hash, Equal> {
// Evict one of the least recently used object
//
T* Evict(const std::function<void(T*)>& fn = nullptr) {
const size_t start_idx = rand_.Next() % hash_table::nlocks_;
uint32_t random = Random::GetTLSInstance()->Next();
const size_t start_idx = random % hash_table::nlocks_;
T* t = nullptr;
// iterate from start_idx .. 0 .. start_idx
@ -157,7 +158,6 @@ class EvictableHashTable : private HashTable<T*, Hash, Equal> {
return hash_table::locks_[lock_idx];
}
Random64 rand_{static_cast<uint64_t>(time(nullptr))};
std::unique_ptr<LRUListType[]> lru_lists_;
};

2
utilities/persistent_cache/persistent_cache_test.cc
View File

@ -26,7 +26,6 @@ TEST_F(PersistentCacheTierTest, VolatileCacheInsert) {
}
}
#ifndef ROCKSDB_TSAN_RUN
TEST_F(PersistentCacheTierTest, VolatileCacheInsertWithEviction) {
for (auto nthreads : {1, 5}) {
for (auto max_keys : {1 * 1024 * 1024}) {
@ -36,7 +35,6 @@ TEST_F(PersistentCacheTierTest, VolatileCacheInsertWithEviction) {
}
}
}
#endif
// test table with volatile page cache
TEST_F(PersistentCacheDBTest, VolatileCacheTest) {