Merge branch 'devel'

Author: rizsotto

source/intercept/CMakeLists.txt

@@ -30,7 +30,7 @@ target_include_directories(intercept_a PUBLIC source/)
 target_link_libraries(intercept_a PUBLIC main_a)
 target_link_libraries(intercept_a PUBLIC exec_a)
 target_link_libraries(intercept_a PUBLIC flags_a)
-target_link_libraries(intercept_a PUBLIC supervise_a)
+target_link_libraries(intercept_a PUBLIC rpc_a)
 target_link_libraries(intercept_a PUBLIC sys_a)
 target_link_libraries(intercept_a PUBLIC report_a)
 target_link_libraries(intercept_a PUBLIC result_a)
@@ -44,7 +44,7 @@ add_executable(intercept
 target_link_libraries(intercept main_a)
 target_link_libraries(intercept intercept_a)
 target_link_libraries(intercept report_a)
-target_link_libraries(intercept supervise_a)
+target_link_libraries(intercept rpc_a)
 target_link_libraries(intercept sys_a)
 target_link_libraries(intercept flags_a)
 target_link_libraries(intercept exec_a)
@@ -76,7 +76,7 @@ if (ENABLE_UNIT_TESTS)
     target_link_libraries(intercept_unit_test exec_a)
     target_link_libraries(intercept_unit_test intercept_a)
     target_link_libraries(intercept_unit_test report_a)
-    target_link_libraries(intercept_unit_test supervise_a)
+    target_link_libraries(intercept_unit_test rpc_a)
     target_link_libraries(intercept_unit_test sys_a)
     target_link_libraries(intercept_unit_test flags_a)
     target_link_libraries(intercept_unit_test PkgConfig::GTest ${CMAKE_THREAD_LIBS_INIT})
@@ -91,7 +91,7 @@ add_library(reporter_a OBJECT
         )
 
 target_include_directories(reporter_a PUBLIC source/)
-target_link_libraries(reporter_a PUBLIC supervise_a)
+target_link_libraries(reporter_a PUBLIC rpc_a)
 target_link_libraries(reporter_a PUBLIC result_a)
 target_link_libraries(reporter_a PUBLIC spdlog::spdlog)
 
@@ -107,7 +107,7 @@ target_link_libraries(wrapper flags_a)
 target_link_libraries(wrapper reporter_a)
 target_link_libraries(wrapper result_a)
 target_link_libraries(wrapper sys_a)
-target_link_libraries(wrapper supervise_a)
+target_link_libraries(wrapper rpc_a)
 target_link_libraries(wrapper spdlog::spdlog)
 
 install(TARGETS wrapper
@@ -160,7 +160,7 @@ target_link_libraries(er reporter_a)
 target_link_libraries(er result_a)
 target_link_libraries(er flags_a)
 target_link_libraries(er sys_a)
-target_link_libraries(er supervise_a)
+target_link_libraries(er rpc_a)
 target_link_libraries(er spdlog::spdlog)
 
 install(TARGETS er

source/intercept/proto/CMakeLists.txt

@@ -26,10 +26,35 @@ add_custom_command(
             "${SUPERVISE_PROTO}"
 )
 
-add_library(supervise_a OBJECT
+get_filename_component(INTERCEPT_PROTO "intercept.proto" ABSOLUTE)
+get_filename_component(INTERCEPT_PROTO_PATH "${SUPERVISE_PROTO}" PATH)
+
+add_custom_command(
+        COMMAND
+            ${_PROTOBUF_PROTOC}
+        ARGS
+            -I "${SUPERVISE_PROTO_PATH}"
+            --grpc_out "${CMAKE_CURRENT_BINARY_DIR}"
+            --cpp_out "${CMAKE_CURRENT_BINARY_DIR}"
+            --plugin=protoc-gen-grpc="${_GRPC_CPP_PLUGIN_EXECUTABLE}"
+            "${INTERCEPT_PROTO}"
+        WORKING_DIRECTORY
+            "${CMAKE_CURRENT_SOURCE_DIR}"
+        OUTPUT
+            ${CMAKE_CURRENT_BINARY_DIR}/intercept.pb.h
+            ${CMAKE_CURRENT_BINARY_DIR}/intercept.grpc.pb.h
+            ${CMAKE_CURRENT_BINARY_DIR}/intercept.pb.cc
+            ${CMAKE_CURRENT_BINARY_DIR}/intercept.grpc.pb.cc
+        DEPENDS
+            "${INTERCEPT_PROTO}"
+)
+
+add_library(rpc_a OBJECT
         ${CMAKE_CURRENT_BINARY_DIR}/supervise.pb.cc
         ${CMAKE_CURRENT_BINARY_DIR}/supervise.grpc.pb.cc
+        ${CMAKE_CURRENT_BINARY_DIR}/intercept.pb.cc
+        ${CMAKE_CURRENT_BINARY_DIR}/intercept.grpc.pb.cc
         )
 
-target_include_directories(supervise_a PUBLIC "${CMAKE_CURRENT_BINARY_DIR}")
-target_link_libraries(supervise_a PUBLIC PkgConfig::gRPC)
+target_include_directories(rpc_a PUBLIC "${CMAKE_CURRENT_BINARY_DIR}")
+target_link_libraries(rpc_a PUBLIC PkgConfig::gRPC)

source/intercept/proto/intercept.proto

@@ -0,0 +1,89 @@
+/*  Copyright (C) 2012-2020 by László Nagy
+    This file is part of Bear.
+
+    Bear is a tool to generate compilation database for clang tooling.
+
+    Bear is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Bear is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+syntax = "proto3";
+
+package rpc;
+option cc_enable_arenas = true;
+
+// Represents the remote sink of supervised process events.
+//
+// Events from a process execution can be sent from many actors (mostly
+// supervisor processes). The events are collected in a common place
+// in order to reconstruct of final report of a build process.
+service Interceptor {
+
+    // Register a process related events.
+    rpc Register (Event) returns (Empty) {}
+}
+
+// Represent a relevant life cycle event of a process.
+//
+// Currently it's only the process life cycle events (start, signal,
+// terminate), but can be extended later with performance related
+// events like monitoring the CPU usage or the memory allocation if
+// those information are available to the the supervisor process.
+message Event {
+
+    // Required.
+    uint64 rid = 1;
+
+    // Required.
+    uint32 pid = 2;
+
+    // Optional.
+    uint32 ppid = 3;
+
+    // Required.
+    // (ISO-8601 date-tie format with microsecond precision in UTC timezone)
+    string timestamp = 4;
+
+    reserved 5 to 10;
+
+    // Required.
+    oneof event {
+        Started started = 11;
+        Terminated terminated = 12;
+        Signalled signalled = 13;
+    }
+
+    // Represents a successful process execution.
+    message Started {
+        // All fields are required.
+        string executable = 3;
+        repeated string arguments = 4;
+        string working_dir = 5;
+        map<string, string> environment = 6;
+    }
+
+    // Represents the termination of the supervised process.
+    message Terminated {
+        // Optional.
+        // (Killed processes have no exit status.)
+        int64 status = 1;
+    }
+
+    // Represents the supervised process received a signal.
+    message Signalled {
+        // Required.
+        int32 number = 1;
+    }
+}
+
+message Empty {}

source/intercept/proto/supervise.proto

@@ -19,7 +19,7 @@
 
 syntax = "proto3";
 
-package supervise;
+package rpc;
 option cc_enable_arenas = true;
 
 // This represents a (remote) supervisor process to set up program execution.
@@ -63,69 +63,3 @@ message ResolveResponse {
 message Environment {
     map<string, string> values = 1;
 }
-
-// Represents the remote sink of supervised process events.
-//
-// Events from a process execution can be sent from many actors (mostly
-// supervisor processes). The events are collected in a common place
-// in order to reconstruct of final report of a build process.
-service Interceptor {
-
-    // Register a process related events.
-    rpc Register (Event) returns (Empty) {}
-}
-
-// Represent a relevant life cycle event of a process.
-//
-// Currently it's only the process life cycle events (start, signal,
-// terminate), but can be extended later with performance related
-// events like monitoring the CPU usage or the memory allocation if
-// those information are available to the the supervisor process.
-message Event {
-
-    // Required.
-    uint64 rid = 1;
-
-    // Required.
-    uint32 pid = 2;
-
-    // Optional.
-    uint32 ppid = 3;
-
-    // Required.
-    // (ISO-8601 date-tie format with microsecond precision in UTC timezone)
-    string timestamp = 4;
-
-    reserved 5 to 10;
-
-    // Required.
-    oneof event {
-        Started started = 11;
-        Terminated terminated = 12;
-        Signalled signalled = 13;
-    }
-
-    // Represents a successful process execution.
-    message Started {
-        // All fields are required.
-        string executable = 3;
-        repeated string arguments = 4;
-        string working_dir = 5;
-        map<string, string> environment = 6;
-    }
-
-    // Represents the termination of the supervised process.
-    message Terminated {
-        // Optional.
-        // (Killed processes have no exit status.)
-        int64 status = 1;
-    }
-
-    // Represents the supervised process received a signal.
-    message Signalled {
-        // Required.
-        int32 number = 1;
-    }
-}
-
-message Empty {}

source/intercept/source/collect/Application.cc

@@ -23,7 +23,6 @@
 #include "collect/Session.h"
 #include "intercept/Flags.h"
 #include "libsys/Os.h"
-#include "libsys/Signal.h"
 
 #include <grpcpp/security/server_credentials.h>
 #include <grpcpp/server_builder.h>
@@ -36,27 +35,6 @@ namespace {
 
     constexpr std::optional<std::string_view> DEVELOPER_GROUP = { "developer options" };
 
-    rust::Result<int> execute_command(const ic::Session& session, const std::vector<std::string_view>& command) {
-        return session.supervise(command)
-            .and_then<sys::Process>([](auto builder) {
-                return builder.spawn();
-            })
-            .and_then<sys::ExitStatus>([](auto child) {
-                sys::SignalForwarder guard(child);
-                return child.wait();
-            })
-            .map<int>([](auto status) {
-                return status.code().value_or(EXIT_FAILURE);
-            })
-            .map_err<std::runtime_error>([](auto error) {
-                spdlog::warn("Command execution failed: {}", error.what());
-                return error;
-            })
-            .on_success([](auto status) {
-                spdlog::debug("Running command. [Exited with {0}]", status);
-            });
-    }
-
     rust::Result<std::vector<std::string_view>> get_command(const flags::Arguments& args)
     {
         return args.as_string_list(ic::COMMAND)
@@ -82,12 +60,12 @@ namespace ic {
                           .AddListeningPort("127.0.0.1:0", grpc::InsecureServerCredentials(), &port)
                           .BuildAndStart();
 
-        std::string server_address = fmt::format("0.0.0.0:{}", port);
+        std::string server_address = fmt::format("127.0.0.1:{}", port);
         spdlog::debug("Running gRPC server. [Listening on {0}]", server_address);
         // Configure the session and the reporter objects
         session_->set_server_address(server_address);
         // Execute the build command
-        auto result = execute_command(*session_, command_);
+        auto result = session_->execute(command_);
         // Stop the gRPC server
         spdlog::debug("Stopping gRPC server.");
         server->Shutdown();

source/intercept/source/collect/Reporter.cc

@@ -20,7 +20,6 @@
 #include "config.h"
 #include "intercept/Flags.h"
 #include "collect/Reporter.h"
-#include "collect/Application.h"
 #include "libsys/Os.h"
 
 #include <spdlog/spdlog.h>
@@ -73,7 +72,7 @@ namespace {
             });
     }
 
-    void update_run_with_started(report::Run& target, const supervise::Event& source)
+    void update_run_with_started(report::Run& target, const rpc::Event& source)
     {
         spdlog::debug("Received event is merged into execution report. [pid: {}, event: start]", source.pid());
         auto event = report::Event {
@@ -85,7 +84,7 @@ namespace {
         target.events.emplace_back(event);
     }
 
-    void update_run_with_signaled(report::Run& target, const supervise::Event& source)
+    void update_run_with_signaled(report::Run& target, const rpc::Event& source)
     {
         spdlog::debug("Received event is merged into execution report. [pid: {}, event: signal]", source.pid());
         auto event = report::Event {
@@ -97,7 +96,7 @@ namespace {
         target.events.emplace_back(event);
     }
 
-    void update_run_with_terminated(report::Run& target, const supervise::Event& source)
+    void update_run_with_terminated(report::Run& target, const rpc::Event& source)
     {
         spdlog::debug("Received event is merged into execution report. [pid: {}, event: stop]", source.pid());
         auto event = report::Event {
@@ -124,7 +123,7 @@ namespace {
         return (value == 0 ? std::nullopt : std::make_optional(value));
     }
 
-    report::Execution init_execution(const supervise::Event& source)
+    report::Execution init_execution(const rpc::Event& source)
     {
         const auto& started = source.started();
 
@@ -167,7 +166,7 @@ namespace ic {
     {
     }
 
-    void Reporter::report(const ::supervise::Event& event)
+    void Reporter::report(const rpc::Event& event)
     {
         const auto rid = event.rid();
         if (auto it = executions_.find(rid); it != executions_.end()) {

source/intercept/source/collect/Reporter.h

@@ -23,7 +23,7 @@
 #include "libflags/Flags.h"
 #include "intercept/output/Report.h"
 #include "libresult/Result.h"
-#include "supervise.pb.h"
+#include "intercept.pb.h"
 
 #include <filesystem>
 #include <memory>
@@ -39,7 +39,7 @@ namespace ic {
         using SharedPtr = std::shared_ptr<Reporter>;
         static rust::Result<Reporter::SharedPtr> from(const flags::Arguments&, const ic::Session&);
 
-        void report(const ::supervise::Event& request);
+        void report(const rpc::Event& request);
         void flush();
 
     public: