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

Commit 953130e2 authored by Myles Watson's avatar Myles Watson Committed by android-build-merger
Browse files

Merge "OS: Protect invalidation_list_ with the mutex" am: e1920b3a am: 517732c4 

am: c18b4673

Change-Id: I12cf84906880c4a00516906694b2269e62ecba7c
parents b50768b8 c18b4673

system/gd/os/linux_generic/reactor.cc

+4 −1
Original line number Diff line number Diff line
@@ -84,7 +84,10 @@ void Reactor::Run() { 
  ASSERT(!previously_running);



  for (;;) {

    {

      std::unique_lock<std::mutex> lock(mutex_);

      invalidation_list_.clear();

    }

    epoll_event events[kEpollMaxEvents];

    int count;

    RUN_NO_INTR(count = epoll_wait(epoll_fd_, events, kEpollMaxEvents, -1));