Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2545239 authored by Hansong Zhang's avatar Hansong Zhang
Browse files

Cert: Get rid of signal socket 

Use gRPC channel_ready_future to wait for channel ready, instead of using
another socket.

Test: cert/run_cert.sh
Change-Id: I97f405323d92bf7526eb174fb5e4b305e052a4e9
parent c6fda887

system/gd/cert/android_devices_config.json

+0 −4
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
                {

                    "grpc_port": "8899",

                    "grpc_root_server_port": "8897",

                    "signal_port": "8895",

                    "label": "stack_under_test",

                    "serial_number": "DUT",

                    "cmd":
@@ -21,7 +20,6 @@ 
                        "/system/bin/stack_with_facade",

                        "--grpc-port=$(grpc_port)",

                        "--root-server-port=$(grpc_root_server_port)",

                        "--signal-port=$(signal_port)"

                    ]

                }

            ],
@@ -30,7 +28,6 @@ 
                {

                    "grpc_port": "8898",

                    "grpc_root_server_port": "8896",

                    "signal_port": "8894",

                    "label": "cert_stack",

                    "serial_number": "CERT",

                    "cmd":
@@ -42,7 +39,6 @@ 
                        "/system/bin/bluetooth_cert_stack",

                        "--grpc-port=$(grpc_port)",

                        "--root-server-port=$(grpc_root_server_port)",

                        "--signal-port=$(signal_port)"

                    ]

                }

            ]

system/gd/cert/cert_main.cc

+0 −17
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 


#include "stack_manager.h"



#include <netinet/in.h>

#include <sys/socket.h>

#include <sys/types.h>

#include <unistd.h>

#include <csignal>

#include <cstring>
@@ -49,12 +46,10 @@ void interrupt_handler(int) { 
int main(int argc, const char** argv) {

  int root_server_port = 8896;

  int grpc_port = 8898;

  int signal_port = 8894;



  const std::string arg_grpc_root_server_port = "--root-server-port=";

  const std::string arg_grpc_server_port = "--grpc-port=";

  const std::string arg_rootcanal_port = "--rootcanal-port=";

  const std::string arg_signal_port = "--signal-port=";

  const std::string arg_btsnoop_path = "--btsnoop=";

  std::string btsnoop_path;

  for (int i = 1; i < argc; i++) {
@@ -75,22 +70,10 @@ int main(int argc, const char** argv) { 
      btsnoop_path = arg.substr(arg_btsnoop_path.size());

      ::bluetooth::hal::SnoopLogger::SetFilePath(btsnoop_path);

    }

    if (arg.find(arg_signal_port) == 0) {

      auto port_number = arg.substr(arg_signal_port.size());

      signal_port = std::stoi(port_number);

    }

  }



  signal(SIGINT, interrupt_handler);

  grpc_root_server.StartServer("0.0.0.0", root_server_port, grpc_port);

  int tester_signal_socket = socket(AF_INET, SOCK_STREAM, 0);

  struct sockaddr_in addr;

  memset(&addr, 0, sizeof(addr));

  addr.sin_family = AF_INET;

  addr.sin_port = htons(signal_port);

  addr.sin_addr.s_addr = htonl(INADDR_ANY);

  connect(tester_signal_socket, (sockaddr*)&addr, sizeof(addr));

  close(tester_signal_socket);

  auto wait_thread = std::thread([] { grpc_root_server.RunGrpcLoop(); });

  wait_thread.join();

system/gd/cert/gd_cert_device.py

+2 −3
Original line number Diff line number Diff line
@@ -55,13 +55,12 @@ def get_instances_with_configs(configs): 
            resolved_cmd.append(replace_vars(entry, config))

        devices.append(GdCertDevice(config["grpc_port"],

                                    config["grpc_root_server_port"],

                                    config["signal_port"],

                                    resolved_cmd, config["label"]))

    return devices



class GdCertDevice(GdDeviceBase):

    def __init__(self, grpc_port, grpc_root_server_port, signal_port, cmd, label):

        super().__init__(grpc_port, grpc_root_server_port, signal_port, cmd,

    def __init__(self, grpc_port, grpc_root_server_port, cmd, label):

        super().__init__(grpc_port, grpc_root_server_port, cmd,

                         label, ACTS_CONTROLLER_CONFIG_NAME)



        # Cert stubs

system/gd/cert/gd_device.py

+2 −3
Original line number Diff line number Diff line
@@ -55,13 +55,12 @@ def get_instances_with_configs(configs): 
            resolved_cmd.append(replace_vars(entry, config))

        devices.append(GdDevice(config["grpc_port"],

                                config["grpc_root_server_port"],

                                config["signal_port"],

                                resolved_cmd, config["label"]))

    return devices



class GdDevice(GdDeviceBase):

    def __init__(self, grpc_port, grpc_root_server_port, signal_port, cmd, label):

        super().__init__(grpc_port, grpc_root_server_port, signal_port, cmd,

    def __init__(self, grpc_port, grpc_root_server_port, cmd, label):

        super().__init__(grpc_port, grpc_root_server_port, cmd,

                         label, ACTS_CONTROLLER_CONFIG_NAME)



        # Facade stubs

system/gd/cert/gd_device_base.py

+10 −13
Original line number Diff line number Diff line
@@ -42,11 +42,10 @@ def replace_vars(string, config): 
                 .replace("$(grpc_port)", config.get("grpc_port")) \

                 .replace("$(grpc_root_server_port)", config.get("grpc_root_server_port")) \

                 .replace("$(rootcanal_port)", rootcanal_port) \

                 .replace("$(signal_port)", config.get("signal_port")) \

                 .replace("$(serial_number)", serial_number)



class GdDeviceBase:

    def __init__(self, grpc_port, grpc_root_server_port, signal_port, cmd,

    def __init__(self, grpc_port, grpc_root_server_port, cmd,

                 label, type_identifier):

        self.label = label if label is not None else grpc_port

        # logging.log_path only exists when this is used in an ACTS test run.
@@ -64,21 +63,12 @@ class GdDeviceBase: 
        btsnoop_path = os.path.join(log_path_base, '%s_btsnoop_hci.log' % label)

        cmd.append("--btsnoop=" + btsnoop_path)



        tester_signal_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

        tester_signal_socket.setsockopt(

            socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)

        socket_address = ('localhost', int(signal_port))

        tester_signal_socket.bind(socket_address)

        tester_signal_socket.listen(1)



        self.backing_process = subprocess.Popen(

            cmd,

            cwd=ANDROID_BUILD_TOP,

            env=os.environ.copy(),

            stdout=self.backing_process_logs,

            stderr=self.backing_process_logs)

        tester_signal_socket.accept()

        tester_signal_socket.close()



        self.grpc_root_server_channel = grpc.insecure_channel("localhost:" + grpc_root_server_port)

        self.grpc_port = int(grpc_port)
@@ -102,6 +92,13 @@ class GdDeviceBase: 
        except grpc.FutureTimeoutError:

            logging.error("wait channel ready timeout")



    def wait_root_service_ready(self):

        future = grpc.channel_ready_future(self.grpc_root_server_channel)

        try:

            future.result(timeout=WAIT_CHANNEL_READY_TIMEOUT)

        except grpc.FutureTimeoutError:

            logging.error("wait channel ready timeout")







class GdDeviceBaseLoggerAdapter(logging.LoggerAdapter):