Skip to content

Commit 84b9953

Browse files
pavelmashpavel.mash
andauthored
[mORMot] - migrate to Ubuntu24.04; [email protected]; return to glibc MM (#9072)
* [mORMot] - migrate to Ubuntu24.04; [email protected]; return to glibc MM * [mORMot] - [email protected] + Define FPC_LIBCMM_NOMSIZE to disable the malloc_usable_size() call on Linux + O3 optimization level --------- Co-authored-by: pavel.mash <[email protected]>
1 parent e50dde3 commit 84b9953

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

frameworks/Pascal/mormot/benchmark_config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"query_url": "/queries?queries=",
1010
"fortune_url": "/fortunes",
1111
"update_url": "/updates?queries=",
12-
"plaintext_url": "/plaintext",
1312
"cached_query_url": "/cached-queries?count=",
13+
"plaintext_url": "/plaintext",
1414
"port": 8080,
1515
"approach": "Realistic",
1616
"classification": "Fullstack",

frameworks/Pascal/mormot/mormot.dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,14 @@ COPY setup_and_build.sh .
99

1010
RUN /bin/bash -c ./setup_and_build.sh
1111

12-
FROM ubuntu:22.04
13-
RUN apt-get update -yqq && apt-get install -yqq libmimalloc2.0
12+
FROM ubuntu:24.04
1413

1514
ARG TFB_TEST_NAME
1615

1716
COPY --from=builder /build/bin/fpc-x86_64-linux/raw /usr/local/bin/raw
1817
COPY --from=builder /build/libpq.so.5.16 /usr/lib/x86_64-linux-gnu/libpq.so.5
1918

2019
ENV TFB_TEST_NAME=$TFB_TEST_NAME
21-
ENV LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libmimalloc.so.2.0
2220

2321
EXPOSE 8080
2422
CMD ["raw"]

frameworks/Pascal/mormot/setup_and_build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ echo "Download statics from $URL ..."
3535
wget -qO- "$URL" | tar -xz -C ./libs/mORMot/static
3636

3737
# uncomment for fixed commit URL
38-
URL=https://github.com/synopse/mORMot2/tarball/527b3fb11cb4dad5f2c03ace293b550f85504420
38+
URL=https://github.com/synopse/mORMot2/tarball/f0fc66c954cd45f5c581e52c21170923805a683b
3939
#URL="https://api.github.com/repos/synopse/mORMot2/tarball/$USED_TAG"
4040
echo "Download and unpacking mORMot sources from $URL ..."
4141
wget -qO- "$URL" | tar -xz -C ./libs/mORMot --strip-components=1
@@ -72,15 +72,15 @@ fi
7272
# Warning: (5090) Variable XXX of a managed type does not seem to be initialized
7373
SUPRESS_WARN=-vm11047,6058,5092,5091,5060,5058,5057,5028,5024,5023,4081,4079,4055,3187,3124,3123,5059,5036,5089,5090
7474
echo "Start compiling..."
75-
fpc -MDelphi -Sci -Ci -O4 -g -gl -gw2 -Xg -k'-rpath=$ORIGIN' -k-L$BIN \
75+
fpc -MDelphi -Sci -Ci -O3 -g -gl -gw2 -Xg -k'-rpath=$ORIGIN' -k-L$BIN \
7676
-T$TARGET -P$ARCH \
7777
-veiq -v-n-h- $SUPRESS_WARN \
7878
-Fi"$BIN/fpc-$ARCH_TG/.dcu" -Fi"$MSRC" \
7979
-Fl"$STATIC/$ARCH-$TARGET" \
8080
-Fu"$MSRC/core" -Fu"$MSRC/db" -Fu"$MSRC/rest" -Fu"$MSRC/crypt" \
8181
-Fu"$MSRC/app" -Fu"$MSRC/net" -Fu"$MSRC/lib" -Fu"$MSRC/orm" -Fu"$MSRC/soa" \
8282
-FU"$BIN/fpc-$ARCH_TG/.dcu" -FE"$BIN/fpc-$ARCH_TG" -o"$BIN/fpc-$ARCH_TG/$dest_fn" \
83-
-dFPC_LIBCMM \
83+
-dFPC_LIBCMM -dFPC_LIBCMM_NOMSIZE \
8484
-B -Se1 "./src/raw.pas" | grep "[Warning|Error|Fatal]:"
8585

8686
script_successful

frameworks/Pascal/mormot/src/raw.pas

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -831,8 +831,7 @@ procedure TAsyncWorld.OnRes(Statement: TSqlDBPostgresAsyncStatement;
831831
ConsoleWaitForEnterKey;
832832
//TSynLog.Family.Level := LOG_VERBOSE; // enable shutdown logs for debug
833833
if servers = 1 then
834-
writeln(ObjectToJsonDebug(rawServers[0].fHttpServer,
835-
[woDontStoreVoid, woHumanReadable]))
834+
writeln(ObjectToJsonDebug(rawServers[0].fHttpServer))
836835
else
837836
begin
838837
writeln('Per-server accepted connections:');

0 commit comments

Comments
 (0)