Merge branch 'master' into thread-safe-random-number-generation

bindings/java/fdbJNI.cpp

@@ -28,14 +28,8 @@
 #define JNI_NULL nullptr 
 
 #if defined(__GNUG__)
-#define thread_local __thread
-// TODO: figure out why the default definition suppresses visibility
 #undef JNIEXPORT
 #define JNIEXPORT __attribute__ ((visibility ("default")))
-#elif defined(_MSC_VER)
-#define thread_local __declspec(thread)
-#else
-#error Missing thread local storage
 #endif
 
 static JavaVM* g_jvm = nullptr; 

flow/Platform.h

@@ -79,23 +79,6 @@
 #define DISABLE_ZERO_DIVISION_FLAG _Pragma("GCC diagnostic ignored \"-Wdiv-by-zero\"")
 #endif
 
-/*
- * Thread-local storage (but keep in mind any platform-specific
- * restrictions on where this is valid and/or ignored).
- *
- * http://en.wikipedia.org/wiki/Thread-local_storage
- *
- * SOMEDAY: Intel C++ compiler uses g++ syntax on Linux and MSC syntax
- * on Windows.
- */
-#if defined(__GNUG__)
-#define thread_local __thread
-#elif defined(_MSC_VER)
-#define thread_local __declspec(thread)
-#else
-#error Missing thread local storage
-#endif
-
 #if defined(__GNUG__)
 #define force_inline inline __attribute__((__always_inline__))
 #elif defined(_MSC_VER)

tests/TestRunner/TestRunner.py

@@ -273,7 +273,7 @@ def run_simulation_test(basedir, options):
         pargs.append(os.path.join(args.builddir, 'fdb.cluster'))
     else:
         pargs.append('-S')
-        pargs.append('random')
+        pargs.append('off')
     td = TestDirectory(basedir)
     if options.buggify:
         pargs.append('-b')