Inicio Explorar Axuda
Iniciar sesión
compsci-industry
/
TechEmpower.FrameworkBenchmarks
réplica de https://github.com/TechEmpower/FrameworkBenchmarks.git
2
0
Fork 0
Ficheiros Incidencias 0 Wiki
Explorar o código

peachpie updated, simplified (#5269)

- aspnetcore 3.0
- peachpie 1.0.0-appv3073
- tests simplified
Jakub Míšek %!s(int64=5) %!d(string=hai) anos
pai
145fb9982d
achega
8ff61662f8
Modificáronse 12 ficheiros con 63 adicións e 112 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 8 0
      frameworks/PHP/peachpie/NuGet.Config
  2. 6 8
      frameworks/PHP/peachpie/Server/Program.cs
  3. 2 8
      frameworks/PHP/peachpie/Server/Server.csproj
  4. 1 2
      frameworks/PHP/peachpie/Website/Website.msbuildproj
  5. 0 1
      frameworks/PHP/peachpie/Website/dbraw.php
  6. 14 27
      frameworks/PHP/peachpie/Website/fortune.php
  7. 3 0
      frameworks/PHP/peachpie/Website/info.php
  8. 5 24
      frameworks/PHP/peachpie/Website/json.php
  9. 2 7
      frameworks/PHP/peachpie/Website/plaintext.php
  10. 17 30
      frameworks/PHP/peachpie/Website/updateraw.php
  11. 1 1
      frameworks/PHP/peachpie/benchmark_config.json
  12. 4 4
      frameworks/PHP/peachpie/peachpie.dockerfile

+ 8 - 0
frameworks/PHP/peachpie/NuGet.Config
Ver ficheiro 

@@ -0,0 +1,8 @@
 
+<?xml version="1.0" encoding="utf-8"?>

+

+<configuration>

+  <packageSources>

+    <add key="appveyor" value="https://ci.appveyor.com/nuget/peachpie" />

+  </packageSources>

+

+</configuration>

+ 6 - 8
frameworks/PHP/peachpie/Server/Program.cs
Ver ficheiro 

@@ -2,26 +2,24 @@ using System;
 
 using System.Threading;
 
 using Microsoft.AspNetCore.Builder;
 
 using Microsoft.AspNetCore.Hosting;
 
-using Microsoft.Extensions.DependencyInjection;
 
-using Peachpie.AspNetCore.Web;
 
+using Microsoft.Extensions.Hosting;
 
 
-namespace MyWebsite.Server
 
+namespace PeachpieBenchmarks.Server
 
 {
 
     class Program
 
     {
 
         static void Main(string[] args)
 
         {
 
-            ThreadPool.GetMinThreads(out int workerThread, out int completionThread);
 
             // Double ThreadPool for non-async calls
 
+            ThreadPool.GetMinThreads(out int workerThread, out int completionThread);
 
             ThreadPool.SetMinThreads(workerThread * 2, completionThread);
 
 
-            var host = new WebHostBuilder()
 
+            new WebHostBuilder()
 
                 .UseKestrel()
 
                 .UseUrls("http://*:8080/")
 
                 .UseStartup<Startup>()
 
-                .Build();
 
-
 
-            host.Run();
 
+                .Build()
 
+                .Run();
 
         }
 
     }

+ 2 - 8
frameworks/PHP/peachpie/Server/Server.csproj
Ver ficheiro 

@@ -1,18 +1,12 @@
 
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 
   <PropertyGroup>
 
-    <TargetFramework>netcoreapp2.2</TargetFramework>
 
+    <TargetFramework>netcoreapp3.0</TargetFramework>
 
     <OutputType>Exe</OutputType>
 
   </PropertyGroup>
 
 
   <ItemGroup>
 
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
 
-    <PackageReference Include="Microsoft.AspNetCore.Session" Version="2.2.0" />
 
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
 
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.2.0" />
 
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.2.1" />
 
-    <PackageReference Include="Microsoft.AspNetCore.Buffering" Version="0.2.2" />
 
-    <PackageReference Include="Peachpie.AspNetCore.Web" Version="0.9.42" />
 
+    <PackageReference Include="Peachpie.AspNetCore.Web" Version="1.0.0-appv3073" />
 
   </ItemGroup>
 
 
   <ItemGroup>

+ 1 - 2
frameworks/PHP/peachpie/Website/Website.msbuildproj
Ver ficheiro 

@@ -1,9 +1,8 @@
 
-<Project Sdk="Peachpie.NET.Sdk/0.9.42">
 
+<Project Sdk="Peachpie.NET.Sdk/1.0.0-appv3073">
 
 
   <PropertyGroup>
 
     <OutputType>Library</OutputType>
 
     <TargetFramework>netstandard2.0</TargetFramework>
 
-	<AssemblyName>Website</AssemblyName>
 
   </PropertyGroup>
 
 
   <ItemGroup>

+ 0 - 1
frameworks/PHP/peachpie/Website/dbraw.php
Ver ficheiro 

@@ -52,4 +52,3 @@ function dbraw() {
 
 }
 
 
 dbraw();
 
-?>

+ 14 - 27
frameworks/PHP/peachpie/Website/fortune.php
Ver ficheiro 

@@ -1,4 +1,12 @@
 
-<?php
 
+<!DOCTYPE html>
 
+<html><head><title>Fortunes</title></head>
 
+<body>
 
+  <table>
 
+  <tr><th>id</th><th>message</th></tr>
 
+<?php table(); ?>
 
+  </table>
 
+</body>
 
+</html><?php
 
 //
 
 // Database Test
 
 //
 
@@ -23,29 +31,8 @@ function fortune() {
 
   return $arr;
 
 }
 
 
-// Set content type
 
-header("Content-type: text/html; charset=utf-8");
 
-
 
-?>
 
-<!DOCTYPE html>
 
-<html>
 
-<head>
 
-<title>Fortunes</title>
 
-</head>
 
-<body>
 
-<table>
 
-<tr>
 
-<th>id</th>
 
-<th>message</th>
 
-</tr>
 
-<?php
 
-foreach ( fortune() as $id => $fortune ) {
 
-?>
 
-<tr>
 
-<td><?php echo htmlspecialchars($id, ENT_QUOTES, 'UTF-8'); ?></td>  
-<td><?php echo htmlspecialchars($fortune, ENT_QUOTES, 'UTF-8'); ?></td>
 
-</tr>
 
-<?php } ?>
 
-</table>
 
-</body>
 
-</html>
 
+function table() {
 
+  foreach ( fortune() as $id => $fortune ) : ?>
 
+<tr><td><?= $id ?></td><td><?= htmlspecialchars($fortune, ENT_QUOTES, 'UTF-8') ?></td></tr>
 
+<?php endforeach;
 
+}

+ 3 - 0
frameworks/PHP/peachpie/Website/info.php
Ver ficheiro 

@@ -0,0 +1,3 @@
 
+<?php
 
+
 
+phpinfo();

+ 5 - 24
frameworks/PHP/peachpie/Website/json.php
Ver ficheiro 

@@ -1,26 +1,7 @@
 
 <?php
 
-//
 
-// JSON Encoding Test
 
-//
 
+// Set content type
 
+header('Content-Type: application/json');
 
 
-function json() {
 
-  // Set content type
 
-  header("Content-type: application/json");
 
-
 
-  // Create an array with the response string.
 
-  $arr = array(
 
-      "message" => "Hello, World!"
 
-  );
 
-
 
-  // Use the PHP standard JSON encoder.
 
-  // http://www.php.net/manual/en/function.json-encode.php
 
-  $output =  json_encode($arr);
 
-
 
-  // Set content length
 
-  header("Content-Length: {strlen($output)}");
 
-
 
-  echo $output;
 
-}
 
-
 
-json();
 
-?>
 
+// Use the PHP standard JSON encoder.
 
+// http://www.php.net/manual/en/function.json-encode.php
 
+echo json_encode(['message' => 'Hello, World!']);

+ 2 - 7
frameworks/PHP/peachpie/Website/plaintext.php
Ver ficheiro 

@@ -1,12 +1,7 @@
 
 <?php
 
-//
 
 // Plaintext Test
 
-//
 
 
 // Set content type
 
-header("Content-type: text/plain");
 
-// Set content length
 
-header("Content-Length: 13");
 
+header('Content-Type: text/plain');
 
 
-?>
 
-Hello, World!
 
+echo 'Hello, World!';

+ 17 - 30
frameworks/PHP/peachpie/Website/updateraw.php
Ver ficheiro 

@@ -3,55 +3,42 @@
 
 // Database Test
 
 //
 
 
-function updateraw() {
 
-  // Database connection (TODO: When it works, use PDO instead)
 
+// Set content type
 
+header("Content-type: application/json");
 
+
 
+function updateraw(int $query_count) {
 
+  // Database connection // TODO: use PDO instead
 
   $link = mysql_pconnect('tfb-database', 'benchmarkdbuser', 'benchmarkdbpass');
 
   mysql_select_db('hello_world', $link);
 
 
-  // Read number of queries to run from URL parameter
 
-  $query_count = 1;
 
-  if (isset($_GET['queries'])) {
 
-    $query_count = (int)$_GET['queries'];
 
-    if ($query_count > 500) {
 
-      $query_count = 500;
 
-    } else if ($query_count < 1) {
 
-      $query_count = 1;
 
-    }
 
-  }
 
-
 
   // Create an array with the response string.
 
-  $arr = array();
 
-  $id = mt_rand(1, 10000);
 
-  $randomNumber = mt_rand(1, 1000);
 
-
 
+  $arr = [];
 
+  
+  // Ensure the number of queries to run from URL parameter
 
+  $query_count = max(min($query_count, 500), 1);
 
+  
   // For each query, store the result set values in the response array
 
   while ($query_count--) {
 
+
 
+    $id = mt_rand(1, 10000);
 
+    $randomNumber = mt_rand(1, 10000);
 
+
 
     $result = mysql_query("SELECT randomNumber FROM World WHERE id = $id", $link);
 
     
     // Store result in array.
 
-    $world = array('id' => $id, 'randomNumber' => mysql_result($result, 0));
 
+    $world = ['id' => $id, 'randomNumber' => mysql_result($result, 0)];
 
     $world['randomNumber'] = $randomNumber;
 
 
     mysql_query("UPDATE World SET randomNumber = $randomNumber WHERE id = $id", $link);
 
     
     $arr[] = $world;
 
-    $id = mt_rand(1, 10000);
 
-    $randomNumber = mt_rand(1, 10000);
 
   }
 
 
   mysql_close($link);
 
 
-  // Set content type
 
-  header("Content-type: application/json");
 
-
 
   // Use the PHP standard JSON encoder.
 
   // http://www.php.net/manual/en/function.json-encode.php
 
-  $output = json_encode($arr);
 
-  // Set content length
 
-  header("Content-Length: {strlen($output)}");
 
-
 
-  echo $output;
 
+  echo json_encode($arr);
 
 }
 
 
-updateraw();
 
-?>
 
+updateraw((int)$_GET['queries']);

+ 1 - 1
frameworks/PHP/peachpie/benchmark_config.json
Ver ficheiro 

@@ -20,7 +20,7 @@
 
       "webserver": "Kestrel",
 
       "os": "Linux",
 
       "database_os": "Linux",
 
-      "display_name": "Peachpie",
 
+      "display_name": "peachpie",
 
       "notes": "",
 
       "versus": "php"
 
     }

+ 4 - 4
frameworks/PHP/peachpie/peachpie.dockerfile
Ver ficheiro 

@@ -1,11 +1,11 @@
 
-FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build
 
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0 AS build
 
 WORKDIR /app
 
 COPY . .
 
-RUN dotnet publish -c Release -o ../out Server
 
+RUN dotnet publish -c Release -o out Server
 
 
-FROM mcr.microsoft.com/dotnet/core/aspnet:2.2 AS runtime
 
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.0 AS runtime
 
 ENV COMPlus_ReadyToRun 0
 
 WORKDIR /app
 
 COPY --from=build /app/out ./
 
 
-ENTRYPOINT ["dotnet", "Server.dll"]
 
+ENTRYPOINT ["dotnet", "Server.dll", "--urls=http://*:8080"]