Ben Adams 4 лет назад
Родитель
Сommit
ba6b3a3618

+ 1 - 1
frameworks/CSharp/aspnetcore-corert/benchmark_config.json

@@ -16,7 +16,7 @@
       "webserver": "Kestrel",
       "webserver": "Kestrel",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "ASP.NET Core",
+      "display_name": "ASP.NET Core [Platform, CoreRT]",
       "notes": "",
       "notes": "",
       "versus": "aspcore"
       "versus": "aspcore"
     }
     }

+ 0 - 14
frameworks/CSharp/aspnetcore-mono/aspcore-mono-mvc-my.dockerfile

@@ -1,14 +0,0 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
-WORKDIR /app
-COPY Benchmarks .
-RUN dotnet publish -c Release -o out
-
-FROM mcr.microsoft.com/dotnet/runtime-deps:5.0 AS runtime
-ENV ASPNETCORE_URLS http://+:8080
-WORKDIR /app
-COPY --from=build /app/out ./
-COPY Benchmarks/appsettings.mysql.json ./appsettings.json
-
-EXPOSE 8080
-
-ENTRYPOINT ["./Benchmarks", "scenarios=MvcDbSingleQueryRaw,MvcDbMultiQueryRaw,MvcDbMultiUpdateRaw,MvcDbFortunesRaw"]

+ 0 - 14
frameworks/CSharp/aspnetcore-mono/aspcore-mono-mw-my.dockerfile

@@ -1,14 +0,0 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
-WORKDIR /app
-COPY Benchmarks .
-RUN dotnet publish -c Release -o out
-
-FROM mcr.microsoft.com/dotnet/runtime-deps:5.0 AS runtime
-ENV ASPNETCORE_URLS http://+:8080
-WORKDIR /app
-COPY --from=build /app/out ./
-COPY Benchmarks/appsettings.mysql.json ./appsettings.json
-
-EXPOSE 8080
-
-ENTRYPOINT ["./Benchmarks", "scenarios=DbSingleQueryRaw,DbMultiQueryRaw,DbMultiUpdateRaw,DbFortunesRaw"]

+ 6 - 48
frameworks/CSharp/aspnetcore-mono/benchmark_config.json

@@ -16,7 +16,7 @@
 			"webserver": "Kestrel",
 			"webserver": "Kestrel",
 			"os": "Linux",
 			"os": "Linux",
 			"database_os": "Linux",
 			"database_os": "Linux",
-			"display_name": "ASP.NET Core on Mono",
+			"display_name": "ASP.NET Core [Platform, Mono]",
 			"notes": "",
 			"notes": "",
 			"versus": "aspcore"
 			"versus": "aspcore"
 		},
 		},
@@ -38,7 +38,7 @@
 			"webserver": "Kestrel",
 			"webserver": "Kestrel",
 			"os": "Linux",
 			"os": "Linux",
 			"database_os": "Linux",
 			"database_os": "Linux",
-			"display_name": "ASP.NET Core on Mono",
+			"display_name": "ASP.NET Core [Platform, Mono, Pg]",
 			"notes": "",
 			"notes": "",
 			"versus": "aspcore-ado-pg"
 			"versus": "aspcore-ado-pg"
 		},
 		},
@@ -57,7 +57,7 @@
 			"webserver": "Kestrel",
 			"webserver": "Kestrel",
 			"os": "Linux",
 			"os": "Linux",
 			"database_os": "Linux",
 			"database_os": "Linux",
-			"display_name": "ASP.NET Core on Mono, Middleware",
+			"display_name": "ASP.NET Core [Middleware, Mono]",
 			"notes": "",
 			"notes": "",
 			"versus": "aspcore-mono"
 			"versus": "aspcore-mono"
 		},
 		},
@@ -78,31 +78,10 @@
 			"webserver": "Kestrel",
 			"webserver": "Kestrel",
 			"os": "Linux",
 			"os": "Linux",
 			"database_os": "Linux",
 			"database_os": "Linux",
-			"display_name": "ASP.NET Core on Mono, Middleware",
+			"display_name": "ASP.NET Core [Middleware, Mono, Pg]",
 			"notes": "",
 			"notes": "",
 			"versus": "aspcore-mono-pg"
 			"versus": "aspcore-mono-pg"
 		},
 		},
-		"mw-my": {
-			"db_url": "/db/raw",
-			"query_url": "/queries/raw?queries=",
-			"update_url": "/updates/raw?queries=",
-			"fortune_url": "/fortunes/raw",
-			"port": 8080,
-			"approach": "Realistic",
-			"classification": "Micro",
-			"database": "MySQL",
-			"framework": "ASP.NET Core",
-			"language": "C#",
-			"orm": "Raw",
-			"platform": ".NET",
-			"flavor": "Mono",
-			"webserver": "Kestrel",
-			"os": "Linux",
-			"database_os": "Linux",
-			"display_name": "ASP.NET Core on Mono, Middleware",
-			"notes": "",
-			"versus": "aspcore-mono-my"
-		},
 		"mvc": {
 		"mvc": {
 			"plaintext_url": "/mvc/plaintext",
 			"plaintext_url": "/mvc/plaintext",
 			"json_url": "/mvc/json",
 			"json_url": "/mvc/json",
@@ -118,7 +97,7 @@
 			"webserver": "Kestrel",
 			"webserver": "Kestrel",
 			"os": "Linux",
 			"os": "Linux",
 			"database_os": "Linux",
 			"database_os": "Linux",
-			"display_name": "ASP.NET Core on Mono, MVC",
+			"display_name": "ASP.NET Core [MVC, Mono]",
 			"notes": "",
 			"notes": "",
 			"versus": "aspcore-mono"
 			"versus": "aspcore-mono"
 		},
 		},
@@ -139,30 +118,9 @@
 			"webserver": "Kestrel",
 			"webserver": "Kestrel",
 			"os": "Linux",
 			"os": "Linux",
 			"database_os": "Linux",
 			"database_os": "Linux",
-			"display_name": "ASP.NET Core on Mono, MVC",
+			"display_name": "ASP.NET Core [MVC, Mono, Pg]",
 			"notes": "",
 			"notes": "",
 			"versus": "aspcore-mono-pg"
 			"versus": "aspcore-mono-pg"
-		},
-		"mvc-my": {
-			"db_url": "/mvc/db/raw",
-			"query_url": "/mvc/queries/raw?queries=",
-			"update_url": "/mvc/updates/raw?queries=",
-			"fortune_url": "/mvc/fortunes/raw",
-			"port": 8080,
-			"approach": "Realistic",
-			"classification": "Fullstack",
-			"database": "MySQL",
-			"framework": "ASP.NET Core",
-			"language": "C#",
-			"orm": "Raw",
-			"platform": ".NET",
-			"flavor": "Mono",
-			"webserver": "Kestrel",
-			"os": "Linux",
-			"database_os": "Linux",
-			"display_name": "ASP.NET Core on Mono, MVC",
-			"notes": "",
-			"versus": "aspcore-mono-my"
 		}
 		}
 	}]
 	}]
 }
 }

+ 21 - 21
frameworks/CSharp/aspnetcore/benchmark_config.json

@@ -16,7 +16,7 @@
       "webserver": "Kestrel",
       "webserver": "Kestrel",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "ASP.NET Core",
+      "display_name": "ASP.NET Core [Platform]",
       "notes": "",
       "notes": "",
       "versus": "aspcore"
       "versus": "aspcore"
     },
     },
@@ -37,7 +37,7 @@
       "webserver": "Kestrel",
       "webserver": "Kestrel",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "ASP.NET Core, ADO.NET",
+      "display_name": "ASP.NET Core [Platform, Pg]",
       "notes": "",
       "notes": "",
       "versus": "aspcore-ado-pg"
       "versus": "aspcore-ado-pg"
     },
     },
@@ -55,7 +55,7 @@
       "webserver": "Kestrel",
       "webserver": "Kestrel",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "ASP.NET Core, ADO.NET",
+      "display_name": "ASP.NET Core [Platform,Pg]",
       "notes": "",
       "notes": "",
       "versus": "aspcore-ado-pg-up"
       "versus": "aspcore-ado-pg-up"
     },
     },
@@ -73,7 +73,7 @@
       "webserver": "Kestrel",
       "webserver": "Kestrel",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "ASP.NET Core, Middleware",
+      "display_name": "ASP.NET Core [Middleware]",
       "notes": "",
       "notes": "",
       "versus": "aspcore"
       "versus": "aspcore"
     },
     },
@@ -91,7 +91,7 @@
       "webserver": "Kestrel",
       "webserver": "Kestrel",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "ASP.NET Core, Middleware, Json",
+      "display_name": "ASP.NET Core [Middleware]",
       "notes": "",
       "notes": "",
       "versus": "aspcore"
       "versus": "aspcore"
     },
     },
@@ -111,7 +111,7 @@
       "webserver": "Kestrel",
       "webserver": "Kestrel",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "ASP.NET Core, Middleware, ADO.NET",
+      "display_name": "ASP.NET Core [Middleware, Pg]",
       "notes": "",
       "notes": "",
       "versus": "aspcore-ado-pg"
       "versus": "aspcore-ado-pg"
     },
     },
@@ -129,7 +129,7 @@
       "webserver": "Kestrel",
       "webserver": "Kestrel",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "ASP.NET Core, Middleware, ADO.NET",
+      "display_name": "ASP.NET Core [Middleware, Pg]",
       "notes": "",
       "notes": "",
       "versus": "aspcore-ado-pg"
       "versus": "aspcore-ado-pg"
     },
     },
@@ -149,7 +149,7 @@
       "webserver": "Kestrel",
       "webserver": "Kestrel",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "ASP.NET Core, Middleware, Entity Framework Core",
+      "display_name": "ASP.NET Core [Middleware, Pg, EF]",
       "notes": "",
       "notes": "",
       "versus": "aspcore-ado-pg"
       "versus": "aspcore-ado-pg"
     },
     },
@@ -167,7 +167,7 @@
       "webserver": "Kestrel",
       "webserver": "Kestrel",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "ASP.NET Core, Middleware, Entity Framework Core",
+      "display_name": "ASP.NET Core [Middleware, Pg, EF]",
       "notes": "",
       "notes": "",
       "versus": "aspcore-ado-pg"
       "versus": "aspcore-ado-pg"
     },
     },
@@ -187,7 +187,7 @@
       "webserver": "Kestrel",
       "webserver": "Kestrel",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "ASP.NET Core, Middleware, Dapper",
+      "display_name": "ASP.NET Core {Middleware, Pg, Dapper]",
       "notes": "",
       "notes": "",
       "versus": "aspcore-ado-pg"
       "versus": "aspcore-ado-pg"
     },
     },
@@ -205,7 +205,7 @@
       "webserver": "Kestrel",
       "webserver": "Kestrel",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "ASP.NET Core, Middleware, Dapper",
+      "display_name": "ASP.NET Core [Middleware, Pg, Dapper]",
       "notes": "",
       "notes": "",
       "versus": "aspcore-ado-pg"
       "versus": "aspcore-ado-pg"
     },
     },
@@ -226,7 +226,7 @@
       "webserver": "Kestrel",
       "webserver": "Kestrel",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "ASP.NET Core, Middleware, ADO.NET",
+      "display_name": "ASP.NET Core [Middleware, My]",
       "notes": "",
       "notes": "",
       "versus": "aspcore-ado-my"
       "versus": "aspcore-ado-my"
     },
     },
@@ -247,7 +247,7 @@
       "webserver": "Kestrel",
       "webserver": "Kestrel",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "ASP.NET Core, Middleware, Dapper",
+      "display_name": "ASP.NET Core [Middleware, My, Dapper]",
       "notes": "",
       "notes": "",
       "versus": "aspcore-ado-my"
       "versus": "aspcore-ado-my"
     },    
     },    
@@ -286,7 +286,7 @@
       "webserver": "Kestrel",
       "webserver": "Kestrel",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "ASP.NET Core, MVC, ADO.NET",
+      "display_name": "ASP.NET Core [MVC, Pg]",
       "notes": "",
       "notes": "",
       "versus": "aspcore-ado-pg"
       "versus": "aspcore-ado-pg"
     },
     },
@@ -304,7 +304,7 @@
       "webserver": "Kestrel",
       "webserver": "Kestrel",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "ASP.NET Core, MVC, ADO.NET",
+      "display_name": "ASP.NET Core [MVC, Pg]",
       "notes": "",
       "notes": "",
       "versus": "aspcore-ado-pg"
       "versus": "aspcore-ado-pg"
     },
     },
@@ -324,7 +324,7 @@
       "webserver": "Kestrel",
       "webserver": "Kestrel",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "ASP.NET Core, MVC, Entity Framework Core",
+      "display_name": "ASP.NET Core [MVC, Pg, EF]",
       "notes": "",
       "notes": "",
       "versus": "aspcore-ado-pg"
       "versus": "aspcore-ado-pg"
     },
     },
@@ -342,7 +342,7 @@
       "webserver": "Kestrel",
       "webserver": "Kestrel",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "ASP.NET Core, MVC, Entity Framework Core",
+      "display_name": "ASP.NET Core [MVC, Pg, EF]",
       "notes": "",
       "notes": "",
       "versus": "aspcore-ado-pg"
       "versus": "aspcore-ado-pg"
     },
     },
@@ -362,7 +362,7 @@
       "webserver": "Kestrel",
       "webserver": "Kestrel",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "ASP.NET Core, MVC, Dapper",
+      "display_name": "ASP.NET Core [MVC, Pg, Dapper]",
       "notes": "",
       "notes": "",
       "versus": "aspcore-ado-pg"
       "versus": "aspcore-ado-pg"
     },
     },
@@ -380,7 +380,7 @@
       "webserver": "Kestrel",
       "webserver": "Kestrel",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "ASP.NET Core, MVC, Dapper",
+      "display_name": "ASP.NET Core [MVC, Pg, Dapper]",
       "notes": "",
       "notes": "",
       "versus": "aspcore-ado-pg"
       "versus": "aspcore-ado-pg"
     },
     },
@@ -401,7 +401,7 @@
       "webserver": "Kestrel",
       "webserver": "Kestrel",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "ASP.NET Core, MVC, Raw",
+      "display_name": "ASP.NET Core [MVC, My]",
       "notes": "",
       "notes": "",
       "versus": "aspcore-ado-my"
       "versus": "aspcore-ado-my"
     },
     },
@@ -422,7 +422,7 @@
       "webserver": "Kestrel",
       "webserver": "Kestrel",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "ASP.NET Core, MVC, Dapper",
+      "display_name": "ASP.NET Core [MVC, My, Dapper]",
       "notes": "",
       "notes": "",
       "versus": "aspcore-ado-my"
       "versus": "aspcore-ado-my"
     }
     }

+ 1 - 1
frameworks/CSharp/ben/benchmark_config.json

@@ -18,7 +18,7 @@
       "webserver": "Kestrel",
       "webserver": "Kestrel",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Ben",
+      "display_name": "Ben [Kestrel]",
       "notes": "",
       "notes": "",
       "versus": "aspcore"
       "versus": "aspcore"
     }
     }

+ 2 - 2
frameworks/CSharp/nancy/benchmark_config.json

@@ -18,7 +18,7 @@
       "webserver": "Kestrel",
       "webserver": "Kestrel",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Nancy on ASP.NET Core on Mono",
+      "display_name": "Nancy [ASP.NET Core, Mono, My]",
       "notes": "",
       "notes": "",
       "versus": "aspcore-mono"
       "versus": "aspcore-mono"
     },
     },
@@ -39,7 +39,7 @@
       "webserver": "Kestrel",
       "webserver": "Kestrel",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "Nancy on ASP.NET Core on .NET Core",
+      "display_name": "Nancy [ASP.NET Core, My]",
       "notes": "",
       "notes": "",
       "versus": "aspcore"
       "versus": "aspcore"
     }
     }