You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ne...@apache.org on 2017/06/15 23:09:18 UTC
[1/2] mesos git commit: Fixed whitespace infelicities in libprocess.
Repository: mesos
Updated Branches:
refs/heads/master 200bf1d67 -> 64b9ff841
Fixed whitespace infelicities in libprocess.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c9ca148b
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c9ca148b
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c9ca148b
Branch: refs/heads/master
Commit: c9ca148b009c2b3865bcfd0bf68dca54b67d79c6
Parents: 200bf1d
Author: Neil Conway <ne...@gmail.com>
Authored: Thu Jun 15 15:57:41 2017 -0700
Committer: Neil Conway <ne...@gmail.com>
Committed: Thu Jun 15 15:57:41 2017 -0700
----------------------------------------------------------------------
3rdparty/libprocess/src/libev.cpp | 1 +
3rdparty/libprocess/src/process.cpp | 1 +
3rdparty/libprocess/src/tests/timeseries_tests.cpp | 1 +
3 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/c9ca148b/3rdparty/libprocess/src/libev.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/libev.cpp b/3rdparty/libprocess/src/libev.cpp
index 07717c4..173ee46 100644
--- a/3rdparty/libprocess/src/libev.cpp
+++ b/3rdparty/libprocess/src/libev.cpp
@@ -157,6 +157,7 @@ void EventLoop::run()
__in_event_loop__ = false;
}
+
void EventLoop::stop()
{
ev_async_send(loop, &shutdown_watcher);
http://git-wip-us.apache.org/repos/asf/mesos/blob/c9ca148b/3rdparty/libprocess/src/process.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/process.cpp b/3rdparty/libprocess/src/process.cpp
index 4ff7448..2a19078 100644
--- a/3rdparty/libprocess/src/process.cpp
+++ b/3rdparty/libprocess/src/process.cpp
@@ -1971,6 +1971,7 @@ Option<int_fd> get_persistent_socket(const UPID& to)
return socket_manager->get_persistent_socket(to);
}
+
Option<int_fd> SocketManager::get_persistent_socket(const UPID& to)
{
synchronized (mutex) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/c9ca148b/3rdparty/libprocess/src/tests/timeseries_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/timeseries_tests.cpp b/3rdparty/libprocess/src/tests/timeseries_tests.cpp
index 59e4657..4177fb6 100644
--- a/3rdparty/libprocess/src/tests/timeseries_tests.cpp
+++ b/3rdparty/libprocess/src/tests/timeseries_tests.cpp
@@ -52,6 +52,7 @@ TEST(TimeSeriesTest, Set)
ASSERT_EQ(1, latest.get().data);
}
+
TEST(TimeSeriesTest, Sparsify)
{
// We have to pause the clock because this test often results
[2/2] mesos git commit: Fixed whitespace infelicities in stout.
Posted by ne...@apache.org.
Fixed whitespace infelicities in stout.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/64b9ff84
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/64b9ff84
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/64b9ff84
Branch: refs/heads/master
Commit: 64b9ff841711838a9d1392e22ab334c93bbabe86
Parents: c9ca148
Author: Neil Conway <ne...@gmail.com>
Authored: Thu Jun 15 16:00:40 2017 -0700
Committer: Neil Conway <ne...@gmail.com>
Committed: Thu Jun 15 16:00:40 2017 -0700
----------------------------------------------------------------------
3rdparty/stout/include/stout/duration.hpp | 1 +
3rdparty/stout/include/stout/os/freebsd.hpp | 1 +
3rdparty/stout/include/stout/os/posix/su.hpp | 1 +
3rdparty/stout/include/stout/os/windows/socket.hpp | 4 ++++
3rdparty/stout/include/stout/windows.hpp | 6 ++++++
3rdparty/stout/tests/duration_tests.cpp | 3 +++
6 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/64b9ff84/3rdparty/stout/include/stout/duration.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/duration.hpp b/3rdparty/stout/include/stout/duration.hpp
index 138993e..5608fbf 100644
--- a/3rdparty/stout/include/stout/duration.hpp
+++ b/3rdparty/stout/include/stout/duration.hpp
@@ -407,6 +407,7 @@ inline Try<Duration> Duration::create(double seconds)
return Nanoseconds(static_cast<int64_t>(seconds * SECONDS));
}
+
inline constexpr Duration Duration::max()
{
return Nanoseconds(std::numeric_limits<int64_t>::max());
http://git-wip-us.apache.org/repos/asf/mesos/blob/64b9ff84/3rdparty/stout/include/stout/os/freebsd.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/os/freebsd.hpp b/3rdparty/stout/include/stout/os/freebsd.hpp
index f331d15..f807848 100644
--- a/3rdparty/stout/include/stout/os/freebsd.hpp
+++ b/3rdparty/stout/include/stout/os/freebsd.hpp
@@ -58,6 +58,7 @@ inline Result<Process> process(pid_t pid)
return None();
}
+
inline Try<std::set<pid_t>> pids()
{
std::set<pid_t> result;
http://git-wip-us.apache.org/repos/asf/mesos/blob/64b9ff84/3rdparty/stout/include/stout/os/posix/su.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/os/posix/su.hpp b/3rdparty/stout/include/stout/os/posix/su.hpp
index cb1478b..715f888 100644
--- a/3rdparty/stout/include/stout/os/posix/su.hpp
+++ b/3rdparty/stout/include/stout/os/posix/su.hpp
@@ -315,6 +315,7 @@ inline Result<std::string> user(Option<uid_t> uid = None())
}
}
+
inline Try<Nothing> su(const std::string& user)
{
Result<gid_t> gid = os::getgid(user);
http://git-wip-us.apache.org/repos/asf/mesos/blob/64b9ff84/3rdparty/stout/include/stout/os/windows/socket.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/os/windows/socket.hpp b/3rdparty/stout/include/stout/os/windows/socket.hpp
index 43f5436..18d2ecf 100644
--- a/3rdparty/stout/include/stout/os/windows/socket.hpp
+++ b/3rdparty/stout/include/stout/os/windows/socket.hpp
@@ -115,6 +115,7 @@ inline os::WindowsFD accept(
return ::accept(fd, addr, reinterpret_cast<int*>(addrlen));
}
+
inline int bind(
const os::WindowsFD& fd, const sockaddr* addr, socklen_t addrlen)
{
@@ -122,6 +123,7 @@ inline int bind(
return ::bind(fd, addr, static_cast<int>(addrlen));
}
+
inline int connect(
const os::WindowsFD& fd, const sockaddr* address, socklen_t addrlen)
{
@@ -129,6 +131,7 @@ inline int connect(
return ::connect(fd, address, static_cast<int>(addrlen));
}
+
inline ssize_t send(
const os::WindowsFD& fd, const void* buf, size_t len, int flags)
{
@@ -137,6 +140,7 @@ inline ssize_t send(
fd, static_cast<const char*>(buf), static_cast<int>(len), flags);
}
+
inline ssize_t recv(const os::WindowsFD& fd, void* buf, size_t len, int flags)
{
CHECK_LE(len, INT32_MAX);
http://git-wip-us.apache.org/repos/asf/mesos/blob/64b9ff84/3rdparty/stout/include/stout/windows.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/windows.hpp b/3rdparty/stout/include/stout/windows.hpp
index 8b8dc61..2fcf27f 100644
--- a/3rdparty/stout/include/stout/windows.hpp
+++ b/3rdparty/stout/include/stout/windows.hpp
@@ -192,31 +192,37 @@ inline bool S_ISDIR(const int mode)
return (mode & S_IFMT) == S_IFDIR; // Directory.
}
+
inline bool S_ISREG(const int mode)
{
return (mode & S_IFMT) == S_IFREG; // File.
}
+
inline bool S_ISCHR(const int mode)
{
return (mode & S_IFMT) == S_IFCHR; // Character device.
}
+
inline bool S_ISFIFO(const int mode)
{
return (mode & S_IFMT) == _S_IFIFO; // Pipe.
}
+
inline bool S_ISBLK(const int mode)
{
return false; // Block special device.
}
+
inline bool S_ISSOCK(const int mode)
{
return false; // Socket.
}
+
inline bool S_ISLNK(const int mode)
{
return false; // Symbolic link.
http://git-wip-us.apache.org/repos/asf/mesos/blob/64b9ff84/3rdparty/stout/tests/duration_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/duration_tests.cpp b/3rdparty/stout/tests/duration_tests.cpp
index c2f82fb..59b08f1 100644
--- a/3rdparty/stout/tests/duration_tests.cpp
+++ b/3rdparty/stout/tests/duration_tests.cpp
@@ -44,6 +44,7 @@ TEST(DurationTest, Comparison)
EXPECT_LT(Weeks(5217) - Nanoseconds(1), Weeks(5217));
}
+
TEST(DurationTest, ParseAndTry)
{
EXPECT_SOME_EQ(Hours(3), Duration::parse("3hrs"));
@@ -55,6 +56,7 @@ TEST(DurationTest, ParseAndTry)
EXPECT_ERROR(Duration::create(-10 * 1e9));
}
+
TEST(DurationTest, Arithmetic)
{
Duration d = Seconds(11);
@@ -111,6 +113,7 @@ TEST(DurationTest, OutputFormat)
EXPECT_EQ("-15250.2844524715weeks", stringify(Duration::min()));
}
+
TEST(DurationTest, Timeval)
{
EXPECT_EQ(Duration(timeval{10, 0}), Seconds(10));