You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/07/04 17:01:33 UTC
[12/15] mesos git commit: Moved MESOS_CONTAINERIZER to a separate
constants file.
Moved MESOS_CONTAINERIZER to a separate constants file.
Review: https://reviews.apache.org/r/49523
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/dc5e7c4b
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/dc5e7c4b
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/dc5e7c4b
Branch: refs/heads/master
Commit: dc5e7c4bcfaeecded1376a3295ef8ec8506b3ec6
Parents: 0e009a6
Author: Jie Yu <yu...@gmail.com>
Authored: Fri Jul 1 11:00:16 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Mon Jul 4 10:01:13 2016 -0700
----------------------------------------------------------------------
src/Makefile.am | 1 +
src/slave/containerizer/mesos/constants.hpp | 34 ++++++++++++++++++++
src/slave/containerizer/mesos/containerizer.cpp | 6 +---
src/slave/containerizer/mesos/containerizer.hpp | 2 --
src/tests/containerizer/port_mapping_tests.cpp | 1 +
5 files changed, 37 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/dc5e7c4b/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 3522b77..28dd151 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -969,6 +969,7 @@ libmesos_no_3rdparty_la_SOURCES += \
slave/containerizer/docker.hpp \
slave/containerizer/external_containerizer.hpp \
slave/containerizer/fetcher.hpp \
+ slave/containerizer/mesos/constants.hpp \
slave/containerizer/mesos/containerizer.hpp \
slave/containerizer/mesos/isolator.hpp \
slave/containerizer/mesos/launch.hpp \
http://git-wip-us.apache.org/repos/asf/mesos/blob/dc5e7c4b/src/slave/containerizer/mesos/constants.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/constants.hpp b/src/slave/containerizer/mesos/constants.hpp
new file mode 100644
index 0000000..5be3950
--- /dev/null
+++ b/src/slave/containerizer/mesos/constants.hpp
@@ -0,0 +1,34 @@
+// 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 __MESOS_CONTAINERIZER_CONSTANTS_HPP__
+#define __MESOS_CONTAINERIZER_CONSTANTS_HPP__
+
+namespace mesos {
+namespace internal {
+namespace slave {
+
+#ifndef __WINDOWS__
+constexpr char MESOS_CONTAINERIZER[] = "mesos-containerizer";
+#else
+constexpr char MESOS_CONTAINERIZER[] = "mesos-containerizer.exe";
+#endif // __WINDOWS__
+
+} // namespace slave {
+} // namespace internal {
+} // namespace mesos {
+
+#endif // __MESOS_CONTAINERIZER_CONSTANTS_HPP__
http://git-wip-us.apache.org/repos/asf/mesos/blob/dc5e7c4b/src/slave/containerizer/mesos/containerizer.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/containerizer.cpp b/src/slave/containerizer/mesos/containerizer.cpp
index 04daddd..4fa10a9 100644
--- a/src/slave/containerizer/mesos/containerizer.cpp
+++ b/src/slave/containerizer/mesos/containerizer.cpp
@@ -105,6 +105,7 @@
#include "slave/containerizer/mesos/isolators/network/port_mapping.hpp"
#endif
+#include "slave/containerizer/mesos/constants.hpp"
#include "slave/containerizer/mesos/containerizer.hpp"
#include "slave/containerizer/mesos/launch.hpp"
#include "slave/containerizer/mesos/provisioner/provisioner.hpp"
@@ -135,11 +136,6 @@ using state::FrameworkState;
using state::ExecutorState;
using state::RunState;
-#ifndef __WINDOWS__
-const char MESOS_CONTAINERIZER[] = "mesos-containerizer";
-#else
-const char MESOS_CONTAINERIZER[] = "mesos-containerizer.exe";
-#endif // __WINDOWS__
Try<MesosContainerizer*> MesosContainerizer::create(
const Flags& flags,
http://git-wip-us.apache.org/repos/asf/mesos/blob/dc5e7c4b/src/slave/containerizer/mesos/containerizer.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/containerizer.hpp b/src/slave/containerizer/mesos/containerizer.hpp
index 70f6d35..3274e09 100644
--- a/src/slave/containerizer/mesos/containerizer.hpp
+++ b/src/slave/containerizer/mesos/containerizer.hpp
@@ -44,8 +44,6 @@ namespace mesos {
namespace internal {
namespace slave {
-extern const char MESOS_CONTAINERIZER[];
-
// Forward declaration.
class MesosContainerizerProcess;
http://git-wip-us.apache.org/repos/asf/mesos/blob/dc5e7c4b/src/tests/containerizer/port_mapping_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/port_mapping_tests.cpp b/src/tests/containerizer/port_mapping_tests.cpp
index 2fbb9ec..b34d5b0 100644
--- a/src/tests/containerizer/port_mapping_tests.cpp
+++ b/src/tests/containerizer/port_mapping_tests.cpp
@@ -57,6 +57,7 @@
#include "slave/containerizer/fetcher.hpp"
+#include "slave/containerizer/mesos/constants.hpp"
#include "slave/containerizer/mesos/containerizer.hpp"
#include "slave/containerizer/mesos/launch.hpp"
#include "slave/containerizer/mesos/launcher.hpp"