f1d76ecf6c
in commit `asyncify pxar create_archive`, we changed from a
separate thread for creating a pxar to using async code, but the
StdChannelWriter used for both pxar and catalog can block, which
may block the tokio runtime for single (and probably dual) core
environments
this patch adds a wrapper struct for any writer that implements
'std::io::Write' and wraps the write calls with 'block_in_place'
so that if called in a tokio runtime, it knows that this code
potentially blocks
Fixes: 6afb60abf5 ("asyncify pxar create_archive")
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
27 lines
676 B
Rust
27 lines
676 B
Rust
use std::io::Write;
|
|
|
|
use tokio::task::block_in_place;
|
|
|
|
/// Wrapper around a writer which implements Write
|
|
///
|
|
/// wraps each write with a 'block_in_place' so that
|
|
/// any (blocking) writer can be safely used in async context in a
|
|
/// tokio runtime
|
|
pub struct TokioWriterAdapter<W: Write>(W);
|
|
|
|
impl<W: Write> TokioWriterAdapter<W> {
|
|
pub fn new(writer: W) -> Self {
|
|
Self(writer)
|
|
}
|
|
}
|
|
|
|
impl<W: Write> Write for TokioWriterAdapter<W> {
|
|
fn write(&mut self, buf: &[u8]) -> Result<usize, std::io::Error> {
|
|
block_in_place(|| self.0.write(buf))
|
|
}
|
|
|
|
fn flush(&mut self) -> Result<(), std::io::Error> {
|
|
block_in_place(|| self.0.flush())
|
|
}
|
|
}
|