From bea5cda4a1e35ee057ee23ce078ca2f992bc50d8 Mon Sep 17 00:00:00 2001 From: Avril Date: Sun, 10 Apr 2022 23:27:05 +0100 Subject: [PATCH] Fixed not copying to buffer when not using feature `bytes`. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fortune for collect's current commit: Curse − 凶 --- Cargo.lock | 360 +++++++++++++++++++++++++++++++++++++++++++++++++ Cargo.toml | 5 + src/buffers.rs | 38 +++++- src/main.rs | 65 ++++++++- 4 files changed, 459 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5d26709..4e8e978 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,51 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "addr2line" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + [[package]] name = "bytes" version = "1.1.0" @@ -14,13 +59,60 @@ version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + [[package]] name = "collect" version = "0.1.0" dependencies = [ "bytes", + "color-eyre", "jemallocator", "libc", + "tracing", + "tracing-error", + "tracing-subscriber", +] + +[[package]] +name = "color-eyre" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ebf286c900a6d5867aeff75cfee3192857bb7f24b547d4f0df2ed6baa812c90" +dependencies = [ + "backtrace", + "color-spantrace", + "eyre", + "indenter", + "once_cell", + "owo-colors", + "tracing-error", +] + +[[package]] +name = "color-spantrace" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce" +dependencies = [ + "once_cell", + "owo-colors", + "tracing-core", + "tracing-error", +] + +[[package]] +name = "eyre" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" +dependencies = [ + "indenter", + "once_cell", ] [[package]] @@ -29,6 +121,18 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" +[[package]] +name = "gimli" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" + +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + [[package]] name = "jemalloc-sys" version = "0.3.2" @@ -50,8 +154,264 @@ dependencies = [ "libc", ] +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + [[package]] name = "libc" version = "0.2.122" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec647867e2bf0772e28c8bcde4f0d19a9216916e890543b5a03ed8ef27b8f259" + +[[package]] +name = "log" +version = "0.4.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata", +] + +[[package]] +name = "memchr" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" + +[[package]] +name = "miniz_oxide" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +dependencies = [ + "adler", + "autocfg", +] + +[[package]] +name = "object" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" + +[[package]] +name = "owo-colors" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e72e30578e0d0993c8ae20823dd9cff2bc5517d2f586a8aef462a581e8a03eb" + +[[package]] +name = "pin-project-lite" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" + +[[package]] +name = "proc-macro2" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "quote" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "regex" +version = "1.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" + +[[package]] +name = "rustc-demangle" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "smallvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" + +[[package]] +name = "syn" +version = "1.0.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "thread_local" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +dependencies = [ + "once_cell", +] + +[[package]] +name = "tracing" +version = "0.1.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80b9fa4360528139bc96100c160b7ae879f5567f49f1782b0b02035b0358ebf3" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90442985ee2f57c9e1b548ee72ae842f4a9a20e3f417cc38dbc5dc684d9bb4ee" +dependencies = [ + "lazy_static", + "valuable", +] + +[[package]] +name = "tracing-error" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +dependencies = [ + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-log" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596" +dependencies = [ + "ansi_term", + "lazy_static", + "matchers", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "unicode-xid" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/Cargo.toml b/Cargo.toml index 687f510..5cb7b24 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,6 +10,7 @@ default = ["jemalloc"] # TODO: mmap, memfd_create() ver +# XXX: without bytes, it completely fails?? # bytes: use `bytes` crate for collecting instead of `std::vec` # Use jemalloc instead of system malloc. @@ -29,5 +30,9 @@ strip=false [dependencies] bytes = {version = "1.1.0", optional = true } +color-eyre = { version = "0.6.1", features = ["capture-spantrace"] } jemallocator = { version = "0.3.2", optional = true } libc = "0.2.122" +tracing = { version = "0.1.33", features = ["attributes"] } +tracing-error = "0.2.0" +tracing-subscriber = { version = "0.3.11", features = ["tracing", "env-filter"] } diff --git a/src/buffers.rs b/src/buffers.rs index d652530..aecb246 100644 --- a/src/buffers.rs +++ b/src/buffers.rs @@ -21,7 +21,6 @@ pub type Default = ::Frozen; #[derive(Debug, Hash, PartialEq, Eq, PartialOrd, Ord)] pub struct BufferReader<'a, B: ?Sized>(&'a mut B, usize); - /// Writer to a mutable reference of a `MutBuffer`. #[derive(Debug, Hash, PartialEq, Eq, PartialOrd, Ord)] pub struct BufferWriter<'a, B: ?Sized>(&'a mut B, usize); @@ -96,10 +95,13 @@ impl<'a, B: ?Sized + Buffer> io::Read for BufferReader<'a, B> impl<'a, B: ?Sized + MutBuffer> io::Write for BufferWriter<'a, B> { #[inline] + #[instrument(skip(self))] fn write(&mut self, buf: &[u8]) -> io::Result { let adv = self.0.copy_from_slice(self.1, buf); + self.1 += adv; - Ok(adv) + Ok(adv) + } #[inline(always)] fn flush(&mut self) -> io::Result<()> { @@ -157,13 +159,17 @@ pub trait MutBuffer: AsMut<[u8]> /// Make immutable fn freeze(self) -> Self::Frozen; - #[inline] + #[inline] + #[instrument(skip(self))] fn copy_from_slice(&mut self, st: usize, slice: &[u8]) -> usize { let by = self.as_mut(); + dbg!(&by); + if st >= by.len() { return 0; } + dbg!(st); let by = &mut by[st..]; let len = std::cmp::min(by.len(), slice.len()); @@ -180,12 +186,14 @@ pub trait MutBuffer: AsMut<[u8]> pub trait MutBufferExt: MutBuffer { - #[inline(always)] + #[inline(always)] + #[instrument(skip(self))] fn writer_from(&mut self, st: usize) -> BufferWriter<'_, Self> { BufferWriter(self, st) } - #[inline] + #[inline] + #[instrument(skip(self))] fn writer(&mut self) -> BufferWriter<'_, Self> { self.writer_from(0) @@ -201,15 +209,35 @@ impl MutBuffer for bytes::BytesMut fn freeze(self) -> Self::Frozen { bytes::BytesMut::freeze(self) } + //TODO: XXX: Impl copy_from_slice() as is done in impl for Vec } impl MutBuffer for Vec { type Frozen = Box<[u8]>; #[inline] + #[instrument] fn freeze(self) -> Self::Frozen { self.into_boxed_slice() } + + #[instrument] + fn copy_from_slice(&mut self, st: usize, buf: &[u8]) -> usize + { + if (st + buf.len()) <= self.len() { + // We can put `buf` in st..buf.len() + self[st..].copy_from_slice(buf); + } else if st <= self.len() { + // The start is lower but the end is not + let rem = self.len() - st; + self[st..].copy_from_slice(&buf[..rem]); + self.extend_from_slice(&buf[rem..]); + } else { + // it is past the end, extend. + self.extend_from_slice(buf); + } + buf.len() + } } /// A trait for buffers that can be allocated with a capacity diff --git a/src/main.rs b/src/main.rs index 52ae69d..33f5f61 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,3 +1,6 @@ + +#[macro_use] extern crate tracing; + #[cfg(feature="jemalloc")] extern crate jemallocator; @@ -14,6 +17,17 @@ use std::{ num::NonZeroUsize, }; +#[allow(unused_imports)] +use color_eyre::{ + eyre::{ + self, + eyre, + WrapErr, + }, + Section, + SectionExt, Help, +}; + mod buffers; use buffers::prelude::*; @@ -45,20 +59,63 @@ where R: AsRawFd } } -fn main() -> io::Result<()> { + +fn init() -> eyre::Result<()> +{ + fn install_tracing() + { + //! Install spantrace handling + + use tracing_error::ErrorLayer; + use tracing_subscriber::prelude::*; + use tracing_subscriber::{fmt, EnvFilter}; + + let fmt_layer = fmt::layer().with_target(false); + let filter_layer = EnvFilter::try_from_default_env() + .or_else(|_| EnvFilter::try_new("info")) + .unwrap(); + + tracing_subscriber::registry() + .with(filter_layer) + .with(fmt_layer) + .with(ErrorLayer::default()) + .init(); + } + + install_tracing(); + + color_eyre::install() +} + +#[instrument] +fn main() -> eyre::Result<()> { + init()?; + //info!("Initialised"); + let (bytes, read) = { let stdin = io::stdin(); let mut bytes: buffers::DefaultMut = try_get_size(&stdin).create_buffer(); - let read = io::copy(&mut stdin.lock(), &mut (&mut bytes).writer())?; + let read = io::copy(&mut stdin.lock(), &mut bytes.writer()) + .with_section(|| bytes.len().header("Buffer size is")) + .with_section(|| bytes.capacity().header("Buffer cap is")) + .with_section(|| format!("{:?}", bytes).header("Buffer is")) + .wrap_err("Failed to read into buffer")?; + (bytes.freeze(), read as usize) }; let written = - io::copy(&mut (&bytes[..read]).reader() , &mut io::stdout().lock())?; + io::copy(&mut (&bytes[..read]).reader() , &mut io::stdout().lock()) + .with_section(|| read.header("Bytes read")) + .with_section(|| bytes.len().header("Buffer length (frozen)")) + .with_section(|| format!("{:?}", &bytes[..read]).header("Read Buffer")) + .with_section(|| format!("{:?}", bytes).header("Full Buffer")) + .wrap_err("Failed to write from buffer")?; if read != written as usize { - return Err(io::Error::new(io::ErrorKind::BrokenPipe, format!("read {read} bytes, but only wrote {written}"))); + return Err(io::Error::new(io::ErrorKind::BrokenPipe, format!("read {read} bytes, but only wrote {written}"))) + .wrap_err("Writing failed: size mismatch"); } Ok(())