add rust fib and update versions

Author: rogusdev

README.md

@@ -1,8 +1,10 @@
-OUTFILE=${BENCHMARK}_`date +%Y%m%d%H%M%S`.json
+NOW=`date +%Y%m%d%H%M%S`
+
+OUTFILE=${BENCHMARK}_${NOW}_out.txt
 ./$BENCHMARK $ARGS > $OUTFILE
 
 aws s3 cp $OUTFILE s3://$BUCKET/$TYPE/
-aws s3 cp /var/log/cloud-init-output.log s3://$BUCKET/$TYPE/
+aws s3 cp /var/log/cloud-init-output.log s3://$BUCKET/$TYPE/${BENCHMARK}_${NOW}_init.log
 
 # https://stackoverflow.com/questions/10541363/self-terminating-aws-ec2-instance
 # https://askubuntu.com/questions/578144/why-doesnt-running-sudo-shutdown-now-shut-down/578155

benchmark_type.sh

@@ -16,12 +16,7 @@ do
 
     for file in "${files[@]}"
     do
-        if [[ $file =~ .*_.*\.json ]]; then
-            aws s3 cp --profile $PROFILE s3://$BUCKET/$TYPE/$file ./${TYPE}_${file}
-            aws s3 rm --profile $PROFILE s3://$BUCKET/$TYPE/$file
-        elif [[ $file = cloud-init-output.log ]]; then
-            aws s3 cp --profile $PROFILE s3://$BUCKET/$TYPE/$file ./${TYPE}-$file
-            aws s3 rm --profile $PROFILE s3://$BUCKET/$TYPE/$file
-        fi
+        aws s3 cp --profile $PROFILE s3://$BUCKET/$TYPE/$file ./${TYPE}_${file}
+        aws s3 rm --profile $PROFILE s3://$BUCKET/$TYPE/$file
     done
 done

clean.sh

@@ -5,5 +5,6 @@ export HOME=/root
 
 apt-get update
 apt-get install -yq git awscli
+apt-get autoremove -y
 
 git clone https://github.com/rogusdev/countbits.git

clone_repo.sh

@@ -1,10 +1,11 @@
 # https://github.com/json-c/json-c
 # https://linuxprograms.wordpress.com/2010/05/20/json-c-libjson-tutorial/
 git clone https://github.com/json-c/json-c.git
-cd json-c && sh autogen.sh && ./configure && make && make install && cd ..
-
+mkdir json-c-build && cd json-c-build && cmake ../json-c
+make && make test && make USE_VALGRIND=0 test && make install
+cd ..
 
 # https://gist.github.com/alan-mushi/19546a0e2c6bd4e059fd
-gcc -Wall -g -I/usr/local/include/json-c/ countbits.c -o countbits -ljson-c
+gcc -Wall -g -I/usr/local/include/json-c-build/ countbits.c -o countbits -ljson-c
 # https://stackoverflow.com/questions/480764/linux-error-while-loading-shared-libraries-cannot-open-shared-object-file-no-s
 export LD_LIBRARY_PATH=/usr/local/lib

countbits/c/build.sh

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />

countbits/csharp/CountBits.csproj

@@ -1 +1,2 @@
-gcc -Wall -g fibonacci.c -o fibonacci
+# https://www.oreilly.com/library/view/c-cookbook/0596007612/ch01s23.html
+gcc -Wall -O3 -finline-functions -g fibonacci.c -o fibonacci

countbits/csharp/build.sh

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
 </Project>

countbits/elixir/build.sh

@@ -1 +1 @@
-dotnet build
+dotnet build --configuration Release

countbits/go/run.sh

@@ -1 +1 @@
-dotnet bin/Debug/netcoreapp2.0/Fibonacci.dll $1
+dotnet bin/Release/netcoreapp3.1/Fibonacci.dll $1

countbits/javascript_1/build.sh

@@ -0,0 +1 @@
+jruby ../ruby/fibonacci.rb $@

countbits/javascript_2/build.sh

@@ -1,18 +1 @@
-#!/usr/bin/env ruby
-
-def recursive_fibonacci(n)
-  if n < 1
-    0
-  elsif n == 1
-    1
-  else
-    recursive_fibonacci(n - 1) + recursive_fibonacci(n - 2)
-  end
-end
-
-n = ARGV[0].to_i
-puts n
-
-start = Time.now.to_f
-puts recursive_fibonacci(n)
-puts ((Time.now.to_f - start) * 1000).to_i
+ruby fibonacci.rb $@

countbits/jruby/build.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+def recursive_fibonacci(n)
+  if n < 1
+    0
+  elsif n == 1
+    1
+  else
+    recursive_fibonacci(n - 1) + recursive_fibonacci(n - 2)
+  end
+end
+
+n = ARGV[0].to_i
+puts n
+
+start = Time.now.to_f
+puts recursive_fibonacci(n)
+puts ((Time.now.to_f - start) * 1000).to_i

countbits/php/build.sh

@@ -1 +1 @@
-rustc fibonacci.rs
+rustc -C debuginfo=0 -C opt-level=3 fibonacci.rs

countbits/python3/build.sh

@@ -1,4 +1,31 @@
-// https://doc.rust-lang.org/book/second-edition/ch01-02-hello-world.html
-fn main() {
-    println!("Hello, world!");
+use std::env;
+use std::time::{SystemTime};
+
+fn recursive_fibonacci (n: i32) -> i32 {
+    if n < 1 {
+        0
+    } else if n == 1 {
+        1
+    } else {
+        recursive_fibonacci(n - 1) + recursive_fibonacci(n - 2)
+    }
+}
+
+fn main () {
+    // https://doc.rust-lang.org/book/ch12-01-accepting-command-line-arguments.html
+    let args: Vec<String> = env::args().collect();
+    // https://doc.rust-lang.org/std/primitive.str.html#method.parse
+    let n = args[1].parse::<i32>().unwrap();
+    println!("{}", n);
+
+    // https://doc.rust-lang.org/std/time/struct.SystemTime.html
+    let start = SystemTime::now();
+
+    println!("{}", recursive_fibonacci(n));
+
+    let dur = SystemTime::now()
+        .duration_since(start)
+        .expect("Time went backwards");
+
+    println!("{}", (dur.as_secs() * 1_000) + dur.subsec_millis() as u64)
 }

countbits/ruby/build.sh

@@ -4,18 +4,18 @@ export BUCKET=...
 REGION=us-east-1
 KEYPAIR=ec2-keypair
 
-# https://cloud-images.ubuntu.com/locator/ec2/  # 64 us-east-1 ebs hvm
-IMAGEID=ami-6dfe5010
+# https://cloud-images.ubuntu.com/locator/ec2/  # amd64 us-east-1 ebs-ssd hvm
+IMAGEID=ami-013da1cc4ae87618c
 
 
-export BENCHMARK=$1
+export BENCHMARK="$1"
 
 # https://stackoverflow.com/questions/2427995/bash-no-arguments-warning-and-case-decisions
-if [[ $# -eq 0 ]]; then BENCHMARK='countbits'; fi
+if [[ $# -eq 0 ]]; then BENCHMARK="countbits"; fi
 
-case "$1" in
+case "$BENCHMARK" in
     # https://unix.stackexchange.com/questions/62333/setting-a-shell-variable-in-a-null-coalescing-fashion
-    fibonacci) export ARGS=${2:-42} ;;
+    fibonacci) export ARGS="${2:-42}" ;;
     *) ;;
 esac
 
@@ -29,6 +29,7 @@ echo $SGID
 
 echo $PROFILE $REGION $BUCKET $TYPE $KEYPAIR $IMAGEID $SGID
 
+NOW=`date +%Y%m%d%H%M%S`
 
 # https://www.cyberciti.biz/faq/bash-for-loop-array/
 types=( c csharp elixir go java java_1 java_2 jruby javascript javascript_1 javascript_2 php python3 ruby rust )
@@ -44,18 +45,22 @@ do
         continue
     fi
 
+    echo ""
+
     echo "aws s3 ls --profile $PROFILE $BUCKET/$TYPE/"
     aws s3 ls --profile $PROFILE $BUCKET/$TYPE/
 
     # https://superuser.com/questions/133780/in-bash-how-do-i-escape-an-exclamation-mark
     # https://stackoverflow.com/questions/10683349/forcing-bash-to-expand-variables-in-a-string-loaded-from-a-file
     USERDATA=$(
-        echo -e "#"'!'"/bin/bash\n\n# ----- CLONE -----\n"
+        echo -e "#"'!'"/bin/bash\n"
+        echo -e "\n# ----- CLONE -----\n"
         cat clone_repo.sh
         echo -e "\n# ----- SETUP -----\n"
         cat setup/$LANG/setup.sh
         echo -e "\n# ----- BUILD -----\n"
-        echo -e "cd countbits/$BENCHMARK/$TYPE && . ./build.sh\n\n# ----- RUN AND COPY -----\n"
+        echo -e "cd countbits/$BENCHMARK/$TYPE && . ./build.sh\n"
+        echo -e "\n# ----- RUN AND COPY -----\n"
         envsubst \$BUCKET,\$BENCHMARK,\$TYPE,\$ARGS < benchmark_type.sh
     )
 
@@ -79,7 +84,7 @@ do
         --profile $PROFILE \
         --region $REGION \
         --resources $INSTANCEID \
-        --tags Key=Name,Value="$BENCHMARK $TYPE"
+        --tags Key=Name,Value="$BENCHMARK $TYPE $NOW"
 
     DOMAIN=$(aws ec2 describe-instances \
         --profile $PROFILE \
@@ -93,6 +98,7 @@ done
 
 unset ARGS  # in case it was set for fibonacci
 
+echo ""
 echo "aws ec2 describe-instances --profile $PROFILE --region $REGION --query 'Reservations[*].Instances[*].[LaunchTime, InstanceId, State.Name, Tags[0].Value]' --output text"
 
 aws ec2 describe-instances \

fibonacci/c/build.sh

@@ -1 +1,3 @@
-sudo apt-get install -yq build-essential gcc autoconf automake libtool
+sudo apt-get install -yq build-essential gcc autoconf automake libtool cmake
+
+gcc --version

fibonacci/csharp/Fibonacci.csproj

@@ -1,11 +1,19 @@
-curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/microsoft.gpg
-sudo sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-xenial-prod xenial main" > /etc/apt/sources.list.d/dotnetdev.list' 
+# https://docs.microsoft.com/en-us/dotnet/core/install/linux-ubuntu
+wget https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
+sudo dpkg -i packages-microsoft-prod.deb
 
-sudo apt-get update
-sudo apt-get install -yq dotnet-sdk-2.1.4
+sudo apt-get update; \
+  sudo apt-get install -y apt-transport-https && \
+  sudo apt-get update && \
+  sudo apt-get install -y dotnet-sdk-3.1
 
 # https://www.michaelcrump.net/part12-aspnetcore/
-export DOTNET_CLI_TELEMETRY_OPTOUT=1
+export DOTNET_CLI_TELEMETRY_OPTOUT=true
 
-# https://github.com/dotnet/cli/issues/6815
-export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
+# https://github.com/dotnet/sdk/issues/3828
+# export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
+export DOTNET_NOLOGO=true
+# https://docs.microsoft.com/en-us/nuget/reference/cli-reference/cli-ref-environment-variables
+export NUGET_XMLDOC_MODE=skip
+
+echo dotnet $(dotnet --version)

fibonacci/csharp/build.sh

@@ -1,10 +1,13 @@
 # http://elixir-lang.github.io/install.html#unix-and-unix-like
-wget https://packages.erlang-solutions.com/erlang-solutions_1.0_all.deb
-sudo dpkg -i erlang-solutions_1.0_all.deb
+wget https://packages.erlang-solutions.com/erlang-solutions_2.0_all.deb
+sudo dpkg -i erlang-solutions_2.0_all.deb
 sudo apt-get update
-sudo apt-get install -yq esl-erlang elixir
-rm erlang-solutions_1.0_all.deb
+sudo apt-get install -y esl-erlang elixir
+rm erlang-solutions_2.0_all.deb
 
 # https://github.com/voxpupuli/puppet-rabbitmq/issues/671
+# https://github.com/elixir-lang/elixir/issues/3548
 export LANG="en_US.UTF-8"
 export LC_ALL="en_US.UTF-8"
+
+erl -version

fibonacci/csharp/fibonacci

@@ -1,7 +1,9 @@
-# https://golang.org/doc/install && https://golang.org/dl/
+# https://golang.org/doc/install#download
 sudo rm -rf /usr/local/go
-wget -L https://dl.google.com/go/go1.10.1.linux-amd64.tar.gz \
+wget -L https://golang.org/dl/go1.15.2.linux-amd64.tar.gz \
   && sudo tar -C /usr/local -xzf go*.tar.gz
 
-echo 'export PATH="/usr/local/go/bin:$PATH"' >> $HOME/.profile
-export PATH="/usr/local/go/bin:$PATH"
+echo 'export PATH=$PATH:/usr/local/go/bin' >> $HOME/.profile
+export PATH=$PATH:/usr/local/go/bin
+
+go version

fibonacci/elixir/build.sh

@@ -1,11 +1,7 @@
-# oracle java, probably best via some user PPA:
-#  http://www.webupd8.org/2012/01/install-oracle-java-jdk-7-in-ubuntu-via.html
-# https://askubuntu.com/questions/190582/installing-java-automatically-with-silent-option/637514#637514
-# must switch to java 11 soon! http://www.oracle.com/technetwork/java/eol-135779.html
-sudo add-apt-repository -y ppa:webupd8team/java
-echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections
+. countbits/setup/setup_asdf.sh
 
-sudo apt-get update
-sudo apt-get install -yq oracle-java8-installer
+asdf plugin-add java https://github.com/halcyon/asdf-java.git
+asdf install java $VERSION_JAVA
+asdf global java $VERSION_JAVA
 
-export JAVA_HOME=/usr/lib/jvm/java-8-oracle
+java -version

fibonacci/java/Fibonacci.class

@@ -1,4 +1,6 @@
-curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
+curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash -
 
 sudo apt-get update
 sudo apt-get install -yq git nodejs
+
+echo node $(node --version)

fibonacci/javascript/build.sh

@@ -1,6 +1,8 @@
 . countbits/setup/java/setup.sh
 
-curl https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.1.16.0/jruby-dist-9.1.16.0-bin.tar.gz | tar xvz
+curl https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.2.13.0/jruby-dist-9.2.13.0-bin.tar.gz | tar xvz
 ln -s jruby-* jruby
 
 export PATH=$(pwd)/jruby/bin:$PATH
+
+jruby --version

fibonacci/jruby/build.sh

@@ -1 +1,3 @@
-sudo apt-get install -yq php7.0-cli
+sudo apt-get install -yq php-cli
+
+php --version

fibonacci/jruby/fibonacci

@@ -1 +1,3 @@
 sudo apt-get install -yq python3
+
+echo python3 $(python3 --version)

fibonacci/php/build.sh

@@ -1,6 +1,8 @@
-sudo apt-get install -yq build-essential gcc
+./countbits/setup/setup_asdf.sh  # for dependencies like openssl
 
 # https://github.com/rbenv/ruby-build/issues/156
-curl https://cache.ruby-lang.org/pub/ruby/2.5/ruby-2.5.1.tar.gz \
+curl https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.1.tar.gz \
   | tar xvz && cd ruby-* && ./configure --disable-install-doc \
   && make && sudo make install && cd .. && rm -rf ruby-*
+
+ruby --version

fibonacci/python3/build.sh

@@ -6,3 +6,5 @@ curl https://sh.rustup.rs -sSf | sh -s -- -y
 
 echo 'export PATH="$HOME/.cargo/bin:$PATH"' >> $HOME/.profile
 PATH="$HOME/.cargo/bin:$PATH"
+
+rustc --version