Browse Source

Merge branch 'master' into uwsgi_perf

Conflicts:
	bottle/benchmark_config
	flask/benchmark_config
	uwsgi/benchmark_config
	wsgi/benchmark_config

I used a webserver value of "nginx-uWSGI" when uWSGI is used in
combination with nginx. I also changed the 'platform' value
for the uwsgi directory to 'wsgi' since that is the real
platform used.
Malcolm Evershed 12 years ago
parent
commit
68cd905f5a
100 changed files with 1931 additions and 210 deletions
  1. 65 10
      HttpListener/benchmark_config
  2. 65 10
      aspnet-stripped/benchmark_config
  3. 234 28
      aspnet/benchmark_config
  4. 9 1
      aspnet/setup_nginx.py
  5. 13 1
      beego/benchmark_config
  6. 66 6
      bottle/benchmark_config
  7. 13 1
      cake/benchmark_config
  8. 2 0
      cake/deploy/nginx.conf
  9. 26 2
      compojure/benchmark_config
  10. 0 0
      config/database_sftp_batch
  11. 13 1
      cowboy/benchmark_config
  12. 53 5
      cpoll_cppsp/benchmark_config
  13. 26 2
      dancer/benchmark_config
  14. 1 0
      dancer/nginx.conf
  15. 26 2
      dart-start/benchmark_config
  16. 26 2
      dart-stream/benchmark_config
  17. 13 1
      dart/benchmark_config
  18. 39 3
      django/benchmark_config
  19. 23 11
      dropwizard/benchmark_config
  20. BIN
      elli/.benchmark_config.swp
  21. 13 1
      elli/benchmark_config
  22. 39 3
      express/benchmark_config
  23. 39 3
      falcon/benchmark_config
  24. 13 1
      falcore/benchmark_config
  25. 23 13
      finagle/benchmark_config
  26. 79 7
      flask/benchmark_config
  27. 13 1
      gemini/benchmark_config
  28. 13 1
      go/benchmark_config
  29. 13 1
      grails/benchmark_config
  30. 13 1
      grizzly-bm/benchmark_config
  31. 13 1
      grizzly-jersey/benchmark_config
  32. 39 3
      hapi/benchmark_config
  33. 13 1
      http-kit/benchmark_config
  34. 13 1
      jester/benchmark_config
  35. 4 2
      jester/config/nginx.conf
  36. 26 2
      kelp/benchmark_config
  37. 1 0
      kelp/nginx.conf
  38. 13 1
      lapis/benchmark_config
  39. 13 1
      lift-stateless/benchmark_config
  40. 26 2
      luminus/benchmark_config
  41. 26 2
      mojolicious/benchmark_config
  42. 1 0
      mojolicious/nginx.conf
  43. 26 3
      nancy/benchmark_config
  44. 9 1
      nancy/setup_nginx.py
  45. 13 1
      netty/benchmark_config
  46. 65 5
      nodejs/benchmark_config
  47. 26 2
      onion/benchmark_config
  48. 13 1
      openresty/benchmark_config
  49. 26 2
      php-codeigniter/benchmark_config
  50. 2 0
      php-codeigniter/deploy/nginx.conf
  51. 13 1
      php-fuel/benchmark_config
  52. 2 0
      php-fuel/deploy/nginx.conf
  53. 26 2
      php-kohana/benchmark_config
  54. 2 0
      php-kohana/deploy/nginx.conf
  55. 26 2
      php-laravel/benchmark_config
  56. 2 0
      php-laravel/deploy/nginx.conf
  57. 13 1
      php-lithium/benchmark_config
  58. 2 0
      php-lithium/deploy/nginx.conf
  59. 13 1
      php-micromvc/benchmark_config
  60. 2 0
      php-micromvc/deploy/nginx.conf
  61. 13 1
      php-phalcon-micro/benchmark_config
  62. 2 0
      php-phalcon-micro/deploy/nginx.conf
  63. 13 1
      php-phalcon/benchmark_config
  64. 2 0
      php-phalcon/deploy/nginx.conf
  65. 13 1
      php-phpixie/benchmark_config
  66. 2 0
      php-phpixie/deploy/nginx.conf
  67. 13 1
      php-silex-orm/benchmark_config
  68. 2 0
      php-silex-orm/deploy/nginx.conf
  69. 26 2
      php-silex/benchmark_config
  70. 2 0
      php-silex/deploy/nginx.conf
  71. 2 0
      php-silex/deploy/nginx_raw.conf
  72. 13 1
      php-silica/benchmark_config
  73. 2 0
      php-silica/deploy/nginx.conf
  74. 13 1
      php-slim/benchmark_config
  75. 2 0
      php-slim/deploy/nginx.conf
  76. 39 3
      php-symfony2/benchmark_config
  77. 2 0
      php-symfony2/deploy/nginx.conf
  78. 13 1
      php-yaf/benchmark_config
  79. 2 0
      php-yaf/deploy/nginx.conf
  80. 26 2
      php/benchmark_config
  81. 2 0
      php/deploy/nginx.conf
  82. 13 1
      phreeze/benchmark_config
  83. 2 0
      phreeze/deploy/nginx.conf
  84. 13 1
      plack/benchmark_config
  85. 26 15
      plain/benchmark_config
  86. 13 1
      play-java-jpa/benchmark_config
  87. 13 1
      play-java/benchmark_config
  88. 13 1
      play-scala-mongodb/benchmark_config
  89. 13 1
      play-scala/benchmark_config
  90. 13 1
      play-slick/benchmark_config
  91. 13 1
      play1/benchmark_config
  92. 13 1
      play1siena/benchmark_config
  93. 26 2
      rack/benchmark_config
  94. 4 2
      rack/config/nginx.conf
  95. 13 1
      racket-ws/benchmark_config
  96. 26 2
      rails-stripped/benchmark_config
  97. 4 2
      rails-stripped/config/nginx.conf
  98. 26 2
      rails/benchmark_config
  99. 4 2
      rails/config/nginx.conf
  100. 39 3
      restexpress/benchmark_config

+ 65 - 10
HttpListener/benchmark_config

@@ -3,51 +3,106 @@
   "tests": [{
     "default": {
       "setup_file": "setup",
-      "os": "nt",
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 150
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "None",
+      "framework": "http-listener",
+      "language": "C#",
+      "orm": "Raw",
+      "platform": "NET",
+      "webserver": "IIS",
+      "os": "Windows",
+      "database_os": "Linux",
+      "display_name": "http-listener",
+      "notes": "",
+      "versus": ""
     },
     "mysql-raw": {
       "setup_file": "setup",
-      "os": "nt",
       "db_url": "/db?provider=mysql",
       "query_url": "/db?provider=mysql&queries=",
       "fortune_url": "/fortunes?provider=mysql",
       "update_url": "/updates?provider=mysql&queries=",
       "port": 8080,
-      "sort": 151
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "MySQL",
+      "framework": "http-listener",
+      "language": "C#",
+      "orm": "Raw",
+      "platform": "NET",
+      "webserver": "IIS",
+      "os": "Windows",
+      "database_os": "Linux",
+      "display_name": "http-listener",
+      "notes": "",
+      "versus": "http-listener"
     },
     "postgresql-raw": {
       "setup_file": "setup",
-      "os": "nt",
       "db_url": "/db?provider=postgresql",
       "query_url": "/db?provider=postgresql&queries=",
       "fortune_url": "/fortunes?provider=postgresql",
       "update_url": "/updates?provider=postgresql&queries=",
       "port": 8080,
-      "sort": 152
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "Postgres",
+      "framework": "http-listener",
+      "language": "C#",
+      "orm": "Raw",
+      "platform": "NET",
+      "webserver": "IIS",
+      "os": "Windows",
+      "database_os": "Linux",
+      "display_name": "http-listener",
+      "notes": "",
+      "versus": "http-listener"
     },
     "mongodb-raw": {
       "setup_file": "setup",
-      "os": "nt",
       "db_url": "/mongodbdb",
       "query_url": "/mongodbdb?queries=",
       "fortune_url": "/mongodbfortunes",
       "update_url": "/mongodbupdates?queries=",
       "port": 8080,
-      "sort": 153
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "MongoDB",
+      "framework": "http-listener",
+      "language": "C#",
+      "orm": "Raw",
+      "platform": "NET",
+      "webserver": "IIS",
+      "os": "Windows",
+      "database_os": "Linux",
+      "display_name": "http-listener",
+      "notes": "",
+      "versus": "http-listener"
     },
     "sqlserver-raw": {
       "setup_file": "setup",
-      "os": "nt",
       "db_url": "/db?provider=sqlserver",
       "query_url": "/db?provider=sqlserver&queries=",
       "fortune_url": "/fortunes?provider=sqlserver",
       "update_url": "/updates?provider=sqlserver&queries=",
       "port": 8080,
-      "sort": 154
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "SQLServer",
+      "framework": "http-listener",
+      "language": "C#",
+      "orm": "Raw",
+      "platform": "NET",
+      "webserver": "IIS",
+      "os": "Windows",
+      "database_os": "Windows",
+      "display_name": "http-listener",
+      "notes": "",
+      "versus": "http-listener"
     }
   }]
 }

+ 65 - 10
aspnet-stripped/benchmark_config

@@ -3,51 +3,106 @@
   "tests": [{
     "default": {
       "setup_file": "setup_iis",
-      "os": "nt",
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 309
+      "approach": "Stripped",
+      "classification": "Fullstack",
+      "database": "None",
+      "framework": "aspnet",
+      "language": "C#",
+      "orm": "Raw",
+      "platform": "NET",
+      "webserver": "IIS",
+      "os": "Windows",
+      "database_os": "Linux",
+      "display_name": "aspnet-stripped",
+      "notes": "",
+      "versus": ""
     },
     "mysql-raw": {
       "setup_file": "setup_iis",
-      "os": "nt",
       "db_url": "/db?provider=mysql",
       "query_url": "/db?provider=mysql&queries=",
       "fortune_url": "/fortunes?provider=mysql",
       "update_url": "/updates?provider=mysql&queries=",
       "port": 8080,
-      "sort": 310
+      "approach": "Stripped",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "aspnet",
+      "language": "C#",
+      "orm": "Raw",
+      "platform": "NET",
+      "webserver": "IIS",
+      "os": "Windows",
+      "database_os": "Linux",
+      "display_name": "aspnet-stripped-raw",
+      "notes": "",
+      "versus": ""
     },
     "postgresql-raw": {
       "setup_file": "setup_iis",
-      "os": "nt",
       "db_url": "/db?provider=postgresql",
       "query_url": "/db?provider=postgresql&queries=",
       "fortune_url": "/fortunes?provider=postgresql",
       "update_url": "/updates?provider=postgresql&queries=",
       "port": 8080,
-      "sort": 311
+      "approach": "Stripped",
+      "classification": "Fullstack",
+      "database": "Postgres",
+      "framework": "aspnet",
+      "language": "C#",
+      "orm": "Raw",
+      "platform": "NET",
+      "webserver": "IIS",
+      "os": "Windows",
+      "database_os": "Linux",
+      "display_name": "aspnet-stripped-raw",
+      "notes": "",
+      "versus": ""
     },
     "mongodb-raw": {
       "setup_file": "setup_iis",
-      "os": "nt",
       "db_url": "/mongodbdb",
       "query_url": "/mongodbdb?queries=",
       "fortune_url": "/mongodbfortunes",
       "update_url": "/mongodbupdates?queries=",
       "port": 8080,
-      "sort": 312
+      "approach": "Stripped",
+      "classification": "Fullstack",
+      "database": "MongoDB",
+      "framework": "aspnet",
+      "language": "C#",
+      "orm": "Raw",
+      "platform": "NET",
+      "webserver": "IIS",
+      "os": "Windows",
+      "database_os": "Linux",
+      "display_name": "aspnet-stripped-raw",
+      "notes": "",
+      "versus": ""
     },
     "sqlserver-raw": {
       "setup_file": "setup_iis",
-      "os": "nt",
       "db_url": "/db?provider=sqlserver",
       "query_url": "/db?provider=sqlserver&queries=",
       "fortune_url": "/fortunes?provider=sqlserver",
       "update_url": "/updates?provider=sqlserver&queries=",
       "port": 8080,
-      "sort": 313
+      "approach": "Stripped",
+      "classification": "Fullstack",
+      "database": "SQLServer",
+      "framework": "aspnet",
+      "language": "C#",
+      "orm": "Raw",
+      "platform": "NET",
+      "webserver": "IIS",
+      "os": "Windows",
+      "database_os": "Windows",
+      "display_name": "aspnet-stripped-raw",
+      "notes": "",
+      "versus": ""
     }
   }]
 }

+ 234 - 28
aspnet/benchmark_config

@@ -3,114 +3,260 @@
   "tests": [{
     "default": {
       "setup_file": "setup_iis",
-      "os": "nt",
       "json_url": "/json/default",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 90
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "None",
+      "framework": "aspnet-mvc",
+      "language": "C#",
+      "orm": "Raw",
+      "platform": "NET",
+      "webserver": "IIS",
+      "os": "Windows",
+      "database_os": "Linux",
+      "display_name": "aspnet",
+      "notes": "",
+      "versus": ""
     },
     "jsonnet": {
       "setup_file": "setup_iis",
-      "os": "nt",
       "json_url": "/json/jsonnet",
       "port": 8080,
-      "sort": 138
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "None",
+      "framework": "aspnet",
+      "language": "C#",
+      "orm": "Raw",
+      "platform": "NET",
+      "webserver": "nginx",
+      "os": "Windows",
+      "database_os": "Linux",
+      "display_name": "aspnet-jsonnet",
+      "notes": "",
+      "versus": ""
     },
     "servicestack": {
       "setup_file": "setup_iis",
-      "os": "nt",
       "json_url": "/json/servicestack",
       "port": 8080,
-      "sort": 139
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "None",
+      "framework": "aspnet",
+      "language": "C#",
+      "orm": "Raw",
+      "platform": "NET",
+      "webserver": "nginx",
+      "os": "Windows",
+      "database_os": "Linux",
+      "display_name": "aspnet-svcstk",
+      "notes": "",
+      "versus": ""
     },
     "mysql-raw": {
       "setup_file": "setup_iis",
-      "os": "nt",
       "db_url": "/ado/mysql",
       "query_url": "/ado/mysql?queries=",
       "fortune_url": "/ado/mysql/fortunes",
       "update_url": "/ado/mysql/update?queries=",
       "port": 8080,
-      "sort": 91
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "aspnet-mvc",
+      "language": "C#",
+      "orm": "Raw",
+      "platform": "NET",
+      "webserver": "IIS",
+      "os": "Windows",
+      "database_os": "Linux",
+      "display_name": "aspnet-mvc-raw",
+      "notes": "",
+      "versus": ""
     },
     "postgresql-raw": {
       "setup_file": "setup_iis",
-      "os": "nt",
       "db_url": "/ado/postgresql",
       "query_url": "/ado/postgresql?queries=",
       "fortune_url": "/ado/postgresql/fortunes",
       "update_url": "/ado/postgresql/update?queries=",
       "port": 8080,
-      "sort": 92
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "Postgres",
+      "framework": "aspnet-mvc",
+      "language": "C#",
+      "orm": "Raw",
+      "platform": "NET",
+      "webserver": "IIS",
+      "os": "Windows",
+      "database_os": "Linux",
+      "display_name": "aspnet-mvc-raw",
+      "notes": "",
+      "versus": ""
     },
     "mongodb-raw": {
       "setup_file": "setup_iis",
-      "os": "nt",
       "db_url": "/mongodb",
       "query_url": "/mongodb?queries=",
       "fortune_url": "/mongodb/fortunes",
       "update_url": "/mongodb/update?queries=",
       "port": 8080,
-      "sort": 93
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MongoDB",
+      "framework": "aspnet-mvc",
+      "language": "C#",
+      "orm": "Raw",
+      "platform": "NET",
+      "webserver": "IIS",
+      "os": "Windows",
+      "database_os": "Linux",
+      "display_name": "aspnet-mvc-raw",
+      "notes": "",
+      "versus": ""
     },
     "sqlserver-raw": {
       "setup_file": "setup_iis",
-      "os": "nt",
       "db_url": "/ado/sqlserver",
       "query_url": "/ado/sqlserver?queries=",
       "fortune_url": "/ado/sqlserver/fortunes",
       "update_url": "/ado/sqlserver/update?queries=",
       "port": 8080,
-      "sort": 94
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "SQLServer",
+      "framework": "aspnet-mvc",
+      "language": "C#",
+      "orm": "Full",
+      "platform": "NET",
+      "webserver": "IIS",
+      "os": "Windows",
+      "database_os": "Windows",
+      "display_name": "aspnet-mvc-raw",
+      "notes": "",
+      "versus": ""
     },
     "mysql-entityframework": {
       "setup_file": "setup_iis",
-      "os": "nt",
       "db_url": "/entityframework/mysql",
       "query_url": "/entityframework/mysql?queries=",
       "fortune_url": "/entityframework/mysql/fortunes",
       "update_url": "/entityframework/mysql/update?queries=",
       "port": 8080,
-      "sort": 95
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "aspnet-mvc",
+      "language": "C#",
+      "orm": "Full",
+      "platform": "NET",
+      "webserver": "IIS",
+      "os": "Windows",
+      "database_os": "Linux",
+      "display_name": "aspnet-mvc",
+      "notes": "",
+      "versus": ""
     },
     "postgresql-entityframework": {
       "setup_file": "setup_iis",
-      "os": "nt",
       "db_url": "/entityframework/postgresql",
       "query_url": "/entityframework/postgresql?queries=",
       "fortune_url": "/entityframework/postgresql/fortunes",
       "update_url": "/entityframework/postgresql/update?queries=",
       "port": 8080,
-      "sort": 302
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "Postgres",
+      "framework": "aspnet-mvc",
+      "language": "C#",
+      "orm": "Full",
+      "platform": "NET",
+      "webserver": "IIS",
+      "os": "Windows",
+      "database_os": "Linux",
+      "display_name": "aspnet-mvc",
+      "notes": "",
+      "versus": ""
     },
     "sqlserver-entityframework": {
       "setup_file": "setup_iis",
-      "os": "nt",
       "db_url": "/entityframework/sqlserver",
       "query_url": "/entityframework/sqlserver?queries=",
       "fortune_url": "/entityframework/sqlserver/fortunes",
       "update_url": "/entityframework/sqlserver/update?queries=",
       "port": 8080,
-      "sort": 303
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "SQLServer",
+      "framework": "aspnet-mvc",
+      "language": "C#",
+      "orm": "Full",
+      "platform": "NET",
+      "webserver": "IIS",
+      "os": "Windows",
+      "database_os": "Windows",
+      "display_name": "aspnet-mvc",
+      "notes": "",
+      "versus": ""
     },
     "mono": {
       "setup_file": "setup_nginx",
       "json_url": "/json/default",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 100
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "None",
+      "framework": "aspnet-mvc",
+      "language": "C#",
+      "orm": "Raw",
+      "platform": "Mono",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "aspnet-mvc-mono",
+      "notes": "",
+      "versus": ""
     },
     "mono-jsonnet": {
       "setup_file": "setup_nginx",
       "json_url": "/json/jsonnet",
       "port": 8080,
-      "sort": 136
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "None",
+      "framework": "aspnet",
+      "language": "C#",
+      "orm": "Raw",
+      "platform": "Mono",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "aspnet-jsonnet-mono",
+      "notes": "",
+      "versus": ""
     },
     "mono-servicestack": {
       "setup_file": "setup_nginx",
       "json_url": "/json/servicestack",
       "port": 8080,
-      "sort": 140
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "None",
+      "framework": "aspnet",
+      "language": "C#",
+      "orm": "Raw",
+      "platform": "Mono",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "aspnet-svcstk-mono",
+      "notes": "",
+      "versus": ""
     },
     "mono-mysql-raw": {
       "setup_file": "setup_nginx",
@@ -119,7 +265,19 @@
       "fortune_url": "/ado/mysql/fortunes",
       "update_url": "/ado/mysql/update?queries=",
       "port": 8080,
-      "sort": 101
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "aspnet-mvc",
+      "language": "C#",
+      "orm": "Raw",
+      "platform": "Mono",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "aspnet-mvc-mono-raw",
+      "notes": "",
+      "versus": ""
     },
     "mono-postgresql-raw": {
       "setup_file": "setup_nginx",
@@ -128,7 +286,19 @@
       "fortune_url": "/ado/postgresql/fortunes",
       "update_url": "/ado/postgresql/update?queries=",
       "port": 8080,
-      "sort": 102
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "Postgres",
+      "framework": "aspnet-mvc",
+      "language": "C#",
+      "orm": "Raw",
+      "platform": "Mono",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "aspnet-mvc-mono-raw",
+      "notes": "",
+      "versus": ""
     },
     "mono-mongodb-raw": {
       "setup_file": "setup_nginx",
@@ -137,7 +307,19 @@
       "fortune_url": "/mongodb/fortunes",
       "update_url": "/mongodb/update?queries=",
       "port": 8080,
-      "sort": 103
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MongoDB",
+      "framework": "aspnet-mvc",
+      "language": "C#",
+      "orm": "Raw",
+      "platform": "Mono",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "aspnet-mvc-mono-raw",
+      "notes": "",
+      "versus": ""
     },
     "mono-mysql-entityframework": {
       "setup_file": "setup_nginx",
@@ -146,7 +328,19 @@
       "fortune_url": "/entityframework/mysql/fortunes",
       "update_url": "/entityframework/mysql/update?queries=",
       "port": 8080,
-      "sort": 104
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "aspnet-mvc",
+      "language": "C#",
+      "orm": "Full",
+      "platform": "Mono",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "aspnet-mvc-mono",
+      "notes": "Entity framework",
+      "versus": ""
     },
     "mono-postgresql-entityframework": {
       "setup_file": "setup_nginx",
@@ -155,7 +349,19 @@
       "fortune_url": "/entityframework/postgresql/fortunes",
       "update_url": "/entityframework/postgresql/update?queries=",
       "port": 8080,
-      "sort": 105
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "Postgres",
+      "framework": "aspnet-mvc",
+      "language": "C#",
+      "orm": "Full",
+      "platform": "Mono",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "aspnet-mvc-mono",
+      "notes": "Entity framework",
+      "versus": ""
     }
   }]
 }

+ 9 - 1
aspnet/setup_nginx.py

@@ -36,5 +36,13 @@ def stop():
   
   subprocess.check_call("sudo /usr/local/nginx/sbin/nginx -c " + root + "/nginx.conf -s stop", shell=True)
   subprocess.check_call("rm -f " + root + "/nginx.upstream.conf", shell=True)
-  subprocess.check_call("pkill -9 mono-sgen", shell=True)
+  #
+  # stop mono
+  #
+  p = subprocess.Popen(['ps', 'aux'], stdout=subprocess.PIPE)
+  out, err = p.communicate()
+  for line in out.splitlines():
+    if 'mono-server' in line:
+      pid = int(line.split(None, 2)[1])
+      os.kill(pid, 9)
   return 0

+ 13 - 1
beego/benchmark_config

@@ -5,7 +5,19 @@
       "setup_file": "setup",
       "json_url": "/json",
       "port": 8080,
-      "sort": 119
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "None",
+      "framework": "beego",
+      "language": "Go",
+      "orm": "Raw",
+      "platform": "Go",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "beego",
+      "notes": "",
+      "versus": "go"
     }
   }]
 }

+ 66 - 6
bottle/benchmark_config

@@ -10,7 +10,19 @@
       "update_url": "/updates?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 88
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "bottle",
+      "language": "Python",
+      "orm": "Full",
+      "platform": "wsgi",
+      "webserver": "Gunicorn",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "bottle",
+      "notes": "",
+      "versus": "wsgi"
     },
     "py3": {
       "setup_file": "setup_py3",
@@ -21,7 +33,19 @@
       "update_url": "/updates?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 239
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "bottle",
+      "language": "Python",
+      "orm": "Full",
+      "platform": "wsgi",
+      "webserver": "Gunicorn",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "bottle-py3",
+      "notes": "",
+      "versus": "wsgi"
     },
     "pypy": {
       "setup_file": "setup_pypy",
@@ -32,7 +56,19 @@
       "update_url": "/updates?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 240
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "bottle",
+      "language": "Python",
+      "orm": "Full",
+      "platform": "wsgi",
+      "webserver": "Gunicorn",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "bottle-pypy",
+      "notes": "",
+      "versus": "wsgi"
     },
     "mysql-raw": {
       "setup_file": "setup",
@@ -41,9 +77,21 @@
       "fortune_url": "/fortuneraw",
       "update_url": "/raw-updates?queries=",
       "port": 8080,
-      "sort": 89
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "bottle",
+      "language": "Python",
+      "orm": "Raw",
+      "platform": "wsgi",
+      "webserver": "Gunicorn",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "bottle-raw",
+      "notes": "",
+      "versus": "wsgi"
     },
-    "nginxuwsgi": {
+    "nginx-uwsgi": {
       "setup_file": "setup_nginxuwsgi",
       "json_url": "/json",
       "db_url": "/dbs",
@@ -52,7 +100,19 @@
       "update_url": "/updates?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 325
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "bottle",
+      "language": "Python",
+      "orm": "Full",
+      "platform": "wsgi",
+      "webserver": "nginx-uWSGI",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "bottle-nginx-uWSGI",
+      "notes": "",
+      "versus": "wsgi"
     }
   }]
 }

+ 13 - 1
cake/benchmark_config

@@ -9,7 +9,19 @@
       "fortunes_url": "/fortunes",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 1
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "cake",
+      "language": "PHP",
+      "orm": "Full",
+      "platform": "PHP-FPM",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "cake",
+      "notes": "",
+      "versus": "php"
     }
   }]
 }

+ 2 - 0
cake/deploy/nginx.conf

@@ -1,5 +1,6 @@
 #user  nobody;
 worker_processes  8;
+error_log /dev/null crit;
 
 #error_log  logs/error.log;
 #error_log  logs/error.log  notice;
@@ -22,6 +23,7 @@ http {
     #                  '"$http_user_agent" "$http_x_forwarded_for"';
 
     #access_log  logs/access.log  main;
+	access_log off;
 
     sendfile        on;
     #tcp_nopush     on;

+ 26 - 2
compojure/benchmark_config

@@ -9,14 +9,38 @@
       "fortune_url": "/compojure/fortune-hiccup",
       "plaintext_url": "/compojure/plaintext",
       "port": 8080,
-      "sort": 2
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "compojure",
+      "language": "Clojure",
+      "orm": "Micro",
+      "platform": "Servlet",
+      "webserver": "Resin",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "compojure",
+      "notes": "",
+      "versus": "servlet"
     },
     "raw": {
       "setup_file": "setup",
       "db_url": "/compojure/dbraw/1",
       "query_url": "/compojure/dbraw/",
       "port": 8080,
-      "sort": 85
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "compojure",
+      "language": "Clojure",
+      "orm": "Raw",
+      "platform": "Servlet",
+      "webserver": "Resin",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "compojure-raw",
+      "notes": "",
+      "versus": "servlet"
     }
   }]
 }

+ 0 - 0
config/client_sftp_batch → config/database_sftp_batch


+ 13 - 1
cowboy/benchmark_config

@@ -7,6 +7,18 @@
       "db_url": "/db",
       "query_url": "/db?queries=",
       "port": 8080,
-      "sort": 40
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "MySQL",
+      "framework": "cowboy",
+      "language": "Erlang",
+      "orm": "Raw",
+      "platform": "Cowboy",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "cowboy",
+      "notes": "",
+      "versus": ""
   }}]
 }

+ 53 - 5
cpoll_cppsp/benchmark_config

@@ -4,9 +4,21 @@
     "default": {
       "setup_file": "setup",
       "json_url": "/json",
-	"plaintext_url": "/plaintext",
+      "plaintext_url": "/plaintext",
       "port": 16969,
-      "sort": 115
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "None",
+      "framework": "cpoll-cppsp",
+      "language": "C++",
+      "orm": "Raw",
+      "platform": "CPoll",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "cpoll-cppsp",
+      "notes": "",
+      "versus": ""
     },
     "raw": {
       "setup_file": "setup",
@@ -15,21 +27,57 @@
       "fortune_url": "/fortune",
       "update_url": "/update?queries=",
       "port": 16969,
-      "sort": 130
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "MySQL",
+      "framework": "cpoll-cppsp",
+      "language": "C++",
+      "orm": "Raw",
+      "platform": "CPoll",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "cpoll-cppsp-raw",
+      "notes": "",
+      "versus": ""
     },
     "postgres-raw": {
       "setup_file": "setup",
       "db_url": "/db_pg_async",
       "query_url": "/db_pg_async?queries=", 
       "port": 16969,
-      "sort": 131
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "Postgres",
+      "framework": "cpoll-cppsp",
+      "language": "C++",
+      "orm": "Raw",
+      "platform": "CPoll",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "cpoll-cppsp-raw",
+      "notes": "",
+      "versus": ""
     },
     "postgres-raw-threadpool": {
       "setup_file": "setup",
       "db_url": "/db_pg_threadpool",
       "query_url": "/db_pg_threadpool?queries=", 
       "port": 16969,
-      "sort": 132
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "Postgres",
+      "framework": "cpoll-cppsp",
+      "language": "C++",
+      "orm": "Raw",
+      "platform": "CPoll",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "cpoll-pool",
+      "notes": "Threadpool",
+      "versus": ""
     }
   }]
 }

+ 26 - 2
dancer/benchmark_config

@@ -5,14 +5,38 @@
       "setup_file": "setup",
       "json_url": "/json",
       "port": 8080,
-      "sort": 76
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "None",
+      "framework": "dancer",
+      "language": "Perl",
+      "orm": "Full",
+      "platform": "Plack",
+      "webserver": "Starman",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "dancer",
+      "notes": "",
+      "versus": ""
     },
     "raw": {
       "setup_file": "setup",
       "db_url": "/db",
       "query_url": "/db?queries=",
       "port": 8080,
-      "sort": 77
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "dancer",
+      "language": "Perl",
+      "orm": "Raw",
+      "platform": "Plack",
+      "webserver": "Starman",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "dancer",
+      "notes": "",
+      "versus": ""
     }
   }]
 }

+ 1 - 0
dancer/nginx.conf

@@ -1,4 +1,5 @@
 user USR;
+error_log /dev/null crit;
 
 worker_processes 2;
 

+ 26 - 2
dart-start/benchmark_config

@@ -10,7 +10,19 @@
       "update_url": "/updates?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 318
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "Postgres",
+      "framework": "start",
+      "language": "Dart",
+      "orm": "Raw",
+      "platform": "Dart",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "start",
+      "notes": "",
+      "versus": "dart"
     },
     "mongodb-raw": {
       "setup_file": "setup",
@@ -19,7 +31,19 @@
       "fortune_url": "/fortunes-mongo",
       "update_url": "/updates-mongo?queries=",
       "port": 8080,
-      "sort": 319
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MongoDB",
+      "framework": "start",
+      "language": "Dart",
+      "orm": "Raw",
+      "platform": "Dart",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "start",
+      "notes": "",
+      "versus": "dart"
     }
   }]
 }

+ 26 - 2
dart-stream/benchmark_config

@@ -10,7 +10,19 @@
       "update_url": "/updates?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 320
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "Postgres",
+      "framework": "stream",
+      "language": "Dart",
+      "orm": "Raw",
+      "platform": "Dart",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "stream",
+      "notes": "",
+      "versus": "dart"
     },
     "mongodb-raw": {
       "setup_file": "setup",
@@ -19,7 +31,19 @@
       "fortune_url": "/fortunes-mongo",
       "update_url": "/updates-mongo?queries=",
       "port": 8080,
-      "sort": 321
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MongoDB",
+      "framework": "stream",
+      "language": "Dart",
+      "orm": "Raw",
+      "platform": "Dart",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "stream",
+      "notes": "",
+      "versus": "dart"
     }
   }]
 }

+ 13 - 1
dart/benchmark_config

@@ -10,7 +10,19 @@
       "update_url": "/updates?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 129
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "Postgres",
+      "framework": "dart",
+      "language": "Dart",
+      "orm": "Raw",
+      "platform": "Dart",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "dart",
+      "notes": "",
+      "versus": "dart"
     }
   }]
 }

+ 39 - 3
django/benchmark_config

@@ -9,7 +9,19 @@
       "fortune_url": "/fortunes",
       "update_url": "/update?queries=",
       "port": 8080,
-      "sort": 3
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "django",
+      "language": "Python",
+      "orm": "Full",
+      "platform": "wsgi",
+      "webserver": "Gunicorn",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "django",
+      "notes": "",
+      "versus": "wsgi"
     },
     "py3": {
       "setup_file": "setup_py3",
@@ -19,7 +31,19 @@
       "fortune_url": "/fortunes",
       "update_url": "/update?queries=",
       "port": 8080,
-      "sort": 242
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "django",
+      "language": "Python",
+      "orm": "Full",
+      "platform": "wsgi",
+      "webserver": "Gunicorn",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "django-py3",
+      "notes": "",
+      "versus": "wsgi"
     },
     "postgresql": {
       "setup_file": "setup_pg",
@@ -29,7 +53,19 @@
       "fortune_url": "/fortunes",
       "update_url": "/update?queries=",
       "port": 8080,
-      "sort": 317
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "Postgres",
+      "framework": "django",
+      "language": "Python",
+      "orm": "Full",
+      "platform": "wsgi",
+      "webserver": "Gunicorn",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "django",
+      "notes": "",
+      "versus": "wsgi"
     }
   }]
 }

+ 23 - 11
dropwizard/benchmark_config

@@ -1,13 +1,25 @@
 {
-    "framework": "dropwizard",
-    "tests": [{
-        "default": {
-            "setup_file": "setup",
-            "json_url": "/json",
-            "db_url": "/db",
-            "query_url": "/db?queries=",
-            "port": 9000,
-            "sort": 69
-        }
-    }]
+  "framework": "dropwizard",
+  "tests": [{
+    "default": {
+      "setup_file": "setup",
+      "json_url": "/json",
+      "db_url": "/db",
+      "query_url": "/db?queries=",
+      "port": 9000,
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "dropwizard",
+      "language": "Java",
+      "orm": "Full",
+      "platform": "Jetty",
+      "webserver": "Jetty",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "dropwizard",
+      "notes": "",
+      "versus": ""
+    }
+  }]
 }

BIN
elli/.benchmark_config.swp


+ 13 - 1
elli/benchmark_config

@@ -7,6 +7,18 @@
       "db_url": "/db",
       "query_url": "/db?queries=",
       "port": 8080,
-      "sort": 39
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "MySQL",
+      "framework": "elli",
+      "language": "Erlang",
+      "orm": "Raw",
+      "platform": "elli",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "elli",
+      "notes": "",
+      "versus": ""
   }}]
 }

+ 39 - 3
express/benchmark_config

@@ -5,7 +5,19 @@
       "setup_file": "setup",
       "json_url": "/json",
       "port": 8080,
-      "sort": 4
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "None",
+      "framework": "express",
+      "language": "JavaScript",
+      "orm": "Full",
+      "platform": "Node.js",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "express",
+      "notes": "",
+      "versus": "node"
     },
     "mongodb": {
       "setup_file": "setup",
@@ -13,7 +25,19 @@
       "query_url": "/mongoose?queries=",
       "update_url": "/mongoose-update?queries=",
       "port": 8080,
-      "sort": 5
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MongoDB",
+      "framework": "express",
+      "language": "JavaScript",
+      "orm": "Full",
+      "platform": "Node.js",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "express",
+      "notes": "",
+      "versus": "node"
     },
     "mysql": {
       "setup_file": "setup",
@@ -22,7 +46,19 @@
       "fortune_url": "/fortune",
       "update_url": "/mysql-orm-update?queries=",
       "port": 8080,
-      "sort": 6
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "express",
+      "language": "JavaScript",
+      "orm": "Full",
+      "platform": "Node.js",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "express",
+      "notes": "",
+      "versus": "node"
     }
   }]
 }

+ 39 - 3
falcon/benchmark_config

@@ -6,21 +6,57 @@
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 245
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "None",
+      "framework": "falcon",
+      "language": "Python",
+      "orm": "Raw",
+      "platform": "wsgi",
+      "webserver": "Gunicorn",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "falcon",
+      "notes": "",
+      "versus": "wsgi"
     },
     "py3": {
       "setup_file": "setup_py3",
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 246
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "None",
+      "framework": "falcon",
+      "language": "Python",
+      "orm": "Raw",
+      "platform": "wsgi",
+      "webserver": "Gunicorn",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "falcon-py3",
+      "notes": "",
+      "versus": "wsgi"
     },
     "pypy": {
       "setup_file": "setup_pypy",
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 247
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "None",
+      "framework": "falcon",
+      "language": "Python",
+      "orm": "Raw",
+      "platform": "wsgi",
+      "webserver": "Gunicorn",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "falcon-pypy",
+      "notes": "",
+      "versus": "wsgi"
     }
   }]
 }

+ 13 - 1
falcore/benchmark_config

@@ -10,7 +10,19 @@
       "update_url": "/update?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 300
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "falcore",
+      "language": "Go",
+      "orm": "Raw",
+      "platform": "Go",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "falcore",
+      "notes": "",
+      "versus": "go"
     }
   }]
 }

+ 23 - 13
finagle/benchmark_config

@@ -1,15 +1,25 @@
 {
-    "framework" : "finagle",
-    "tests" : [{
-        "default" : {
-            "setup_file" : "setup",
-            "json_url" : "/json",
-            "db_url" : "/db",
-            "query_url" : "/db?queries=",
-            "port": 8080,
-            "sort": 44
-            }
-        }
-        ]
-
+  "framework": "finagle",
+  "tests": [{
+    "default": {
+      "setup_file": "setup",
+      "json_url": "/json",
+      "db_url": "/db",
+      "query_url": "/db?queries=",
+      "port": 8080,
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "finagle",
+      "language": "Scala",
+      "orm": "Micro",
+      "platform": "Netty",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "finagle",
+      "notes": "",
+      "versus": "netty"
+    }
+  }]
 }

+ 79 - 7
flask/benchmark_config

@@ -10,7 +10,19 @@
       "update_url": "/updates?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 31
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "flask",
+      "language": "Python",
+      "orm": "Full",
+      "platform": "wsgi",
+      "webserver": "Unicorn",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "flask",
+      "notes": "",
+      "versus": "wsgi"
     },
     "mysql-raw": {
       "setup_file": "setup",
@@ -19,7 +31,19 @@
       "fortune_url": "/fortunesraw",
       "update_url": "/raw-updates?queries=",
       "port": 8080,
-      "sort": 84
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "flask",
+      "language": "Python",
+      "orm": "Raw",
+      "platform": "wsgi",
+      "webserver": "Unicorn",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "flask",
+      "notes": "",
+      "versus": "wsgi"
     },
     "py3": {
       "setup_file": "setup_py3",
@@ -30,7 +54,19 @@
       "update_url": "/updates?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 241
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "flask",
+      "language": "Python",
+      "orm": "Full",
+      "platform": "wsgi",
+      "webserver": "Unicorn",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "flask-py3",
+      "notes": "",
+      "versus": "wsgi"
     },
     "pypy": {
       "setup_file": "setup_pypy",
@@ -41,7 +77,19 @@
       "update_url": "/updates?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 110
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "flask",
+      "language": "Python",
+      "orm": "Full",
+      "platform": "wsgi",
+      "webserver": "Unicorn",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "flask-pypy",
+      "notes": "",
+      "versus": "wsgi"
     },
     "pypy-mysql-raw": {
       "setup_file": "setup_pypy",
@@ -50,9 +98,21 @@
       "fortune_url": "/fortunesraw",
       "update_url": "/raw-updates?queries=",
       "port": 8080,
-      "sort": 111
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "flask",
+      "language": "Python",
+      "orm": "Raw",
+      "platform": "wsgi",
+      "webserver": "Unicorn",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "flask-pypy",
+      "notes": "",
+      "versus": "wsgi"
     },
-    "nginxuwsgi": {
+    "nginx-uwsgi": {
       "setup_file": "setup_nginxuwsgi",
       "json_url": "/json",
       "db_url": "/dbs",
@@ -61,7 +121,19 @@
       "update_url": "/updates?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 326
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "flask",
+      "language": "Python",
+      "orm": "Full",
+      "platform": "wsgi",
+      "webserver": "nginx-uWSGI",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "flask-nginx-uWSGI",
+      "notes": "",
+      "versus": "wsgi"
     }
   }]
 }

+ 13 - 1
gemini/benchmark_config

@@ -10,7 +10,19 @@
       "update_url": "/update?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 0
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "gemini",
+      "language": "Java",
+      "orm": "Micro",
+      "platform": "Servlet",
+      "webserver": "Resin",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "gemini",
+      "notes": "",
+      "versus": "servlet"
     }
   }]
 }

+ 13 - 1
go/benchmark_config

@@ -10,7 +10,19 @@
       "update_url": "/update?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 27
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "MySQL",
+      "framework": "go",
+      "language": "Go",
+      "orm": "Raw",
+      "platform": "Go",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "go",
+      "notes": "",
+      "versus": "go"
     }
   }]
 }

+ 13 - 1
grails/benchmark_config

@@ -7,7 +7,19 @@
       "db_url": "/grails/hello/db",
       "query_url": "/grails/hello/db?queries=",
       "port": 8080,
-      "sort": 7
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "grails",
+      "language": "Groovy",
+      "orm": "Full",
+      "platform": "Servlet",
+      "webserver": "Resin",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "grails",
+      "notes": "",
+      "versus": "servlet"
     }
   }]
 }

+ 13 - 1
grizzly-bm/benchmark_config

@@ -6,7 +6,19 @@
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 238
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "None",
+      "framework": "grizzly-bm",
+      "language": "Java",
+      "orm": "Raw",
+      "platform": "Servlet",
+      "webserver": "Grizzly",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "grizzly-bm",
+      "notes": "",
+      "versus": "servlet"
     }
   }]
 }

+ 13 - 1
grizzly-jersey/benchmark_config

@@ -8,7 +8,19 @@
       "query_url": "/db?queries=",
       "fortune_url": "/fortunes",
       "port": 8080,
-      "sort": 38
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "grizzly-jersey",
+      "language": "Java",
+      "orm": "Full",
+      "platform": "Servlet",
+      "webserver": "Grizzly",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "grizzly-jersey",
+      "notes": "",
+      "versus": "servlet"
     }
   }]
 }

+ 39 - 3
hapi/benchmark_config

@@ -5,7 +5,19 @@
       "setup_file": "setup",
       "json_url": "/json",
       "port": 8080,
-      "sort": 121
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "None",
+      "framework": "hapi",
+      "language": "JavaScript",
+      "orm": "Raw",
+      "platform": "Node.js",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "hapi",
+      "notes": "",
+      "versus": "node"
     },
     "mongodb": {
       "setup_file": "setup",
@@ -13,7 +25,19 @@
       "query_url": "/mongoose/",
       "update_url": "/mongoose-update/",
       "port": 8080,
-      "sort": 122
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MongoDB",
+      "framework": "hapi",
+      "language": "JavaScript",
+      "orm": "Raw",
+      "platform": "Node.js",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "hapi",
+      "notes": "",
+      "versus": "node"
     },
     "mysql": {
       "setup_file": "setup",
@@ -22,7 +46,19 @@
       "fortune_url": "/fortune",
       "update_url": "/mysql-orm-update/",
       "port": 8080,
-      "sort": 123
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "hapi",
+      "language": "JavaScript",
+      "orm": "Raw",
+      "platform": "Node.js",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "hapi",
+      "notes": "",
+      "versus": "node"
     }
   }]
 }

+ 13 - 1
http-kit/benchmark_config

@@ -7,7 +7,19 @@
       "db_url": "/http-kit/db/1",
       "query_url": "/http-kit/db/",
       "port": 8080,
-      "sort": 36
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "MySQL",
+      "framework": "http-kit",
+      "language": "Clojure",
+      "orm": "Raw",
+      "platform": "http-kit",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "http-kit",
+      "notes": "",
+      "versus": ""
     }
   }]
 }

+ 13 - 1
jester/benchmark_config

@@ -5,7 +5,19 @@
       "setup_file": "setup",
       "json_url": "/json",
       "port": 8080,
-      "sort": 133
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "jester",
+      "language": "Nimrod",
+      "orm": "Raw",
+      "platform": "Nimrod",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "jester",
+      "notes": "",
+      "versus": ""
     }
   }]
 }

+ 4 - 2
jester/config/nginx.conf

@@ -13,7 +13,8 @@ worker_processes 8;
 
 # Feel free to change all paths to suite your needs here, of course
 # pid /tmp/nginx.pid;
-error_log /tmp/nginx.error.log;
+#error_log /tmp/nginx.error.log;
+error_log /dev/null crit;
 
 events {
   worker_connections 4096; # increase if you have lots of clients
@@ -30,7 +31,8 @@ http {
   default_type application/octet-stream;
 
   # click tracking!
-  access_log /tmp/nginx.access.log combined;
+  #access_log /tmp/nginx.access.log combined;
+  access_log off;
 
   upstream nimrod {
     server localhost:9000;

+ 26 - 2
kelp/benchmark_config

@@ -5,14 +5,38 @@
       "setup_file": "setup",
       "json_url": "/json",
       "port": 8080,
-      "sort": 78
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "None",
+      "framework": "kelp",
+      "language": "Perl",
+      "orm": "Full",
+      "platform": "Plack",
+      "webserver": "Starman",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "kelp",
+      "notes": "",
+      "versus": ""
     },
     "raw": {
       "setup_file": "setup",
       "db_url": "/db",
       "query_url": "/db?queries=",
       "port": 8080,
-      "sort": 79
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "kelp",
+      "language": "Perl",
+      "orm": "Raw",
+      "platform": "Plack",
+      "webserver": "Starman",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "kelp",
+      "notes": "",
+      "versus": ""
     }
   }]
 }

+ 1 - 0
kelp/nginx.conf

@@ -1,4 +1,5 @@
 user USR;
+error_log /dev/null crit;
 
 worker_processes 2;
 

+ 13 - 1
lapis/benchmark_config

@@ -10,7 +10,19 @@
       "update_url": "/update?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 143
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "Postgres",
+      "framework": "lapis",
+      "language": "Lua",
+      "orm": "Full",
+      "platform": "OpenResty",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "lapis",
+      "notes": "",
+      "versus": "openresty"
     }
   }]
 }

+ 13 - 1
lift-stateless/benchmark_config

@@ -7,7 +7,19 @@
       "db_url": "/db",
       "query_url": "/db/",
       "port": 8080,
-      "sort": 45
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "lift",
+      "language": "Scala",
+      "orm": "Full",
+      "platform": "Netty",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "lift-stateless",
+      "notes": "",
+      "versus": "netty"
     }
   }]
 }

+ 26 - 2
luminus/benchmark_config

@@ -8,14 +8,38 @@
       "query_url": "/luminus/db/",
       "fortune_url": "/luminus/fortune",
       "port": 8080,
-      "sort": 125
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "luminus",
+      "language": "Clojure",
+      "orm": "Full",
+      "platform": "Servlet",
+      "webserver": "Resin",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "luminus",
+      "notes": "",
+      "versus": "servlet"
     },
     "raw": {
       "setup_file": "setup",
       "db_url": "/luminus/dbraw/1",
       "query_url": "/luminus/dbraw/",
       "port": 8080,
-      "sort": 126
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "luminus",
+      "language": "Clojure",
+      "orm": "Raw",
+      "platform": "Servlet",
+      "webserver": "Resin",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "luminus",
+      "notes": "",
+      "versus": "servlet"
     }
   }]
 }

+ 26 - 2
mojolicious/benchmark_config

@@ -5,14 +5,38 @@
       "setup_file": "setup",
       "json_url": "/json",
       "port": 8080,
-      "sort": 80
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "None",
+      "framework": "mojolicious",
+      "language": "Perl",
+      "orm": "Full",
+      "platform": "Plack",
+      "webserver": "Starman",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "mojolicious",
+      "notes": "",
+      "versus": ""
     },
     "raw": {
       "setup_file": "setup",
       "db_url": "/db",
       "query_url": "/db?queries=",
       "port": 8080,
-      "sort": 81
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "mojolicious",
+      "language": "Perl",
+      "orm": "Raw",
+      "platform": "Plack",
+      "webserver": "Starman",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "mojolicious",
+      "notes": "",
+      "versus": ""
     }
   }]
 }

+ 1 - 0
mojolicious/nginx.conf

@@ -1,4 +1,5 @@
 user USR;
+error_log /dev/null crit;
 
 worker_processes 2;
 

+ 26 - 3
nancy/benchmark_config

@@ -3,12 +3,23 @@
   "tests": [{
     "default": {
       "setup_file": "setup_iis",
-      "os": "nt",
       "json_url": "/json",
       "db_url": "/db",
       "query_url": "/db/",
       "port": 8080,
-      "sort": 141
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "nancy",
+      "language": "C#",
+      "orm": "Raw",
+      "platform": "NET",
+      "webserver": "IIS",
+      "os": "Windows",
+      "database_os": "Linux",
+      "display_name": "nancy",
+      "notes": "",
+      "versus": ""
     },
     "mono": {
       "setup_file": "setup_nginx",
@@ -16,7 +27,19 @@
       "db_url": "/db",
       "query_url": "/db/",
       "port": 8080,
-      "sort": 137
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "nancy",
+      "language": "C#",
+      "orm": "Raw",
+      "platform": "Mono",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "nancy",
+      "notes": "",
+      "versus": ""
     }
   }]
 }

+ 9 - 1
nancy/setup_nginx.py

@@ -35,5 +35,13 @@ def stop():
   
   subprocess.check_call("sudo /usr/local/nginx/sbin/nginx -c " + root + "/nginx.conf -s stop", shell=True)
   subprocess.check_call("rm -f " + root + "/nginx.upstream.conf", shell=True)
-  subprocess.check_call("pkill -9 mono-sgen", shell=True)
+  #
+  # stop mono
+  #
+  p = subprocess.Popen(['ps', 'aux'], stdout=subprocess.PIPE)
+  out, err = p.communicate()
+  for line in out.splitlines():
+    if 'mono-server' in line:
+      pid = int(line.split(None, 2)[1])
+      os.kill(pid, 9)
   return 0

+ 13 - 1
netty/benchmark_config

@@ -6,7 +6,19 @@
       "json_url": "/",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 30
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "None",
+      "framework": "netty",
+      "language": "Java",
+      "orm": "Raw",
+      "platform": "Netty",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "netty",
+      "notes": "",
+      "versus": "netty"
     }
   }]
 }

+ 65 - 5
nodejs/benchmark_config

@@ -6,14 +6,38 @@
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 8
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "None",
+      "framework": "nodejs",
+      "language": "JavaScript",
+      "orm": "Raw",
+      "platform": "Node.js",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "nodejs",
+      "notes": "",
+      "versus": "nodejs"
     },
     "mongodb": {
       "setup_file": "setup",
       "db_url": "/mongoose",
       "query_url": "/mongoose?queries=",
       "port": 8080,
-      "sort": 9
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "MongoDB",
+      "framework": "nodejs",
+      "language": "JavaScript",
+      "orm": "Full",
+      "platform": "Node.js",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "nodejs",
+      "notes": "",
+      "versus": "nodejs"
     },
     "mongodb-raw": {
       "setup_file": "setup",
@@ -21,14 +45,38 @@
       "query_url": "/mongodbdriver?queries=",
       "update_url": "/update-mongodb?queries=",
       "port": 8080,
-      "sort": 47
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "MongoDB",
+      "framework": "nodejs",
+      "language": "JavaScript",
+      "orm": "Raw",
+      "platform": "Node.js",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "nodejs",
+      "notes": "",
+      "versus": "nodejs"
     },
     "mysql": {
       "setup_file": "setup",
       "db_url": "/mysql-orm",
       "query_url": "/mysql-orm?queries=",
       "port": 8080,
-      "sort": 10
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "MySQL",
+      "framework": "nodejs",
+      "language": "JavaScript",
+      "orm": "Full",
+      "platform": "Node.js",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "nodejs",
+      "notes": "",
+      "versus": "nodejs"
     },
     "mysql-raw": {
       "setup_file": "setup",
@@ -36,7 +84,19 @@
       "query_url": "/mysql?queries=",
       "update_url": "/update?queries=",
       "port": 8080,
-      "sort": 28
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "MySQL",
+      "framework": "nodejs",
+      "language": "JavaScript",
+      "orm": "Raw",
+      "platform": "Node.js",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "nodejs",
+      "notes": "",
+      "versus": "nodejs"
     }
   }]
 }

+ 26 - 2
onion/benchmark_config

@@ -5,7 +5,19 @@
       "setup_file": "setup",
       "json_url": "/json",
       "port": 8080,
-      "sort": 42
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "None",
+      "framework": "onion",
+      "language": "C",
+      "orm": "Raw",
+      "platform": "Onion",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "onion",
+      "notes": "",
+      "versus": ""
     },
     "raw": {
       "setup_file": "setup",
@@ -13,7 +25,19 @@
       "query_url": "/db?queries=",
       "fortune_url": "/fortune",
       "port": 8080,
-      "sort": 43
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "MySQL",
+      "framework": "onion",
+      "language": "C",
+      "orm": "Raw",
+      "platform": "Onion",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "onion",
+      "notes": "",
+      "versus": ""
     }
   }]
 }

+ 13 - 1
openresty/benchmark_config

@@ -8,7 +8,19 @@
       "query_url": "/db?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 50
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "MySQL",
+      "framework": "openresty",
+      "language": "Lua",
+      "orm": "Raw",
+      "platform": "OpenResty",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "openresty",
+      "notes": "",
+      "versus": "openresty"
     }
   }]
 }

+ 26 - 2
php-codeigniter/benchmark_config

@@ -5,7 +5,19 @@
       "setup_file": "setup",
       "json_url": "/index.php/bench/json",
       "port": 8080,
-      "sort": 55
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "None",
+      "framework": "codeigniter",
+      "language": "PHP",
+      "orm": "Raw",
+      "platform": "PHP-FPM",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "codeigniter",
+      "notes": "",
+      "versus": "php"
     },
     "raw": {
       "setup_file": "setup",
@@ -13,7 +25,19 @@
       "query_url": "/index.php/bench/db/",
       "fortune_url": "/index.php/bench/fortunes",
       "port": 8080,
-      "sort": 63
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "codeigniter",
+      "language": "PHP",
+      "orm": "Raw",
+      "platform": "PHP-FPM",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "codeigniter",
+      "notes": "",
+      "versus": "php"
     }
   }]
 }

+ 2 - 0
php-codeigniter/deploy/nginx.conf

@@ -4,6 +4,7 @@ worker_processes  8;
 #error_log  logs/error.log;
 #error_log  logs/error.log  notice;
 #error_log  logs/error.log  info;
+error_log /dev/null crit;
 
 #pid        logs/nginx.pid;
 
@@ -22,6 +23,7 @@ http {
     #                  '"$http_user_agent" "$http_x_forwarded_for"';
 
     #access_log  logs/access.log  main;
+    access_log off;
 
     sendfile        on;
     #tcp_nopush     on;

+ 13 - 1
php-fuel/benchmark_config

@@ -8,7 +8,19 @@
       "query_url": "/db?queries=",
       "fortune_url": "/fortunes",
       "port": 8080,
-      "sort": 67
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "fuel",
+      "language": "PHP",
+      "orm": "Raw",
+      "platform": "PHP-FPM",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "fuel",
+      "notes": "",
+      "versus": "php"
     }
   }]
 }

+ 2 - 0
php-fuel/deploy/nginx.conf

@@ -4,6 +4,7 @@ worker_processes  8;
 #error_log  logs/error.log;
 #error_log  logs/error.log  notice;
 #error_log  logs/error.log  info;
+error_log /dev/null crit;
 
 #pid        logs/nginx.pid;
 
@@ -22,6 +23,7 @@ http {
     #                  '"$http_user_agent" "$http_x_forwarded_for"';
 
     #access_log  logs/access.log  main;
+    access_log off;
 
     sendfile        on;
     #tcp_nopush     on;

+ 26 - 2
php-kohana/benchmark_config

@@ -5,7 +5,19 @@
       "setup_file": "setup",
       "json_url": "/bench/json",
       "port": 8080,
-      "sort": 60
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "None",
+      "framework": "kohana",
+      "language": "PHP",
+      "orm": "Raw",
+      "platform": "PHP-FPM",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "kohana",
+      "notes": "",
+      "versus": "php"
     },
     "raw": {
       "setup_file": "setup",
@@ -13,7 +25,19 @@
       "query_url": "/bench/db/",
       "fortune_url": "/bench/fortunes",
       "port": 8080,
-      "sort": 61
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "kohana",
+      "language": "PHP",
+      "orm": "Raw",
+      "platform": "PHP-FPM",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "kohana",
+      "notes": "",
+      "versus": "php"
     }
   }]
 }

+ 2 - 0
php-kohana/deploy/nginx.conf

@@ -4,6 +4,7 @@ worker_processes  8;
 #error_log  logs/error.log;
 #error_log  logs/error.log  notice;
 #error_log  logs/error.log  info;
+error_log /dev/null crit;
 
 #pid        logs/nginx.pid;
 
@@ -22,6 +23,7 @@ http {
     #                  '"$http_user_agent" "$http_x_forwarded_for"';
 
     #access_log  logs/access.log  main;
+    access_log off;
 
     sendfile        on;
     #tcp_nopush     on;

+ 26 - 2
php-laravel/benchmark_config

@@ -5,7 +5,19 @@
       "setup_file": "setup",
       "json_url": "/json",
       "port": 8080,
-      "sort": 59
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "None",
+      "framework": "laravel",
+      "language": "PHP",
+      "orm": "Raw",
+      "platform": "PHP-FPM",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "laravel",
+      "notes": "",
+      "versus": "php"
     },
     "raw": {
       "setup_file": "setup",
@@ -13,7 +25,19 @@
       "query_url": "/db?queries=",
       "fortune_url": "/fortunes",
       "port": 8080,
-      "sort": 62
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "laravel",
+      "language": "PHP",
+      "orm": "Raw",
+      "platform": "PHP-FPM",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "laravel",
+      "notes": "",
+      "versus": "php"
     }
   }]
 }

+ 2 - 0
php-laravel/deploy/nginx.conf

@@ -4,6 +4,7 @@ worker_processes  8;
 #error_log  logs/error.log;
 #error_log  logs/error.log  notice;
 #error_log  logs/error.log  info;
+error_log /dev/null crit;
 
 #pid        logs/nginx.pid;
 
@@ -21,6 +22,7 @@ http {
     #                  '"$http_user_agent" "$http_x_forwarded_for"';
 
     #access_log  logs/access.log  main;
+    access_log off;
 
     sendfile        on;
     #tcp_nopush     on;

+ 13 - 1
php-lithium/benchmark_config

@@ -7,7 +7,19 @@
       "db_url": "/db",
       "query_url": "/db?queries=",
       "port": 8080,
-      "sort": 57
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "lithium",
+      "language": "PHP",
+      "orm": "Full",
+      "platform": "PHP-FPM",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "lithium",
+      "notes": "",
+      "versus": "php"
     }
   }]
 }

+ 2 - 0
php-lithium/deploy/nginx.conf

@@ -4,6 +4,7 @@ worker_processes  8;
 #error_log  logs/error.log;
 #error_log  logs/error.log  notice;
 #error_log  logs/error.log  info;
+error_log /dev/null crit;
 
 #pid        logs/nginx.pid;
 
@@ -22,6 +23,7 @@ http {
     #                  '"$http_user_agent" "$http_x_forwarded_for"';
 
     #access_log  logs/access.log  main;
+    access_log off;
 
     sendfile        on;
     #tcp_nopush     on;

+ 13 - 1
php-micromvc/benchmark_config

@@ -7,7 +7,19 @@
       "db_url": "/db",
       "query_url": "/db?queries=",
       "port": 8080,
-      "sort": 70
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "micromvc",
+      "language": "PHP",
+      "orm": "Raw",
+      "platform": "PHP-FPM",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "micromvc",
+      "notes": "",
+      "versus": "php"
     }
   }]
 }

+ 2 - 0
php-micromvc/deploy/nginx.conf

@@ -4,6 +4,7 @@ worker_processes  8;
 #error_log  logs/error.log;
 #error_log  logs/error.log  notice;
 #error_log  logs/error.log  info;
+error_log /dev/null crit;
 
 #pid        logs/nginx.pid;
 
@@ -22,6 +23,7 @@ http {
     #                  '"$http_user_agent" "$http_x_forwarded_for"';
 
     #access_log  logs/access.log  main;
+    access_log off;
 
     sendfile        on;
     #tcp_nopush     on;

+ 13 - 1
php-phalcon-micro/benchmark_config

@@ -8,7 +8,19 @@
       "query_url": "/db?queries=",
       "fortune_url": "/fortunes",
       "port": 8080,
-      "sort": 98
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "phalcon",
+      "language": "PHP",
+      "orm": "Full",
+      "platform": "PHP-FPM",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "phalcon",
+      "notes": "",
+      "versus": "php"
     }
   }]
 }

+ 2 - 0
php-phalcon-micro/deploy/nginx.conf

@@ -4,6 +4,7 @@ worker_processes  8;
 #error_log  logs/error.log;
 #error_log  logs/error.log  notice;
 #error_log  logs/error.log  info;
+error_log /dev/null crit;
 
 #pid        logs/nginx.pid;
 
@@ -22,6 +23,7 @@ http {
     #                  '"$http_user_agent" "$http_x_forwarded_for"';
 
     #access_log  logs/access.log  main;
+    access_log off;
 
     sendfile        on;
     #tcp_nopush     on;

+ 13 - 1
php-phalcon/benchmark_config

@@ -9,7 +9,19 @@
       "fortune_url": "/fortunes",
       "update_url": "/update?queries=",
       "port": 8080,
-      "sort": 72
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "phalcon",
+      "language": "PHP",
+      "orm": "Full",
+      "platform": "PHP-FPM",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "phalcon",
+      "notes": "",
+      "versus": "php"
     }
   }]
 }

+ 2 - 0
php-phalcon/deploy/nginx.conf

@@ -4,6 +4,7 @@ worker_processes  8;
 #error_log  logs/error.log;
 #error_log  logs/error.log  notice;
 #error_log  logs/error.log  info;
+error_log /dev/null crit;
 
 #pid        logs/nginx.pid;
 
@@ -22,6 +23,7 @@ http {
     #                  '"$http_user_agent" "$http_x_forwarded_for"';
 
     #access_log  logs/access.log  main;
+    access_log off;
 
     sendfile        on;
     #tcp_nopush     on;

+ 13 - 1
php-phpixie/benchmark_config

@@ -10,7 +10,19 @@
       "update_url": "/updates?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 301
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "phpixie",
+      "language": "PHP",
+      "orm": "Full",
+      "platform": "PHP-FPM",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "phpixie",
+      "notes": "",
+      "versus": "php"
     }
   }]
 }

+ 2 - 0
php-phpixie/deploy/nginx.conf

@@ -4,6 +4,7 @@ worker_processes  8;
 #error_log  logs/error.log;
 #error_log  logs/error.log  notice;
 #error_log  logs/error.log  info;
+error_log /dev/null crit;
 
 #pid        logs/nginx.pid;
 
@@ -22,6 +23,7 @@ http {
     #                  '"$http_user_agent" "$http_x_forwarded_for"';
 
     #access_log  logs/access.log  main;
+    access_log off;
 
     sendfile        on;
     #tcp_nopush     on;

+ 13 - 1
php-silex-orm/benchmark_config

@@ -7,7 +7,19 @@
       "db_url": "/db",
       "query_url": "/db?queries=",
       "port": 8080,
-      "sort": 82 
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "silex",
+      "language": "PHP",
+      "orm": "Full",
+      "platform": "PHP-FPM",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "silex",
+      "notes": "",
+      "versus": "php"
     }
   }]
 }

+ 2 - 0
php-silex-orm/deploy/nginx.conf

@@ -4,6 +4,7 @@ worker_processes  8;
 #error_log  logs/error.log;
 #error_log  logs/error.log  notice;
 #error_log  logs/error.log  info;
+error_log /dev/null crit;
 
 #pid        logs/nginx.pid;
 
@@ -22,6 +23,7 @@ http {
     #                  '"$http_user_agent" "$http_x_forwarded_for"';
 
     #access_log  logs/access.log  main;
+    access_log off;
 
     sendfile        on;
     #tcp_nopush     on;

+ 26 - 2
php-silex/benchmark_config

@@ -6,7 +6,19 @@
       "db_url": "/db",
       "query_url": "/db?queries=",
       "port": 8080,
-      "sort": 64
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "silex",
+      "language": "PHP",
+      "orm": "Raw",
+      "platform": "PHP-FPM",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "silex",
+      "notes": "",
+      "versus": "php"
     },
     "raw": {
       "setup_file": "setup_raw",
@@ -17,7 +29,19 @@
       "update_url": "/update?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 144
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "silex",
+      "language": "PHP",
+      "orm": "Raw",
+      "platform": "PHP-FPM",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "silex",
+      "notes": "",
+      "versus": "php"
     }
   }]
 }

+ 2 - 0
php-silex/deploy/nginx.conf

@@ -4,6 +4,7 @@ worker_processes  8;
 #error_log  logs/error.log;
 #error_log  logs/error.log  notice;
 #error_log  logs/error.log  info;
+error_log /dev/null crit;
 
 #pid        logs/nginx.pid;
 
@@ -22,6 +23,7 @@ http {
     #                  '"$http_user_agent" "$http_x_forwarded_for"';
 
     #access_log  logs/access.log  main;
+    access_log off;
 
     sendfile        on;
     #tcp_nopush     on;

+ 2 - 0
php-silex/deploy/nginx_raw.conf

@@ -4,6 +4,7 @@ worker_processes  8;
 #error_log  logs/error.log;
 #error_log  logs/error.log  notice;
 #error_log  logs/error.log  info;
+error_log /dev/null crit;
 
 #pid        logs/nginx.pid;
 
@@ -22,6 +23,7 @@ http {
     #                  '"$http_user_agent" "$http_x_forwarded_for"';
 
     #access_log  logs/access.log  main;
+    access_log off;
 
     sendfile        on;
     #tcp_nopush     on;

+ 13 - 1
php-silica/benchmark_config

@@ -6,7 +6,19 @@
       "db_url": "/db",
       "query_url": "/db?queries=",
       "port": 8080,
-      "sort": 142
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "silica",
+      "language": "PHP",
+      "orm": "Raw",
+      "platform": "PHP-FPM",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "silica",
+      "notes": "",
+      "versus": "php"
     }
   }]
 }

+ 2 - 0
php-silica/deploy/nginx.conf

@@ -4,6 +4,7 @@ worker_processes  8;
 #error_log  logs/error.log;
 #error_log  logs/error.log  notice;
 #error_log  logs/error.log  info;
+error_log /dev/null crit;
 
 #pid        logs/nginx.pid;
 
@@ -22,6 +23,7 @@ http {
     #                  '"$http_user_agent" "$http_x_forwarded_for"';
 
     #access_log  logs/access.log  main;
+    access_log off;
 
     sendfile        on;
     #tcp_nopush     on;

+ 13 - 1
php-slim/benchmark_config

@@ -7,7 +7,19 @@
       "db_url": "/db",
       "query_url": "/db?queries=",
       "port": 8080,
-      "sort": 68
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "slim",
+      "language": "PHP",
+      "orm": "Raw",
+      "platform": "PHP-FPM",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "slim",
+      "notes": "",
+      "versus": "php"
     }
   }]
 }

+ 2 - 0
php-slim/deploy/nginx.conf

@@ -4,6 +4,7 @@ worker_processes  8;
 #error_log  logs/error.log;
 #error_log  logs/error.log  notice;
 #error_log  logs/error.log  info;
+error_log /dev/null crit;
 
 #pid        logs/nginx.pid;
 
@@ -22,6 +23,7 @@ http {
     #                  '"$http_user_agent" "$http_x_forwarded_for"';
 
     #access_log  logs/access.log  main;
+    access_log off;
 
     sendfile        on;
     #tcp_nopush     on;

+ 39 - 3
php-symfony2/benchmark_config

@@ -8,13 +8,37 @@
       "query_url": "/db?queries=",
       "fortune_url": "/fortunes",
       "port": 8080,
-      "sort": 51
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "symfony2",
+      "language": "PHP",
+      "orm": "Full",
+      "platform": "PHP-FPM",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "symfony2",
+      "notes": "",
+      "versus": "php"
     },
     "php-templates": {
       "setup_file": "setup",
       "fortune_url": "/fortunes-php",
       "port": 8080,
-      "sort": 96
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "symfony2",
+      "language": "PHP",
+      "orm": "Full",
+      "platform": "PHP-FPM",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "symfony2",
+      "notes": "",
+      "versus": "php"
     },
     "raw": {
       "setup_file": "setup",
@@ -22,7 +46,19 @@
       "query_url": "/db-raw?queries=",
       "fortune_url": "/fortunes-raw",
       "port": 8080,
-      "sort": 97
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "symfony2",
+      "language": "PHP",
+      "orm": "Raw",
+      "platform": "PHP-FPM",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "symfony2",
+      "notes": "",
+      "versus": "php"
     }
   }]
 }

+ 2 - 0
php-symfony2/deploy/nginx.conf

@@ -4,6 +4,7 @@ worker_processes  8;
 #error_log  logs/error.log;
 #error_log  logs/error.log  notice;
 #error_log  logs/error.log  info;
+error_log /dev/null crit;
 
 #pid        logs/nginx.pid;
 
@@ -22,6 +23,7 @@ http {
     #                  '"$http_user_agent" "$http_x_forwarded_for"';
 
     #access_log  logs/access.log  main;
+    access_log off;
 
     sendfile        on;
     #tcp_nopush     on;

+ 13 - 1
php-yaf/benchmark_config

@@ -8,7 +8,19 @@
       "query_url": "/bench/raw/db?queries=",
       "fortune_url": "/bench/raw/fortunes",
       "port": 8080,
-      "sort": 124
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "yaf",
+      "language": "PHP",
+      "orm": "Raw",
+      "platform": "PHP-FPM",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "yaf",
+      "notes": "",
+      "versus": "php"
     }
   }]
 }

+ 2 - 0
php-yaf/deploy/nginx.conf

@@ -1,4 +1,5 @@
 worker_processes  8;
+error_log /dev/null crit;
 
 events {
     worker_connections  1024;
@@ -9,6 +10,7 @@ http {
     default_type  application/octet-stream;
     sendfile      on;
     keepalive_timeout  65;
+    access_log off;
 
     upstream fastcgi_backend {
         server 127.0.0.1:9001;

+ 26 - 2
php/benchmark_config

@@ -8,7 +8,19 @@
       "db_url": "/dborm.php",
       "query_url": "/dborm.php?queries=",
       "port": 8080,
-      "sort": 11
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "MySQL",
+      "framework": "php",
+      "language": "PHP",
+      "orm": "Full",
+      "platform": "PHP-FPM",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "php",
+      "notes": "",
+      "versus": "php"
     },
     "raw": {
       "setup_file": "setup",
@@ -17,7 +29,19 @@
       "fortune_url": "/fortune.php",
       "update_url": "/updateraw.php?queries=",
       "port": 8080,
-      "sort": 12
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "MySQL",
+      "framework": "php",
+      "language": "PHP",
+      "orm": "Raw",
+      "platform": "PHP-FPM",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "php",
+      "notes": "",
+      "versus": "php"
     }
   }]
 }

+ 2 - 0
php/deploy/nginx.conf

@@ -4,6 +4,7 @@ worker_processes  8;
 #error_log  logs/error.log;
 #error_log  logs/error.log  notice;
 #error_log  logs/error.log  info;
+error_log /dev/null crit;
 
 #pid        logs/nginx.pid;
 
@@ -22,6 +23,7 @@ http {
     #                  '"$http_user_agent" "$http_x_forwarded_for"';
 
     #access_log  logs/access.log  main;
+    access_log off;
 
     sendfile        on;
     #tcp_nopush     on;

+ 13 - 1
phreeze/benchmark_config

@@ -7,7 +7,19 @@
       "db_url": "/db",
       "query_url": "/db?queries=",
       "port": 8080,
-      "sort": 49
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "phreeze",
+      "language": "PHP",
+      "orm": "Micro",
+      "platform": "PHP-FPM",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "phreeze",
+      "notes": "",
+      "versus": "php"
     }
   }]
 }

+ 2 - 0
phreeze/deploy/nginx.conf

@@ -4,6 +4,7 @@ worker_processes  8;
 #error_log  logs/error.log;
 #error_log  logs/error.log  notice;
 #error_log  logs/error.log  info;
+error_log /dev/null crit;
 
 #pid        logs/nginx.pid;
 
@@ -22,6 +23,7 @@ http {
     #                  '"$http_user_agent" "$http_x_forwarded_for"';
 
     #access_log  logs/access.log  main;
+    access_log off;
 
     sendfile        on;
     #tcp_nopush     on;

+ 13 - 1
plack/benchmark_config

@@ -6,7 +6,19 @@
       "json_url": "/json",
       "db_url": "/db",
       "port": 8080,
-      "sort": 118
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "plack",
+      "language": "Perl",
+      "orm": "Raw",
+      "platform": "Plack",
+      "webserver": "Starman",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "plack",
+      "notes": "",
+      "versus": ""
     }
   }]
 }

+ 26 - 15
plain/benchmark_config

@@ -1,17 +1,28 @@
 {
-    "framework" : "plain",
-    "tests" : [{
-        "default" : {
-            "setup_file" : "setup",
-            "json_url" : "/json",
-            "plaintext_url": "/plaintext",
-            "db_url": "/db",
-            "query_url": "/db?queries=",
-            "update_url": "/update?queries=",
-            "fortune_url": "/fortunes",
-            "port": 9080,
-            "sort": 316
-            }
-        }
-    ]
+  "framework": "plain",
+  "tests": [{
+    "default": {
+      "setup_file": "setup",
+      "json_url": "/json",
+      "plaintext_url": "/plaintext",
+      "db_url": "/db",
+      "query_url": "/db?queries=",
+      "update_url": "/update?queries=",
+      "fortune_url": "/fortunes",
+      "port": 9080,
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "plain",
+      "language": "Scala",
+      "orm": "Full",
+      "platform": "Plain",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "plain",
+      "notes": "",
+      "versus": ""
+    }
+  }]
 }

+ 13 - 1
play-java-jpa/benchmark_config

@@ -6,7 +6,19 @@
       "db_url": "/db",
       "query_url": "/db?queries=",
       "port": 9000,
-      "sort": 113
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "play-java",
+      "language": "Java",
+      "orm": "Full",
+      "platform": "Netty",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "play-java-jpa",
+      "notes": "JPA alternate",
+      "versus": "netty"
     }
   }]
 }

+ 13 - 1
play-java/benchmark_config

@@ -7,7 +7,19 @@
       "db_url": "/db",
       "query_url": "/db?queries=",
       "port": 9000,
-      "sort": 13
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "play-java",
+      "language": "Java",
+      "orm": "Full",
+      "platform": "Netty",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "play-java",
+      "notes": "",
+      "versus": "netty"
     }
   }]
 }

+ 13 - 1
play-scala-mongodb/benchmark_config

@@ -6,7 +6,19 @@
       "db_url": "/db",
       "query_url": "/db?queries=",
       "port": 9000,
-      "sort": 83
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MongoDB",
+      "framework": "play-scala",
+      "language": "Scala",
+      "orm": "Raw",
+      "platform": "Netty",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "play-scala",
+      "notes": "",
+      "versus": "netty"
     }
   }]
 }

+ 13 - 1
play-scala/benchmark_config

@@ -9,7 +9,19 @@
       "fortune_url": "/fortunes",
       "update_url": "/update?queries=",
       "port": 9000,
-      "sort": 32
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "play-scala",
+      "language": "Scala",
+      "orm": "Full",
+      "platform": "Netty",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "play-scala",
+      "notes": "",
+      "versus": "netty"
     }
   }]
 }

+ 13 - 1
play-slick/benchmark_config

@@ -8,7 +8,19 @@
       "fortune_url": "/fortunes",
       "update_url": "/update?queries=",
       "port": 9000,
-      "sort": 135
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "play-scala",
+      "language": "Scala",
+      "orm": "Raw",
+      "platform": "Netty",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "play-slick",
+      "notes": "",
+      "versus": "netty"
     }
   }]
 }

+ 13 - 1
play1/benchmark_config

@@ -7,7 +7,19 @@
       "db_url": "/db",
       "query_url": "/db?queries=",
       "port": 8080,
-      "sort": 65
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "play1",
+      "language": "Java",
+      "orm": "Full",
+      "platform": "Netty",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "play1",
+      "notes": "",
+      "versus": "netty"
     }
   }]
 }

+ 13 - 1
play1siena/benchmark_config

@@ -7,7 +7,19 @@
       "db_url": "/play1/db",
       "query_url": "/play1/db?queries=",
       "port": 8080,
-      "sort": 66
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "play1-siena",
+      "language": "Java",
+      "orm": "Full",
+      "platform": "Netty",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "play1-seina",
+      "notes": "Siena alternate",
+      "versus": "netty"
     }
   }]
 }

+ 26 - 2
rack/benchmark_config

@@ -6,14 +6,38 @@
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "sort": 14
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "None",
+      "framework": "rack",
+      "language": "Ruby",
+      "orm": "Full",
+      "platform": "Rack",
+      "webserver": "Unicorn",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "rack",
+      "notes": "",
+      "versus": ""
     },
     "jruby": {
       "setup_file": "setup_jruby",
       "json_url": "/rack/json",
       "plaintext_url": "/rack/plaintext",
       "port": 8080,
-      "sort": 15
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "None",
+      "framework": "rack",
+      "language": "Ruby",
+      "orm": "Full",
+      "platform": "JRuby",
+      "webserver": "Resin",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "rack",
+      "notes": "",
+      "versus": ""
     }
   }]
 }

+ 4 - 2
rack/config/nginx.conf

@@ -25,7 +25,8 @@ worker_processes 8;
 
 # Feel free to change all paths to suite your needs here, of course
 # pid /tmp/nginx.pid;
-error_log /tmp/nginx.error.log;
+#error_log /tmp/nginx.error.log;
+error_log /dev/null crit;
 
 events {
   worker_connections 4096; # increase if you have lots of clients
@@ -42,7 +43,8 @@ http {
   default_type application/octet-stream;
 
   # click tracking!
-  access_log /tmp/nginx.access.log combined;
+  #access_log /tmp/nginx.access.log combined;
+  access_log off;
 
   # you generally want to serve static files with nginx since neither
   # Unicorn nor Rainbows! is optimized for it at the moment

+ 13 - 1
racket-ws/benchmark_config

@@ -7,7 +7,19 @@
       "db_url": "/db",
       "query_url": "/dbs/",
       "port": 8000,
-      "sort": 322
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "racket-ws",
+      "language": "Racket",
+      "orm": "Micro",
+      "platform": "Racket",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "racket-ws",
+      "notes": "",
+      "versus": ""
     }
   }]
 }

+ 26 - 2
rails-stripped/benchmark_config

@@ -7,7 +7,19 @@
       "db_url": "/hello_world/db",
       "query_url": "/hello_world/db?queries=",
       "port": 8080,
-      "sort": 34
+      "approach": "Stripped",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "rails",
+      "language": "Ruby",
+      "orm": "Full",
+      "platform": "Rack",
+      "webserver": "Unicorn",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "rails",
+      "notes": "",
+      "versus": "rack"
     },
     "jruby": {
       "setup_file": "setup_jruby",
@@ -15,7 +27,19 @@
       "db_url": "/rails/hello_world/db",
       "query_url": "/rails/hello_world/db?queries=",
       "port": 8080,
-      "sort": 35
+      "approach": "Stripped",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "rails",
+      "language": "Ruby",
+      "orm": "Full",
+      "platform": "JRuby",
+      "webserver": "Resin",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "rails",
+      "notes": "",
+      "versus": "rack"
     }
   }]
 }

+ 4 - 2
rails-stripped/config/nginx.conf

@@ -25,7 +25,8 @@ worker_processes 8;
 
 # Feel free to change all paths to suite your needs here, of course
 # pid /tmp/nginx.pid;
-error_log /tmp/nginx.error.log;
+#error_log /tmp/nginx.error.log;
+error_log /dev/null crit;
 
 events {
   worker_connections 4096; # increase if you have lots of clients
@@ -42,7 +43,8 @@ http {
   default_type application/octet-stream;
 
   # click tracking!
-  access_log /tmp/nginx.access.log combined;
+  #access_log /tmp/nginx.access.log combined;
+  access_log off;
 
   # you generally want to serve static files with nginx since neither
   # Unicorn nor Rainbows! is optimized for it at the moment

+ 26 - 2
rails/benchmark_config

@@ -9,7 +9,19 @@
       "fortune_url": "/fortune",
       "update_url": "/update?queries=",
       "port": 8080,
-      "sort": 16
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "rails",
+      "language": "Ruby",
+      "orm": "Full",
+      "platform": "Rack",
+      "webserver": "Unicorn",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "rails",
+      "notes": "",
+      "versus": "rack"
     },
     "jruby": {
       "setup_file": "setup_jruby",
@@ -19,7 +31,19 @@
       "fortune_url": "/rails/fortune",
       "update_url": "/rails/update?queries=",
       "port": 8080,
-      "sort": 17
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "rails",
+      "language": "Ruby",
+      "orm": "Full",
+      "platform": "JRuby",
+      "webserver": "Resin",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "rails",
+      "notes": "",
+      "versus": "rack"
     }
   }]
 }

+ 4 - 2
rails/config/nginx.conf

@@ -25,7 +25,8 @@ worker_processes 8;
 
 # Feel free to change all paths to suite your needs here, of course
 # pid /tmp/nginx.pid;
-error_log /tmp/nginx.error.log;
+#error_log /tmp/nginx.error.log;
+error_log /dev/null crit;
 
 events {
   worker_connections 4096; # increase if you have lots of clients
@@ -42,7 +43,8 @@ http {
   default_type application/octet-stream;
 
   # click tracking!
-  access_log /tmp/nginx.access.log combined;
+  #access_log /tmp/nginx.access.log combined;
+  access_log off;
 
   # you generally want to serve static files with nginx since neither
   # Unicorn nor Rainbows! is optimized for it at the moment

+ 39 - 3
restexpress/benchmark_config

@@ -5,21 +5,57 @@
       "setup_file": "setup",
       "json_url": "/restexpress/json",
       "port": 8080,
-      "sort": 107
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "None",
+      "framework": "rest-express",
+      "language": "Java",
+      "orm": "Raw",
+      "platform": "Netty",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "rest-express",
+      "notes": "",
+      "versus": "netty"
     },
     "mysql-raw": {
       "setup_file": "setup",
       "db_url": "/restexpress/mysql",
       "query_url": "/restexpress/mysql?queries=",
       "port": 8080,
-      "sort": 108
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MySQL",
+      "framework": "rest-express",
+      "language": "Java",
+      "orm": "Raw",
+      "platform": "Netty",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "rest-express",
+      "notes": "",
+      "versus": "netty"
     },
     "mongodb": {
       "setup_file": "setup",
       "db_url": "/restexpress/mongodb",
       "query_url": "/restexpress/mongodb?queries=",
       "port": 8080,
-      "sort": 109
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "MongoDB",
+      "framework": "rest-express",
+      "language": "Java",
+      "orm": "Raw",
+      "platform": "Netty",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "rest-express",
+      "notes": "",
+      "versus": "netty"
     }
   }]
 }

Some files were not shown because too many files changed in this diff