Repository: mesos Updated Branches: refs/heads/master c5f49f629 -> 8ab200b4d
Libprocess: Removed namespace pollution. Review: https://reviews.apache.org/r/38307/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8ab200b4 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8ab200b4 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8ab200b4 Branch: refs/heads/master Commit: 8ab200b4d4c580ddafda0fab9016bc2dac9a4ac9 Parents: c5f49f6 Author: Joris Van Remoortere <[email protected]> Authored: Wed Oct 14 10:34:28 2015 +0200 Committer: Joris Van Remoortere <[email protected]> Committed: Wed Oct 14 10:34:28 2015 +0200 ---------------------------------------------------------------------- 3rdparty/libprocess/src/process.cpp | 17 +++++--- 3rdparty/libprocess/src/test-master.cpp | 6 +-- 3rdparty/libprocess/src/test-slave.cpp | 2 +- 3rdparty/libprocess/src/tests/benchmarks.cpp | 9 +++- 3rdparty/libprocess/src/tests/decoder_tests.cpp | 46 ++++++++++++-------- 3rdparty/libprocess/src/tests/encoder_tests.cpp | 24 +++++----- 3rdparty/libprocess/src/tests/http_tests.cpp | 6 ++- 3rdparty/libprocess/src/tests/io_tests.cpp | 5 ++- 3rdparty/libprocess/src/tests/limiter_tests.cpp | 4 +- 3rdparty/libprocess/src/tests/metrics_tests.cpp | 27 ++++++++---- 3rdparty/libprocess/src/tests/mutex_tests.cpp | 3 +- 3rdparty/libprocess/src/tests/owned_tests.cpp | 3 +- 3rdparty/libprocess/src/tests/process_tests.cpp | 25 ++++++++++- 3rdparty/libprocess/src/tests/queue_tests.cpp | 3 +- 3rdparty/libprocess/src/tests/reap_tests.cpp | 4 +- .../libprocess/src/tests/sequence_tests.cpp | 6 ++- 3rdparty/libprocess/src/tests/shared_tests.cpp | 4 +- 3rdparty/libprocess/src/tests/ssl_client.cpp | 9 +++- 3rdparty/libprocess/src/tests/ssl_tests.cpp | 13 +++++- .../libprocess/src/tests/statistics_tests.cpp | 6 ++- .../libprocess/src/tests/subprocess_tests.cpp | 7 ++- 3rdparty/libprocess/src/tests/system_tests.cpp | 4 +- 3rdparty/libprocess/src/tests/time_tests.cpp | 6 ++- .../libprocess/src/tests/timeseries_tests.cpp | 5 ++- 24 files changed, 169 insertions(+), 75 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/8ab200b4/3rdparty/libprocess/src/process.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/process.cpp b/3rdparty/libprocess/src/process.cpp index d1c81f1..0454554 100644 --- a/3rdparty/libprocess/src/process.cpp +++ b/3rdparty/libprocess/src/process.cpp @@ -105,8 +105,8 @@ #endif #include "process_reference.hpp" -using namespace process::firewall; -using namespace process::metrics::internal; +namespace firewall = process::firewall; +namespace metrics = process::metrics; using process::wait; // Necessary on some OS's to disambiguate. @@ -404,7 +404,7 @@ public: void terminate(const UPID& pid, bool inject, ProcessBase* sender = NULL); bool wait(const UPID& pid); - void installFirewall(vector<Owned<FirewallRule>>&& rules); + void installFirewall(vector<Owned<firewall::FirewallRule>>&& rules); string absolutePath(const string& path); void enqueue(ProcessBase* process); @@ -440,7 +440,7 @@ private: std::atomic_bool joining_threads; // List of rules applied to all incoming HTTP requests. - vector<Owned<FirewallRule>> firewallRules; + vector<Owned<firewall::FirewallRule>> firewallRules; std::recursive_mutex firewall_mutex; }; @@ -948,7 +948,9 @@ void initialize(const string& delegate) // Ensure metrics process is running. // TODO(bmahler): Consider initializing this consistently with // the other global Processes. - MetricsProcess* metricsProcess = MetricsProcess::instance(); + metrics::internal::MetricsProcess* metricsProcess = + metrics::internal::MetricsProcess::instance(); + CHECK_NOTNULL(metricsProcess); // Initialize the mime types. @@ -2309,7 +2311,7 @@ bool ProcessManager::handle( synchronized (firewall_mutex) { // Don't use a const reference, since it cannot be guaranteed // that the rules don't keep an internal state. - foreach (Owned<FirewallRule>& rule, firewallRules) { + foreach (Owned<firewall::FirewallRule>& rule, firewallRules) { Option<Response> rejection = rule->apply(socket, *request); if (rejection.isSome()) { VLOG(1) << "Returning '"<< rejection.get().status << "' for '" @@ -2756,7 +2758,8 @@ bool ProcessManager::wait(const UPID& pid) } -void ProcessManager::installFirewall(vector<Owned<FirewallRule>>&& rules) +void ProcessManager::installFirewall( + vector<Owned<firewall::FirewallRule>>&& rules) { synchronized (firewall_mutex) { firewallRules = std::move(rules); http://git-wip-us.apache.org/repos/asf/mesos/blob/8ab200b4/3rdparty/libprocess/src/test-master.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/test-master.cpp b/3rdparty/libprocess/src/test-master.cpp index 5ce9171..17f33b3 100644 --- a/3rdparty/libprocess/src/test-master.cpp +++ b/3rdparty/libprocess/src/test-master.cpp @@ -19,11 +19,9 @@ #include "test.hpp" -using std::string; - - -using namespace process::tuple; +namespace tuple = process::tuple; +using std::string; class Master : public Tuple<Process> { http://git-wip-us.apache.org/repos/asf/mesos/blob/8ab200b4/3rdparty/libprocess/src/test-slave.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/test-slave.cpp b/3rdparty/libprocess/src/test-slave.cpp index 03fa8e6..3c728d4 100644 --- a/3rdparty/libprocess/src/test-slave.cpp +++ b/3rdparty/libprocess/src/test-slave.cpp @@ -14,7 +14,7 @@ #include <test.hpp> -using namespace process::record; +namespace record = process::record; class Slave : public RecordProcess { http://git-wip-us.apache.org/repos/asf/mesos/blob/8ab200b4/3rdparty/libprocess/src/tests/benchmarks.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/tests/benchmarks.cpp b/3rdparty/libprocess/src/tests/benchmarks.cpp index bb9ced8..11e9217 100644 --- a/3rdparty/libprocess/src/tests/benchmarks.cpp +++ b/3rdparty/libprocess/src/tests/benchmarks.cpp @@ -37,7 +37,14 @@ #include <stout/hashset.hpp> #include <stout/stopwatch.hpp> -using namespace process; +namespace http = process::http; + +using process::Future; +using process::Owned; +using process::Process; +using process::ProcessBase; +using process::Promise; +using process::UPID; using std::cout; using std::endl; http://git-wip-us.apache.org/repos/asf/mesos/blob/8ab200b4/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 f1963fd..c2f7662 100644 --- a/3rdparty/libprocess/src/tests/decoder_tests.cpp +++ b/3rdparty/libprocess/src/tests/decoder_tests.cpp @@ -23,14 +23,18 @@ #include "decoder.hpp" -using namespace process; -using namespace process::http; +namespace http = process::http; -using std::deque; -using std::string; +using process::DataDecoder; +using process::Future; +using process::ResponseDecoder; +using process::StreamingResponseDecoder; using process::network::Socket; +using std::deque; +using std::string; + TEST(DecoderTest, Request) { Try<Socket> socket = Socket::create(); @@ -44,11 +48,11 @@ TEST(DecoderTest, Request) "Accept-Encoding: compress, gzip\r\n" "\r\n"; - deque<Request*> requests = decoder.decode(data.data(), data.length()); + deque<http::Request*> requests = decoder.decode(data.data(), data.length()); ASSERT_FALSE(decoder.failed()); ASSERT_EQ(1, requests.size()); - Request* request = requests[0]; + http::Request* request = requests[0]; EXPECT_EQ("GET", request->method); EXPECT_EQ("/path/file.json", request->url.path); @@ -83,11 +87,11 @@ TEST(DecoderTest, RequestHeaderContinuation) " gzip\r\n" "\r\n"; - deque<Request*> requests = decoder.decode(data.data(), data.length()); + deque<http::Request*> requests = decoder.decode(data.data(), data.length()); ASSERT_FALSE(decoder.failed()); ASSERT_EQ(1, requests.size()); - Request* request = requests[0]; + http::Request* request = requests[0]; EXPECT_SOME_EQ("compress, gzip", request->headers.get("Accept-Encoding")); delete request; @@ -107,11 +111,11 @@ TEST(DecoderTest, RequestHeaderCaseInsensitive) "accept-ENCODING: compress, gzip\r\n" "\r\n"; - deque<Request*> requests = decoder.decode(data.data(), data.length()); + deque<http::Request*> requests = decoder.decode(data.data(), data.length()); ASSERT_FALSE(decoder.failed()); ASSERT_EQ(1, requests.size()); - Request* request = requests[0]; + http::Request* request = requests[0]; EXPECT_FALSE(request->keepAlive); EXPECT_SOME_EQ("compress, gzip", request->headers.get("Accept-Encoding")); @@ -132,14 +136,14 @@ TEST(DecoderTest, Response) "\r\n" "hi"; - deque<Response*> responses = decoder.decode(data.data(), data.length()); + deque<http::Response*> responses = decoder.decode(data.data(), data.length()); ASSERT_FALSE(decoder.failed()); ASSERT_EQ(1, responses.size()); - Response* response = responses[0]; + http::Response* response = responses[0]; EXPECT_EQ("200 OK", response->status); - EXPECT_EQ(Response::BODY, response->type); + EXPECT_EQ(http::Response::BODY, response->type); EXPECT_EQ("hi", response->body); EXPECT_EQ(3, response->headers.size()); @@ -161,17 +165,19 @@ TEST(DecoderTest, StreamingResponse) const string body = "hi"; - deque<Response*> responses = decoder.decode(headers.data(), headers.length()); + deque<http::Response*> responses = + decoder.decode(headers.data(), headers.length()); + EXPECT_FALSE(decoder.failed()); EXPECT_TRUE(decoder.writingBody()); ASSERT_EQ(1, responses.size()); - Response* response = responses[0]; + http::Response* response = responses[0]; EXPECT_EQ("200 OK", response->status); EXPECT_EQ(3, response->headers.size()); - ASSERT_EQ(Response::PIPE, response->type); + ASSERT_EQ(http::Response::PIPE, response->type); ASSERT_SOME(response->reader); http::Pipe::Reader reader = response->reader.get(); @@ -211,17 +217,19 @@ TEST(DecoderTest, StreamingResponseFailure) // The body is shorter than the content length! const string body = "1"; - deque<Response*> responses = decoder.decode(headers.data(), headers.length()); + deque<http::Response*> responses = + decoder.decode(headers.data(), headers.length()); + EXPECT_FALSE(decoder.failed()); EXPECT_TRUE(decoder.writingBody()); ASSERT_EQ(1, responses.size()); - Response* response = responses[0]; + http::Response* response = responses[0]; EXPECT_EQ("200 OK", response->status); EXPECT_EQ(3, response->headers.size()); - ASSERT_EQ(Response::PIPE, response->type); + ASSERT_EQ(http::Response::PIPE, response->type); ASSERT_SOME(response->reader); http::Pipe::Reader reader = response->reader.get(); http://git-wip-us.apache.org/repos/asf/mesos/blob/8ab200b4/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 5ad5fd4..feee466 100644 --- a/3rdparty/libprocess/src/tests/encoder_tests.cpp +++ b/3rdparty/libprocess/src/tests/encoder_tests.cpp @@ -26,8 +26,10 @@ #include "encoder.hpp" #include "decoder.hpp" -using namespace process; -using namespace process::http; +namespace http = process::http; + +using process::HttpResponseEncoder; +using process::ResponseDecoder; using std::deque; using std::string; @@ -36,19 +38,21 @@ using std::vector; TEST(EncoderTest, Response) { - Request request; - const OK response("body"); + http::Request request; + const http::OK response("body"); // Encode the response. const string encoded = HttpResponseEncoder::encode(response, request); // Now decode it back, and verify the encoding was correct. ResponseDecoder decoder; - deque<Response*> responses = decoder.decode(encoded.data(), encoded.length()); + deque<http::Response*> responses = + decoder.decode(encoded.data(), encoded.length()); + ASSERT_FALSE(decoder.failed()); ASSERT_EQ(1, responses.size()); - Response* decoded = responses[0]; + http::Response* decoded = responses[0]; EXPECT_EQ("200 OK", decoded->status); EXPECT_EQ("body", decoded->body); @@ -64,7 +68,7 @@ TEST(EncoderTest, Response) TEST(EncoderTest, AcceptableEncodings) { // Create requests that do not accept gzip encoding. - vector<Request> requests(10); + vector<http::Request> requests(10); requests[0].headers["Accept-Encoding"] = "gzip;q=0.0,*"; requests[1].headers["Accept-Encoding"] = "compress"; requests[2].headers["Accept-Encoding"] = "compress, gzip;q=0.0"; @@ -76,14 +80,14 @@ TEST(EncoderTest, AcceptableEncodings) requests[8].headers["Accept-Encoding"] = ""; requests[9].headers["Accept-Encoding"] = ","; - foreach (const Request& request, requests) { + foreach (const http::Request& request, requests) { EXPECT_FALSE(request.acceptsEncoding("gzip")) << "Gzip encoding is unacceptable for 'Accept-Encoding: " << request.headers.get("Accept-Encoding").get() << "'"; } // Create requests that accept gzip encoding. - vector<Request> gzipRequests(12); + vector<http::Request> gzipRequests(12); // Using q values. gzipRequests[0].headers["Accept-Encoding"] = "gzip;q=0.1,*"; @@ -101,7 +105,7 @@ TEST(EncoderTest, AcceptableEncodings) gzipRequests[10].headers["Accept-Encoding"] = "compress,\tgzip"; gzipRequests[11].headers["Accept-Encoding"] = "gzip"; - foreach (const Request& gzipRequest, gzipRequests) { + foreach (const http::Request& gzipRequest, gzipRequests) { EXPECT_TRUE(gzipRequest.acceptsEncoding("gzip")) << "Gzip encoding is acceptable for 'Accept-Encoding: " << gzipRequest.headers.get("Accept-Encoding").get() << "'"; http://git-wip-us.apache.org/repos/asf/mesos/blob/8ab200b4/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 38f3ad7..d13d388 100644 --- a/3rdparty/libprocess/src/tests/http_tests.cpp +++ b/3rdparty/libprocess/src/tests/http_tests.cpp @@ -40,9 +40,12 @@ #include "encoder.hpp" -using namespace process; +namespace http = process::http; +using process::Future; using process::Owned; +using process::Process; +using process::Promise; using process::http::URL; @@ -58,7 +61,6 @@ using testing::EndsWith; using testing::Invoke; using testing::Return; - class HttpProcess : public Process<HttpProcess> { public: http://git-wip-us.apache.org/repos/asf/mesos/blob/8ab200b4/3rdparty/libprocess/src/tests/io_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/tests/io_tests.cpp b/3rdparty/libprocess/src/tests/io_tests.cpp index a7135ee..56eb21b 100644 --- a/3rdparty/libprocess/src/tests/io_tests.cpp +++ b/3rdparty/libprocess/src/tests/io_tests.cpp @@ -25,10 +25,11 @@ #include "encoder.hpp" -using namespace process; +namespace io = process::io; -using std::string; +using process::Future; +using std::string; TEST(IOTest, Poll) { http://git-wip-us.apache.org/repos/asf/mesos/blob/8ab200b4/3rdparty/libprocess/src/tests/limiter_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/tests/limiter_tests.cpp b/3rdparty/libprocess/src/tests/limiter_tests.cpp index ba72250..f3ff8ae 100644 --- a/3rdparty/libprocess/src/tests/limiter_tests.cpp +++ b/3rdparty/libprocess/src/tests/limiter_tests.cpp @@ -24,7 +24,9 @@ #include <stout/duration.hpp> #include <stout/nothing.hpp> -using namespace process; +using process::Clock; +using process::Future; +using process::RateLimiter; TEST(LimiterTest, Acquire) { http://git-wip-us.apache.org/repos/asf/mesos/blob/8ab200b4/3rdparty/libprocess/src/tests/metrics_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/tests/metrics_tests.cpp b/3rdparty/libprocess/src/tests/metrics_tests.cpp index 8f15ee7..380ec6c 100644 --- a/3rdparty/libprocess/src/tests/metrics_tests.cpp +++ b/3rdparty/libprocess/src/tests/metrics_tests.cpp @@ -33,15 +33,24 @@ #include <process/metrics/metrics.hpp> #include <process/metrics/timer.hpp> -using namespace process; - -using process::http::BadRequest; -using process::http::OK; -using process::http::Response; - -using process::metrics::Counter; -using process::metrics::Gauge; -using process::metrics::Timer; +namespace http = process::http; +namespace metrics = process::metrics; + +using http::BadRequest; +using http::OK; +using http::Response; + +using metrics::Counter; +using metrics::Gauge; +using metrics::Timer; + +using process::Clock; +using process::Failure; +using process::Future; +using process::PID; +using process::Process; +using process::Statistics; +using process::UPID; using std::map; using std::string; http://git-wip-us.apache.org/repos/asf/mesos/blob/8ab200b4/3rdparty/libprocess/src/tests/mutex_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/tests/mutex_tests.cpp b/3rdparty/libprocess/src/tests/mutex_tests.cpp index 484727f..d131f48 100644 --- a/3rdparty/libprocess/src/tests/mutex_tests.cpp +++ b/3rdparty/libprocess/src/tests/mutex_tests.cpp @@ -17,7 +17,8 @@ #include <process/future.hpp> #include <process/mutex.hpp> -using namespace process; +using process::Future; +using process::Mutex; TEST(MutexTest, Lock) { http://git-wip-us.apache.org/repos/asf/mesos/blob/8ab200b4/3rdparty/libprocess/src/tests/owned_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/tests/owned_tests.cpp b/3rdparty/libprocess/src/tests/owned_tests.cpp index 3ef76b8..69fa166 100644 --- a/3rdparty/libprocess/src/tests/owned_tests.cpp +++ b/3rdparty/libprocess/src/tests/owned_tests.cpp @@ -18,7 +18,8 @@ #include <process/owned.hpp> #include <process/shared.hpp> -using namespace process; +using process::Owned; +using process::Shared; class Foo { http://git-wip-us.apache.org/repos/asf/mesos/blob/8ab200b4/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 ffd260a..e5277de 100644 --- a/3rdparty/libprocess/src/tests/process_tests.cpp +++ b/3rdparty/libprocess/src/tests/process_tests.cpp @@ -57,7 +57,30 @@ #include "encoder.hpp" -using namespace process; +namespace http = process::http; +namespace inject = process::inject; + +using process::async; +using process::Clock; +using process::defer; +using process::Deferred; +using process::Event; +using process::Executor; +using process::ExitedEvent; +using process::Failure; +using process::Future; +using process::Message; +using process::MessageEncoder; +using process::MessageEvent; +using process::Owned; +using process::PID; +using process::Process; +using process::ProcessBase; +using process::Promise; +using process::run; +using process::TerminateEvent; +using process::Time; +using process::UPID; using process::firewall::DisabledEndpointsFirewallRule; using process::firewall::FirewallRule; http://git-wip-us.apache.org/repos/asf/mesos/blob/8ab200b4/3rdparty/libprocess/src/tests/queue_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/tests/queue_tests.cpp b/3rdparty/libprocess/src/tests/queue_tests.cpp index a6a0dab..f04eb12 100644 --- a/3rdparty/libprocess/src/tests/queue_tests.cpp +++ b/3rdparty/libprocess/src/tests/queue_tests.cpp @@ -19,7 +19,8 @@ #include <process/future.hpp> #include <process/queue.hpp> -using namespace process; +using process::Future; +using process::Queue; using std::string; http://git-wip-us.apache.org/repos/asf/mesos/blob/8ab200b4/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 a844ae2..7056a9a 100644 --- a/3rdparty/libprocess/src/tests/reap_tests.cpp +++ b/3rdparty/libprocess/src/tests/reap_tests.cpp @@ -31,7 +31,9 @@ #include <stout/os/pstree.hpp> #include <stout/try.hpp> -using namespace process; +using process::Clock; +using process::Future; +using process::MAX_REAP_INTERVAL; using os::Exec; using os::Fork; http://git-wip-us.apache.org/repos/asf/mesos/blob/8ab200b4/3rdparty/libprocess/src/tests/sequence_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/tests/sequence_tests.cpp b/3rdparty/libprocess/src/tests/sequence_tests.cpp index 88de001..5911c7a 100644 --- a/3rdparty/libprocess/src/tests/sequence_tests.cpp +++ b/3rdparty/libprocess/src/tests/sequence_tests.cpp @@ -26,7 +26,11 @@ #include <stout/nothing.hpp> -using namespace process; +using process::Clock; +using process::Future; +using process::Process; +using process::Promise; +using process::Sequence; using testing::_; using testing::Return; http://git-wip-us.apache.org/repos/asf/mesos/blob/8ab200b4/3rdparty/libprocess/src/tests/shared_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/tests/shared_tests.cpp b/3rdparty/libprocess/src/tests/shared_tests.cpp index 74ea260..7d7dc5a 100644 --- a/3rdparty/libprocess/src/tests/shared_tests.cpp +++ b/3rdparty/libprocess/src/tests/shared_tests.cpp @@ -18,7 +18,9 @@ #include <process/owned.hpp> #include <process/shared.hpp> -using namespace process; +using process::Future; +using process::Owned; +using process::Shared; class Foo { http://git-wip-us.apache.org/repos/asf/mesos/blob/8ab200b4/3rdparty/libprocess/src/tests/ssl_client.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/tests/ssl_client.cpp b/3rdparty/libprocess/src/tests/ssl_client.cpp index 9ae59e5..f5bdf75 100644 --- a/3rdparty/libprocess/src/tests/ssl_client.cpp +++ b/3rdparty/libprocess/src/tests/ssl_client.cpp @@ -29,8 +29,13 @@ #include "openssl.hpp" -using namespace process; -using namespace process::network; +namespace network = process::network; +namespace openssl = network::openssl; + +using network::Address; +using network::Socket; + +using process::Future; using std::cout; using std::endl; http://git-wip-us.apache.org/repos/asf/mesos/blob/8ab200b4/3rdparty/libprocess/src/tests/ssl_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/tests/ssl_tests.cpp b/3rdparty/libprocess/src/tests/ssl_tests.cpp index ee30a02..9254297 100644 --- a/3rdparty/libprocess/src/tests/ssl_tests.cpp +++ b/3rdparty/libprocess/src/tests/ssl_tests.cpp @@ -35,8 +35,17 @@ using std::vector; // We only run these tests if we have configured with '--enable-ssl'. #ifdef USE_SSL_SOCKET -using namespace process; -using namespace process::network; +namespace http = process::http; +namespace io = process::io; +namespace network = process::network; +namespace openssl = network::openssl; + +using network::Address; +using network::Socket; + +using process::Failure; +using process::Future; +using process::Subprocess; // Wait for a subprocess and test the status code for the following http://git-wip-us.apache.org/repos/asf/mesos/blob/8ab200b4/3rdparty/libprocess/src/tests/statistics_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/tests/statistics_tests.cpp b/3rdparty/libprocess/src/tests/statistics_tests.cpp index 657d27a..a95ae43 100644 --- a/3rdparty/libprocess/src/tests/statistics_tests.cpp +++ b/3rdparty/libprocess/src/tests/statistics_tests.cpp @@ -20,8 +20,10 @@ #include <stout/duration.hpp> #include <stout/gtest.hpp> -using namespace process; - +using process::Clock; +using process::Statistics; +using process::Time; +using process::TimeSeries; TEST(StatisticsTest, Empty) { http://git-wip-us.apache.org/repos/asf/mesos/blob/8ab200b4/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 25d4a7b..ac600a5 100644 --- a/3rdparty/libprocess/src/tests/subprocess_tests.cpp +++ b/3rdparty/libprocess/src/tests/subprocess_tests.cpp @@ -37,7 +37,12 @@ #include <stout/tests/utils.hpp> -using namespace process; +namespace io = process::io; + +using process::Clock; +using process::subprocess; +using process::Subprocess; +using process::MAX_REAP_INTERVAL; using std::map; using std::string; http://git-wip-us.apache.org/repos/asf/mesos/blob/8ab200b4/3rdparty/libprocess/src/tests/system_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/tests/system_tests.cpp b/3rdparty/libprocess/src/tests/system_tests.cpp index 25436ea..c5436f7 100644 --- a/3rdparty/libprocess/src/tests/system_tests.cpp +++ b/3rdparty/libprocess/src/tests/system_tests.cpp @@ -27,7 +27,9 @@ #include <stout/gtest.hpp> -using namespace process; +namespace http = process::http; + +using process::Future; using process::metrics::internal::MetricsProcess; http://git-wip-us.apache.org/repos/asf/mesos/blob/8ab200b4/3rdparty/libprocess/src/tests/time_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/tests/time_tests.cpp b/3rdparty/libprocess/src/tests/time_tests.cpp index 60791ff..07b6d46 100644 --- a/3rdparty/libprocess/src/tests/time_tests.cpp +++ b/3rdparty/libprocess/src/tests/time_tests.cpp @@ -23,8 +23,10 @@ #include <stout/gtest.hpp> #include <stout/os.hpp> -using namespace process; - +using process::Clock; +using process::RFC1123; +using process::RFC3339; +using process::Time; TEST(TimeTest, Arithmetic) { http://git-wip-us.apache.org/repos/asf/mesos/blob/8ab200b4/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 ec6f486..6cb7069 100644 --- a/3rdparty/libprocess/src/tests/timeseries_tests.cpp +++ b/3rdparty/libprocess/src/tests/timeseries_tests.cpp @@ -21,8 +21,9 @@ #include <stout/gtest.hpp> #include <stout/list.hpp> -using namespace process; - +using process::Clock; +using process::Time; +using process::TimeSeries; List<int> toList(const TimeSeries<int>& series) {
