Locked stdin and out for rust sbp2json (#1161)

* locked stdin and out for rust sbp2json

* updated benchmark thresholds

* updated python dockerfile to slim-buster

* updated rust dockerfile version 1.55 -> 1.61

* installing musl-tools in docker

* changed to build musl-tools for linux

Co-authored-by: Jason Mobarak <[email protected]>

Author: adrian-kong

python/Dockerfile.benchmark

@@ -1,4 +1,4 @@
-FROM python:3.7-slim-stretch
+FROM python:3.7-slim-buster
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN    apt-get update \

rust/Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.55-slim-buster
+FROM rust:1.61-slim-buster
 
 ARG DEBIAN_FRONTEND=noninterative
 
@@ -13,14 +13,15 @@ RUN mkdir -p $SCCACHE_DIR
 
 RUN \
       apt-get update \
-   && apt-get install -y libssl-dev pkg-config curl build-essential make \
+   && apt-get install -y libssl-dev pkg-config curl build-essential make musl-tools \
    && curl -sSL -o /tmp/sccache.tgz "${SCCACHE_URL}" \
    && mkdir /tmp/sccache \
    && tar --strip-components=1 -C /tmp/sccache -xzf /tmp/sccache.tgz \
    && mv /tmp/sccache/sccache /usr/local/bin \
    && chmod +x /usr/local/bin/sccache \
    && rustup component add rustfmt \
    && rustup component add clippy \
+   && rustup target add x86_64-unknown-linux-musl \
    && rm -rf /var/lib/apt/lists/* \
    && rm -rf /tmp/sccache /tmp/sccache.tgz
 

rust/sbp2json/src/bin/json2json.rs

@@ -53,12 +53,12 @@ fn main() -> Result<()> {
 
     let stdin: Box<dyn Read> = match options.input {
         Some(path) => Box::new(File::open(path)?),
-        _ => Box::new(io::stdin()),
+        _ => Box::new(io::stdin().lock()),
     };
 
     let stdout: Box<dyn Write> = match options.output {
         Some(path) => Box::new(File::create(path)?),
-        _ => Box::new(io::stdout()),
+        _ => Box::new(io::stdout().lock()),
     };
 
     if options.float_compat {

rust/sbp2json/src/bin/json2sbp.rs

@@ -48,12 +48,12 @@ fn main() -> Result<()> {
 
     let stdin: Box<dyn Read> = match options.input {
         Some(path) => Box::new(File::open(path)?),
-        _ => Box::new(io::stdin()),
+        _ => Box::new(io::stdin().lock()),
     };
 
     let stdout: Box<dyn Write> = match options.output {
         Some(path) => Box::new(File::create(path)?),
-        _ => Box::new(io::stdout()),
+        _ => Box::new(io::stdout().lock()),
     };
 
     json2sbp(stdin, stdout, options.buffered, options.fatal_errors)

rust/sbp2json/src/bin/sbp2json.rs

@@ -57,12 +57,12 @@ fn main() -> Result<()> {
 
     let stdin: Box<dyn Read> = match options.input {
         Some(path) => Box::new(File::open(path)?),
-        _ => Box::new(io::stdin()),
+        _ => Box::new(io::stdin().lock()),
     };
 
     let stdout: Box<dyn Write> = match options.output {
         Some(path) => Box::new(File::create(path)?),
-        _ => Box::new(io::stdout()),
+        _ => Box::new(io::stdout().lock()),
     };
 
     if options.float_compat {

scripts/ci_benchmark.bash

@@ -53,13 +53,13 @@ docker run \
   --rm \
   --name rust-sbp2json-run \
   rust-sbp2json \
-  cargo build --release
+  cargo build --release --target=x86_64-unknown-linux-musl
 
 sudo chown    "$USER:$USER" "$HOME/.docker-cache"
 sudo chown -R "$USER:$USER" "$HOME/.docker-cache/cargo"
 sudo chown -R "$USER:$USER" "$PWD"
 
-rust_bins="$HOME/.docker-cache/cargo/work/release"
+rust_bins="$HOME/.docker-cache/cargo/work/x86_64-unknown-linux-musl/release"
 
 mkdir -p bin
 

scripts/ci_build_rust.bash

@@ -19,9 +19,13 @@ else
     exit 1
 fi
 
-cargo build --all --release
-
-cd target/release
+if [ "$RUNNER_OS" == "Linux" ]; then
+  cargo build --all --release --target=x86_64-unknown-linux-musl
+  cd target/x86_64-unknown-linux-musl/release
+else
+  cargo build --all --release
+  cd target/release
+fi
 
 strip "${EXECUTABLES[@]}"
 

scripts/ci_prepare_python.bash

@@ -28,6 +28,7 @@ sudo apt-get install -y \
     python3 python3-dev python3-distutils \
     python3.9 python3.9-dev python3.9-distutils \
     python3.10 python3.10-dev python3.10-distutils \
+    musl-tools \
     tox dpkg-dev wget
 
 pip3 install wheel setuptools

scripts/ci_prepare_rust.bash

@@ -4,7 +4,8 @@ set -ex
 
 if [ "$RUNNER_OS" == "Linux" ]; then
     sudo apt-get -qq update
-    sudo apt-get -qq install -y pkg-config build-essential libudev-dev
+    sudo apt-get -qq install -y pkg-config build-essential libudev-dev musl-tools
+    rustup target add x86_64-unknown-linux-musl
 elif [ "$RUNNER_OS" == "macOS" ]; then
     brew install cmake
 elif [ "$RUNNER_OS" == "Windows" ]; then

test_data/benchmark_main.py

@@ -11,16 +11,16 @@
 
 # How much faster Rust should be than other implementations
 RATIOS_SBP2JSON = {
-    "haskell": 2.19,
-    "python": 24.96,
+    "haskell": 2.08,
+    "python": 17.48,
 }
 
 RATIOS_JSON2SBP = {
     "haskell": 2.05,
 }
 
 RATIOS_JSON2JSON = {
-    "haskell": 2.78,
+    "haskell": 2.60,
 }
 
 FAILED = [False]