You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by of...@apache.org on 2015/10/09 20:28:46 UTC
bigtop git commit: BIGTOP-2082: Remove x86 Assembler Code from
zookeeper
Repository: bigtop
Updated Branches:
refs/heads/master 2a6fa3adf -> 8048c8e96
BIGTOP-2082: Remove x86 Assembler Code from zookeeper
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/8048c8e9
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/8048c8e9
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/8048c8e9
Branch: refs/heads/master
Commit: 8048c8e960fab8db89f376646e08bd6c048a937b
Parents: 2a6fa3a
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Mon Oct 5 20:59:13 2015 +0000
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Fri Oct 9 20:26:56 2015 +0200
----------------------------------------------------------------------
.../src/common/zookeeper/patch4-removeasm.diff | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/8048c8e9/bigtop-packages/src/common/zookeeper/patch4-removeasm.diff
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/zookeeper/patch4-removeasm.diff b/bigtop-packages/src/common/zookeeper/patch4-removeasm.diff
new file mode 100644
index 0000000..6599617
--- /dev/null
+++ b/bigtop-packages/src/common/zookeeper/patch4-removeasm.diff
@@ -0,0 +1,17 @@
+--- zookeeper-3.4.6/src/c/src/mt_adaptor.c.ORG 2015-10-05 20:50:36.662228733 +0000
++++ zookeeper-3.4.6/src/c/src/mt_adaptor.c 2015-10-05 20:51:35.722773398 +0000
+@@ -483,13 +483,7 @@
+ 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