mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

system: use spa_system functions for fds

Browse source
This commit is contained in:
Wim Taymans 2019-11-19 13:40:46 +01:00
parent b14bb1f496
commit 68e94a2e7e
16 changed files with 96 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

16
spa/plugins/bluez5/bluez5-dbus.c
View file

@ -29,7 +29,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/socket.h>
#include <sys/timerfd.h>
#include <fcntl.h>
#include <bluetooth/bluetooth.h>
@ -59,6 +58,7 @@ struct spa_bt_monitor {
struct spa_log *log;
struct spa_loop *main_loop;
struct spa_system *main_system;
struct spa_dbus *dbus;
struct spa_dbus_connection *dbus_connection;
DBusConnection *conn;
@ -546,7 +546,7 @@ static void device_timer_event(struct spa_source *source)
struct spa_bt_monitor *monitor = device->monitor;
uint64_t exp;
if (read(source->fd, &exp, sizeof(uint64_t)) != sizeof(uint64_t))
if (spa_system_timerfd_read(monitor->main_system, source->fd, &exp) < 0)
spa_log_warn(monitor->log, "error reading timerfd: %s", strerror(errno));
spa_log_debug(monitor->log, "device %p: timeout %08x %08x",
@ -564,7 +564,8 @@ static int device_start_timer(struct spa_bt_device *device)
if (device->timer.data == NULL) {
device->timer.data = device;
device->timer.func = device_timer_event;
device->timer.fd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC | TFD_NONBLOCK);
device->timer.fd = spa_system_timerfd_create(monitor->main_system,
CLOCK_MONOTONIC, SPA_FD_CLOEXEC | SPA_FD_NONBLOCK);
device->timer.mask = SPA_IO_IN;
device->timer.rmask = 0;
spa_loop_add_source(monitor->main_loop, &device->timer);
@ -573,7 +574,7 @@ static int device_start_timer(struct spa_bt_device *device)
ts.it_value.tv_nsec = 0;
ts.it_interval.tv_sec = 0;
ts.it_interval.tv_nsec = 0;
timerfd_settime(device->timer.fd, 0, &ts, NULL);
spa_system_timerfd_settime(monitor->main_system, device->timer.fd, 0, &ts, NULL);
return 0;
}
@ -591,8 +592,8 @@ static int device_stop_timer(struct spa_bt_device *device)
ts.it_value.tv_nsec = 0;
ts.it_interval.tv_sec = 0;
ts.it_interval.tv_nsec = 0;
timerfd_settime(device->timer.fd, 0, &ts, NULL);
close(device->timer.fd);
spa_system_timerfd_settime(monitor->main_system, device->timer.fd, 0, &ts, NULL);
spa_system_close(monitor->main_system, device->timer.fd);
device->timer.data = NULL;
return 0;
}
@ -2258,6 +2259,9 @@ impl_init(const struct spa_handle_factory *factory,
case SPA_TYPE_INTERFACE_Loop:
this->main_loop = support[i].data;
break;
case SPA_TYPE_INTERFACE_System:
this->main_system = support[i].data;
break;
}
}
if (this->dbus == NULL) {