Get rid of __MonoCS__

Replaced with existing USE_UNIX_IO and MONO for other places. Also added a few MONOCKECK comments where we should follow up if it is still needed or not
EventStore · Jan 13, 2017 · 6d13189 · 6d13189
1 parent ba9e7f0
commit 6d13189
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 35 deletions.
diff --git a/build.sh b/build.sh
@@ -39,6 +39,7 @@ EOF
 }
 
 CONFIGURATION="Release"
+DEFINES="USE_UNIX_IO MONO"
 
 function checkParams() {
     version=$1
@@ -199,7 +200,7 @@ function buildEventStore {
     patchVersionFiles
     patchVersionInfo
     rm -rf bin/
-    xbuild src/EventStore.sln /p:Platform="Any CPU" /p:Configuration="$CONFIGURATION" || err
+    xbuild src/EventStore.sln /p:Platform="Any CPU" /p:DefineConstants="$DEFINES" /p:Configuration="$CONFIGURATION" || err
     revertVersionFiles
     revertVersionInfo
 }

diff --git a/src/EventStore.ClientAPI/Transport.Http/HttpAsyncClient.cs b/src/EventStore.ClientAPI/Transport.Http/HttpAsyncClient.cs
@@ -76,7 +76,8 @@ private void Receive(string method, string url, UserCredentials userCredentials,
                              Action<HttpResponse> onSuccess, Action<Exception> onException, string hostHeader = "")
         {
             var request = new HttpRequestMessage();
-#if __MonoCS__
+//MONOCHECK IS THIS STILL NEEDED?
+#if MONO
             request.Headers.Add("Keep-alive", "false");
 #endif
             request.RequestUri = new Uri(url);

diff --git a/src/EventStore.Core.Tests/Http/HttpBehaviorSpecification.cs b/src/EventStore.Core.Tests/Http/HttpBehaviorSpecification.cs
@@ -30,7 +30,8 @@ public abstract class HttpBehaviorSpecification : SpecificationWithDirectoryPerT
         protected string _lastResponseBody;
         protected byte[] _lastResponseBytes;
         protected JsonException _lastJsonException;
-#if !__MonoCS__
+//MONOCHECK Does this work now?
+#if !MONO
         private Func<HttpWebResponse, byte[]> _dumpResponse;
         private Func<HttpWebResponse, int> _dumpResponse2;
         private Func<HttpWebRequest, byte[]> _dumpRequest;
@@ -41,7 +42,7 @@ public abstract class HttpBehaviorSpecification : SpecificationWithDirectoryPerT
 
         public override void TestFixtureSetUp()
         {
-#if !__MonoCS__
+#if !MONO
             Helper.EatException(() => _dumpResponse = CreateDumpResponse());
             Helper.EatException(() => _dumpResponse2 = CreateDumpResponse2());
             Helper.EatException(() => _dumpRequest = CreateDumpRequest());
@@ -368,7 +369,7 @@ protected HttpWebResponse GetRequestResponse(HttpWebRequest request)
             {
                 response = (HttpWebResponse) ex.Response;
             }
-#if !__MonoCS__
+#if !MONO
             if (_dumpRequest != null)
             {
                 var bytes = _dumpRequest(request);

diff --git a/src/EventStore.Core.Tests/Http/Streams/basic.cs b/src/EventStore.Core.Tests/Http/Streams/basic.cs
@@ -426,11 +426,7 @@ public void returns_a_location_header_that_is_to_stream_without_slash()
             }
         }
 
-#if __MonoCS__
-        [TestFixture, Category("LongRunning"), Ignore("https://bugzilla.xamarin.com/show_bug.cgi?id=16960")]
-#else
         [TestFixture, Category("LongRunning")]
-#endif
         public class when_getting_from_encoded_all_stream_with_slash : HttpBehaviorSpecification
         {
             private HttpWebResponse _response;

diff --git a/src/EventStore.Core/Bus/QueuedHandler.cs b/src/EventStore.Core/Bus/QueuedHandler.cs
@@ -5,7 +5,8 @@ namespace EventStore.Core.Bus
 {
     // on Windows AutoReset version is much slower, but on Linux ManualResetEventSlim version is much slower
     public class QueuedHandler :
-#if __MonoCS__
+//MONOCHECK is this still worthwhile or should we use MPMC?
+#if MONO
         QueuedHandlerAutoReset,
 #else
         QueuedHandlerMRES,
@@ -41,7 +42,7 @@ public static IQueuedHandler CreateQueuedHandler(IHandle<Message> consumer, stri
         }
 
         class QueueHandlerUsingMpsc :
-#if __MonoCS__
+#if MONO
         QueuedHandlerAutoResetWithMpsc,
 #else
             QueuedHandlerMresWithMpsc,

diff --git a/src/EventStore.Core/Index/PTable.cs b/src/EventStore.Core/Index/PTable.cs
@@ -166,7 +166,7 @@ internal Midpoint[] CacheMidpointsAndVerifyHash(int depth)
             var count = Count;
             if (count == 0 || depth == 0)
                 return null;
-#if  __MonoCS__
+#if  MONO
             var workItem = GetWorkItem();
             var stream = workItem.Stream;
             try {
@@ -232,7 +232,7 @@ internal Midpoint[] CacheMidpointsAndVerifyHash(int depth)
                     throw;
                 }
             }
-#if __MonoCS__
+#if MONO
             finally
             {
                 ReturnWorkItem(workItem);

diff --git a/src/EventStore.Core/Services/Monitoring/Utils/PerfCounterHelper.cs b/src/EventStore.Core/Services/Monitoring/Utils/PerfCounterHelper.cs
@@ -57,7 +57,7 @@ private PerformanceCounter CreatePerfCounterForProcess(string category, string c
             string processName = null;
             try
             {
-                #if __MonoCS__
+                #if MONO
                 processName = Process.GetCurrentProcess().Id.ToString();
                 #else
                 processName = Process.GetCurrentProcess().ProcessName;

diff --git a/src/EventStore.Core/TransactionLog/Chunks/TFChunk/TFChunk.cs b/src/EventStore.Core/TransactionLog/Chunks/TFChunk/TFChunk.cs
@@ -379,7 +379,7 @@ public void VerifyFileHash()
                 throw new InvalidOperationException("You can't verify hash of not-completed TFChunk.");
 
             Log.Trace("Verifying hash for TFChunk '{0}'...", _filename);
-#if  __MonoCS__
+#if  MONO
             using (var reader = AcquireReader())
             {
                 reader.Stream.Seek(0, SeekOrigin.Begin);

diff --git a/src/EventStore.Core/TransactionLog/Unbuffered/NativeFile.cs b/src/EventStore.Core/TransactionLog/Unbuffered/NativeFile.cs
@@ -5,7 +5,7 @@
 using Microsoft.Win32.SafeHandles;
 using System.Runtime.InteropServices;
 
-#if __MonoCS__ || USE_UNIX_IO
+#if USE_UNIX_IO
 using Mono.Unix.Native;
 using Mono.Unix;
 #endif
@@ -27,7 +27,7 @@ internal unsafe static class NativeFile
 
         public static uint GetDriveSectorSize(string path)
         {
-#if !__MonoCS__ && !USE_UNIX_IO
+#if !USE_UNIX_IO
             uint size;
             uint dontcare;
             WinNative.GetDiskFreeSpace(Path.GetPathRoot(path), out dontcare, out size, out dontcare, out dontcare);
@@ -39,7 +39,7 @@ public static uint GetDriveSectorSize(string path)
 
         public static long GetPageSize(string path)
         {
-#if !__MonoCS__ && !USE_UNIX_IO
+#if !USE_UNIX_IO
             return GetDriveSectorSize(path);
 #else
             int r =0;
@@ -53,7 +53,7 @@ public static long GetPageSize(string path)
 
         public static void SetFileSize(SafeFileHandle handle, long count)
         {
-#if !__MonoCS__ && !USE_UNIX_IO
+#if !USE_UNIX_IO
             var low = (int)(count & 0xffffffff);
             var high = (int)(count >> 32);
             WinNative.SetFilePointer(handle, low, out high, WinNative.EMoveMethod.Begin);
@@ -73,7 +73,7 @@ public static void SetFileSize(SafeFileHandle handle, long count)
 
         private static void FSync(SafeFileHandle handle)
         {
-#if !__MonoCS__ && !USE_UNIX_IO
+#if !USE_UNIX_IO
             WinNative.FlushFileBuffers(handle);
 #else
             Syscall.fsync(handle.DangerousGetHandle().ToInt32());
@@ -82,7 +82,7 @@ private static void FSync(SafeFileHandle handle)
 
         public static void Write(SafeFileHandle handle, byte* buffer, uint count, ref int written)
         {
-#if !__MonoCS__ && !USE_UNIX_IO
+#if !USE_UNIX_IO
             if (!WinNative.WriteFile(handle, buffer, count, ref written, IntPtr.Zero))
             {
                 throw new Win32Exception();
@@ -100,7 +100,7 @@ public static void Write(SafeFileHandle handle, byte* buffer, uint count, ref in
 
         public static int Read(SafeFileHandle handle, byte* buffer, int offset, int count)
         {
-#if !__MonoCS__ && !USE_UNIX_IO
+#if !USE_UNIX_IO
             var read = 0;
 
             if (!WinNative.ReadFile(handle, buffer, count, ref read, 0))
@@ -121,7 +121,7 @@ public static int Read(SafeFileHandle handle, byte* buffer, int offset, int coun
 
         public static long GetFileSize(SafeFileHandle handle)
         {
-#if !__MonoCS__ && !USE_UNIX_IO
+#if !USE_UNIX_IO
             long size = 0;
             if (!WinNative.GetFileSizeEx(handle, out size))
             {
@@ -142,7 +142,7 @@ public static long GetFileSize(SafeFileHandle handle)
         //TODO UNBUFF use FileAccess etc or do custom?
         public static SafeFileHandle Create(string path, FileAccess acc, FileShare readWrite, FileMode mode, int flags)
         {
-#if !__MonoCS__ && !USE_UNIX_IO
+#if !USE_UNIX_IO
             var handle = WinNative.CreateFile(path,
                 acc,
                 FileShare.ReadWrite,
@@ -164,7 +164,7 @@ public static SafeFileHandle Create(string path, FileAccess acc, FileShare readW
 
         public static SafeFileHandle CreateUnbufferedRW(string path, FileAccess acc, FileShare share, FileMode mode, bool writeThrough)
         {
-#if !__MonoCS__ && !USE_UNIX_IO
+#if !USE_UNIX_IO
             var flags = ExtendedFileOptions.NoBuffering;
             if (writeThrough) flags = flags | ExtendedFileOptions.WriteThrough;
             var handle = WinNative.CreateFile(path,
@@ -195,7 +195,7 @@ public static SafeFileHandle CreateUnbufferedRW(string path, FileAccess acc, Fil
 #endif
         }
 
-#if __MonoCS__ || USE_UNIX_IO
+#if USE_UNIX_IO
         private static OpenFlags GetFlags(FileAccess acc, FileMode mode)
         {
             OpenFlags flags = OpenFlags.O_RDONLY; //RDONLY is 0 
@@ -211,7 +211,7 @@ private static OpenFlags GetFlags(FileAccess acc, FileMode mode)
             return flags;
         }
 #endif
-#if __MonoCS__ || USE_UNIX_IO
+#if USE_UNIX_IO
 [DllImport("libc")]
 static extern int fcntl(int fd, uint command, int arg);
 #endif
@@ -220,7 +220,7 @@ public static void TurnOffMacCaching(SafeFileHandle handle)
         {
 
             if (OS.OsFlavor != OsFlavor.MacOS) return;
-#if __MonoCS__ || USE_UNIX_IO
+#if USE_UNIX_IO
             long r = 0;
             do {
                 r = fcntl (handle.DangerousGetHandle().ToInt32(), MAC_F_NOCACHE, 1);
@@ -233,7 +233,7 @@ public static void TurnOffMacCaching(SafeFileHandle handle)
 
         public static void Seek(SafeFileHandle handle, long position, SeekOrigin origin)
         {
-#if !__MonoCS__ && !USE_UNIX_IO
+#if !USE_UNIX_IO
             var low = (int)(position & 0xffffffff);
             var high = (int)(position >> 32);
             var f = WinNative.SetFilePointer(handle, low, out high, WinNative.EMoveMethod.Begin);

diff --git a/src/EventStore.Core/TransactionLog/Unbuffered/WinNative.cs b/src/EventStore.Core/TransactionLog/Unbuffered/WinNative.cs
@@ -5,7 +5,7 @@
 
 namespace EventStore.Core.TransactionLog.Unbuffered
 {
-#if ! __MonoCS__ && !USE_UNIX_IO
+#if !USE_UNIX_IO
     internal unsafe static class WinNative
     {
         [DllImport("KERNEL32", SetLastError = true, CharSet = CharSet.Auto, BestFitMapping = false)]

diff --git a/src/EventStore.Transport.Http/Client/HttpAsyncClient.cs b/src/EventStore.Transport.Http/Client/HttpAsyncClient.cs
@@ -84,7 +84,8 @@ private void Receive(string method, string url, IEnumerable<KeyValuePair<string,
                              Action<HttpResponse> onSuccess, Action<Exception> onException)
         {
             var request = new HttpRequestMessage();
-#if __MonoCS__
+//MONOCHECK is this still needed?
+#if MONO
             request.Headers.Add("Keep-alive", "false");
 #endif
             request.Method = new System.Net.Http.HttpMethod(method);

diff --git a/src/EventStore.Transport.Http/Server/HttpAsyncServer.cs b/src/EventStore.Transport.Http/Server/HttpAsyncServer.cs
@@ -201,8 +201,8 @@ private void OnRequestReceived(HttpListenerContext context)
             if (handler != null)
                 handler(this, context);
         }
-
-#if __MonoCS__
+//MONOCHECK is this still needed?
+#if MONO
        private static Func<HttpListenerRequest, HttpListenerContext> CreateGetContext()
         {
             var r = System.Linq.Expressions.Expression.Parameter(typeof (HttpListenerRequest), "r");

diff --git a/src/esquery/Program.cs b/src/esquery/Program.cs
@@ -137,8 +137,8 @@ private static bool TryValidatePassword(Uri baseuri, NetworkCredential cred)
             }
         }
 
-
-#if __MonoCS__
+//MONOCHECK
+#if MONO
         //mono apparently doesnt work with secure strings.
         //TODO delete me when its no longer broken
         private static string ReadPassword()