Updated README and benchmark_config

pdonald · May 11, 2013 · a454ab5 · a454ab5
1 parent 3d8d46c
commit a454ab5
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 70 deletions.
diff --git a/aspnet/README.md b/aspnet/README.md
@@ -2,48 +2,44 @@
 
 ## Tests
 
-### JSON
+* JSON serialization
+* Single query
+* Multiple queries
+* Server-side templates and collections
+* Updates
 
-* `http://localhost:8080/json`
-
----
-
-### ADO.NET (Raw)
-
-**MySQL**
+## Versions
 
-* `http://localhost:8080/ado/mysql`
-* `http://localhost:8080/ado/mysql?queries=10`
-* `http://localhost:8080/ado/mysql/fortunes`
+**Language**
 
-**PostgreSQL**
+* C# 5.0
 
-* `http://localhost:8080/ado/postgresql`
-* `http://localhost:8080/ado/postgresql?queries=10`
-* `http://localhost:8080/ado/postgresql/fortunes`
+**Platforms**
 
----
+* .NET Framework 4.5 (Windows)
+* Mono 3.0.10 (Linux)
 
-### Entity Framework (ORM)
+**Web Servers**
 
-**MySQL**
+* IIS 8 (Windows)
+* XSP 2.11.0.0 (3.0?) (Linux)
+* nginx 1.4.0 & XSP FastCGI (Linux)
 
-* `http://localhost:8080/entityframework/mysql`
-* `http://localhost:8080/entityframework/mysql?queries=10`
-* `http://localhost:8080/entityframework/mysql/fortunes`
+**Web Stack**
 
-**PostgreSQL**
+* ASP.NET 4.5
+* ASP.NET MVC Framework 4
 
-* `http://localhost:8080/entityframework/postgresql`
-* `http://localhost:8080/entityframework/postgresql?queries=10`
-* `http://localhost:8080/entityframework/postgresql/fortunes`
+**Databases**
 
----
+* MySQL Connector/Net 6.7.2-beta ([custom build](https://github.com/pdonald/mysql-connector-net))
+* Npgsql 2.0.12 ([custom build](https://github.com/pdonald/Npgsql2))
+* Entity Framework 6.0.0-alpha3
+* Mongo C# Driver 1.8.1
 
-### MongoDB
+**Developer Tools**
 
-* `http://localhost:8080/mongodb`
-* `http://localhost:8080/mongodb?queries=10`
+* Visual Studio 2012 Update 2
 
 ## Mono Installation
 
@@ -64,37 +60,4 @@
     git checkout 3.0
     ./autogen.sh --prefix=/usr/local
     make
-    sudo make install
-
-## Versions
-
-**Language**
-
-* C# 5.0
-
-**Platforms**
-
-* .NET Framework 4.5 (Windows)
-* Mono 3.0.10 (Linux)
-
-**Web Servers**
-
-* IIS 8 (Windows)
-* XSP 2.11.0.0 (3.0?) (Linux)
-* nginx 1.4.0 & XSP FastCGI (Linux)
-
-**Web Stack**
-
-* ASP.NET 4.5
-* ASP.NET MVC Framework 4
-
-**Databases**
-
-* MySQL Connector/Net 6.7.2-beta (custom build)
-* Npgsql 2.0.12 (custom build)
-* Entity Framework 6.0.0-alpha3
-* Mongo C# Driver 1.8.1
-
-**Developer Tools**
-
-* Visual Studio 2012 Update 2
+    sudo make install
diff --git a/aspnet/benchmark_config b/aspnet/benchmark_config
@@ -3,93 +3,111 @@
   "tests": [{
     "default": {
       "setup_file": "setup_iis",
+      "os": "nt",
       "json_url": "/json",
       "port": 8080,
       "sort": 90
     },
     "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
     },
     "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
     },
     "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
     },
     "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": 94
     },
     "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": 95
     },
     "mono": {
       "setup_file": "setup_nginx",
       "json_url": "/json",
       "port": 8080,
-      "sort": 98
+      "sort": 100
     },
     "mono-mysql-raw": {
       "setup_file": "setup_nginx",
       "db_url": "/ado/mysql",
       "query_url": "/ado/mysql?queries=",
       "fortune_url": "/ado/mysql/fortunes",
+      "update_url": "/ado/mysql/update?queries=",
       "port": 8080,
-      "sort": 99
+      "sort": 101
     },
     "mono-postgresql-raw": {
       "setup_file": "setup_nginx",
       "db_url": "/ado/postgresql",
       "query_url": "/ado/postgresql?queries=",
       "fortune_url": "/ado/postgresql/fortunes",
+      "update_url": "/ado/postgresql/update?queries=",
       "port": 8080,
-      "sort": 100
+      "sort": 102
     },
     "mono-mongodb-raw": {
       "setup_file": "setup_nginx",
       "db_url": "/mongodb",
       "query_url": "/mongodb?queries=",
+      "fortune_url": "/mongodb/fortunes",
+      "update_url": "/mongodb/update?queries=",
       "port": 8080,
-      "sort": 101
+      "sort": 103
     },
     "mono-mysql-entityframework": {
       "setup_file": "setup_nginx",
       "db_url": "/entityframework/mysql",
       "query_url": "/entityframework/mysql?queries=",
       "fortune_url": "/entityframework/mysql/fortunes",
+      "update_url": "/entityframework/mysql/update?queries=",
       "port": 8080,
-      "sort": 102
+      "sort": 104
     },
     "mono-postgresql-entityframework": {
       "setup_file": "setup_nginx",
       "db_url": "/entityframework/postgresql",
       "query_url": "/entityframework/postgresql?queries=",
       "fortune_url": "/entityframework/postgresql/fortunes",
+      "update_url": "/entityframework/postgresql/update?queries=",
       "port": 8080,
-      "sort": 103
+      "sort": 105
     }
   }]
-}
+}