You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by zj...@apache.org on 2015/03/13 00:04:51 UTC
[32/49] hadoop git commit: Revert "HADOOP-11638.
OpensslSecureRandom.c pthreads_thread_id should support FreeBSD and Solaris
in addition to Linux (Kiran Kumar M R via Colin P. McCabe)"
Revert "HADOOP-11638. OpensslSecureRandom.c pthreads_thread_id should support FreeBSD and Solaris in addition to Linux (Kiran Kumar M R via Colin P. McCabe)"
This reverts commit 3241fc2b17f11e621d8ffb6160caa4b850c278b6.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8d5b01e0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8d5b01e0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8d5b01e0
Branch: refs/heads/YARN-2928
Commit: 8d5b01e005b2647262861acf522e9b5c6d6f8bba
Parents: 20b8ee1
Author: cnauroth <cn...@apache.org>
Authored: Tue Mar 10 11:02:07 2015 -0700
Committer: cnauroth <cn...@apache.org>
Committed: Tue Mar 10 11:02:07 2015 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 4 ----
.../hadoop/crypto/random/OpensslSecureRandom.c | 16 +---------------
2 files changed, 1 insertion(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8d5b01e0/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 7d0cbee..ab58270 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -680,10 +680,6 @@ Release 2.7.0 - UNRELEASED
HADOOP-11642. Upgrade azure sdk version from 0.6.0 to 2.0.0.
(Shashank Khandelwal and Ivan Mitic via cnauroth)
- HADOOP-11638. OpensslSecureRandom.c pthreads_thread_id should support
- FreeBSD and Solaris in addition to Linux (Kiran Kumar M R via Colin P.
- McCabe)
-
OPTIMIZATIONS
HADOOP-11323. WritableComparator#compare keeps reference to byte array.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8d5b01e0/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 f30ccbe..6c31d10 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
@@ -29,10 +29,6 @@
#include <sys/types.h>
#endif
-#if defined(__FreeBSD__)
-#include <pthread_np.h>
-#endif
-
#ifdef WINDOWS
#include <windows.h>
#endif
@@ -278,17 +274,7 @@ static void pthreads_locking_callback(int mode, int type, char *file, int line)
static unsigned long pthreads_thread_id(void)
{
- unsigned long thread_id = 0;
-#if defined(__linux__)
- thread_id = (unsigned long)syscall(SYS_gettid);
-#elif defined(__FreeBSD__)
- thread_id = (unsigned long)pthread_getthreadid_np();
-#elif defined(__sun)
- thread_id = (unsigned long)pthread_self();
-#else
-#error "Platform not supported"
-#endif
- return thread_id;
+ return (unsigned long)syscall(SYS_gettid);
}
#endif /* UNIX */