You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by me...@apache.org on 2014/07/31 22:09:17 UTC
[2/5] git commit: Fixed 3rdparty libprocess todo and namespace style
Fixed 3rdparty libprocess todo and namespace style
Review: https://reviews.apache.org/r/23597
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0e89e6db
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0e89e6db
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0e89e6db
Branch: refs/heads/master
Commit: 0e89e6db2565174c78e4059cfab582bafa4d84dd
Parents: ee27f04
Author: Timothy Chen <tn...@apache.org>
Authored: Thu Jul 31 11:49:17 2014 -0700
Committer: Adam B <ad...@mesosphere.io>
Committed: Thu Jul 31 12:22:32 2014 -0700
----------------------------------------------------------------------
3rdparty/libprocess/include/process/event.hpp | 2 +-
3rdparty/libprocess/include/process/metrics/timer.hpp | 4 ++--
3rdparty/libprocess/include/process/protobuf.hpp | 3 ++-
3rdparty/libprocess/include/process/tuples/tuples.hpp | 3 ++-
3rdparty/libprocess/src/decoder.hpp | 5 +++--
3rdparty/libprocess/src/process.cpp | 6 +++---
6 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/0e89e6db/3rdparty/libprocess/include/process/event.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/event.hpp b/3rdparty/libprocess/include/process/event.hpp
index 3c860f4..bf689d7 100644
--- a/3rdparty/libprocess/include/process/event.hpp
+++ b/3rdparty/libprocess/include/process/event.hpp
@@ -200,6 +200,6 @@ private:
TerminateEvent& operator = (const TerminateEvent&);
};
-} // namespace event {
+} // namespace process {
#endif // __PROCESS_EVENT_HPP__
http://git-wip-us.apache.org/repos/asf/mesos/blob/0e89e6db/3rdparty/libprocess/include/process/metrics/timer.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/metrics/timer.hpp b/3rdparty/libprocess/include/process/metrics/timer.hpp
index 0b253aa..dfd7dd9 100644
--- a/3rdparty/libprocess/include/process/metrics/timer.hpp
+++ b/3rdparty/libprocess/include/process/metrics/timer.hpp
@@ -113,7 +113,7 @@ private:
memory::shared_ptr<Data> data;
};
-} // namespace metrics
-} // namespace process
+} // namespace metrics {
+} // namespace process {
#endif // __PROCESS_METRICS_TIMER_HPP__
http://git-wip-us.apache.org/repos/asf/mesos/blob/0e89e6db/3rdparty/libprocess/include/process/protobuf.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/protobuf.hpp b/3rdparty/libprocess/include/process/protobuf.hpp
index a232107..f3190f6 100644
--- a/3rdparty/libprocess/include/process/protobuf.hpp
+++ b/3rdparty/libprocess/include/process/protobuf.hpp
@@ -72,7 +72,8 @@ std::vector<T> convert(const google::protobuf::RepeatedPtrField<T>& items)
return result;
}
-}} // namespace google { namespace protobuf {
+} // namespace protobuf {
+} // namespace google {
template <typename T>
http://git-wip-us.apache.org/repos/asf/mesos/blob/0e89e6db/3rdparty/libprocess/include/process/tuples/tuples.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/tuples/tuples.hpp b/3rdparty/libprocess/include/process/tuples/tuples.hpp
index ac1198e..f993b01 100644
--- a/3rdparty/libprocess/include/process/tuples/tuples.hpp
+++ b/3rdparty/libprocess/include/process/tuples/tuples.hpp
@@ -149,7 +149,8 @@ struct deserializer
};
-}} // namespace process { namespace tuples {
+} // namespace tuples {
+} // namespace process {
#endif // __PROCESS_TUPLES_HPP__
http://git-wip-us.apache.org/repos/asf/mesos/blob/0e89e6db/3rdparty/libprocess/src/decoder.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/decoder.hpp b/3rdparty/libprocess/src/decoder.hpp
index c329882..b66f378 100644
--- a/3rdparty/libprocess/src/decoder.hpp
+++ b/3rdparty/libprocess/src/decoder.hpp
@@ -18,7 +18,8 @@
// TODO(bmahler): Upgrade our http_parser to the latest version.
namespace process {
-// TODO: Make DataDecoder abstract and make RequestDecoder a concrete subclass.
+// TODO(benh): Make DataDecoder abstract and make RequestDecoder a
+// concrete subclass.
class DataDecoder
{
public:
@@ -196,7 +197,7 @@ private:
if (url.field_set & (1 << UF_QUERY)) {
decoder->query.append(
- data + url.field_data[UF_QUERY].off,
+ data + url.field_data[UF_QUERY].off,
url.field_data[UF_QUERY].len);
}
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/0e89e6db/3rdparty/libprocess/src/process.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/process.cpp b/3rdparty/libprocess/src/process.cpp
index 0c0fca7..6f6f3f9 100644
--- a/3rdparty/libprocess/src/process.cpp
+++ b/3rdparty/libprocess/src/process.cpp
@@ -2820,7 +2820,7 @@ void ProcessManager::cleanup(ProcessBase* process)
CHECK(process->events.empty());
processes.erase(process->pid.id);
-
+
// Lookup gate to wake up waiting threads.
map<ProcessBase*, Gate*>::iterator it = gates.find(process);
if (it != gates.end()) {
@@ -3009,7 +3009,7 @@ void ProcessManager::enqueue(ProcessBase* process)
CHECK(find(runq.begin(), runq.end(), process) == runq.end());
runq.push_back(process);
}
-
+
// Wake up the processing thread if necessary.
gate->open();
}
@@ -4073,7 +4073,7 @@ void ____splice(
}
#endif // __cplusplus >= 201103L
-} // namespace internal
+} // namespace internal {
Future<string> read(int fd)