You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2016/04/04 21:20:03 UTC
[2/2] mesos git commit: Add zookeeper patch for 3.4.8 to support PPC
LE platform.
Add zookeeper patch for 3.4.8 to support PPC LE platform.
Carried this patch from upstream zookeeper, since the
fetch_and_add function in zookeeper is not 64bit-compatible.
Details see: https://issues.apache.org/jira/browse/ZOOKEEPER-1643
Review: https://reviews.apache.org/r/45376/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5ff13bec
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5ff13bec
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5ff13bec
Branch: refs/heads/master
Commit: 5ff13bece66e4381ff00cecb07d722143e3b6b48
Parents: b9ffcd7
Author: Zhiwei Chen <zh...@gmail.com>
Authored: Mon Apr 4 11:44:01 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Mon Apr 4 11:44:01 2016 -0700
----------------------------------------------------------------------
3rdparty/zookeeper-3.4.8.patch | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/5ff13bec/3rdparty/zookeeper-3.4.8.patch
----------------------------------------------------------------------
diff --git a/3rdparty/zookeeper-3.4.8.patch b/3rdparty/zookeeper-3.4.8.patch
new file mode 100644
index 0000000..486df1a
--- /dev/null
+++ b/3rdparty/zookeeper-3.4.8.patch
@@ -0,0 +1,19 @@
+diff --git a/src/c/src/mt_adaptor.c b/src/c/src/mt_adaptor.c
+index 7dc7878..9c62991 100644
+--- a/src/c/src/mt_adaptor.c
++++ b/src/c/src/mt_adaptor.c
+@@ -483,13 +483,7 @@ int32_t inc_ref_counter(zhandle_t* zh,int i)
+ int32_t fetch_and_add(volatile int32_t* operand, int incr)
+ {
+ #ifndef WIN32
+- int32_t result;
+- asm __volatile__(
+- "lock xaddl %0,%1\n"
+- : "=r"(result), "=m"(*(int *)operand)
+- : "0"(incr)
+- : "memory");
+- return result;
++ return __sync_fetch_and_add(operand, incr);
+ #else
+ volatile int32_t result;
+ _asm