You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by mp...@apache.org on 2016/01/04 11:43:23 UTC
[3/5] mesos git commit: libprocess: Cleaned up STL I/O includes.
libprocess: Cleaned up STL I/O includes.
Where possible moved `operator<<` definitions and functions using
streams to implementation files and included <iosfwd> in headers.
Also removed unused I/O includes, and cleaned up `std::` prefixes.
Review: https://reviews.apache.org/r/41509/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d3a5a614
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d3a5a614
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d3a5a614
Branch: refs/heads/master
Commit: d3a5a614a9afa6b3b8873a26200db4c79aba7379
Parents: 68d4fc3
Author: Alexander Rukletsov <ru...@gmail.com>
Authored: Mon Jan 4 02:24:54 2016 -0800
Committer: Michael Park <mp...@apache.org>
Committed: Mon Jan 4 02:37:22 2016 -0800
----------------------------------------------------------------------
3rdparty/libprocess/include/process/address.hpp | 2 +-
3rdparty/libprocess/include/process/future.hpp | 1 -
3rdparty/libprocess/include/process/http.hpp | 25 +------------------
3rdparty/libprocess/include/process/pid.hpp | 3 +--
3rdparty/libprocess/src/http.cpp | 24 ++++++++++++++++++
3rdparty/libprocess/src/pid.cpp | 26 +++++++++++---------
6 files changed, 41 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/d3a5a614/3rdparty/libprocess/include/process/address.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/address.hpp b/3rdparty/libprocess/include/process/address.hpp
index 79429e9..04e3155 100644
--- a/3rdparty/libprocess/include/process/address.hpp
+++ b/3rdparty/libprocess/include/process/address.hpp
@@ -24,7 +24,7 @@
#include <glog/logging.h>
-#include <sstream>
+#include <ostream>
#include <boost/functional/hash.hpp>
http://git-wip-us.apache.org/repos/asf/mesos/blob/d3a5a614/3rdparty/libprocess/include/process/future.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/future.hpp b/3rdparty/libprocess/include/process/future.hpp
index 817fca2..bcb5668 100644
--- a/3rdparty/libprocess/include/process/future.hpp
+++ b/3rdparty/libprocess/include/process/future.hpp
@@ -17,7 +17,6 @@
#include <stdlib.h> // For abort.
#include <atomic>
-#include <iostream>
#include <list>
#include <memory> // TODO(benh): Replace shared_ptr with unique_ptr.
#include <set>
http://git-wip-us.apache.org/repos/asf/mesos/blob/d3a5a614/3rdparty/libprocess/include/process/http.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/http.hpp b/3rdparty/libprocess/include/process/http.hpp
index 404770f..ed708fe 100644
--- a/3rdparty/libprocess/include/process/http.hpp
+++ b/3rdparty/libprocess/include/process/http.hpp
@@ -21,7 +21,6 @@
#include <iosfwd>
#include <memory>
#include <queue>
-#include <sstream>
#include <string>
#include <vector>
@@ -491,29 +490,7 @@ struct OK : Response
explicit OK(const std::string& body) : Response(body, Status::OK) {}
- OK(const JSON::Value& value, const Option<std::string>& jsonp = None())
- : Response(Status::OK)
- {
- type = BODY;
-
- std::ostringstream out;
-
- if (jsonp.isSome()) {
- out << jsonp.get() << "(";
- }
-
- out << value;
-
- if (jsonp.isSome()) {
- out << ");";
- headers["Content-Type"] = "text/javascript";
- } else {
- headers["Content-Type"] = "application/json";
- }
-
- headers["Content-Length"] = stringify(out.str().size());
- body = out.str().data();
- }
+ OK(const JSON::Value& value, const Option<std::string>& jsonp = None());
};
http://git-wip-us.apache.org/repos/asf/mesos/blob/d3a5a614/3rdparty/libprocess/include/process/pid.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/pid.hpp b/3rdparty/libprocess/include/process/pid.hpp
index b22c160..0791dc1 100644
--- a/3rdparty/libprocess/include/process/pid.hpp
+++ b/3rdparty/libprocess/include/process/pid.hpp
@@ -15,8 +15,7 @@
#include <stdint.h>
-#include <iostream>
-#include <sstream>
+#include <iosfwd>
#include <string>
#include <boost/functional/hash.hpp>
http://git-wip-us.apache.org/repos/asf/mesos/blob/d3a5a614/3rdparty/libprocess/src/http.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/http.cpp b/3rdparty/libprocess/src/http.cpp
index 2893d91..06231d9 100644
--- a/3rdparty/libprocess/src/http.cpp
+++ b/3rdparty/libprocess/src/http.cpp
@@ -542,6 +542,30 @@ Future<Nothing> Pipe::Writer::readerClosed() const
}
+OK::OK(const JSON::Value& value, const Option<string>& jsonp)
+ : Response(Status::OK)
+{
+ type = BODY;
+
+ std::ostringstream out;
+
+ if (jsonp.isSome()) {
+ out << jsonp.get() << "(";
+ }
+
+ out << value;
+
+ if (jsonp.isSome()) {
+ out << ");";
+ headers["Content-Type"] = "text/javascript";
+ } else {
+ headers["Content-Type"] = "application/json";
+ }
+
+ headers["Content-Length"] = stringify(out.str().size());
+ body = out.str().data();
+}
+
namespace path {
Try<hashmap<string, string>> parse(const string& pattern, const string& path)
http://git-wip-us.apache.org/repos/asf/mesos/blob/d3a5a614/3rdparty/libprocess/src/pid.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/pid.cpp b/3rdparty/libprocess/src/pid.cpp
index 1a9cbd1..3cd04ec 100644
--- a/3rdparty/libprocess/src/pid.cpp
+++ b/3rdparty/libprocess/src/pid.cpp
@@ -21,6 +21,7 @@
#include <glog/logging.h>
#include <iostream>
+#include <sstream>
#include <string>
#include <process/pid.hpp>
@@ -31,24 +32,25 @@
#include "config.hpp"
-
+using std::ios_base;
using std::istream;
+using std::istringstream;
using std::ostream;
+using std::ostringstream;
using std::string;
-
namespace process {
UPID::UPID(const char* s)
{
- std::istringstream in(s);
+ istringstream in(s);
in >> *this;
}
-UPID::UPID(const std::string& s)
+UPID::UPID(const string& s)
{
- std::istringstream in(s);
+ istringstream in(s);
in >> *this;
}
@@ -63,7 +65,7 @@ UPID::UPID(const ProcessBase& process)
UPID::operator std::string() const
{
- std::ostringstream out;
+ ostringstream out;
out << *this;
return out.str();
}
@@ -84,14 +86,14 @@ istream& operator>>(istream& stream, UPID& pid)
string str;
if (!(stream >> str)) {
- stream.setstate(std::ios_base::badbit);
+ stream.setstate(ios_base::badbit);
return stream;
}
VLOG(2) << "Attempting to parse '" << str << "' into a PID";
if (str.size() == 0) {
- stream.setstate(std::ios_base::badbit);
+ stream.setstate(ios_base::badbit);
return stream;
}
@@ -104,7 +106,7 @@ istream& operator>>(istream& stream, UPID& pid)
if (index != string::npos) {
id = str.substr(0, index);
} else {
- stream.setstate(std::ios_base::badbit);
+ stream.setstate(ios_base::badbit);
return stream;
}
@@ -115,7 +117,7 @@ istream& operator>>(istream& stream, UPID& pid)
if (index != string::npos) {
host = str.substr(0, index);
} else {
- stream.setstate(std::ios_base::badbit);
+ stream.setstate(ios_base::badbit);
return stream;
}
@@ -124,7 +126,7 @@ istream& operator>>(istream& stream, UPID& pid)
if (ip.isError()) {
VLOG(2) << ip.error();
- stream.setstate(std::ios_base::badbit);
+ stream.setstate(ios_base::badbit);
return stream;
}
@@ -133,7 +135,7 @@ istream& operator>>(istream& stream, UPID& pid)
str = str.substr(index + 1);
if (sscanf(str.c_str(), "%hu", &address.port) != 1) {
- stream.setstate(std::ios_base::badbit);
+ stream.setstate(ios_base::badbit);
return stream;
}