Skip to content

Commit a85041b

Browse files
pavelmashpavel.mash
andauthored
- thread pool auto-tuning: use 1 listening socket per logical CPU and 8 working thread pes listener socket (#7994)
- for /updates with count <=20 use 'case .. when .. then' pattern [mORMot] update to mORMot 2.0.stable [mORMot] improved cached queries performance Co-authored-by: pavel.mash <[email protected]>
1 parent 30bd1a4 commit a85041b

File tree

3 files changed

+280
-225
lines changed

3 files changed

+280
-225
lines changed

frameworks/Pascal/mormot/mormot.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
FROM freepascal/fpc:3.2.2-focal-full as builder
22

33
RUN apt-get update -yqq
4-
RUN apt-get install -yqq p7zip-full zlib1g-dev
4+
RUN apt-get install -yqq zlib1g-dev
55

66
WORKDIR /build
7-
COPY src/ src/
7+
COPY src/raw.* src/
88
COPY setup_and_build.sh .
99

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

frameworks/Pascal/mormot/setup_and_build.sh

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,18 @@ script_aborted() {
2424
set -o pipefail
2525

2626
rm -rf ./libs
27-
27+
mkdir -p ./libs/mORMot/static
2828
# echo "Getting the latest pre-release URL..."
2929
# USED_TAG=$(wget -qO- https://api.github.com/repos/synopse/mORMot2/releases/latest | jq -r '.tag_name')
30-
USED_TAG="2.0.4383"
30+
USED_TAG="2.0.stable"
3131

3232
echo "Used release tag $USED_TAG"
33-
URL="https://github.com/synopse/mORMot2/releases/download/$USED_TAG/mormot2static.7z"
33+
URL="https://github.com/synopse/mORMot2/releases/download/$USED_TAG/mormot2static.tgz"
3434
echo "Download statics from $URL ..."
35-
wget -q -O./mormot2static.7z "$URL"
36-
37-
mkdir -p ./libs/mORMot/static
38-
echo "Unpacking to ./libs/mORMot/static ..."
39-
7za x ./mormot2static.7z -o./libs/mORMot/static
40-
rm -rf ./mormot2static.7z
35+
wget -qO- "$URL" | tar -xz -C ./libs/mORMot/static
4136

4237
# uncomment for fixed commit URL
43-
URL=https://github.com/synopse/mORMot2/tarball/0eb1a70da04481a6d478acff5183742eed1882f7
38+
URL=https://github.com/synopse/mORMot2/tarball/46f5360a668ccf7a7c4d538fb319b449da8a232f
4439
#URL="https://api.github.com/repos/synopse/mORMot2/tarball/$USED_TAG"
4540
echo "Download and unpacking mORMot sources from $URL ..."
4641
wget -qO- "$URL" | tar -xz -C ./libs/mORMot --strip-components=1
@@ -72,7 +67,6 @@ fi
7267
# Warning: (5089) Local variable XXX of a managed type does not seem to be initialized
7368
# Warning: (5090) Variable XXX of a managed type does not seem to be initialized
7469
SUPRESS_WARN=-vm11047,6058,5092,5091,5060,5058,5057,5028,5024,5023,4081,4079,4055,3187,3124,3123,5059,5036,5089,5090
75-
7670
echo "Start compiling..."
7771
fpc -MDelphi -Sci -Ci -O4 -g -gl -gw2 -Xg -k'-rpath=$ORIGIN' -k-L$BIN \
7872
-T$TARGET -P$ARCH \
@@ -82,7 +76,7 @@ fpc -MDelphi -Sci -Ci -O4 -g -gl -gw2 -Xg -k'-rpath=$ORIGIN' -k-L$BIN \
8276
-Fu"$MSRC/core" -Fu"$MSRC/db" -Fu"$MSRC/rest" -Fu"$MSRC/crypt" \
8377
-Fu"$MSRC/app" -Fu"$MSRC/net" -Fu"$MSRC/lib" -Fu"$MSRC/orm" -Fu"$MSRC/soa" \
8478
-FU"$BIN/fpc-$ARCH_TG/.dcu" -FE"$BIN/fpc-$ARCH_TG" -o"$BIN/fpc-$ARCH_TG/$dest_fn" \
85-
-dFPC_LIBCMM -dNOSYNDBZEOS -dNOSYNDBIBX \
79+
-dFPC_LIBCMM \
8680
-B -Se1 "./src/raw.pas" | grep "[Warning|Error|Fatal]:"
8781

8882
script_successful

0 commit comments

Comments
 (0)