Cleanups.parallel-retrace

2 files changed, 12 insertions, 34 deletions

diff --git a/common/os_thread.hpp b/common/os_thread.hpp
index 6edf148c..6573d0f2 100644
--- a/common/os_thread.hpp
+++ b/common/os_thread.hpp
@@ -322,8 +322,9 @@ namespace os {
 
         inline void
         wait(unique_lock<mutex> & lock, std::function<bool()> pred) {
-            while (!pred)
+            while (!pred) {
                 wait(lock);
+            }
         }
     };
 
@@ -443,31 +444,6 @@ namespace os {
 #endif
         }
 
-#if 0
-        template< typename Function, typename... Args >
-        class thread_data
-        {
-        public:
-            thread_data(Function &&f, Args&&... args) :
-                _f(std::forward<Function>(f)),
-                _args(std::forward<Args...>(args...))
-            {}
-
-            thread_data(const thread_data&) = delete;
-            thread_data& operator=(const thread_data&) = delete;
-
-            void operator() (void) {
-                //auto f = std::bind(std::forward<Function>(_f), std::forward<Args>(_args)...);
-                //f();
-                _f(std::tie(_args));
-            }
-
-        private:
-            typename std::decay<Function>::type _f;
-            std::tuple<typename std::decay<Args>::type...> _args;
-        };
-#endif
-
         template< class Function, class... Args >
         explicit thread(Function &&f, Args&&... args) {
             auto bound = std::bind(std::forward<Function>(f), std::forward<Args>(args)...);
diff --git a/common/os_thread_test.cpp b/common/os_thread_test.cpp
index ff966f36..aeec6a93 100644
--- a/common/os_thread_test.cpp
+++ b/common/os_thread_test.cpp
@@ -77,14 +77,16 @@ struct Data
     volatile unsigned c = 0;
 };
 
-
-static os::mutex cerr_mutex;
-
-#define WITH_CERR_MUTEX(_stmts) \
-    { \
-        os::unique_lock<os::mutex> cerr_lock(cerr_mutex); \
-        _stmts \
-    }
+#if 0
+    static os::mutex cerr_mutex;
+#   define WITH_CERR_MUTEX(_stmts) \
+        { \
+            os::unique_lock<os::mutex> cerr_lock(cerr_mutex); \
+            _stmts \
+        }
+#else
+#   define WITH_CERR_MUTEX(_stmts)
+#endif
 
 
 static void cvf(Data *data, unsigned idx)