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

Commit fb9382e9 authored by Myles Watson's avatar Myles Watson
Browse files

GD Cert Tests: Always enqueue events 

Make sure we know that the tree fell in the forest.

Bug: 193518849
Test: cert/run
Tag: #testing
Change-Id: Ife01020500e0c7ac26b08b91651b77cd33216f4e
parent 93ef121c

system/gd/grpc/grpc_event_queue.h

+3 −5
Original line number Diff line number Diff line
@@ -50,12 +50,10 @@ class GrpcEventQueue { 
  ::grpc::Status RunLoop(::grpc::ServerContext* context, ::grpc::ServerWriter<T>* writer) {

    using namespace std::chrono_literals;

    LOG_INFO("%s: Entering Loop", log_name_.c_str());

    pending_events_.clear();

    running_ = true;

    while (!context->IsCancelled()) {

      // Wait for 500 ms so that cancellation can be caught in amortized 250 ms latency

      if (pending_events_.wait_to_take(500ms)) {

        LOG_INFO("%s: Got event after queue", log_name_.c_str());

        LOG_INFO("%s: Got event from queue", log_name_.c_str());

        writer->Write(pending_events_.take());

      }

    }
@@ -73,13 +71,13 @@ class GrpcEventQueue { 
      LOG_INFO("%s: Discarding an event while not running the loop", log_name_.c_str());

      return;

    }

    LOG_INFO("%s: Got event before queue", log_name_.c_str());

    LOG_INFO("%s: Got event, enqueuing", log_name_.c_str());

    pending_events_.push(std::move(event));

  }



 private:

  std::string log_name_;

  std::atomic<bool> running_ = false;

  std::atomic<bool> running_{true};

  common::BlockingQueue<T> pending_events_;

};