You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2016/06/21 21:25:40 UTC
mesos git commit: Audited includes in the DRF sorter.
Repository: mesos
Updated Branches:
refs/heads/master 12ca831c1 -> 349ff0600
Audited includes in the DRF sorter.
Review: https://reviews.apache.org/r/48455/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/349ff060
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/349ff060
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/349ff060
Branch: refs/heads/master
Commit: 349ff06006a37ddc4fc5532bb96537e904a4ddc9
Parents: 12ca831
Author: Guangya Liu <gy...@gmail.com>
Authored: Tue Jun 21 14:17:52 2016 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Tue Jun 21 14:25:35 2016 -0700
----------------------------------------------------------------------
src/master/allocator/sorter/drf/sorter.cpp | 20 ++++++++++++++++++--
src/master/allocator/sorter/drf/sorter.hpp | 2 ++
2 files changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/349ff060/src/master/allocator/sorter/drf/sorter.cpp
----------------------------------------------------------------------
diff --git a/src/master/allocator/sorter/drf/sorter.cpp b/src/master/allocator/sorter/drf/sorter.cpp
index 5364833..27d56f2 100644
--- a/src/master/allocator/sorter/drf/sorter.cpp
+++ b/src/master/allocator/sorter/drf/sorter.cpp
@@ -14,6 +14,20 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include <algorithm>
+#include <list>
+#include <set>
+#include <string>
+
+#include <mesos/mesos.hpp>
+#include <mesos/resources.hpp>
+
+#include <process/pid.hpp>
+
+#include <stout/check.hpp>
+#include <stout/foreach.hpp>
+#include <stout/option.hpp>
+
#include "logging/logging.hpp"
#include "master/allocator/sorter/drf/sorter.hpp"
@@ -22,6 +36,8 @@ using std::list;
using std::set;
using std::string;
+using process::UPID;
+
namespace mesos {
namespace internal {
namespace master {
@@ -40,8 +56,8 @@ bool DRFComparator::operator()(const Client& client1, const Client& client2)
DRFSorter::DRFSorter(
- const process::UPID& allocator,
- const std::string& metricsPrefix)
+ const UPID& allocator,
+ const string& metricsPrefix)
: metrics(Metrics(allocator, *this, metricsPrefix)) {}
http://git-wip-us.apache.org/repos/asf/mesos/blob/349ff060/src/master/allocator/sorter/drf/sorter.hpp
----------------------------------------------------------------------
diff --git a/src/master/allocator/sorter/drf/sorter.hpp b/src/master/allocator/sorter/drf/sorter.hpp
index 88bd923..35273b5 100644
--- a/src/master/allocator/sorter/drf/sorter.hpp
+++ b/src/master/allocator/sorter/drf/sorter.hpp
@@ -20,9 +20,11 @@
#include <set>
#include <string>
+#include <mesos/mesos.hpp>
#include <mesos/resources.hpp>
#include <stout/hashmap.hpp>
+#include <stout/option.hpp>
#include "master/allocator/sorter/drf/metrics.hpp"