Skip to content

Commit 534e03e

Browse files
kitriokitrio
committed
Merge branch 'master' into php/composer
# Conflicts: # frameworks/PHP/kumbiaphp/kumbiaphp-workerman-mysql.dockerfile # frameworks/PHP/kumbiaphp/kumbiaphp-workerman.dockerfile # frameworks/PHP/mark/mark.dockerfile # frameworks/PHP/php/php-laravel-query-builder.dockerfile # frameworks/PHP/php/php-workerman.dockerfile # frameworks/PHP/reactphp/reactphp-libuv.dockerfile # frameworks/PHP/reactphp/reactphp.dockerfile # frameworks/PHP/yii2/yii2-raw.dockerfile # frameworks/PHP/yii2/yii2-workerman.dockerfile # frameworks/PHP/yii2/yii2.dockerfile
2 parents 21f2760 + 80c46e9 commit 534e03e

File tree

274 files changed

+3121
-2673
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

274 files changed

+3121
-2673
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ jobs:
155155
# run-ci.py runs the diffing to see if github actions needs to test this framework. Ideally/eventually,
156156
# we'd like to try and do the diffing before github_actions_clean & setup.
157157
# This will run the tests exactly as you would in your own vm:
158-
docker network create tfb > /dev/null 2>&1 && docker run --network=tfb -e USER_ID=$(id -u) -e CI=true -v /var/run/docker.sock:/var/run/docker.sock --mount type=bind,source=`pwd`,target=/FrameworkBenchmarks techempower/tfb --mode verify --test-dir $RUN_TESTS --results-environment Github-Actions;
158+
docker network create tfb > /dev/null 2>&1 && docker run --network=tfb -e USER_ID=$(id -u) -e CI=true -v /var/run/docker.sock:/var/run/docker.sock --mount type=bind,source=`pwd`,target=/FrameworkBenchmarks techempower/tfb --mode verify --force-rm --test-dir $RUN_TESTS --results-environment Github-Actions;
159159
dependabot:
160160
needs: verify
161161
runs-on: ubuntu-latest

‎frameworks/C/h2o/src/event_loop.c‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,13 @@
3232
#include <netinet/tcp.h>
3333
#include <openssl/ssl.h>
3434
#include <sys/socket.h>
35-
#include <sys/syscall.h>
3635
#include <sys/types.h>
3736

3837
#include "error.h"
3938
#include "event_loop.h"
4039
#include "global_data.h"
4140
#include "thread.h"
42-
#include "utility.h"
4341

44-
#define CONN_NUM_SAMPLE_PERIOD 2500
4542
#define DEFAULT_TCP_FASTOPEN_QUEUE_LEN 4096
4643

4744
static void accept_connection(h2o_socket_t *listener, const char *err);
@@ -80,7 +77,6 @@ static void accept_connection(h2o_socket_t *listener, const char *err)
8077
if (!sock)
8178
break;
8279

83-
ctx->event_loop.accepted_conn_num++;
8480
ctx->event_loop.conn_num++;
8581
sock->on_close.cb = on_close_connection;
8682
sock->on_close.data = &ctx->event_loop.conn_num;
@@ -299,36 +295,11 @@ static void start_accept_polling(bool is_main_thread,
299295

300296
void event_loop(struct thread_context_t *ctx)
301297
{
302-
uint64_t last_sample = 0;
303-
304298
while (!ctx->shutdown || ctx->event_loop.conn_num) {
305299
h2o_evloop_run(ctx->event_loop.h2o_ctx.loop, INT32_MAX);
306300
process_messages(&ctx->global_thread_data->h2o_receiver,
307301
&ctx->event_loop.local_messages);
308-
309-
const uint64_t now = h2o_now(ctx->event_loop.h2o_ctx.loop);
310-
311-
if (now - last_sample > CONN_NUM_SAMPLE_PERIOD || last_sample > now) {
312-
const size_t i = ctx->event_loop.conn_num_sample_idx;
313-
314-
ctx->event_loop.conn_num_sample[i] = ctx->event_loop.conn_num;
315-
ctx->event_loop.conn_num_sample_idx =
316-
(i + 1) % ARRAY_SIZE(ctx->event_loop.conn_num_sample);
317-
last_sample = now;
318-
}
319302
}
320-
321-
flockfile(stdout);
322-
printf("Thread %ld statistics:\nAccepted connections: %zu\nConnection number samples: %zu",
323-
syscall(SYS_gettid),
324-
ctx->event_loop.accepted_conn_num,
325-
*ctx->event_loop.conn_num_sample);
326-
327-
for (size_t i = 1; i < ARRAY_SIZE(ctx->event_loop.conn_num_sample); i++)
328-
printf(",%zu", ctx->event_loop.conn_num_sample[i]);
329-
330-
putc_unlocked('\n', stdout);
331-
funlockfile(stdout);
332303
}
333304

334305
void free_event_loop(event_loop_t *event_loop, h2o_multithread_receiver_t *h2o_receiver)

‎frameworks/C/h2o/src/event_loop.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727

2828
#include "global_data.h"
2929

30-
#define CONN_NUM_SAMPLES 512
31-
3230
typedef enum {
3331
SHUTDOWN,
3432
TASK
@@ -43,9 +41,6 @@ typedef struct {
4341
h2o_accept_ctx_t h2o_accept_ctx;
4442
h2o_context_t h2o_ctx;
4543
h2o_linklist_t local_messages;
46-
size_t accepted_conn_num;
47-
size_t conn_num_sample[CONN_NUM_SAMPLES];
48-
size_t conn_num_sample_idx;
4944
} event_loop_t;
5045

5146
typedef struct {

‎frameworks/CSharp/akazawayun.pro/src/AkazawaYun.Benchmark.Platform/AkazawaYun.Benchmark.Platform.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="AkazawaYun.PRO" Version="1.14.25.1027-p" />
18+
<PackageReference Include="AkazawaYun.PRO" Version="1.14.25.1024-p" />
1919
</ItemGroup>
2020

2121
</Project>

‎frameworks/CSharp/akazawayun.pro/src/AkazawaYun.Benchmark.Platform/MyBenchmarkReceptor.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace AkazawaYun.Benchmark.Platform;
44

5-
class MyBenchmarkReceptor : akzWebReceptorBenchmark
5+
class MyBenchmarkReceptor : akaWebReceptorBenchmark
66
{
77
readonly JsonModel JsonModel;
88

@@ -23,7 +23,7 @@ public override ValueTask SendPlaintext(IHttpContext http)
2323
public override async ValueTask SendJson(IHttpContext http)
2424
{
2525
await http.Slient.Send(DataJson_OnlyHeader);
26-
akzJson.Text2Json(JsonModel, out ReadOnlyMemory<byte> json);
26+
akaJson.Text2Json(JsonModel, out ReadOnlyMemory<byte> json);
2727
await http.Slient.Send(json);
2828
}
2929
public override ValueTask SendDb(IHttpContext http)

‎frameworks/CSharp/akazawayun.pro/src/AkazawaYun.Benchmark.Platform/Program.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ namespace AkazawaYun.Benchmark.Platform;
44

55
class Program
66
{
7-
static readonly akzWebBuilder builder;
7+
static readonly akaWebBuilder builder;
88

99
static Program()
1010
{
11-
akzLog.War("AkazawaYun.PRO 平台压力测试特供版 ver2025.11.3, 只支持 /plaintext 和 /json");
12-
akzJson.Config(AotJsonContext.Default);
13-
builder = akzWebBuilder.Shared.Build(new MyBenchmarkReceptor());
11+
akaLog.War("AkazawaYun.PRO 平台压力测试特供版 ver2025.11.3, 只支持 /plaintext 和 /json");
12+
akaJson.Config(AotJsonContext.Default);
13+
builder = akaWebBuilder.Shared.Build(new MyBenchmarkReceptor());
1414
}
1515
static async Task Main()
1616
{

‎frameworks/CSharp/aspnetcore/appsettings.postgresql.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"ConnectionString": "Server=tfb-database;Database=hello_world;User Id=benchmarkdbuser;Password=benchmarkdbpass;SSL Mode=Disable;Maximum Pool Size=512;NoResetOnClose=true;Enlist=false;Max Auto Prepare=4",
2+
"ConnectionString": "Server=tfb-database;Database=hello_world;User Id=benchmarkdbuser;Password=benchmarkdbpass;SSL Mode=Disable;Maximum Pool Size=18;Enlist=false;Max Auto Prepare=4;Multiplexing=true;Write Coalescing Buffer Threshold Bytes=1000;",
33
"Database": "postgresql"
44
}

‎frameworks/CSharp/aspnetcore/aspnetcore-aot.dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
1+
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
22
RUN apt-get update
33
RUN apt-get -yqq install clang zlib1g-dev
44
WORKDIR /app
55
COPY src/Platform .
66
RUN dotnet publish -c Release -o out /p:DatabaseProvider=Npgsql /p:PublishAot=true /p:OptimizationPreference=Speed /p:GarbageCollectionAdaptationMode=0
77

8-
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime
8+
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS runtime
99
ENV URLS=http://+:8080
1010

1111
WORKDIR /app

‎frameworks/CSharp/aspnetcore/aspnetcore-minimal.dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
1+
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
22
WORKDIR /app
33
COPY src/Minimal .
44
RUN dotnet publish -c Release -o out
55

6-
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime
6+
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS runtime
77
ENV URLS http://+:8080
88
ENV DOTNET_GCDynamicAdaptationMode=0
99
ENV DOTNET_ReadyToRun=0

‎frameworks/CSharp/aspnetcore/aspnetcore-mvc.dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
1+
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
22
WORKDIR /app
33
COPY src/Mvc .
44
RUN dotnet publish -c Release -o out
55

6-
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime
6+
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS runtime
77
ENV URLS http://+:8080
88
ENV DOTNET_GCDynamicAdaptationMode=0
99
ENV DOTNET_ReadyToRun=0

0 commit comments

Comments
 (0)