picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bus: poll() on the right fds in proxyd

Browse source
This commit is contained in:
Lennart Poettering 2013-12-21 17:46:35 +01:00
parent 0721804f03
commit b2bb3469fd
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/bus-proxyd/bus-proxyd.c
View file

@ -266,6 +266,7 @@ int main(int argc, char *argv[]) {
int events_a, events_b, fd;
uint64_t timeout_a, timeout_b, t;
struct timespec _ts, *ts;
struct pollfd *pollfd;
int k;
r = sd_bus_process(a, &m);
@ -374,14 +375,13 @@ int main(int argc, char *argv[]) {
ts = timespec_store(&_ts, t);
}
{
struct pollfd p[3] = {
{.fd = fd, .events = events_a, },
{.fd = STDIN_FILENO, .events = events_b & POLLIN, },
{.fd = STDOUT_FILENO, .events = events_b & POLLOUT, }};
pollfd = (struct pollfd[3]) {
{.fd = fd, .events = events_a, },
{.fd = in_fd, .events = events_b & POLLIN, },
{.fd = out_fd, .events = events_b & POLLOUT, }
};
r = ppoll(p, ELEMENTSOF(p), ts, NULL);
}
r = ppoll(pollfd, 3, ts, NULL);
if (r < 0) {
log_error("ppoll() failed: %m");
goto finish;