Merge branch 'devel' into master

rizsotto · rizsotto · commit 017d5d9f2a31 · 2020-12-12T20:18:45.000+11:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -58,8 +58,6 @@ ExternalProject_Add(BearSource
             -DROOT_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
             -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
             -DENABLE_UNIT_TESTS:BOOL=${ENABLE_UNIT_TESTS}
-        BUILD_ALWAYS
-            1
         TEST_BEFORE_INSTALL
             1
         TEST_COMMAND
diff --git a/source/bear/main.cc b/source/bear/main.cc
@@ -38,7 +38,6 @@ namespace {
     constexpr std::optional<std::string_view> ADVANCED_GROUP = { "advanced options" };
     constexpr std::optional<std::string_view> DEVELOPER_GROUP = { "developer options" };
 
-    constexpr char VERBOSE[] = "--verbose";
     constexpr char APPEND[] = "--append";
     constexpr char OUTPUT[] = "--output";
     constexpr char CITNAMES[] = "--citnames";
@@ -96,7 +95,7 @@ namespace {
         auto library = arguments.as_string(LIBRARY);
         auto executor = arguments.as_string(EXECUTOR);
         auto wrapper = arguments.as_string(WRAPPER);
-        auto verbose = arguments.as_bool(VERBOSE).unwrap_or(false);
+        auto verbose = arguments.as_bool(flags::VERBOSE).unwrap_or(false);
         auto force_wrapper = arguments.as_bool(FORCE_WRAPPER).unwrap_or(false);
         auto force_preload = arguments.as_bool(FORCE_PRELOAD).unwrap_or(false);
 
@@ -136,7 +135,7 @@ namespace {
         auto program = arguments.as_string(CITNAMES);
         auto output = arguments.as_string(OUTPUT);
         auto append = arguments.as_bool(APPEND).unwrap_or(false);
-        auto verbose = arguments.as_bool(VERBOSE).unwrap_or(false);
+        auto verbose = arguments.as_bool(flags::VERBOSE).unwrap_or(false);
         auto include = arguments.as_string_list(INCLUDE).unwrap_or({});
         auto exclude = arguments.as_string_list(EXCLUDE).unwrap_or({});
 
@@ -170,14 +169,6 @@ namespace {
                 });
     }
 
-    void remove_commands_file(const fs::path &commands) {
-        std::error_code error_code;
-        auto removed = fs::remove(commands, error_code);
-        if (!removed) {
-            spdlog::debug("remove command file failed: {}", commands.c_str());
-        }
-    }
-
     rust::Result<int> run(const flags::Arguments& arguments, const sys::env::Vars& environment)
     {
         auto commands = arguments.as_string(OUTPUT)
@@ -193,8 +184,12 @@ namespace {
                 .and_then<int>([&commands](auto tuple) {
                     const auto& [intercept, citnames] = tuple;
                     auto result = execute(intercept, "intercept");
-                    execute(citnames, "citnames");
-                    remove_commands_file(commands);
+
+                    std::error_code error_code;
+                    if (fs::exists(commands, error_code)) {
+                        execute(citnames, "citnames");
+                        fs::remove(commands, error_code);
+                    }
                     return result;
                 });
     }
@@ -206,8 +201,7 @@ int main(int argc, char* argv[], char* envp[])
     spdlog::set_pattern("bear: %v [pid: %P]");
     spdlog::set_level(spdlog::level::info);
 
-    const flags::Parser parser("bear", VERSION,
-                               { { VERBOSE, { 0, false,"run the interception verbose", std::nullopt, std::nullopt } },
+    const flags::Parser parser("bear", VERSION,{
                                  { OUTPUT, { 1, false, "path of the result file", { "compile_commands.json" }, std::nullopt } },
                                  { APPEND, { 0, false, "append result to an existing output file", std::nullopt, ADVANCED_GROUP } },
                                  { INCLUDE, { 1, false, "directory where from source file shall be in the output", std::nullopt, ADVANCED_GROUP } },
@@ -219,11 +213,12 @@ int main(int argc, char* argv[], char* envp[])
                                  { WRAPPER, { 1, false, "path to the wrapper directory", { WRAPPER_DEFAULT_PATH }, DEVELOPER_GROUP } },
                                  { CITNAMES, { 1, false, "path to the citnames executable", { CITNAMES_DEFAULT_PATH }, DEVELOPER_GROUP } },
                                  { INTERCEPT, { 1, false, "path to the intercept executable", { INTERCEPT_DEFAULT_PATH }, DEVELOPER_GROUP } },
-                                 { COMMAND, { -1, true, "command to execute", std::nullopt, std::nullopt } } });
+                                 { COMMAND, { -1, true, "command to execute", std::nullopt, std::nullopt } }
+    });
     return parser.parse_or_exit(argc, const_cast<const char**>(argv))
             // change the log verbosity if requested.
             .on_success([&argv, &envp](const auto& args) {
-                if (args.as_bool(VERBOSE).unwrap_or(false)) {
+                if (args.as_bool(flags::VERBOSE).unwrap_or(false)) {
                     spdlog::set_pattern("[%H:%M:%S.%f, br, %P] %v");
                     spdlog::set_level(spdlog::level::debug);
                 }
diff --git a/source/citnames/main.cc b/source/citnames/main.cc
@@ -53,8 +53,7 @@ int main(int argc, char* argv[], char* envp[])
     spdlog::set_pattern("citnames: %v");
     spdlog::set_level(spdlog::level::info);
 
-    const flags::Parser parser("citnames", VERSION,
-                               { { cs::Application::VERBOSE, { 0, false, "run the application verbose", std::nullopt, std::nullopt } },
+    const flags::Parser parser("citnames", VERSION,{
                                  { cs::Application::INPUT, { 1, false, "path of the input file", { "commands.json" }, std::nullopt } },
                                  { cs::Application::OUTPUT, { 1, false, "path of the result file", { "compile_commands.json" }, std::nullopt } },
                                  { cs::Application::CONFIG, { 1, false, "path of the config file", std::nullopt, std::nullopt } },
@@ -66,7 +65,7 @@ int main(int argc, char* argv[], char* envp[])
     return parser.parse_or_exit(argc, const_cast<const char**>(argv))
             // change the log verbosity if requested.
             .on_success([&argv, &envp](const auto& args) {
-                if (args.as_bool(cs::Application::VERBOSE).unwrap_or(false)) {
+                if (args.as_bool(flags::VERBOSE).unwrap_or(false)) {
                     spdlog::set_pattern("[%H:%M:%S.%f, cs, %P] %v");
                     spdlog::set_level(spdlog::level::debug);
                 }
diff --git a/source/citnames/source/Application.h b/source/citnames/source/Application.h
@@ -27,7 +27,6 @@ namespace cs {
 
     class Application {
     public:
-        static constexpr char VERBOSE[] = "--verbose";
         static constexpr char INPUT[] = "--input";
         static constexpr char OUTPUT[] = "--output";
         static constexpr char INCLUDE[] = "--include";
diff --git a/source/intercept/source/collect/Application.cc b/source/intercept/source/collect/Application.cc
@@ -103,7 +103,7 @@ namespace ic {
         auto server = grpc::ServerBuilder()
                           .RegisterService(&supervisor)
                           .RegisterService(&interceptor)
-                          .AddListeningPort("0.0.0.0:0", grpc::InsecureServerCredentials(), &port)
+                          .AddListeningPort("127.0.0.1:0", grpc::InsecureServerCredentials(), &port)
                           .BuildAndStart();
 
         std::string server_address = fmt::format("0.0.0.0:{}", port);
diff --git a/source/intercept/source/collect/Application.h b/source/intercept/source/collect/Application.h
@@ -29,7 +29,6 @@ namespace ic {
 
     class Application {
     public:
-        static constexpr char VERBOSE[] = "--verbose";
         static constexpr char OUTPUT[] = "--output";
         static constexpr char LIBRARY[] = "--library";
         static constexpr char EXECUTOR[] = "--executor";
diff --git a/source/intercept/source/collect/SessionLibrary.cc b/source/intercept/source/collect/SessionLibrary.cc
@@ -57,7 +57,7 @@ namespace ic {
 
     rust::Result<Session::SharedPtr> LibraryPreloadSession::from(const flags::Arguments& args, const char **envp)
     {
-        auto verbose = args.as_bool(ic::Application::VERBOSE).unwrap_or(false);
+        auto verbose = args.as_bool(flags::VERBOSE).unwrap_or(false);
         auto library = args.as_string(ic::Application::LIBRARY);
         auto executor = args.as_string(ic::Application::EXECUTOR);
         auto environment = sys::env::from(envp);
diff --git a/source/intercept/source/collect/SessionWrapper.cc b/source/intercept/source/collect/SessionWrapper.cc
@@ -108,7 +108,7 @@ namespace ic {
 
     rust::Result<Session::SharedPtr> WrapperSession::from(const flags::Arguments& args, const char **envp)
     {
-        const bool verbose = args.as_bool(ic::Application::VERBOSE).unwrap_or(false);
+        const bool verbose = args.as_bool(flags::VERBOSE).unwrap_or(false);
         auto wrapper_dir = args.as_string(ic::Application::WRAPPER);
         auto wrappers = wrapper_dir
                             .and_then<std::list<fs::path>>([](auto wrapper_dir) {
@@ -122,7 +122,7 @@ namespace ic {
                 el::Resolver resolver;
                 for (const auto& wrapper : wrappers) {
                     auto basename = wrapper.filename();
-                    auto candidate = resolver.from_path(basename.c_str(), const_cast<char* const*>(envp));
+                    auto candidate = resolver.from_path(basename.c_str(), envp);
                     candidate.on_success([&result, &basename](auto candidate) {
                         result[basename] = candidate;
                     });
@@ -139,7 +139,7 @@ namespace ic {
                         // FIXME: it would be more correct if we shell-split the `env_it->second`
                         //        and use only the program name, but not the argument. But then how
                         //        to deal with the errors?
-                        auto program = resolver.from_path(std::string_view(env_it), const_cast<char* const*>(envp));
+                        auto program = resolver.from_path(std::string_view(env_it), envp);
 
                         // find the current mapping for the program the user wants to run.
                         // and replace the program what the wrapper will call.
diff --git a/source/intercept/source/collect/main.cc b/source/intercept/source/collect/main.cc
@@ -68,19 +68,19 @@ int main(int argc, char* argv[], char* envp[])
     spdlog::set_pattern("intercept: %v [pid: %P]");
     spdlog::set_level(spdlog::level::info);
 
-    const flags::Parser parser("intercept", VERSION,
-        { { ic::Application::VERBOSE, { 0, false, "run the interception verbose", std::nullopt, std::nullopt } },
+    const flags::Parser parser("intercept", VERSION, {
             { ic::Application::OUTPUT, { 1, false, "path of the result file", { "commands.json" }, std::nullopt } },
             { ic::Application::FORCE_PRELOAD, { 0, false, "force to use library preload", std::nullopt, DEVELOPER_GROUP } },
             { ic::Application::FORCE_WRAPPER, { 0, false, "force to use compiler wrappers", std::nullopt, DEVELOPER_GROUP } },
             { ic::Application::LIBRARY, { 1, false, "path to the preload library", { LIBRARY_DEFAULT_PATH }, DEVELOPER_GROUP } },
             { ic::Application::EXECUTOR, { 1, false, "path to the preload executable", { EXECUTOR_DEFAULT_PATH }, DEVELOPER_GROUP } },
             { ic::Application::WRAPPER, { 1, false, "path to the wrapper directory", { WRAPPER_DEFAULT_PATH }, DEVELOPER_GROUP } },
-            { ic::Application::COMMAND, { -1, true, "command to execute", std::nullopt, std::nullopt } } });
+            { ic::Application::COMMAND, { -1, true, "command to execute", std::nullopt, std::nullopt } }
+    });
     return parser.parse_or_exit(argc, const_cast<const char**>(argv))
         // change the log verbosity if requested.
         .on_success([&argv, &envp](const auto& args) {
-            if (args.as_bool(ic::Application::VERBOSE).unwrap_or(false)) {
+            if (args.as_bool(flags::VERBOSE).unwrap_or(false)) {
                 spdlog::set_pattern("[%H:%M:%S.%f, ic, %P] %v");
                 spdlog::set_level(spdlog::level::debug);
             }
diff --git a/source/intercept/source/report/libexec/Executor.cc b/source/intercept/source/report/libexec/Executor.cc
@@ -131,7 +131,7 @@ namespace el {
         CHECK_SESSION(session_);
         CHECK_POINTER(file);
 
-        if (auto executable = resolver_.from_path(file, envp); executable.is_ok()) {
+        if (auto executable = resolver_.from_path(file, const_cast<const char **>(envp)); executable.is_ok()) {
             const CommandBuilder cmd(session_, executable.unwrap(), argv);
             const char* dst[cmd.length()];
             cmd.assemble(dst);
@@ -183,7 +183,7 @@ namespace el {
         CHECK_SESSION(session_);
         CHECK_POINTER(file);
 
-        if (auto executable = resolver_.from_path(file, envp); executable.is_ok()) {
+        if (auto executable = resolver_.from_path(file, const_cast<const char **>(envp)); executable.is_ok()) {
             const CommandBuilder cmd(session_, executable.unwrap(), argv);
             const char* dst[cmd.length()];
             cmd.assemble(dst);
diff --git a/source/intercept/source/report/libexec/Resolver.cc b/source/intercept/source/report/libexec/Resolver.cc
@@ -61,13 +61,13 @@ namespace el {
         return rust::Err(ENOENT);
     }
 
-    rust::Result<const char*, int> Resolver::from_path(std::string_view const &file, char* const* envp) {
+    rust::Result<const char*, int> Resolver::from_path(std::string_view const &file, const char **envp) {
         if (contains_dir_separator(file)) {
             // the file contains a dir separator, it is treated as path.
             return from_current_directory(file);
         } else {
             // otherwise use the PATH variable to locate the executable.
-            const char *paths = el::env::get_env_value(const_cast<const char **>(envp), "PATH");
+            const char *paths = el::env::get_env_value(envp, "PATH");
             if (paths != nullptr) {
                 return from_search_path(file, paths);
             }
diff --git a/source/intercept/source/report/libexec/Resolver.h b/source/intercept/source/report/libexec/Resolver.h
@@ -47,7 +47,7 @@ namespace el {
         virtual rust::Result<const char*, int> from_current_directory(std::string_view const &file);
 
         [[nodiscard]]
-        virtual rust::Result<const char*, int> from_path(std::string_view const &file, char *const *envp);
+        virtual rust::Result<const char*, int> from_path(std::string_view const &file, const char **envp);
 
         [[nodiscard]]
         virtual rust::Result<const char*, int> from_search_path(std::string_view const &file, const char *search_path);
diff --git a/source/intercept/source/report/supervisor/main.cc b/source/intercept/source/report/supervisor/main.cc
@@ -56,11 +56,11 @@ int main(int argc, char* argv[], char* envp[])
     spdlog::set_pattern(fmt::format("er: %v [pid: %P]"));
     spdlog::set_level(spdlog::level::info);
 
-    const flags::Parser parser("er", VERSION,
-        { { ::er::flags::VERBOSE, { 0, false, "make the interception run verbose", std::nullopt, std::nullopt } },
+    const flags::Parser parser("er", VERSION,{
             { ::er::flags::DESTINATION, { 1, true, "path to report directory", std::nullopt, std::nullopt } },
             { ::er::flags::EXECUTE, { 1, true, "the path parameter for the command", std::nullopt, std::nullopt } },
-            { ::er::flags::COMMAND, { -1, true, "the executed command", std::nullopt, std::nullopt } } });
+            { ::er::flags::COMMAND, { -1, true, "the executed command", std::nullopt, std::nullopt } }
+    });
     return parser.parse_or_exit(argc, const_cast<const char**>(argv))
         // log the original command line as it was received.
         .on_success([&argv, &envp](const auto& args) {
diff --git a/source/intercept/test/libexec/ResolverMock.h b/source/intercept/test/libexec/ResolverMock.h
@@ -35,7 +35,7 @@ class ResolverMock : public el::Resolver {
     MOCK_METHOD(
             (rust::Result<const char*, int>),
             from_path,
-            (std::string_view const &, char *const *),
+            (std::string_view const &, const char **),
             (override)
     );
 
diff --git a/source/libflags/include/libflags/Flags.h b/source/libflags/include/libflags/Flags.h
@@ -31,6 +31,10 @@
 
 namespace flags {
 
+    constexpr char HELP[] = "--help";
+    constexpr char VERSION[] = "--version";
+    constexpr char VERBOSE[] = "--verbose";
+
     class Parser;
 
     class Arguments {
diff --git a/source/libflags/source/Flags.cc b/source/libflags/source/Flags.cc
@@ -21,18 +21,14 @@
 
 #include <cstring>
 #include <iostream>
-#include <list>
-#include <numeric>
 #include <optional>
 #include <set>
+#include <utility>
 
 #include <fmt/format.h>
 
 namespace {
 
-    constexpr char HELP[] = "--help";
-    constexpr char VERSION[] = "--version";
-
     constexpr char QUERY_GROUP[] = "query options";
 
     std::optional<std::tuple<const char**, const char**>>
@@ -205,6 +201,7 @@ namespace flags {
             , version_(version)
             , options_(options)
     {
+        options_.insert({ VERBOSE, { 0, false, "run in verbose mode", std::nullopt, std::nullopt } });
         options_.insert({ HELP, { 0, false, "print help and exit", std::nullopt, { QUERY_GROUP } } });
         options_.insert({ VERSION, { 0, false, "print version and exit", std::nullopt, { QUERY_GROUP } } });
     }
diff --git a/third_party/fmt/CMakeLists.txt b/third_party/fmt/CMakeLists.txt
@@ -10,9 +10,9 @@ else ()
     include(ExternalProject)
     ExternalProject_Add(fmt_dependency
             URL
-                https://github.com/fmtlib/fmt/archive/7.1.2.tar.gz
+                https://github.com/fmtlib/fmt/archive/7.1.3.tar.gz
             URL_HASH
-                MD5=12cd3ca25fbde5661836042f3de819ff
+                MD5=2522ec65070c0bda0ca288677ded2831
             DOWNLOAD_NO_PROGRESS
                 1
             UPDATE_COMMAND
diff --git a/third_party/grpc/CMakeLists.txt b/third_party/grpc/CMakeLists.txt
@@ -29,7 +29,7 @@ else ()
             GIT_REPOSITORY
                 https://github.com/grpc/grpc
             GIT_TAG
-                v1.33.2
+                v1.34.0
             GIT_SUBMODULES
             UPDATE_COMMAND
                 ""

Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,6 @@ ExternalProject_Add(BearSource`
`58`	`58`	`-DROOT_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}`
`59`	`59`	`-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}`
`60`	`60`	`-DENABLE_UNIT_TESTS:BOOL=${ENABLE_UNIT_TESTS}`
`61`		`- BUILD_ALWAYS`
`62`		`- 1`
`63`	`61`	`TEST_BEFORE_INSTALL`
`64`	`62`	`1`
`65`	`63`	`TEST_COMMAND`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ namespace ic {`
`57`	`57`
`58`	`58`	`rust::Result<Session::SharedPtr> LibraryPreloadSession::from(const flags::Arguments& args, const char **envp)`
`59`	`59`	`{`
`60`		`- auto verbose = args.as_bool(ic::Application::VERBOSE).unwrap_or(false);`
	`60`	`+ auto verbose = args.as_bool(flags::VERBOSE).unwrap_or(false);`
`61`	`61`	`auto library = args.as_string(ic::Application::LIBRARY);`
`62`	`62`	`auto executor = args.as_string(ic::Application::EXECUTOR);`
`63`	`63`	`auto environment = sys::env::from(envp);`