You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2013/05/29 19:41:13 UTC
[35/35] git commit: Replaced Mesos CHECK_SOME with stout CHECK_SOME.
Replaced Mesos CHECK_SOME with stout CHECK_SOME.
Review: https://reviews.apache.org/r/11473
Project: http://git-wip-us.apache.org/repos/asf/incubator-mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mesos/commit/5307934e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mesos/tree/5307934e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mesos/diff/5307934e
Branch: refs/heads/master
Commit: 5307934ef024015f62a4ff641e984724e7b13b5c
Parents: 7239579
Author: Benjamin Hindman <be...@twitter.com>
Authored: Mon May 27 12:11:34 2013 -0700
Committer: Benjamin Hindman <be...@twitter.com>
Committed: Tue May 28 14:20:25 2013 -0700
----------------------------------------------------------------------
src/Makefile.am | 2 +-
src/java/jni/org_apache_mesos_Log.cpp | 1 +
src/log/coordinator.cpp | 1 +
src/log/log.cpp | 1 +
src/log/log.hpp | 1 +
src/log/main.cpp | 1 +
src/log/replica.cpp | 1 +
src/logging/check_some.hpp | 107 --------------------
src/logging/logging.hpp | 1 -
src/master/hierarchical_allocator_process.hpp | 1 +
src/master/main.cpp | 1 +
src/master/master.cpp | 1 +
src/slave/cgroups_isolator.cpp | 3 +-
src/slave/main.cpp | 1 +
src/slave/paths.hpp | 1 +
src/slave/process_isolator.cpp | 1 +
src/slave/reaper.cpp | 3 +-
src/slave/slave.cpp | 1 +
src/slave/status_update_manager.cpp | 15 ++--
src/tests/environment.cpp | 1 +
src/tests/flags.hpp | 1 +
src/tests/mesos.cpp | 3 +-
src/tests/paths_tests.cpp | 1 +
src/tests/script.cpp | 3 +-
src/tests/zookeeper.cpp | 1 +
src/tests/zookeeper_test_server.cpp | 1 +
src/zookeeper/group.cpp | 1 +
27 files changed, 32 insertions(+), 124 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index a91daae..e67b342 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -221,7 +221,7 @@ libmesos_no_3rdparty_la_SOURCES += common/attributes.hpp \
detector/detector.hpp examples/utils.hpp files/files.hpp \
launcher/launcher.hpp linux/cgroups.hpp \
linux/fs.hpp local/flags.hpp local/local.hpp \
- logging/check_some.hpp logging/flags.hpp logging/logging.hpp \
+ logging/flags.hpp logging/logging.hpp \
master/allocator.hpp \
master/constants.hpp master/drf_sorter.hpp master/flags.hpp \
master/hierarchical_allocator_process.hpp master/http.hpp \
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/java/jni/org_apache_mesos_Log.cpp
----------------------------------------------------------------------
diff --git a/src/java/jni/org_apache_mesos_Log.cpp b/src/java/jni/org_apache_mesos_Log.cpp
index c93f096..36c636d 100644
--- a/src/java/jni/org_apache_mesos_Log.cpp
+++ b/src/java/jni/org_apache_mesos_Log.cpp
@@ -20,6 +20,7 @@
#include <process/timeout.hpp>
+#include <stout/check.hpp>
#include <stout/duration.hpp>
#include "log/log.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/log/coordinator.cpp
----------------------------------------------------------------------
diff --git a/src/log/coordinator.cpp b/src/log/coordinator.cpp
index cec3ec9..6e6466f 100644
--- a/src/log/coordinator.cpp
+++ b/src/log/coordinator.cpp
@@ -21,6 +21,7 @@
#include <process/dispatch.hpp>
#include <process/future.hpp>
+#include <stout/check.hpp>
#include <stout/duration.hpp>
#include <stout/error.hpp>
#include <stout/foreach.hpp>
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/log/log.cpp
----------------------------------------------------------------------
diff --git a/src/log/log.cpp b/src/log/log.cpp
index 6aa45bd..aea06e7 100644
--- a/src/log/log.cpp
+++ b/src/log/log.cpp
@@ -47,6 +47,7 @@
#include <process/process.hpp>
#include <process/run.hpp>
+#include <stout/check.hpp>
#include <stout/duration.hpp>
#include <stout/fatal.hpp>
#include <stout/foreach.hpp>
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/log/log.hpp
----------------------------------------------------------------------
diff --git a/src/log/log.hpp b/src/log/log.hpp
index 7fb0c4b..77edc7a 100644
--- a/src/log/log.hpp
+++ b/src/log/log.hpp
@@ -26,6 +26,7 @@
#include <process/process.hpp>
#include <process/timeout.hpp>
+#include <stout/check.hpp>
#include <stout/error.hpp>
#include <stout/foreach.hpp>
#include <stout/none.hpp>
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/log/main.cpp
----------------------------------------------------------------------
diff --git a/src/log/main.cpp b/src/log/main.cpp
index 18a1b23..f07bd10 100644
--- a/src/log/main.cpp
+++ b/src/log/main.cpp
@@ -22,6 +22,7 @@
#include <process/process.hpp>
+#include <stout/check.hpp>
#include <stout/flags.hpp>
#include <stout/foreach.hpp>
#include <stout/none.hpp>
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/log/replica.cpp
----------------------------------------------------------------------
diff --git a/src/log/replica.cpp b/src/log/replica.cpp
index c1a4689..59a6ff3 100644
--- a/src/log/replica.cpp
+++ b/src/log/replica.cpp
@@ -27,6 +27,7 @@
#include <process/dispatch.hpp>
#include <process/protobuf.hpp>
+#include <stout/check.hpp>
#include <stout/error.hpp>
#include <stout/foreach.hpp>
#include <stout/none.hpp>
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/logging/check_some.hpp
----------------------------------------------------------------------
diff --git a/src/logging/check_some.hpp b/src/logging/check_some.hpp
deleted file mode 100644
index cbfd78b..0000000
--- a/src/logging/check_some.hpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __LOGGING_CHECK_SOME_HPP__
-#define __LOGGING_CHECK_SOME_HPP__
-
-#include <ostream>
-#include <sstream>
-#include <string>
-
-#include <glog/logging.h> // Includes LOG(*), PLOG(*), CHECK, etc.
-
-#include <stout/none.hpp>
-#include <stout/option.hpp>
-#include <stout/result.hpp>
-#include <stout/try.hpp>
-
-// Provides a CHECK_SOME macro, akin to CHECK.
-// This appends the error if possible to the end of the log message, so there's
-// no need to append the error message explicitly.
-#define CHECK_SOME(expression) \
- for (const Option<std::string>& _error = _check(expression); \
- _error.isSome();) \
- _CheckSome(__FILE__, __LINE__, #expression, _error.get()).stream() \
-
-// Private structs/functions used for CHECK_SOME.
-
-template <typename T>
-Option<std::string> _check(const Option<T>& o)
-{
- if (o.isNone()) {
- return Option<std::string>::some("is NONE");
- }
- return None();
-}
-
-
-template <typename T>
-Option<std::string> _check(const Try<T>& t)
-{
- if (t.isError()) {
- return t.error();
- }
- return None();
-}
-
-
-template <typename T>
-Option<std::string> _check(const Result<T>& r)
-{
- if (r.isError()) {
- return r.error();
- } else if (r.isNone()) {
- return Option<std::string>::some("is NONE");
- }
- return None();
-}
-
-
-struct _CheckSome
-{
- _CheckSome(const char* _file,
- int _line,
- const char* _expression,
- const std::string& _error)
- : file(_file),
- line(_line),
- expression(_expression),
- error(_error)
- {
- out << "CHECK_SOME(" << expression << "): ";
- }
-
- ~_CheckSome()
- {
- out << error;
- google::LogMessageFatal(file.c_str(), line).stream() << out.str();
- }
-
- std::ostream& stream()
- {
- return out;
- }
-
- const std::string file;
- const int line;
- const std::string expression;
- const std::string error;
- std::ostringstream out;
-};
-
-#endif // __LOGGING_CHECK_SOME_HPP__
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/logging/logging.hpp
----------------------------------------------------------------------
diff --git a/src/logging/logging.hpp b/src/logging/logging.hpp
index 56fbbd4..3c24211 100644
--- a/src/logging/logging.hpp
+++ b/src/logging/logging.hpp
@@ -23,7 +23,6 @@
#include <glog/logging.h> // Includes LOG(*), PLOG(*), CHECK, etc.
-#include "logging/check_some.hpp"
#include "logging/flags.hpp"
namespace mesos {
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/master/hierarchical_allocator_process.hpp
----------------------------------------------------------------------
diff --git a/src/master/hierarchical_allocator_process.hpp b/src/master/hierarchical_allocator_process.hpp
index ebd97e4..28a7879 100644
--- a/src/master/hierarchical_allocator_process.hpp
+++ b/src/master/hierarchical_allocator_process.hpp
@@ -23,6 +23,7 @@
#include <process/id.hpp>
#include <process/timeout.hpp>
+#include <stout/check.hpp>
#include <stout/duration.hpp>
#include <stout/hashmap.hpp>
#include <stout/stopwatch.hpp>
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/master/main.cpp
----------------------------------------------------------------------
diff --git a/src/master/main.cpp b/src/master/main.cpp
index 79a912c..3c1cf4c 100644
--- a/src/master/main.cpp
+++ b/src/master/main.cpp
@@ -18,6 +18,7 @@
#include <mesos/mesos.hpp>
+#include <stout/check.hpp>
#include <stout/flags.hpp>
#include <stout/nothing.hpp>
#include <stout/os.hpp>
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index cbc40e1..d031b95 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -26,6 +26,7 @@
#include <process/id.hpp>
#include <process/run.hpp>
+#include <stout/check.hpp>
#include <stout/multihashmap.hpp>
#include <stout/os.hpp>
#include <stout/path.hpp>
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/slave/cgroups_isolator.cpp
----------------------------------------------------------------------
diff --git a/src/slave/cgroups_isolator.cpp b/src/slave/cgroups_isolator.cpp
index 8e8e99e..9b3a3a5 100644
--- a/src/slave/cgroups_isolator.cpp
+++ b/src/slave/cgroups_isolator.cpp
@@ -34,6 +34,7 @@
#include <process/dispatch.hpp>
#include <stout/bytes.hpp>
+#include <stout/check.hpp>
#include <stout/duration.hpp>
#include <stout/error.hpp>
#include <stout/exit.hpp>
@@ -56,8 +57,6 @@
#include "linux/cgroups.hpp"
-#include "logging/check_some.hpp"
-
#include "slave/cgroups_isolator.hpp"
#include "slave/state.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/slave/main.cpp
----------------------------------------------------------------------
diff --git a/src/slave/main.cpp b/src/slave/main.cpp
index 1d3431f..750a127 100644
--- a/src/slave/main.cpp
+++ b/src/slave/main.cpp
@@ -18,6 +18,7 @@
#include <mesos/mesos.hpp>
+#include <stout/check.hpp>
#include <stout/flags.hpp>
#include <stout/nothing.hpp>
#include <stout/os.hpp>
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/slave/paths.hpp
----------------------------------------------------------------------
diff --git a/src/slave/paths.hpp b/src/slave/paths.hpp
index 3ac6f13..9d2a2a4 100644
--- a/src/slave/paths.hpp
+++ b/src/slave/paths.hpp
@@ -21,6 +21,7 @@
#include <list>
+#include <stout/check.hpp>
#include <stout/foreach.hpp>
#include <stout/format.hpp>
#include <stout/fs.hpp>
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/slave/process_isolator.cpp
----------------------------------------------------------------------
diff --git a/src/slave/process_isolator.cpp b/src/slave/process_isolator.cpp
index 477af4e..d4f7b76 100644
--- a/src/slave/process_isolator.cpp
+++ b/src/slave/process_isolator.cpp
@@ -32,6 +32,7 @@
#include <process/dispatch.hpp>
#include <process/id.hpp>
+#include <stout/check.hpp>
#include <stout/exit.hpp>
#include <stout/foreach.hpp>
#include <stout/nothing.hpp>
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/slave/reaper.cpp
----------------------------------------------------------------------
diff --git a/src/slave/reaper.cpp b/src/slave/reaper.cpp
index 5a6de5a..1d826d1 100644
--- a/src/slave/reaper.cpp
+++ b/src/slave/reaper.cpp
@@ -25,6 +25,7 @@
#include <process/dispatch.hpp>
#include <process/id.hpp>
+#include <stout/check.hpp>
#include <stout/foreach.hpp>
#include <stout/nothing.hpp>
#include <stout/os.hpp>
@@ -32,8 +33,6 @@
#include <stout/utils.hpp>
-#include "logging/check_some.hpp"
-
#include "slave/reaper.hpp"
using namespace process;
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/slave/slave.cpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp
index 25c91d9..e905ab3 100644
--- a/src/slave/slave.cpp
+++ b/src/slave/slave.cpp
@@ -32,6 +32,7 @@
#include <process/id.hpp>
#include <stout/bytes.hpp>
+#include <stout/check.hpp>
#include <stout/duration.hpp>
#include <stout/exit.hpp>
#include <stout/fs.hpp>
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/slave/status_update_manager.cpp
----------------------------------------------------------------------
diff --git a/src/slave/status_update_manager.cpp b/src/slave/status_update_manager.cpp
index c6866dc..9e9e4e2 100644
--- a/src/slave/status_update_manager.cpp
+++ b/src/slave/status_update_manager.cpp
@@ -20,14 +20,15 @@
#include <process/process.hpp>
#include <process/timer.hpp>
-#include "common/protobuf_utils.hpp"
+#include <stout/check.hpp>
+#include <stout/foreach.hpp>
+#include <stout/hashmap.hpp>
+#include <stout/hashset.hpp>
+#include <stout/protobuf.hpp>
+#include <stout/utils.hpp>
+#include <stout/uuid.hpp>
-#include "stout/foreach.hpp"
-#include "stout/hashmap.hpp"
-#include "stout/hashset.hpp"
-#include "stout/protobuf.hpp"
-#include "stout/utils.hpp"
-#include "stout/uuid.hpp"
+#include "common/protobuf_utils.hpp"
#include "slave/constants.hpp"
#include "slave/flags.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/tests/environment.cpp
----------------------------------------------------------------------
diff --git a/src/tests/environment.cpp b/src/tests/environment.cpp
index 125c306..24227c5 100644
--- a/src/tests/environment.cpp
+++ b/src/tests/environment.cpp
@@ -24,6 +24,7 @@
#include <process/gmock.hpp>
#include <process/gtest.hpp>
+#include <stout/check.hpp>
#include <stout/error.hpp>
#include <stout/exit.hpp>
#include <stout/os.hpp>
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/tests/flags.hpp
----------------------------------------------------------------------
diff --git a/src/tests/flags.hpp b/src/tests/flags.hpp
index b229e1f..071f138 100644
--- a/src/tests/flags.hpp
+++ b/src/tests/flags.hpp
@@ -21,6 +21,7 @@
#include <string>
+#include <stout/check.hpp>
#include <stout/flags.hpp>
#include <stout/os.hpp>
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/tests/mesos.cpp
----------------------------------------------------------------------
diff --git a/src/tests/mesos.cpp b/src/tests/mesos.cpp
index 4ddf032..d811267 100644
--- a/src/tests/mesos.cpp
+++ b/src/tests/mesos.cpp
@@ -1,3 +1,4 @@
+#include <stout/check.hpp>
#include <stout/foreach.hpp>
#include <stout/os.hpp>
#include <stout/result.hpp>
@@ -6,8 +7,6 @@
#include "linux/cgroups.hpp"
#endif
-#include "logging/logging.hpp"
-
#include "tests/environment.hpp"
#include "tests/flags.hpp"
#include "tests/isolator.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/tests/paths_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/paths_tests.cpp b/src/tests/paths_tests.cpp
index 655e9ce..40c644c 100644
--- a/src/tests/paths_tests.cpp
+++ b/src/tests/paths_tests.cpp
@@ -18,6 +18,7 @@
#include <gtest/gtest.h>
+#include <stout/check.hpp>
#include <stout/os.hpp>
#include <stout/protobuf.hpp>
#include <stout/stringify.hpp>
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/tests/script.cpp
----------------------------------------------------------------------
diff --git a/src/tests/script.cpp b/src/tests/script.cpp
index 74ce91a..e72eea6 100644
--- a/src/tests/script.cpp
+++ b/src/tests/script.cpp
@@ -24,12 +24,11 @@
#include <string>
+#include <stout/check.hpp>
#include <stout/os.hpp>
#include <stout/path.hpp>
#include <stout/strings.hpp>
-#include "logging/logging.hpp"
-
#include "tests/environment.hpp"
#include "tests/flags.hpp"
#include "tests/script.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/tests/zookeeper.cpp
----------------------------------------------------------------------
diff --git a/src/tests/zookeeper.cpp b/src/tests/zookeeper.cpp
index 62d93b5..8bb4901 100644
--- a/src/tests/zookeeper.cpp
+++ b/src/tests/zookeeper.cpp
@@ -29,6 +29,7 @@
#include <jvm/org/apache/log4j.hpp>
#include <jvm/org/apache/log4j.hpp>
+#include <stout/check.hpp>
#include <stout/lambda.hpp>
#include "common/lock.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/tests/zookeeper_test_server.cpp
----------------------------------------------------------------------
diff --git a/src/tests/zookeeper_test_server.cpp b/src/tests/zookeeper_test_server.cpp
index 8051b4d..0b22f31 100644
--- a/src/tests/zookeeper_test_server.cpp
+++ b/src/tests/zookeeper_test_server.cpp
@@ -23,6 +23,7 @@
#include <jvm/org/apache/zookeeper.hpp>
+#include <stout/check.hpp>
#include <stout/os.hpp>
#include "logging/logging.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5307934e/src/zookeeper/group.cpp
----------------------------------------------------------------------
diff --git a/src/zookeeper/group.cpp b/src/zookeeper/group.cpp
index c1a587a..cd58d23 100644
--- a/src/zookeeper/group.cpp
+++ b/src/zookeeper/group.cpp
@@ -8,6 +8,7 @@
#include <process/dispatch.hpp>
#include <process/process.hpp>
+#include <stout/check.hpp>
#include <stout/duration.hpp>
#include <stout/error.hpp>
#include <stout/none.hpp>