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

Commit 738a8663 authored by Henri Chataing's avatar Henri Chataing
Browse files

RootCanal: Adapt async_manager.cc for compatibility with darwin 

TEMP_FAILURE_RETRY, pipe2 are not available

Bug: 279665786
Test: m root-canal
Flag: EXEMPT, tool change
Change-Id: I46bb9e6258882593ddc2392f7a5fc0b3b7303a67
parent bd898c9e

tools/rootcanal/model/setup/async_manager.cc

+24 −4
Original line number Diff line number Diff line
@@ -19,14 +19,24 @@ 
#include <algorithm>

#include <atomic>

#include <condition_variable>

#include <fcntl.h>

#include <mutex>

#include <sys/select.h>

#include <thread>

#include <unistd.h>

#include <vector>



#include "fcntl.h"

#include "log.h"

#include "sys/select.h"

#include "unistd.h"



#ifndef TEMP_FAILURE_RETRY

/* Used to retry syscalls that can return EINTR. */

#define TEMP_FAILURE_RETRY(exp) ({         \

    __typeof__(exp) _rc;                   \

    do {                                   \

        _rc = (exp);                       \

    } while (_rc == -1 && errno == EINTR); \

    _rc; })

#endif  // TEMP_FAILURE_RETRY



namespace rootcanal {

// Implementation of AsyncManager is divided between two classes, three if
@@ -157,13 +167,23 @@ class AsyncManager::AsyncFdWatcher { 
    }

    // set up the communication channel

    int pipe_fds[2];

    if (pipe2(pipe_fds, O_NONBLOCK)) {

    if (pipe(pipe_fds)) {

      ERROR(

          "{}: Unable to establish a communication channel to the reading "

          "thread",

          __func__);

      return -1;

    }

    // configure the fds as non blocking.

    if (fcntl(pipe_fds[0], F_SETFL, O_NONBLOCK) ||

        fcntl(pipe_fds[1], F_SETFL, O_NONBLOCK)) {

      ERROR(

          "{}: Unable to configure the communication channel to the reading "

          "thread",

          __func__);

      return -1;

    }



    notification_listen_fd_ = pipe_fds[0];

    notification_write_fd_ = pipe_fds[1];