Merge pull request #2443 from nbrady-techempower/silicon-fix

C++/silicon framework fix

frameworks/C++/silicon/README.md

@@ -0,0 +1,8 @@
+# C++/silicon Benchmarking test
+
+Silicon is a C++ web framework located at https://github.com/matt-42/silicon
+
+### Note
+
+The `silicon-epoll-mysql` and `silicon-lwan-mysql` tests are currently not working. They have been removed from the `benchmark_config.json` file but the implementations still exist. You can see the old `benchmark_config.json` [here](https://github.com/TechEmpower/FrameworkBenchmarks/blob/5d44d57cbb5cbc209a2d6aeb23010b466c055200/frameworks/C%2B%2B/silicon/benchmark_config.json).
+

frameworks/C++/silicon/benchmark_config.json

@@ -24,55 +24,6 @@
       "display_name": "silicon-tpc-mysql",
       "notes": "",
       "versus": "silicon"
-    },
-    "epoll-mysql": {
-      "setup_file": "setup_mhd_epoll_mysql",
-      "json_url"       : "/json",
-      "db_url"         : "/db",
-      "query_url"      : "/queries?queries=",
-      "fortune_url"    : "/fortunes",
-      "update_url"     : "/updates?queries=",
-      "plaintext_url"  : "/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Micro",
-      "database": "MySQL",
-      "framework": "silicon",
-      "language": "C++",
-      "flavor": "None",
-      "orm": "Full",
-      "platform": "None",
-      "webserver": "microhttpd",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "silicon-epoll-mysql",
-      "notes": "",
-      "versus": "silicon"
-    },
-    "lwan-mysql": {
-      "setup_file": "setup_lwan_mysql",
-      "json_url"       : "/json",
-      "db_url"         : "/db",
-      "query_url"      : "/queries?queries=",
-      "fortune_url"    : "/fortunes",
-      "update_url"     : "/updates?queries=",
-      "plaintext_url"  : "/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Micro",
-      "database": "MySQL",
-      "framework": "silicon",
-      "language": "C++",
-      "flavor": "None",
-      "orm": "Full",
-      "platform": "None",
-      "webserver": "Lwan",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "silicon-lwan-mysql",
-      "notes": "",
-      "versus": "silicon"
     }
-    
   }]
 }

frameworks/C++/silicon/setup_lwan_mysql.sh

@@ -5,7 +5,7 @@ fw_depends mysql silicon lwan
 rm -rf build
 mkdir build
 cd build
-cmake .. -DCMAKE_CXX_COMPILER=clang++-3.8
+cmake .. -DCMAKE_CXX_COMPILER=clang++-3.9
 make silicon_lwan_mysql
 
 $TROOT/build/silicon_lwan_mysql ${DBHOST} 8080 &

frameworks/C++/silicon/setup_mhd_epoll_mysql.sh

@@ -5,7 +5,7 @@ fw_depends mysql silicon microhttpd
 rm -rf build
 mkdir build
 cd build
-cmake .. -DCMAKE_CXX_COMPILER=clang++-3.8
+cmake .. -DCMAKE_CXX_COMPILER=clang++-3.9
 make silicon_epoll_mysql
 
 $TROOT/build/silicon_epoll_mysql ${DBHOST} 8080 ${MAX_THREADS} &

frameworks/C++/silicon/setup_mhd_tpc_mysql.sh

@@ -5,7 +5,7 @@ fw_depends mysql silicon microhttpd
 rm -rf build
 mkdir build
 cd build
-cmake .. -DCMAKE_CXX_COMPILER=clang++-3.8
+cmake .. -DCMAKE_CXX_COMPILER=clang++-3.9
 make silicon_tpc_mysql
 
 $TROOT/build/silicon_tpc_mysql ${DBHOST} 8080 ${MAX_THREADS} &

toolset/setup/linux/frameworks/silicon.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends libboost-dev clang-3.8 gcc-4.9
+fw_depends libboost-dev clang-3.9 gcc-4.9
 
 RETCODE=$(fw_exists ${IROOT}/silicon.installed)
 [ ! "$RETCODE" == 0 ] || { \
@@ -12,9 +12,9 @@ SILICON=$IROOT/silicon
 
 git clone https://github.com/matt-42/silicon.git
 cd silicon;
-# May 18th, 2016
-git checkout 73dac7f3c8dcd4f9c53713456e8b73165006e968
-CC=clang-3.8 CXX=clang++-3.8 ./install.sh $IROOT
+# December 28th, 2016
+git checkout 1fed7cead9490e3054af730ac9bf04ae4cf5009d
+CC=clang-3.9 CXX=clang++-3.9 ./install.sh $IROOT
 
 echo "" > $IROOT/silicon.installed
 

toolset/setup/linux/systools/clang-3.9.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-
 RETCODE=$(fw_exists ${IROOT}/clang-3.9.installed)
 [ ! "$RETCODE" == 0 ] || { \
   source $IROOT/clang-3.9.installed