Skip to content

Commit 9fdf087

Browse files
authored
Merge branch 'TechEmpower:master' into tio-boot
2 parents 9cf860c + 31cf37d commit 9fdf087

1,106 files changed

Lines changed: 14367 additions & 24880 deletions

File tree

Some content is hidden

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

deployment/vagrant/Vagrantfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ Vagrant.configure("2") do |config|
1313
end
1414

1515
config.vm.network "private_network", ip: "172.16.0.16"
16+
config.vm.network "forwarded_port", guest: 5432, host: 5432
17+
config.vm.network "forwarded_port", guest: 3306, host: 3306
1618

1719
TCP_PORTS = [2001, 3000, 8000, 8080, 8081, 8082, 8085, 9000]
1820

frameworks/C++/ffead-cpp/benchmark_config.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"display_name": "ffead-cpp [v]",
4848
"notes": "",
4949
"versus": "",
50-
"tags": []
50+
"tags": ["broken"]
5151
},
5252
"v-picov-raw-profiled": {
5353
"json_url": "/t3/j",
@@ -71,7 +71,7 @@
7171
"display_name": "ffead-cpp [v-prof]",
7272
"notes": "",
7373
"versus": "",
74-
"tags": []
74+
"tags": ["broken"]
7575
},
7676
"v-picov-raw-clibpqb-profiled": {
7777
"json_url": "/t3/j",
@@ -116,7 +116,7 @@
116116
"display_name": "ffead-cpp [pg-raw-prof]",
117117
"notes": "memory profiled",
118118
"versus": "",
119-
"tags": []
119+
"tags": ["broken"]
120120
},
121121
"postgresql-raw-clibpqb-profiled": {
122122
"db_url": "/t3/d",
@@ -158,7 +158,7 @@
158158
"display_name": "ffead-cpp [pg-raw-async-prof]",
159159
"notes": "async memory profiled",
160160
"versus": "",
161-
"tags": []
161+
"tags": ["broken"]
162162
},
163163
"postgresql-raw-async-pool-profiled": {
164164
"db_url": "/t4/d",
@@ -179,7 +179,7 @@
179179
"display_name": "ffead-cpp [pg-raw-async-prof-pool]",
180180
"notes": "async memory profiled",
181181
"versus": "",
182-
"tags": []
182+
"tags": ["broken"]
183183
},
184184
"postgresql-raw-async-pool-profiled-m": {
185185
"query_url": "/t4/quem?queries=",
@@ -261,7 +261,7 @@
261261
"display_name": "ffead-cpp [pg-raw-async-qw-prof]",
262262
"notes": "async memory profiled",
263263
"versus": "",
264-
"tags": []
264+
"tags": ["broken"]
265265
},
266266
"postgresql-raw-async-qw-clibpqb-profiled": {
267267
"db_url": "/t5/d",

frameworks/C/h2o/h2o.dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG UBUNTU_VERSION=25.10
1+
ARG UBUNTU_VERSION=26.04
22

33
ARG H2O_APP_PREFIX=/opt/h2o-app
44

@@ -35,13 +35,14 @@ RUN apt-get install \
3535
systemtap-sdt-dev
3636

3737
RUN echo "[timing] Building H2O: $(date)"
38-
ARG H2O_VERSION=3b9b6a53cac8bcc6a25fb28df81ad295fc5f9402
38+
ARG H2O_VERSION=ccea64b17ade832753db933658047ede9f31a380
3939

4040
WORKDIR /tmp/h2o-build
4141
RUN curl -LSs "https://github.com/h2o/h2o/archive/${H2O_VERSION}.tar.gz" | \
4242
tar --strip-components=1 -xz && \
4343
cmake \
4444
-B build \
45+
-DCMAKE_BUILD_TYPE=Release \
4546
-DCMAKE_C_FLAGS="-flto=auto -march=native -mtune=native" \
4647
-DWITH_MRUBY=on \
4748
-S . && \

frameworks/C/octane/README.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

frameworks/C/octane/benchmark_config.json

Lines changed: 0 additions & 24 deletions
This file was deleted.

frameworks/C/octane/config.toml

Lines changed: 0 additions & 15 deletions
This file was deleted.

frameworks/C/octane/octane.dockerfile

Lines changed: 0 additions & 18 deletions
This file was deleted.

frameworks/C/octane/src/program.cpp

Lines changed: 0 additions & 49 deletions
This file was deleted.

frameworks/C/octane/src/responders/sds_responder.cpp

Lines changed: 0 additions & 52 deletions
This file was deleted.

frameworks/C/octane/src/responders/sds_responder.hpp

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)