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 2015/06/02 16:54:35 UTC
[1/4] mesos git commit: Fix capture by reference of temporary strings
in Stout.
Repository: mesos
Updated Branches:
refs/heads/master a03b96f55 -> 36ec7f22d
Fix capture by reference of temporary strings in Stout.
Review: https://reviews.apache.org/r/33272
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9a2a313d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9a2a313d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9a2a313d
Branch: refs/heads/master
Commit: 9a2a313df30ef6994efe16c3e7f3c8d61edd1209
Parents: a03b96f
Author: Joris Van Remoortere <jo...@gmail.com>
Authored: Tue Jun 2 07:52:04 2015 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Tue Jun 2 07:52:05 2015 -0700
----------------------------------------------------------------------
.../3rdparty/stout/include/stout/bytes.hpp | 2 +-
.../3rdparty/stout/include/stout/duration.hpp | 2 +-
.../stout/include/stout/flags/fetch.hpp | 2 +-
.../3rdparty/stout/tests/flags_tests.cpp | 4 +--
.../3rdparty/stout/tests/os_tests.cpp | 28 ++++++++++----------
5 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/9a2a313d/3rdparty/libprocess/3rdparty/stout/include/stout/bytes.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/bytes.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/bytes.hpp
index 0e8385b..451a53d 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/bytes.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/bytes.hpp
@@ -49,7 +49,7 @@ public:
return Error(value.error());
}
- const std::string& unit = strings::upper(s.substr(index));
+ const std::string unit = strings::upper(s.substr(index));
if (unit == "B") {
return Bytes(value.get(), BYTES);
http://git-wip-us.apache.org/repos/asf/mesos/blob/9a2a313d/3rdparty/libprocess/3rdparty/stout/include/stout/duration.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/duration.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/duration.hpp
index 8a1626c..ac823f1 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/duration.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/duration.hpp
@@ -45,7 +45,7 @@ public:
return Error(value.error());
}
- const std::string& unit = s.substr(index);
+ const std::string unit = s.substr(index);
if (unit == "ns") {
return Duration(value.get(), NANOSECONDS);
http://git-wip-us.apache.org/repos/asf/mesos/blob/9a2a313d/3rdparty/libprocess/3rdparty/stout/include/stout/flags/fetch.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/flags/fetch.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/flags/fetch.hpp
index 1df982c..3c320a3 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/flags/fetch.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/flags/fetch.hpp
@@ -44,7 +44,7 @@ Try<T> fetch(const std::string& value)
// TODO(cmaloney): Introduce fetching for things beyond just file://
// such as http:// as well!
if (strings::startsWith(value, "file://")) {
- const std::string& path = value.substr(7);
+ const std::string path = value.substr(7);
Try<std::string> read = os::read(path);
if (read.isError()) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/9a2a313d/3rdparty/libprocess/3rdparty/stout/tests/flags_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/tests/flags_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/flags_tests.cpp
index a6e8ba9..8045018 100644
--- a/3rdparty/libprocess/3rdparty/stout/tests/flags_tests.cpp
+++ b/3rdparty/libprocess/3rdparty/stout/tests/flags_tests.cpp
@@ -645,7 +645,7 @@ TEST_F(FlagsFileTest, JSONFile)
object.values["nested"] = nested;
// Write the JSON to a file.
- const string& file = path::join(os::getcwd(), "file.json");
+ const string file = path::join(os::getcwd(), "file.json");
ASSERT_SOME(os::write(file, stringify(object)));
// Read the JSON from the file.
@@ -669,7 +669,7 @@ TEST_F(FlagsFileTest, FilePrefix)
"arg to be loaded from file");
// Write the JSON to a file.
- const string& file = path::join(os::getcwd(), "file");
+ const string file = path::join(os::getcwd(), "file");
ASSERT_SOME(os::write(file, "testing"));
// Read the JSON from the file.
http://git-wip-us.apache.org/repos/asf/mesos/blob/9a2a313d/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp
index 12b2e1b..7ea9475 100644
--- a/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp
+++ b/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp
@@ -75,8 +75,8 @@ TEST_F(OsTest, environment)
if (position == std::string::npos) {
continue; // Skip malformed environment entries.
}
- const string& key = entry.substr(0, position);
- const string& value = entry.substr(position + 1);
+ const string key = entry.substr(0, position);
+ const string value = entry.substr(position + 1);
EXPECT_TRUE(environment.contains(key));
EXPECT_EQ(value, environment[key]);
}
@@ -86,7 +86,7 @@ TEST_F(OsTest, environment)
TEST_F(OsTest, rmdir)
{
const hashset<string> EMPTY;
- const string& tmpdir = os::getcwd();
+ const string tmpdir = os::getcwd();
hashset<string> expectedListing = EMPTY;
EXPECT_EQ(expectedListing, listfiles(tmpdir));
@@ -185,7 +185,7 @@ TEST_F(OsTest, nonblock)
TEST_F(OsTest, touch)
{
- const string& testfile = path::join(os::getcwd(), UUID::random().toString());
+ const string testfile = path::join(os::getcwd(), UUID::random().toString());
ASSERT_SOME(os::touch(testfile));
ASSERT_TRUE(os::exists(testfile));
@@ -194,8 +194,8 @@ TEST_F(OsTest, touch)
TEST_F(OsTest, readWriteString)
{
- const string& testfile = path::join(os::getcwd(), UUID::random().toString());
- const string& teststr = "line1\nline2";
+ const string testfile = path::join(os::getcwd(), UUID::random().toString());
+ const string teststr = "line1\nline2";
ASSERT_SOME(os::write(testfile, teststr));
@@ -240,14 +240,14 @@ TEST_F(OsTest, size)
TEST_F(OsTest, find)
{
- const string& testdir = path::join(os::getcwd(), UUID::random().toString());
- const string& subdir = testdir + "/test1";
+ const string testdir = path::join(os::getcwd(), UUID::random().toString());
+ const string subdir = testdir + "/test1";
ASSERT_SOME(os::mkdir(subdir)); // Create the directories.
// Now write some files.
- const string& file1 = testdir + "/file1.txt";
- const string& file2 = subdir + "/file2.txt";
- const string& file3 = subdir + "/file3.jpg";
+ const string file1 = testdir + "/file1.txt";
+ const string file2 = subdir + "/file2.txt";
+ const string file3 = subdir + "/file3.jpg";
ASSERT_SOME(os::touch(file1));
ASSERT_SOME(os::touch(file2));
@@ -943,9 +943,9 @@ TEST_F(OsTest, Mknod)
return;
}
- const string& device = "null";
+ const string device = "null";
- const string& existing = path::join("/dev", device);
+ const string existing = path::join("/dev", device);
ASSERT_TRUE(os::exists(existing));
Try<mode_t> mode = os::stat::mode(existing);
@@ -954,7 +954,7 @@ TEST_F(OsTest, Mknod)
Try<dev_t> rdev = os::stat::rdev(existing);
ASSERT_SOME(rdev);
- const string& another = path::join(os::getcwd(), device);
+ const string another = path::join(os::getcwd(), device);
ASSERT_FALSE(os::exists(another));
EXPECT_SOME(os::mknod(another, mode.get(), rdev.get()));
[2/4] mesos git commit: Fix capture by reference of temporary strings
in Libprocess.
Posted by be...@apache.org.
Fix capture by reference of temporary strings in Libprocess.
Review: https://reviews.apache.org/r/33274
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ef4c4db8
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ef4c4db8
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ef4c4db8
Branch: refs/heads/master
Commit: ef4c4db8be5d7605e426b89bae9fdce76a3ef666
Parents: 9a2a313
Author: Joris Van Remoortere <jo...@gmail.com>
Authored: Tue Jun 2 07:53:03 2015 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Tue Jun 2 07:53:05 2015 -0700
----------------------------------------------------------------------
3rdparty/libprocess/src/help.cpp | 2 +-
3rdparty/libprocess/src/process.cpp | 6 +++---
3rdparty/libprocess/src/tests/decoder_tests.cpp | 16 ++++++++--------
3rdparty/libprocess/src/tests/encoder_tests.cpp | 2 +-
3rdparty/libprocess/src/tests/http_tests.cpp | 2 +-
3rdparty/libprocess/src/tests/process_tests.cpp | 2 +-
3rdparty/libprocess/src/tests/subprocess_tests.cpp | 2 +-
7 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/ef4c4db8/3rdparty/libprocess/src/help.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/help.cpp b/3rdparty/libprocess/src/help.cpp
index ce2de11..e4e0bb6 100644
--- a/3rdparty/libprocess/src/help.cpp
+++ b/3rdparty/libprocess/src/help.cpp
@@ -135,7 +135,7 @@ Future<http::Response> Help::help(const http::Request& request)
document += "## `/" + id.get() + "` ##\n";
foreachkey (const string& name, helps[id.get()]) {
- const string& path = id.get() + name;
+ const string path = id.get() + name;
document += "> [/" + path + "][" + path + "]\n";
references += "[" + path + "]: " + path + "\n";
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/ef4c4db8/3rdparty/libprocess/src/process.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/process.cpp b/3rdparty/libprocess/src/process.cpp
index e3de3cd..304e877 100644
--- a/3rdparty/libprocess/src/process.cpp
+++ b/3rdparty/libprocess/src/process.cpp
@@ -486,7 +486,7 @@ static Message* parse(Request* request)
} else {
// Try and get 'from' from the User-Agent.
const string& agent = request->headers["User-Agent"];
- const string& identifier = "libprocess/";
+ const string identifier = "libprocess/";
size_t index = agent.find(identifier);
if (index != string::npos) {
from = UPID(agent.substr(index + identifier.size(), agent.size()));
@@ -513,7 +513,7 @@ static Message* parse(Request* request)
// And now determine 'name'.
index = index != string::npos ? index + 2: request->path.size();
- const string& name = request->path.substr(index);
+ const string name = request->path.substr(index);
VLOG(2) << "Parsed message name '" << name
<< "' for " << to << " from " << from.get();
@@ -2711,7 +2711,7 @@ void ProcessBase::visit(const HttpEvent& event)
CHECK(tokens.size() >= 1);
CHECK_EQ(pid.id, http::decode(tokens[0]).get());
- const string& name = tokens.size() > 1 ? tokens[1] : "";
+ const string name = tokens.size() > 1 ? tokens[1] : "";
if (handlers.http.count(name) > 0) {
// Create the promise to link with whatever gets returned, as well
http://git-wip-us.apache.org/repos/asf/mesos/blob/ef4c4db8/3rdparty/libprocess/src/tests/decoder_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/decoder_tests.cpp b/3rdparty/libprocess/src/tests/decoder_tests.cpp
index efe364a..f8fa798 100644
--- a/3rdparty/libprocess/src/tests/decoder_tests.cpp
+++ b/3rdparty/libprocess/src/tests/decoder_tests.cpp
@@ -23,7 +23,7 @@ TEST(Decoder, Request)
ASSERT_SOME(socket);
DataDecoder decoder = DataDecoder(socket.get());
- const string& data =
+ const string data =
"GET /path/file.json?key1=value1&key2=value2#fragment HTTP/1.1\r\n"
"Host: localhost\r\n"
"Connection: close\r\n"
@@ -61,7 +61,7 @@ TEST(Decoder, RequestHeaderContinuation)
ASSERT_SOME(socket);
DataDecoder decoder = DataDecoder(socket.get());
- const string& data =
+ const string data =
"GET /path/file.json HTTP/1.1\r\n"
"Host: localhost\r\n"
"Connection: close\r\n"
@@ -87,7 +87,7 @@ TEST(Decoder, DISABLED_RequestHeaderCaseInsensitive)
ASSERT_SOME(socket);
DataDecoder decoder = DataDecoder(socket.get());
- const string& data =
+ const string data =
"GET /path/file.json HTTP/1.1\r\n"
"Host: localhost\r\n"
"cOnnECtioN: close\r\n"
@@ -111,7 +111,7 @@ TEST(Decoder, Response)
{
ResponseDecoder decoder;
- const string& data =
+ const string data =
"HTTP/1.1 200 OK\r\n"
"Date: Fri, 31 Dec 1999 23:59:59 GMT\r\n"
"Content-Type: text/plain\r\n"
@@ -139,14 +139,14 @@ TEST(Decoder, StreamingResponse)
{
StreamingResponseDecoder decoder;
- const string& headers =
+ const string headers =
"HTTP/1.1 200 OK\r\n"
"Date: Fri, 31 Dec 1999 23:59:59 GMT\r\n"
"Content-Type: text/plain\r\n"
"Content-Length: 2\r\n"
"\r\n";
- const string& body = "hi";
+ const string body = "hi";
deque<Response*> responses = decoder.decode(headers.data(), headers.length());
ASSERT_FALSE(decoder.failed());
@@ -183,7 +183,7 @@ TEST(Decoder, StreamingResponseFailure)
{
StreamingResponseDecoder decoder;
- const string& headers =
+ const string headers =
"HTTP/1.1 200 OK\r\n"
"Date: Fri, 31 Dec 1999 23:59:59 GMT\r\n"
"Content-Type: text/plain\r\n"
@@ -191,7 +191,7 @@ TEST(Decoder, StreamingResponseFailure)
"\r\n";
// The body is shorter than the content length!
- const string& body = "1";
+ const string body = "1";
deque<Response*> responses = decoder.decode(headers.data(), headers.length());
ASSERT_FALSE(decoder.failed());
http://git-wip-us.apache.org/repos/asf/mesos/blob/ef4c4db8/3rdparty/libprocess/src/tests/encoder_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/encoder_tests.cpp b/3rdparty/libprocess/src/tests/encoder_tests.cpp
index 784a2c7..44996f0 100644
--- a/3rdparty/libprocess/src/tests/encoder_tests.cpp
+++ b/3rdparty/libprocess/src/tests/encoder_tests.cpp
@@ -26,7 +26,7 @@ TEST(Encoder, Response)
const OK response("body");
// Encode the response.
- const string& encoded = HttpResponseEncoder::encode(response, request);
+ const string encoded = HttpResponseEncoder::encode(response, request);
// Now decode it back, and verify the encoding was correct.
ResponseDecoder decoder;
http://git-wip-us.apache.org/repos/asf/mesos/blob/ef4c4db8/3rdparty/libprocess/src/tests/http_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/http_tests.cpp b/3rdparty/libprocess/src/tests/http_tests.cpp
index d29cd29..708e331 100644
--- a/3rdparty/libprocess/src/tests/http_tests.cpp
+++ b/3rdparty/libprocess/src/tests/http_tests.cpp
@@ -143,7 +143,7 @@ TEST(HTTP, Endpoints)
<< "Connection: Keep-Alive\r\n"
<< "\r\n";
- const string& data = out.str();
+ const string data = out.str();
EXPECT_CALL(*http.process, body(_))
.WillOnce(Return(http::OK()));
http://git-wip-us.apache.org/repos/asf/mesos/blob/ef4c4db8/3rdparty/libprocess/src/tests/process_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/process_tests.cpp b/3rdparty/libprocess/src/tests/process_tests.cpp
index 67e582c..0d8a87b 100644
--- a/3rdparty/libprocess/src/tests/process_tests.cpp
+++ b/3rdparty/libprocess/src/tests/process_tests.cpp
@@ -1462,7 +1462,7 @@ TEST(Process, remote)
message.from = UPID();
message.to = process.self();
- const string& data = MessageEncoder::encode(&message);
+ const string data = MessageEncoder::encode(&message);
AWAIT_READY(socket.send(data));
http://git-wip-us.apache.org/repos/asf/mesos/blob/ef4c4db8/3rdparty/libprocess/src/tests/subprocess_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/subprocess_tests.cpp b/3rdparty/libprocess/src/tests/subprocess_tests.cpp
index dea4ed8..b5cfc8d 100644
--- a/3rdparty/libprocess/src/tests/subprocess_tests.cpp
+++ b/3rdparty/libprocess/src/tests/subprocess_tests.cpp
@@ -828,7 +828,7 @@ TEST_F(SubprocessTest, Setup)
ASSERT_SOME(s.get().status().get());
// Make sure 'file' is there and contains 'hello world'.
- const string& path = path::join(directory.get(), "file");
+ const string path = path::join(directory.get(), "file");
EXPECT_TRUE(os::exists(path));
EXPECT_SOME_EQ("hello world\n", os::read(path));
[4/4] mesos git commit: Fix capture by reference of temporaries in
Libprocess.
Posted by be...@apache.org.
Fix capture by reference of temporaries in Libprocess.
Review: https://reviews.apache.org/r/33276
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/36ec7f22
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/36ec7f22
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/36ec7f22
Branch: refs/heads/master
Commit: 36ec7f22da3cceeeeec339eba62affa2bff69fac
Parents: ae506bc
Author: Joris Van Remoortere <jo...@gmail.com>
Authored: Tue Jun 2 07:54:17 2015 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Tue Jun 2 07:54:19 2015 -0700
----------------------------------------------------------------------
3rdparty/libprocess/include/process/check.hpp | 8 ++++----
3rdparty/libprocess/include/process/gmock.hpp | 2 +-
3rdparty/libprocess/src/http.cpp | 6 +++---
3rdparty/libprocess/src/process.cpp | 2 +-
3rdparty/libprocess/src/tests/process_tests.cpp | 2 +-
3rdparty/libprocess/src/tests/reap_tests.cpp | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/36ec7f22/3rdparty/libprocess/include/process/check.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/check.hpp b/3rdparty/libprocess/include/process/check.hpp
index b3f9690..60989ac 100644
--- a/3rdparty/libprocess/include/process/check.hpp
+++ b/3rdparty/libprocess/include/process/check.hpp
@@ -25,25 +25,25 @@
// 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_PENDING(expression) \
- for (const Option<std::string>& _error = _checkPending(expression); \
+ for (const Option<std::string> _error = _checkPending(expression); \
_error.isSome();) \
_CheckFatal(__FILE__, __LINE__, "CHECK_PENDING", \
#expression, _error.get()).stream()
#define CHECK_READY(expression) \
- for (const Option<std::string>& _error = _checkReady(expression); \
+ for (const Option<std::string> _error = _checkReady(expression); \
_error.isSome();) \
_CheckFatal(__FILE__, __LINE__, "CHECK_READY", \
#expression, _error.get()).stream()
#define CHECK_DISCARDED(expression) \
- for (const Option<std::string>& _error = _checkDiscarded(expression); \
+ for (const Option<std::string> _error = _checkDiscarded(expression); \
_error.isSome();) \
_CheckFatal(__FILE__, __LINE__, "CHECK_DISCARDED", \
#expression, _error.get()).stream()
#define CHECK_FAILED(expression) \
- for (const Option<std::string>& _error = _checkFailed(expression); \
+ for (const Option<std::string> _error = _checkFailed(expression); \
_error.isSome();) \
_CheckFatal(__FILE__, __LINE__, "CHECK_FAILED", \
#expression, _error.get()).stream()
http://git-wip-us.apache.org/repos/asf/mesos/blob/36ec7f22/3rdparty/libprocess/include/process/gmock.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/gmock.hpp b/3rdparty/libprocess/include/process/gmock.hpp
index a99eb8a..6adc034 100644
--- a/3rdparty/libprocess/include/process/gmock.hpp
+++ b/3rdparty/libprocess/include/process/gmock.hpp
@@ -162,7 +162,7 @@ private:
virtual typename ::testing::ActionInterface<F>::Result Perform(
const typename ::testing::ActionInterface<F>::ArgumentTuple& args)
{
- const typename ::testing::ActionInterface<F>::Result& result =
+ const typename ::testing::ActionInterface<F>::Result result =
action.Perform(args);
promise.set(result);
return result;
http://git-wip-us.apache.org/repos/asf/mesos/blob/36ec7f22/3rdparty/libprocess/src/http.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/http.cpp b/3rdparty/libprocess/src/http.cpp
index 67983ee..1d318b9 100644
--- a/3rdparty/libprocess/src/http.cpp
+++ b/3rdparty/libprocess/src/http.cpp
@@ -134,7 +134,7 @@ bool Request::accepts(const string& encoding) const
foreach (const string& _encoding, strings::tokenize(accepted.get(), ",")) {
if (strings::startsWith(_encoding, candidate)) {
// Is there a 0 q value? Ex: 'gzip;q=0.0'.
- const map<string, vector<string>>& values =
+ const map<string, vector<string>> values =
strings::pairs(_encoding, ";", "=");
// Look for { "q": ["0"] }.
@@ -474,9 +474,9 @@ Try<hashmap<std::string, std::string>> decode(const std::string& query)
{
hashmap<std::string, std::string> result;
- const std::vector<std::string>& tokens = strings::tokenize(query, ";&");
+ const std::vector<std::string> tokens = strings::tokenize(query, ";&");
foreach (const std::string& token, tokens) {
- const std::vector<std::string>& pairs = strings::split(token, "=", 2);
+ const std::vector<std::string> pairs = strings::split(token, "=", 2);
if (pairs.size() == 0) {
continue;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/36ec7f22/3rdparty/libprocess/src/process.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/process.cpp b/3rdparty/libprocess/src/process.cpp
index 304e877..4a5ab79 100644
--- a/3rdparty/libprocess/src/process.cpp
+++ b/3rdparty/libprocess/src/process.cpp
@@ -558,7 +558,7 @@ void decode_recv(
}
// Decode as much of the data as possible into HTTP requests.
- deque<Request*> requests = decoder->decode(data, length.get());
+ const deque<Request*> requests = decoder->decode(data, length.get());
if (!requests.empty()) {
foreach (Request* request, requests) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/36ec7f22/3rdparty/libprocess/src/tests/process_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/process_tests.cpp b/3rdparty/libprocess/src/tests/process_tests.cpp
index 0d8a87b..7b9ba9e 100644
--- a/3rdparty/libprocess/src/tests/process_tests.cpp
+++ b/3rdparty/libprocess/src/tests/process_tests.cpp
@@ -1641,7 +1641,7 @@ public:
TEST(Process, provide)
{
- const Try<string>& mkdtemp = os::mkdtemp();
+ const Try<string> mkdtemp = os::mkdtemp();
ASSERT_SOME(mkdtemp);
const string LOREM_IPSUM =
http://git-wip-us.apache.org/repos/asf/mesos/blob/36ec7f22/3rdparty/libprocess/src/tests/reap_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/reap_tests.cpp b/3rdparty/libprocess/src/tests/reap_tests.cpp
index a18d54c..51a570f 100644
--- a/3rdparty/libprocess/src/tests/reap_tests.cpp
+++ b/3rdparty/libprocess/src/tests/reap_tests.cpp
@@ -146,7 +146,7 @@ TEST(Reap, TerminatedChildProcess)
// Make sure the process is transitioned into the zombie
// state before we reap it.
while (true) {
- const Result<os::Process>& process = os::process(child);
+ const Result<os::Process> process = os::process(child);
ASSERT_SOME(process) << "Process " << child << " reaped unexpectedly";
if (process.get().zombie) {
[3/4] mesos git commit: Fix capture by reference of temporaries in
Stout.
Posted by be...@apache.org.
Fix capture by reference of temporaries in Stout.
Review: https://reviews.apache.org/r/33275
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ae506bce
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ae506bce
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ae506bce
Branch: refs/heads/master
Commit: ae506bcec76440c26f1c876efa77320ec48e3664
Parents: ef4c4db
Author: Joris Van Remoortere <jo...@gmail.com>
Authored: Tue Jun 2 07:53:56 2015 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Tue Jun 2 07:53:58 2015 -0700
----------------------------------------------------------------------
.../libprocess/3rdparty/stout/include/stout/cache.hpp | 2 +-
.../libprocess/3rdparty/stout/include/stout/check.hpp | 6 +++---
.../3rdparty/stout/include/stout/flags/flags.hpp | 2 +-
.../libprocess/3rdparty/stout/include/stout/format.hpp | 2 +-
.../libprocess/3rdparty/stout/include/stout/json.hpp | 2 +-
.../3rdparty/stout/include/stout/multihashmap.hpp | 2 +-
.../libprocess/3rdparty/stout/include/stout/multimap.hpp | 2 +-
3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp | 11 +++++------
.../libprocess/3rdparty/stout/include/stout/os/linux.hpp | 2 +-
.../libprocess/3rdparty/stout/include/stout/os/osx.hpp | 6 +++---
.../3rdparty/stout/include/stout/os/pstree.hpp | 2 +-
.../libprocess/3rdparty/stout/include/stout/os/shell.hpp | 2 +-
.../libprocess/3rdparty/stout/include/stout/strings.hpp | 4 ++--
3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp | 10 +++++-----
14 files changed, 27 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/include/stout/cache.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/cache.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/cache.hpp
index 37e007e..9714d9a 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/cache.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/cache.hpp
@@ -125,7 +125,7 @@ private:
// Evict the least-recently used element from the cache.
void evict()
{
- const typename map::iterator& i = values.find(keys.front());
+ const typename map::iterator i = values.find(keys.front());
CHECK(i != values.end());
values.erase(i);
keys.pop_front();
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/include/stout/check.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/check.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/check.hpp
index 4380c24..3972383 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/check.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/check.hpp
@@ -28,10 +28,10 @@
#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.
+// 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); \
+ for (const Option<std::string> _error = _check(expression); \
_error.isSome();) \
_CheckFatal(__FILE__, __LINE__, "CHECK_SOME", \
#expression, _error.get()).stream()
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/include/stout/flags/flags.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/flags/flags.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/flags/flags.hpp
index 61a405f..ee855da 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/flags/flags.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/flags/flags.hpp
@@ -668,7 +668,7 @@ inline std::ostream& operator << (std::ostream& stream, const FlagsBase& flags)
std::vector<std::string> _flags;
foreachvalue (const flags::Flag& flag, flags) {
- const Option<std::string>& value = flag.stringify(flags);
+ const Option<std::string> value = flag.stringify(flags);
if (value.isSome()) {
_flags.push_back("--" + flag.name + "=\"" + value.get() + '"');
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp
index abe1a1d..9bd19fd 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp
@@ -77,7 +77,7 @@ inline Try<std::string> format(const std::string fmt, ...)
{
va_list args;
va_start(args, fmt);
- const Try<std::string>& result = format(fmt, args);
+ const Try<std::string> result = format(fmt, args);
va_end(args);
return result;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/include/stout/json.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/json.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/json.hpp
index 8784e76..6e0a178 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/json.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/json.hpp
@@ -261,7 +261,7 @@ inline const Value& Value::as<Value>() const
template <typename T>
Result<T> Object::find(const std::string& path) const
{
- const std::vector<std::string>& names = strings::split(path, ".", 2);
+ const std::vector<std::string> names = strings::split(path, ".", 2);
if (names.empty()) {
return None();
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/include/stout/multihashmap.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/multihashmap.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/multihashmap.hpp
index ecda6a9..a8573ed 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/multihashmap.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/multihashmap.hpp
@@ -115,7 +115,7 @@ bool multihashmap<K, V>::contains(const K& key) const
template <typename K, typename V>
bool multihashmap<K, V>::contains(const K& key, const V& value) const
{
- const std::list<V>& values = get(key);
+ const std::list<V> values = get(key);
return std::find(values.begin(), values.end(), value) != values.end();
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/include/stout/multimap.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/multimap.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/multimap.hpp
index 9714ba0..fb3e7a1 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/multimap.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/multimap.hpp
@@ -113,7 +113,7 @@ bool Multimap<K, V>::contains(const K& key) const
template <typename K, typename V>
bool Multimap<K, V>::contains(const K& key, const V& value) const
{
- const std::list<V>& values = get(key);
+ const std::list<V> values = get(key);
return std::find(values.begin(), values.end(), value) != values.end();
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp
index d2ca4be..8ee02ef 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp
@@ -984,8 +984,7 @@ inline Try<Memory> memory()
return memory;
#elif defined __APPLE__
- const Try<int64_t>& totalMemory =
- os::sysctl(CTL_HW, HW_MEMSIZE).integer();
+ const Try<int64_t> totalMemory = os::sysctl(CTL_HW, HW_MEMSIZE).integer();
if (totalMemory.isError()) {
return Error(totalMemory.error());
@@ -1110,7 +1109,7 @@ inline Try<Version> release()
inline Try<std::list<Process> > processes()
{
- const Try<std::set<pid_t> >& pids = os::pids();
+ const Try<std::set<pid_t>> pids = os::pids();
if (pids.isError()) {
return Error(pids.error());
@@ -1118,7 +1117,7 @@ inline Try<std::list<Process> > processes()
std::list<Process> result;
foreach (pid_t pid, pids.get()) {
- const Result<Process>& process = os::process(pid);
+ const Result<Process> process = os::process(pid);
// Ignore any processes that disappear.
if (process.isSome()) {
@@ -1173,7 +1172,7 @@ inline std::set<pid_t> children(
inline Try<std::set<pid_t> > children(pid_t pid, bool recursive = true)
{
- const Try<std::list<Process> >& processes = os::processes();
+ const Try<std::list<Process>> processes = os::processes();
if (processes.isError()) {
return Error(processes.error());
@@ -1196,7 +1195,7 @@ inline Try<std::set<pid_t> > pids(Option<pid_t> group, Option<pid_t> session)
return Error("Invalid session");
}
- const Try<std::list<Process> >& processes = os::processes();
+ const Try<std::list<Process>> processes = os::processes();
if (processes.isError()) {
return Error(processes.error());
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/include/stout/os/linux.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/linux.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/linux.hpp
index 7a5573b..0850ae9 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/linux.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/linux.hpp
@@ -51,7 +51,7 @@ inline Result<Process> process(pid_t pid)
return Error("Failed to get sysconf(_SC_CLK_TCK)");
}
- const Result<proc::ProcessStatus>& status = proc::status(pid);
+ const Result<proc::ProcessStatus> status = proc::status(pid);
if (status.isError()) {
return Error(status.error());
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp
index 7d17249..c8d30d8 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp
@@ -38,7 +38,7 @@ namespace os {
inline Result<Process> process(pid_t pid)
{
- const Try<std::vector<kinfo_proc> >& processes =
+ const Try<std::vector<kinfo_proc>> processes =
os::sysctl(CTL_KERN, KERN_PROC, KERN_PROC_PID, pid).table(1);
if (processes.isError()) {
@@ -166,13 +166,13 @@ inline Result<Process> process(pid_t pid)
inline Try<std::set<pid_t> > pids()
{
- const Try<int>& maxproc = os::sysctl(CTL_KERN, KERN_MAXPROC).integer();
+ const Try<int> maxproc = os::sysctl(CTL_KERN, KERN_MAXPROC).integer();
if (maxproc.isError()) {
return Error(maxproc.error());
}
- const Try<std::vector<kinfo_proc> >& processes =
+ const Try<std::vector<kinfo_proc>> processes =
os::sysctl(CTL_KERN, KERN_PROC, KERN_PROC_ALL).table(maxproc.get());
if (processes.isError()) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/include/stout/os/pstree.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/pstree.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/pstree.hpp
index 9426895..ba8e579 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/pstree.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/pstree.hpp
@@ -70,7 +70,7 @@ inline Try<ProcessTree> pstree(Option<pid_t> pid = None())
pid = getpid();
}
- const Try<std::list<Process> >& processes = os::processes();
+ const Try<std::list<Process>> processes = os::processes();
if (processes.isError()) {
return Error(processes.error());
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/include/stout/os/shell.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/shell.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/shell.hpp
index 6728ad8..f6d3b76 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/shell.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/shell.hpp
@@ -34,7 +34,7 @@ inline Try<int> shell(std::ostream* os, const std::string fmt, ...)
va_list args;
va_start(args, fmt);
- const Try<std::string>& command = strings::internal::format(fmt, args);
+ const Try<std::string> command = strings::internal::format(fmt, args);
va_end(args);
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/include/stout/strings.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/strings.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/strings.hpp
index 46b79bc..702ed0b 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/strings.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/strings.hpp
@@ -177,9 +177,9 @@ inline std::map<std::string, std::vector<std::string> > pairs(
{
std::map<std::string, std::vector<std::string> > result;
- const std::vector<std::string>& tokens = tokenize(s, delims1);
+ const std::vector<std::string> tokens = tokenize(s, delims1);
foreach (const std::string& token, tokens) {
- const std::vector<std::string>& pairs = tokenize(token, delims2);
+ const std::vector<std::string> pairs = tokenize(token, delims2);
if (pairs.size() == 2) {
result[pairs[0]].push_back(pairs[1]);
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp
index 7ea9475..62987e0 100644
--- a/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp
+++ b/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp
@@ -294,7 +294,7 @@ TEST_F(OsTest, bootId)
TEST_F(OsTest, uname)
{
- const Try<os::UTSInfo>& info = os::uname();
+ const Try<os::UTSInfo> info = os::uname();
ASSERT_SOME(info);
#ifdef __linux__
@@ -308,7 +308,7 @@ TEST_F(OsTest, uname)
TEST_F(OsTest, sysname)
{
- const Try<string>& name = os::sysname();
+ const Try<string> name = os::sysname();
ASSERT_SOME(name);
#ifdef __linux__
@@ -322,7 +322,7 @@ TEST_F(OsTest, sysname)
TEST_F(OsTest, release)
{
- const Try<Version>& info = os::release();
+ const Try<Version> info = os::release();
ASSERT_SOME(info);
}
@@ -466,7 +466,7 @@ TEST_F(OsTest, children)
TEST_F(OsTest, process)
{
- const Result<Process>& process = os::process(getpid());
+ const Result<Process> process = os::process(getpid());
ASSERT_SOME(process);
EXPECT_EQ(getpid(), process.get().pid);
@@ -490,7 +490,7 @@ TEST_F(OsTest, process)
TEST_F(OsTest, processes)
{
- const Try<list<Process> >& processes = os::processes();
+ const Try<list<Process>> processes = os::processes();
ASSERT_SOME(processes);
ASSERT_GT(processes.get().size(), 2);