You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/04/20 23:32:01 UTC
[1/3] mesos git commit: Fixed typos in comments/docs in stout.
Repository: mesos
Updated Branches:
refs/heads/master d2d44d5e8 -> e20677f3b
Fixed typos in comments/docs in stout.
Review: https://reviews.apache.org/r/46440/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ffa644ec
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ffa644ec
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ffa644ec
Branch: refs/heads/master
Commit: ffa644eccc6eb4b0b318385384d54f7037f7aeb9
Parents: d2d44d5
Author: Neil Conway <ne...@gmail.com>
Authored: Wed Apr 20 14:31:47 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Apr 20 14:31:47 2016 -0700
----------------------------------------------------------------------
3rdparty/libprocess/3rdparty/stout/README.md | 18 +++++++++---------
.../3rdparty/stout/include/stout/flags/flags.hpp | 3 +--
2 files changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/ffa644ec/3rdparty/libprocess/3rdparty/stout/README.md
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/README.md b/3rdparty/libprocess/3rdparty/stout/README.md
index 7fd1367..45dd8f3 100644
--- a/3rdparty/libprocess/3rdparty/stout/README.md
+++ b/3rdparty/libprocess/3rdparty/stout/README.md
@@ -40,7 +40,7 @@ Note that the library is designed to completely avoid exceptions. See [exception
## `Option`, `Some`, and `None`
-The `Option` type provides a safe alternative to using `NULL`. An `Option` can be constructed explicitely or implicitely:
+The `Option` type provides a safe alternative to using `NULL`. An `Option` can be constructed explicitly or implicitly:
~~~{.cpp}
Option<bool> o(true);
@@ -93,7 +93,7 @@ Similar to `None`, the `Some` type can be used to construct an `Option` as well.
## `Try`, `Result`, and `Error`
-A `Try` provides a mechanism to return a value or an error without throwing exceptions. Like `Option`, you can explicitely or implicitely construct a `Try`:
+A `Try` provides a mechanism to return a value or an error without throwing exceptions. Like `Option`, you can explicitly or implicitly construct a `Try`:
~~~{.cpp}
Try<bool> t(true);
@@ -110,7 +110,7 @@ You can check if a value is present using `Try::isSome()` and `Try::isError()` a
}
~~~
-A `Result` is a combination of a `Try` and an `Option`; you can think of a `Result` as semantically being equivalant to `Try<Option<T>>`. In addition to `isSome()` and `isError()` a `Result` includes `isNone()`.
+A `Result` is a combination of a `Try` and an `Option`; you can think of a `Result` as semantically being equivalent to `Try<Option<T>>`. In addition to `isSome()` and `isError()` a `Result` includes `isNone()`.
The `Error` type acts as "syntactic sugar" for implicitly constructing a `Try` or `Result`. For example:
@@ -261,7 +261,7 @@ std::cout << jsonify(customer);
// prints: {"first name":"michael","last name":"park","age":25}
~~~
-`jsonify(const F&)` overload takes a function object `F` that takes a pointer to writer. This is useful in cases where we don't want to define a public `json` function out-ouf-line.
+`jsonify(const F&)` overload takes a function object `F` that takes a pointer to writer. This is useful in cases where we don't want to define a public `json` function out-of-line.
~~~{.cpp}
namespace store {
@@ -314,7 +314,7 @@ Most of the ways to get or set information about files requires complicated call
#### Processes
-There are some fairly extensive abstractions around getting process information from the operating system. There is an `os::Process` type that gets provided by utiltiies like `os::processes`. You can construct an arbitrary fork/exec process tree by constructing an `os::Fork`, get all the processes in a process tree using `os::pstree`, and kill all the processes in a process tree using `os::killtree` (the latter is similar to the shell command `kill` but strictly more powerful in that it can walk a process tree, following groups and sessions if requested).
+There are some fairly extensive abstractions around getting process information from the operating system. There is an `os::Process` type that gets provided by utilities like `os::processes`. You can construct an arbitrary fork/exec process tree by constructing an `os::Fork`, get all the processes in a process tree using `os::pstree`, and kill all the processes in a process tree using `os::killtree` (the latter is similar to the shell command `kill` but strictly more powerful in that it can walk a process tree, following groups and sessions if requested).
#### `sysctl`
@@ -338,7 +338,7 @@ There are a handful of wrappers that make working with signals easier, including
## `path::`
-The `path` namespace provides the `path::join` function for joining toghether filesystem paths. Additionally to the `path` namespace there also exists the class `Path`. `Path` provides `basename()` and `dirname()` as thread safe replacements for standard `::basename()` and `::dirname()`.
+The `path` namespace provides the `path::join` function for joining together filesystem paths. Additionally to the `path` namespace there also exists the class `Path`. `Path` provides `basename()` and `dirname()` as thread safe replacements for standard `::basename()` and `::dirname()`.
<a href="proc"></a>
@@ -425,7 +425,7 @@ You can load flags from the environment in addition to `argc` and `argv` by spec
Try<Nothing> load = flags.load("PREFIX_", argc, argv);
~~~
-Then both PREFIX_foo and PREFIX_bar will be loaded from the environemnt as well as possibly from on the command line.
+Then both PREFIX_foo and PREFIX_bar will be loaded from the environment as well as possibly from on the command line.
There are various ways to deal with unknown flags (i.e., `--baz` in our example above) and duplicates (i.e., `--foo` on the command line twice or once in the environment and once on the command line). See the header files for the various `load` overloads.
@@ -451,7 +451,7 @@ Finally, there is a `cache` implementation (also requires Boost) that provides a
## Miscellaneous
-There are a handful of types and utilties that fall into the miscellaneous category. Note that like the collections _these are not namespaced_.
+There are a handful of types and utilities that fall into the miscellaneous category. Note that like the collections _these are not namespaced_.
#### `Bytes`
@@ -606,7 +606,7 @@ You'll notice that the library is designed in a way that can lead to a
lot of copying. This decision was deliberate. Capturing the semantics
of pointer ownership is hard to enforce programmatically unless you
copy, and in many instances these copies can be elided by an
-optimizing compiler. We've choosen safety rather than premature
+optimizing compiler. We've chosen safety rather than premature
optimizations.
Note, however, that we plan to liberally augment the library as we add
http://git-wip-us.apache.org/repos/asf/mesos/blob/ffa644ec/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 3e43c01..c3cbcdb 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/flags/flags.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/flags/flags.hpp
@@ -391,8 +391,7 @@ void FlagsBase::add(
// use the correct instance of FlagsBase. In other words, we can't
// capture 'this' here because it's possible that the FlagsBase
// object that we're working with when we invoke FlagsBase::add is
- // not the same instance as 'this' when the these lambdas get
- // invoked.
+ // not the same instance as 'this' when these lambdas get invoked.
flag.load = [t1](FlagsBase* base, const std::string& value) -> Try<Nothing> {
Flags* flags = dynamic_cast<Flags*>(base);
[3/3] mesos git commit: Fixed typos in comments.
Posted by ji...@apache.org.
Fixed typos in comments.
Review: https://reviews.apache.org/r/46442/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e20677f3
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e20677f3
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e20677f3
Branch: refs/heads/master
Commit: e20677f3b5937a0b136c8a5ab0260a20890624b2
Parents: 6ce84cf
Author: Neil Conway <ne...@gmail.com>
Authored: Wed Apr 20 14:31:54 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Apr 20 14:31:54 2016 -0700
----------------------------------------------------------------------
src/master/contender/zookeeper.cpp | 2 +-
src/slave/containerizer/docker.hpp | 12 ++++++------
.../mesos/provisioner/backends/overlay.cpp | 2 +-
src/slave/status_update_manager.cpp | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/e20677f3/src/master/contender/zookeeper.cpp
----------------------------------------------------------------------
diff --git a/src/master/contender/zookeeper.cpp b/src/master/contender/zookeeper.cpp
index 61766ca..6c9305c 100644
--- a/src/master/contender/zookeeper.cpp
+++ b/src/master/contender/zookeeper.cpp
@@ -50,7 +50,7 @@ public:
explicit ZooKeeperMasterContenderProcess(Owned<zookeeper::Group> group);
virtual ~ZooKeeperMasterContenderProcess();
- // Explicitely use 'initialize' since we're overloading below.
+ // Explicitly use 'initialize' since we're overloading below.
using process::ProcessBase::initialize;
void initialize(const MasterInfo& masterInfo);
http://git-wip-us.apache.org/repos/asf/mesos/blob/e20677f3/src/slave/containerizer/docker.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/docker.hpp b/src/slave/containerizer/docker.hpp
index 18c15a5..fac26a2 100644
--- a/src/slave/containerizer/docker.hpp
+++ b/src/slave/containerizer/docker.hpp
@@ -38,14 +38,14 @@ namespace slave {
// created by Mesos from those created manually.
extern const std::string DOCKER_NAME_PREFIX;
-// Seperator used to compose docker container name, which is made up
+// Separator used to compose docker container name, which is made up
// of slave ID and container ID.
extern const std::string DOCKER_NAME_SEPERATOR;
// Directory that stores all the symlinked sandboxes that is mapped
// into Docker containers. This is a relative directory that will
// joined with the slave path. Only sandbox paths that contains a
-// colon will be symlinked due to the limiitation of the Docker CLI.
+// colon will be symlinked due to the limitation of the Docker CLI.
extern const std::string DOCKER_SYMLINK_DIRECTORY;
@@ -397,7 +397,7 @@ private:
return executor.container().docker().force_pull_image();
}
- // The DockerContainerier needs to be able to properly clean up
+ // The DockerContainerizer needs to be able to properly clean up
// Docker containers, regardless of when they are destroyed. For
// example, if a container gets destroyed while we are fetching,
// we need to not keep running the fetch, nor should we try and
@@ -411,10 +411,10 @@ private:
// DESTROYING
//
// In particular, we made 'PULLING' be it's own state so that we
- // could easily destroy and cleanup when a user initiated pulling
+ // can easily destroy and cleanup when a user initiated pulling
// a really big image but we timeout due to the executor
- // registration timeout. Since we curently have no way to discard
- // a Docker::run, we needed to explicitely do the pull (which is
+ // registration timeout. Since we currently have no way to discard
+ // a Docker::run, we needed to explicitly do the pull (which is
// the part that takes the longest) so that we can also explicitly
// kill it when asked. Once the functions at Docker::* get support
// for discarding, then we won't need to make pull be it's own
http://git-wip-us.apache.org/repos/asf/mesos/blob/e20677f3/src/slave/containerizer/mesos/provisioner/backends/overlay.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/provisioner/backends/overlay.cpp b/src/slave/containerizer/mesos/provisioner/backends/overlay.cpp
index ebe1fc5..86abf28 100644
--- a/src/slave/containerizer/mesos/provisioner/backends/overlay.cpp
+++ b/src/slave/containerizer/mesos/provisioner/backends/overlay.cpp
@@ -153,7 +153,7 @@ Future<Nothing> OverlayBackendProcess::provision(
// For overlayfs, the specified lower directories will be stacked
// beginning from the rightmost one and going left. But we need the
- // first layer in the vector to be the the bottom most layer.
+ // first layer in the vector to be the bottom most layer.
string options = "lowerdir=" + strings::join(":", adaptor::reverse(layers));
options += ",upperdir=" + upperdir;
options += ",workdir=" + workdir;
http://git-wip-us.apache.org/repos/asf/mesos/blob/e20677f3/src/slave/status_update_manager.cpp
----------------------------------------------------------------------
diff --git a/src/slave/status_update_manager.cpp b/src/slave/status_update_manager.cpp
index d616fd4..f3b4767 100644
--- a/src/slave/status_update_manager.cpp
+++ b/src/slave/status_update_manager.cpp
@@ -70,7 +70,7 @@ public:
StatusUpdateManagerProcess(const Flags& flags);
virtual ~StatusUpdateManagerProcess();
- // Explicitely use 'initialize' since we're overloading below.
+ // Explicitly use 'initialize' since we're overloading below.
using process::ProcessBase::initialize;
// StatusUpdateManager implementation.
[2/3] mesos git commit: Fixed typos in comments in libprocess.
Posted by ji...@apache.org.
Fixed typos in comments in libprocess.
Review: https://reviews.apache.org/r/46441/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6ce84cf2
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6ce84cf2
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6ce84cf2
Branch: refs/heads/master
Commit: 6ce84cf2492c7487d37a8f7f4dbf9c19602f7fc2
Parents: ffa644e
Author: Neil Conway <ne...@gmail.com>
Authored: Wed Apr 20 14:31:51 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Apr 20 14:31:51 2016 -0700
----------------------------------------------------------------------
3rdparty/libprocess/3rdparty/Makefile.am | 2 +-
3rdparty/libprocess/include/process/defer.hpp | 4 ++--
3rdparty/libprocess/include/process/deferred.hpp | 4 ++--
3rdparty/libprocess/include/process/subprocess.hpp | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/6ce84cf2/3rdparty/libprocess/3rdparty/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/Makefile.am b/3rdparty/libprocess/3rdparty/Makefile.am
index 9cb3098..f7aa579 100644
--- a/3rdparty/libprocess/3rdparty/Makefile.am
+++ b/3rdparty/libprocess/3rdparty/Makefile.am
@@ -134,7 +134,7 @@ if OS_FREEBSD
endif
if WITH_BUNDLED_GLOG
-# NOTE: We explicitely set GTEST_CONFIG=no so that we don't attempt to
+# NOTE: We explicitly set GTEST_CONFIG=no so that we don't attempt to
# build glog against a system installed gtest (there's no reason to
# "test" glog and it's highly likely it will cause a compilation bug
# when building with clang).
http://git-wip-us.apache.org/repos/asf/mesos/blob/6ce84cf2/3rdparty/libprocess/include/process/defer.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/defer.hpp b/3rdparty/libprocess/include/process/defer.hpp
index 6bb79cd..8fb4f3f 100644
--- a/3rdparty/libprocess/include/process/defer.hpp
+++ b/3rdparty/libprocess/include/process/defer.hpp
@@ -56,7 +56,7 @@ Deferred<void()> defer(const Process<T>* process, void (T::*method)())
// with variadic templates and lambdas, we still need to do
// preprocessor expansions. In addition, due to a bug with clang (or
// libc++) we can't use std::bind with a std::function so we have to
-// explicitely use the std::function<R(P...)>::operator() (see
+// explicitly use the std::function<R(P...)>::operator() (see
// http://stackoverflow.com/questions/20097616/stdbind-to-a-stdfunction-crashes-with-clang).
#define TEMPLATE(Z, N, DATA) \
template <typename T, \
@@ -165,7 +165,7 @@ Deferred<Future<R>()> defer(const Process<T>* process, Future<R> (T::*method)())
#undef TEMPLATE
-// Finaly, definitions of defer for methods returning a value:
+// Finally, definitions of defer for methods returning a value:
template <typename R, typename T>
Deferred<Future<R>()> defer(const PID<T>& pid, R (T::*method)())
http://git-wip-us.apache.org/repos/asf/mesos/blob/6ce84cf2/3rdparty/libprocess/include/process/deferred.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/deferred.hpp b/3rdparty/libprocess/include/process/deferred.hpp
index eb4739c..18ba979 100644
--- a/3rdparty/libprocess/include/process/deferred.hpp
+++ b/3rdparty/libprocess/include/process/deferred.hpp
@@ -51,7 +51,7 @@ private:
};
-// We need an intermeidate "deferred" type because when constructing a
+// We need an intermediate "deferred" type because when constructing a
// Deferred we won't always know the underlying function type (for
// example, if we're being passed a std::bind or a lambda). A lambda
// won't always implicitly convert to a std::function so instead we
@@ -139,7 +139,7 @@ struct _Deferred
// with variadic templates and lambdas, we still need to do
// preprocessor expansions. In addition, due to a bug with clang (or
// libc++) we can't use std::bind with a std::function so we have to
- // explicitely use the std::function<R(P...)>::operator() (see
+ // explicitly use the std::function<R(P...)>::operator() (see
// http://stackoverflow.com/questions/20097616/stdbind-to-a-stdfunction-crashes-with-clang).
#define TEMPLATE(Z, N, DATA) \
template <ENUM_PARAMS(N, typename P)> \
http://git-wip-us.apache.org/repos/asf/mesos/blob/6ce84cf2/3rdparty/libprocess/include/process/subprocess.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/subprocess.hpp b/3rdparty/libprocess/include/process/subprocess.hpp
index 8a3fe55..6ce1a82 100644
--- a/3rdparty/libprocess/include/process/subprocess.hpp
+++ b/3rdparty/libprocess/include/process/subprocess.hpp
@@ -67,7 +67,7 @@ public:
* Describes how the I/O is redirected for stdin/stdout/stderr.
* One of the following three modes are supported:
* 1. PIPE: Redirect to a pipe. The pipe will be created when
- * launching a subprocess and the the user can read/write the
+ * launching a subprocess and the user can read/write the
* parent side of the pipe using `Subprocess::in/out/err`.
* 2. PATH: Redirect to a file. For stdout/stderr, the file will
* be created if it does not exist. If the file exists, it