Fix aeron directory resolution on OSX

AdaptiveConsulting · Jan 21, 2019 · f235244 · f235244
1 parent 7153e58
commit f235244
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 16 deletions.
diff --git a/src/Adaptive.Aeron/Aeron.cs b/src/Adaptive.Aeron/Aeron.cs
@@ -411,6 +411,28 @@ public class Context : IDisposable
             private UnsafeBuffer _countersValuesBuffer;
             private IThreadFactory _threadFactory = new DefaultThreadFactory();
 
+
+            static Context()
+            {
+                string baseDirName = null;
+
+                if (Environment.OSVersion.Platform == PlatformID.Unix)
+                {
+                    if (Directory.Exists(@"/dev/shm"))
+                    {
+                        baseDirName = "/dev/shm/aeron";
+                    }
+                }
+
+                if (null == baseDirName)
+                {
+                    baseDirName = Path.Combine(Path.GetTempPath(), "aeron");
+                }
+
+                AERON_DIR_PROP_DEFAULT = baseDirName + '-' + Environment.UserName;
+
+            }
+
             /// <summary>
             /// The top level Aeron directory used for communication between a Media Driver and client.
             /// </summary>
@@ -419,8 +441,7 @@ public class Context : IDisposable
             /// <summary>
             /// The value of the top level Aeron directory unless overridden by <seealso cref="AeronDirectoryName()"/>
             /// </summary>
-            public static readonly string AERON_DIR_PROP_DEFAULT =
-                Path.Combine(IoUtil.TmpDirName(), "aeron-" + Environment.UserName);
+            public static readonly string AERON_DIR_PROP_DEFAULT;
 
             /// <summary>
             /// Media type used for IPC shared memory from <seealso cref="Publication"/> to <seealso cref="Subscription"/> channels.

diff --git a/src/Adaptive.Agrona/IoUtil.cs b/src/Adaptive.Agrona/IoUtil.cs
@@ -196,20 +196,6 @@ public static void CheckFileExists(string path)
             }
         }
 
-        /// <summary>
-        /// Return the system property for java.io.tmpdir ensuring a '/' is at the end.
-        /// </summary>
-        /// <returns> tmp directory for the runtime </returns>
-        public static string TmpDirName()
-        {
-            if (Environment.OSVersion.Platform == PlatformID.Unix)
-            {
-                return @"/dev/shm";
-            }
-
-            return Path.GetTempPath();
-        }
-
         public static void Delete(DirectoryInfo directory, bool b)
         {
             if (directory.Exists)