This is an automated email from the ASF dual-hosted git repository. nightowl888 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit 4d13c36c8cc1fd419f125661632396cf1d305cd0 Author: Shad Storhaug <[email protected]> AuthorDate: Sat Aug 14 03:26:26 2021 +0700 SWEEP: Removed FEATURE_THREAD_YIELD and changed all calls to use Thread.Yield() instead of Thread.Sleep(0) --- Directory.Build.targets | 1 - src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs | 3 ++- src/Lucene.Net.TestFramework/Store/BaseDirectoryTestCase.cs | 4 ---- src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs | 4 ---- src/Lucene.Net.TestFramework/Store/MockIndexOutputWrapper.cs | 2 +- src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs | 4 ++-- src/Lucene.Net.Tests/Index/TestStressIndexing2.cs | 2 +- src/Lucene.Net.Tests/TestWorstCaseTestBehavior.cs | 2 -- 8 files changed, 6 insertions(+), 16 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 89d4ccd..5c18ebc 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -71,7 +71,6 @@ <DefineConstants>$(DefineConstants);FEATURE_TEXTWRITER_CLOSE</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_TEXTWRITER_INITIALIZELIFETIMESERVICE</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_THREAD_PRIORITY</DefineConstants> - <DefineConstants>$(DefineConstants);FEATURE_THREAD_YIELD</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_THREADPOOL_UNSAFEQUEUEWORKITEM</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_TYPE_GETMETHOD__BINDINGFLAGS_PARAMS</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_XSLT</DefineConstants> diff --git a/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs b/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs index 896db4e..f34829a 100644 --- a/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs +++ b/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs @@ -8,6 +8,7 @@ using RandomizedTesting.Generators; using System; using System.Collections; using System.Collections.Generic; +using System.Threading; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Index @@ -65,7 +66,7 @@ namespace Lucene.Net.Index { if (random.Next(4) == 2) { - System.Threading.Thread.Sleep(0); + Thread.Yield(); } } } diff --git a/src/Lucene.Net.TestFramework/Store/BaseDirectoryTestCase.cs b/src/Lucene.Net.TestFramework/Store/BaseDirectoryTestCase.cs index bf3182e..a45097d 100644 --- a/src/Lucene.Net.TestFramework/Store/BaseDirectoryTestCase.cs +++ b/src/Lucene.Net.TestFramework/Store/BaseDirectoryTestCase.cs @@ -501,11 +501,7 @@ namespace Lucene.Net.Store // using (IndexOutput output = this.dir.CreateOutput(fileName, NewIOContext(Random))) // { // // Add some lags so that the other thread can read the content of the directory. - //#if !FEATURE_THREAD_YIELD - // Thread.Sleep(0); - //#else // Thread.Yield(); - //#endif // } // assertTrue(SlowFileExists(this.dir, fileName)); // } diff --git a/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs b/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs index e091f0d..dd4be0a 100644 --- a/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs +++ b/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs @@ -534,11 +534,7 @@ namespace Lucene.Net.Store { if (randomState.NextBoolean()) { -#if !FEATURE_THREAD_YIELD - Thread.Sleep(0); -#else Thread.Yield(); -#endif } } diff --git a/src/Lucene.Net.TestFramework/Store/MockIndexOutputWrapper.cs b/src/Lucene.Net.TestFramework/Store/MockIndexOutputWrapper.cs index 87bc01e..cf61b84 100644 --- a/src/Lucene.Net.TestFramework/Store/MockIndexOutputWrapper.cs +++ b/src/Lucene.Net.TestFramework/Store/MockIndexOutputWrapper.cs @@ -150,7 +150,7 @@ namespace Lucene.Net.Store { int half = len / 2; @delegate.WriteBytes(b, offset, half); - Thread.Sleep(0); + Thread.Yield(); @delegate.WriteBytes(b, offset + half, len - half); } else diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs index 4245c2c..c14ee52 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs @@ -464,7 +464,7 @@ namespace Lucene.Net.Index break; } #pragma warning disable 168 - catch (NullReferenceException e) + catch (NullReferenceException e) // LUCENENET TODO: We should fix the components so this cannot occur (assuming it can). #pragma warning restore 168 { done = true; @@ -478,7 +478,7 @@ namespace Lucene.Net.Index break; } } - Thread.Sleep(0); + Thread.Yield(); } } } diff --git a/src/Lucene.Net.Tests/Index/TestStressIndexing2.cs b/src/Lucene.Net.Tests/Index/TestStressIndexing2.cs index 22e9c3b..d1c2d52 100644 --- a/src/Lucene.Net.Tests/Index/TestStressIndexing2.cs +++ b/src/Lucene.Net.Tests/Index/TestStressIndexing2.cs @@ -69,7 +69,7 @@ namespace Lucene.Net.Index // if (name.equals("startCommit")) { if (Random.Next(4) == 2) { - Thread.Sleep(0); + Thread.Yield(); } } } diff --git a/src/Lucene.Net.Tests/TestWorstCaseTestBehavior.cs b/src/Lucene.Net.Tests/TestWorstCaseTestBehavior.cs index a6c9298..6259402 100644 --- a/src/Lucene.Net.Tests/TestWorstCaseTestBehavior.cs +++ b/src/Lucene.Net.Tests/TestWorstCaseTestBehavior.cs @@ -26,7 +26,6 @@ namespace Lucene.Net public class TestWorstCaseTestBehavior : LuceneTestCase { -#if FEATURE_THREAD_YIELD [Ignore("Ignored in Lucene")] [Test] public virtual void TestThreadLeak() @@ -41,7 +40,6 @@ namespace Lucene.Net // once alive, leave it to run outside of the test scope. } -#endif private class ThreadAnonymousClass : ThreadJob {
