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

Merge pull request #1003 from yuslepukhin/fix_mutexlock_pthread_build

Browse Source 
This addresses build issues on Windows
This commit is contained in:
Igor Canadi 2016-02-19 13:12:36 -08:00
commit 0914f0ca55
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
db/auto_roll_logger.h
View File

@ -14,6 +14,7 @@
#include "port/port.h" #include "port/port.h"
#include "port/util_logger.h" #include "port/util_logger.h"
#include "util/sync_point.h" #include "util/sync_point.h"
#include "util/mutexlock.h"
namespace rocksdb { namespace rocksdb {

14
util/thread_local_test.cc
View File

@ -3,7 +3,7 @@
// LICENSE file in the root directory of this source tree. An additional grant // 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. // of patent rights can be found in the PATENTS file in the same directory.
#include <pthread.h> #include <thread>
#include <atomic> #include <atomic>
#include <string> #include <string>
@ -496,9 +496,15 @@ TEST_F(ThreadLocalTest, DISABLED_MainThreadDiesFirst) {
// Triggers the initialization of singletons. // Triggers the initialization of singletons.
Env::Default(); Env::Default();
pthread_t t;
pthread_create(&t, nullptr, &AccessThreadLocal, nullptr); try {
TEST_SYNC_POINT("MainThreadDiesFirst:End"); std::thread th(&AccessThreadLocal, nullptr);
th.detach();
TEST_SYNC_POINT("MainThreadDiesFirst:End");
} catch (const std::system_error& ex) {
std::cerr << "Start thread: " << ex.code() << std::endl;
ASSERT_TRUE(false);
}
} }
} // namespace rocksdb } // namespace rocksdb