This addresses build issues on Windows

https://github.com/facebook/rocksdb/issues/1002
main
Dmitri Smirnov 9 years ago
parent d825fc70d4
commit d37d348da8
  1. 1
      db/auto_roll_logger.h
  2. 14
      util/thread_local_test.cc

@ -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 {

@ -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

Loading…
Cancel
Save