Miroirs/rkvm
1
0
Fork 0
mirror of https://github.com/htrefil/rkvm.git synced 2025-01-27 19:57:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

Asyncify WriterBuilder::build()

Browse source
This commit is contained in:
Jan Trefil 2023-06-21 21:14:11 +02:00
parent 1fbcb0c606
commit 742fb3db7f
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
rkvm-client/src/client.rs
View file

@ -115,6 +115,7 @@ pub async fn run(
.abs(abs)? .abs(abs)?
.key(keys)? .key(keys)?
.build() .build()
.await
} }
.await .await
.map_err(Error::Input)?; .map_err(Error::Input)?;

26
rkvm-input/src/writer.rs
View file

@ -15,6 +15,7 @@ use std::path::Path;
use std::ptr; use std::ptr;
use std::ptr::NonNull; use std::ptr::NonNull;
use tokio::io::unix::AsyncFd; use tokio::io::unix::AsyncFd;
use tokio::task;
pub struct Writer { pub struct Writer {
file: AsyncFd<File>, file: AsyncFd<File>,
@ -112,6 +113,8 @@ impl Writer {
} }
} }
unsafe impl Send for Writer {}
pub struct WriterBuilder { pub struct WriterBuilder {
evdev: NonNull<libevdev>, evdev: NonNull<libevdev>,
} }
@ -129,7 +132,7 @@ impl WriterBuilder {
Ok(Self { evdev }) Ok(Self { evdev })
} }
pub fn name(&mut self, name: &CStr) -> &mut Self { pub fn name(self, name: &CStr) -> Self {
unsafe { unsafe {
glue::libevdev_set_name(self.evdev.as_ptr(), name.as_ptr()); glue::libevdev_set_name(self.evdev.as_ptr(), name.as_ptr());
} }
@ -137,7 +140,7 @@ impl WriterBuilder {
self self
} }
pub fn vendor(&mut self, value: u16) -> &mut Self { pub fn vendor(self, value: u16) -> Self {
unsafe { unsafe {
glue::libevdev_set_id_vendor(self.evdev.as_ptr(), value as _); glue::libevdev_set_id_vendor(self.evdev.as_ptr(), value as _);
} }
@ -145,7 +148,7 @@ impl WriterBuilder {
self self
} }
pub fn product(&mut self, value: u16) -> &mut Self { pub fn product(self, value: u16) -> Self {
unsafe { unsafe {
glue::libevdev_set_id_product(self.evdev.as_ptr(), value as _); glue::libevdev_set_id_product(self.evdev.as_ptr(), value as _);
} }
@ -153,7 +156,7 @@ impl WriterBuilder {
self self
} }
pub fn version(&mut self, value: u16) -> &mut Self { pub fn version(self, value: u16) -> Self {
unsafe { unsafe {
glue::libevdev_set_id_version(self.evdev.as_ptr(), value as _); glue::libevdev_set_id_version(self.evdev.as_ptr(), value as _);
} }
@ -161,7 +164,7 @@ impl WriterBuilder {
self self
} }
pub fn rel<T: IntoIterator<Item = RelAxis>>(&mut self, items: T) -> Result<&mut Self, Error> { pub fn rel<T: IntoIterator<Item = RelAxis>>(self, items: T) -> Result<Self, Error> {
for axis in items { for axis in items {
let ret = unsafe { let ret = unsafe {
glue::libevdev_enable_event_code( glue::libevdev_enable_event_code(
@ -180,10 +183,7 @@ impl WriterBuilder {
Ok(self) Ok(self)
} }
pub fn abs<T: IntoIterator<Item = (AbsAxis, AbsInfo)>>( pub fn abs<T: IntoIterator<Item = (AbsAxis, AbsInfo)>>(self, items: T) -> Result<Self, Error> {
&mut self,
items: T,
) -> Result<&mut Self, Error> {
let ret = unsafe { let ret = unsafe {
glue::libevdev_enable_event_code( glue::libevdev_enable_event_code(
self.evdev.as_ptr(), self.evdev.as_ptr(),
@ -224,7 +224,7 @@ impl WriterBuilder {
Ok(self) Ok(self)
} }
pub fn key<T: IntoIterator<Item = Key>>(&mut self, items: T) -> Result<&mut Self, Error> { pub fn key<T: IntoIterator<Item = Key>>(self, items: T) -> Result<Self, Error> {
for key in items { for key in items {
let ret = unsafe { let ret = unsafe {
glue::libevdev_enable_event_code( glue::libevdev_enable_event_code(
@ -243,12 +243,12 @@ impl WriterBuilder {
Ok(self) Ok(self)
} }
pub fn build(&self) -> Result<Writer, Error> { pub async fn build(self) -> Result<Writer, Error> {
unsafe { Writer::from_evdev(self.evdev.as_ref()) } task::spawn_blocking(move || unsafe { Writer::from_evdev(self.evdev.as_ref()) }).await?
} }
} }
unsafe impl Send for Writer {} unsafe impl Send for WriterBuilder {}
impl Drop for WriterBuilder { impl Drop for WriterBuilder {
fn drop(&mut self) { fn drop(&mut self) {