Browse Source

Update wrk to version 4.2.0 (#7783)

Anton Kirilov 2 years ago
parent
commit
4f2e2df338
4 changed files with 6 additions and 6 deletions
  1. 1 1
      toolset/wrk/concurrency.sh
  2. 1 1
      toolset/wrk/pipeline.sh
  3. 1 1
      toolset/wrk/query.sh
  4. 3 3
      toolset/wrk/wrk.dockerfile

+ 1 - 1
toolset/wrk/concurrency.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-let max_threads=$(cat /proc/cpuinfo | grep processor | wc -l)
+let max_threads=$(nproc)
 echo ""
 echo "---------------------------------------------------------"
 echo " Running Primer $name"

+ 1 - 1
toolset/wrk/pipeline.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-let max_threads=$(cat /proc/cpuinfo | grep processor | wc -l)
+let max_threads=$(nproc)
 echo ""
 echo "---------------------------------------------------------"
 echo " Running Primer $name"

+ 1 - 1
toolset/wrk/query.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-let max_threads=$(cat /proc/cpuinfo | grep processor | wc -l)
+let max_threads=$(nproc)
 echo ""
 echo "---------------------------------------------------------"
 echo " Running Primer $name"

+ 3 - 3
toolset/wrk/wrk.dockerfile

@@ -1,10 +1,10 @@
-FROM buildpack-deps:bionic
+FROM buildpack-deps:jammy
 
 RUN apt-get update && apt-get install -yqq libluajit-5.1-dev libssl-dev luajit
 
 WORKDIR /wrk
-RUN curl -sL https://github.com/wg/wrk/archive/4.1.0.tar.gz | tar xz --strip-components=1
-ENV LDFLAGS="-O3 -march=native -flto"
+RUN curl -sL https://github.com/wg/wrk/archive/4.2.0.tar.gz | tar xz --strip-components=1
+ENV LDFLAGS="-O3 -march=native -mtune=native -flto"
 ENV CFLAGS="-I /usr/include/luajit-2.1 $LDFLAGS"
 RUN make WITH_LUAJIT=/usr WITH_OPENSSL=/usr -j "$(nproc)"
 RUN cp wrk /usr/local/bin