xcode 9 compilation workaround

TobyShaw · Sep 27, 2017 · c5cdddd · c5cdddd
1 parent 808a143
commit c5cdddd
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 0 deletions.
diff --git a/cpp/src/plasma/CMakeLists.txt b/cpp/src/plasma/CMakeLists.txt
@@ -111,6 +111,7 @@ target_link_libraries(plasma_store plasma_static)
 install(FILES
   common.h
   common_generated.h
+  compat.h
   client.h
   events.h
   plasma.h

diff --git a/cpp/src/plasma/common.h b/cpp/src/plasma/common.h
@@ -26,6 +26,8 @@
 #define __STDC_FORMAT_MACROS
 #endif
 
+#include "plasma/compat.h"
+
 #include "arrow/status.h"
 #include "arrow/util/logging.h"
 

diff --git a/cpp/src/plasma/compat.h b/cpp/src/plasma/compat.h
@@ -0,0 +1,33 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you 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.
+
+#ifndef PLASMA_COMPAT_H
+#define PLASMA_COMPAT_H
+
+// Workaround for multithreading on XCode 9, see
+// https://issues.apache.org/jira/browse/ARROW-1622 and
+// https://github.com/tensorflow/tensorflow/issues/13220#issuecomment-331579775
+// This should be a short-term fix until the problem is fixed upstream.
+#ifndef _MACH_PORT_T
+#define _MACH_PORT_T
+#include <sys/_types.h> /* __darwin_mach_port_t */
+typedef __darwin_mach_port_t mach_port_t;
+#include <pthread.h>
+mach_port_t pthread_mach_thread_np(pthread_t);
+#endif /* _MACH_PORT_T */
+
+#endif  // PLASMA_COMPAT_H
diff --git a/cpp/src/plasma/io.h b/cpp/src/plasma/io.h
@@ -27,6 +27,7 @@
 #include <vector>
 
 #include "arrow/status.h"
+#include "plasma/compat.h"
 
 // TODO(pcm): Replace our own custom message header (message type,
 // message length, plasma protocol verion) with one that is serialized

diff --git a/cpp/src/plasma/plasma.h b/cpp/src/plasma/plasma.h
@@ -31,6 +31,8 @@
 #include <unordered_map>
 #include <unordered_set>
 
+#include "plasma/compat.h"
+
 #include "arrow/status.h"
 #include "arrow/util/logging.h"
 #include "plasma/common.h"