C++/Luna (#3468)

.travis.yml

@@ -26,7 +26,7 @@ env:
     # - "TESTDIR=C++/ulib"
      - "TESTDIR=C++/wt"
      - "TESTDIR=C++/poco"
-    # - "TESTDIR=C++/luna"
+     - "TESTDIR=C++/luna"
      - "TESTDIR=Clojure/aleph"
      - "TESTDIR=Clojure/compojure"
      - "TESTDIR=Clojure/http-kit"

frameworks/C++/luna/benchmark_config.json

@@ -2,7 +2,6 @@
   "framework": "luna",
   "tests": [{
     "default": {
-      "setup_file": "setup",
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 8080,
@@ -21,7 +20,6 @@
       "versus": ""
     },
     "epoll": {
-      "setup_file": "setup_epoll",
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 8080,
@@ -39,8 +37,7 @@
       "notes": "",
       "versus": ""
     },
-    "thread-per-connection": {
-      "setup_file": "setup_thread",
+    "thread": {
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 8080,

frameworks/C++/luna/luna-base.dockerfile

@@ -0,0 +1,15 @@
+FROM tfb/gcc-4.9:latest
+
+RUN apt install -yqq python-dev python-pip cmake autoconf
+
+# We're using conan 0.28.1 because, as of this writing, later versions of conan
+# are incompatible with the luna framework, and luna is the only framework that
+# uses conan.
+RUN pip install conan==0.28.1
+
+ADD ./ /luna
+WORKDIR /luna
+
+RUN CC=gcc-4.9 CXX=g++-4.9 conan install --build=missing -s compiler="gcc" -s compiler.version="4.9" .
+RUN cmake . -DCMAKE_CXX_COMPILER=g++-4.9 -DCMAKE_CC_COMPILER=gcc-4.9
+RUN cmake --build .

frameworks/C++/luna/luna-epoll.dockerfile

@@ -0,0 +1,3 @@
+FROM tfb/luna-base:latest
+
+CMD /luna/bin/lunabench_epoll 8080 $((2 * $CPU_COUNT))

frameworks/C++/luna/luna-thread.dockerfile

@@ -0,0 +1,3 @@
+FROM tfb/luna-base:latest
+
+CMD /luna/bin/lunabench_thread 8080

frameworks/C++/luna/luna.dockerfile

@@ -0,0 +1,3 @@
+FROM tfb/luna-base:latest
+
+CMD /luna/bin/lunabench_default 8080 $((2 * $CPU_COUNT))

frameworks/C++/luna/setup.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-fw_depends luna
-
-CC=gcc-4.9 CXX=g++-4.9 conan install --build=missing -s compiler="gcc" -s compiler.version="4.9" .
-cmake . -DCMAKE_CXX_COMPILER=g++-4.9 -DCMAKE_CC_COMPILER=gcc-4.9
-cmake --build .
-
-MAX_THREADS=$((2 * $CPU_COUNT))
-
-$TROOT/bin/lunabench_default 8080 $MAX_THREADS

frameworks/C++/luna/setup_epoll.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-fw_depends luna
-
-CC=gcc-4.9 CXX=g++-4.9 conan install --build=missing -s compiler="gcc" -s compiler.version="4.9" .
-cmake . -DCMAKE_CXX_COMPILER=g++-4.9 -DCMAKE_CC_COMPILER=gcc-4.9
-cmake --build .
-
-MAX_THREADS=$((2 * $CPU_COUNT))
-
-$TROOT/bin/lunabench_epoll 8080 $MAX_THREADS

frameworks/C++/luna/setup_thread.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-fw_depends luna
-
-CC=gcc-4.9 CXX=g++-4.9 conan install --build=missing -s compiler="gcc" -s compiler.version="4.9" .
-cmake . -DCMAKE_CXX_COMPILER=g++-4.9 -DCMAKE_CC_COMPILER=gcc-4.9
-cmake --build .
-
-$TROOT/bin/lunabench_thread 8080

toolset/setup/docker/systools/gcc-4.9.dockerfile

@@ -0,0 +1,6 @@
+FROM tfb/base:latest
+
+RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test
+RUN apt update -y
+RUN apt install -y g++-4.9
+RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.9 50

toolset/setup/linux/systools/conan.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-fw_depends python-dev
-
-fw_installed conan && return 0
-
-# We're using conan 0.28.1 because, as of this writing, later versions of conan
-# are incompatible with the luna framework, and luna is the only framework that
-# uses conan.
-pip install --user -Iv conan==0.28.1
-
-echo -e "export PATH=~/.local/bin:\$PATH" > $IROOT/conan.installed
-
-source $IROOT/conan.installed

toolset/setup/linux/systools/gcc-4.9.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-fw_installed gcc-4.9 && return 0
-
-sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-sudo apt-get -yq update
-sudo apt-get install -qqy gcc-4.9 g++-4.9
-
-touch $IROOT/gcc-4.9.installed