enable_input_merging -> allow_merging

schlangster · schlangster · commit d63c66a05118 · 2014-06-21T14:03:15.000+02:00
diff --git a/include/react/Domain.h b/include/react/Domain.h
@@ -65,7 +65,7 @@ class SignalPack;
 using REACT_IMPL::TurnFlagsT;
 
 //ETurnFlags
-using REACT_IMPL::enable_input_merging;
+using REACT_IMPL::allow_merging;
 
 #ifdef REACT_ENABLE_LOGGING
     using REACT_IMPL::EventLog;
diff --git a/include/react/detail/ReactiveInput.h b/include/react/detail/ReactiveInput.h
@@ -44,7 +44,7 @@ using TransactionFuncT = std::function<void()>;
 
 enum
 {
-    enable_input_merging    = 1 << 0
+    allow_merging    = 1 << 0
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -278,7 +278,7 @@ class InputManager :
     {
         // Attempt to add input to another turn.
         // If successful, blocks until other turn is done and returns.
-        bool canMerge = (flags & enable_input_merging) != 0;
+        bool canMerge = (flags & allow_merging) != 0;
         if (canMerge && Engine::TryMergeSync(std::forward<F>(func)))
             return;
 
@@ -454,7 +454,7 @@ class InputManager :
                 skipPop = false;
 
             // First try to merge to an existing synchronous item in the queue
-            bool canMerge = (item.Flags & enable_input_merging) != 0;
+            bool canMerge = (item.Flags & allow_merging) != 0;
             if (canMerge && Engine::TryMergeAsync(std::move(item.Func), std::move(item.StatusPtr)))
                 continue;
 
@@ -487,7 +487,7 @@ class InputManager :
                 uint extraCount = 0;
                 while (extraCount < 100 && asyncQueue_.try_pop(item))
                 {
-                    bool canMergeNext = (item.Flags & enable_input_merging) != 0;
+                    bool canMergeNext = (item.Flags & allow_merging) != 0;
                     if (canMergeNext)
                     {
                         item.Func();
@@ -540,7 +540,7 @@ class InputManager :
     void processContinuationData(TurnFlagsT flags)
     {
         // No merging for continuations
-        flags &= ~enable_input_merging;
+        flags &= ~allow_merging;
 
         continuation_.template DetachQueuedObservers<D>();
 
diff --git a/tests/src/TransactionTest.h b/tests/src/TransactionTest.h
@@ -268,25 +268,25 @@ TYPED_TEST_P(TransactionTest, Merging1)
     // Todo: improve this as it'll fail occasionally
     shouldSpin = true;
     std::thread t1([&] {
-        D::DoTransaction(enable_input_merging, [&] {
+        D::DoTransaction(allow_merging, [&] {
             n1 <<= 2;
         });
     });
     std::this_thread::sleep_for(std::chrono::milliseconds(2000));
     std::thread t2([&] {
-        D::DoTransaction(enable_input_merging, [&] {
+        D::DoTransaction(allow_merging, [&] {
             n1 <<= 3;
         });
     });
     std::this_thread::sleep_for(std::chrono::milliseconds(1000));
     std::thread t3([&] {
-        D::DoTransaction(enable_input_merging, [&] {
+        D::DoTransaction(allow_merging, [&] {
             n1 <<= 4;
         });
     });
     std::this_thread::sleep_for(std::chrono::milliseconds(1000));
     std::thread t4([&] {
-        D::DoTransaction(enable_input_merging, [&] {
+        D::DoTransaction(allow_merging, [&] {
             n1 <<= 5;
         });
         
@@ -360,7 +360,7 @@ TYPED_TEST_P(TransactionTest, AsyncMerging1)
 
     TransactionStatus st;
 
-    D::AsyncTransaction(enable_input_merging, st, [&] {
+    D::AsyncTransaction(allow_merging, st, [&] {
         std::this_thread::sleep_for(std::chrono::milliseconds(1000));
         in <<= 10;
     });
@@ -369,11 +369,11 @@ TYPED_TEST_P(TransactionTest, AsyncMerging1)
     std::this_thread::sleep_for(std::chrono::milliseconds(10));
 
     // These two can still be pulled in after the first input function is done
-    D::AsyncTransaction(enable_input_merging, st, [&] {
+    D::AsyncTransaction(allow_merging, st, [&] {
         in <<= 20;
     });
 
-    D::AsyncTransaction(enable_input_merging, st, [&] {
+    D::AsyncTransaction(allow_merging, st, [&] {
         in <<= 30;
     });
 
@@ -383,11 +383,11 @@ TYPED_TEST_P(TransactionTest, AsyncMerging1)
     });
 
     // These two should be merged again
-    D::AsyncTransaction(enable_input_merging, st, [&] {
+    D::AsyncTransaction(allow_merging, st, [&] {
         in <<= 50;
     });
 
-    D::AsyncTransaction(enable_input_merging, st, [&] {
+    D::AsyncTransaction(allow_merging, st, [&] {
         in <<= 60;
     });
 
