You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2013/08/13 21:50:04 UTC

[20/23] git commit: Fixed issues from cherry-picks for 0.13.0-rc4.

Fixed issues from cherry-picks for 0.13.0-rc4.


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5c19b044
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5c19b044
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5c19b044

Branch: refs/heads/vinod/0.13.0
Commit: 5c19b044a6d8d7b0f24c219965b3b7ab8674d7ba
Parents: d6e399a
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Fri Jul 12 16:36:24 2013 -0700
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Fri Jul 12 16:36:24 2013 -0700

----------------------------------------------------------------------
 .../libprocess/3rdparty/stout/include/stout/stopwatch.hpp |  9 ++++++++-
 3rdparty/libprocess/src/process.cpp                       | 10 +++-------
 2 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/5c19b044/3rdparty/libprocess/3rdparty/stout/include/stout/stopwatch.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/stopwatch.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/stopwatch.hpp
index bcff8c6..97e3469 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/stopwatch.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/stopwatch.hpp
@@ -15,7 +15,14 @@
 class Stopwatch
 {
 public:
-  Stopwatch() : running(false) { started.tv_sec = 0; started.tv_nsec = 0; }
+  Stopwatch()
+    : running(false)
+  {
+    started.tv_sec = 0;
+    started.tv_nsec = 0;
+    stopped.tv_sec = 0;
+    stopped.tv_nsec = 0;
+  }
 
   void start()
   {

http://git-wip-us.apache.org/repos/asf/mesos/blob/5c19b044/3rdparty/libprocess/src/process.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/process.cpp b/3rdparty/libprocess/src/process.cpp
index 373097c..5ae3a80 100644
--- a/3rdparty/libprocess/src/process.cpp
+++ b/3rdparty/libprocess/src/process.cpp
@@ -301,10 +301,9 @@ class Route
 {
 public:
   Route(const string& name,
-        const Option<string>& help,
         const lambda::function<Future<Response>(const Request&)>& handler)
   {
-    process = new RouteProcess(name, help, handler);
+    process = new RouteProcess(name, handler);
     spawn(process);
   }
 
@@ -320,16 +319,14 @@ private:
   public:
     RouteProcess(
         const string& name,
-        const Option<string>& _help,
         const lambda::function<Future<Response>(const Request&)>& _handler)
       : ProcessBase(strings::remove(name, "/", strings::PREFIX)),
-        help(_help),
         handler(_handler) {}
 
   protected:
     virtual void initialize()
     {
-      route("/", help, &RouteProcess::handle);
+      route("/", &RouteProcess::handle);
     }
 
     Future<Response> handle(const Request& request)
@@ -337,7 +334,6 @@ private:
       return handler(request);
     }
 
-    const Option<string> help;
     const lambda::function<Future<Response>(const Request&)> handler;
   };
 
@@ -1475,7 +1471,7 @@ void initialize(const string& delegate)
   lambda::function<Future<Response>(const Request&)> __processes__ =
     lambda::bind(&ProcessManager::__processes__, process_manager, lambda::_1);
 
-  new Route("/__processes__", None(), __processes__);
+  new Route("/__processes__", __processes__);
 
   char temp[INET_ADDRSTRLEN];
   if (inet_ntop(AF_INET, (in_addr*) &__ip__, temp, INET_ADDRSTRLEN) == NULL) {