hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cnaur...@apache.org
Subject [1/3] hadoop git commit: HADOOP-11787. OpensslSecureRandom.c pthread_threadid_np usage signature is wrong on 32-bit Mac. Contributed by Kiran Kumar M R.
Date Wed, 01 Apr 2015 18:51:36 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 2ca2515b3 -> 726024faa
  refs/heads/branch-2.7 3acfde6d8 -> aa326086c
  refs/heads/trunk 796fb2687 -> a3a96a07f


HADOOP-11787. OpensslSecureRandom.c pthread_threadid_np usage signature is wrong on 32-bit
Mac. Contributed by Kiran Kumar M R.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a3a96a07
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a3a96a07
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a3a96a07

Branch: refs/heads/trunk
Commit: a3a96a07faf0c6f6aa3ed33608271c2b1657e437
Parents: 796fb26
Author: cnauroth <cnauroth@apache.org>
Authored: Wed Apr 1 11:40:09 2015 -0700
Committer: cnauroth <cnauroth@apache.org>
Committed: Wed Apr 1 11:40:09 2015 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt                  | 3 +++
 .../src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c    | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/a3a96a07/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 13d74fd..111fb5e 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1184,6 +1184,9 @@ Release 2.7.0 - UNRELEASED
     HADOOP-11754. RM fails to start in non-secure mode due to authentication
     filter failure. (wheat9)
 
+    HADOOP-11787. OpensslSecureRandom.c pthread_threadid_np usage signature is
+    wrong on 32-bit Mac. (Kiran Kumar M R via cnauroth)
+
 Release 2.6.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/a3a96a07/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c
b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c
index 8f0c06d..26e1fa6 100644
--- a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c
+++ b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c
@@ -286,7 +286,9 @@ static unsigned long pthreads_thread_id(void)
 #elif defined(__sun)
   thread_id = (unsigned long)pthread_self();
 #elif defined(__APPLE__)
-  (void)pthread_threadid_np(pthread_self(), &thread_id);
+  __uint64_t tmp_thread_id;
+  (void)pthread_threadid_np(pthread_self(), &tmp_thread_id);
+  thread_id = (unsigned long)tmp_thread_id;
 #else
 #error "Platform not supported"
 #endif


Mime
View raw message