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

make MockTimeEnv::current_time_ atomic to fix data race

Browse Source 
Summary:
fix a new TSAN failure
https://gist.github.com/miasantreble/7599c33f4e17da1024c67d4540dbe397
Closes https://github.com/facebook/rocksdb/pull/3694

Differential Revision: D7565310

Pulled By: miasantreble

fbshipit-source-id: f672c96e925797b34dec6e20b59527e8eebaa825
This commit is contained in:
Zhongyi Xie 2018-04-10 14:04:44 -07:00 committed by Facebook Github Bot
parent 5ec382b918
commit 2770a94c42
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/db_test_util.h
View File

@ -606,7 +606,7 @@ class MockTimeEnv : public EnvWrapper {
} }
private: private:
uint64_t current_time_ = 0; std::atomic<uint64_t> current_time_{0};
}; };
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE

5
util/status.cc
View File

@ -15,10 +15,11 @@
namespace rocksdb { namespace rocksdb {
const char* Status::CopyState(const char* state) { const char* Status::CopyState(const char* state) {
const size_t cch = const size_t cch =
std::strlen(state) + 1; // +1 for the null terminator std::strlen(state) + 1; // +1 for the null terminator
char* const result = char* const result =
new char[cch]; new char[cch];
result[cch - 1] = '\0';
#ifdef OS_WIN #ifdef OS_WIN
errno_t ret; errno_t ret;
ret = strncpy_s(result, cch, state, cch - 1); ret = strncpy_s(result, cch, state, cch - 1);