kudu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danburk...@apache.org
Subject kudu git commit: Bump glog to 0.3.5
Date Fri, 12 May 2017 06:01:05 GMT
Repository: kudu
Updated Branches:
  refs/heads/master a7e8994e4 -> 4ec6280c9


Bump glog to 0.3.5

Change-Id: I9f638970abfd1aa214cf0032b46064ff7edf4dc4
Reviewed-on: http://gerrit.cloudera.org:8080/6871
Tested-by: Kudu Jenkins
Reviewed-by: Dan Burkert <danburkert@apache.org>


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

Branch: refs/heads/master
Commit: 4ec6280c96b8900d0d587526b999f3a03e8ebec6
Parents: a7e8994
Author: Dan Burkert <danburkert@apache.org>
Authored: Wed May 10 11:16:20 2017 -0700
Committer: Dan Burkert <danburkert@apache.org>
Committed: Fri May 12 06:00:44 2017 +0000

----------------------------------------------------------------------
 thirdparty/download-thirdparty.sh               |  3 +-
 ...a16b3443e2d6ef88cdbbe10b9a11adea6f33fe.patch | 94 --------------------
 thirdparty/vars.sh                              |  2 +-
 3 files changed, 2 insertions(+), 97 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/4ec6280c/thirdparty/download-thirdparty.sh
----------------------------------------------------------------------
diff --git a/thirdparty/download-thirdparty.sh b/thirdparty/download-thirdparty.sh
index 8a61d52..8ac968e 100755
--- a/thirdparty/download-thirdparty.sh
+++ b/thirdparty/download-thirdparty.sh
@@ -102,7 +102,7 @@ fetch_and_expand() {
 mkdir -p $TP_SOURCE_DIR
 cd $TP_SOURCE_DIR
 
-GLOG_PATCHLEVEL=3
+GLOG_PATCHLEVEL=2
 delete_if_wrong_patchlevel $GLOG_SOURCE $GLOG_PATCHLEVEL
 if [ ! -d $GLOG_SOURCE ]; then
   fetch_and_expand glog-${GLOG_VERSION}.tar.gz
@@ -110,7 +110,6 @@ if [ ! -d $GLOG_SOURCE ]; then
   pushd $GLOG_SOURCE
   patch -p0 < $TP_DIR/patches/glog-issue-198-fix-unused-warnings.patch
   patch -p0 < $TP_DIR/patches/glog-issue-54-dont-build-tests.patch
-  patch -p1 < $TP_DIR/patches/glog-cda16b3443e2d6ef88cdbbe10b9a11adea6f33fe.patch
   touch patchlevel-$GLOG_PATCHLEVEL
   autoreconf -fvi
   popd

http://git-wip-us.apache.org/repos/asf/kudu/blob/4ec6280c/thirdparty/patches/glog-cda16b3443e2d6ef88cdbbe10b9a11adea6f33fe.patch
----------------------------------------------------------------------
diff --git a/thirdparty/patches/glog-cda16b3443e2d6ef88cdbbe10b9a11adea6f33fe.patch b/thirdparty/patches/glog-cda16b3443e2d6ef88cdbbe10b9a11adea6f33fe.patch
deleted file mode 100644
index e1900bb..0000000
--- a/thirdparty/patches/glog-cda16b3443e2d6ef88cdbbe10b9a11adea6f33fe.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-commit cda16b3443e2d6ef88cdbbe10b9a11adea6f33fe
-Author: Yoshisato Yanagisawa <yyanagisawa@google.com>
-Date:   Wed Nov 18 15:40:12 2015 +0900
-
-    Reset SIGABRT action only if FailureSignalHandler is installed.
-    
-    When I set my own signal handler to SIGABRT, it did not executed
-    with CHECK.  That is because SIGABRT handler is reset to default
-    just before glog calls abort.
-    Let me make it reset only if the handler is what glog installed
-    i.e. FailureSignalHandler.
-
-diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in
-index 455bd28..b1de2c9 100644
---- a/src/glog/logging.h.in
-+++ b/src/glog/logging.h.in
-@@ -923,6 +923,9 @@ template <bool>
- struct CompileAssert {
- };
- struct CrashReason;
-+
-+// Returns true if FailureSignalHandler is installed.
-+bool IsFailureSignalHandlerInstalled();
- }  // namespace glog_internal_namespace_
- 
- #define GOOGLE_GLOG_COMPILE_ASSERT(expr, msg) \
-diff --git a/src/signalhandler.cc b/src/signalhandler.cc
-index cccd800..a7aef8b 100644
---- a/src/signalhandler.cc
-+++ b/src/signalhandler.cc
-@@ -335,6 +335,22 @@ void FailureSignalHandler(int signal_number,
- 
- #endif  // HAVE_SIGACTION
- 
-+namespace glog_internal_namespace_ {
-+
-+bool IsFailureSignalHandlerInstalled() {
-+#ifdef HAVE_SIGACTION
-+  struct sigaction sig_action;
-+  memset(&sig_action, 0, sizeof(sig_action));
-+  sigemptyset(&sig_action.sa_mask);
-+  sigaction(SIGABRT, NULL, &sig_action);
-+  if (sig_action.sa_sigaction == &FailureSignalHandler)
-+    return true;
-+#endif  // HAVE_SIGACTION
-+  return false;
-+}
-+
-+}  // namespace glog_internal_namespace_
-+
- void InstallFailureSignalHandler() {
- #ifdef HAVE_SIGACTION
-   // Build the sigaction struct.
-diff --git a/src/utilities.cc b/src/utilities.cc
-index f31c7c7..5c88e58 100644
---- a/src/utilities.cc
-+++ b/src/utilities.cc
-@@ -138,13 +138,15 @@ static void DumpStackTraceAndExit() {
- 
-   // TOOD(hamaji): Use signal instead of sigaction?
- #ifdef HAVE_SIGACTION
--  // Set the default signal handler for SIGABRT, to avoid invoking our
--  // own signal handler installed by InstallFailedSignalHandler().
--  struct sigaction sig_action;
--  memset(&sig_action, 0, sizeof(sig_action));
--  sigemptyset(&sig_action.sa_mask);
--  sig_action.sa_handler = SIG_DFL;
--  sigaction(SIGABRT, &sig_action, NULL);
-+  if (IsFailureSignalHandlerInstalled()) {
-+    // Set the default signal handler for SIGABRT, to avoid invoking our
-+    // own signal handler installed by InstallFailureSignalHandler().
-+    struct sigaction sig_action;
-+    memset(&sig_action, 0, sizeof(sig_action));
-+    sigemptyset(&sig_action.sa_mask);
-+    sig_action.sa_handler = SIG_DFL;
-+    sigaction(SIGABRT, &sig_action, NULL);
-+  }
- #endif  // HAVE_SIGACTION
- 
-   abort();
-diff --git a/src/windows/glog/logging.h b/src/windows/glog/logging.h
-index bab8c61..36107a6 100755
---- a/src/windows/glog/logging.h
-+++ b/src/windows/glog/logging.h
-@@ -910,6 +910,9 @@ template <bool>
- struct CompileAssert {
- };
- struct CrashReason;
-+
-+// Returns true if FailureSignalHandler is installed.
-+bool IsFailureSignalHandlerInstalled();
- }  // namespace glog_internal_namespace_
- 
- #define GOOGLE_GLOG_COMPILE_ASSERT(expr, msg) \

http://git-wip-us.apache.org/repos/asf/kudu/blob/4ec6280c/thirdparty/vars.sh
----------------------------------------------------------------------
diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh
index 53ef1e4..3e3ee3c 100644
--- a/thirdparty/vars.sh
+++ b/thirdparty/vars.sh
@@ -38,7 +38,7 @@ GFLAGS_VERSION=2.2.0
 GFLAGS_NAME=gflags-$GFLAGS_VERSION
 GFLAGS_SOURCE=$TP_SOURCE_DIR/$GFLAGS_NAME
 
-GLOG_VERSION=0.3.4
+GLOG_VERSION=0.3.5
 GLOG_NAME=glog-$GLOG_VERSION
 GLOG_SOURCE=$TP_SOURCE_DIR/$GLOG_NAME
 


Mime
View raw message