@@ -17,6 +17,7 @@
 package net.openhft.affinity;
 
 import net.openhft.affinity.impl.NullAffinity;
+import net.openhft.affinity.impl.OSXJNAAffinity;
 import net.openhft.affinity.impl.PosixJNAAffinity;
 import net.openhft.affinity.impl.WindowsJNAAffinity;
 import org.jetbrains.annotations.NotNull;
@@ -44,7 +45,11 @@ public enum AffinitySupport {
         } else if (osName.contains("x") && isJNAAvailable() && PosixJNAAffinity.LOADED) {
             LOGGER.fine("Using Posix JNA-based affinity control implementation");
             AFFINITY_IMPL = PosixJNAAffinity.INSTANCE;
-        } else {
+        }else if (osName.contains("Mac") && isJNAAvailable()) {
+            LOGGER.fine("Using MAC OSX JNA-based thread id implementation");
+            AFFINITY_IMPL = OSXJNAAffinity.INSTANCE;
+        }
+        else {
             LOGGER.info("Using dummy affinity control implementation");
             AFFINITY_IMPL = NullAffinity.INSTANCE;
         }
 
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2013 Peter Lawrey
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.openhft.affinity.impl;
+
+
+import com.sun.jna.LastErrorException;
+import com.sun.jna.Library;
+import com.sun.jna.Native;
+import net.openhft.affinity.IAffinity;
+
+import java.lang.management.ManagementFactory;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * This is essentially the same as the NullAffinity implementation but with concrete
+ * support for getThreadId().
+ * @author daniel.shaya
+ */
+public enum OSXJNAAffinity implements IAffinity {
+    INSTANCE;
+    private static final Logger LOGGER = Logger.getLogger(OSXJNAAffinity.class.getName());
+
+    @Override
+    public long getAffinity() {
+        return -1;
+    }
+
+    @Override
+    public void setAffinity(final long affinity) {
+        if (LOGGER.isLoggable(Level.FINE))
+            LOGGER.fine("unable to set mask to " + Long.toHexString(affinity) + " as the JNIa nd JNA libraries and not loaded");
+    }
+
+    @Override
+    public int getCpu() {
+        return -1;
+    }
+
+    @Override
+    public int getProcessId() {
+        final String name = ManagementFactory.getRuntimeMXBean().getName();
+        return Integer.parseInt(name.split("@")[0]);
+    }
+
+    @Override
+    public int getThreadId() {
+        final CLibrary lib = CLibrary.INSTANCE;
+        return CLibrary.INSTANCE.pthread_self();
+    }
+
+    interface CLibrary extends Library {
+        CLibrary INSTANCE = (CLibrary)
+                Native.loadLibrary("libpthread.dylib", CLibrary.class);
+
+        int pthread_self() throws LastErrorException;
+
+    }
+}