Make GetTestDirectory threadsafe within Chromium and make it work on Windows.
git-svn-id: https://leveldb.googlecode.com/svn/trunk@13 62dab493-f737-651d-591e-8d6aee1b9529
This commit is contained in:
parent
13b72af77b
commit
6d243ebf79
@ -60,6 +60,9 @@ namespace {
|
|||||||
|
|
||||||
class Thread;
|
class Thread;
|
||||||
|
|
||||||
|
static const ::FilePath::CharType kLevelDBTestDirectoryPrefix[]
|
||||||
|
= FILE_PATH_LITERAL("leveldb-test-");
|
||||||
|
|
||||||
::FilePath CreateFilePath(const std::string& file_path) {
|
::FilePath CreateFilePath(const std::string& file_path) {
|
||||||
#if defined(OS_WIN)
|
#if defined(OS_WIN)
|
||||||
return FilePath(UTF8ToUTF16(file_path));
|
return FilePath(UTF8ToUTF16(file_path));
|
||||||
@ -391,12 +394,16 @@ class ChromiumEnv : public Env {
|
|||||||
}
|
}
|
||||||
|
|
||||||
virtual Status GetTestDirectory(std::string* path) {
|
virtual Status GetTestDirectory(std::string* path) {
|
||||||
|
mu_.Acquire();
|
||||||
if (test_directory_.empty()) {
|
if (test_directory_.empty()) {
|
||||||
if (!::file_util::CreateNewTempDirectory("leveldb-", &test_directory_)) {
|
if (!::file_util::CreateNewTempDirectory(kLevelDBTestDirectoryPrefix,
|
||||||
|
&test_directory_)) {
|
||||||
|
mu_.Release();
|
||||||
return Status::IOError("Could not create temp directory.");
|
return Status::IOError("Could not create temp directory.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
*path = FilePathToString(test_directory_);
|
*path = FilePathToString(test_directory_);
|
||||||
|
mu_.Release();
|
||||||
return Status::OK();
|
return Status::OK();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user