shuf: Tune performance for -i 1-1000000

Author: oech3

src/uu/shuf/src/shuf.rs

@@ -3,7 +3,7 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
-// spell-checker:ignore (ToDO) cmdline evec nonrepeating seps shufable rvec fdata
+// spell-checker:ignore (ToDO) cmdline codegen-units evec nonrepeating seps shufable rvec fdata
 
 use std::ffi::{OsStr, OsString};
 use std::fs::File;
@@ -378,6 +378,7 @@ impl Writable for &OsStr {
 }
 
 impl Writable for u64 {
+    #[inline]
     fn write_all_to(&self, output: &mut impl OsWrite) -> Result<(), Error> {
         // The itoa crate is surprisingly much more efficient than a formatted write.
         // It speeds up `shuf -r -n1000000 -i1-1024` by 1.8×.
@@ -386,13 +387,23 @@ impl Writable for u64 {
     }
 }
 
+#[cold]
+#[inline(never)]
+fn error_write_failed(e: std::io::Error) -> Box<dyn uucore::error::UError> {
+    use uucore::error::FromIo;
+    let ctx = translate!("shuf-error-write-failed");
+    e.map_err_context(move || ctx)
+}
+
+//#[inline(never)] //maybe, codegen-units=1 needs it?
 fn shuf_exec(
     input: &mut impl Shufable,
     opts: &Options,
     rng: &mut WrappedRng,
     output: &mut BufWriter<Box<dyn OsWrite>>,
 ) -> UResult<()> {
     let ctx = || translate!("shuf-error-write-failed");
+    let sep = [opts.sep];
     if opts.repeat {
         if input.is_empty() {
             return Err(USimpleError::new(
@@ -402,17 +413,21 @@ fn shuf_exec(
         }
         for _ in 0..opts.head_count {
             let r = input.choose(rng)?;
-
-            r.write_all_to(output).map_err_context(ctx)?;
-            output.write_all(&[opts.sep]).map_err_context(ctx)?;
+            if let Err(e) = r.write_all_to(output) {
+                return Err(error_write_failed(e));
+            }
+            if let Err(e) = output.write_all(&sep) {
+                return Err(error_write_failed(e));
+            }
         }
     } else {
         let shuffled = input.partial_shuffle(rng, opts.head_count)?;
+        let sep = [opts.sep];
 
         for r in shuffled {
             let r = r?;
-            r.write_all_to(output).map_err_context(ctx)?;
-            output.write_all(&[opts.sep]).map_err_context(ctx)?;
+            r.write_all_to(output).map_err(error_write_failed)?;
+            output.write_all(&sep).map_err(error_write_failed)?;
         }
     }
     output.flush().map_err_context(ctx)?;